From c9023582aa4653977018fe1daf68a7cf8ac4954c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 10 Dec 2017 04:43:39 +0100 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 00993d4dd1..c4141f00b3 100644 --- a/effects/logout/package/metadata.desktop +++ b/effects/logout/package/metadata.desktop @@ -31,7 +31,7 @@ Name[sr@ijekavianlatin]=Odjava Name[sr@latin]=Odjava Name[sv]=utloggning Name[tr]=çıkış yap -Name[uk]=вихід +Name[uk]=Вихід Name[x-test]=xxlogoutxx Name[zh_CN]=注销 Name[zh_TW]=登出