Commit 79ae1b97 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 b2acd7a9
......@@ -9,6 +9,7 @@
"Name[ca@valencia]": "Enllaçat de fitxers a les activitats",
"Name[ca]": "Enllaçat de fitxers a les activitats",
"Name[cs]": "Připojit soubory k aktivitám",
"Name[da]": "Link filer til aktiviteter",
"Name[en_GB]": "Link Files to Activities",
"Name[es]": "Enlazar archivos a actividades",
"Name[et]": "Failide linkimine tegevustega",
......
Markdown is supported
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