Commit 925e3535 authored by Script Kiddy's avatar Script Kiddy

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 8db31988
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
"Name[pt_BR]": "Nicolas Fella", "Name[pt_BR]": "Nicolas Fella",
"Name[ru]": "Nicolas Fella", "Name[ru]": "Nicolas Fella",
"Name[sk]": "Nicolas Fella", "Name[sk]": "Nicolas Fella",
"Name[sl]": "Nicolas Fella",
"Name[sv]": "Nicolas Fella", "Name[sv]": "Nicolas Fella",
"Name[uk]": "Nicolas Fella", "Name[uk]": "Nicolas Fella",
"Name[x-test]": "xxNicolas Fellaxx", "Name[x-test]": "xxNicolas Fellaxx",
...@@ -65,6 +66,7 @@ ...@@ -65,6 +66,7 @@
"Description[pt_BR]": "Altera etiquetas de arquivos", "Description[pt_BR]": "Altera etiquetas de arquivos",
"Description[ru]": "Изменение меток файла", "Description[ru]": "Изменение меток файла",
"Description[sk]": "Zmeniť značky súborov", "Description[sk]": "Zmeniť značky súborov",
"Description[sl]": "Zamenjaj oznake v datoteki",
"Description[sv]": "Ändra filetiketter", "Description[sv]": "Ändra filetiketter",
"Description[uk]": "Зміна міток файлів", "Description[uk]": "Зміна міток файлів",
"Description[x-test]": "xxChange file tagsxx", "Description[x-test]": "xxChange file tagsxx",
...@@ -104,6 +106,7 @@ ...@@ -104,6 +106,7 @@
"Name[pt_BR]": "Etiquetas", "Name[pt_BR]": "Etiquetas",
"Name[ru]": "Метки", "Name[ru]": "Метки",
"Name[sk]": "Značky", "Name[sk]": "Značky",
"Name[sl]": "Oznake",
"Name[sv]": "Etiketter", "Name[sv]": "Etiketter",
"Name[uk]": "Мітки", "Name[uk]": "Мітки",
"Name[x-test]": "xxTagsxx", "Name[x-test]": "xxTagsxx",
......
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