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"
2019-09-17 05:29:51 +02:00 · 2019-09-17 05:29:51 +02:00 · fd702c3644
parent 9d83a4d365
commit fd702c3644
36 changed files with 10 additions and 34 deletions
--- a/effects/blur/blur_config.desktop
+++ b/effects/blur/blur_config.desktop
@ -76,7 +76,6 @@ Name[sr@latin]=Zamućenje
 Name[sv]=Oskärpa
 Name[ta]=மங்கலாக
 Name[te]=బ్లర్
-Name[tg]=Шуста
 Name[th]=ทำให้ไม่ชัดเจน
 Name[tr]=Bulanıklaştırma
 Name[ug]=گۇڭگا
--- a/effects/coverswitch/coverswitch_config.desktop
+++ b/effects/coverswitch/coverswitch_config.desktop
@ -65,7 +65,6 @@ Name[sr@latin]=Protočno prebacivanje
 Name[sv]=Omslagsbyte
 Name[ta]=Cover Switch
 Name[te]=కవర్ స్విచ్
-Name[tg]=Циркуляция
 Name[th]=สลับหน้าต่างแบบปกเทป
 Name[tr]=Kapak Pencere Seçici
 Name[ug]=قاپنى ئالماشتۇر
--- a/effects/cube/cube_config.desktop
+++ b/effects/cube/cube_config.desktop
@ -71,7 +71,6 @@ Name[sr@latin]=Kocka površi
 Name[sv]=Skrivbordskub
 Name[ta]=பணிமேசை க்யூப்
 Name[te]=‍డెస్‍క్ టాప్ క్యూబ్
-Name[tg]=Мизи корӣ, монанди куб
 Name[th]=พื้นที่ทำงานทรงลูกบาศก์
 Name[tr]=Masaüstü Küpü
 Name[ug]=ئۈستەلئۈستى كۈپى
--- a/effects/cubeslide/cubeslide_config.desktop
+++ b/effects/cubeslide/cubeslide_config.desktop
@ -62,7 +62,6 @@ Name[sr@ijekavian]=Анимација коцке површи
 Name[sr@ijekavianlatin]=Animacija kocke površi
 Name[sr@latin]=Animacija kocke površi
 Name[sv]=Animering med skrivbordskub
-Name[tg]=Мизи корӣ, монанди куб
 Name[th]=พื้นที่ทำงานทรงลูกบาศก์แบบเคลื่อนไหว
 Name[tr]=Masaüstü Küp Animasyonu
 Name[ug]=ئۈستەلئۈستى كۇب جانلاندۇرۇمى
--- a/effects/desktopgrid/desktopgrid_config.desktop
+++ b/effects/desktopgrid/desktopgrid_config.desktop
@ -73,7 +73,6 @@ Name[sr@latin]=Mreža površi
 Name[sv]=Skrivbordsrutnät
 Name[ta]=மேல்மேசை கிரிட்
 Name[te]=డెస్‍క్ టాప్ గ్రిడ్
-Name[tg]=Шабакаи мизи корӣ
 Name[th]=พื้นที่ทำงานเป็นตาราง
 Name[tr]=Masaüstü Izgarası
 Name[ug]=ئۈستەلئۈستى سېتكىسى
--- a/effects/dialogparent/package/metadata.desktop
+++ b/effects/dialogparent/package/metadata.desktop
@ -64,7 +64,6 @@ Name[sr@latin]=Roditelj dijaloga
 Name[sv]=Dialogrutors ägare
 Name[ta]=தாய் பலகம்
 Name[te]=డైలాగ్ మాత్రుక
-Name[tg]=Соҳиби диалог
 Name[th]=กล่องโต้ตอบหลัก
 Name[tr]=İletişim Kutusu Sahibi
 Name[ug]=ئاتا سۆزلەشكۈ
--- a/effects/diminactive/diminactive_config.desktop
+++ b/effects/diminactive/diminactive_config.desktop
@ -69,7 +69,6 @@ Name[sr@latin]=Prigušeni neaktivni
 Name[sv]=Dämpa inaktiva
 Name[ta]=Dim Inactive
 Name[te]=Dim క్రియాహీనం
-Name[tg]=Затемнение отключено
 Name[th]=ลดความสว่างตัวที่ไม่ได้ใช้
 Name[tr]=Pasifleri Koyulaştır
 Name[ug]=تۇتۇق ئاكتىپسىز
--- a/effects/fade/package/metadata.desktop
+++ b/effects/fade/package/metadata.desktop
@ -66,7 +66,6 @@ Name[sr@latin]=Utapanje
 Name[sv]=Tona
 Name[ta]=வெளிர்
 Name[te]=ఫేడ్
-Name[tg]=Плавное появление и исчезновение
 Name[th]=ค่อย ๆ ชัด/ค่อย ๆ จางหาย
 Name[tr]=Kaybolma
 Name[ug]=سۇسلاشتۇر
--- a/effects/fadedesktop/package/metadata.desktop
+++ b/effects/fadedesktop/package/metadata.desktop
@ -56,7 +56,6 @@ Name[sr@ijekavian]=Утапање површи
 Name[sr@ijekavianlatin]=Utapanje površi
 Name[sr@latin]=Utapanje površi
 Name[sv]=Tona skrivbord
-Name[tg]=Мизи корӣ, монанди пардаи экран
 Name[th]=ปรับพื้นที่ทำงานแบบค่อย ๆ ชัด/ค่อย ๆ จางหาย
 Name[tr]=Masaüstü Kaybolması
 Name[ug]=ئۈستەلئۈستىنى سۇسلاشتۇر
--- a/effects/flipswitch/flipswitch_config.desktop
+++ b/effects/flipswitch/flipswitch_config.desktop
@ -65,7 +65,6 @@ Name[sr@latin]=Preklopno prebacivanje
 Name[sv]=Blädderbyte
 Name[ta]=Flip Switch
 Name[te]=ఫ్లిప్ స్విచ్
-Name[tg]=Перелистывание
 Name[th]=สลับหน้าต่างพลิกซ้อนเป็นชั้น
 Name[tr]=Dönen Seçici
 Name[ug]=ئايلاندۇرۇپ ئالماشتۇر
--- a/effects/invert/invert_config.desktop
+++ b/effects/invert/invert_config.desktop
@ -75,7 +75,6 @@ Name[sr@latin]=Izvrtanje
 Name[sv]=Invertera
 Name[ta]=திருப்பு
 Name[te]=ఇన్వర్‍ట్
-Name[tg]=Табдилдиҳӣ
 Name[th]=กลับค่าสี
 Name[tr]=Negatifleştir
 Name[ug]=ئەكسى رەڭگە ئالماشتۇر
--- a/effects/kwineffect.desktop
+++ b/effects/kwineffect.desktop
@ -72,7 +72,6 @@ Comment[sr@latin]=Efekti KWina
 Comment[sv]=Kwin-effekt
 Comment[ta]=கேவின் தாக்கங்கள்
 Comment[te]=KWin ప్రభావం
-Comment[tg]=Воситаҳои KWin
 Comment[th]=ลูกเล่นของ KWin
 Comment[tr]=KWin Efekti
 Comment[ug]=KWin ئۈنۈمى
--- a/effects/login/package/metadata.desktop
+++ b/effects/login/package/metadata.desktop
@ -72,7 +72,7 @@ Name[sr@latin]=Prijava
 Name[sv]=Inloggning
 Name[ta]=நுழைக
 Name[te]=లాగిన్
-Name[tg]=Воридот
+Name[tg]=Воридшавӣ
 Name[th]=ลงบันทึกเข้าระบบ
 Name[tr]=Giriş
 Name[ug]=كىرىش
--- a/effects/logout/package/metadata.desktop
+++ b/effects/logout/package/metadata.desktop
@ -24,7 +24,6 @@ Name[pt_BR]=Encerrar sessão
 Name[ru]=Завершение работы
 Name[sk]=Odhlásiť sa
 Name[sv]=Logga ut
-Name[tg]=Баромад аз мизи корӣ
 Name[uk]=Вихід
 Name[x-test]=xxLogoutxx
 Name[zh_CN]=注销
--- a/effects/lookingglass/lookingglass_config.desktop
+++ b/effects/lookingglass/lookingglass_config.desktop
@ -71,7 +71,6 @@ Name[sr@latin]=Lupa
 Name[sv]=Förstoringsglas
 Name[ta]=Looking Glass
 Name[te]=లుకింగ్ గ్లాస్
-Name[tg]=Увеличительное стекло
 Name[th]=เลนส์ตาปลา
 Name[tr]=Büyüteç
 Name[ug]=كۆزىتىش ئەينەك
--- a/effects/magiclamp/magiclamp_config.desktop
+++ b/effects/magiclamp/magiclamp_config.desktop
@ -67,7 +67,6 @@ Name[sr@latin]=Magična lampa
 Name[sv]=Magisk lanterna
 Name[ta]=Magic Lamp
 Name[te]=మాజిక్ లాంప్
-Name[tg]=Contact - чароғ
 Name[th]=ตะเกียงวิเศษ
 Name[tr]=Sihirli Lamba
 Name[ug]=سېھىرلىك چىراغ
--- a/effects/magnifier/magnifier_config.desktop
+++ b/effects/magnifier/magnifier_config.desktop
@ -76,7 +76,6 @@ Name[sr@latin]=Uveličavač
 Name[sv]=Förstoringsglas
 Name[ta]=பெரிதாக்கி
 Name[te]=మాగ్నిఫైర్
-Name[tg]=Увеличитель
 Name[th]=แว่นขยาย
 Name[tr]=Büyüteç
 Name[ug]=چوڭايتقۇچ
--- a/effects/mousemark/mousemark_config.desktop
+++ b/effects/mousemark/mousemark_config.desktop
@ -73,7 +73,6 @@ Name[sr@latin]=Otisci miša
 Name[sv]=Markera med musen
 Name[ta]=எலியச் சுட்டி
 Name[te]=మౌస్ గుర్తు
-Name[tg]=Рисование отметок на экране
 Name[th]=วาดด้วยเมาส์
 Name[tr]=Fare İzi
 Name[ug]=چاشقىنەك بەلگىسى
--- a/effects/presentwindows/presentwindows_config.desktop
+++ b/effects/presentwindows/presentwindows_config.desktop
@ -73,7 +73,6 @@ Name[sr@latin]=Predstava prozora
 Name[sv]=Befintliga fönster
 Name[ta]=தற்போதைய சாளரம்
 Name[te]=ప్రస్తుత విండోలు
-Name[tg]=Ресурсы Windows
 Name[th]=แสดงหน้าต่างทั้งหมด
 Name[tr]=Şimdiki Pencereler
 Name[ug]=كۆزنەكلەرنى كۆرسەت
--- a/effects/resize/resize_config.desktop
+++ b/effects/resize/resize_config.desktop
@ -64,7 +64,6 @@ Name[sr@ijekavian]=Преувеличање прозора
 Name[sr@ijekavianlatin]=Preuveličanje prozora
 Name[sr@latin]=Preuveličanje prozora
 Name[sv]=Ändra fönsterstorlek
-Name[tg]=Тағйири андозаи тиреза
 Name[th]=ปรับขนาดหน้าต่าง
 Name[tr]=Pencereyi Yeniden Boyutlandır
 Name[ug]=كۆزنەك چوڭلۇقىنى ئۆزگەرت
--- a/effects/showfps/showfps_config.desktop
+++ b/effects/showfps/showfps_config.desktop
@ -74,7 +74,6 @@ Name[sr@latin]=Kadrovi/sekundi
 Name[sv]=Visa ramar/s
 Name[ta]=Show FPS
 Name[te]=FPS ను చూపుము
-Name[tg]=Намоиши FPS
 Name[th]=แสดงอัตราเฟรมต่อวินาที
 Name[tr]=FPS Göster
 Name[ug]=FPS نى كۆرسەت
--- a/effects/showpaint/showpaint_config.desktop
+++ b/effects/showpaint/showpaint_config.desktop
@ -63,7 +63,6 @@ Name[sl]=Izrisovanje
 Name[sv]=Visa uppritning
 Name[ta]=வண்ணங் காட்டு
 Name[te]=పెయింట్ చూపుము
-Name[tg]=Намоиши Paint
 Name[th]=แสดงพื้นที่
 Name[tr]=Boyamayı Göster
 Name[ug]=سىزىش دائىرىسىنى كۆرسەت
--- a/effects/slide/slide_config.desktop
+++ b/effects/slide/slide_config.desktop
@ -62,7 +62,6 @@ Name[sr@ijekavianlatin]=Klizanje
 Name[sr@latin]=Klizanje
 Name[sv]=Skjut
 Name[ta]=நழுவு
-Name[tg]=Слайд
 Name[th]=เลื่อนหน้าต่าง
 Name[tr]=Kaydır
 Name[ug]=تام تەسۋىر
--- a/effects/thumbnailaside/thumbnailaside_config.desktop
+++ b/effects/thumbnailaside/thumbnailaside_config.desktop
@ -71,7 +71,6 @@ Name[sr@latin]=Sličica postrance
 Name[sv]=Miniatyrbild vid sidan om
 Name[ta]=சுட்டி பக்கத்தில்
 Name[te]=థంబ్‌నెయిల్ ఎసైడ్
-Name[tg]=Миниатюры сбоку
 Name[th]=ภาพตัวอย่างแบบย่อตามด้าน
 Name[tr]=Yan Küçük Resimcik
 Name[ug]=كىچىك سۈرەت يانى
--- a/effects/trackmouse/trackmouse_config.desktop
+++ b/effects/trackmouse/trackmouse_config.desktop
@ -74,7 +74,6 @@ Name[sr@latin]=Praćenje miša
 Name[sv]=Följ musen
 Name[ta]=எலியத்தை கவனி
 Name[te]=ట్రాక్ మౌస్
-Name[tg]=Отслеживание мыши
 Name[th]=ติดตามเมาส์
 Name[tr]=Fareyi İzle
 Name[ug]=چاشقىنەكنى ئىزلا
--- a/effects/translucency/package/metadata.desktop
+++ b/effects/translucency/package/metadata.desktop
@ -69,7 +69,6 @@ Name[sr@latin]=Prozirnost
 Name[sv]=Genomlysning
 Name[ta]=ஒளிகசிவு
 Name[te]=ట్రాన్‍స్‌లుసెన్సీ
-Name[tg]=Полупрозрачность
 Name[th]=ความโปร่งแสง
 Name[tr]=Şeffaflık
 Name[ug]=يېرىم سۈزۈكلۈك
--- a/effects/wobblywindows/wobblywindows_config.desktop
+++ b/effects/wobblywindows/wobblywindows_config.desktop
@ -69,7 +69,6 @@ Name[sr@latin]=Lelujavi prozori
 Name[sv]=Ostadiga fönster
 Name[ta]=அசைவுடைய சாளரம்
 Name[te]=వూబ్లీ విండోస్
-Name[tg]=Тирезаҳои Wobbly
 Name[th]=หน้าต่างพริ้วไหว
 Name[tr]=Sallanan Pencereler
 Name[ug]=تەۋرەنگەن كۆزنەكلەر
--- a/effects/zoom/zoom_config.desktop
+++ b/effects/zoom/zoom_config.desktop
@ -78,7 +78,6 @@ Name[sr@latin]=Uveličanje
 Name[sv]=Zoom
 Name[ta]=Zoom
 Name[te]=జూమ్
-Name[tg]=Калонкунӣ
 Name[th]=ดูย่อ/ดูขยาย
 Name[tr]=Büyüt
 Name[ug]=كېڭەيت-تارايت
--- a/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop
+++ b/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop
@ -65,7 +65,6 @@ Name[sr@ijekavian]=Виртуелне површи
 Name[sr@ijekavianlatin]=Virtuelne površi
 Name[sr@latin]=Virtuelne površi
 Name[sv]=Virtuella skrivbord
-Name[tg]=Мизҳои кории виртуалӣ
 Name[th]=พื้นที่ทำงานเสมือน
 Name[tr]=Sanal Masaüstleri
 Name[ug]=مەۋھۇم ئۈستەلئۈستى
--- a/kcmkwin/kwindesktop/package/metadata.desktop
+++ b/kcmkwin/kwindesktop/package/metadata.desktop
@ -52,7 +52,6 @@ Name[sr@ijekavian]=Виртуелне површи
 Name[sr@ijekavianlatin]=Virtuelne površi
 Name[sr@latin]=Virtuelne površi
 Name[sv]=Virtuella skrivbord
-Name[tg]=Мизҳои кории виртуалӣ
 Name[th]=พื้นที่ทำงานเสมือน
 Name[tr]=Sanal Masaüstleri
 Name[ug]=مەۋھۇم ئۈستەلئۈستى
--- a/kcmkwin/kwineffects/kcm_kwin_effects.desktop
+++ b/kcmkwin/kwineffects/kcm_kwin_effects.desktop
@ -55,12 +55,19 @@ Name[sr@ijekavian]=Ефекти површи
 Name[sr@ijekavianlatin]=Efekti površi
 Name[sr@latin]=Efekti površi
 Name[sv]=Skrivbordseffekter
+Name[tg]=Таъсирҳои мизи корӣ
 Name[tr]=Masaüstü Efektleri
 Name[uk]=Ефекти стільниці
 Name[x-test]=xxDesktop Effectsxx
 Name[zh_CN]=桌面特效
 Name[zh_TW]=桌面效果
 Comment=Configure compositor settings for desktop effects
+Comment[ca]=Configura l'arranjament del compositor per als efectes de l'escriptori
+Comment[nl]=Instellingen van compositor configureren voor bureaubladeffecten
+Comment[pt]=Configuração do compositor para os efeitos do ecrã
+Comment[sv]=Anpassa sammansättningsinställningar för skrivbordseffekter
+Comment[uk]=Налаштовування параметрів засобу композиції для ефектів стільниці
+Comment[x-test]=xxConfigure compositor settings for desktop effectsxx

 X-KDE-Keywords=kwin,window,manager,effect,3D effects,2D effects,graphical effects,desktop effects,animations,various animations,window management effects,window switching effect,desktop switching effect,animations,desktop animations,drivers,driver settings,rendering,render,invert effect,looking glass effect,magnifier effect,snap helper effect,track mouse effect,zoom effect,blur effect,fade effect,fade desktop effect,fall apart effect,glide effect,highlight window effect,login effect,logout effect,magic lamp effect,minimize animation effect,mouse mark effect,scale effect,screenshot effect,sheet effect,slide effect,sliding popups effect,thumbnail aside effect,translucency,translucency effect,transparency,window geometry effect,wobbly windows effect,startup feedback effect,dialog parent effect,dim inactive effect,dim screen effect,slide back effect,eye candy,candy,show FPS effect,show paint effect,cover switch effect,desktop cube effect,desktop cube animation effect,desktop grid effect,flip switch effect,present windows effect,resize window effect,background contrast effect
 X-KDE-Keywords[ca]=kwin,finestra,gestor,efecte,efectes 3D,efectes 2D,efectes gràfics,efectes d'escriptori,animacions,animacions diverses,efectes en la gestió de les finestres,efecte en el canvi de finestra,efecte en el canvi d'escriptori,animacions,animacions a l'escriptori,controladors,configuració dels controladors,renderització,render,efecte d'inversió,efecte d'aspecte de vidre,efecte de lupa,efecte ajudant del desplaçament,efecte de seguiment del ratolí,efecte de zoom,efecte de difuminat,efecte d'esvaïment,efecte d'esvaïment de l'escriptori,efecte de trencament,efecte de lliscament,efecte de ressaltat de la finestra,efecte en l'inici de la sessió,efecte en sortir de la sessió,efecte de làmpada màgica,efecte d'animació de la minimització,efecte de marca del ratolí,efecte d'apropament,efecte de captura de la pantalla,efecte de full,efecte de diapositiva,efecte de missatges emergents lliscants,efecte de miniatures laterals,translucidesa,efecte de translucidesa,transparència,efecte de geometria de la finestra,efecte de finestres sacsejades,efecte de confirmació d'engegada,efecte de diàleg principal,efecte d'enfosquiment en estar inactiu,efecte d'enfosquiment de la pantalla,efecte de diapositiva prèvia,decoració,efecte per a mostrar els FPS,efecte de mostrar el pintat,efecte de canvi de coberta,efecte de cub de l'escriptori,efecte d'animació del cub de l'escriptori,efecte de quadrícula de l'escriptori,efecte de canvi en roda,efecte de presentació de les finestres,efecte de redimensionat de la finestra,efecte de contrast del fons
--- a/kcmkwin/kwineffects/package/metadata.desktop
+++ b/kcmkwin/kwineffects/package/metadata.desktop
@ -40,6 +40,7 @@ Name[sr@ijekavian]=Ефекти површи
 Name[sr@ijekavianlatin]=Efekti površi
 Name[sr@latin]=Efekti površi
 Name[sv]=Skrivbordseffekter
+Name[tg]=Таъсирҳои мизи корӣ
 Name[tr]=Masaüstü Efektleri
 Name[uk]=Ефекти стільниці
 Name[x-test]=xxDesktop Effectsxx
@ -86,6 +87,7 @@ Comment[sr@ijekavian]=Ефекти површи
 Comment[sr@ijekavianlatin]=Efekti površi
 Comment[sr@latin]=Efekti površi
 Comment[sv]=Skrivbordseffekter
+Comment[tg]=Таъсирҳои мизи корӣ
 Comment[tr]=Masaüstü Efektleri
 Comment[uk]=Ефекти стільниці
 Comment[x-test]=xxDesktop Effectsxx
--- a/kcmkwin/kwinoptions/kwinoptions.desktop
+++ b/kcmkwin/kwinoptions/kwinoptions.desktop
@ -86,7 +86,6 @@ Name[sr@latin]=Ponašanje prozora
 Name[sv]=Fönsterbeteende
 Name[ta]=சாளர நடத்தை
 Name[te]=విండో ప్రవర్తన
-Name[tg]=Холати тиреза
 Name[th]=พฤติกรรมของหน้าต่าง
 Name[tr]=Pencere Davranışı
 Name[ug]=كۆزنەكنىڭ ئىش-ھەرىكەتلىرى
--- a/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
+++ b/kcmkwin/kwinscreenedges/kwinscreenedges.desktop
@ -70,7 +70,6 @@ Name[sr@ijekavian]=Ивице екрана
 Name[sr@ijekavianlatin]=Ivice ekrana
 Name[sr@latin]=Ivice ekrana
 Name[sv]=Skärmkanter
-Name[tg]=Пардаи экран
 Name[th]=ขอบจอ
 Name[tr]=Ekran Kenarları
 Name[ug]=ئېكران گىرۋەكلىرى
--- a/kwin.notifyrc
+++ b/kwin.notifyrc
@ -53,7 +53,6 @@ Comment[sr@ijekavian]=Менаџер прозора К‑вин
 Comment[sr@ijekavianlatin]=Menadžer prozora KWin
 Comment[sr@latin]=Menadžer prozora KWin
 Comment[sv]=Kwin fönsterhanterare
-Comment[tg]=Мудири тирезаҳои KWin
 Comment[th]=ตัวจัดการหน้าต่าง KWin
 Comment[tr]=KWin Pencere Yöneticisi
 Comment[ug]=KWin كۆزنەك باشقۇرغۇچ
--- a/plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop
+++ b/plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop
@ -75,7 +75,6 @@ Name[sr@latin]=Plastika
 Name[sv]=Plastik
 Name[ta]=திட்டம்
 Name[te]=ప్లాస్టిక్
-Name[tg]=Пластик
 Name[th]=รูปแบบพลาสติก
 Name[tr]=Plastik
 Name[ug]=پىلاستىك