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 2016-12-20 12:48:20 +01:00
parent 4bfd117d4a
commit 7b0f19ead5
1 changed files with 0 additions and 2 deletions

View File

@ -2,7 +2,6 @@
Type=Application
Name=KDE Partition Manager
Name[ar]=مدير أقسام كدي
Name[ast]=Xestor de particiones KDE
Name[bg]=Управление на дялове за KDE
Name[bs]=KDEov menadžer particija
Name[ca]=Gestor de particions del KDE
@ -105,7 +104,6 @@ GenericName[zh_CN]=分区编辑器
GenericName[zh_TW]=磁碟分割區編輯器
Comment=Manage disks, partitions and file systems
Comment[ar]=أدِر الأقراص، والأقسام وأنظمة الملفّات
Comment[ast]=Xestiona discos, particiones y sistemes de ficheros
Comment[bg]=Управлява размерите на дискове, дялове и операционни системи
Comment[bs]=Upravljajte diskovima, particijama i datotečnim sistemima
Comment[ca]=Gestioneu discos, particions i sistemes de fitxers