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"
2022-07-20 01:44:06 +00:00 · 2022-07-20 01:44:06 +00:00 · ff9bfc2e3b
commit ff9bfc2e3b
parent dd9b4aa37a
28 changed files with 28 additions and 2 deletions
--- a/src/effects/fade/package/metadata.desktop
+++ b/src/effects/fade/package/metadata.desktop
@ -35,6 +35,7 @@ Name[id]=Fade
 Name[is]=Þynna út
 Name[it]=Dissolvi
 Name[ja]=フェード
+Name[ka]=მინავლება
 Name[kk]=Біртіндеп
 Name[km]=លេចបន្តិចម្ដងៗ
 Name[kn]=ಮಾಸು/ಮಸುಕುಗೊಳಿಸು
--- a/src/effects/fullscreen/package/metadata.desktop
+++ b/src/effects/fullscreen/package/metadata.desktop
@ -56,6 +56,7 @@ Name[hu]=Teljes képernyő
 Name[ia]=Schermo plen
 Name[id]=Full Screen
 Name[it]=Schermo intero
+Name[ka]=სრულეკრანიანი რეჟიმი
 Name[ko]=전체 화면
 Name[lt]=Visas ekranas
 Name[nl]=Volledig scherm
--- a/src/effects/login/package/metadata.desktop
+++ b/src/effects/login/package/metadata.desktop
@ -39,6 +39,7 @@ Name[id]=Login
 Name[is]=Innskráning
 Name[it]=Accesso
 Name[ja]=ログイン
+Name[ka]=შესვლა
 Name[kk]=Кіру
 Name[km]=ចូល
 Name[kn]=ಪ್ರವೇಶಿಸು (ಲಾಗಿನ್)
--- a/src/effects/logout/package/metadata.desktop
+++ b/src/effects/logout/package/metadata.desktop
@ -21,6 +21,7 @@ Name[hu]=Kijelentkezés
 Name[ia]=Clausura de session
 Name[id]=Logout
 Name[it]=Uscita
+Name[ka]=გასვლა
 Name[ko]=로그아웃
 Name[lt]=Atsijungimas
 Name[nl]=Afmelden
--- a/src/effects/maximize/package/metadata.desktop
+++ b/src/effects/maximize/package/metadata.desktop
@ -77,6 +77,7 @@ Name[id]=Maximize
 Name[is]=Hámarka
 Name[it]=Massimizzazione
 Name[ja]=最大化
+Name[ka]=გადიდება
 Name[kk]=Кең жаю
 Name[ko]=최대화
 Name[lt]=Išskleisti
--- a/src/effects/scale/package/metadata.desktop
+++ b/src/effects/scale/package/metadata.desktop
@ -20,6 +20,7 @@ Name[hu]=Nagyítás
 Name[ia]=Scala
 Name[id]=Scale
 Name[it]=Scala
+Name[ka]=მასშტაბირება
 Name[ko]=크기 조정
 Name[lt]=Mastelio keitimas
 Name[nl]=Schalen
--- a/src/effects/sessionquit/package/metadata.desktop
+++ b/src/effects/sessionquit/package/metadata.desktop
@ -19,6 +19,7 @@ Name[hu]=Kilépés a munkamenetből
 Name[ia]=Abandona session
 Name[id]=Sesi Berhenti
 Name[it]=Chiusura sessione
+Name[ka]=სესიიდან გასვლა
 Name[ko]=세션 종료
 Name[lt]=Seanso baigimas
 Name[nl]=Afsluiten van sessie
--- a/src/effects/translucency/package/metadata.desktop
+++ b/src/effects/translucency/package/metadata.desktop
@ -37,7 +37,7 @@ Name[id]=Translucency
 Name[is]=Hálfgegnsæi
 Name[it]=Translucenza
 Name[ja]=半透明
-Name[ka]=ნახევრადგამჭირვალეობა
+Name[ka]=გამჭვირვალობა
 Name[kk]=Мөлдірлік
 Name[km]=ភាពល្អក់
 Name[kn]=ಪಾರದೀಪಕತೆ (ಟ್ರಾನ್ಸಲುಸೆಂಸಿ)
--- a/src/kcmkwin/kwincompositing/kwincompositing.desktop
+++ b/src/kcmkwin/kwincompositing/kwincompositing.desktop
@ -28,6 +28,7 @@ Name[ia]=Compositor
 Name[id]=Kompositor
 Name[it]=Compositore
 Name[ja]=コンポジタ
+Name[ka]=კომპოზიტორი
 Name[ko]=컴포지터
 Name[lt]=Kompozitorius
 Name[nb]=Sammensetter
--- a/src/kcmkwin/kwindecoration/kcm_kwindecoration.desktop
+++ b/src/kcmkwin/kwindecoration/kcm_kwindecoration.desktop
@ -32,6 +32,7 @@ Name[id]=Dekorasi Window
 Name[is]=Gluggaskreytingar
 Name[it]=Decorazioni delle finestre
 Name[ja]=ウィンドウの飾り
+Name[ka]=ფანჯრის დეკორაციები
 Name[kk]=Терезенің безендірулері
 Name[km]=ការតុបតែងបង្អួច
 Name[kn]=ವಿಂಡೋ ಅಲಂಕಾರಗಳು
--- a/src/kcmkwin/kwindecoration/package/metadata.desktop
+++ b/src/kcmkwin/kwindecoration/package/metadata.desktop
@ -42,6 +42,7 @@ Name[id]=Dekorasi Window
 Name[is]=Gluggaskreytingar
 Name[it]=Decorazioni delle finestre
 Name[ja]=ウィンドウの飾り
+Name[ka]=ფანჯრის დეკორაციები
 Name[kk]=Терезенің безендірулері
 Name[km]=ការតុបតែងបង្អួច
 Name[kn]=ವಿಂಡೋ ಅಲಂಕಾರಗಳು
--- a/src/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop
+++ b/src/kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop
@ -34,6 +34,7 @@ Name[id]=Desktop Virtual
 Name[is]=Sýndarskjáborð
 Name[it]=Desktop virtuali
 Name[ja]=仮想デスクトップ
+Name[ka]=ვირტუალური სამუშაო მაგიდები
 Name[kk]=Виртуалды Үстелдер
 Name[km]=ផ្ទៃតុនិម្មិត
 Name[kn]=ವಾಸ್ತವಪ್ರಾಯ ಗಣಕತೆರೆಗಳು
--- a/src/kcmkwin/kwindesktop/package/metadata.desktop
+++ b/src/kcmkwin/kwindesktop/package/metadata.desktop
@ -29,6 +29,7 @@ Name[id]=Desktop Virtual
 Name[is]=Sýndarskjáborð
 Name[it]=Desktop virtuali
 Name[ja]=仮想デスクトップ
+Name[ka]=ვირტუალური სამუშაო მაგიდები
 Name[kk]=Виртуалды Үстелдер
 Name[km]=ផ្ទៃតុនិម្មិត
 Name[kn]=ವಾಸ್ತವಪ್ರಾಯ ಗಣಕತೆರೆಗಳು
--- a/src/kcmkwin/kwineffects/kcm_kwin_effects.desktop
+++ b/src/kcmkwin/kwineffects/kcm_kwin_effects.desktop
@ -28,6 +28,7 @@ Name[ia]=Effectos de scriptorio
 Name[id]=Efek Desktop
 Name[it]=Effetti del desktop
 Name[ja]=デスクトップ効果
+Name[ka]=სამუშაო მაგიდის ეფექტები
 Name[ko]=데스크톱 효과
 Name[lt]=Darbalaukio efektai
 Name[nb]=Skrivebordseffekter
--- a/src/kcmkwin/kwineffects/kwineffect.knsrc
+++ b/src/kcmkwin/kwineffects/kwineffect.knsrc
@ -21,6 +21,7 @@ Name[hu]=Ablakkezelő-effektusok
 Name[ia]=Gerente de effectos de fenestra
 Name[id]=Efek Pengelola Window
 Name[it]=Effetti del gestore delle finestre
+Name[ka]=ფანჯრების მმართველის ეფექტები
 Name[ko]=창 관리자 효과
 Name[lt]=Langų tvarkytuvės efektai
 Name[nl]=Effecten van vensterbeheerder
--- a/src/kcmkwin/kwineffects/package/metadata.desktop
+++ b/src/kcmkwin/kwineffects/package/metadata.desktop
@ -23,6 +23,7 @@ Name[ia]=Effectos de scriptorio
 Name[id]=Efek Desktop
 Name[it]=Effetti del desktop
 Name[ja]=デスクトップ効果
+Name[ka]=სამუშაო მაგიდის ეფექტები
 Name[ko]=데스크톱 효과
 Name[lt]=Darbalaukio efektai
 Name[nb]=Skrivebordseffekter
@ -76,6 +77,7 @@ Comment[ia]=Effectos de scriptorio
 Comment[id]=Efek Desktop
 Comment[it]=Effetti del desktop
 Comment[ja]=デスクトップ効果
+Comment[ka]=სამუშაო მაგიდის ეფექტები
 Comment[ko]=데스크톱 효과
 Comment[lt]=Darbalaukio efektai
 Comment[nb]=Skrivebordseffekter
--- a/src/kcmkwin/kwinrules/kcm_kwinrules.desktop
+++ b/src/kcmkwin/kwinrules/kcm_kwinrules.desktop
@ -33,6 +33,7 @@ Name[id]=Peraturan Window
 Name[is]=Gluggahegðunarreglur
 Name[it]=Regole delle finestre
 Name[ja]=ウィンドウルール
+Name[ka]=ფანჯრების წესები
 Name[kk]=Терезе тәртібі
 Name[km]=ក្បួនបង្អួច
 Name[kn]=ವಿಂಡೋ ನಿಯಮಗಳು
--- a/src/kcmkwin/kwinrules/org.kde.kwin_rules_dialog.desktop
+++ b/src/kcmkwin/kwinrules/org.kde.kwin_rules_dialog.desktop
@ -29,6 +29,7 @@ Name[id]=Peraturan Window
 Name[is]=Gluggahegðunarreglur
 Name[it]=Regole delle finestre
 Name[ja]=ウィンドウルール
+Name[ka]=ფანჯრების წესები
 Name[kk]=Терезе тәртібі
 Name[km]=ក្បួនបង្អួច
 Name[kn]=ವಿಂಡೋ ನಿಯಮಗಳು
--- a/src/kcmkwin/kwinrules/package/metadata.desktop
+++ b/src/kcmkwin/kwinrules/package/metadata.desktop
@ -43,6 +43,7 @@ Name[id]=Peraturan Window
 Name[is]=Gluggahegðunarreglur
 Name[it]=Regole delle finestre
 Name[ja]=ウィンドウルール
+Name[ka]=ფანჯრების წესები
 Name[kk]=Терезе тәртібі
 Name[km]=ក្បួនបង្អួច
 Name[kn]=ವಿಂಡೋ ನಿಯಮಗಳು
--- a/src/kcmkwin/kwinscreenedges/kcm_kwinscreenedges.desktop
+++ b/src/kcmkwin/kwinscreenedges/kcm_kwinscreenedges.desktop
@ -36,6 +36,7 @@ Name[id]=Tepian Layar
 Name[is]=Skjájaðrar
 Name[it]=Lati dello schermo
 Name[ja]=スクリーンエッジ
+Name[ka]=ეკრანის კიდეები
 Name[kk]=Экран жиектері
 Name[km]=គែមអេក្រង់
 Name[kn]=ತೆರೆ ಅಂಚುಗಳು
--- a/src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.desktop
+++ b/src/kcmkwin/kwinscreenedges/kcm_kwintouchscreen.desktop
@ -28,6 +28,7 @@ Name[hu]=Érintőképernyő
 Name[ia]=Schermo a tacto
 Name[id]=Layar Sentuh
 Name[it]=Schermo a sfioramento
+Name[ka]=სენსორული ეკრანი
 Name[ko]=터치 스크린
 Name[lt]=Jutiklinis ekranas
 Name[nl]=Aanraakscherm
--- a/src/kcmkwin/kwinscripts/kcm_kwin_scripts.desktop
+++ b/src/kcmkwin/kwinscripts/kcm_kwin_scripts.desktop
@ -29,6 +29,7 @@ Name[ia]=Scripts de KWin
 Name[id]=Skrip KWin
 Name[it]=Script kwin
 Name[ja]=KWin Scripts
+Name[ka]=KWin-ის სკრიპტები
 Name[kk]=KWin скрипттері
 Name[km]=ស្គ្រីប KWin
 Name[ko]=KWin 스크립트
--- a/src/kcmkwin/kwinscripts/kwinscripts.knsrc
+++ b/src/kcmkwin/kwinscripts/kwinscripts.knsrc
@ -20,6 +20,7 @@ Name[hu]=Ablakkezelő szkriptek
 Name[ia]=Gerente de scripts de fenestra 
 Name[id]=Skrip Pengelola Window
 Name[it]=Script del gestore delle finestre
+Name[ka]=ფანჯრების მმართველის სკრიპტები
 Name[ko]=창 관리자 스크립트
 Name[lt]=Langų tvarkytuvės scenarijai
 Name[nl]=Scripts van vensterbeheerder
--- a/src/kcmkwin/kwintabbox/kcm_kwintabbox.desktop
+++ b/src/kcmkwin/kwintabbox/kcm_kwintabbox.desktop
@ -37,6 +37,7 @@ Name[id]=Pengalih Tugas
 Name[is]=Verkefnaskiptir
 Name[it]=Selettore delle finestre
 Name[ja]=タスクスイッチャー
+Name[ka]=ამოცანების გადამრთველი
 Name[kk]=Тапсырма ауыстырғышы
 Name[km]=កម្មវិធីប្ដូរភារកិច្ច
 Name[kn]=ಕಾರ್ಯ ಬದಲಾವಣೆಗಾರ
--- a/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop
+++ b/src/kcmkwin/kwinvirtualkeyboard/kcm_virtualkeyboard.desktop
@ -25,6 +25,7 @@ Name[hu]=Virtuális billentyűzet
 Name[ia]=Claviero virtual
 Name[id]=Keyboard Virtual
 Name[it]=Tastiera virtuale
+Name[ka]=ვირტუალური კლავიატურა
 Name[ko]=가상 키보드
 Name[lt]=Virtuali klaviatūra
 Name[nl]=Virtueel toetsenbord
--- a/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop
+++ b/src/kcmkwin/kwinvirtualkeyboard/package/metadata.desktop
@ -20,6 +20,7 @@ Name[hu]=Virtuális billentyűzet
 Name[ia]=Claviero virtual
 Name[id]=Keyboard Virtual
 Name[it]=Tastiera virtuale
+Name[ka]=ვირტუალური კლავიატურა
 Name[ko]=가상 키보드
 Name[lt]=Virtuali klaviatūra
 Name[nl]=Virtueel toetsenbord
--- a/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop
+++ b/src/plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop
@ -41,7 +41,6 @@ Name[id]=Plastik
 Name[is]=Plastik
 Name[it]=Plastica
 Name[ja]=Plastik
-Name[ka]=Пластик
 Name[kk]=Пластик
 Name[km]=ប្ល៉ាស្ទិក
 Name[kn]=ಪ್ಲಾಸ್ಟಿಕ್
--- a/src/plugins/krunner-integration/kwin-runner-windows.desktop
+++ b/src/plugins/krunner-integration/kwin-runner-windows.desktop
@ -18,6 +18,7 @@ Name[hu]=Ablakok
 Name[ia]=Fenestras
 Name[id]=Windows
 Name[it]=Finestre
+Name[ka]=ფანჯრები
 Name[ko]=창
 Name[lt]=Langai
 Name[nl]=Vensters