From f94e5bc84326a3dc9e91530bb37c6b4896f0f355 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 19 May 2022 01:42:43 +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" --- app/lattedock.notifyrc | 2 +- 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/metadata.json.in | 2 ++ shell/package/metadata.json | 2 ++ 8 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/lattedock.notifyrc b/app/lattedock.notifyrc index 21beb47da..ab308fb61 100644 --- a/app/lattedock.notifyrc +++ b/app/lattedock.notifyrc @@ -298,7 +298,7 @@ Name=Switch to layout Name[ar]=بدل إلى تخطيط Name[az]=Maketi Keçmək Name[ca]=Commuta a la disposició -Name[ca@valencia]=Commuta a la disposició +Name[ca@valencia]=Canvia a la disposició Name[cs]=Přepnout na rozložení Name[da]=Skift til layout Name[de]=Wechsel zu Profil diff --git a/containment/package/metadata.json b/containment/package/metadata.json index bc7559e41..6409db33b 100644 --- a/containment/package/metadata.json +++ b/containment/package/metadata.json @@ -6,6 +6,7 @@ "Name": "Michail Vourlakos, Smith Ar", "Name[ca@valencia]": "Michail Vourlakos, Smith Ar", "Name[ca]": "Michail Vourlakos, Smith Ar", + "Name[fr]": "Michail Vourlakos, Smith Ar", "Name[nl]": "Michail Vourlakos, Smith Ar", "Name[pt]": "Michail Vourlakos, Smith Ar", "Name[sl]": "Michail Vourlakos, Smith Ar", @@ -19,6 +20,7 @@ "Description": "Containment provided for the Latte Dock", "Description[ca@valencia]": "Contenidor proporcionat per Latte Dock", "Description[ca]": "Contenidor proporcionat pel Latte Dock", + "Description[fr]": "Confinement fourni pour le panneau de Latte", "Description[nl]": "Container geleverd voor de Latte Dock", "Description[pt]": "Contentor oferecido para a área acoplável do Latte", "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 08f583a27..7dd2e9c97 100644 --- a/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json +++ b/containmentactions/contextmenu/plasma-containmentactions-lattecontextmenu.json @@ -6,6 +6,7 @@ "Name": "Michail Vourlakos", "Name[ca@valencia]": "Michail Vourlakos", "Name[ca]": "Michail Vourlakos", + "Name[fr]": "Michail Vourlakos", "Name[nl]": "Michail Vourlakos", "Name[pt]": "Michail Vourlakos", "Name[sl]": "Michail Vourlakos", @@ -18,6 +19,7 @@ "Description": "The latte menu that normally shows on right-click", "Description[ca@valencia]": "El menú Latte que es mostra normalment amb un clic del botó dret", "Description[ca]": "El menú Latte que es mostra normalment amb un clic del botó dret", + "Description[fr]": "Le menu de Latte s'affichant normalement sur un clic droit", "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[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 0e1c12bcc..019e330e1 100644 --- a/indicators/default/metadata.json +++ b/indicators/default/metadata.json @@ -6,6 +6,7 @@ "Name": "Michail Vourlakos", "Name[ca@valencia]": "Michail Vourlakos", "Name[ca]": "Michail Vourlakos", + "Name[fr]": "Michail Vourlakos", "Name[nl]": "Michail Vourlakos", "Name[pt]": "Michail Vourlakos", "Name[sl]": "Michail Vourlakos", @@ -18,6 +19,7 @@ "Description": "Latte default indicator", "Description[ca@valencia]": "Indicador predeterminat de Latte", "Description[ca]": "Indicador predeterminat del Latte", + "Description[fr]": "Indicateur de Latte par défaut", "Description[nl]": "Standaard indicator van Latte", "Description[pt]": "Indicador predefinido 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 de94fc712..499271928 100644 --- a/indicators/org.kde.latte.plasma/metadata.json +++ b/indicators/org.kde.latte.plasma/metadata.json @@ -6,6 +6,7 @@ "Name": "Michail Vourlakos", "Name[ca@valencia]": "Michail Vourlakos", "Name[ca]": "Michail Vourlakos", + "Name[fr]": "Michail Vourlakos", "Name[nl]": "Michail Vourlakos", "Name[pt]": "Michail Vourlakos", "Name[sl]": "Michail Vourlakos", @@ -18,6 +19,7 @@ "Description": "Latte Plasma style indicator", "Description[ca@valencia]": "Indicador a l'estil Plasma de Latte", "Description[ca]": "Indicador a l'estil Plasma del Latte", + "Description[fr]": "Indicateur de Latte dans le style de Plasma", "Description[nl]": "Plasma stijlindicator van Latte", "Description[pt]": "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 93f2895af..c0ef9e35d 100644 --- a/indicators/org.kde.latte.plasmatabstyle/metadata.json +++ b/indicators/org.kde.latte.plasmatabstyle/metadata.json @@ -6,6 +6,7 @@ "Name": "Michail Vourlakos", "Name[ca@valencia]": "Michail Vourlakos", "Name[ca]": "Michail Vourlakos", + "Name[fr]": "Michail Vourlakos", "Name[nl]": "Michail Vourlakos", "Name[pt]": "Michail Vourlakos", "Name[sl]": "Michail Vourlakos", @@ -18,6 +19,7 @@ "Description": "Plasma Tab style indicator for Latte", "Description[ca@valencia]": "Indicador a l'estil pestanya de Plasma per a Latte", "Description[ca]": "Indicador a l'estil pestanya del Plasma per al Latte", + "Description[fr]": "Indicateur dans le style des onglets de Plasma pour Latte", "Description[nl]": "Plasma-tabblad stijl indicator voor Latte", "Description[pt]": "Indicador do estilo de Páginas do Plasma para o Latte", "Description[sl]": "Kazalnik sloga Latte Plasma zavihkov", diff --git a/plasmoid/metadata.json.in b/plasmoid/metadata.json.in index 985d8d920..06d7d0418 100644 --- a/plasmoid/metadata.json.in +++ b/plasmoid/metadata.json.in @@ -6,6 +6,7 @@ "Name": "Michail Vourlakos, Smith Ar", "Name[ca@valencia]": "Michail Vourlakos, Smith Ar", "Name[ca]": "Michail Vourlakos, Smith Ar", + "Name[fr]": "Michail Vourlakos, Smith Ar", "Name[nl]": "Michail Vourlakos, Smith Ar", "Name[pt]": "Michail Vourlakos, Smith Ar", "Name[sl]": "Michail Vourlakos, Smith Ar", @@ -18,6 +19,7 @@ "Description": "Tasks plasmoid from Latte Dock", "Description[ca@valencia]": "Plasmoide de tasques de Latte Dock", "Description[ca]": "Plasmoide de tasques del Latte Dock", + "Description[fr]": "Composant graphique de tâches pour le panneau de Latte", "Description[nl]": "Widget voor taken uit Latte Dock", "Description[pt]": "Plasmóide de tarefas da Área Acoplável do Latte", "Description[sl]": "Plasmoidi nalog iz Latte Dock", diff --git a/shell/package/metadata.json b/shell/package/metadata.json index 02a6ecf99..ad2d5b6b2 100644 --- a/shell/package/metadata.json +++ b/shell/package/metadata.json @@ -6,6 +6,7 @@ "Name": "Michail Vourlakos, Smith Ar", "Name[ca@valencia]": "Michail Vourlakos, Smith Ar", "Name[ca]": "Michail Vourlakos, Smith Ar", + "Name[fr]": "Michail Vourlakos, Smith Ar", "Name[nl]": "Michail Vourlakos, Smith Ar", "Name[pt]": "Michail Vourlakos, Smith Ar", "Name[sl]": "Michail Vourlakos, Smith Ar", @@ -17,6 +18,7 @@ "Description": "Shell provided for the Latte Dock", "Description[ca@valencia]": "Intèrpret d'ordres proporcionat per Latte Dock", "Description[ca]": "Intèrpret d'ordres proporcionat pel Latte Dock", + "Description[fr]": "Interpréteur de commandes fourni pour le panneau de Latte", "Description[nl]": "Shell geleverd voor de Latte Dock", "Description[pt]": "Consola oferecida para a área acoplável do Latte", "Description[sl]": "Shell za Latte Dock",