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-06-07 05:41:48 +02:00
parent b3a8a3874f
commit 7497d509f4
3 changed files with 3 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

@ -14,6 +14,7 @@
"Description[de]": "Ein Dummy-Backend für die KDE-Partitionsverwaltung zu Testzwecken.",
"Description[es]": "Un motor de simulación para el gestor de particiones de KDE para hacer pruebas.",
"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[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í",

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

@ -14,6 +14,7 @@
"Description[de]": "Das LibParted-Backend für die KDE-Partitionsverwaltung",
"Description[es]": "El motor LibParted para el gestor de particiones de KDE",
"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[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í",

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

@ -14,6 +14,7 @@
"Description[de]": "Ein sfdisk-Backend für die KDE-Partitionsverwaltung.",
"Description[es]": "Motor sfdisk para el gestor de particiones de KDE.",
"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[pt]": "A infra-estrutura do 'sfdisk' para o Gestor de Partições do KDE.",
"Description[sk]": "Backend KDE správcu partícií sfdisk.",