From bffbbde688a10a398d46704c8104f6570fb547e5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 28 Jul 2021 01:20:15 +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" --- applets/manage-inputmethod/metadata.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/applets/manage-inputmethod/metadata.desktop b/applets/manage-inputmethod/metadata.desktop index ffc7f247a..56ecadc28 100644 --- a/applets/manage-inputmethod/metadata.desktop +++ b/applets/manage-inputmethod/metadata.desktop @@ -11,6 +11,7 @@ Name[fr]=Méthode de saisie Name[nl]=Invoermethode Name[pt]=Método de Entrada Name[ro]=Metodă de introducere +Name[sk]=Metóda vstupu Name[sv]=Inmatningsmetod Name[uk]=Спосіб введення Name[vi]=Phương thức nhập @@ -28,6 +29,7 @@ Comment[fr]=Gérer vos méthodes de saisie Comment[nl]=Uw invoermethoden beheren Comment[pt]=Faça a Gestão dos seus Métodos de Entrada de Dados Comment[ro]=Gestionați metodele de introducere +Comment[sk]=Spravujte svoje metódy vstupu Comment[sv]=Hantera dina inmatningsmetoder Comment[uk]=Керування вашими способами введення Comment[vi]=Quản lí các phương thức nhập