partitionmanager: sync with upstream, update to 1.1.1

diff --git a/partitionmanager/CMakeLists.txt b/partitionmanager/CMakeLists.txt
index cb13084..c951704 100644 (file)
--- a/partitionmanager/CMakeLists.txt
+++ b/partitionmanager/CMakeLists.txt
@@ -26,12 +26,11 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
 
 set(VERSION_MAJOR "1")
 set(VERSION_MINOR "1")
-set(VERSION_RELEASE "0")
+set(VERSION_RELEASE "1")
 set(VERSION_SUFFIX "")
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}${VERSION_SUFFIX})
 add_definitions(-DVERSION="${VERSION}")
 
-set(KDE_MIN_VERSION 4.4)
 find_package(KDE4 4.14.3 REQUIRED)
 
 find_package(MSGFMT REQUIRED)
@@ -45,20 +44,8 @@ add_definitions(${KDE4_ENABLE_EXCEPTIONS})
 include(KDE4Defaults)
 include(MacroLibrary)
 
-############### prefer udisks2 over udisks
-macro_optional_find_package( UDisks2 )
-set_package_properties(UDisks2 PROPERTIES DESCRIPTION "UDisks2 support"
-                       URL "http://www.freedesktop.org/wiki/Software/udisks/"
-                       TYPE OPTIONAL
-                      )
-if ( UDISKS2_FOUND )
-    message(STATUS "Building Partition Manager with UDisks2 support enabled")
-    add_definitions(-DENABLE_UDISKS2)
-endif()
-
 include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${UUID_INCLUDE_DIRS} ${BLKID_INCLUDE_DIRS} lib/ src/)
 
 add_subdirectory(lib)
 add_subdirectory(src)
 add_subdirectory(icons)
-

diff --git a/partitionmanager/cmake/modules/FindLIBPARTED.cmake b/partitionmanager/cmake/modules/FindLIBPARTED.cmake
index b47e8fb..dff58e4 100644 (file)
--- a/partitionmanager/cmake/modules/FindLIBPARTED.cmake
+++ b/partitionmanager/cmake/modules/FindLIBPARTED.cmake
@@ -1,3 +1,5 @@
+
+
 # Copyright (C) 2008,2010,2011 by Volker Lanz <vl@fidra.de>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -22,13 +24,13 @@
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 INCLUDE(CheckCSourceCompiles)
+include(CheckFunctionExists)
 
 if (LIBPARTED_INCLUDE_DIR AND LIBPARTED_LIBRARY)
   # Already in cache, be silent
   set(LIBPARTED_FIND_QUIETLY TRUE)
 endif (LIBPARTED_INCLUDE_DIR AND LIBPARTED_LIBRARY)
 
-
 FIND_PATH(LIBPARTED_INCLUDE_DIR parted.h PATH_SUFFIXES parted )
 
 FIND_LIBRARY(LIBPARTED_LIBRARY NAMES parted)
@@ -38,7 +40,7 @@ INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBPARTED DEFAULT_MSG LIBPARTED_LIBRARY LIBPARTED_INCLUDE_DIR)
 
 if (LIBPARTED_FS_RESIZE_LIBRARY)
-  set(LIBPARTED_LIBS ${LIBPARTED_LIBRARY} ${LIBPARTED_FS_RESIZE_LIBRARY})
+  set(LIBPARTED_LIBS ${LIBPARTED_FS_RESIZE_LIBRARY} ${LIBPARTED_LIBRARY})
 else (LIBPARTED_FS_RESIZE_LIBRARY)
   set(LIBPARTED_LIBS ${LIBPARTED_LIBRARY})
 endif (LIBPARTED_FS_RESIZE_LIBRARY)

diff --git a/partitionmanager/src/main.cpp b/partitionmanager/src/main.cpp
index 87d069a..8534c8c 100644 (file)
--- a/partitionmanager/src/main.cpp
+++ b/partitionmanager/src/main.cpp
@@ -51,9 +51,6 @@ int main(int argc, char* argv[])
        if (!loadBackend())
                return 0;
 
-       if (!checkAccessibleDevices())
-               return 0;
-       
        MainWindow* mainWindow = new MainWindow();
        mainWindow->show();
 

diff --git a/partitionmanager/src/partitionmanager.appdata.xml b/partitionmanager/src/partitionmanager.appdata.xml
index 4d68a66..0c6fe2e 100644 (file)
--- a/partitionmanager/src/partitionmanager.appdata.xml
+++ b/partitionmanager/src/partitionmanager.appdata.xml
@@ -5,115 +5,163 @@
   <project_license>GPL-2.0+</project_license>
   <name>KDE Partition Manager</name>
   <name xml:lang="ar">مدير أقسام كدي</name>
+  <name xml:lang="ca">Gestor de particions del KDE</name>
   <name xml:lang="cs">Správce diskových oddílů pro KDE</name>
   <name xml:lang="da">KDE Partitionshåndtering</name>
+  <name xml:lang="de">KDE-Partitionsverwaltung</name>
+  <name xml:lang="en-GB">KDE Partition Manager</name>
   <name xml:lang="es">Gestor de particiones de KDE</name>
+  <name xml:lang="et">KDE partitsioonide haldur</name>
   <name xml:lang="fi">KDE:n osionhallinta</name>
+  <name xml:lang="fr">Gestionnaire de partitions de KDE</name>
+  <name xml:lang="it">Gestore delle partizioni di KDE</name>
   <name xml:lang="lt">KDE Skaidinių tvarkyklė</name>
   <name xml:lang="nl">KDE Partitiebeheerder</name>
   <name xml:lang="pl">Zarządzanie partycjami KDE</name>
   <name xml:lang="pt">Gestor de Partições do KDE</name>
   <name xml:lang="pt-BR">Gerenciador de Partições do KDE</name>
   <name xml:lang="sk">KDE Správca partícií</name>
+  <name xml:lang="sl">Upravljalnik razdelkov za KDE</name>
   <name xml:lang="sr">КДЕ‑ов менаџер партиција</name>
   <name xml:lang="sr-Latn">KDE‑ov menadžer particija</name>
   <name xml:lang="sr-ijekavian">КДЕ‑ов менаџер партиција</name>
   <name xml:lang="sr-ijekavianlatin">KDE‑ov menadžer particija</name>
   <name xml:lang="sv">KDE:s partitionshanterare</name>
+  <name xml:lang="tr">KDE Disk Bölümleme Yöneticisi</name>
   <name xml:lang="uk">Редактор розділів для KDE</name>
   <name xml:lang="x-test">xxKDE Partition Managerxx</name>
   <summary>Partition Editor</summary>
   <summary xml:lang="ar">محرّر أقسام</summary>
+  <summary xml:lang="ca">Editor de particions</summary>
   <summary xml:lang="cs">Editor diskových oddílů</summary>
   <summary xml:lang="da">Partitioneringsprogram</summary>
+  <summary xml:lang="de">Partition-Editor</summary>
+  <summary xml:lang="en-GB">Partition Editor</summary>
   <summary xml:lang="es">Editor de particiones</summary>
+  <summary xml:lang="et">Partitsiooniredaktor</summary>
   <summary xml:lang="fi">Osionhallinta</summary>
+  <summary xml:lang="fr">Éditeur de partitions</summary>
+  <summary xml:lang="it">Editor delle partizioni</summary>
   <summary xml:lang="lt">Skaidinių tvarkyklė</summary>
   <summary xml:lang="nl">Partitiebewerker</summary>
   <summary xml:lang="pl">Zarządzanie partycjami</summary>
   <summary xml:lang="pt">Editor de Partições</summary>
   <summary xml:lang="pt-BR">Editor de Partições</summary>
   <summary xml:lang="sk">Editor partícií</summary>
+  <summary xml:lang="sl">Urejevalnik razdelkov</summary>
   <summary xml:lang="sr">Уређивач партиција</summary>
   <summary xml:lang="sr-Latn">Uređivač particija</summary>
   <summary xml:lang="sr-ijekavian">Уређивач партиција</summary>
   <summary xml:lang="sr-ijekavianlatin">Uređivač particija</summary>
   <summary xml:lang="sv">Partitionseditor</summary>
+  <summary xml:lang="tr">Disk Bölümü Düzenleyici</summary>
   <summary xml:lang="uk">Редактор розділів на дисках</summary>
   <summary xml:lang="x-test">xxPartition Editorxx</summary>
   <description>
     <p>KDE Partition Manager is a utility program to help you manage the disk devices, partitions and file systems on your computer. It allows you to easily create, copy, move, delete, resize without losing data, backup and restore partitions.</p>
     <p xml:lang="ar">إن مدير أقسام كدي برنامج يساعدك على إدارة أجهزة الأقراص، والأقسام وأنظمة الملفات في نظامك. ويسمح لك أن تُنشئ، وتنسخ، وتنقل، وتحذف، وتُحَجِّم دون فقدات البيانات، وتنسخ احتياطياً، وتستعيد من النسخ الاحتياطية بسهولة.</p>
+    <p xml:lang="ca">El gestor de particions del KDE és un programa d'utilitats que us ajuda a gestionar els dispositius de disc, les particions i els sistemes de fitxers de l'ordinador. Us permet crear, moure, eliminar, redimensionar sense perdre dades, fer còpies de seguretat i restaurar particions fàcilment.</p>
     <p xml:lang="da">KDE Partition Manager er et værktøj til at hjælpe dig med at håndtere dine diskenheder og filsystemerne på din computer. Den lader dig nemt oprette, kopiere, flytte, slette, ændre størrelse uden at miste data, tage backup og gendanne partitioner.</p>
+    <p xml:lang="de">KDE-Partitionsverwaltung ist ein Dienstprogramm zur Verwaltung der Festplattengeräte, Partitionen und Dateisystemen auf Ihrem Rechner. Damit können Sie Partitionen einfach erstellen, kopieren, verschieben, deren Größe ohne Datenverlust verändern und Partitionen sichern und wieder herstellen.</p>
+    <p xml:lang="en-GB">KDE Partition Manager is a utility program to help you manage the disk devices, partitions and file systems on your computer. It allows you to easily create, copy, move, delete, resize without losing data, backup and restore partitions.</p>
     <p xml:lang="es">El gestor de particiones de KDE es una utilidad que le ayuda a gestionar los dispositivos de disco duro, las particiones y el sistema de archivos de su equipo. Le permite crear, copiar, mover, borrar, cambiar el tamaño sin perder datos, hacer copia de seguridad y restaurar particiones.</p>
+    <p xml:lang="et">KDE partitsioonide haldur on tööriist, mis aitab hallata kettaseadmeid, partitsioone ja failisüsteeme sinu arvutis. See võimaldab vähese vaevaga partitsioone luua, kopeerida, liigutada, kustutada, muuta suurust andmeid kaotamata, varundada ja taastada.</p>
     <p xml:lang="fi">KDE:n osionhallinta on apuohjelma, joka auttaa hallitsemaan tietokoneen levyjä, osioita ja tiedostojärjestelmiä. Sillä voi luoda, kopioida, siirtää, poistaa, muuttaa kokoa menettämättä tietoja, varmuuskopioida ja palauttaa osioita.</p>
+    <p xml:lang="fr">Le gestionnaire de partitions de KDE est un utilitaire qui vous aide à gérer les disques, partitions et systèmes de fichiers de votre ordinateur. Il vous permet de créer, copier, déplacer, supprimer, redimensionner sans perte, sauvegarder et rétablir des partitions facilement.</p>
+    <p xml:lang="it">Il gestore delle partizioni di KDE è un programma che ti aiuta a gestire i dischi, le partizioni e i filesystem sul tuo computer. Ti consente di creare, copiare, spostare, eliminare, ridimensionare senza perdere dati, effettuare copie di sicurezza e ripristinare partizioni con grande semplicità.</p>
     <p xml:lang="lt">KDE Skaidinių tvarkyklė yra programa padedanti tvarkyti jūsų kompiuterio diskų įrenginius, skaidinius ir failų sistemas. Ji leidžia lengvai kurti, kopijuoti, perkelti, trinti ir keisti dydį neprarandant duomenų, kurti atsargines skaidinių kopijas.</p>
     <p xml:lang="nl">KDE Partitiebeheerder is een hulpprogramma om u helpen bij het beheer van de schijven, partities en bestandssystemen op uw computer. Het stelt u in staat gemakkelijk partities te maken, te kopiëren, te verplaatsen, te verwijderen, hun grootte te wijzigen zonder verlies van gegevens en hiervan een reservekopie te maken of hier vanaf te herstellen.</p>
     <p xml:lang="pl">Zarządzanie partycjami KDE jest programem użytkowym mającym na celu pomoc przy zarządzaniu urządzeniami dyskowymi, partycjami i systemami plików na twoim komputerze. Umożliwia łatwe tworzenie, kopiowanie, przenoszenie, usuwanie i zamianę rozmiaru bez utraty danych, a także tworzenie i przywracanie kopii zapasowych partycji.</p>
     <p xml:lang="pt">O Gestor de Partições do KDE é um utilitário que o ajuda a gerir os dispositivos dos discos, as suas partições e sistemas de ficheiros no seu computador. Permite-lhe facilmente criar, copiar, mover, apagar, dimensionar sem perder dados, salvaguardar e repor partições.</p>
     <p xml:lang="pt-BR">O Gerenciador de Partições do KDE é um utilitário que o ajuda a gerenciar os dispositivos de disco, suas partições e sistemas de arquivos no seu computador. Permite-lhe facilmente criar, copiar, mover, excluir, redimensionar sem perder dados, criar backup e restaurar partições.</p>
     <p xml:lang="sk">KDE správca partícií je nástroj, ktorý vám má pomôcť spravovať diskové zariadenia, partície a súborové systémy na vašom počítači. Umožňuje vám jednoducho vytvoriť, kopírovať, presúvať, mazať a meniť veľkosť bez straty dám, zálohovať a obnovovať partície.</p>
+    <p xml:lang="sl">Upravljalnik razdelkov za KDE je pripomoček, ki vam omogoča upravljanje z diski, razdelki in datotečnimi sistemi na vašem računalniku. Z njim lahko enostavno ustvarite, kopirate, premaknete, izbrišete, varnostno kopirate in obnovite ter spreminjate velikost razdelkov brez izgube podatkov. </p>
     <p xml:lang="sr">КДЕ‑ов менаџер партиција је алатка за управљање дисковима, партицијама и фајл системима на рачунару. Омогућава лако стварање, копирање, премештање и брисање партиција, промену величине без губитка података, прављење и враћање резерва партиција.</p>
     <p xml:lang="sr-Latn">KDE‑ov menadžer particija je alatka za upravljanje diskovima, particijama i fajl sistemima na računaru. Omogućava lako stvaranje, kopiranje, premeštanje i brisanje particija, promenu veličine bez gubitka podataka, pravljenje i vraćanje rezerva particija.</p>
     <p xml:lang="sr-ijekavian">КДЕ‑ов менаџер партиција је алатка за управљање дисковима, партицијама и фајл системима на рачунару. Омогућава лако стварање, копирање, премештање и брисање партиција, промену величине без губитка података, прављење и враћање резерва партиција.</p>
     <p xml:lang="sr-ijekavianlatin">KDE‑ov menadžer particija je alatka za upravljanje diskovima, particijama i fajl sistemima na računaru. Omogućava lako stvaranje, kopiranje, premeštanje i brisanje particija, promenu veličine bez gubitka podataka, pravljenje i vraćanje rezerva particija.</p>
     <p xml:lang="sv">KDE Partition Manager är ett verktyg för att hjälpa till att hantera diskenheter, partitioner och filsystem på datorn. Det låter dig enkelt skapa, kopiera, flytta, ta bort, ändra storlek utan dataförlust, säkerhetskopiera och återställa partitioner.</p>
+    <p xml:lang="tr">KDE Disk Bölümü Yöneticisi bilgisayarınızdaki disk aygıtlarını, bölümlerini ve dosya sistemlerini yönetmenize yardım eden bir programdır. Disk bölümleri üzerinde kolayca oluşturma, kopyalama, taşıma, silme, veri kaybetmeden yeniden boyutlandırma, yedekleme ve yeniden yükleme işlemleri yapmanıza izin verir.</p>
     <p xml:lang="uk">Редактор розділів KDE — допоміжна програма, яку призначено для полегшення керування дисковими пристроями, розділами та файловими системами на комп’ютері. За її допомогою ви зможете без проблем створювати, копіювати, пересувати, вилучати та змінювати розміри розділів без втрати даних, створювати резервні копії розділів та відновлювати дані з цих резервних копій.</p>
     <p xml:lang="x-test">xxKDE Partition Manager is a utility program to help you manage the disk devices, partitions and file systems on your computer. It allows you to easily create, copy, move, delete, resize without losing data, backup and restore partitions.xx</p>
     <p>Features:</p>
     <p xml:lang="ar">المزايا:</p>
+    <p xml:lang="ca">Característiques:</p>
     <p xml:lang="cs">Vlastnosti:</p>
     <p xml:lang="da">Funktioner:</p>
+    <p xml:lang="de">Funktionen:</p>
+    <p xml:lang="en-GB">Features:</p>
     <p xml:lang="es">Funciones:</p>
+    <p xml:lang="et">Omadused:</p>
     <p xml:lang="fi">Ominaisuudet:</p>
+    <p xml:lang="fr">Fonctionnalités :</p>
+    <p xml:lang="it">Funzionalità:</p>
     <p xml:lang="lt">Galimybės</p>
     <p xml:lang="nl">Mogelijkheden:</p>
     <p xml:lang="pl">Możliwości:</p>
     <p xml:lang="pt">Características:</p>
     <p xml:lang="pt-BR">Funcionalidades:</p>
     <p xml:lang="sk">Funkcie:</p>
+    <p xml:lang="sl">Zmožnosti:</p>
     <p xml:lang="sr">Могућности:</p>
     <p xml:lang="sr-Latn">Mogućnosti:</p>
     <p xml:lang="sr-ijekavian">Могућности:</p>
     <p xml:lang="sr-ijekavianlatin">Mogućnosti:</p>
     <p xml:lang="sv">Funktioner:</p>
+    <p xml:lang="tr">Özellikler:</p>
     <p xml:lang="uk">Можливості:</p>
     <p xml:lang="x-test">xxFeatures:xx</p>
     <ul>
       <li>Supports a large number of file systems, including ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS and more</li>
       <li xml:lang="ar">يدعم عددًا كبيراً من أنظمة الملفات، منها ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS وغيرها الكثير</li>
+      <li xml:lang="ca">Accepta un gran nombre de sistemes de fitxers, incloent ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS i més</li>
       <li xml:lang="da">Understøtter et større antal filsystemer, derunder ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS og andre</li>
+      <li xml:lang="de">Unterstützt eine große Zahl von Dateisystemen, einschließlich ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS und weitere</li>
+      <li xml:lang="en-GB">Supports a large number of file systems, including Ext2/3/4, Btrfs, ReiserFS, NTFS, FAT16/32, JFS, XFS and more</li>
       <li xml:lang="es">Permite un gran número de sistemas de archivos, como ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS y XFS, entre otros</li>
+      <li xml:lang="et">Paljude failisüsteemide toetus, sealhulgas ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS ja veel paljud</li>
       <li xml:lang="fi">Tukee monia tiedostojärjestelmiä kuten ext2/3/4, Btrfs, ReiserFS, NTFS, FAT16/32, JFS, XFS ja muita</li>
+      <li xml:lang="fr">Prend en charge un grand nombre de systèmes de fichiers, notamment ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS et d'autres</li>
+      <li xml:lang="it">Supporta un vasto numero di filesystem, tra cui ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS e altri</li>
       <li xml:lang="lt">Palaiko daug failų sistemų, tarp jų ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS ir kitos</li>
       <li xml:lang="nl">Ondersteunt een groot aantal bestandssystemen, inclusief ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS en meer</li>
       <li xml:lang="pl">Obsługa wielu systemów plików, uwzględniając przy tym  ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS i więcej</li>
       <li xml:lang="pt">Suporta um grande conjunto de sistemas de ficheiros, incluindo o ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS entre outros</li>
       <li xml:lang="pt-BR">Suporte a um grande conjunto de sistemas de arquivos, incluindo o ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS, entre outros</li>
       <li xml:lang="sk">Podporuje veľký počet súborových systémov, vrátane ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS a viac</li>
+      <li xml:lang="sl">Podpira številne datotečne sisteme vključno z ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS in XFS</li>
       <li xml:lang="sr">Подржава велики број фајл система, укључујући екст‑2/3/4, бтрфс, рајзер, НТФС, ФАТ‑16/32, ЈФС, ИксФС, и друге.</li>
       <li xml:lang="sr-Latn">Podržava veliki broj fajl sistema, uključujući ext2/3/4, btrfs, reiser, NTFS, FAT16/32, JFS, XFS, i druge.</li>
       <li xml:lang="sr-ijekavian">Подржава велики број фајл система, укључујући екст‑2/3/4, бтрфс, рајзер, НТФС, ФАТ‑16/32, ЈФС, ИксФС, и друге.</li>
       <li xml:lang="sr-ijekavianlatin">Podržava veliki broj fajl sistema, uključujući ext2/3/4, btrfs, reiser, NTFS, FAT16/32, JFS, XFS, i druge.</li>
       <li xml:lang="sv">Stöder ett stort antal filsystem, inklusive ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS med flera</li>
+      <li xml:lang="tr">Çok fazla dosya sistemini destekler, ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS ve XFS bunlardan bazılarıdır.</li>
       <li xml:lang="uk">Підтримка широкого набору файлових систем, зокрема ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS тощо.</li>
       <li xml:lang="x-test">xxSupports a large number of file systems, including ext2/3/4, btrfs, reiserfs, NTFS, FAT16/32, JFS, XFS and morexx</li>
       <li>Makes use of already available external programs to get its job done</li>
       <li xml:lang="ar">يستفيد من البرامج الخارجية المتاحة بالفعل لإتمام عمله</li>
+      <li xml:lang="ca">Fa ús de programes externs ja disponibles per fer la seva feina</li>
       <li xml:lang="da">Gør brug af allerede tilgængelige eksterne programmer til at udføre arbejdet</li>
+      <li xml:lang="de">Verwendet bereits vorhandene externe Programme, um die Aufgaben zu erfüllen</li>
+      <li xml:lang="en-GB">Makes use of already available external programs to get its job done</li>
       <li xml:lang="es">Utiliza varios programas externos que deben estar disponibles para realizar el trabajo</li>
+      <li xml:lang="et">Saadaolevate väliste programmide kasutamine vajalike tegevuste sooritamiseks</li>
       <li xml:lang="fi">Hoitaa hommansa hyödyntäen valmiita ulkoisia ohjelmia</li>
+      <li xml:lang="fr">Utilise des programmes externes existants pour faire le travail</li>
+      <li xml:lang="it">Utilizza programmi esterni già disponibili per fare il suo lavoro</li>
       <li xml:lang="lt">Užduotims atlikti naudoja išorinius įrankius</li>
       <li xml:lang="nl">Maakt gebruik van al beschikbare externe programma's om deze taken uit te voeren</li>
       <li xml:lang="pl">Wykorzystywanie już dostępnych programów zewnętrznych do wykonywania swojej pracy</li>
       <li xml:lang="pt">Tira partido dos programas externos já existentes para terminar a sua tarefa</li>
       <li xml:lang="pt-BR">Utiliza os programas externos já existentes para terminar a sua tarefa</li>
       <li xml:lang="sk">Používa už existujúce dostupné externé programy na vykonanie svojej práce</li>
+      <li xml:lang="sl">Za izvedbo opravil uporablja že obstoječe zunanje programe</li>
       <li xml:lang="sr">Користи разне већ постојеће спољашње програма да обави посао.</li>
       <li xml:lang="sr-Latn">Koristi razne već postojeće spoljašnje programa da obavi posao.</li>
       <li xml:lang="sr-ijekavian">Користи разне већ постојеће спољашње програма да обави посао.</li>
       <li xml:lang="sr-ijekavianlatin">Koristi razne već postojeće spoljašnje programa da obavi posao.</li>
       <li xml:lang="sv">Drar nytta av redan tillgängliga externa program för att få jobbet gjort</li>
+      <li xml:lang="tr">İşini yapmak için mevcut harici programları kullanır</li>
       <li xml:lang="uk">Використання доступних зовнішніх інструментів для виконання завдань.</li>
       <li xml:lang="x-test">xxMakes use of already available external programs to get its job donexx</li>
     </ul>

diff --git a/partitionmanager/src/partitionmanager.desktop b/partitionmanager/src/partitionmanager.desktop
index a8e94ad..f85fb1a 100644 (file)
--- a/partitionmanager/src/partitionmanager.desktop
+++ b/partitionmanager/src/partitionmanager.desktop
@@ -31,7 +31,7 @@ Name[nds]=KDE-Partitschonenpleger
 Name[nl]=KDE Partitiebeheerder
 Name[nn]=KDE-partisjonshandtering
 Name[pa]=ਕੇਡੀਈ ਪਾਰਟੀਸ਼ਨ ਮੈਨੇਜਰ
-Name[pl]=Menadżer partycji KDE
+Name[pl]=Zarządzanie partycjami
 Name[pt]=Gestor de Partições do KDE
 Name[pt_BR]=Gerenciador de partições do KDE
 Name[ro]=Gestionarul de partiții KDE
@@ -80,7 +80,7 @@ GenericName[nds]=Partitschonen-Editor
 GenericName[nl]=Partitiebewerker
 GenericName[nn]=Partisjonsredigering
 GenericName[pa]=ਪਾਰਟੀਸ਼ਨ ਐਡੀਟਰ
-GenericName[pl]=Menadżer partycji
+GenericName[pl]=Zarządzanie partycjami dla KDE
 GenericName[pt]=Editor de Partições
 GenericName[pt_BR]=Editor de partições
 GenericName[ro]=Editor de partiții

diff --git a/partitionmanager/src/plugins/dummy/pmdummybackendplugin.desktop b/partitionmanager/src/plugins/dummy/pmdummybackendplugin.desktop
index c62f653..789ef21 100644 (file)
--- a/partitionmanager/src/plugins/dummy/pmdummybackendplugin.desktop
+++ b/partitionmanager/src/plugins/dummy/pmdummybackendplugin.desktop
@@ -24,7 +24,7 @@ Name[nb]=Attrapp-motor for KDE partisjonsbehandler
 Name[nds]=Platzholler-Hülpprogramm för KDE-Partitschonenpleger
 Name[nl]=KDE Partitiebeheerder dummy-backend
 Name[pa]=ਕੇਡੀਈ ਪਾਰਟੀਸ਼ਨ ਮੈਨੇਜਰ ਫ਼ਰਜ਼ੀ ਬੈਕਐਂਡ
-Name[pl]=Fikcyjny silnik menadżera partycji KDE
+Name[pl]=Fikcyjny silnik zarządzania partycjami
 Name[pt]=Infra-Estrutura de Testes do Gestor de Partições do KDE
 Name[pt_BR]=Infraestrutura de testes do gerenciador de partições do KDE
 Name[ro]=Machetă de platformă pentru Gestionarul de partiții KDE
@@ -66,7 +66,7 @@ Comment[nb]=KDE partisjonsbehandler, attrapp bakgrunnsmotor for testing.
 Comment[nds]=En Platzholler-Hülpprogramm för KDE-Partitschonenpleger, testwies
 Comment[nl]=Een KDE Partitiebeheerder dummy-backend voor testen.
 Comment[pa]=ਟੈਸਟ ਕਰਨ ਲਈ KDE ਪਾਰਟੀਸ਼ਨ ਮੈਨੇਜਰ ਫ਼ਰਜ਼ੀ ਬੈਕਐਂਡ
-Comment[pl]=Fikcyjny silnik menadżera partycji KDE do celów testowych.
+Comment[pl]=Fikcyjny silnik zarządzania partycjami do prób.
 Comment[pt]=Uma infra-estrutura de testes do Gestor de Partições do KDE.
 Comment[pt_BR]=Uma infraestrutura de testes do gerenciador de partições do KDE.
 Comment[ro]=Machetă de platformă pentru Gestionarul de partiții KDE, destinată testelor.

diff --git a/partitionmanager/src/plugins/libparted/libpartedbackend.cpp b/partitionmanager/src/plugins/libparted/libpartedbackend.cpp
index b14d52a..3e7b8d2 100644 (file)
--- a/partitionmanager/src/plugins/libparted/libpartedbackend.cpp
+++ b/partitionmanager/src/plugins/libparted/libpartedbackend.cpp
@@ -49,11 +49,6 @@
 #include <kpluginfactory.h>
 #include <kaboutdata.h>
 
-#include <solid/device.h>
-#include <solid/deviceinterface.h>
-#include <solid/block.h>
-#include <solid/storagedrive.h>
-
 #include <parted/parted.h>
 #include <unistd.h>
 #include <blkid/blkid.h>
@@ -441,62 +436,30 @@ Device* LibPartedBackend::scanDevice(const QString& device_node)
        return d;
 }
 
-static quint32 countDevices(const QList<Solid::Device>& driveList)
-{
-       quint32 rval = 0;
-
-       foreach(const Solid::Device& solidDevice, driveList)
-       {
-                (void) solidDevice; // Silence compiler warning.
-#ifndef ENABLE_UDISKS2
-               const Solid::StorageDrive* solidDrive = solidDevice.as<Solid::StorageDrive>();
-               if (solidDrive->driveType() == Solid::StorageDrive::HardDisk ||
-                       solidDrive->driveType() == Solid::StorageDrive::CompactFlash ||
-                       solidDrive->driveType() == Solid::StorageDrive::MemoryStick ||
-                       solidDrive->driveType() == Solid::StorageDrive::SmartMedia ||
-                       solidDrive->driveType() == Solid::StorageDrive::SdMmc ||
-                       solidDrive->driveType() == Solid::StorageDrive::Xd)
-#endif
-                       rval++;
-       }
-       return rval;
-}
-
 QList<Device*> LibPartedBackend::scanDevices()
 {
        QList<Device*> result;
 
-       const QList<Solid::Device> driveList = getSolidDeviceList();
-       const quint32 totalDevices = countDevices(driveList);
-
-       quint32 count = 0;
-
-       foreach(const Solid::Device& solidDevice, driveList)
+       ped_device_probe_all();
+       PedDevice* pedDevice = NULL;
+       QVector<QString> path;
+       quint32 totalDevices = 0;
+       while (true)
        {
-#ifndef ENABLE_UDISKS2
-               const Solid::StorageDrive* solidDrive = solidDevice.as<Solid::StorageDrive>();
-
-               if (solidDrive->driveType() != Solid::StorageDrive::HardDisk &&
-                       solidDrive->driveType() != Solid::StorageDrive::CompactFlash &&
-                       solidDrive->driveType() != Solid::StorageDrive::MemoryStick &&
-                       solidDrive->driveType() != Solid::StorageDrive::SmartMedia &&
-                       solidDrive->driveType() != Solid::StorageDrive::SdMmc &&
-                       solidDrive->driveType() != Solid::StorageDrive::Xd)
+               pedDevice = ped_device_get_next(pedDevice);
+               if (!pedDevice)
+                       break;
+               if (pedDevice->type == PED_DEVICE_DM)
                        continue;
-#endif
-
-               const Solid::Block* solidBlock = solidDevice.as<Solid::Block>();
-
-               Device* d = scanDevice(solidBlock->device());
-               kWarning() << solidBlock->device();
-
-               if (d != NULL)
-               {
-                       d->setIconName(solidDevice.icon());
+               path.push_back(QString::fromUtf8(pedDevice->path));
+               ++totalDevices;
+       }
+       for (quint32 i = 0; i < totalDevices; ++i)
+       {
+               emitScanProgress(path[i], i * 100 / totalDevices);
+               Device* d = scanDevice(path[i]);
+               if (d)
                        result.append(d);
-               }
-
-               emitScanProgress(solidBlock->device(), (++count) * 100 / totalDevices);
        }
 
        return result;

diff --git a/partitionmanager/src/plugins/libparted/pmlibpartedbackendplugin.desktop b/partitionmanager/src/plugins/libparted/pmlibpartedbackendplugin.desktop
index 763df34..21e4751 100644 (file)
--- a/partitionmanager/src/plugins/libparted/pmlibpartedbackendplugin.desktop
+++ b/partitionmanager/src/plugins/libparted/pmlibpartedbackendplugin.desktop
@@ -24,7 +24,7 @@ Name[nb]=KDE partisjonsbehandler, bakgrunnsmotor for libparted
 Name[nds]=LibParted-Hülpprogramm för KDE-Partitschonenpleger
 Name[nl]=KDE Partitiebeheerder LibParted-backend
 Name[pa]=ਕੇਡੀਈ ਪਾਰਟੀਸ਼ਨ ਮੈਨੇਜਰ LibParted ਬੈਕਐਂਡ
-Name[pl]=Silnik LibParted menadżera partycji KDE
+Name[pl]=Silnik LibParted zarządzania partycjami
 Name[pt]=Infra-Estrutura da LibParted para o Gestor de Partições do KDE
 Name[pt_BR]=Infraestrutura LibParted do gerenciador de partições do KDE
 Name[ro]=Platformă LibParted pentru Gestionarul de partiții KDE
@@ -66,7 +66,7 @@ Comment[nb]=LibParted bakgrunnsmogtoren for KDE partisjonsbehandler.
 Comment[nds]=Dat LibParted-Hülpprogramm för KDE-Partitschonenpleger
 Comment[nl]=De LibParted-backend voor de KDE Partitiebeheerder
 Comment[pa]=ਕੇਡੀਈ ਪਾਰਟੀਸ਼ਨ ਮੈਨੇਜਰ ਲਈ LibParted ਬੈਕਐਂਡ
-Comment[pl]=Silnika LibParted dla menadżera partycji KDE
+Comment[pl]=Silnik LibParted dla zarządzania partycjami
 Comment[pt]=A infra-estrutura da LibParted para o Gestor de Partições do KDE
 Comment[pt_BR]=Uma infraestrutura LibParted para o gerenciador de partições do KDE
 Comment[ro]=Platforma LibParted pentru Gestionarul de partiții KDE

diff --git a/partitionmanager/src/plugins/pmcorebackendplugin.desktop b/partitionmanager/src/plugins/pmcorebackendplugin.desktop
index 60f7bf9..635a9e3 100644 (file)
--- a/partitionmanager/src/plugins/pmcorebackendplugin.desktop
+++ b/partitionmanager/src/plugins/pmcorebackendplugin.desktop
@@ -27,7 +27,7 @@ Name[nb]=KDE partisjonsbehandler programtillegg
 Name[nds]=Partitschonenpleger-Moduul för KDE
 Name[nl]=Plugin voor KDE Partitiebeheerder
 Name[pa]=ਕੇਡੀਈ ਪਾਰਟੀਸ਼ਨ ਮੈਨੇਜਰ ਪਲੱਗਇਨ
-Name[pl]=Wtyczka menadżera partycji KDE
+Name[pl]=Wtyczka zarządzania partycjami
 Name[pt]='Plugin' do Gestor de Partições do KDE
 Name[pt_BR]=Plugin do gerenciador de partições do KDE
 Name[ro]=Modul pentru gestionarul de partiții KDE

diff --git a/partitionmanager/src/util/externalcommand.cpp b/partitionmanager/src/util/externalcommand.cpp
index 9eee3eb..06d48ff 100644 (file)
--- a/partitionmanager/src/util/externalcommand.cpp
+++ b/partitionmanager/src/util/externalcommand.cpp
@@ -92,7 +92,7 @@ ExternalCommand::~ExternalCommand()
 
 void ExternalCommand::setup()
 {
-       setEnvironment(QStringList() << "LC_ALL=C" << QString("PATH=") + QString(getenv("PATH")));
+       setEnvironment(QStringList() << "LC_ALL=C" << QString("PATH=") + qgetenv("PATH"));
        setProcessChannelMode(MergedChannels);
 
        processes = new QProcess[command().size()];

diff --git a/partitionmanager/src/util/helpers.cpp b/partitionmanager/src/util/helpers.cpp
index fe55c36..2b0010d 100644 (file)
--- a/partitionmanager/src/util/helpers.cpp
+++ b/partitionmanager/src/util/helpers.cpp
@@ -35,8 +35,6 @@
 #include <kmenu.h>
 #include <kstringhandler.h>
 
-#include <solid/device.h>
-
 #include <QProcess>
 #include <QFileInfo>
 #include <QApplication>
@@ -215,56 +213,3 @@ bool loadBackend()
 
        return true;
 }
-
-bool checkAccessibleDevices()
-{
-       if (getSolidDeviceList().empty())
-       {
-               KMessageBox::error(NULL,
-                       i18nc("@info", "<para>No usable devices could be found.</para><para>Make sure you have sufficient "
-                               "privileges to access block devices on your system.</para>"),
-                       i18nc("@title:window", "Error: No Usable Devices Found"));
-               return false;
-       }
-
-       return true;
-}
-
-QList<Solid::Device> getSolidDeviceList()
-{
-#ifdef ENABLE_UDISKS2
-        QString predicate = "StorageVolume.usage == 'PartitionTable'";
-
-#else
-        QString predicate = "[ [ [ StorageDrive.driveType == 'HardDisk' OR StorageDrive.driveType == 'CompactFlash'] OR "
-                "[ StorageDrive.driveType == 'MemoryStick' OR StorageDrive.driveType == 'SmartMedia'] ] OR "
-                "[ StorageDrive.driveType == 'SdMmc' OR StorageDrive.driveType == 'Xd'] ]";
-#endif
-
-       KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
-       if (args->count() > 0)
-       {
-               predicate = " [ " + predicate + " AND ";
-
-               qint32 brackets = (args->count() + 1) / 2;
-               brackets = args->count() == 1 ? 0 : brackets;
-               for (qint32 i = 0; i < brackets; i++)
-                       predicate += "[ ";
-
-               bool right_bracket = false;
-               for (qint32 i = 0; i < args->count(); i++, right_bracket =! right_bracket)
-               {
-                       predicate += QString("Block.device == '%1' ").arg(args->arg(i));
-
-                       if (right_bracket)
-                               predicate += i == 1 ? "] " : "] ] ";
-                       if (i < args->count() - 1)
-                               predicate += "OR ";
-                       if (right_bracket && i != args->count() - 2 && i != args->count()-1)
-                               predicate += "[ ";
-               }
-               predicate += right_bracket && brackets > 0 ? "] ]" : "]";
-       }
-
-       return Solid::Device::listFromQuery(predicate);
-}

diff --git a/partitionmanager/src/util/helpers.h b/partitionmanager/src/util/helpers.h
index f5698ed..c872908 100644 (file)
--- a/partitionmanager/src/util/helpers.h
+++ b/partitionmanager/src/util/helpers.h
@@ -31,11 +31,6 @@ class QIcon;
 class QPoint;
 class QTreeWidget;
 
-namespace Solid
-{
-       class Device;
-}
-
 LIBPARTITIONMANAGERPRIVATE_EXPORT void registerMetaTypes();
 LIBPARTITIONMANAGERPRIVATE_EXPORT bool checkPermissions();
 
@@ -50,8 +45,6 @@ LIBPARTITIONMANAGERPRIVATE_EXPORT void showColumnsContextMenu(const QPoint& p, Q
 
 LIBPARTITIONMANAGERPRIVATE_EXPORT bool loadBackend();
 
-LIBPARTITIONMANAGERPRIVATE_EXPORT QList<Solid::Device> getSolidDeviceList();
-
 LIBPARTITIONMANAGERPRIVATE_EXPORT bool checkAccessibleDevices();
 
 #endif