Merge branch 'master' into frameworks
Conflicts: CMakeLists.txt src/util/helpers.cpp
This commit is contained in:
commit
1ee1e2f780
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,7 @@
|
|||
[Desktop Entry]
|
||||
Type=Application
|
||||
Name=KDE Partition Manager
|
||||
Name[ar]=مدير أقسام كدي
|
||||
Name[bg]=Управление на дялове за KDE
|
||||
Name[bs]=KDE‑ov menadžer particija
|
||||
Name[ca]=Gestor de particions del KDE
|
||||
|
@ -50,6 +51,7 @@ Name[x-test]=xxKDE Partition Managerxx
|
|||
Name[zh_CN]=KDE 分区管理器
|
||||
Name[zh_TW]=KDE 磁碟分割區管理員
|
||||
GenericName=Partition Editor
|
||||
GenericName[ar]=محرِّر أقسام
|
||||
GenericName[bg]=Редактор на дялове
|
||||
GenericName[bs]=Uređivač particija
|
||||
GenericName[ca]=Editor de particions
|
||||
|
@ -98,6 +100,7 @@ GenericName[x-test]=xxPartition Editorxx
|
|||
GenericName[zh_CN]=分区编辑器
|
||||
GenericName[zh_TW]=磁碟分割區編輯器
|
||||
Comment=Manage disks, partitions and file systems
|
||||
Comment[ar]=أدِر الأقراص والأقسام وأنظمة الملفات
|
||||
Comment[bg]=Управлява размерите на дискове, дялове и операционни системи
|
||||
Comment[bs]=Upravljajte diskovima, particijama i datotečnim sistemima
|
||||
Comment[ca]=Gestioneu discos, particions i sistemes de fitxers
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
Type=ServiceType
|
||||
X-KDE-ServiceType=PartitionManager/Plugin
|
||||
Name=KDE Partition Manager Plugin
|
||||
Name[ar]=ملحَق مدير أقسام كدي
|
||||
Name[bg]=Приставка за управление на дялове в KDE
|
||||
Name[bs]=Dodatak za KDE‑ov menadžer particija
|
||||
Name[ca]=Connector del gestor de particions del KDE
|
||||
|
|
|
@ -118,7 +118,7 @@ KAboutData* createPartitionManagerAboutData()
|
|||
QStringLiteral(VERSION),
|
||||
i18nc("@title", "Manage your disks, partitions and file systems"),
|
||||
KAboutLicense::GPL,
|
||||
i18nc("@info:credit", "(c) 2008, 2009, 2010, 2011 Volker Lanz"));
|
||||
i18nc("@info:credit", "© 2008-2013 Volker Lanz"));
|
||||
about->setOrganizationDomain(QByteArray("kde.org"));
|
||||
about->setProgramIconName(QStringLiteral("partitionmanager"));
|
||||
about->setProductName(QByteArray("partitionmanager"));
|
||||
|
|
Loading…
Reference in New Issue