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-05 09:59:21 +00:00
parent b4f2611125
commit 83b79d9e74
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/qml-plasmoid/qml-plasmoid.kdevtemplate
View File

@ -15,6 +15,7 @@ Name[nl]=Plasma QML-applet
Name[nn]=Plasma QML-element
Name[pl]=Aplet QML Plazmy
Name[pt]='Applet' em QML do Plasma
Name[sk]=Plasma QML Applet
Name[sl]=Plasma aplet v QML
Name[sv]=Plasma QML-miniprogram
Name[uk]=Аплет Плазми мовою QML
@ -32,6 +33,7 @@ Comment[nl]=Sjabloon voor Plasma-QML-applet: een sjabloon voor een plasma-applet
Comment[nn]=Plasma-elementmal skriven i QML: Ein mal for eit Plasma-element som viser eit SVG-bilete og litt tekst
Comment[pl]=Szablon apletu Plazmy QML: szablon apletu plazmy wyświetlający obraz SVG i tekst
Comment[pt]=Modelo de 'Applet' do Plasma em QML: um modelo de 'applets' do Plasma que mostra uma figura em SVG e um texto
Comment[sk]=Šablóna appletu Plasma QML: šablóna plasma appletu zobrazujúca svg obrázok a text.
Comment[sl]=Predloga Plasma apleta v QML: predloga Plasma apleta, ki prikazuje sliko SVG in besedilo
Comment[sv]=Mall för Plasma QML-miniprogram. En mall för ett Plasma-miniprogram som visar en SVG-bild och en text
Comment[uk]=Шаблон аплету Плазми. Шаблон аплету Плазми, який показу зображення SVG і текст