From 26c156c27b4b576e72c883dad768e8113f899f9c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 5 Nov 2017 06:02:11 +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" --- translations.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/translations.desktop b/translations.desktop index 36e477d25..9937b6d3e 100644 --- a/translations.desktop +++ b/translations.desktop @@ -27,6 +27,7 @@ Name[fr]=Langage Name[gl]=Idioma Name[he]=שפה Name[hu]=Nyelv +Name[id]=Bahasa Name[it]=Lingua Name[ja]=言語 Name[ko]=언어