From 10c7011ee82b9965d2569bea7a0941d622a6cc63 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 18 Jul 2016 10:10:55 +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 a99d4a65a..476994613 100644 --- a/translations.desktop +++ b/translations.desktop @@ -14,6 +14,7 @@ X-KDE-Weight=40 Name=Language Name[ca]=Idioma Name[es]=Idioma +Name[nl]=Taal Name[pl]=Język Name[pt]=Língua Name[sv]=Språk