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
78c53afd3d
commit
2a3ec0535d
|
@ -2,7 +2,6 @@
|
|||
Type=Application
|
||||
Name=KDE Partition Manager
|
||||
Name[ar]=مدير أقسام كدي
|
||||
Name[ast]=Xestor KDE de particiones
|
||||
Name[bg]=Управление на дялове за KDE
|
||||
Name[bs]=KDE‑ov menadžer particija
|
||||
Name[ca]=Gestor de particions del KDE
|
||||
|
@ -54,7 +53,6 @@ Name[zh_CN]=KDE 分区管理器
|
|||
Name[zh_TW]=KDE 磁碟分割區管理員
|
||||
GenericName=Partition Editor
|
||||
GenericName[ar]=محرّر أقسام
|
||||
GenericName[ast]=Editor de particiones
|
||||
GenericName[bg]=Редактор на дялове
|
||||
GenericName[bs]=Uređivač particija
|
||||
GenericName[ca]=Editor de particions
|
||||
|
@ -105,7 +103,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
|
||||
|
|
Loading…
Reference in New Issue