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 2016-11-04 09:43:11 +00:00
parent 62b0865492
commit b4f2611125
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
templates/cpp-plasmoid/cpp-plasmoid.kdevtemplate
View File

@ -3,6 +3,7 @@
Name=Plasma QML/C++ Applet Name=Plasma QML/C++ Applet
Name[ca]=Miniaplicació QML/C++ del Plasma Name[ca]=Miniaplicació QML/C++ del Plasma
Name[ca@valencia]=Miniaplicació QML/C++ del Plasma Name[ca@valencia]=Miniaplicació QML/C++ del Plasma
Name[cs]=Aplet QML/C++ Plasma
Name[de]=Plasma-QML/C++-Miniprogramm Name[de]=Plasma-QML/C++-Miniprogramm
Name[en_GB]=Plasma QML/C++ Applet Name[en_GB]=Plasma QML/C++ Applet
Name[es]=Miniaplicación en QML/C++ para Plasma Name[es]=Miniaplicación en QML/C++ para Plasma

1
templates/plasma-wallpaper/plasma-wallpaper.kdevtemplate
View File

@ -3,6 +3,7 @@
Name=Simple Plasma Wallpaper Name=Simple Plasma Wallpaper
Name[ca]=Fons d'escriptori senzill del Plasma Name[ca]=Fons d'escriptori senzill del Plasma
Name[ca@valencia]=Fons d'escriptori senzill del Plasma Name[ca@valencia]=Fons d'escriptori senzill del Plasma
Name[cs]=Jednoduchá tapeta pro prostředí Plasma
Name[de]=Einfaches Plasma-Hintergrundbild Name[de]=Einfaches Plasma-Hintergrundbild
Name[en_GB]=Simple Plasma Wallpaper Name[en_GB]=Simple Plasma Wallpaper
Name[es]=Fondo de escritorio sencillo para Plasma Name[es]=Fondo de escritorio sencillo para Plasma