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:
parent
f89bc39c76
commit
4406297053
|
@ -28,6 +28,7 @@
|
|||
"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[nb]": "Attrapp-motor for KDE partisjonsbehandler",
|
||||
"Name[nl]": "Dummy backend van KDE-partitiebeheerder",
|
||||
"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í",
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
"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[nb]": "KDE partisjonsbehandler, bakgrunnsmotor for libparted",
|
||||
"Name[nl]": "KDE-partitiebeheerder LibParted-backend",
|
||||
"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í",
|
||||
|
|
Loading…
Reference in New Issue