From 515aa406471d7ba33937345d831eba7b0ff8df5c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 19 Jul 2016 03:45:30 +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" --- src/Gui/trojita.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Gui/trojita.desktop b/src/Gui/trojita.desktop index 2f6a99d5..8c917e5e 100644 --- a/src/Gui/trojita.desktop +++ b/src/Gui/trojita.desktop @@ -112,6 +112,7 @@ Actions=Composer; [Desktop Action Composer] Name=New Message Name[ca]=Missatge nou +Name[ca@valencia]=Missatge nou Name[cs]=Nová zpráva Name[nl]=Nieuw bericht Name[pt]=Nova Mensagem -- 2.11.4.GIT