From 3903be520b8d2c79a55a6420d372186be80efe92 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 18 Feb 2018 05:00:39 +0100 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" --- korganizer/plugins/lunarphases/lunarphases.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/korganizer/plugins/lunarphases/lunarphases.desktop b/korganizer/plugins/lunarphases/lunarphases.desktop index be8108b6..8bf58644 100644 --- a/korganizer/plugins/lunarphases/lunarphases.desktop +++ b/korganizer/plugins/lunarphases/lunarphases.desktop @@ -3,6 +3,7 @@ X-KDE-Library=korg_lunarphases Name=Lunar Phases Plugin for Calendars Name[ca]=Connector de fases lunars pels calendaris Name[ca@valencia]=Connector de fases lunars pels calendaris +Name[de]=Mondphasen-Modul für Kalender Name[fr]=Module de phases lunaires pour les agendas Name[it]=Estensione fasi lunari per i calendari Name[nl]=Plug-in voor maanfasen voor kalenders -- GitLab