From abd13144b36937d4fa5640290bee918972a20862 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 11 Oct 2017 08:50:16 +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" --- appmenu/appmenu.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appmenu/appmenu.desktop b/appmenu/appmenu.desktop index 13497c604..377818cad 100644 --- a/appmenu/appmenu.desktop +++ b/appmenu/appmenu.desktop @@ -15,7 +15,7 @@ Name[et]=Rakenduste menüü deemon Name[eu]=Aplikazio-menuen daimona Name[fi]=Sovellusvalikkopalvelu Name[fr]=Démon de menus des applications -Name[gl]=Daemon de menús do aplicativo +Name[gl]=Servizo de menús do aplicativo Name[he]=תהליך רקע של תפריט היישומים Name[hu]=Alkalmazás menük démon Name[ia]=Demone de menus de application