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 2018-04-19 05:18:00 +02:00
parent 0e013db633
commit be129c9912
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/plasma-wallpaper-with-qml-extension/plasma-wallpaper-with-qml-extension.kdevtemplate
View File

@ -2,6 +2,7 @@
Name=Simple Plasma Wallpaper with QML extension
Name[ca]=Fons de pantalla senzill del Plasma amb extensió QML
Name[ca@valencia]=Fons de pantalla senzill del Plasma amb extensió QML
Name[de]=Einfaches Plasma-Hintergrundbild mit QML-Erweiterung
Name[en_GB]=Simple Plasma Wallpaper with QML extension
Name[id]=Wallpaper Plasma sederhana dengan ektensi QML
Name[it]=Semplice sfondo di Plasma con estensione QML