From c8b4c064cce8e66f87ba634c48d51f5455e4e3aa Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 24 Oct 2016 09:37:19 +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" --- translations.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/translations.desktop b/translations.desktop index 6679bf701..4f1f88a2d 100644 --- a/translations.desktop +++ b/translations.desktop @@ -23,6 +23,7 @@ Name[en_GB]=Language Name[es]=Idioma Name[et]=Keel Name[fi]=Kieli +Name[fr]=Langage Name[he]=שפה Name[it]=Lingua Name[ko]=언어