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-19 05:09:05 +01:00
parent 2f621fc6db
commit ad863cc6b1
1 changed files with 2 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

@ -12,6 +12,7 @@
"Description[ca@valencia]": "Un dorsal fals del gestor de particions del KDE amb la finalitat de fer proves.",
"Description[ca]": "Un dorsal fals del gestor de particions del KDE amb la finalitat de fer proves.",
"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[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í",
@ -26,6 +27,7 @@
"Name[ca@valencia]": "Dorsal fals del gestor de particions del KDE",
"Name[ca]": "Dorsal fals del gestor de particions del KDE",
"Name[de]": "KDE-Partitionsverwaltung Dummy-Backend",
"Name[es]": "Motor de simulación para el gestor de particiones de KDE",
"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",