Commit 113953d9 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 ef55d5bb
......@@ -139,7 +139,7 @@ GenericName[zh_CN]=帮助中心
Comment=Browse and search documentation
Comment[ca]=Explora i cerca documentació
Comment[ca@valencia]=Explora i busca documentació
Comment[ca@valencia]=Explora i cerca documentació
Comment[cs]=Procházejte a prohledávejte dokumentaci
Comment[da]=Gennemse og søg i dokumentationen
Comment[de]=Dokumentation lesen und durchsuchen
......@@ -10,7 +10,7 @@ Name[bn_IN]=(১) ব্যবহারকারীদের জন্য উপ
Name[br]=(1) Urzhiadoù arveriad
Name[bs]=(1) Korisničke naredbe
Name[ca]=(1) Ordres d'usuari
Name[ca@valencia]=(1) Ordes d'usuari
Name[ca@valencia]=(1) Ordres d'usuari
Name[cs]=(1) Uživatelské příkazy
Name[csb]=(1) Pòlét brëkòwnika
Name[cy]=(1) Gorchmynion Defnyddiwr
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