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 2018-02-19 04:59:32 +01:00
parent dcc9875923
commit ff9e6c8323
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/sfdisk/pmsfdiskbackendplugin.desktop
View File

@ -4,6 +4,7 @@ Name=KDE Partition Manager sfdisk Backend
Name[ca]=Dorsal «sfdisk» del gestor de particions del KDE
Name[ca@valencia]=Dorsal «sfdisk» del gestor de particions del KDE
Name[de]=KDE-Partitionsverwaltung sfdisk-Backend
Name[en_GB]=KDE Partition Manager sfdisk Backend
Name[es]=Motor sfdisk para el gestor de particiones de KDE
Name[gl]=Infraestrutura de sfdisk do xestor de particións de KDE
Name[nl]=Sfdisk-backend van KDE-partitiebeheerder
@ -21,6 +22,7 @@ Comment=A KDE Partition Manager sfdisk backend.
Comment[ca]=Un dorsal «sfdisk» del gestor de particions del KDE.
Comment[ca@valencia]=Un dorsal «sfdisk» del gestor de particions del KDE.
Comment[de]=Ein sfdisk-Backend für die KDE-Partitionsverwaltung.
Comment[en_GB]=A KDE Partition Manager sfdisk backend.
Comment[es]=Motor sfdisk para el gestor de particiones de KDE.
Comment[gl]=Unha infraestrutura de sfdisk do xestor de particións de KDE.
Comment[nl]=Sfdisk-backend van KDE-partitiebeheerder