andrius
/
kpmcore
1
0
Fork 0
Code Pull Requests Releases Activity

SVN_SILENT made messages (.desktop file) - always resolve ours 

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:31:47 +02:00
parent 63b5c8c34c
commit cb1f76d018
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/pmcorebackendplugin.desktop
View File

@ -18,7 +18,7 @@ Name[et]=KDE partitsioonihalduri plugin
Name[fi]=KDE:n osionhallintaliitännäinen
Name[fr]=Module externe pour le gestionnaire de partitions de KDE
Name[ga]=Breiseán Bhainisteoir Deighiltí KDE
Name[gl]=Engadido de xestión de particións de KDE
Name[gl]=Complemento de xestión de particións de KDE
Name[hu]=KDE partíciószerkesztő bővítmény
Name[id]=Plugin Manajer Partisi KDE
Name[it]=Estensione del gestore delle partizioni di KDE