From 74f50ec30cdac90ff7f0483adcd663a2b78dafd2 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 9 Aug 2016 10:09:48 +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 19935a50d..1e440b9b2 100644 --- a/translations.desktop +++ b/translations.desktop @@ -22,6 +22,7 @@ Name[es]=Idioma Name[it]=Lingua Name[nl]=Taal Name[nn]=Språk +Name[pa]=ਭਾਸ਼ਾ Name[pl]=Język Name[pt]=Língua Name[sl]=Jezik