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 2017-06-28 08:24:06 +02:00
parent f43938f4c2
commit 1aebd9cd11
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/qml-plasmoid-with-qml-extension/qml-plasmoid-with-qml-extension.kdevtemplate
View File

@ -20,6 +20,7 @@ Name[sv]=Plasma QML-miniprogram med QML-utökning
Name[tr]=QML eklentisi ile Plasma QML Uygulamacığı
Name[uk]=Аплет Плазми мовою QML із розширенням QML
Name[x-test]=xxPlasma QML Applet with QML extensionxx
Name[zh_TW]=含有 QML 副檔名的 Plasma QML 小程式
Comment=A template for a Plasma applet which uses custom API provided by an own QML extension plugin
Comment[ca]=Una plantilla per a una miniaplicació Plasma que usa una API personalitzada proporcionada per un connector propi d'una extensió QML
Comment[ca@valencia]=Una plantilla per a una miniaplicació Plasma que usa una API personalitzada proporcionada per un connector propi d'una extensió QML
@ -39,4 +40,5 @@ Comment[sv]=En mall för ett Plasma-miniprogram som använder ett anpassat progr
Comment[tr]=Kendi QML eklentisi için sağlanan özel bir API kullanan Plasma uygulamacığı için bir şablon
Comment[uk]=Шаблон для аплету Плазми, у якому використовується нетиповий програмний інтерфейс, що надається власним додатком розширення QML
Comment[x-test]=xxA template for a Plasma applet which uses custom API provided by an own QML extension pluginxx
Comment[zh_TW]=使用由自己的 QML 延伸元件提供的自訂 API 的 Plasma 小程式範本
Category=Plasma/Plasmoid