From 60903d087cab6ab46631e695b0b939387b92de3c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 20 May 2019 05:28:59 +0200 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/org.kde.trojita.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Gui/org.kde.trojita.desktop b/src/Gui/org.kde.trojita.desktop index b3101bea..f3217bf9 100644 --- a/src/Gui/org.kde.trojita.desktop +++ b/src/Gui/org.kde.trojita.desktop @@ -128,6 +128,7 @@ Name[fi]=Uusi viesti Name[fr]=Nouveau message Name[gl]=Mensaxe nova Name[it]=Nuovo messaggio +Name[ko]=새 메시지 Name[nl]=Nieuw bericht Name[pl]=Nowa wiadomość Name[pt]=Nova Mensagem -- 2.11.4.GIT