Commit 3a812917 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 21e56d17
......@@ -36,6 +36,7 @@ Name[sr@ijekavian]=Батерија и освјетљај
Name[sr@ijekavianlatin]=Baterija i osvjetljaj
Name[sr@latin]=Baterija i osvetljaj
Name[sv]=Batteri och ljusstyrka
Name[tg]=Батарея ва дурахшонӣ
Name[tr]=Pil ve Ekran Parlaklığı
Name[uk]=Акумулятор і яскравість дисплея
Name[x-test]=xxBattery and Brightnessxx
......@@ -104,6 +105,7 @@ Comment[sr@latin]=Pazite na stanje popunjenosti baterije
Comment[sv]=Se batteriets laddningsstatus
Comment[ta]=See the power status of your battery
Comment[te]=మీ బ్యాటరీ యొక్క పవర్ స్థితిని చూడుము
Comment[tg]=Вазъияти қувваи барқи батареяро назорат кунед
Comment[th]=แสดงสถานะพลังงานของแบตเตอรี่ของคุณ
Comment[tr]=Pilinizin güç durumuna bakın
Comment[ug]=توكدانىڭىزنىڭ توك ھالىتىنى كۆرسىتىدۇ
......
......@@ -69,6 +69,7 @@ Name[sr@latin]=zaključavanje/odjava
Name[sv]=Låsning eller utloggning
Name[ta]=சாற்று/ வெளிவருக
Name[te]=లాక్/లాగ్అవుట్
Name[tg]=Қулф/Баромад
Name[th]=ล็อคหน้าจอ/ออกจากระบบ
Name[tr]=Kilitle/Çık
Name[ug]=قۇلۇپلا/تىزىمدىن چىق
......
......@@ -40,6 +40,7 @@ Name[sr@ijekavian]=медија плејер
Name[sr@ijekavianlatin]=medija plejer
Name[sr@latin]=medija plejer
Name[sv]=Mediaspelare
Name[tg]=Плеери медиа
Name[tr]=Ortam Yürütücüsü
Name[uk]=Програвач
Name[x-test]=xxMedia Playerxx
......
......@@ -23,6 +23,7 @@ Name[pt]=Reacções do Utilizador
Name[pt_BR]=Comentários dos usuários
Name[ru]=Обратная связь
Name[sv]=Användaråterkoppling
Name[tg]=Изҳори назари корбар
Name[uk]=Відгуки користувача
Name[x-test]=xxUser Feedbackxx
Name[zh_CN]=用户反馈
......
......@@ -12,6 +12,7 @@ Name[pt]=Reacções
Name[pt_BR]=Comentários
Name[ru]=Обратная связь
Name[sv]=Återkoppling
Name[tg]=Изҳори назар
Name[uk]=Відгуки
Name[x-test]=xxFeedbackxx
Name[zh_CN]=反馈
......
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