alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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"
This commit is contained in:
l10n daemon script 2019-07-24 05:33:26 +02:00
parent 04c0ff5cd7
commit 47281f2a64
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/applets/qmltasks/metadata.desktop
View File

@ -43,7 +43,7 @@ Comment=Example showing how to write your own tasks Widget
Comment[ar]=مثال يُظهر كيفية كتابة ودجات المهام
Comment[bs]=Primjer prikazuje kako da napišete svoj vlastiti podsjetnik zadataka
Comment[ca]=Exemple que mostra com escriure el vostre propi estri de tasques
Comment[ca@valencia]=Exemple que mostra com escriure el vostre propi estri de tasques
Comment[ca@valencia]=Exemple que mostra com escriure el vostre propi giny («widget») de tasques
Comment[da]=Eksempel som viser hvordan man kan skrive sin egen opgave-widget
Comment[de]=Beispiel für das Schreiben eigener Aufgaben-Miniprogramme
Comment[en_GB]=Example showing how to write your own tasks Widget

4
examples/applets/widgetgallery/metadata.desktop
View File

@ -3,7 +3,7 @@ Name=Widgets gallery
Name[ar]=معرض للودجات
Name[bs]=galerija dodataka
Name[ca]=Galeria d'estris
Name[ca@valencia]=Galeria d'estris
Name[ca@valencia]=Galeria dels ginys («widgets»)
Name[cs]=Galerie widgetů
Name[da]=Widget-galleri
Name[de]=Miniprogramm-Galerie
@ -43,7 +43,7 @@ Name[zh_TW]=元件集
Comment=gallery of widgets done with Plasma QtComponents
Comment[bs]=galerija dodataka urađena sa plazma Qt komponentama
Comment[ca]=Galeria d'estris fets amb el «QtComponents» del Plasma
Comment[ca@valencia]=Galeria d'estris fets amb el «QtComponents» del Plasma
Comment[ca@valencia]=Galeria dels ginys («widgets») fets amb el «QtComponents» del Plasma
Comment[da]=galleri over widgets lavet med Plasma QtComponents
Comment[de]=Galerie von Miniprogrammen, die mit Plasma QtComponents erstellt wurden
Comment[en_GB]=gallery of widgets done with Plasma QtComponents

4
src/scriptengines/qml/data/plasma-scriptengine-applet-declarative.desktop
View File

@ -2,7 +2,7 @@
Name=Declarative widget
Name[bs]=Deklarativna grafička kontrola
Name[ca]=Estri declaratiu
Name[ca@valencia]=Estri declaratiu
Name[ca@valencia]=Giny («Widget») declaratiu
Name[cs]=Deklarativní widget
Name[da]=Erklærende widget
Name[de]=Deklaratives Bedienelement
@ -46,7 +46,7 @@ Name[zh_TW]=宣告元件
Comment=Native Plasma widget written in QML and JavaScript
Comment[bs]=Prirodna Plasma grafička kontrola pisana u QML i JavaScript
Comment[ca]=Estri nadiu del Plasma escrit en QML i JavaScript
Comment[ca@valencia]=Estri nadiu del Plasma escrit en QML i JavaScript
Comment[ca@valencia]=Giny («Widget») nadiu del Plasma escrit en QML i JavaScript
Comment[cs]=Nativní Plasma widget napsaný v QML a JavaScriptu
Comment[da]=Hjemmehørende Plasma-widget skrevet i QML og JavaScript
Comment[de]=Echtes Plasma-Programm, geschrieben in QML und JavaScript

4
src/scriptengines/ruby/plasma-scriptengine-ruby-dataengine.desktop
View File

@ -2,7 +2,7 @@
Name=Ruby Widget
Name[ar]=ودجة روبي
Name[ca]=Estri en Ruby
Name[ca@valencia]=Estri en Ruby
Name[ca@valencia]=Giny («Widget») en Ruby
Name[cs]=Ruby widget
Name[da]=Ruby-widget
Name[de]=Ruby-Miniprogramm
@ -44,7 +44,7 @@ Name[zh_TW]=Ruby 元件
Comment=Native Plasma widget written in Ruby
Comment[ar]=ودجة «بلازما» أصيلة مكتوبة ب‍«روبي»
Comment[ca]=Estri nadiu del Plasma escrit en Ruby
Comment[ca@valencia]=Estri nadiu del Plasma escrit en Ruby
Comment[ca@valencia]=Giny («Widget») nadiu del Plasma escrit en Ruby
Comment[cs]=Nativní plasmoid napsaný v Ruby
Comment[da]=Ægte Plasma-widget skrevet i Ruby
Comment[de]=Echtes Plasma-Programm, geschrieben in Ruby