From 7ba564fdebfc064e7db5f73c03a88033cb35ab4d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 16 Aug 2022 01:49:16 +0000 Subject: [PATCH] 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" --- bin/plasma-mobile-dev.desktop.cmake | 1 + containments/homescreens/default/package/metadata.json | 1 + containments/homescreens/halcyon/package/metadata.json | 2 ++ containments/panel/package/metadata.json | 1 + containments/taskpanel/package/metadata.json | 1 + kcms/mobileshell/kcm_mobileshell.json | 2 ++ quicksettings/airplanemode/metadata.json | 1 + quicksettings/audio/metadata.json | 1 + quicksettings/battery/metadata.json | 1 + quicksettings/bluetooth/metadata.json | 3 ++- quicksettings/caffeine/metadata.json | 1 + quicksettings/flashlight/package/metadata.json | 1 + quicksettings/keyboardtoggle/metadata.json | 1 + quicksettings/location/metadata.json | 1 + quicksettings/mobiledata/metadata.json | 1 + quicksettings/nightcolor/package/metadata.json | 1 + quicksettings/powermenu/package/metadata.json | 1 + quicksettings/record/metadata.json | 1 + quicksettings/screenrotation/package/metadata.json | 1 + quicksettings/screenshot/package/metadata.json | 1 + quicksettings/settingsapp/metadata.json | 3 ++- quicksettings/wifi/metadata.json | 1 + shell/metadata.json | 2 ++ 23 files changed, 28 insertions(+), 2 deletions(-) diff --git a/bin/plasma-mobile-dev.desktop.cmake b/bin/plasma-mobile-dev.desktop.cmake index cbf7600d..983b277c 100644 --- a/bin/plasma-mobile-dev.desktop.cmake +++ b/bin/plasma-mobile-dev.desktop.cmake @@ -15,6 +15,7 @@ Name[fi]=Plasma Mobile (kehitys) Name[fr]=Plasma Mobile (Développement) Name[ia]=Plasma Mobile (Disveloppamento) Name[it]=Plasma Mobile (sviluppo) +Name[ka]=Plasma Mobile (ბეტა) Name[ko]=Plasma 모바일(개발) Name[nl]=Plasma-mobiel (ontwikkeling) Name[pl]=Przenośna Plazma (Rozwój) diff --git a/containments/homescreens/default/package/metadata.json b/containments/homescreens/default/package/metadata.json index aceaf12c..634559d1 100644 --- a/containments/homescreens/default/package/metadata.json +++ b/containments/homescreens/default/package/metadata.json @@ -14,6 +14,7 @@ "Name[fi]": "Marco Martin", "Name[fr]": "Marco Martin", "Name[it]": "Marco Martin", + "Name[ka]": "Marco Martin", "Name[nl]": "Marco Martin", "Name[pl]": "Marco Martin", "Name[pt]": "Marco Martin", diff --git a/containments/homescreens/halcyon/package/metadata.json b/containments/homescreens/halcyon/package/metadata.json index 98539b3e..6ddd836d 100644 --- a/containments/homescreens/halcyon/package/metadata.json +++ b/containments/homescreens/halcyon/package/metadata.json @@ -33,6 +33,7 @@ "Name[fi]": "Devin Lin", "Name[fr]": "Devin Lin", "Name[it]": "Devin Lin", + "Name[ka]": "Devin Lin", "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", @@ -58,6 +59,7 @@ "Name[fr]": "Halcyon", "Name[ia]": "Halcyon", "Name[it]": "Halcyon", + "Name[ka]": "ჰალკიონი", "Name[ko]": "Halcyon", "Name[nl]": "Halcyon", "Name[pa]": "ਹਲਕਿਆਨ", diff --git a/containments/panel/package/metadata.json b/containments/panel/package/metadata.json index 945d84e4..84417e85 100644 --- a/containments/panel/package/metadata.json +++ b/containments/panel/package/metadata.json @@ -14,6 +14,7 @@ "Name[fi]": "Marco Martin", "Name[fr]": "Marco Martin", "Name[it]": "Marco Martin", + "Name[ka]": "Marco Martin", "Name[nl]": "Marco Martin", "Name[pl]": "Marco Martin", "Name[pt]": "Marco Martin", diff --git a/containments/taskpanel/package/metadata.json b/containments/taskpanel/package/metadata.json index ec481043..1c4104e8 100644 --- a/containments/taskpanel/package/metadata.json +++ b/containments/taskpanel/package/metadata.json @@ -14,6 +14,7 @@ "Name[fi]": "Marco Martin", "Name[fr]": "Marco Martin", "Name[it]": "Marco Martin", + "Name[ka]": "Marco Martin", "Name[nl]": "Marco Martin", "Name[pl]": "Marco Martin", "Name[pt]": "Marco Martin", diff --git a/kcms/mobileshell/kcm_mobileshell.json b/kcms/mobileshell/kcm_mobileshell.json index cebf4564..a8cb9b6a 100644 --- a/kcms/mobileshell/kcm_mobileshell.json +++ b/kcms/mobileshell/kcm_mobileshell.json @@ -14,6 +14,7 @@ "Name[fi]": "Devin Lin", "Name[fr]": "Devin Lin", "Name[it]": "Devin Lin", + "Name[ka]": "Devin Lin", "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", @@ -36,6 +37,7 @@ "Description[fi]": "Aseta järjestelmän komentotulkki", "Description[fr]": "Configurer le shell du système", "Description[it]": "Configura la shell di sistema", + "Description[ka]": "სისტემური გარსის მორგება", "Description[nl]": "De systeem-shell configureren", "Description[pl]": "Ustawienia powłoki systemowej", "Description[pt]": "Configurar a consola do sistema", diff --git a/quicksettings/airplanemode/metadata.json b/quicksettings/airplanemode/metadata.json index 8149c3a7..83a8463e 100644 --- a/quicksettings/airplanemode/metadata.json +++ b/quicksettings/airplanemode/metadata.json @@ -38,6 +38,7 @@ "Name[fi]": "Bhushan Shah", "Name[fr]": "Bhushan Shah", "Name[it]": "Bhushan Shah", + "Name[ka]": "Bhushan Shah", "Name[nl]": "Bhushan Shah", "Name[pl]": "Bhushan Shah", "Name[pt]": "Bhushan Shah", diff --git a/quicksettings/audio/metadata.json b/quicksettings/audio/metadata.json index 33325542..4eadea25 100644 --- a/quicksettings/audio/metadata.json +++ b/quicksettings/audio/metadata.json @@ -38,6 +38,7 @@ "Name[fi]": "Devin Lin", "Name[fr]": "Devin Lin", "Name[it]": "Devin Lin", + "Name[ka]": "Devin Lin", "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", diff --git a/quicksettings/battery/metadata.json b/quicksettings/battery/metadata.json index 72576463..c6d409ec 100644 --- a/quicksettings/battery/metadata.json +++ b/quicksettings/battery/metadata.json @@ -38,6 +38,7 @@ "Name[fi]": "Devin Lin", "Name[fr]": "Devin Lin", "Name[it]": "Devin Lin", + "Name[ka]": "Devin Lin", "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", diff --git a/quicksettings/bluetooth/metadata.json b/quicksettings/bluetooth/metadata.json index 2d5a86e3..73b85bce 100644 --- a/quicksettings/bluetooth/metadata.json +++ b/quicksettings/bluetooth/metadata.json @@ -39,6 +39,7 @@ "Name[fi]": "Devin Lin", "Name[fr]": "Devin Lin", "Name[it]": "Devin Lin", + "Name[ka]": "Devin Lin", "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", @@ -66,7 +67,7 @@ "Name[fr]": "Bluetooth", "Name[ia]": "Bluetooth", "Name[it]": "Bluetooth", - "Name[ka]": "Bluetooth", + "Name[ka]": "ლურჯკბილა", "Name[ko]": "블루투스", "Name[nl]": "Bluetooth", "Name[pa]": "ਬਲੂਟੁੱਥ", diff --git a/quicksettings/caffeine/metadata.json b/quicksettings/caffeine/metadata.json index d38e5c2c..c6f7a442 100644 --- a/quicksettings/caffeine/metadata.json +++ b/quicksettings/caffeine/metadata.json @@ -14,6 +14,7 @@ "Name[fi]": "Devin Lin", "Name[fr]": "Devin Lin", "Name[it]": "Devin Lin", + "Name[ka]": "Devin Lin", "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", diff --git a/quicksettings/flashlight/package/metadata.json b/quicksettings/flashlight/package/metadata.json index b3936cd0..b6d3f866 100644 --- a/quicksettings/flashlight/package/metadata.json +++ b/quicksettings/flashlight/package/metadata.json @@ -38,6 +38,7 @@ "Name[fi]": "Devin Lin", "Name[fr]": "Devin Lin", "Name[it]": "Devin Lin", + "Name[ka]": "Devin Lin", "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", diff --git a/quicksettings/keyboardtoggle/metadata.json b/quicksettings/keyboardtoggle/metadata.json index 7f23fd36..234e33c5 100644 --- a/quicksettings/keyboardtoggle/metadata.json +++ b/quicksettings/keyboardtoggle/metadata.json @@ -14,6 +14,7 @@ "Name[fi]": "Devin Lin", "Name[fr]": "Devin Lin", "Name[it]": "Devin Lin", + "Name[ka]": "Devin Lin", "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", diff --git a/quicksettings/location/metadata.json b/quicksettings/location/metadata.json index 069a7d56..c7a31104 100644 --- a/quicksettings/location/metadata.json +++ b/quicksettings/location/metadata.json @@ -38,6 +38,7 @@ "Name[fi]": "Devin Lin", "Name[fr]": "Devin Lin", "Name[it]": "Devin Lin", + "Name[ka]": "Devin Lin", "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", diff --git a/quicksettings/mobiledata/metadata.json b/quicksettings/mobiledata/metadata.json index 7d3835ed..919379f3 100644 --- a/quicksettings/mobiledata/metadata.json +++ b/quicksettings/mobiledata/metadata.json @@ -38,6 +38,7 @@ "Name[fi]": "Devin Lin", "Name[fr]": "Devin Lin", "Name[it]": "Devin Lin", + "Name[ka]": "Devin Lin", "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", diff --git a/quicksettings/nightcolor/package/metadata.json b/quicksettings/nightcolor/package/metadata.json index 2a0f2d1d..c3434bdb 100644 --- a/quicksettings/nightcolor/package/metadata.json +++ b/quicksettings/nightcolor/package/metadata.json @@ -14,6 +14,7 @@ "Name[fi]": "Aleix Pol", "Name[fr]": "Aleix Pol", "Name[it]": "Aleix Pol", + "Name[ka]": "ალის პოლი", "Name[nl]": "Aleix Pol", "Name[pl]": "Aleix Pol", "Name[pt]": "Aleix Pol", diff --git a/quicksettings/powermenu/package/metadata.json b/quicksettings/powermenu/package/metadata.json index 4ca6e2c9..ed7761bd 100644 --- a/quicksettings/powermenu/package/metadata.json +++ b/quicksettings/powermenu/package/metadata.json @@ -14,6 +14,7 @@ "Name[fi]": "Devin Lin", "Name[fr]": "Devin Lin", "Name[it]": "Devin Lin", + "Name[ka]": "Devin Lin", "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", diff --git a/quicksettings/record/metadata.json b/quicksettings/record/metadata.json index f97af95a..4f7438a8 100644 --- a/quicksettings/record/metadata.json +++ b/quicksettings/record/metadata.json @@ -14,6 +14,7 @@ "Name[fi]": "Aleix Pol i Gonzalez", "Name[fr]": "Aleix Pol i Gonzalez", "Name[it]": "Aleix Pol i Gonzalez", + "Name[ka]": "Aleix Pol i Gonzalez", "Name[nl]": "Aleix Pol i Gonzalez", "Name[pl]": "Aleix Pol i Gonzalez", "Name[pt]": "Aleix Pol i Gonzalez", diff --git a/quicksettings/screenrotation/package/metadata.json b/quicksettings/screenrotation/package/metadata.json index 79670764..296b87c3 100644 --- a/quicksettings/screenrotation/package/metadata.json +++ b/quicksettings/screenrotation/package/metadata.json @@ -38,6 +38,7 @@ "Name[fi]": "Devin Lin", "Name[fr]": "Devin Lin", "Name[it]": "Devin Lin", + "Name[ka]": "Devin Lin", "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", diff --git a/quicksettings/screenshot/package/metadata.json b/quicksettings/screenshot/package/metadata.json index c6b7c0cf..131f9fd5 100644 --- a/quicksettings/screenshot/package/metadata.json +++ b/quicksettings/screenshot/package/metadata.json @@ -38,6 +38,7 @@ "Name[fi]": "Devin Lin", "Name[fr]": "Devin Lin", "Name[it]": "Devin Lin", + "Name[ka]": "Devin Lin", "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", diff --git a/quicksettings/settingsapp/metadata.json b/quicksettings/settingsapp/metadata.json index 1309995e..5bda9e76 100644 --- a/quicksettings/settingsapp/metadata.json +++ b/quicksettings/settingsapp/metadata.json @@ -39,6 +39,7 @@ "Name[fi]": "Devin Lin", "Name[fr]": "Devin Lin", "Name[it]": "Devin Lin", + "Name[ka]": "Devin Lin", "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", @@ -66,7 +67,7 @@ "Name[fr]": "Configuration", "Name[ia]": "Preferentias", "Name[it]": "Impostazioni", - "Name[ka]": "პარამეტრები", + "Name[ka]": "მორგება", "Name[ko]": "설정", "Name[nl]": "Instellingen", "Name[pa]": "ਸੈਟਿੰਗਾਂ", diff --git a/quicksettings/wifi/metadata.json b/quicksettings/wifi/metadata.json index a4428802..e45729bf 100644 --- a/quicksettings/wifi/metadata.json +++ b/quicksettings/wifi/metadata.json @@ -40,6 +40,7 @@ "Name[fi]": "Devin Lin", "Name[fr]": "Devin Lin", "Name[it]": "Devin Lin", + "Name[ka]": "Devin Lin", "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", diff --git a/shell/metadata.json b/shell/metadata.json index 2b6fd737..68195507 100644 --- a/shell/metadata.json +++ b/shell/metadata.json @@ -14,6 +14,7 @@ "Name[fi]": "Aaron Seigo", "Name[fr]": "Aaron Seigo", "Name[it]": "Aaron Seigo", + "Name[ka]": "Aaron Seigo", "Name[nl]": "Aaron Seigo", "Name[pl]": "Aaron Seigo", "Name[pt]": "Aaron Seigo", @@ -37,6 +38,7 @@ "Description[fi]": "Puhelinten Plasma-käyttöliittymä", "Description[fr]": "Shell Plasma pour téléphones", "Description[it]": "Shell di Plasma per telefoni", + "Description[ka]": "Plasma გარსი ტელეფონისთვის", "Description[nl]": "Plasma-shell voor telefoons", "Description[pl]": "Powłoka Plazmy dla telefonów", "Description[pt]": "Consola do Plasma para telemóveis",