From 9782c8574b7ec1348bdec46281e0632ae801df5c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 9 Aug 2016 12:40:34 +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" --- menu/desktop/kf5-education.directory | 1 + 1 file changed, 1 insertion(+) diff --git a/menu/desktop/kf5-education.directory b/menu/desktop/kf5-education.directory index 18ed68aa9..34f024d25 100644 --- a/menu/desktop/kf5-education.directory +++ b/menu/desktop/kf5-education.directory @@ -12,6 +12,7 @@ Name[da]=Uddannelse Name[de]=Lernprogramme Name[el]=Εκπαίδευση Name[en_GB]=Education +Name[eo]=Edukado Name[es]=Educación Name[et]=Haridus Name[fi]=Opetus