Commit c63567b5 authored by Script Kiddy's avatar Script Kiddy

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"
parent 30ac4bb6
......@@ -2,6 +2,7 @@
Encoding=UTF-8
Name=KDE Partition Manager LibParted Backend
Name[ar]=سند LibParted لمدير كدي للأقسام
Name[ast]=Backend LibParted del xestor de ficheros de KDE
Name[bg]=Ядро LibParted за управление на дялове в KDE
Name[bs]=LibParted pozadina za KDE‑ov menadžer particija
Name[ca]=Dorsal pel LibParted del gestor de particions del KDE
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment