From 55caf75ab49cc8ba5bf83faf24effde078f51844 Mon Sep 17 00:00:00 2001 From: l10n daemon script <scripty@kde.org> Date: Sun, 7 Aug 2022 01:49:36 +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" --- containment/package/metadata.json | 2 ++ .../contextmenu/plasma-containmentactions-lattecontextmenu.json | 2 ++ indicators/default/metadata.json | 2 ++ indicators/org.kde.latte.plasma/metadata.json | 2 ++ indicators/org.kde.latte.plasmatabstyle/metadata.json | 2 ++ plasmoid/package/metadata.json | 2 ++ shell/package/metadata.json | 2 ++ 7 files changed, 14 insertions(+) diff --git a/containment/package/metadata.json b/containment/package/metadata.json index f6f332742..d1fe81fe5 100644 --- a/containment/package/metadata.json +++ b/containment/package/metadata.json @@ -14,6 +14,7 @@ "Name[it]": "Michail Vourlakos, Smith Ar", "Name[ko]": "Michail Vourlakos, Smith Ar", "Name[nl]": "Michail Vourlakos, Smith Ar", + "Name[pl]": "Michail Vourlakos, Smith Ar", "Name[pt]": "Michail Vourlakos, Smith Ar", "Name[pt_BR]": "Michail Vourlakos, Smith Ar", "Name[sl]": "Michail Vourlakos, Smith Ar", @@ -37,6 +38,7 @@ "Description[it]": "Contenitore fornito per Latte Dock", "Description[ko]": "Latte 독 컨테이너", "Description[nl]": "Container geleverd voor de Latte Dock", + "Description[pl]": "Pojemnik dla doku Latte", "Description[pt]": "Contentor oferecido para a área acoplável do Latte", "Description[pt_BR]": "Contêiner fornecido pelo Latte Dock", "Description[sl]": "Zadrževalni prostor za Latte Dock", diff --git a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json index 8cf50e497..37095b22c 100644 --- a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json +++ b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json @@ -14,6 +14,7 @@ "Name[it]": "Michail Vourlakos", "Name[ko]": "Michail Vourlakos", "Name[nl]": "Michail Vourlakos", + "Name[pl]": "Michail Vourlakos", "Name[pt]": "Michail Vourlakos", "Name[pt_BR]": "Michail Vourlakos", "Name[sl]": "Michail Vourlakos", @@ -36,6 +37,7 @@ "Description[it]": "Il menu di Latte che normalmente viene mostrato al clic destro", "Description[ko]": "오른쪽 클릭 시 일반적으로 표시되는 Latte 메뉴", "Description[nl]": "Het menu van latte dat normaal getoond wordt bij rechtsklikken", + "Description[pl]": "Menu Latte, które normalnie pokazuj się po kliknięciu prawym", "Description[pt]": "O menu do Latte que normalmente aparece com o botão direito do rato", "Description[pt_BR]": "O menu do Latte que normalmente aparece ao clicar com o botão direito do mouse", "Description[sl]": "Meni latte, ki se običajno prikaže z desnim klikom", diff --git a/indicators/default/metadata.json b/indicators/default/metadata.json index a4d4feae2..c8f4eb331 100644 --- a/indicators/default/metadata.json +++ b/indicators/default/metadata.json @@ -14,6 +14,7 @@ "Name[it]": "Michail Vourlakos", "Name[ko]": "Michail Vourlakos", "Name[nl]": "Michail Vourlakos", + "Name[pl]": "Michail Vourlakos", "Name[pt]": "Michail Vourlakos", "Name[pt_BR]": "Michail Vourlakos", "Name[sl]": "Michail Vourlakos", @@ -36,6 +37,7 @@ "Description[it]": "Indicatore predefinito di Latte", "Description[ko]": "Latte 기본 표시기", "Description[nl]": "Standaard indicator van Latte", + "Description[pl]": "Domyślny wskaźnik Latte", "Description[pt]": "Indicador predefinido do Latte", "Description[pt_BR]": "Indicador padrão do Latte", "Description[sl]": "Privzeti kazalnik Latte", diff --git a/indicators/org.kde.latte.plasma/metadata.json b/indicators/org.kde.latte.plasma/metadata.json index 8cfbf633d..4994b8f1d 100644 --- a/indicators/org.kde.latte.plasma/metadata.json +++ b/indicators/org.kde.latte.plasma/metadata.json @@ -14,6 +14,7 @@ "Name[it]": "Michail Vourlakos", "Name[ko]": "Michail Vourlakos", "Name[nl]": "Michail Vourlakos", + "Name[pl]": "Michail Vourlakos", "Name[pt]": "Michail Vourlakos", "Name[pt_BR]": "Michail Vourlakos", "Name[sl]": "Michail Vourlakos", @@ -36,6 +37,7 @@ "Description[it]": "Indicatore stile di Plasma di Latte", "Description[ko]": "Latte Plasma 스타일 표시기", "Description[nl]": "Plasma stijlindicator van Latte", + "Description[pl]": "Wskaźnik Latte dla Plazmy", "Description[pt]": "Indicador de estilo do Plasma no Latte", "Description[pt_BR]": "Indicador de estilo do Plasma no Latte", "Description[sl]": "Kazalnik sloga Latte Plasma", diff --git a/indicators/org.kde.latte.plasmatabstyle/metadata.json b/indicators/org.kde.latte.plasmatabstyle/metadata.json index 3a606af42..a929500fd 100644 --- a/indicators/org.kde.latte.plasmatabstyle/metadata.json +++ b/indicators/org.kde.latte.plasmatabstyle/metadata.json @@ -14,6 +14,7 @@ "Name[it]": "Michail Vourlakos", "Name[ko]": "Michail Vourlakos", "Name[nl]": "Michail Vourlakos", + "Name[pl]": "Michail Vourlakos", "Name[pt]": "Michail Vourlakos", "Name[pt_BR]": "Michail Vourlakos", "Name[sl]": "Michail Vourlakos", @@ -36,6 +37,7 @@ "Description[it]": "Indicatore stile delle schede di Plasma di Latte", "Description[ko]": "Latte Plasma 탭 스타일 표시기", "Description[nl]": "Plasma-tabblad stijl indicator voor Latte", + "Description[pl]": "Wskaźnik wyglądu karty Plazmy dla Latte", "Description[pt]": "Indicador do estilo de Páginas do Plasma para o Latte", "Description[pt_BR]": "Indicador de estilo de abas do Plasma para o Latte", "Description[sl]": "Kazalnik sloga Latte Plasma zavihkov", diff --git a/plasmoid/package/metadata.json b/plasmoid/package/metadata.json index 786abbaa2..b854b41a5 100644 --- a/plasmoid/package/metadata.json +++ b/plasmoid/package/metadata.json @@ -14,6 +14,7 @@ "Name[it]": "Michail Vourlakos, Smith Ar", "Name[ko]": "Michail Vourlakos, Smith Ar", "Name[nl]": "Michail Vourlakos, Smith Ar", + "Name[pl]": "Michail Vourlakos, Smith Ar", "Name[pt]": "Michail Vourlakos, Smith Ar", "Name[pt_BR]": "Michail Vourlakos, Smith Ar", "Name[sl]": "Michail Vourlakos, Smith Ar", @@ -36,6 +37,7 @@ "Description[it]": "Plasmoide dei processi da Latte Dock", "Description[ko]": "Latte 독의 작업 Plasmoid", "Description[nl]": "Widget voor taken uit Latte Dock", + "Description[pl]": "Plazmoidy zadań dla doku Latte", "Description[pt]": "Plasmóide de tarefas da Área Acoplável do Latte", "Description[pt_BR]": "Plasmoide de tarefas do Latte Dock", "Description[sl]": "Plasmoidi nalog iz Latte Dock", diff --git a/shell/package/metadata.json b/shell/package/metadata.json index 24ea79aca..7d108240f 100644 --- a/shell/package/metadata.json +++ b/shell/package/metadata.json @@ -14,6 +14,7 @@ "Name[it]": "Michail Vourlakos, Smith Ar", "Name[ko]": "Michail Vourlakos, Smith Ar", "Name[nl]": "Michail Vourlakos, Smith Ar", + "Name[pl]": "Michail Vourlakos, Smith Ar", "Name[pt]": "Michail Vourlakos, Smith Ar", "Name[pt_BR]": "Michail Vourlakos, Smith Ar", "Name[sl]": "Michail Vourlakos, Smith Ar", @@ -35,6 +36,7 @@ "Description[it]": "Shell fornita per Latte Dock", "Description[ko]": "Latte 독용 셸", "Description[nl]": "Shell geleverd voor de Latte Dock", + "Description[pl]": "Powłoka dla doku Latte", "Description[pt]": "Consola oferecida para a área acoplável do Latte", "Description[pt_BR]": "Shell fornecido pelo Latte Dock", "Description[sl]": "Shell za Latte Dock",