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 2015-05-08 10:19:36 +00:00
parent 04f96779c1
commit 662adbb41b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plasma/data/servicetypes/plasma-scriptengine.desktop
View File

@ -4,7 +4,7 @@ X-KDE-ServiceType=Plasma/ScriptEngine
Comment=Scripting language extension for Plasma
Comment[bs]=Proširenje Plazme za skriptne jezike
Comment[ca]=Extensió pel llenguatge de creació d'scripts pel Plasma
Comment[ca]=Extensió pel llenguatge de creació de scripts pel Plasma
Comment[cs]=Rozšíření pro skriptovací jazyky Plasma
Comment[da]=Scriptsprog-udvidelse til Plasma
Comment[de]=Skriptsprachen-Erweiterung für Plasma