From 9655dcdc6df8c8fded677e7ed4cd84bbfea31004 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 23 Jul 2022 01:48:30 +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 + .../homescreens/default/package/metadata.json | 9 ++++++++- .../homescreens/halcyon/package/metadata.json | 10 +++++++++- containments/panel/package/metadata.json | 9 ++++++++- containments/taskpanel/package/metadata.json | 9 ++++++++- kcms/mobileshell/kcm_mobileshell.json | 16 +++++++++++++++- quicksettings/airplanemode/metadata.json | 9 ++++++++- quicksettings/audio/metadata.json | 9 ++++++++- quicksettings/battery/metadata.json | 9 ++++++++- quicksettings/bluetooth/metadata.json | 9 ++++++++- quicksettings/caffeine/metadata.json | 9 ++++++++- quicksettings/flashlight/package/metadata.json | 9 ++++++++- quicksettings/keyboardtoggle/metadata.json | 9 ++++++++- quicksettings/location/metadata.json | 9 ++++++++- quicksettings/mobiledata/metadata.json | 9 ++++++++- quicksettings/nightcolor/package/metadata.json | 9 ++++++++- quicksettings/powermenu/package/metadata.json | 9 ++++++++- quicksettings/record/metadata.json | 9 ++++++++- .../screenrotation/package/metadata.json | 9 ++++++++- quicksettings/screenshot/package/metadata.json | 9 ++++++++- quicksettings/settingsapp/metadata.json | 9 ++++++++- quicksettings/wifi/metadata.json | 9 ++++++++- shell/metadata.json | 16 +++++++++++++++- 23 files changed, 192 insertions(+), 22 deletions(-) diff --git a/bin/plasma-mobile-dev.desktop.cmake b/bin/plasma-mobile-dev.desktop.cmake index 7301bd74..c7a57ab8 100644 --- a/bin/plasma-mobile-dev.desktop.cmake +++ b/bin/plasma-mobile-dev.desktop.cmake @@ -8,6 +8,7 @@ Name=Plasma Mobile (Development) Name[az]=Plasma Mobil (Tərtibat) Name[ca]=Plasma Mobile (Desenvolupament) Name[ca@valencia]=Plasma Mobile (Desenvolupament) +Name[en_GB]=Plasma Mobile (Development) Name[es]=Plasma Mobile (desarrollo) Name[eu]=Plasma Mugikorra (Garapena) Name[fi]=Plasma Mobile (kehitys) diff --git a/containments/homescreens/default/package/metadata.json b/containments/homescreens/default/package/metadata.json index 0d828b92..dcbf6c89 100644 --- a/containments/homescreens/default/package/metadata.json +++ b/containments/homescreens/default/package/metadata.json @@ -3,7 +3,14 @@ "Authors": [ { "Email": "mart@kde.org", - "Name": "Marco Martin" + "Name": "Marco Martin", + "Name[az]": "Marco Martin", + "Name[ca]": "Marco Martin", + "Name[en_GB]": "Marco Martin", + "Name[pt]": "Marco Martin", + "Name[tr]": "Marco Martin", + "Name[uk]": "Marco Martin", + "Name[x-test]": "xxMarco Martinxx" } ], "Category": "Containments", diff --git a/containments/homescreens/halcyon/package/metadata.json b/containments/homescreens/halcyon/package/metadata.json index 45e33fe2..c67fe6f5 100644 --- a/containments/homescreens/halcyon/package/metadata.json +++ b/containments/homescreens/halcyon/package/metadata.json @@ -22,7 +22,14 @@ "Authors": [ { "Email": "devin@kde.org", - "Name": "Devin Lin" + "Name": "Devin Lin", + "Name[az]": "Devin Lin", + "Name[ca]": "Devin Lin", + "Name[en_GB]": "Devin Lin", + "Name[pt]": "Devin Lin", + "Name[tr]": "Devin Lin", + "Name[uk]": "Devin Lin", + "Name[x-test]": "xxDevin Linxx" } ], "Category": "Containments", @@ -32,6 +39,7 @@ "Name[az]": "Halcyon", "Name[ca@valencia]": "Halcyon", "Name[ca]": "Halcyon", + "Name[en_GB]": "Halcyon", "Name[es]": "Halcyon", "Name[eu]": "Halcyon", "Name[fi]": "Halcyon", diff --git a/containments/panel/package/metadata.json b/containments/panel/package/metadata.json index 5e238afa..33e8402e 100644 --- a/containments/panel/package/metadata.json +++ b/containments/panel/package/metadata.json @@ -3,7 +3,14 @@ "Authors": [ { "Email": "mart@kde.org", - "Name": "Marco Martin" + "Name": "Marco Martin", + "Name[az]": "Marco Martin", + "Name[ca]": "Marco Martin", + "Name[en_GB]": "Marco Martin", + "Name[pt]": "Marco Martin", + "Name[tr]": "Marco Martin", + "Name[uk]": "Marco Martin", + "Name[x-test]": "xxMarco Martinxx" } ], "Category": "Containments", diff --git a/containments/taskpanel/package/metadata.json b/containments/taskpanel/package/metadata.json index 58b21976..cabb0036 100644 --- a/containments/taskpanel/package/metadata.json +++ b/containments/taskpanel/package/metadata.json @@ -3,7 +3,14 @@ "Authors": [ { "Email": "mart@kde.org", - "Name": "Marco Martin" + "Name": "Marco Martin", + "Name[az]": "Marco Martin", + "Name[ca]": "Marco Martin", + "Name[en_GB]": "Marco Martin", + "Name[pt]": "Marco Martin", + "Name[tr]": "Marco Martin", + "Name[uk]": "Marco Martin", + "Name[x-test]": "xxMarco Martinxx" } ], "Category": "Containments", diff --git a/kcms/mobileshell/kcm_mobileshell.json b/kcms/mobileshell/kcm_mobileshell.json index 23fc1b60..28e929ab 100644 --- a/kcms/mobileshell/kcm_mobileshell.json +++ b/kcms/mobileshell/kcm_mobileshell.json @@ -3,11 +3,25 @@ "Authors": [ { "Email": "espidev@gmail.com", - "Name": "Devin Lin" + "Name": "Devin Lin", + "Name[az]": "Devin Lin", + "Name[ca]": "Devin Lin", + "Name[en_GB]": "Devin Lin", + "Name[pt]": "Devin Lin", + "Name[tr]": "Devin Lin", + "Name[uk]": "Devin Lin", + "Name[x-test]": "xxDevin Linxx" } ], "Category": "System Information", "Description": "Configure the system shell", + "Description[az]": "Sistem üz qabığını tənzimləyin", + "Description[ca]": "Configura l'intèrpret d'ordres del sistema", + "Description[en_GB]": "Configure the system shell", + "Description[pt]": "Configurar a consola do sistema", + "Description[tr]": "Sistem kabuğunu yapılandır", + "Description[uk]": "Налаштувати командну оболонку системи", + "Description[x-test]": "xxConfigure the system shellxx", "EnabledByDefault": true, "FormFactors": [ "desktop", diff --git a/quicksettings/airplanemode/metadata.json b/quicksettings/airplanemode/metadata.json index 111fc81c..818fe801 100644 --- a/quicksettings/airplanemode/metadata.json +++ b/quicksettings/airplanemode/metadata.json @@ -27,7 +27,14 @@ "Authors": [ { "Email": "bshah@kde.org", - "Name": "Bhushan Shah" + "Name": "Bhushan Shah", + "Name[az]": "Bhushan Shah", + "Name[ca]": "Bhushan Shah", + "Name[en_GB]": "Bhushan Shah", + "Name[pt]": "Bhushan Shah", + "Name[tr]": "Buşan Şah", + "Name[uk]": "Bhushan Shah", + "Name[x-test]": "xxBhushan Shahxx" } ], "Icon": "network-flightmode-on", diff --git a/quicksettings/audio/metadata.json b/quicksettings/audio/metadata.json index bbad41a4..3014f17d 100644 --- a/quicksettings/audio/metadata.json +++ b/quicksettings/audio/metadata.json @@ -27,7 +27,14 @@ "Authors": [ { "Email": "devin@kde.org", - "Name": "Devin Lin" + "Name": "Devin Lin", + "Name[az]": "Devin Lin", + "Name[ca]": "Devin Lin", + "Name[en_GB]": "Devin Lin", + "Name[pt]": "Devin Lin", + "Name[tr]": "Devin Lin", + "Name[uk]": "Devin Lin", + "Name[x-test]": "xxDevin Linxx" } ], "Icon": "audio-speakers-symbolic", diff --git a/quicksettings/battery/metadata.json b/quicksettings/battery/metadata.json index bed228f7..cfc0275e 100644 --- a/quicksettings/battery/metadata.json +++ b/quicksettings/battery/metadata.json @@ -27,7 +27,14 @@ "Authors": [ { "Email": "devin@kde.org", - "Name": "Devin Lin" + "Name": "Devin Lin", + "Name[az]": "Devin Lin", + "Name[ca]": "Devin Lin", + "Name[en_GB]": "Devin Lin", + "Name[pt]": "Devin Lin", + "Name[tr]": "Devin Lin", + "Name[uk]": "Devin Lin", + "Name[x-test]": "xxDevin Linxx" } ], "Icon": "battery-full", diff --git a/quicksettings/bluetooth/metadata.json b/quicksettings/bluetooth/metadata.json index 3e3c3100..c606352c 100644 --- a/quicksettings/bluetooth/metadata.json +++ b/quicksettings/bluetooth/metadata.json @@ -28,7 +28,14 @@ "Authors": [ { "Email": "devin@kde.org", - "Name": "Devin Lin" + "Name": "Devin Lin", + "Name[az]": "Devin Lin", + "Name[ca]": "Devin Lin", + "Name[en_GB]": "Devin Lin", + "Name[pt]": "Devin Lin", + "Name[tr]": "Devin Lin", + "Name[uk]": "Devin Lin", + "Name[x-test]": "xxDevin Linxx" } ], "Icon": "network-bluetooth", diff --git a/quicksettings/caffeine/metadata.json b/quicksettings/caffeine/metadata.json index f42ab860..47ec3491 100644 --- a/quicksettings/caffeine/metadata.json +++ b/quicksettings/caffeine/metadata.json @@ -3,7 +3,14 @@ "Authors": [ { "Email": "devin@kde.org", - "Name": "Devin Lin" + "Name": "Devin Lin", + "Name[az]": "Devin Lin", + "Name[ca]": "Devin Lin", + "Name[en_GB]": "Devin Lin", + "Name[pt]": "Devin Lin", + "Name[tr]": "Devin Lin", + "Name[uk]": "Devin Lin", + "Name[x-test]": "xxDevin Linxx" } ], "Icon": "system-suspend-hibernate", diff --git a/quicksettings/flashlight/package/metadata.json b/quicksettings/flashlight/package/metadata.json index 717e7ce3..9085c6cc 100644 --- a/quicksettings/flashlight/package/metadata.json +++ b/quicksettings/flashlight/package/metadata.json @@ -27,7 +27,14 @@ "Authors": [ { "Email": "devin@kde.org", - "Name": "Devin Lin" + "Name": "Devin Lin", + "Name[az]": "Devin Lin", + "Name[ca]": "Devin Lin", + "Name[en_GB]": "Devin Lin", + "Name[pt]": "Devin Lin", + "Name[tr]": "Devin Lin", + "Name[uk]": "Devin Lin", + "Name[x-test]": "xxDevin Linxx" } ], "Icon": "flashlight-on", diff --git a/quicksettings/keyboardtoggle/metadata.json b/quicksettings/keyboardtoggle/metadata.json index cb8851a6..fd8c978f 100644 --- a/quicksettings/keyboardtoggle/metadata.json +++ b/quicksettings/keyboardtoggle/metadata.json @@ -3,7 +3,14 @@ "Authors": [ { "Email": "devin@kde.org", - "Name": "Devin Lin" + "Name": "Devin Lin", + "Name[az]": "Devin Lin", + "Name[ca]": "Devin Lin", + "Name[en_GB]": "Devin Lin", + "Name[pt]": "Devin Lin", + "Name[tr]": "Devin Lin", + "Name[uk]": "Devin Lin", + "Name[x-test]": "xxDevin Linxx" } ], "Icon": "input-keyboard-virtual", diff --git a/quicksettings/location/metadata.json b/quicksettings/location/metadata.json index 5cfa913a..3aeb431c 100644 --- a/quicksettings/location/metadata.json +++ b/quicksettings/location/metadata.json @@ -27,7 +27,14 @@ "Authors": [ { "Email": "devin@kde.org", - "Name": "Devin Lin" + "Name": "Devin Lin", + "Name[az]": "Devin Lin", + "Name[ca]": "Devin Lin", + "Name[en_GB]": "Devin Lin", + "Name[pt]": "Devin Lin", + "Name[tr]": "Devin Lin", + "Name[uk]": "Devin Lin", + "Name[x-test]": "xxDevin Linxx" } ], "Icon": "gps", diff --git a/quicksettings/mobiledata/metadata.json b/quicksettings/mobiledata/metadata.json index d3302066..0acacaa8 100644 --- a/quicksettings/mobiledata/metadata.json +++ b/quicksettings/mobiledata/metadata.json @@ -27,7 +27,14 @@ "Authors": [ { "Email": "devin@kde.org", - "Name": "Devin Lin" + "Name": "Devin Lin", + "Name[az]": "Devin Lin", + "Name[ca]": "Devin Lin", + "Name[en_GB]": "Devin Lin", + "Name[pt]": "Devin Lin", + "Name[tr]": "Devin Lin", + "Name[uk]": "Devin Lin", + "Name[x-test]": "xxDevin Linxx" } ], "Icon": "network-modem", diff --git a/quicksettings/nightcolor/package/metadata.json b/quicksettings/nightcolor/package/metadata.json index ed542460..d752a998 100644 --- a/quicksettings/nightcolor/package/metadata.json +++ b/quicksettings/nightcolor/package/metadata.json @@ -3,7 +3,14 @@ "Authors": [ { "Email": "aleixpol@kde.org", - "Name": "Aleix Pol" + "Name": "Aleix Pol", + "Name[az]": "Aleix Pol", + "Name[ca]": "Aleix Pol", + "Name[en_GB]": "Aleix Pol", + "Name[pt]": "Aleix Pol", + "Name[tr]": "Aleix Pol", + "Name[uk]": "Aleix Pol", + "Name[x-test]": "xxAleix Polxx" } ], "Icon": "redshift-status-on", diff --git a/quicksettings/powermenu/package/metadata.json b/quicksettings/powermenu/package/metadata.json index c7ac1bd4..bfaf5dee 100644 --- a/quicksettings/powermenu/package/metadata.json +++ b/quicksettings/powermenu/package/metadata.json @@ -3,7 +3,14 @@ "Authors": [ { "Email": "devin@kde.org", - "Name": "Devin Lin" + "Name": "Devin Lin", + "Name[az]": "Devin Lin", + "Name[ca]": "Devin Lin", + "Name[en_GB]": "Devin Lin", + "Name[pt]": "Devin Lin", + "Name[tr]": "Devin Lin", + "Name[uk]": "Devin Lin", + "Name[x-test]": "xxDevin Linxx" } ], "Icon": "system-shutdown-symbolic", diff --git a/quicksettings/record/metadata.json b/quicksettings/record/metadata.json index bfedd3b9..7af0454e 100644 --- a/quicksettings/record/metadata.json +++ b/quicksettings/record/metadata.json @@ -3,7 +3,14 @@ "Authors": [ { "Email": "aleixpol@kde.org", - "Name": "Aleix Pol i Gonzalez" + "Name": "Aleix Pol i Gonzalez", + "Name[az]": "Aleix Pol i Gonzalez", + "Name[ca]": "Aleix Pol i Gonzalez", + "Name[en_GB]": "Aleix Pol i Gonzalez", + "Name[pt]": "Aleix Pol i Gonzalez", + "Name[tr]": "Aleix Pol i Gonzalez", + "Name[uk]": "Aleix Pol i Gonzalez", + "Name[x-test]": "xxAleix Pol i Gonzalezxx" } ], "Icon": "spectacle", diff --git a/quicksettings/screenrotation/package/metadata.json b/quicksettings/screenrotation/package/metadata.json index 8ce268bc..eb7ff742 100644 --- a/quicksettings/screenrotation/package/metadata.json +++ b/quicksettings/screenrotation/package/metadata.json @@ -27,7 +27,14 @@ "Authors": [ { "Email": "devin@kde.org", - "Name": "Devin Lin" + "Name": "Devin Lin", + "Name[az]": "Devin Lin", + "Name[ca]": "Devin Lin", + "Name[en_GB]": "Devin Lin", + "Name[pt]": "Devin Lin", + "Name[tr]": "Devin Lin", + "Name[uk]": "Devin Lin", + "Name[x-test]": "xxDevin Linxx" } ], "Icon": "rotation-allowed", diff --git a/quicksettings/screenshot/package/metadata.json b/quicksettings/screenshot/package/metadata.json index 6967ace8..245c889f 100644 --- a/quicksettings/screenshot/package/metadata.json +++ b/quicksettings/screenshot/package/metadata.json @@ -27,7 +27,14 @@ "Authors": [ { "Email": "devin@kde.org", - "Name": "Devin Lin" + "Name": "Devin Lin", + "Name[az]": "Devin Lin", + "Name[ca]": "Devin Lin", + "Name[en_GB]": "Devin Lin", + "Name[pt]": "Devin Lin", + "Name[tr]": "Devin Lin", + "Name[uk]": "Devin Lin", + "Name[x-test]": "xxDevin Linxx" } ], "Icon": "spectacle", diff --git a/quicksettings/settingsapp/metadata.json b/quicksettings/settingsapp/metadata.json index 83cd19b4..caf5698b 100644 --- a/quicksettings/settingsapp/metadata.json +++ b/quicksettings/settingsapp/metadata.json @@ -28,7 +28,14 @@ "Authors": [ { "Email": "devin@kde.org", - "Name": "Devin Lin" + "Name": "Devin Lin", + "Name[az]": "Devin Lin", + "Name[ca]": "Devin Lin", + "Name[en_GB]": "Devin Lin", + "Name[pt]": "Devin Lin", + "Name[tr]": "Devin Lin", + "Name[uk]": "Devin Lin", + "Name[x-test]": "xxDevin Linxx" } ], "Icon": "spectacle", diff --git a/quicksettings/wifi/metadata.json b/quicksettings/wifi/metadata.json index ce0a18d9..86d1006c 100644 --- a/quicksettings/wifi/metadata.json +++ b/quicksettings/wifi/metadata.json @@ -29,7 +29,14 @@ "Authors": [ { "Email": "devin@kde.org", - "Name": "Devin Lin" + "Name": "Devin Lin", + "Name[az]": "Devin Lin", + "Name[ca]": "Devin Lin", + "Name[en_GB]": "Devin Lin", + "Name[pt]": "Devin Lin", + "Name[tr]": "Devin Lin", + "Name[uk]": "Devin Lin", + "Name[x-test]": "xxDevin Linxx" } ], "Icon": "network-wireless-signal", diff --git a/shell/metadata.json b/shell/metadata.json index c9b432fd..da3424d5 100644 --- a/shell/metadata.json +++ b/shell/metadata.json @@ -3,11 +3,25 @@ "Authors": [ { "Email": "aseigo@kde.org", - "Name": "Aaron Seigo" + "Name": "Aaron Seigo", + "Name[az]": "Aaron Seigo", + "Name[ca]": "Aaron Seigo", + "Name[en_GB]": "Aaron Seigo", + "Name[pt]": "Aaron Seigo", + "Name[tr]": "Aaron Seigo", + "Name[uk]": "Aaron Seigo", + "Name[x-test]": "xxAaron Seigoxx" } ], "Category": "", "Description": "Plasma shell for phones", + "Description[az]": "Telefonlar üçün Plasma üz qabığı", + "Description[ca]": "Espai de treball Plasma per a telèfons", + "Description[en_GB]": "Plasma shell for phones", + "Description[pt]": "Consola do Plasma para telemóveis", + "Description[tr]": "Telefonlar için Plasma kabuğu", + "Description[uk]": "Оболонка Плазми для телефонів", + "Description[x-test]": "xxPlasma shell for phonesxx", "Id": "org.kde.plasma.phoneshell", "License": "GPLv2+", "Name": "Phone",