Commit 64b71089 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 a3e2f9bd
......@@ -2,6 +2,7 @@
Type=Application
Name=KDE Partition Manager
Name[ar]=مدير أقسام كدي
Name[ast]=Xestor de particiones de KDE
Name[bg]=Управление на дялове за KDE
Name[bs]=KDE‑ov menadžer particija
Name[ca]=Gestor de particions del KDE
......@@ -53,6 +54,7 @@ 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
......@@ -103,6 +105,7 @@ 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
......@@ -157,6 +160,7 @@ Icon=partitionmanager
Categories=System;Filesystem;KDE;Qt;
X-KDE-StartupNotify=true
Keywords=partition;disk;
Keywords[ast]=partición;discu;
Keywords[ca]=partició;disc;
Keywords[ca@valencia]=partició;disc;
Keywords[cs]=oddíl;disk;
......
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