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-09-15 05:04:47 +02:00
parent 7141ad1721
commit df8ecfa929
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

@ -10,6 +10,7 @@ Name[eu]=Plasma QML appleta QML hedapenak dituena
Name[fi]=Plasman QML-sovelma QML-laajennuksella Name[fi]=Plasman QML-sovelma QML-laajennuksella
Name[fr]=Applet Plasma QML avec des extensions QML Name[fr]=Applet Plasma QML avec des extensions QML
Name[gl]=Miniaplicativo QML para Plasma con extensión de QML Name[gl]=Miniaplicativo QML para Plasma con extensión de QML
Name[ia]=Applet QML de Plasma con extension QML
Name[it]=Applet QML di Plasma con estensione QML Name[it]=Applet QML di Plasma con estensione QML
Name[nl]=Plasma QML-applet met QML-extensie Name[nl]=Plasma QML-applet met QML-extensie
Name[nn]=Plasma QML-element med QML-utviding Name[nn]=Plasma QML-element med QML-utviding