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-04 05:17:01 +01:00
parent 17451c3494
commit 67b25dc0e9
3 changed files with 46 additions and 3 deletions

View File

@ -3,16 +3,29 @@
"Authors": [
{
"Email": "vl@fidra.de",
"Name": "Volker Lanz"
"Name": "Volker Lanz",
"Name[x-test]": "xxVolker Lanzxx"
}
],
"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[nl]": "Dummy backend van KDE-partitiebeheerder voor testdoeleinden",
"Description[pt]": "Uma infra-estrutura de testes para o Gestor de Partições do KDE.",
"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",
"EnabledByDefault": true,
"Icon": "preferences-plugin",
"Id": "pmdummybackendplugin",
"License": "GPL",
"Name": "KDE Partition Manager Dummy Backend",
"Name[ca]": "Dorsal fals del gestor de particions del KDE",
"Name[nl]": "Dummy backend van KDE-partitiebeheerder",
"Name[pt]": "Infra-Estrutura de Testes para o Gestor de Partições do KDE",
"Name[sv]": "KDE:s partitionshanterare bakgrundsprogram för test",
"Name[uk]": "Тестовий додаток сервера Керування розділами KDE",
"Name[x-test]": "xxKDE Partition Manager Dummy Backendxx",
"ServiceTypes": [
"PartitionManager/Plugin"
],

View File

@ -3,16 +3,31 @@
"Authors": [
{
"Email": "vl@fidra.de",
"Name": "Volker Lanz"
"Name": "Volker Lanz",
"Name[x-test]": "xxVolker Lanzxx"
}
],
"Category": "BackendPlugin",
"Description": "The LibParted backend for KDE Partition Manager",
"Description[ca]": "Un dorsal pel LibParted del gestor de particions del KDE",
"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[sv]": "LibParted bakgrundsprogrammet till KDE:s partitionshanterare",
"Description[uk]": "Сервер LibParted для Керування розділами KDE",
"Description[x-test]": "xxThe LibParted backend for KDE Partition Managerxx",
"EnabledByDefault": true,
"Icon": "preferences-plugin",
"Id": "pmlibpartedbackendplugin",
"License": "GPL",
"Name": "KDE Partition Manager LibParted Backend",
"Name[ca]": "Dorsal pel LibParted del gestor de particions del KDE",
"Name[es]": "Motor LibParted para el gestor de particiones de KDE",
"Name[nl]": "KDE-partitiebeheerder LibParted-backend",
"Name[pt]": "Infra-Estrutura da LibParted para o Gestor de Partições do KDE",
"Name[sv]": "KDE:s partitionshanterare LibParted bakgrundsprogram",
"Name[uk]": "Сервер LibParted Керування розділами KDE",
"Name[x-test]": "xxKDE Partition Manager LibParted Backendxx",
"ServiceTypes": [
"PartitionManager/Plugin"
],

View File

@ -3,16 +3,31 @@
"Authors": [
{
"Email": "andrius@stikonas.eu",
"Name": "Andrius Štikonas"
"Name": "Andrius Štikonas",
"Name[x-test]": "xxAndrius Štikonasxx"
}
],
"Category": "BackendPlugin",
"Description": "A KDE Partition Manager sfdisk backend.",
"Description[ca]": "Un dorsal «sfdisk» del gestor de particions del KDE.",
"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[sv]": "Ett sfdisk bakgrundsprogram till KDE:s partitionshanterare",
"Description[uk]": "Додаток sfdisk сервера Керування розділами KDE.",
"Description[x-test]": "xxA KDE Partition Manager sfdisk backend.xx",
"EnabledByDefault": true,
"Icon": "preferences-plugin",
"Id": "pmsfdiskbackendplugin",
"License": "GPL",
"Name": "KDE Partition Manager sfdisk Backend",
"Name[ca]": "Dorsal «sfdisk» del gestor de particions del KDE",
"Name[es]": "Motor sfdisk para el gestor de particiones de KDE",
"Name[nl]": "Sfdisk backend van KDE-partitiebeheerder",
"Name[pt]": "Infra-Estrutura do Sfdisk para o Gestor de Partições do KDE",
"Name[sv]": "KDE:s partitionshanterare sfdisk bakgrundsprogram",
"Name[uk]": "Додаток sfdisk сервера Керування розділами KDE",
"Name[x-test]": "xxKDE Partition Manager sfdisk Backendxx",
"ServiceTypes": [
"PartitionManager/Plugin"
],