Commit a14b1a44 authored by Script Kiddy's avatar Script Kiddy
Browse files

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent 8222d89b
Pipeline #164646 passed with stage
in 54 seconds
......@@ -335,6 +335,7 @@ Name[fr]=Démarrage de la réparation
Name[ia]=Reparation initiava
Name[id]=Perbaikan Dimulai
Name[it]=Riparazione avviata
Name[ko]=복구 시작됨
Name[nl]=Repareren is gestart
Name[pl]=Rozpoczęto naprawianie
Name[pt]=Reparação Iniciada
......@@ -362,6 +363,7 @@ Name[fr]=La réparation a été réalisée avec succès.
Name[ia]=Systema reparate con successo
Name[id]=Berhasil Memperbaiki
Name[it]=Riparato correttamente
Name[ko]=복구에 성공함
Name[nl]=Met succes gerepareerd
Name[pl]=Pomyślnie naprawiono
Name[pt]=Reparado com Sucesso
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment