From 9122ab0a67db94cb521185121de2f6e70a9bd262 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 10 May 2017 07:43:26 +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" --- applets/appmenu/package/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/applets/appmenu/package/metadata.desktop b/applets/appmenu/package/metadata.desktop index 358d4717a..f38aa25c8 100644 --- a/applets/appmenu/package/metadata.desktop +++ b/applets/appmenu/package/metadata.desktop @@ -10,6 +10,7 @@ Name[el]=Καθολικό μενού Name[en_GB]=Global Menu Name[es]=Menú global Name[eu]=Menu orokorra +Name[fi]=Yleisvalikko Name[hu]=Globális menü Name[it]=Menu globale Name[nl]=Globaal menu