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
30ac4bb6ab
commit
c63567b524
|
@ -2,6 +2,7 @@
|
||||||
Encoding=UTF-8
|
Encoding=UTF-8
|
||||||
Name=KDE Partition Manager LibParted Backend
|
Name=KDE Partition Manager LibParted Backend
|
||||||
Name[ar]=سند LibParted لمدير كدي للأقسام
|
Name[ar]=سند LibParted لمدير كدي للأقسام
|
||||||
|
Name[ast]=Backend LibParted del xestor de ficheros de KDE
|
||||||
Name[bg]=Ядро LibParted за управление на дялове в KDE
|
Name[bg]=Ядро LibParted за управление на дялове в KDE
|
||||||
Name[bs]=LibParted pozadina za KDE‑ov menadžer particija
|
Name[bs]=LibParted pozadina za KDE‑ov menadžer particija
|
||||||
Name[ca]=Dorsal pel LibParted del gestor de particions del KDE
|
Name[ca]=Dorsal pel LibParted del gestor de particions del KDE
|
||||||
|
|
Loading…
Reference in New Issue