Merge branch 'master' of github.com:trueos/lumina

11 files changed, 55 insertions, 55 deletions

diff --git a/src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp b/src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp
index 10216f92..5cdf18bc 100644
--- a/src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp
+++ b/src-qt5/core/libLumina/LuminaOS-FreeBSD.cpp
@@ -292,7 +292,7 @@ QString LOS::FileSystemCapacity(QString dir) { //Return: percentage capacity as
 QStringList LOS::CPUTemperatures(){ //Returns: List containing the temperature of any CPU's ("50C" for example)
   static QStringList vars = QStringList();
   QStringList temps;
-  if(vars.isEmpty()){ temps = LUtils::getCmdOutput("sysctl -ai").filter(".temperature:"); }
+  if(vars.isEmpty()){ temps = LUtils::getCmdOutput("sysctl -i hw.").filter(".temperature:"); }
   else{ temps = LUtils::getCmdOutput("sysctl "+vars.join(" ")); vars.clear(); }
   
     temps.sort();
diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fa.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fa.ts
index 30601151..48083653 100644
--- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fa.ts
+++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fa.ts
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="lumina-desktop_fa">
 <context>
     <name>AppLaunchButtonPlugin</name>
     <message>
         <location filename="../panel-plugins/applauncher/AppLaunchButton.cpp" line="32"/>
         <source>Click to assign an application</source>
-        <translation type="unfinished"></translation>
+        <translation>تْلیک کنید تا یک کاربست بگمارید</translation>
     </message>
     <message>
         <location filename="../panel-plugins/applauncher/AppLaunchButton.cpp" line="38"/>
         <source>Launch %1</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 را راه بیانداز</translation>
     </message>
     <message>
         <location filename="../panel-plugins/applauncher/AppLaunchButton.cpp" line="45"/>
         <source>Open %1</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 را باز کن</translation>
     </message>
     <message>
         <location filename="../panel-plugins/applauncher/AppLaunchButton.cpp" line="63"/>
         <source>Select Application</source>
-        <translation type="unfinished"></translation>
+        <translation>کاربست برگزین</translation>
     </message>
     <message>
         <location filename="../panel-plugins/applauncher/AppLaunchButton.cpp" line="63"/>
diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fi.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fi.ts
index 536d9700..0c60a7cb 100644
--- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fi.ts
+++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_fi.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
 <TS version="2.1" language="fi">
 <context>
@@ -53,7 +53,7 @@
     <message>
         <location filename="../AppMenu.cpp" line="45"/>
         <source>Desktop</source>
-        <translation type="unfinished">Työpöytä</translation>
+        <translation>Työpöytä</translation>
     </message>
     <message>
         <location filename="../AppMenu.cpp" line="83"/>
@@ -1059,12 +1059,12 @@
     <message>
         <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="267"/>
         <source>Apply Updates?</source>
-        <translation type="unfinished"></translation>
+        <translation>Toteutetaanko päivitykset?</translation>
     </message>
     <message>
         <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="267"/>
         <source>You have system updates waiting to be applied! Do you wish to install them now?</source>
-        <translation type="unfinished"></translation>
+        <translation>Jotkin järjestelmäpäivitykset odottavat toteuttamista! Haluatko asentaa ne nyt?</translation>
     </message>
     <message>
         <location filename="../panel-plugins/systemstart/StartMenu.cpp" line="475"/>
@@ -1129,12 +1129,12 @@
     <message>
         <location filename="../SystemWindow.cpp" line="57"/>
         <source>Apply Updates?</source>
-        <translation type="unfinished"></translation>
+        <translation>Toteutetaanko päivitykset?</translation>
     </message>
     <message>
         <location filename="../SystemWindow.cpp" line="57"/>
         <source>You have system updates waiting to be applied! Do you wish to install them now?</source>
-        <translation type="unfinished"></translation>
+        <translation>Joitakin järjestelmäpäivityksiä odottavat toteuttamista! Haluatko asentaa ne nyt?</translation>
     </message>
 </context>
 <context>
diff --git a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts
index 18b39873..5fe2c5aa 100644
--- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts
+++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
 <TS version="2.1" language="ru">
 <context>
@@ -128,7 +128,7 @@
     <message>
         <location filename="../AppMenu.cpp" line="110"/>
         <source>Unsorted</source>
-        <translation>Не классифицированные </translation>
+        <translation>Несортированный</translation>
     </message>
     <message>
         <location filename="../AppMenu.cpp" line="37"/>
@@ -146,47 +146,47 @@
     <message>
         <location filename="../BootSplash.cpp" line="18"/>
         <source>Initializing Session …</source>
-        <translation>Инициализация сессии ...</translation>
+        <translation>Инициализация сессии …</translation>
     </message>
     <message>
         <location filename="../BootSplash.cpp" line="21"/>
         <source>Loading System Settings …</source>
-        <translation>Загрузка параметров системы ...</translation>
+        <translation>Загрузка параметров системы …</translation>
     </message>
     <message>
         <location filename="../BootSplash.cpp" line="24"/>
         <source>Loading User Preferences …</source>
-        <translation>Загрузка пользовательских настроек ...</translation>
+        <translation>Загрузка пользовательских настроек …</translation>
     </message>
     <message>
         <location filename="../BootSplash.cpp" line="27"/>
         <source>Preparing System Tray …</source>
-        <translation>Подготовка Системного лотка ...</translation>
+        <translation>Подготовка Системного лотка …</translation>
     </message>
     <message>
         <location filename="../BootSplash.cpp" line="30"/>
         <source>Starting Window Manager …</source>
-        <translation>Запуск Менеджера окон ...</translation>
+        <translation>Запуск Менеджера окон …</translation>
     </message>
     <message>
         <location filename="../BootSplash.cpp" line="33"/>
         <source>Detecting Applications …</source>
-        <translation>Обнаружение Приложений ...</translation>
+        <translation>Обнаружение Приложений …</translation>
     </message>
     <message>
         <location filename="../BootSplash.cpp" line="36"/>
         <source>Preparing Menus …</source>
-        <translation>Подготовка Меню ...</translation>
+        <translation>Подготовка Меню …</translation>
     </message>
     <message>
         <location filename="../BootSplash.cpp" line="39"/>
         <source>Preparing Workspace …</source>
-        <translation>Подготовка Рабочей области ...</translation>
+        <translation>Подготовка Рабочей области …</translation>
     </message>
     <message>
         <location filename="../BootSplash.cpp" line="42"/>
         <source>Finalizing …</source>
-        <translation>Завершение ...</translation>
+        <translation>Завершение …</translation>
     </message>
     <message>
         <location filename="../BootSplash.cpp" line="45"/>
@@ -903,7 +903,7 @@
     <message>
         <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="78"/>
         <source>Lumina Desktop RSS</source>
-        <translation>Lumina Desktop RSS</translation>
+        <translation>RSS рабочего стола Lumina</translation>
     </message>
     <message>
         <location filename="../desktop-plugins/rssreader/RSSFeedPlugin.cpp" line="143"/>
@@ -1338,7 +1338,7 @@
     <message>
         <location filename="../panel-plugins/userbutton/UserWidget.cpp" line="302"/>
         <source>Unsorted</source>
-        <translation>Не классифицированные </translation>
+        <translation>Несортированный</translation>
     </message>
 </context>
 </TS>
diff --git a/src-qt5/core/lumina-info/i18n/lumina-info_ru.ts b/src-qt5/core/lumina-info/i18n/lumina-info_ru.ts
index f86f8764..b886b049 100644
--- a/src-qt5/core/lumina-info/i18n/lumina-info_ru.ts
+++ b/src-qt5/core/lumina-info/i18n/lumina-info_ru.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
 <TS version="2.1" language="ru">
 <context>
diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_fi.ts b/src-qt5/core/lumina-open/i18n/lumina-open_fi.ts
index 71e1fdbb..f39d8d2a 100644
--- a/src-qt5/core/lumina-open/i18n/lumina-open_fi.ts
+++ b/src-qt5/core/lumina-open/i18n/lumina-open_fi.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
 <TS version="2.1" language="fi">
 <context>
@@ -36,7 +36,7 @@
     <message>
         <location filename="../LFileDialog.ui" line="199"/>
         <source>Set this application as the default </source>
-        <translation>Aseta tämä sovellus oletukseksi</translation>
+        <translation>Aseta tämä sovellus oletukseksi </translation>
     </message>
     <message>
         <location filename="../LFileDialog.ui" line="221"/>
@@ -186,7 +186,7 @@
     <message>
         <location filename="../main.cpp" line="362"/>
         <source>Binary Missing</source>
-        <translation type="unfinished"></translation>
+        <translation>Ohjelmatiedosto puuttuu</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="362"/>
diff --git a/src-qt5/core/lumina-open/i18n/lumina-open_ru.ts b/src-qt5/core/lumina-open/i18n/lumina-open_ru.ts
index b111f228..1a1f9f18 100644
--- a/src-qt5/core/lumina-open/i18n/lumina-open_ru.ts
+++ b/src-qt5/core/lumina-open/i18n/lumina-open_ru.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
 <TS version="2.1" language="ru">
 <context>
diff --git a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_fa.ts b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_fa.ts
index 0987534d..e5078580 100644
--- a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_fa.ts
+++ b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_fa.ts
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
 <TS version="2.1" language="fa_IR">
 <context>
     <name>LLockScreen</name>
     <message>
-        <location filename="../LLockScreen.ui" line="14"/>
+        <location filename="../LLockScreen.ui" line="14"></location>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>از</translation>
     </message>
     <message>
         <location filename="../LLockScreen.ui" line="114"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>گذرواژه</translation>
     </message>
     <message>
         <location filename="../LLockScreen.ui" line="126"/>
         <source>Unlock Session</source>
-        <translation type="unfinished"></translation>
+        <translation>نشست را باز کن</translation>
     </message>
     <message>
         <location filename="../LLockScreen.cpp" line="39"/>
         <source>Locked by: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>بسته شده بدست: %1</translation>
     </message>
     <message>
         <location filename="../LLockScreen.cpp" line="76"/>
diff --git a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_fi.ts b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_fi.ts
index 567a67aa..d8341f4d 100644
--- a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_fi.ts
+++ b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_fi.ts
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
 <TS version="2.1" language="fi_FI">
 <context>
     <name>LLockScreen</name>
     <message>
-        <location filename="../LLockScreen.ui" line="14"/>
+        <location filename="../LLockScreen.ui" line="14"></location>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Lomake</translation>
     </message>
     <message>
         <location filename="../LLockScreen.ui" line="114"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Salasana</translation>
     </message>
     <message>
         <location filename="../LLockScreen.ui" line="126"/>
         <source>Unlock Session</source>
-        <translation type="unfinished"></translation>
+        <translation>Poista istunnon lukitus</translation>
     </message>
     <message>
         <location filename="../LLockScreen.cpp" line="39"/>
         <source>Locked by: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Lukinnut: %1</translation>
     </message>
     <message>
         <location filename="../LLockScreen.cpp" line="76"/>
diff --git a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_lt.ts b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_lt.ts
index e676ad89..c3da1cd8 100644
--- a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_lt.ts
+++ b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_lt.ts
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
 <TS version="2.1" language="lt_LT">
 <context>
     <name>LLockScreen</name>
     <message>
-        <location filename="../LLockScreen.ui" line="14"/>
+        <location filename="../LLockScreen.ui" line="14"></location>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Forma</translation>
     </message>
     <message>
         <location filename="../LLockScreen.ui" line="114"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Slaptažodis</translation>
     </message>
     <message>
         <location filename="../LLockScreen.ui" line="126"/>
         <source>Unlock Session</source>
-        <translation type="unfinished"></translation>
+        <translation>Atrakinti seansą</translation>
     </message>
     <message>
         <location filename="../LLockScreen.cpp" line="39"/>
         <source>Locked by: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Užrakino: %1</translation>
     </message>
     <message>
         <location filename="../LLockScreen.cpp" line="76"/>
diff --git a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_ru.ts b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_ru.ts
index c3df58cc..0f3d9759 100644
--- a/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_ru.ts
+++ b/src-qt5/core/lumina-wm-INCOMPLETE/i18n/lumina-wm_ru.ts
@@ -1,27 +1,27 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
 <TS version="2.1" language="ru_RU">
 <context>
     <name>LLockScreen</name>
     <message>
-        <location filename="../LLockScreen.ui" line="14"/>
+        <location filename="../LLockScreen.ui" line="14"></location>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Экран блокировки</translation>
     </message>
     <message>
         <location filename="../LLockScreen.ui" line="114"/>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation>Пароль</translation>
     </message>
     <message>
         <location filename="../LLockScreen.ui" line="126"/>
         <source>Unlock Session</source>
-        <translation type="unfinished"></translation>
+        <translation>Разблокировать сессию</translation>
     </message>
     <message>
         <location filename="../LLockScreen.cpp" line="39"/>
         <source>Locked by: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Заблокировано: %1</translation>
     </message>
     <message>
         <location filename="../LLockScreen.cpp" line="76"/>