From e11f31f48d5fef332c0ea7868aa5f425027dbcd0 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 20 Sep 2022 01:50:04 +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/folio/package/metadata.json | 2 ++ containments/homescreens/halcyon/package/metadata.json | 1 + containments/panel/package/metadata.json | 1 + containments/taskpanel/package/metadata.json | 1 + quicksettings/caffeine/metadata.json | 1 + quicksettings/donotdisturb/metadata.json | 2 ++ quicksettings/keyboardtoggle/metadata.json | 1 + quicksettings/nightcolor/package/metadata.json | 1 + quicksettings/powermenu/package/metadata.json | 1 + quicksettings/record/metadata.json | 2 ++ quicksettings/screenrotation/package/metadata.json | 1 + 11 files changed, 14 insertions(+) diff --git a/containments/homescreens/folio/package/metadata.json b/containments/homescreens/folio/package/metadata.json index b90a8616..72ebae21 100644 --- a/containments/homescreens/folio/package/metadata.json +++ b/containments/homescreens/folio/package/metadata.json @@ -37,6 +37,7 @@ "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[it]": "Schermata home mobile con particolare attenzione alla personalizzazione.", "Description[ka]": "მობილური საწყისი ეკრანი მორგებადობაზე ფოკუსით.", "Description[nl]": "Een startscherm voor een mobiel gericht op aanpasbaarheid.", "Description[pt]": "Ecrã inicial móvel com um foco na personalização.", @@ -53,6 +54,7 @@ "Name[es]": "Folio", "Name[eu]": "Folio", "Name[fr]": "Porte-feuille", + "Name[it]": "Folio", "Name[ka]": "ფოლიო", "Name[nl]": "Folio", "Name[pt]": "Folio", diff --git a/containments/homescreens/halcyon/package/metadata.json b/containments/homescreens/halcyon/package/metadata.json index 18637a80..8498318a 100644 --- a/containments/homescreens/halcyon/package/metadata.json +++ b/containments/homescreens/halcyon/package/metadata.json @@ -38,6 +38,7 @@ "Description[eu]": "Sinpletasuna eta erabilerraztasuna helburu duen mugikorrerako etxeko pantaila bat.", "Description[fi]": "Yksinkertaisuuteen ja helppokäyttöisyyteen keskittyvä mobiilikotinäyttö.", "Description[fr]": "Un écran d'accueil pour périphérique mobile, centré sur la simplicité et la facilité d'utilisation.", + "Description[it]": "Una schermata iniziale mobile incentrata sulla semplicità e sulla facilità d'uso.", "Description[ka]": "მობილური საწყისი ეკრანი სიმარტივეზე და სიადვილეზე ფოკუსით.", "Description[ko]": "간단함과 사용 편의성에 초점을 맞춘 모바일 홈 화면입니다.", "Description[nl]": "Een startscherm voor een mobiel gericht op eenvoud en gebruiksgemak.", diff --git a/containments/panel/package/metadata.json b/containments/panel/package/metadata.json index a81b0314..8832191a 100644 --- a/containments/panel/package/metadata.json +++ b/containments/panel/package/metadata.json @@ -37,6 +37,7 @@ "Description[es]": "Panel superior para Plasma Mobile", "Description[eu]": "Plasma Mugikorrerako goiko panela", "Description[fr]": "Panneau supérieur pour Plasma Mobile", + "Description[it]": "Pannello superiore per Plasma Mobile", "Description[ka]": "Plasma Mobile-ის ზედა პანელი", "Description[nl]": "Hoofdpaneel voor Plasma-mobiel", "Description[pt]": "Painel de topo do Plasma Mobile", diff --git a/containments/taskpanel/package/metadata.json b/containments/taskpanel/package/metadata.json index d351731a..42d09ea0 100644 --- a/containments/taskpanel/package/metadata.json +++ b/containments/taskpanel/package/metadata.json @@ -37,6 +37,7 @@ "Description[es]": "Panel de navegación para Plasma Mobile", "Description[eu]": "Plasma Mugikorrerako nabigatzeko panela", "Description[fr]": "Panneau de navigation pour Plasma Mobile", + "Description[it]": "Pannello di navigazione per Plasma Mobile", "Description[ka]": "Plasma Mobile-ის ნავიგაციის პანელი", "Description[nl]": "Navigatiepaneel voor Plasma-mobiel", "Description[pt]": "Painel de navegação do Plasma Mobile", diff --git a/quicksettings/caffeine/metadata.json b/quicksettings/caffeine/metadata.json index 731b5b84..e0b73ba8 100644 --- a/quicksettings/caffeine/metadata.json +++ b/quicksettings/caffeine/metadata.json @@ -35,6 +35,7 @@ "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[it]": "Impostazione rapida per la sospensione del sistema", "Description[ka]": "სისტემის ძილის შეწყვეტის სწრაფ მორგება", "Description[nl]": "Snelle instelling systeemslaap te onderbreken", "Description[pt]": "Configuração rápida para interromper a suspensão do sistema", diff --git a/quicksettings/donotdisturb/metadata.json b/quicksettings/donotdisturb/metadata.json index 7af6c543..5c06805b 100644 --- a/quicksettings/donotdisturb/metadata.json +++ b/quicksettings/donotdisturb/metadata.json @@ -35,6 +35,7 @@ "Description[es]": "Ajuste rápido para cambiar el modo «no molestar»", "Description[eu]": "Zaratarik ez modua txandakatzeko ezarpen azkarra", "Description[fr]": "Configuration rapide pour basculer ou non en mode « Ne pas déranger »", + "Description[it]": "Impostazione rapida per commutare la modalità Non disturbare", "Description[ka]": "სისტემის ძილის შეწყვეტის სწრაფი მორგება", "Description[nl]": "Snelle instelling om modus niet storen om te schakelen", "Description[pt]": "Configuração rápida para activar/desactivar o modo 'não incomodar'", @@ -52,6 +53,7 @@ "Name[es]": "No molestar", "Name[eu]": "Zatarik ez", "Name[fr]": "Ne pas déranger", + "Name[it]": "Non disturbare", "Name[ka]": "არ შემაწუხო", "Name[nl]": "Niet storen", "Name[pt]": "Não Incomodar", diff --git a/quicksettings/keyboardtoggle/metadata.json b/quicksettings/keyboardtoggle/metadata.json index acb2e35b..bd0242ca 100644 --- a/quicksettings/keyboardtoggle/metadata.json +++ b/quicksettings/keyboardtoggle/metadata.json @@ -35,6 +35,7 @@ "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[it]": "Impostazione rapida per la commutazione della tastiera", "Description[ka]": "პარამეტრების აპლიკაციის სწრაფი მორგება", "Description[nl]": "Snelle instelling voor omschakelen van toetsenbord", "Description[pt]": "Configuração rápida da comutação do teclado", diff --git a/quicksettings/nightcolor/package/metadata.json b/quicksettings/nightcolor/package/metadata.json index cdef74a8..6f27ea2f 100644 --- a/quicksettings/nightcolor/package/metadata.json +++ b/quicksettings/nightcolor/package/metadata.json @@ -36,6 +36,7 @@ "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[it]": "Impostazione rapida del colore notturno", "Description[ka]": "ღამის ფერების სწრაფი მორგება", "Description[nl]": "Snelle instelling voor nachtkleur", "Description[pt]": "Configuração rápida da cor nocturna", diff --git a/quicksettings/powermenu/package/metadata.json b/quicksettings/powermenu/package/metadata.json index b8b6861a..b982988b 100644 --- a/quicksettings/powermenu/package/metadata.json +++ b/quicksettings/powermenu/package/metadata.json @@ -35,6 +35,7 @@ "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[it]": "Impostazione rapida del menu di alimentazione", "Description[ka]": "კვების მენიუს სწრაფი მორგება", "Description[nl]": "Snelle instelling energiemenu", "Description[pt]": "Configuração rápida do menu de energia", diff --git a/quicksettings/record/metadata.json b/quicksettings/record/metadata.json index 3273a36e..85ec93e0 100644 --- a/quicksettings/record/metadata.json +++ b/quicksettings/record/metadata.json @@ -35,6 +35,7 @@ "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[it]": "Impostazioni rapide di registrazione dello schermo", "Description[ka]": "ეკრანის ჩაწერის სწრაფი მორგება", "Description[nl]": "Snelle instelling van scherm opnemen", "Description[pt]": "Configuração rápida da gravação do ecrã", @@ -52,6 +53,7 @@ "Name[es]": "Grabar la pantalla", "Name[eu]": "Grabatu pantaila", "Name[fr]": "Enregistrer l'écran", + "Name[it]": "Registra schermo", "Name[ka]": "ეკრანის ჩასწერა", "Name[nl]": "Scherm opnemen", "Name[pt]": "Gravar o Ecrã", diff --git a/quicksettings/screenrotation/package/metadata.json b/quicksettings/screenrotation/package/metadata.json index 062bb802..7b53ba57 100644 --- a/quicksettings/screenrotation/package/metadata.json +++ b/quicksettings/screenrotation/package/metadata.json @@ -35,6 +35,7 @@ "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[it]": "Impostazione rapida della rotazione dello schermo", "Description[ka]": "ეკრანის ტრიალის სწრაფი მორგება", "Description[nl]": "Snelle instelling van schermrotatie", "Description[pt]": "Configuração rápida da rotação do ecrã",