Commit 134fbf60 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 c3ab3703
......@@ -42,7 +42,7 @@ Name[x-test]=xxLanguagexx
Comment=Change workspace and application languages
Comment[ast]=Camuda les llingües de les aplicaciones y estayes de trabayu
Comment[ast]=Camuda les llingües de la estaya de trabayu y les aplicaciones
Comment[ca]=Canvi dels idiomes de l'espai de treball i les aplicacions
Comment[cs]=Změnit pracovní prostředí a jazyk aplikace
Comment[de]=Sprache für den Arbeitsbereich und die Anwendungen ändern
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