From 972108e58559c32d3f5a420050be217379a8ed0a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 30 Sep 2018 05:55:57 +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" --- effects/showpaint/showpaint_config.desktop | 5 ++++- packageplugins/effect/kwin-packagestructure-effect.desktop | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/effects/showpaint/showpaint_config.desktop b/effects/showpaint/showpaint_config.desktop index 677e553cbf..dbe0fc0fdb 100644 --- a/effects/showpaint/showpaint_config.desktop +++ b/effects/showpaint/showpaint_config.desktop @@ -10,6 +10,8 @@ Name[af]=Wys inkleur Name[ar]=أظهر الطلاء Name[bg]=Показване на боята Name[bn_IN]=Paint প্রদর্শন করা হবে +Name[ca]=Mostra el pintat +Name[ca@valencia]=Mostra el pintat Name[csb]=Pòkôżë Paint Name[da]=Vis tegning Name[de]=Zeichnungsbereiche hervorheben @@ -30,7 +32,6 @@ Name[hne]=पेंट देखाव Name[hr]=Prikaz nedavnih promjena Name[hu]=Megmutatja a kirajzolt területeket Name[ia]=Monstra pictura -Name[id]=Tampilkan Lukisan Name[is]=Sýna teikningu Name[it]=Mostra il ridisegno Name[kk]=Бояулау @@ -58,4 +59,6 @@ Name[tg]=Намоиши Paint Name[th]=แสดงพื้นที่ Name[tr]=Boyamayı Göster Name[ug]=سىزىش دائىرىسىنى كۆرسەت +Name[uk]=Показ малювання Name[wa]=Mostrer pondaedje +Name[x-test]=xxShow Paintxx diff --git a/packageplugins/effect/kwin-packagestructure-effect.desktop b/packageplugins/effect/kwin-packagestructure-effect.desktop index f6d451a899..b7e2f7b49f 100644 --- a/packageplugins/effect/kwin-packagestructure-effect.desktop +++ b/packageplugins/effect/kwin-packagestructure-effect.desktop @@ -1,5 +1,12 @@ [Desktop Entry] Name=KWin Effect +Name[ca]=Efecte del KWin +Name[ca@valencia]=Efecte del KWin +Name[es]=Efecto de KWin +Name[nl]=KWin-effect +Name[sv]=Kwin-effekt +Name[uk]=Ефект KWin +Name[x-test]=xxKWin Effectxx Type=Service X-KDE-ServiceTypes=KPackage/PackageStructure X-KDE-Library=kwin_packagestructure_effect