From ea20992b60b9dbb6eb01b9a430a32e3a0667a913 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 9 Oct 2020 10:20:37 +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" --- wallpapers/Next/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop index df1df9b2..9c3a70ef 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -21,6 +21,7 @@ Name[ru]=Ракушка Name[sk]=Ulita Name[uk]=Оболонка Name[x-test]=xxShellxx +Name[zh_CN]=Shell Name[zh_TW]=殼層 X-KDE-PluginInfo-Name=Next