From c632dab1c1c3ed53a53cd1c3c2289fd50fe625dd Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 3 Jul 2022 01:57:41 +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" --- bin/plasma-mobile-dev.desktop.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/plasma-mobile-dev.desktop.cmake b/bin/plasma-mobile-dev.desktop.cmake index de5fbbb0..89b28293 100644 --- a/bin/plasma-mobile-dev.desktop.cmake +++ b/bin/plasma-mobile-dev.desktop.cmake @@ -17,6 +17,7 @@ Name[sl]=Plasma Mobile (Razvoj) Name[tr]=Plasma Mobile (Geliştirme) Name[uk]=Мобільна Плазма (версія у розробці) Name[x-test]=xxPlasma Mobile (Development)xx +Name[zh_CN]=Plasma Mobile (开发) Comment=Plasma Mobile by KDE Comment[ast]=Plasma Mobile, por KDE Comment[az]=KDE Plasma Mobil