From 4ae96e718cf6e12c18ee361e24d7747d69cfdd9d Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 20 Jun 2022 01:54:41 +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" --- shell/package/metadata.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/package/metadata.json b/shell/package/metadata.json index eb9d54bd6..dbb846814 100644 --- a/shell/package/metadata.json +++ b/shell/package/metadata.json @@ -22,7 +22,7 @@ ], "Description": "Shell provided for the Latte Dock", "Description[az]": "Latte Dok paneli üçün nəzərdə tutulan üzlük", - "Description[ca@valencia]": "Intérpret d'ordres proporcionat per Latte Dock", + "Description[ca@valencia]": "Intèrpret d'ordres proporcionat per Latte Dock", "Description[ca]": "Intèrpret d'ordres proporcionat pel Latte Dock", "Description[es]": "Shell proporcionada para Latte Dock", "Description[fr]": "Interpréteur de commandes fourni pour le panneau de Latte", @@ -40,7 +40,7 @@ "Name": "Latte Shell", "Name[ar]": "صدفة لاتيه", "Name[az]": "Latte Üzlüyü", - "Name[ca@valencia]": "Intérpret d'ordres de Latte", + "Name[ca@valencia]": "Intèrpret d'ordres de Latte", "Name[ca]": "Intèrpret d'ordres del Latte", "Name[cs]": "Shell Latte", "Name[da]": "Latte-skal",