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-03-30 05:19:57 +02:00
parent ad863cc6b1
commit 8658743a49
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/dummy/pmdummybackendplugin.json
View File

@ -26,6 +26,7 @@
"Name": "KDE Partition Manager Dummy Backend",
"Name[ca@valencia]": "Dorsal fals del gestor de particions del KDE",
"Name[ca]": "Dorsal fals del gestor de particions del KDE",
"Name[cs]": "Podpůrná vrstva pro správce diskových oddílů pro KDE",
"Name[de]": "KDE-Partitionsverwaltung Dummy-Backend",
"Name[es]": "Motor de simulación para el gestor de particiones de KDE",
"Name[fi]": "KDE:n osionhallinnan valetaustaosa",

1
src/plugins/libparted/pmlibpartedbackendplugin.json
View File

@ -26,6 +26,7 @@
"Name": "KDE Partition Manager LibParted Backend",
"Name[ca@valencia]": "Dorsal pel LibParted del gestor de particions del KDE",
"Name[ca]": "Dorsal pel LibParted del gestor de particions del KDE",
"Name[cs]": "Podpůrná vrstva LibParted pro správce diskových oddílů pro KDE",
"Name[de]": "KDE-Partitionsverwaltung LibParted-Backend",
"Name[es]": "Motor LibParted para el gestor de particiones de KDE",
"Name[fi]": "KDE:n osionhallinnan LibParted-taustaosa",