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
510f1f80af
commit
0183d07911
|
@ -50,7 +50,6 @@ Name[th]=เครื่องมือจัดการพาร์ทิช
|
|||
Name[tr]=KDE Partition Manager
|
||||
Name[ug]=KDE دىسكا رايونى باشقۇرغۇ
|
||||
Name[uk]=Керування розділами диска KDE
|
||||
Name[x-test]=xxKDE Partition Managerxx
|
||||
Name[zh_CN]=KDE 分区管理器
|
||||
Name[zh_TW]=KDE 磁碟分割區管理員
|
||||
GenericName=Partition Editor
|
||||
|
@ -102,7 +101,6 @@ GenericName[th]=แก้ไขพาร์ทิชัน
|
|||
GenericName[tr]=Disk Bölümü Düzenleyici
|
||||
GenericName[ug]=دىسكا رايونى تەھرىرلىگۈچ
|
||||
GenericName[uk]=Редактор розділів диска
|
||||
GenericName[x-test]=xxPartition Editorxx
|
||||
GenericName[zh_CN]=分区编辑器
|
||||
GenericName[zh_TW]=磁碟分割區編輯器
|
||||
Comment=Manage disks, partitions and file systems
|
||||
|
@ -155,7 +153,6 @@ Comment[th]=จัดการดิสก์, พาร์ทิชัน แ
|
|||
Comment[tr]=Diskleri, disk bölümlerini ve dosya sistemlerini yönet
|
||||
Comment[ug]=دىسكىلارنى، دىسكا رايونلىرىنى ۋە ھۆججەت سىستېمىسىنى باشقۇرۇش پروگراممىسى
|
||||
Comment[uk]=Керуйте дисками, розділами та файловими системами
|
||||
Comment[x-test]=xxManage disks, partitions and file systemsxx
|
||||
Comment[zh_CN]=管理磁盘、分区和文件系统
|
||||
Comment[zh_TW]=管理磁碟、分割區與檔案系統
|
||||
Exec=partitionmanager
|
||||
|
@ -197,6 +194,5 @@ Keywords[sr@latin]=partition;disk;particija;disk;
|
|||
Keywords[sv]=partition;disk;
|
||||
Keywords[tr]=bölümleme;disk;
|
||||
Keywords[uk]=розділ;диск;
|
||||
Keywords[x-test]=xxpartitionxx;xxdiskxx;
|
||||
Keywords[zh_CN]=partition;disk;分区;磁盘;
|
||||
Keywords[zh_TW]=partition;disk;分割區;磁碟;硬碟
|
||||
|
|
Loading…
Reference in New Issue