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"
7 years ago · b39c4b9cfa
parent 8e9d63c132
commit b39c4b9cfa
3 changed files with 3 additions and 3 deletions
--- a/dataengines/time/plasma-dataengine-time.desktop
+++ b/dataengines/time/plasma-dataengine-time.desktop
@ -104,7 +104,7 @@ Comment[hi]=तारीख़ तथा समय समयक्षेत्
 Comment[hr]=Datum i vrijeme po vremenskoj zoni
 Comment[hu]=Dátum és idő (időzónánként)
 Comment[ia]=Data e tempore per fuso horari
-Comment[id]=Tanggal dan waktu menurut zona waktu
+Comment[id]=Tanggal dan waktu menurut zona-waktu
 Comment[is]=Stillingar dagssetningar og klukku eftir tímabeltum
 Comment[it]=Data e ora per fuso orario
 Comment[ja]=タイムゾーンの日付と時刻
--- a/dataengines/weather/ions/wetter.com/ion-wettercom.desktop
+++ b/dataengines/weather/ions/wetter.com/ion-wettercom.desktop
@ -90,7 +90,7 @@ Comment[hi]=wetter.com द्वारा मोसम पूर्वानु
 Comment[hr]=Prognoza vremena s wetter.com
 Comment[hu]=Időjárás-előrejelzés a wetter.com-ról
 Comment[ia]=Prevision Meteorologic per wetter.com
-Comment[id]=Ramalan cuaca oleh wetter.com
+Comment[id]=Prakiraan cuaca oleh wetter.com
 Comment[is]=Veðurspá frá wetter.com
 Comment[it]=Previsioni del tempo di wetter.com
 Comment[ja]=wetter.com による天気予報
--- a/runners/recentdocuments/plasma-runner-recentdocuments.desktop
+++ b/runners/recentdocuments/plasma-runner-recentdocuments.desktop
@ -32,7 +32,7 @@ Name[hne]=हाल ही मं प्रयुक्त कागद
 Name[hr]=Nedavno pristupljeni dokumenti
 Name[hu]=Nemrég használt dokumentumok
 Name[ia]=Documentos recente
-Name[id]=Dokumen Terkini
+Name[id]=Dokumen Baru-baru ini
 Name[is]=Nýleg skjöl
 Name[it]=Documenti recenti
 Name[ja]=最近の文書