Commit fa64e1db 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 46819e98
......@@ -41,6 +41,7 @@ Name[sr@ijekavian]=Геттекст превод
Name[sr@ijekavianlatin]=Gettext prevod
Name[sr@latin]=Gettext prevod
Name[sv]=Översättning med Gettext
Name[tg]=Тарҷумаҳои «Gettext»
Name[tr]=Gettext Çevirisi
Name[uk]=Переклад Gettext
Name[x-test]=xxGettext Translationxx
......
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