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-20 04:28:48 +02:00
parent 87d5449480
commit 7051018577
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ Name=Plasma QML Applet with QML extension
Name[ca]=Miniaplicació QML del Plasma amb una extensió QML
Name[ca@valencia]=Miniaplicació QML del Plasma amb una extensió QML
Name[cs]=Aplet QML Plasma s rozšířením QML
Name[de]=Plasma-QML-Miniprogramm mit QML-Erweiterung
Name[en_GB]=Plasma QML Applet with QML extension
Name[es]=Miniaplicación en QML para Plasma con extensión QML
Name[fi]=Plasman QML-sovelma QML-laajennuksella