From fb5889a61fd8dcbc7d0e2ff9bd6b6b2e9db6c55a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 25 Jul 2021 01:14:50 +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 1c7e80da1..e8aff5830 100644 --- a/applets/manage-inputmethod/metadata.desktop +++ b/applets/manage-inputmethod/metadata.desktop @@ -5,6 +5,7 @@ Name[ca]=Mètode d'entrada Name[cs]=Metoda vstupu Name[es]=Método de entrada Name[nl]=Invoermethode +Name[pt]=Método de Entrada Name[sv]=Inmatningsmetod Name[uk]=Спосіб введення Name[x-test]=xxInput Methodxx @@ -14,6 +15,7 @@ Comment[ca]=Gestioneu els mètodes d'entrada Comment[cs]=Spravujte svoje metody vstupu Comment[es]=Gestión de métodos de entrada Comment[nl]=Uw invoermethoden beheren +Comment[pt]=Faça a Gestão dos seus Métodos de Entrada de Dados Comment[sv]=Hantera dina inmatningsmetoder Comment[uk]=Керування вашими способами введення Comment[x-test]=xxManage your Input Methodsxx