From 7f398af180d99d725169d0710bad114b3b1f12cc Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 15 Jul 2018 05:21:01 +0200 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" --- effects/logout/package/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/effects/logout/package/metadata.desktop b/effects/logout/package/metadata.desktop index 43fea23ff5..1595b7c91d 100644 --- a/effects/logout/package/metadata.desktop +++ b/effects/logout/package/metadata.desktop @@ -20,7 +20,7 @@ Name[it]=uscita Name[ko]=로그아웃 Name[nl]=afmelden Name[nn]=Utlogging -Name[pl]=wylogowanie +Name[pl]=Wylogowywanie Name[pt]=encerramento Name[pt_BR]=sair Name[ru]=Завершение сеанса