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-27 09:05:33 +02:00
parent 18d04e9b41
commit 07272a2b98
3 changed files with 3 additions and 3 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

@ -16,7 +16,7 @@ Comment[eu]=Plasmarentzako script-hizkuntzaren hedapena
Comment[fi]=Skriptauskielituki Plasmalle
Comment[fr]=Extension du langage de script pour Plasma
Comment[gd]=Leudachan cànan sgriobtaidh airson Plasma
Comment[gl]=Extensión de linguaxe de scripts para o Plasma
Comment[gl]=Extensión de linguaxe de scripts para Plasma
Comment[hu]=Szkriptnyelv-kiterjesztés a Plasmához
Comment[ia]=Extension del language de script de Plasma
Comment[it]=Estensione del linguaggio di creazione script per Plasma

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

@ -18,7 +18,7 @@ Comment[eu]=Plasma zerbitzua
Comment[fi]=Plasma-palvelu
Comment[fr]=Service de Plasma
Comment[gd]=Seirbheis Plasma
Comment[gl]=Servizo do Plasma
Comment[gl]=Servizo de Plasma
Comment[hu]=Plasma szolgáltatás
Comment[ia]=Servicio de Plasma
Comment[it]=Servizio di Plasma

2
src/scriptengines/qml/data/plasma-wallpaper.desktop
View File

@ -18,7 +18,7 @@ Comment[eu]=Plasma horma-papera
Comment[fi]=Plasma-taustakuva
Comment[fr]=Fond d'écran Plasma
Comment[gd]=Pàipear-balla Plasma
Comment[gl]=Fondo de escritorio do Plasma
Comment[gl]=Fondo de escritorio de Plasma
Comment[hu]=Plasma háttérkép
Comment[ia]=Tapete de papiro de Plasma
Comment[it]=Sfondo di plasma