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-12-11 04:39:09 +01:00
parent f2614c3a7d
commit adc10bb30c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/applets/nowplaying/metadata.desktop
View File

@ -42,7 +42,7 @@ Name[zh_TW]=現正播放（QML）
Comment=A proof of concept media player controller qml
Comment[ar]=متحكّم لمشغّل وسائط ب‍QML يثبت فعاليّة المبدأ
Comment[bs]=Dokaz koncepta media player upravljača qml
Comment[ca]=Una prova del concepte de controlador qml per a un reproductor multimèdia
Comment[ca]=Una prova del concepte de controlador QML per a un reproductor multimèdia
Comment[ca@valencia]=Una prova del concepte de controlador qml per a un reproductor multimèdia
Comment[da]=Prototype af medieafspiller-betjening i qml
Comment[de]=Ein Konzeptnachweis für eine Medien-Wiedergabe geschrieben in QML