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-11 05:21:27 +01:00
parent 11d2bbc344
commit f89bc39c76
2 changed files with 2 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

@ -26,6 +26,7 @@
"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[id]": "Backend Tiruan Pengelola Partisi 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",

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

@ -28,6 +28,7 @@
"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[id]": "Backend LibParted Pengelola Parisi 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",