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-07-15 05:17:11 +02:00
parent 11954f1185
commit 79a6f5a192
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

@ -17,6 +17,7 @@
"Description[gl]": "Unha infraestrutura de probas para o xestor de particións de KDE.",
"Description[it]": "Un motore fittizio del gestore delle partizioni di KDE per scopi di prova.",
"Description[nl]": "Dummy backend van KDE-partitiebeheerder voor testdoeleinden",
"Description[pl]": "Fikcyjny silnik zarządzania partycjami do prób.",
"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.",
@ -40,6 +41,7 @@
"Name[it]": "Motore fittizio del gestore delle partizioni di KDE",
"Name[nb]": "Attrapp-motor for KDE partisjonsbehandler",
"Name[nl]": "Dummy backend van KDE-partitiebeheerder",
"Name[pl]": "Fikcyjny silnik zarządzania partycjami",
"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",

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

@ -17,6 +17,7 @@
"Description[gl]": "A infraestrutura de LibPartes para o xestor de particións de KDE.",
"Description[it]": "Il motore LibParted del gestore delle partizioni di KDE",
"Description[nl]": "De LibParted-backend voor de KDE-partitiebeheerder",
"Description[pl]": "Silnik LibParted dla zarządzania partycjami",
"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",
@ -40,6 +41,7 @@
"Name[it]": "Motore LibParted del gestore delle partizioni di KDE",
"Name[nb]": "KDE partisjonsbehandler, bakgrunnsmotor for libparted",
"Name[nl]": "KDE-partitiebeheerder LibParted-backend",
"Name[pl]": "Silnik LibParted zarządzania partycjami",
"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",

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

@ -17,6 +17,7 @@
"Description[gl]": "Unha infraestrutura de sfdisk para o xestor de particións de KDE.",
"Description[it]": "Un motore sfdisk del gestore delle partizioni di KDE.",
"Description[nl]": "Een sfdisk backend van KDE-partitiebeheerder.",
"Description[pl]": "Silnik sfdisk zarządzania partycjami.",
"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",
@ -35,6 +36,7 @@
"Name[gl]": "Infraestrutura de sfdisk para o xestor de particións de KDE",
"Name[it]": "Motore sfdisk del gestore delle partizioni di KDE",
"Name[nl]": "Sfdisk backend van KDE-partitiebeheerder",
"Name[pl]": "Silnik sfdisk zarządzania partycjami",
"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",