From a2b2999f41df1549f2e48bcffd245d4ec3172790 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 12 Feb 2022 02:47:40 +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" --- wallpapers/Next/metadata.desktop | 1 + 1 file changed, 1 insertion(+) diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop index 98c97e62..02fbd7ee 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -19,6 +19,7 @@ Name[sl]=Medeni pljusk Name[sv]=Honungsvåg Name[uk]=Медова хвиля Name[x-test]=xxHoneywavexx +Name[zh_CN]=Honeywave 金波 X-KDE-PluginInfo-Name=Next X-KDE-PluginInfo-Author=Ken Vermette