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-05 05:14:10 +01:00
parent 67b25dc0e9
commit 07a0f47c57
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

@ -21,6 +21,7 @@
"License": "GPL",
"Name": "KDE Partition Manager Dummy Backend",
"Name[ca]": "Dorsal fals del gestor de particions del KDE",
"Name[fr]": "Moteur de test pour le gestionnaire de partitions de 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",

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

@ -23,6 +23,7 @@
"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[fr]": "Moteur LibParted pour le gestionnaire de partitions 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",