From 051847ea72ad8625c2742d2e78fda70be836d42e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 28 Sep 2016 09:24:12 +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 6be36a918..82de6ac64 100644 --- a/translations.desktop +++ b/translations.desktop @@ -22,6 +22,7 @@ Name[el]=Γλώσσα Name[en_GB]=Language Name[es]=Idioma Name[et]=Keel +Name[fi]=Kieli Name[he]=שפה Name[it]=Lingua Name[nl]=Taal