Commit 652fd4b7 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 dde49229
......@@ -326,6 +326,7 @@ Name=Repair Started
Name[ar]=بدء الإصلاح
Name[az]=Bərpa edilməyə başladı
Name[ca]=S'ha iniciat la reparació
Name[ca@valencia]=S'ha iniciat la reparació
Name[de]=Reparatur gestartet
Name[es]=Reparación iniciada
Name[eu]=Konponketak hasi da
......@@ -348,6 +349,7 @@ Name=Repaired Successfully
Name[ar]=نجح الإصلاح
Name[az]=Sistem uğurla bərpa olundu
Name[ca]=La reparació ha estat correcta
Name[ca@valencia]=La reparació ha estat correcta
Name[de]=Erfolgreich repariert
Name[es]=Reparado correctamente
Name[eu]=Konponketa arrakastatsua
......
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