From bc6f26184a7c53a67f19ae6f349f1fb1dc8826c2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 8 Sep 2022 01:51:21 +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/panel/package/metadata.json | 1 + containments/taskpanel/package/metadata.json | 1 + quicksettings/caffeine/metadata.json | 1 + quicksettings/keyboardtoggle/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 + 9 files changed, 9 insertions(+) diff --git a/containments/homescreens/default/package/metadata.json b/containments/homescreens/default/package/metadata.json index 21e0a454..55c993d0 100644 --- a/containments/homescreens/default/package/metadata.json +++ b/containments/homescreens/default/package/metadata.json @@ -32,6 +32,7 @@ "Description": "Mobile homescreen with a focus on customizability.", "Description[ca@valencia]": "Pantalla d'inici del mòbil enfocada a la personalització.", "Description[ca]": "Pantalla d'inici del mòbil enfocada a la personalització.", + "Description[es]": "Pantalla de inicio para móvil centrada en la personalización.", "Description[eu]": "Norbere gustura egokitzeko gaitasuna helburu duen mugikorreko etxeko pantaila.", "Description[fr]": "Un écran d'accueil pour périphérique mobile, avec une attention pour la personnalisation.", "Description[ka]": "მობილური საწყისი ეკრანი მორგებადობაზე ფოკუსით", diff --git a/containments/panel/package/metadata.json b/containments/panel/package/metadata.json index 4750d3d8..d8b9e85b 100644 --- a/containments/panel/package/metadata.json +++ b/containments/panel/package/metadata.json @@ -32,6 +32,7 @@ "Description": "Top panel for Plasma Mobile", "Description[ca@valencia]": "Quadro superior per a Plasma Mobile", "Description[ca]": "Plafó superior per al Plasma Mobile", + "Description[es]": "Panel superior para Plasma Mobile", "Description[eu]": "Plasma Mugikorrerako goiko panela", "Description[fr]": "Panneau supérieur pour Plasma Mobile", "Description[ka]": "Plasma Mobile-ის ზედა პანელი", diff --git a/containments/taskpanel/package/metadata.json b/containments/taskpanel/package/metadata.json index 8a0e10b4..5bec64f1 100644 --- a/containments/taskpanel/package/metadata.json +++ b/containments/taskpanel/package/metadata.json @@ -32,6 +32,7 @@ "Description": "Navigation panel for Plasma Mobile", "Description[ca@valencia]": "Quadro de navegació per a Plasma Mobile", "Description[ca]": "Plafó de navegació per al Plasma Mobile", + "Description[es]": "Panel de navegación para Plasma Mobile", "Description[eu]": "Plasma Mugikorrerako nabigatzeko panela", "Description[fr]": "Panneau de navigation pour Plasma Mobile", "Description[ka]": "Plasma Mobile-ის ნავიგაციის პანელი", diff --git a/quicksettings/caffeine/metadata.json b/quicksettings/caffeine/metadata.json index 9b6d2595..7ec47679 100644 --- a/quicksettings/caffeine/metadata.json +++ b/quicksettings/caffeine/metadata.json @@ -31,6 +31,7 @@ "Description": "Quick setting to suspend system sleep", "Description[ca@valencia]": "Configuració ràpida per a suspendre el repòs del sistema", "Description[ca]": "Configuració ràpida per suspendre el repòs del sistema", + "Description[es]": "Ajuste rápido para suspender el reposo del sistema", "Description[eu]": "Sistemaren loa geldiarazteko ezarpen azkarra", "Description[fr]": "Configuration rapide pour annuler la veille du système", "Description[ka]": "სისტემის ძილის შეწყვეტის სწრაფ მორგება", diff --git a/quicksettings/keyboardtoggle/metadata.json b/quicksettings/keyboardtoggle/metadata.json index a82b02ba..d54c84a2 100644 --- a/quicksettings/keyboardtoggle/metadata.json +++ b/quicksettings/keyboardtoggle/metadata.json @@ -31,6 +31,7 @@ "Description": "Quick setting for keyboard toggle", "Description[ca@valencia]": "Configuració ràpida del canvi de teclat", "Description[ca]": "Configuració ràpida del canvi de teclat", + "Description[es]": "Ajuste rápido para conmutar el teclado", "Description[eu]": "Teklatua txandakatzeko ezarpen azkarrak", "Description[fr]": "Configuration rapide pour le basculement de clavier", "Description[ka]": "პარამეტრების აპლიკაციის სწრაფი მორგება", diff --git a/quicksettings/nightcolor/package/metadata.json b/quicksettings/nightcolor/package/metadata.json index 2f0acba3..d60fac14 100644 --- a/quicksettings/nightcolor/package/metadata.json +++ b/quicksettings/nightcolor/package/metadata.json @@ -31,6 +31,7 @@ "Description": "Night color quick setting", "Description[ca@valencia]": "Configuració ràpida del color de nit", "Description[ca]": "Configuració ràpida del color de nit", + "Description[es]": "Ajuste rápido para el color nocturno", "Description[eu]": "Gaueko kolorearen ezarpen azkarra", "Description[fr]": "Configuration rapide de la couleur de nuit", "Description[ka]": "ღამის ფერების სწრაფი მორგება", diff --git a/quicksettings/powermenu/package/metadata.json b/quicksettings/powermenu/package/metadata.json index f1faf128..981a6f62 100644 --- a/quicksettings/powermenu/package/metadata.json +++ b/quicksettings/powermenu/package/metadata.json @@ -31,6 +31,7 @@ "Description": "Power menu quick setting", "Description[ca@valencia]": "Configuració ràpida del menú d'energia", "Description[ca]": "Configuració ràpida del menú d'energia", + "Description[es]": "Ajuste rápido del menú de energía", "Description[eu]": "Indar-menuaren ezarpen azkarra", "Description[fr]": "Configuration rapide pour le menu de gestion de l'énergie", "Description[ka]": "კვების მენიუს სწრაფი მორგება", diff --git a/quicksettings/record/metadata.json b/quicksettings/record/metadata.json index 1b951212..5da77124 100644 --- a/quicksettings/record/metadata.json +++ b/quicksettings/record/metadata.json @@ -31,6 +31,7 @@ "Description": "Screen recording quick setting", "Description[ca@valencia]": "Configuració ràpida de la gravació de pantalla", "Description[ca]": "Configuració ràpida de l'enregistrament de pantalla", + "Description[es]": "Ajuste rápido de grabación de la pantalla", "Description[eu]": "Pantaila grabatzeko ezarpen azkarra", "Description[fr]": "Configuration rapide de l'enregistrement d'écran", "Description[ka]": "ეკრანის ჩაწერის სწრაფი მორგება", diff --git a/quicksettings/screenrotation/package/metadata.json b/quicksettings/screenrotation/package/metadata.json index 2adfd533..17aaeb7c 100644 --- a/quicksettings/screenrotation/package/metadata.json +++ b/quicksettings/screenrotation/package/metadata.json @@ -31,6 +31,7 @@ "Description": "Screen rotation quick setting", "Description[ca@valencia]": "Configuració ràpida del gir de pantalla", "Description[ca]": "Configuració ràpida del gir de pantalla", + "Description[es]": "Ajuste rápido de rotación de la pantalla", "Description[eu]": "Pantaila biratzearen ezarpen azkarra", "Description[fr]": "Configuration rapide pour la rotation d'écran", "Description[ka]": "ეკრანის ტრიალის სწრაფი მორგება",