From d404ca52192e903b704ccbba033eb3ca3dcb036f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 15 Jul 2022 01:48:37 +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 feb9d16c9..08c93ba49 100644 --- a/containment/package/metadata.json +++ b/containment/package/metadata.json @@ -13,6 +13,7 @@ "Name[ko]": "Michail Vourlakos, Smith Ar", "Name[nl]": "Michail Vourlakos, Smith Ar", "Name[pt]": "Michail Vourlakos, Smith Ar", + "Name[pt_BR]": "Michail Vourlakos, Smith Ar", "Name[sl]": "Michail Vourlakos, Smith Ar", "Name[sv]": "Michail Vourlakos, Smith Ar", "Name[tr]": "Michail Vourlakos, Smith Ar", @@ -33,6 +34,7 @@ "Description[ko]": "Latte 독 컨테이너", "Description[nl]": "Container geleverd voor de Latte Dock", "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", "Description[sv]": "Omgivning tillhandahållen för Latte dockningsfönster", "Description[tr]": "Latte Rıhtım tarafından sağlanan kapsama", diff --git a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json index e6bd45612..f21a257cd 100644 --- a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json +++ b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json @@ -13,6 +13,7 @@ "Name[ko]": "Michail Vourlakos", "Name[nl]": "Michail Vourlakos", "Name[pt]": "Michail Vourlakos", + "Name[pt_BR]": "Michail Vourlakos", "Name[sl]": "Michail Vourlakos", "Name[sv]": "Michail Vourlakos", "Name[tr]": "Michail Vourlakos", @@ -32,6 +33,7 @@ "Description[ko]": "오른쪽 클릭 시 일반적으로 표시되는 Latte 메뉴", "Description[nl]": "Het menu van latte dat normaal getoond wordt bij rechtsklikken", "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", "Description[sv]": "Menyn i Latte som normalt visas vid högerklick", "Description[tr]": "Normalde sağ tıklama ile gösterilen Latte menüsü", diff --git a/indicators/default/metadata.json b/indicators/default/metadata.json index 1a6c64340..783f18cae 100644 --- a/indicators/default/metadata.json +++ b/indicators/default/metadata.json @@ -13,6 +13,7 @@ "Name[ko]": "Michail Vourlakos", "Name[nl]": "Michail Vourlakos", "Name[pt]": "Michail Vourlakos", + "Name[pt_BR]": "Michail Vourlakos", "Name[sl]": "Michail Vourlakos", "Name[sv]": "Michail Vourlakos", "Name[tr]": "Michail Vourlakos", @@ -32,6 +33,7 @@ "Description[ko]": "Latte 기본 표시기", "Description[nl]": "Standaard indicator van Latte", "Description[pt]": "Indicador predefinido do Latte", + "Description[pt_BR]": "Indicador padrão do Latte", "Description[sl]": "Privzeti kazalnik Latte", "Description[sv]": "Latte standardindikator", "Description[tr]": "Latte öntanımlı göstergesi", diff --git a/indicators/org.kde.latte.plasma/metadata.json b/indicators/org.kde.latte.plasma/metadata.json index 1f055797a..acffd581f 100644 --- a/indicators/org.kde.latte.plasma/metadata.json +++ b/indicators/org.kde.latte.plasma/metadata.json @@ -13,6 +13,7 @@ "Name[ko]": "Michail Vourlakos", "Name[nl]": "Michail Vourlakos", "Name[pt]": "Michail Vourlakos", + "Name[pt_BR]": "Michail Vourlakos", "Name[sl]": "Michail Vourlakos", "Name[sv]": "Michail Vourlakos", "Name[tr]": "Michail Vourlakos", @@ -32,6 +33,7 @@ "Description[ko]": "Latte Plasma 스타일 표시기", "Description[nl]": "Plasma stijlindicator van Latte", "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", "Description[sv]": "Latte Plasmastilindikator", "Description[tr]": "Latte Plasma biçemli gösterge", diff --git a/indicators/org.kde.latte.plasmatabstyle/metadata.json b/indicators/org.kde.latte.plasmatabstyle/metadata.json index ef984354f..f5ae695cf 100644 --- a/indicators/org.kde.latte.plasmatabstyle/metadata.json +++ b/indicators/org.kde.latte.plasmatabstyle/metadata.json @@ -13,6 +13,7 @@ "Name[ko]": "Michail Vourlakos", "Name[nl]": "Michail Vourlakos", "Name[pt]": "Michail Vourlakos", + "Name[pt_BR]": "Michail Vourlakos", "Name[sl]": "Michail Vourlakos", "Name[sv]": "Michail Vourlakos", "Name[tr]": "Michail Vourlakos", @@ -32,6 +33,7 @@ "Description[ko]": "Latte Plasma 탭 스타일 표시기", "Description[nl]": "Plasma-tabblad stijl indicator voor 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", "Description[sv]": "Plasma flikstilsindikator för Latte", "Description[tr]": "Latte için Plasma sekme biçemi göstergesi", diff --git a/plasmoid/package/metadata.json b/plasmoid/package/metadata.json index 25a0edc1b..cbeaf88a5 100644 --- a/plasmoid/package/metadata.json +++ b/plasmoid/package/metadata.json @@ -13,6 +13,7 @@ "Name[ko]": "Michail Vourlakos, Smith Ar", "Name[nl]": "Michail Vourlakos, Smith Ar", "Name[pt]": "Michail Vourlakos, Smith Ar", + "Name[pt_BR]": "Michail Vourlakos, Smith Ar", "Name[sl]": "Michail Vourlakos, Smith Ar", "Name[sv]": "Michail Vourlakos, Smith Ar", "Name[tr]": "Michail Vourlakos, Smith Ar", @@ -32,6 +33,7 @@ "Description[ko]": "Latte 독의 작업 Plasmoid", "Description[nl]": "Widget voor taken uit Latte Dock", "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", "Description[sv]": "Aktivitetsplasmoid för Latte dockningsfönster", "Description[tr]": "Latte Rıhtım'dan görevler Plasmoid'i", diff --git a/shell/package/metadata.json b/shell/package/metadata.json index 353cec5f9..7175bd2e9 100644 --- a/shell/package/metadata.json +++ b/shell/package/metadata.json @@ -13,6 +13,7 @@ "Name[ko]": "Michail Vourlakos, Smith Ar", "Name[nl]": "Michail Vourlakos, Smith Ar", "Name[pt]": "Michail Vourlakos, Smith Ar", + "Name[pt_BR]": "Michail Vourlakos, Smith Ar", "Name[sl]": "Michail Vourlakos, Smith Ar", "Name[sv]": "Michail Vourlakos, Smith Ar", "Name[tr]": "Michail Vourlakos, Smith Ar", @@ -31,6 +32,7 @@ "Description[ko]": "Latte 독용 셸", "Description[nl]": "Shell geleverd voor de Latte Dock", "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", "Description[sv]": "Skal tillhandahållet för Latte dockningsfönster", "Description[tr]": "Latte Rıhtım için sağlanan kabuk",