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-06 05:21:11 +01:00
parent 07a0f47c57
commit 11d2bbc344
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,8 +10,10 @@
"Category": "BackendPlugin",
"Description": "A KDE Partition Manager dummy backend for testing purposes.",
"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",
"Description[pt]": "Uma infra-estrutura de testes para o Gestor de Partições do KDE.",
"Description[sk]": "Testovací program v pozadí KDE Správcu partícií",
"Description[sv]": "Ett bakgrundsprogram till KDE:s partitionshanterare i testsyfte.",
"Description[uk]": "Тестовий додаток сервера Керування розділами KDE.",
"Description[x-test]": "xxA KDE Partition Manager dummy backend for testing purposes.xx",
@ -21,9 +23,13 @@
"License": "GPL",
"Name": "KDE Partition Manager Dummy Backend",
"Name[ca]": "Dorsal fals del gestor de particions del KDE",
"Name[de]": "KDE-Partitionsverwaltung Dummy-Backend",
"Name[fi]": "KDE:n osionhallinnan valetaustaosa",
"Name[fr]": "Moteur de test pour le gestionnaire de partitions de KDE",
"Name[it]": "Motore fittizio del gestore delle partizioni di KDE",
"Name[nl]": "Dummy backend van KDE-partitiebeheerder",
"Name[pt]": "Infra-Estrutura de Testes para o Gestor de Partições do KDE",
"Name[sk]": "Testovací program v pozadí KDE Správcu partícií",
"Name[sv]": "KDE:s partitionshanterare bakgrundsprogram för test",
"Name[uk]": "Тестовий додаток сервера Керування розділами KDE",
"Name[x-test]": "xxKDE Partition Manager Dummy Backendxx",

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

@ -10,9 +10,11 @@
"Category": "BackendPlugin",
"Description": "The LibParted backend for KDE Partition Manager",
"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",
"Description[nl]": "De LibParted-backend voor de KDE-partitiebeheerder",
"Description[pt]": "A infra-estrutura da LibParted para o Gestor de Partições do KDE",
"Description[sk]": "LibParted - program v pozadí pre KDE Správcu partícií",
"Description[sv]": "LibParted bakgrundsprogrammet till KDE:s partitionshanterare",
"Description[uk]": "Сервер LibParted для Керування розділами KDE",
"Description[x-test]": "xxThe LibParted backend for KDE Partition Managerxx",
@ -22,10 +24,14 @@
"License": "GPL",
"Name": "KDE Partition Manager LibParted Backend",
"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",
"Name[fi]": "KDE:n osionhallinnan LibParted-taustaosa",
"Name[fr]": "Moteur LibParted pour le gestionnaire de partitions de KDE",
"Name[it]": "Motore LibParted del gestore delle partizioni di KDE",
"Name[nl]": "KDE-partitiebeheerder LibParted-backend",
"Name[pt]": "Infra-Estrutura da LibParted para o Gestor de Partições do KDE",
"Name[sk]": "LibParted - program v pozadí pre KDE Správcu partícií",
"Name[sv]": "KDE:s partitionshanterare LibParted bakgrundsprogram",
"Name[uk]": "Сервер LibParted Керування розділами KDE",
"Name[x-test]": "xxKDE Partition Manager LibParted Backendxx",

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

@ -10,9 +10,11 @@
"Category": "BackendPlugin",
"Description": "A KDE Partition Manager sfdisk backend.",
"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.",
"Description[nl]": "Een sfdisk backend van KDE-partitiebeheerder.",
"Description[pt]": "A infra-estrutura do 'sfdisk' para o Gestor de Partições do KDE.",
"Description[sk]": "Backend KDE správcu partícií sfdisk.",
"Description[sv]": "Ett sfdisk bakgrundsprogram till KDE:s partitionshanterare",
"Description[uk]": "Додаток sfdisk сервера Керування розділами KDE.",
"Description[x-test]": "xxA KDE Partition Manager sfdisk backend.xx",
@ -22,9 +24,12 @@
"License": "GPL",
"Name": "KDE Partition Manager sfdisk Backend",
"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",
"Name[it]": "Motore sfdisk del gestore delle partizioni di KDE",
"Name[nl]": "Sfdisk backend van KDE-partitiebeheerder",
"Name[pt]": "Infra-Estrutura do Sfdisk para o Gestor de Partições do KDE",
"Name[sk]": "Backend KDE správcu partícií sfdisk",
"Name[sv]": "KDE:s partitionshanterare sfdisk bakgrundsprogram",
"Name[uk]": "Додаток sfdisk сервера Керування розділами KDE",
"Name[x-test]": "xxKDE Partition Manager sfdisk Backendxx",