From 636457828117b5e66628176706e831e9889646f5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 4 Aug 2022 01:46:56 +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 | 1 + 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 | 1 + 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 | 1 + quicksettings/wifi/metadata.json | 1 + shell/metadata.json | 2 ++ 23 files changed, 25 insertions(+) diff --git a/bin/plasma-mobile-dev.desktop.cmake b/bin/plasma-mobile-dev.desktop.cmake index 1177baa5..cbf7600d 100644 --- a/bin/plasma-mobile-dev.desktop.cmake +++ b/bin/plasma-mobile-dev.desktop.cmake @@ -21,6 +21,7 @@ Name[pl]=Przenośna Plazma (Rozwój) Name[pt]=Plasma Mobile (Desenvolvimento) Name[pt_BR]=Plasma Mobile (desenvolvimento) Name[sl]=Plasma Mobile (Razvoj) +Name[sv]=Plasma mobil (utvecklingsversion) Name[tr]=Plasma Mobile (Geliştirme) Name[uk]=Мобільна Плазма (версія у розробці) Name[x-test]=xxPlasma Mobile (Development)xx diff --git a/containments/homescreens/default/package/metadata.json b/containments/homescreens/default/package/metadata.json index 8fd0ccb9..32eb248e 100644 --- a/containments/homescreens/default/package/metadata.json +++ b/containments/homescreens/default/package/metadata.json @@ -17,6 +17,7 @@ "Name[pl]": "Marco Martin", "Name[pt]": "Marco Martin", "Name[sl]": "Marco Martin", + "Name[sv]": "Marco Martin", "Name[tr]": "Marco Martin", "Name[uk]": "Marco Martin", "Name[x-test]": "xxMarco Martinxx", diff --git a/containments/homescreens/halcyon/package/metadata.json b/containments/homescreens/halcyon/package/metadata.json index af1e731f..22b938c0 100644 --- a/containments/homescreens/halcyon/package/metadata.json +++ b/containments/homescreens/halcyon/package/metadata.json @@ -36,6 +36,7 @@ "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", "Name[sl]": "Devin Lin", + "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", "Name[uk]": "Devin Lin", "Name[x-test]": "xxDevin Linxx", diff --git a/containments/panel/package/metadata.json b/containments/panel/package/metadata.json index bb43d5fe..adc875c3 100644 --- a/containments/panel/package/metadata.json +++ b/containments/panel/package/metadata.json @@ -17,6 +17,7 @@ "Name[pl]": "Marco Martin", "Name[pt]": "Marco Martin", "Name[sl]": "Marco Martin", + "Name[sv]": "Marco Martin", "Name[tr]": "Marco Martin", "Name[uk]": "Marco Martin", "Name[x-test]": "xxMarco Martinxx", diff --git a/containments/taskpanel/package/metadata.json b/containments/taskpanel/package/metadata.json index 22adcef1..8bc7e373 100644 --- a/containments/taskpanel/package/metadata.json +++ b/containments/taskpanel/package/metadata.json @@ -17,6 +17,7 @@ "Name[pl]": "Marco Martin", "Name[pt]": "Marco Martin", "Name[sl]": "Marco Martin", + "Name[sv]": "Marco Martin", "Name[tr]": "Marco Martin", "Name[uk]": "Marco Martin", "Name[x-test]": "xxMarco Martinxx", diff --git a/kcms/mobileshell/kcm_mobileshell.json b/kcms/mobileshell/kcm_mobileshell.json index 3a6cad6e..5f74cfc0 100644 --- a/kcms/mobileshell/kcm_mobileshell.json +++ b/kcms/mobileshell/kcm_mobileshell.json @@ -17,6 +17,7 @@ "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", "Name[sl]": "Devin Lin", + "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", "Name[uk]": "Devin Lin", "Name[x-test]": "xxDevin Linxx", @@ -37,6 +38,7 @@ "Description[pl]": "Ustawienia powłoki systemowej", "Description[pt]": "Configurar a consola do sistema", "Description[sl]": "Konfiguriraj sistemski shell", + "Description[sv]": "Anpassa systemskalet", "Description[tr]": "Sistem kabuğunu yapılandır", "Description[uk]": "Налаштувати командну оболонку системи", "Description[x-test]": "xxConfigure the system shellxx", diff --git a/quicksettings/airplanemode/metadata.json b/quicksettings/airplanemode/metadata.json index db18547b..a2b6a4d8 100644 --- a/quicksettings/airplanemode/metadata.json +++ b/quicksettings/airplanemode/metadata.json @@ -41,6 +41,7 @@ "Name[pl]": "Bhushan Shah", "Name[pt]": "Bhushan Shah", "Name[sl]": "Bhushan Shah", + "Name[sv]": "Bhushan Shah", "Name[tr]": "Buşan Şah", "Name[uk]": "Bhushan Shah", "Name[x-test]": "xxBhushan Shahxx", diff --git a/quicksettings/audio/metadata.json b/quicksettings/audio/metadata.json index 9d6c57ac..c931ab91 100644 --- a/quicksettings/audio/metadata.json +++ b/quicksettings/audio/metadata.json @@ -41,6 +41,7 @@ "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", "Name[sl]": "Devin Lin", + "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", "Name[uk]": "Devin Lin", "Name[x-test]": "xxDevin Linxx", diff --git a/quicksettings/battery/metadata.json b/quicksettings/battery/metadata.json index 3be4672f..d9bf7b32 100644 --- a/quicksettings/battery/metadata.json +++ b/quicksettings/battery/metadata.json @@ -41,6 +41,7 @@ "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", "Name[sl]": "Devin Lin", + "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", "Name[uk]": "Devin Lin", "Name[x-test]": "xxDevin Linxx", diff --git a/quicksettings/bluetooth/metadata.json b/quicksettings/bluetooth/metadata.json index 9f6764aa..e4e36db7 100644 --- a/quicksettings/bluetooth/metadata.json +++ b/quicksettings/bluetooth/metadata.json @@ -42,6 +42,7 @@ "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", "Name[sl]": "Devin Lin", + "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", "Name[uk]": "Devin Lin", "Name[x-test]": "xxDevin Linxx", diff --git a/quicksettings/caffeine/metadata.json b/quicksettings/caffeine/metadata.json index 40d383c6..f9971b44 100644 --- a/quicksettings/caffeine/metadata.json +++ b/quicksettings/caffeine/metadata.json @@ -17,6 +17,7 @@ "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", "Name[sl]": "Devin Lin", + "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", "Name[uk]": "Devin Lin", "Name[x-test]": "xxDevin Linxx", diff --git a/quicksettings/flashlight/package/metadata.json b/quicksettings/flashlight/package/metadata.json index c8fb6fec..86a06472 100644 --- a/quicksettings/flashlight/package/metadata.json +++ b/quicksettings/flashlight/package/metadata.json @@ -41,6 +41,7 @@ "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", "Name[sl]": "Devin Lin", + "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", "Name[uk]": "Devin Lin", "Name[x-test]": "xxDevin Linxx", diff --git a/quicksettings/keyboardtoggle/metadata.json b/quicksettings/keyboardtoggle/metadata.json index 1af6fc8f..76adfb80 100644 --- a/quicksettings/keyboardtoggle/metadata.json +++ b/quicksettings/keyboardtoggle/metadata.json @@ -17,6 +17,7 @@ "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", "Name[sl]": "Devin Lin", + "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", "Name[uk]": "Devin Lin", "Name[x-test]": "xxDevin Linxx", diff --git a/quicksettings/location/metadata.json b/quicksettings/location/metadata.json index 5b855ba0..ef44fc8b 100644 --- a/quicksettings/location/metadata.json +++ b/quicksettings/location/metadata.json @@ -41,6 +41,7 @@ "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", "Name[sl]": "Devin Lin", + "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", "Name[uk]": "Devin Lin", "Name[x-test]": "xxDevin Linxx", diff --git a/quicksettings/mobiledata/metadata.json b/quicksettings/mobiledata/metadata.json index 803a6e36..c88be8e4 100644 --- a/quicksettings/mobiledata/metadata.json +++ b/quicksettings/mobiledata/metadata.json @@ -41,6 +41,7 @@ "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", "Name[sl]": "Devin Lin", + "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", "Name[uk]": "Devin Lin", "Name[x-test]": "xxDevin Linxx", diff --git a/quicksettings/nightcolor/package/metadata.json b/quicksettings/nightcolor/package/metadata.json index a3617b1d..52100869 100644 --- a/quicksettings/nightcolor/package/metadata.json +++ b/quicksettings/nightcolor/package/metadata.json @@ -17,6 +17,7 @@ "Name[pl]": "Aleix Pol", "Name[pt]": "Aleix Pol", "Name[sl]": "Aleix Pol", + "Name[sv]": "Aleix Pol", "Name[tr]": "Aleix Pol", "Name[uk]": "Aleix Pol", "Name[x-test]": "xxAleix Polxx", diff --git a/quicksettings/powermenu/package/metadata.json b/quicksettings/powermenu/package/metadata.json index 69571de1..0557288f 100644 --- a/quicksettings/powermenu/package/metadata.json +++ b/quicksettings/powermenu/package/metadata.json @@ -17,6 +17,7 @@ "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", "Name[sl]": "Devin Lin", + "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", "Name[uk]": "Devin Lin", "Name[x-test]": "xxDevin Linxx", diff --git a/quicksettings/record/metadata.json b/quicksettings/record/metadata.json index d092e95e..ba428875 100644 --- a/quicksettings/record/metadata.json +++ b/quicksettings/record/metadata.json @@ -17,6 +17,7 @@ "Name[pl]": "Aleix Pol i Gonzalez", "Name[pt]": "Aleix Pol i Gonzalez", "Name[sl]": "Aleix Pol i Gonzalez", + "Name[sv]": "Aleix Pol i Gonzalez", "Name[tr]": "Aleix Pol i Gonzalez", "Name[uk]": "Aleix Pol i Gonzalez", "Name[x-test]": "xxAleix Pol i Gonzalezxx", diff --git a/quicksettings/screenrotation/package/metadata.json b/quicksettings/screenrotation/package/metadata.json index 0ec5ae3a..431ff008 100644 --- a/quicksettings/screenrotation/package/metadata.json +++ b/quicksettings/screenrotation/package/metadata.json @@ -41,6 +41,7 @@ "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", "Name[sl]": "Devin Lin", + "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", "Name[uk]": "Devin Lin", "Name[x-test]": "xxDevin Linxx", diff --git a/quicksettings/screenshot/package/metadata.json b/quicksettings/screenshot/package/metadata.json index 1f4dff93..f721b49b 100644 --- a/quicksettings/screenshot/package/metadata.json +++ b/quicksettings/screenshot/package/metadata.json @@ -41,6 +41,7 @@ "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", "Name[sl]": "Devin Lin", + "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", "Name[uk]": "Devin Lin", "Name[x-test]": "xxDevin Linxx", diff --git a/quicksettings/settingsapp/metadata.json b/quicksettings/settingsapp/metadata.json index 5b75d92c..8ff2b439 100644 --- a/quicksettings/settingsapp/metadata.json +++ b/quicksettings/settingsapp/metadata.json @@ -42,6 +42,7 @@ "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", "Name[sl]": "Devin Lin", + "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", "Name[uk]": "Devin Lin", "Name[x-test]": "xxDevin Linxx", diff --git a/quicksettings/wifi/metadata.json b/quicksettings/wifi/metadata.json index 47f0cb32..5ff989a2 100644 --- a/quicksettings/wifi/metadata.json +++ b/quicksettings/wifi/metadata.json @@ -43,6 +43,7 @@ "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", "Name[sl]": "Devin Lin", + "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", "Name[uk]": "Devin Lin", "Name[x-test]": "xxDevin Linxx", diff --git a/shell/metadata.json b/shell/metadata.json index 81fe6429..98377949 100644 --- a/shell/metadata.json +++ b/shell/metadata.json @@ -17,6 +17,7 @@ "Name[pl]": "Aaron Seigo", "Name[pt]": "Aaron Seigo", "Name[sl]": "Aaron Seigo", + "Name[sv]": "Aaron Seigo", "Name[tr]": "Aaron Seigo", "Name[uk]": "Aaron Seigo", "Name[x-test]": "xxAaron Seigoxx", @@ -38,6 +39,7 @@ "Description[pl]": "Powłoka Plazmy dla telefonów", "Description[pt]": "Consola do Plasma para telemóveis", "Description[sl]": "Plasma shell za telefone", + "Description[sv]": "Plasma skal för telefoner", "Description[tr]": "Telefonlar için Plasma kabuğu", "Description[uk]": "Оболонка Плазми для телефонів", "Description[x-test]": "xxPlasma shell for phonesxx",