From bb4c89a20ac21b4594a4a96674f3f41dfd089d77 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 20 Aug 2016 09:42: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 1e440b9b2..ab5f1a8ef 100644 --- a/translations.desktop +++ b/translations.desktop @@ -19,6 +19,7 @@ Name[de]=Sprache Name[el]=Γλώσσα Name[en_GB]=Language Name[es]=Idioma +Name[et]=Keel Name[it]=Lingua Name[nl]=Taal Name[nn]=Språk