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-06-11 04:33:38 +02:00
parent 1f4f1815af
commit 2d4548e4d0
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ Name[et]=Apleti test
Name[fi]=Sovelmatesti
Name[fr]=Applet test
Name[gd]=Deuchainn air aplaid
Name[gl]=Proba de applet
Name[gl]=Proba de miniaplicativo
Name[hu]=Kisalkalmazás teszt
Name[ia]=Applet Test (Prova de applet)
Name[it]=Prova applet

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

@ -10,7 +10,7 @@ Comment[et]=Näidisaplett selle kohta, kuidas kasutada andmemootoritesse põimit
Comment[fi]=Esimerkkisovelma, joka näyttää, miten tietomoottoreihin upotettuja malleja käytetään
Comment[fr]=Exemple d'applet qui montre comment utiliser les modèles embarqués dans DataEngines
Comment[gd]=Aplaid-eisimpleir a sheallas mar a chleachdas tu modailean leabaichte ann an DataEngines
Comment[gl]=Unha applet de exemplo que mostra como usar os modelos incorporados nos DataEngines
Comment[gl]=Un miniaplicativo de exemplo que mostra como usar os modelos incorporados nos DataEngines
Comment[hu]=Példa kisalkalmazás a DataEngine-be ágyazott modellek használatának bemutatására
Comment[ia]=Applet de exemplo que monstra como usar Models (modellos) insertate in DataEngines (Motores de datos)
Comment[it]=Applet di esempio che mostra come utilizzare i modelli integrati nei motori di dati

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

@ -17,7 +17,7 @@ Comment[et]=Plasma aplett
Comment[fi]=Plasma-sovelma
Comment[fr]=Applet Plasma
Comment[gd]=Aplaid Plasma
Comment[gl]=Applet de Plasma
Comment[gl]=Miniaplicativo de Plasma
Comment[hu]=Plasma kisalkalmazás
Comment[ia]=Applet Plasma
Comment[it]=Applet di Plasma

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

@ -15,7 +15,7 @@ Comment[et]=Plasma apleti konteiner ja tausta joonistaja
Comment[fi]=Plasma-sovelmasäiliö ja taustan piirrin
Comment[fr]=Conteneur d'applets Plasma et décor d'arrière-plan
Comment[gd]=Soitheach aplaidean agus peantair cùlaibh Plasma
Comment[gl]=Un contedor de applet de Plasma e pintor do fondo
Comment[gl]=Un contedor de miniaplicativo de Plasma e pintor do fondo
Comment[hu]=Tároló Plasma-kisalkalmazásokhoz és háttérrajzoló
Comment[ia]=Receptaculo applet Plasma e pictor de fundo
Comment[it]=Contenitore di applet di Plasma e creazione sfondo