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 · 625883dec8
parent bbe4db6c91
commit 625883dec8
7 changed files with 9 additions and 0 deletions
--- a/applets/appmenu/package/metadata.desktop
+++ b/applets/appmenu/package/metadata.desktop
@ -33,6 +33,7 @@ Name[sr@ijekavian]=Глобални мени
 Name[sr@ijekavianlatin]=Globalni meni
 Name[sr@latin]=Globalni meni
 Name[sv]=Global meny
+Name[tg]=Феҳристи умумӣ
 Name[tr]=Genel Menü
 Name[uk]=Загальне меню
 Name[x-test]=xxGlobal Menuxx
--- a/components/shellprivate/widgetexplorer/plasmoids.knsrc
+++ b/components/shellprivate/widgetexplorer/plasmoids.knsrc
@ -33,6 +33,7 @@ Name[sr@ijekavian]=плазма виџети
 Name[sr@ijekavianlatin]=plasma vidžeti
 Name[sr@latin]=plasma vidžeti
 Name[sv]=Plasma grafiska komponenter
+Name[tg]=Виҷетҳои Плазма
 Name[tr]=Plasma Gereçleri
 Name[uk]=Віджети Плазми
 Name[x-test]=xxPlasma Widgetsxx
--- a/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop
+++ b/containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop
@ -57,6 +57,7 @@ Name[sr@ijekavian]=стандардни мени
 Name[sr@ijekavianlatin]=standardni meni
 Name[sr@latin]=standardni meni
 Name[sv]=Standardmeny
+Name[tg]=Феҳристи стандартӣ
 Name[th]=เมนูมาตรฐาน
 Name[tr]=Standart Menü
 Name[ug]=ئۆلچەملىك تىزىملىك
--- a/containmentactions/switchactivity/plasma-containmentactions-switchactivity.desktop
+++ b/containmentactions/switchactivity/plasma-containmentactions-switchactivity.desktop
@ -55,6 +55,7 @@ Name[sr@ijekavian]=пребацивање активности
 Name[sr@ijekavianlatin]=prebacivanje aktivnosti
 Name[sr@latin]=prebacivanje aktivnosti
 Name[sv]=Byt aktivitet
+Name[tg]=Гузариши фаъолият
 Name[th]=สลับกิจกรรม
 Name[tr]=Etkinlik Değiştir
 Name[ug]=پائالىيەت ئالماشتۇر
@ -120,6 +121,7 @@ Comment[sr@ijekavian]=Пребацује на другу активност
 Comment[sr@ijekavianlatin]=Prebacuje na drugu aktivnost
 Comment[sr@latin]=Prebacuje na drugu aktivnost
 Comment[sv]=Byt till en annan aktivitet
+Comment[tg]=Гузариш ба фаъолияти дигар
 Comment[th]=สลับไปยังกิจกรรมอื่น ๆ
 Comment[tr]=Başka bir etkinliğe geç
 Comment[ug]=باشقا بىر پائالىيەتكە ئالماشتۇر
--- a/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop
+++ b/containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop
@ -57,6 +57,7 @@ Name[sr@ijekavian]=пребацивање површи
 Name[sr@ijekavianlatin]=prebacivanje površi
 Name[sr@latin]=prebacivanje površi
 Name[sv]=Byt skrivbord
+Name[tg]=Гузариши мизи корӣ
 Name[th]=สลับพื้นที่ทำงาน
 Name[tr]=Masaüstünü Değiştir
 Name[ug]=ئۈستەلئۈستى ئالماشتۇر
@ -123,6 +124,7 @@ Comment[sr@ijekavian]=Пребацује на другу виртуелну по
 Comment[sr@ijekavianlatin]=Prebacuje na drugu virtuelnu površ
 Comment[sr@latin]=Prebacuje na drugu virtuelnu površ
 Comment[sv]=Byt till ett annat virtuellt skrivbord
+Comment[tg]=Гузариш ба мизи кории маҷозии дигар
 Comment[th]=สลับไปยังพื้นที่ทำงานเสมือนตัวอื่น ๆ
 Comment[tr]=Başka bir sanal masaüstüne geç
 Comment[ug]=باشقا بىر مەۋھۇم ئۈستەلئۈستىگە ئالماشتۇر
--- a/containmentactions/switchwindow/plasma-containmentactions-switchwindow.desktop
+++ b/containmentactions/switchwindow/plasma-containmentactions-switchwindow.desktop
@ -55,6 +55,7 @@ Name[sr@ijekavian]=пребацивање прозора
 Name[sr@ijekavianlatin]=prebacivanje prozora
 Name[sr@latin]=prebacivanje prozora
 Name[sv]=Byt fönster
+Name[tg]=Гузариши равзана
 Name[th]=สลับหน้าต่าง
 Name[tr]=Pencereyi Değiştir
 Name[ug]=كۆزنەك ئالماشتۇر
--- a/kioslave/desktop/directory.trash
+++ b/kioslave/desktop/directory.trash
@ -36,6 +36,7 @@ Name[sr@ijekavian]=Смеће
 Name[sr@ijekavianlatin]=Smeće
 Name[sr@latin]=Smeće
 Name[sv]=Papperskorg
+Name[tg]=Сабад
 Name[tr]=Çöp
 Name[uk]=Смітник
 Name[x-test]=xxTrashxx