Commit e5012639 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 b6ad3a15
......@@ -46,7 +46,7 @@ Name[km]=រូបភាព EXR
Name[kn]=ಇಕ್ಸರ್ ಚಿತ್ರಗಳು
Name[ko]=EXR 그림
Name[ku]=Wêneyên EXR
Name[lt]=EXR paveiksliukai
Name[lt]=EXR paveikslai
Name[lv]=EXR attēli
Name[mai]=ईएक्सआर छविसभ
Name[mk]=EXR-слики
......
......@@ -37,7 +37,7 @@ Name[kk]=JPEG кескіндері
Name[km]=រូបភាព JPEG
Name[kn]=JPEG ಚಿತ್ರಗಳು
Name[ko]=JPEG 그림
Name[lt]=JPEG paveiksliukai
Name[lt]=JPEG paveikslai
Name[lv]=JPEG attēli
Name[mai]=JPEG चित्र
Name[mk]=JPEG-слики
......
......@@ -37,7 +37,7 @@ Name[kk]=SVG кескіндері
Name[km]=រូបភាព SVG
Name[kn]=SVG ಚಿತ್ರಗಳು
Name[ko]=SVG 그림
Name[lt]=SVG paveiksliukai
Name[lt]=SVG paveikslai
Name[lv]=SVG attēli
Name[mai]=SVG चित्र
Name[mk]=SVG-слики
......
......@@ -37,7 +37,7 @@ Name[kk]=Microsoft Windows-тың кескіндері
Name[km]=រូបភាព​របស់ Microsoft Windows
Name[kn]=ಮೈಕ್ರೋಸಾಫ್ಟ್ ವಿಂಡೋಸ್ ಚಿತ್ರಗಳು
Name[ko]=Microsoft Windows 그림
Name[lt]=Microsoft Windows paveiksliukai
Name[lt]=Microsoft Windows atvaizdžiai
Name[lv]=Microsoft Windows attēli
Name[mk]=Microsoft Windows-слики
Name[ml]=മൈക്രോസോഫ്റ്റ് വിന്‍ഡോസ് ചിത്രങ്ങള്‍
......
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