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-13 05:16:54 +01:00
parent 4406297053
commit 2f621fc6db
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,6 +9,7 @@
],
"Category": "BackendPlugin",
"Description": "A KDE Partition Manager dummy backend for testing purposes.",
"Description[ca@valencia]": "Un dorsal fals del gestor de particions del KDE amb la finalitat de fer proves.",
"Description[ca]": "Un dorsal fals del gestor de particions del KDE amb la finalitat de fer proves.",
"Description[de]": "Ein Dummy-Backend für die KDE-Partitionsverwaltung zu Testzwecken.",
"Description[nl]": "Dummy backend van KDE-partitiebeheerder voor testdoeleinden",
@ -22,6 +23,7 @@
"Id": "pmdummybackendplugin",
"License": "GPL",
"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[de]": "KDE-Partitionsverwaltung Dummy-Backend",
"Name[fi]": "KDE:n osionhallinnan valetaustaosa",

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

@ -9,6 +9,7 @@
],
"Category": "BackendPlugin",
"Description": "The LibParted backend for KDE Partition Manager",
"Description[ca@valencia]": "Un dorsal pel LibParted del gestor de particions del KDE",
"Description[ca]": "Un dorsal pel LibParted del gestor de particions del KDE",
"Description[de]": "Das LibParted-Backend für die KDE-Partitionsverwaltung",
"Description[es]": "El motor LibParted para el gestor de particiones de KDE",
@ -23,6 +24,7 @@
"Id": "pmlibpartedbackendplugin",
"License": "GPL",
"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[de]": "KDE-Partitionsverwaltung LibParted-Backend",
"Name[es]": "Motor LibParted para el gestor de particiones de KDE",

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

@ -9,6 +9,7 @@
],
"Category": "BackendPlugin",
"Description": "A KDE Partition Manager sfdisk backend.",
"Description[ca@valencia]": "Un dorsal «sfdisk» del gestor de particions del KDE.",
"Description[ca]": "Un dorsal «sfdisk» del gestor de particions del KDE.",
"Description[de]": "Ein sfdisk-Backend für die KDE-Partitionsverwaltung.",
"Description[es]": "Motor sfdisk para el gestor de particiones de KDE.",
@ -23,6 +24,7 @@
"Id": "pmsfdiskbackendplugin",
"License": "GPL",
"Name": "KDE Partition Manager sfdisk Backend",
"Name[ca@valencia]": "Dorsal «sfdisk» del gestor de particions del KDE",
"Name[ca]": "Dorsal «sfdisk» del gestor de particions del KDE",
"Name[de]": "KDE-Partitionsverwaltung sfdisk-Backend",
"Name[es]": "Motor sfdisk para el gestor de particiones de KDE",