From 3fc6f79e2dfad45e47ee8a325e618f6bd68b1395 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 19 Sep 2021 01:27:20 +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" --- kstyle/config/breezestyleconfig.desktop | 4 ++-- wallpapers/Next/metadata.desktop | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/kstyle/config/breezestyleconfig.desktop b/kstyle/config/breezestyleconfig.desktop index 7aecf7e2..e93d6fbd 100644 --- a/kstyle/config/breezestyleconfig.desktop +++ b/kstyle/config/breezestyleconfig.desktop @@ -51,7 +51,7 @@ Name[tg]=Услуби виҷети Насим Name[tr]=Breeze Programcık Biçimi Name[uk]=Стиль віджетів Breeze Name[x-test]=xxBreeze Widget Stylexx -Name[zh_CN]=Breeze 微风部件样式 +Name[zh_CN]=Breeze 微风部件风格 Name[zh_TW]=Breeze 元件樣式 Comment=Modify the appearance of widgets Comment[ar]=عدّل مظهر الودجات @@ -145,5 +145,5 @@ X-KDE-Keywords[tg]=насим,виҷет,услуб X-KDE-Keywords[tr]=esinti,gereç,biçem X-KDE-Keywords[uk]=breeze,widget,style,бриз,віджет,стиль,вигляд X-KDE-Keywords[x-test]=xxbreezexx,xxwidgetxx,xxstylexx -X-KDE-Keywords[zh_CN]=breeze,微风,部件,样式 +X-KDE-Keywords[zh_CN]=breeze,微风,部件,样式,风格 X-KDE-Keywords[zh_TW]=breeze,widget,style diff --git a/wallpapers/Next/metadata.desktop b/wallpapers/Next/metadata.desktop index 4caf1d14..21009367 100644 --- a/wallpapers/Next/metadata.desktop +++ b/wallpapers/Next/metadata.desktop @@ -1,5 +1,6 @@ [Desktop Entry] Name=Patak +Name[az]=Patak Name[ca]=Patak Name[cs]=Patak Name[el]=Patak