From c874e5d6b6cf15fd888812ea2cebd9c3803de241 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 21 Oct 2016 12:02:16 +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 1ada69073..8dd65e484 100644 --- a/translations.desktop +++ b/translations.desktop @@ -24,6 +24,7 @@ Name[et]=Keel Name[fi]=Kieli Name[he]=שפה Name[it]=Lingua +Name[ko]=언어 Name[nl]=Taal Name[nn]=Språk Name[pa]=ਭਾਸ਼ਾ