From 2a94ef0d96094908ef462c1b64b1844684a1f48d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 20 Aug 2022 01:43:57 +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" --- 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 ++ 22 files changed, 24 insertions(+) diff --git a/containments/homescreens/default/package/metadata.json b/containments/homescreens/default/package/metadata.json index 634559d1..72353299 100644 --- a/containments/homescreens/default/package/metadata.json +++ b/containments/homescreens/default/package/metadata.json @@ -18,6 +18,7 @@ "Name[nl]": "Marco Martin", "Name[pl]": "Marco Martin", "Name[pt]": "Marco Martin", + "Name[pt_BR]": "Marco Martin", "Name[sl]": "Marco Martin", "Name[sv]": "Marco Martin", "Name[tr]": "Marco Martin", diff --git a/containments/homescreens/halcyon/package/metadata.json b/containments/homescreens/halcyon/package/metadata.json index 6ddd836d..b9b1ff42 100644 --- a/containments/homescreens/halcyon/package/metadata.json +++ b/containments/homescreens/halcyon/package/metadata.json @@ -37,6 +37,7 @@ "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", + "Name[pt_BR]": "Devin Lin", "Name[sl]": "Devin Lin", "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", diff --git a/containments/panel/package/metadata.json b/containments/panel/package/metadata.json index 84417e85..4803bff5 100644 --- a/containments/panel/package/metadata.json +++ b/containments/panel/package/metadata.json @@ -18,6 +18,7 @@ "Name[nl]": "Marco Martin", "Name[pl]": "Marco Martin", "Name[pt]": "Marco Martin", + "Name[pt_BR]": "Marco Martin", "Name[sl]": "Marco Martin", "Name[sv]": "Marco Martin", "Name[tr]": "Marco Martin", diff --git a/containments/taskpanel/package/metadata.json b/containments/taskpanel/package/metadata.json index 1c4104e8..d5078c8f 100644 --- a/containments/taskpanel/package/metadata.json +++ b/containments/taskpanel/package/metadata.json @@ -18,6 +18,7 @@ "Name[nl]": "Marco Martin", "Name[pl]": "Marco Martin", "Name[pt]": "Marco Martin", + "Name[pt_BR]": "Marco Martin", "Name[sl]": "Marco Martin", "Name[sv]": "Marco Martin", "Name[tr]": "Marco Martin", diff --git a/kcms/mobileshell/kcm_mobileshell.json b/kcms/mobileshell/kcm_mobileshell.json index a8cb9b6a..d3434c92 100644 --- a/kcms/mobileshell/kcm_mobileshell.json +++ b/kcms/mobileshell/kcm_mobileshell.json @@ -18,6 +18,7 @@ "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", + "Name[pt_BR]": "Devin Lin", "Name[sl]": "Devin Lin", "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", @@ -41,6 +42,7 @@ "Description[nl]": "De systeem-shell configureren", "Description[pl]": "Ustawienia powłoki systemowej", "Description[pt]": "Configurar a consola do sistema", + "Description[pt_BR]": "Configurar o shell do sistema", "Description[sl]": "Konfiguriraj sistemski shell", "Description[sv]": "Anpassa systemskalet", "Description[tr]": "Sistem kabuğunu yapılandır", diff --git a/quicksettings/airplanemode/metadata.json b/quicksettings/airplanemode/metadata.json index 83a8463e..0986e083 100644 --- a/quicksettings/airplanemode/metadata.json +++ b/quicksettings/airplanemode/metadata.json @@ -42,6 +42,7 @@ "Name[nl]": "Bhushan Shah", "Name[pl]": "Bhushan Shah", "Name[pt]": "Bhushan Shah", + "Name[pt_BR]": "Bhushan Shah", "Name[sl]": "Bhushan Shah", "Name[sv]": "Bhushan Shah", "Name[tr]": "Buşan Şah", diff --git a/quicksettings/audio/metadata.json b/quicksettings/audio/metadata.json index 4eadea25..77477d77 100644 --- a/quicksettings/audio/metadata.json +++ b/quicksettings/audio/metadata.json @@ -42,6 +42,7 @@ "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", + "Name[pt_BR]": "Devin Lin", "Name[sl]": "Devin Lin", "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", diff --git a/quicksettings/battery/metadata.json b/quicksettings/battery/metadata.json index c6d409ec..abc2945f 100644 --- a/quicksettings/battery/metadata.json +++ b/quicksettings/battery/metadata.json @@ -42,6 +42,7 @@ "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", + "Name[pt_BR]": "Devin Lin", "Name[sl]": "Devin Lin", "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", diff --git a/quicksettings/bluetooth/metadata.json b/quicksettings/bluetooth/metadata.json index 73b85bce..76fe06c4 100644 --- a/quicksettings/bluetooth/metadata.json +++ b/quicksettings/bluetooth/metadata.json @@ -43,6 +43,7 @@ "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", + "Name[pt_BR]": "Devin Lin", "Name[sl]": "Devin Lin", "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", diff --git a/quicksettings/caffeine/metadata.json b/quicksettings/caffeine/metadata.json index c6f7a442..daa7bc92 100644 --- a/quicksettings/caffeine/metadata.json +++ b/quicksettings/caffeine/metadata.json @@ -18,6 +18,7 @@ "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", + "Name[pt_BR]": "Devin Lin", "Name[sl]": "Devin Lin", "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", diff --git a/quicksettings/flashlight/package/metadata.json b/quicksettings/flashlight/package/metadata.json index b6d3f866..5cb62ce8 100644 --- a/quicksettings/flashlight/package/metadata.json +++ b/quicksettings/flashlight/package/metadata.json @@ -42,6 +42,7 @@ "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", + "Name[pt_BR]": "Devin Lin", "Name[sl]": "Devin Lin", "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", diff --git a/quicksettings/keyboardtoggle/metadata.json b/quicksettings/keyboardtoggle/metadata.json index 234e33c5..9309907a 100644 --- a/quicksettings/keyboardtoggle/metadata.json +++ b/quicksettings/keyboardtoggle/metadata.json @@ -18,6 +18,7 @@ "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", + "Name[pt_BR]": "Devin Lin", "Name[sl]": "Devin Lin", "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", diff --git a/quicksettings/location/metadata.json b/quicksettings/location/metadata.json index c7a31104..2936cb5f 100644 --- a/quicksettings/location/metadata.json +++ b/quicksettings/location/metadata.json @@ -42,6 +42,7 @@ "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", + "Name[pt_BR]": "Devin Lin", "Name[sl]": "Devin Lin", "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", diff --git a/quicksettings/mobiledata/metadata.json b/quicksettings/mobiledata/metadata.json index 919379f3..9972552b 100644 --- a/quicksettings/mobiledata/metadata.json +++ b/quicksettings/mobiledata/metadata.json @@ -42,6 +42,7 @@ "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", + "Name[pt_BR]": "Devin Lin", "Name[sl]": "Devin Lin", "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", diff --git a/quicksettings/nightcolor/package/metadata.json b/quicksettings/nightcolor/package/metadata.json index c3434bdb..8d60f446 100644 --- a/quicksettings/nightcolor/package/metadata.json +++ b/quicksettings/nightcolor/package/metadata.json @@ -18,6 +18,7 @@ "Name[nl]": "Aleix Pol", "Name[pl]": "Aleix Pol", "Name[pt]": "Aleix Pol", + "Name[pt_BR]": "Aleix Pol", "Name[sl]": "Aleix Pol", "Name[sv]": "Aleix Pol", "Name[tr]": "Aleix Pol", diff --git a/quicksettings/powermenu/package/metadata.json b/quicksettings/powermenu/package/metadata.json index ed7761bd..965ad44b 100644 --- a/quicksettings/powermenu/package/metadata.json +++ b/quicksettings/powermenu/package/metadata.json @@ -18,6 +18,7 @@ "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", + "Name[pt_BR]": "Devin Lin", "Name[sl]": "Devin Lin", "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", diff --git a/quicksettings/record/metadata.json b/quicksettings/record/metadata.json index 4f7438a8..eea3c595 100644 --- a/quicksettings/record/metadata.json +++ b/quicksettings/record/metadata.json @@ -18,6 +18,7 @@ "Name[nl]": "Aleix Pol i Gonzalez", "Name[pl]": "Aleix Pol i Gonzalez", "Name[pt]": "Aleix Pol i Gonzalez", + "Name[pt_BR]": "Aleix Pol i Gonzalez", "Name[sl]": "Aleix Pol i Gonzalez", "Name[sv]": "Aleix Pol i Gonzalez", "Name[tr]": "Aleix Pol i Gonzalez", diff --git a/quicksettings/screenrotation/package/metadata.json b/quicksettings/screenrotation/package/metadata.json index 296b87c3..f5e600d3 100644 --- a/quicksettings/screenrotation/package/metadata.json +++ b/quicksettings/screenrotation/package/metadata.json @@ -42,6 +42,7 @@ "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", + "Name[pt_BR]": "Devin Lin", "Name[sl]": "Devin Lin", "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", diff --git a/quicksettings/screenshot/package/metadata.json b/quicksettings/screenshot/package/metadata.json index 131f9fd5..cf2f24e1 100644 --- a/quicksettings/screenshot/package/metadata.json +++ b/quicksettings/screenshot/package/metadata.json @@ -42,6 +42,7 @@ "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", + "Name[pt_BR]": "Devin Lin", "Name[sl]": "Devin Lin", "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", diff --git a/quicksettings/settingsapp/metadata.json b/quicksettings/settingsapp/metadata.json index 5bda9e76..c55527a3 100644 --- a/quicksettings/settingsapp/metadata.json +++ b/quicksettings/settingsapp/metadata.json @@ -43,6 +43,7 @@ "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", + "Name[pt_BR]": "Devin Lin", "Name[sl]": "Devin Lin", "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", diff --git a/quicksettings/wifi/metadata.json b/quicksettings/wifi/metadata.json index e45729bf..99c8da6a 100644 --- a/quicksettings/wifi/metadata.json +++ b/quicksettings/wifi/metadata.json @@ -44,6 +44,7 @@ "Name[nl]": "Devin Lin", "Name[pl]": "Devin Lin", "Name[pt]": "Devin Lin", + "Name[pt_BR]": "Devin Lin", "Name[sl]": "Devin Lin", "Name[sv]": "Devin Lin", "Name[tr]": "Devin Lin", diff --git a/shell/metadata.json b/shell/metadata.json index 68195507..e04f33f6 100644 --- a/shell/metadata.json +++ b/shell/metadata.json @@ -18,6 +18,7 @@ "Name[nl]": "Aaron Seigo", "Name[pl]": "Aaron Seigo", "Name[pt]": "Aaron Seigo", + "Name[pt_BR]": "Aaron Seigo", "Name[sl]": "Aaron Seigo", "Name[sv]": "Aaron Seigo", "Name[tr]": "Aaron Seigo", @@ -42,6 +43,7 @@ "Description[nl]": "Plasma-shell voor telefoons", "Description[pl]": "Powłoka Plazmy dla telefonów", "Description[pt]": "Consola do Plasma para telemóveis", + "Description[pt_BR]": "Plasma Shell para celulares", "Description[sl]": "Plasma shell za telefone", "Description[sv]": "Plasma skal för telefoner", "Description[tr]": "Telefonlar için Plasma kabuğu",