From ad34f6f112056d321db57e6ae2be70077bd9dcb9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 21 Jul 2024 01:22: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/taskpanel/package/metadata.json | 2 +- .../metadata.json | 4 ++++ .../org.kde.plasma.mobile.defaultStatusBar/metadata.json | 4 ++++ lookandfeel/metadata.json | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/containments/taskpanel/package/metadata.json b/containments/taskpanel/package/metadata.json index 080265ac..685178ee 100644 --- a/containments/taskpanel/package/metadata.json +++ b/containments/taskpanel/package/metadata.json @@ -33,7 +33,7 @@ "Description[nl]": "Navigatiepaneel voor Plasma Mobile", "Description[nn]": "Navigasjonspanel for Plasma Mobile", "Description[pa]": "ਪਲਾਜ਼ਮਾ ਮੋਬਾਈਲ ਲਈ ਨੇਵੀਗੇਸ਼ਨ ਪੈਨਲ", - "Description[pl]": "Panel poruszania się dla Przenośnej Plazmy", + "Description[pl]": "Pasek poruszania się dla Przenośnej Plazmy", "Description[pt]": "Painel de navegação do Plasma Mobile", "Description[pt_BR]": "Painel de navegação do Plasma Mobile", "Description[ru]": "Панель навигации Plasma Mobile", diff --git a/layout-templates/org.kde.plasma.mobile.defaultNavigationPanel/metadata.json b/layout-templates/org.kde.plasma.mobile.defaultNavigationPanel/metadata.json index 0c651e52..8f314cb8 100644 --- a/layout-templates/org.kde.plasma.mobile.defaultNavigationPanel/metadata.json +++ b/layout-templates/org.kde.plasma.mobile.defaultNavigationPanel/metadata.json @@ -15,6 +15,7 @@ "Description": "Default navigation panel for mobile", "Description[ca@valencia]": "Quadro de navegació predeterminat per al mòbil", "Description[ca]": "Plafó de navegació predeterminat per al mòbil", + "Description[eo]": "Defaŭlta navigpanelo por poŝtelefono", "Description[es]": "Panel de navegación predeterminado para dispositivos móviles", "Description[eu]": "Mugikorrerako nabigatzeko panel lehenetsia", "Description[he]": "לוח ניווט כברירת מחדל לנייד", @@ -22,6 +23,7 @@ "Description[ka]": "ნაგულისხმევი ნავიგაციის პანელი მობილური მოწყობილობებისთვის", "Description[nl]": "Standaard navigatiepaneel voor mobiel", "Description[nn]": "Standard navigasjonspanel for mobil", + "Description[pl]": "Pasek poruszania się", "Description[sl]": "Privzeta krmilna plošča za mobilne naprave", "Description[sv]": "Standardnavigeringspanel för mobil", "Description[tr]": "Cep için öntanımlı dolaşım paneli", @@ -34,6 +36,7 @@ "Name": "Default Mobile Navigation Panel", "Name[ca@valencia]": "Quadro de navegació predeterminat del mòbil", "Name[ca]": "Plafó de navegació predeterminat del mòbil", + "Name[eo]": "Defaŭlta Poŝtelefona Navigpanelo", "Name[es]": "Panel de navegación móvil predeterminado", "Name[eu]": "Mugikorreko nabigatzeko panel lehenetsia", "Name[he]": "לוח ניווט כברירת מחדל לנייד", @@ -41,6 +44,7 @@ "Name[ka]": "ნაგულისხმევი მობილური ნავიგაციის პანელი", "Name[nl]": "Standaard navigatiepaneel van mobiel", "Name[nn]": "Standard mobil­navigasjonspanel", + "Name[pl]": "Domyślny pasek poruszania się", "Name[sl]": "Privzeta postavitev za mobilne naprave", "Name[sv]": "Mobil standardnavigeringspanel", "Name[tr]": "Öntanımlı Taşınabilir Dolaşım Paneli", diff --git a/layout-templates/org.kde.plasma.mobile.defaultStatusBar/metadata.json b/layout-templates/org.kde.plasma.mobile.defaultStatusBar/metadata.json index c50c7406..e1171424 100644 --- a/layout-templates/org.kde.plasma.mobile.defaultStatusBar/metadata.json +++ b/layout-templates/org.kde.plasma.mobile.defaultStatusBar/metadata.json @@ -15,6 +15,7 @@ "Description": "Default status bar for mobile", "Description[ca@valencia]": "Barra d'estat predeterminada per al mòbil", "Description[ca]": "Barra d'estat predeterminada per al mòbil", + "Description[eo]": "Defaŭlta statusbreto por poŝtelefono", "Description[es]": "Barra de estado predeterminada para dispositivos móviles", "Description[eu]": "Mugikorrerako egoera-barra lehenetsia", "Description[he]": "מצב ברירת מחדל לנייד", @@ -22,6 +23,7 @@ "Description[ka]": "ნაგულისხმევი სტატუსი მობილური მოწყობილობებისთვის", "Description[nl]": "Standaard statusbalk van mobiel", "Description[nn]": "Standard statuslinje for mobil", + "Description[pl]": "Domyślny pasek stanu", "Description[sl]": "Privzeta vrstica stanja za mobilne naprave", "Description[sv]": "Standardstatusrad för mobil", "Description[tr]": "Cep için öntanımlı durum çubuğu", @@ -34,6 +36,7 @@ "Name": "Default Mobile Status Bar", "Name[ca@valencia]": "Barra d'estat predeterminada del mòbil", "Name[ca]": "Barra d'estat predeterminada del mòbil", + "Name[eo]": "Defaŭlta Poŝtelefona Statusbreto", "Name[es]": "Barra de estado móvil predeterminada", "Name[eu]": "Mugikorreko egoera-barra lehenetsia", "Name[he]": "שורת מצב כברירת מחדל לנייד", @@ -41,6 +44,7 @@ "Name[ka]": "ნაგულისხმევი მობილური სტატუსის ზოლი", "Name[nl]": "Standaard statusbalk van mobiel", "Name[nn]": "Standard mobil­statuslinje", + "Name[pl]": "Domyślny pasek stanu", "Name[sl]": "Privzeta vrstica stanja za mobilne naprave", "Name[sv]": "Mobil standardstatusrad", "Name[tr]": "Öntanımlı Taşınabilir Durum Çubuğu", diff --git a/lookandfeel/metadata.json b/lookandfeel/metadata.json index bc79c475..d067de86 100644 --- a/lookandfeel/metadata.json +++ b/lookandfeel/metadata.json @@ -71,7 +71,7 @@ "Name": "Plasma Mobile Breeze", "Name[ca@valencia]": "Plasma Mobile Brisa", "Name[ca]": "Plasma Mobile Brisa", - "Name[eo]": "Plasma Poŝtelefono Brizo", + "Name[eo]": "Plasma-Poŝtelefona Breeze", "Name[es]": "Brisa de Plasma Mobile", "Name[eu]": "Plasma Mugikorra Breeze", "Name[fi]": "Plasma Mobilen Breeze",