From ed9fe37985662c81d49143035c77a0c37cd870b5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 21 Jul 2019 05:20:01 +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" --- krfb/krfb-events.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/krfb/krfb-events.desktop b/krfb/krfb-events.desktop index 69e2eaa8..1e303ff9 100644 --- a/krfb/krfb-events.desktop +++ b/krfb/krfb-events.desktop @@ -8,6 +8,7 @@ Comment[ca@valencia]=Connectors d'esdeveniments per al KRfb. Comment[de]=Ereignis-Module für KRfb Comment[en_GB]=Event plugins for KRfb Comment[es]=Complementos de eventos para KRfb +Comment[fr]=Modules externes d'événements pour Krfb Comment[gl]=Complementos de eventos para KRfb Comment[it]=Estensioni degli eventi per KRfb Comment[ko]=KRfb 이벤트 플러그인