Commit 79c5c3da 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 c46e1174
......@@ -21,6 +21,7 @@ Name[gl]=Cómic
Name[he]=קומיקס
Name[hr]=Strip
Name[hu]=Képregény
Name[ia]=Comic
Name[id]=Komik
Name[is]=Comic
Name[it]=Fumetto
......
......@@ -15,6 +15,7 @@
"Name[fr]": "Wikimedia Commons",
"Name[gl]": "Wikimedia Commons",
"Name[hu]": "Wikimedia Commons",
"Name[ia]": "Wikimedia Commons",
"Name[id]": "Wikimedia Commons",
"Name[it]": "Wikimedia Commons",
"Name[ko]": "위키미디어 공용",
......
......@@ -21,6 +21,7 @@ Name[gl]=Caracteres especiais
Name[he]=תווים מיוחדים
Name[hr]=Posebni znakovi
Name[hu]=Speciális karakterek
Name[ia]=Characteres special
Name[id]=Karakter Spesial
Name[it]=Caratteri speciali
Name[ja]=特殊文字
......
......@@ -20,6 +20,7 @@ Name[gl]=Caracteres especiais
Name[he]=תווים מיוחדים
Name[hr]=Posebni znakovi
Name[hu]=Speciális karakterek
Name[ia]=Characteres special
Name[id]=Karakter spesial
Name[it]=Caratteri speciali
Name[ja]=特殊文字
......
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