Commit d3cb7d24 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 7651afff
......@@ -81,7 +81,7 @@ Comment[ta]=கான்சோல்
Comment[te]=కాన్సొల్
Comment[tg]=Консол
Comment[th]=คอนโซล-K
Comment[tr]=Konsol
Comment[tr]=Konsole
Comment[ug]=Konsole
Comment[uk]=Konsole
Comment[uz]=Terminal
......
......@@ -51,7 +51,7 @@ Name[sr@ijekavian]=Изврши у Конзоли
Name[sr@ijekavianlatin]=Izvrši u Konsoli
Name[sr@latin]=Izvrši u Konsoli
Name[sv]=Kör i Terminal
Name[tr]=Konsolda Çalıştır
Name[tr]=Konsole'da Çalıştır
Name[uk]=Запустити у Konsole
Name[x-test]=xxRun In Konsolexx
Name[zh_CN]=在 Konsole 中运行
......@@ -91,7 +91,7 @@ Comment[sr@ijekavian]=Изврши у Конзоли
Comment[sr@ijekavianlatin]=Izvrši u Konsoli
Comment[sr@latin]=Izvrši u Konsoli
Comment[sv]=Kör i Terminal
Comment[tr]=Konsolda Çalıştır
Comment[tr]=Konsol İçinde Çalıştır
Comment[uk]=Запустити у Konsole
Comment[x-test]=xxRun within Konsolexx
Comment[zh_CN]=在 Konsole 中运行
......
......@@ -92,7 +92,7 @@ Name[ta]=கான்சோல்
Name[te]=కాన్సోల్
Name[tg]=Консол
Name[th]=คอนโซล-K
Name[tr]=Konsol
Name[tr]=Konsole
Name[ug]=Konsole
Name[uk]=Konsole
Name[uz]=Konsole
......
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