From 864cb2c4ad875b196eda5bd13f9204e90b4754d9 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 11 Feb 2017 06:09:41 +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" --- applets/appmenu/package/metadata.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/applets/appmenu/package/metadata.desktop b/applets/appmenu/package/metadata.desktop index edb37010a..d46ee73e0 100644 --- a/applets/appmenu/package/metadata.desktop +++ b/applets/appmenu/package/metadata.desktop @@ -1,6 +1,8 @@ [Desktop Entry] Encoding=UTF-8 Name=Global Menu +Name[ca]=Menú global +Name[en_GB]=Global Menu Name[nl]=Globaal menu Name[pt]=Menu Global Name[uk]=Загальне меню