aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-05-04 09:49:14 -0400
committerKen Moore <ken@ixsystems.com>2017-05-04 09:49:14 -0400
commitf8bfe3865d81f984e73a91e6a4f5aa853eeee5b5 (patch)
treea9d5ad28dc57bec9a8fd64ca1470e9de966b2c10
parentClean up some margins on the clock for the horizontal orientation. (diff)
parentTranslated using Weblate (l_TE@ru (generated)) (diff)
downloadlumina-f8bfe3865d81f984e73a91e6a4f5aa853eeee5b5.tar.gz
lumina-f8bfe3865d81f984e73a91e6a4f5aa853eeee5b5.tar.bz2
lumina-f8bfe3865d81f984e73a91e6a4f5aa853eeee5b5.zip
Merge branch 'master' of github.com:trueos/lumina
-rw-r--r--port-files/FreeBSD/pkg-plist5
-rw-r--r--src-qt5/core-utils/lumina-config/i18n/lumina-config_ru.ts16
-rw-r--r--src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts34
-rw-r--r--src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_ru.ts10
-rw-r--r--src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_ru.ts2
-rw-r--r--src-qt5/desktop-utils/lumina-textedit/i18n/l-te_ru.ts12
6 files changed, 38 insertions, 41 deletions
diff --git a/port-files/FreeBSD/pkg-plist b/port-files/FreeBSD/pkg-plist
index 2b08fb83..ed0edfc3 100644
--- a/port-files/FreeBSD/pkg-plist
+++ b/port-files/FreeBSD/pkg-plist
@@ -30,6 +30,7 @@ share/applications/lumina-search.desktop
share/applications/lumina-support.desktop
share/applications/lumina-textedit.desktop
share/applications/lumina-xconfig.desktop
+share/applications/lumina-xdg-entry.desktop
share/icons/material-design-dark/LICENSE
share/icons/material-design-dark/index.theme
share/icons/material-design-dark/scalable/actions/address-book-new.svg
@@ -1857,7 +1858,6 @@ share/icons/material-design-light/scalable/status/weather-windy.svg
%%DATADIR%%-desktop/i18n/l-mediap_fi.qm
%%DATADIR%%-desktop/i18n/l-mediap_fr.qm
%%DATADIR%%-desktop/i18n/l-mediap_fr_CA.qm
-%%DATADIR%%-desktop/i18n/l-mediap_fur.qm
%%DATADIR%%-desktop/i18n/l-mediap_gl.qm
%%DATADIR%%-desktop/i18n/l-mediap_he.qm
%%DATADIR%%-desktop/i18n/l-mediap_hi.qm
@@ -1876,7 +1876,6 @@ share/icons/material-design-light/scalable/status/weather-windy.svg
%%DATADIR%%-desktop/i18n/l-mediap_ms.qm
%%DATADIR%%-desktop/i18n/l-mediap_mt.qm
%%DATADIR%%-desktop/i18n/l-mediap_nb.qm
-%%DATADIR%%-desktop/i18n/l-mediap_ne.qm
%%DATADIR%%-desktop/i18n/l-mediap_nl.qm
%%DATADIR%%-desktop/i18n/l-mediap_pa.qm
%%DATADIR%%-desktop/i18n/l-mediap_pl.qm
@@ -1884,7 +1883,6 @@ share/icons/material-design-light/scalable/status/weather-windy.svg
%%DATADIR%%-desktop/i18n/l-mediap_pt_BR.qm
%%DATADIR%%-desktop/i18n/l-mediap_ro.qm
%%DATADIR%%-desktop/i18n/l-mediap_ru.qm
-%%DATADIR%%-desktop/i18n/l-mediap_sa.qm
%%DATADIR%%-desktop/i18n/l-mediap_sk.qm
%%DATADIR%%-desktop/i18n/l-mediap_sl.qm
%%DATADIR%%-desktop/i18n/l-mediap_sr.qm
@@ -1895,7 +1893,6 @@ share/icons/material-design-light/scalable/status/weather-windy.svg
%%DATADIR%%-desktop/i18n/l-mediap_th.qm
%%DATADIR%%-desktop/i18n/l-mediap_tr.qm
%%DATADIR%%-desktop/i18n/l-mediap_uk.qm
-%%DATADIR%%-desktop/i18n/l-mediap_ur.qm
%%DATADIR%%-desktop/i18n/l-mediap_uz.qm
%%DATADIR%%-desktop/i18n/l-mediap_vi.qm
%%DATADIR%%-desktop/i18n/l-mediap_zh_CN.qm
diff --git a/src-qt5/core-utils/lumina-config/i18n/lumina-config_ru.ts b/src-qt5/core-utils/lumina-config/i18n/lumina-config_ru.ts
index b6b7c5c8..c978122f 100644
--- a/src-qt5/core-utils/lumina-config/i18n/lumina-config_ru.ts
+++ b/src-qt5/core-utils/lumina-config/i18n/lumina-config_ru.ts
@@ -344,7 +344,7 @@
</message>
<message>
<location filename="../LPlugins.cpp" line="67"/>
- <source>Start menu alternative focusing on the user&apos;s files, directories, and favorites.</source>
+ <source>Start menu alternative focusing on the user's files, directories, and favorites.</source>
<translation>Альтернативное стартовое меню, сфокусированное на пользовательских файлах, каталогах и Избранном.</translation>
</message>
<message>
@@ -1242,12 +1242,12 @@
</message>
<message>
<location filename="../pages/page_fluxbox_keys.ui" line="244"/>
- <source>&quot;Mod1&quot;: Alt key
-&quot;Mod4&quot;: Windows/Mac key
-&quot;Control&quot;: Ctrl key</source>
- <translation>&quot;Mod1&quot;: Alt key
-&quot;Mod4&quot;: Windows/Mac key
-&quot;Control&quot;: Ctrl key</translation>
+ <source>"Mod1": Alt key
+"Mod4": Windows/Mac key
+"Control": Ctrl key</source>
+ <translation>"Mod1": Alt key
+"Mod4": Windows/Mac key
+"Control": Ctrl key</translation>
</message>
<message>
<location filename="../pages/page_fluxbox_keys.cpp" line="70"/>
@@ -1394,7 +1394,7 @@
<message>
<location filename="../pages/page_interface_desktop.ui" line="86"/>
<source>Display Removable Media Icons</source>
- <translation type="unfinished"></translation>
+ <translation>Отображение значков съемных носителей</translation>
</message>
<message>
<location filename="../pages/page_interface_desktop.cpp" line="56"/>
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 9a40b93d..35d49ac5 100644
--- a/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts
+++ b/src-qt5/core/lumina-desktop/i18n/lumina-desktop_ru.ts
@@ -40,47 +40,47 @@
<message>
<location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="64"/>
<source>Launch %1</source>
- <translation type="unfinished">Запуск %1</translation>
+ <translation>Запуск %1</translation>
</message>
<message>
<location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="103"/>
<source>Open</source>
- <translation type="unfinished">Открыть</translation>
+ <translation>Открыть</translation>
</message>
<message>
<location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="104"/>
<source>Open With</source>
- <translation type="unfinished"></translation>
+ <translation>Открыть с помощью</translation>
</message>
<message>
<location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="106"/>
<source>View Properties</source>
- <translation type="unfinished"></translation>
+ <translation>Посмотреть свойства</translation>
</message>
<message>
<location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="107"/>
<source>File Operations</source>
- <translation type="unfinished"></translation>
+ <translation>Операции с файлами</translation>
</message>
<message>
<location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="109"/>
<source>Rename</source>
- <translation type="unfinished"></translation>
+ <translation>Переименовать</translation>
</message>
<message>
<location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="111"/>
<source>Copy</source>
- <translation type="unfinished">Копировать</translation>
+ <translation>Копировать</translation>
</message>
<message>
<location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="113"/>
<source>Cut</source>
- <translation type="unfinished">Вырезать</translation>
+ <translation>Вырезать</translation>
</message>
<message>
<location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="114"/>
<source>Delete</source>
- <translation type="unfinished">Удалить</translation>
+ <translation>Удалить</translation>
</message>
<message>
<location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="174"/>
@@ -95,7 +95,7 @@
<message>
<location filename="../desktop-plugins/applauncher/AppLauncherPlugin.cpp" line="243"/>
<source>New Filename</source>
- <translation type="unfinished"></translation>
+ <translation>Новое имя файла</translation>
</message>
</context>
<context>
@@ -246,7 +246,7 @@
<message>
<location filename="../BootSplash.cpp" line="55"/>
<source>Everything has its beauty but not everyone sees it.</source>
- <translation>Все имеет свою красоту, но не каждый видит еe.</translation>
+ <translation>Все имеет свою красоту, но не каждый видит ее.</translation>
</message>
<message>
<location filename="../BootSplash.cpp" line="57"/>
@@ -265,12 +265,12 @@
</message>
<message>
<location filename="../BootSplash.cpp" line="63"/>
- <source>Don&apos;t expect to build up the weak by pulling down the strong.</source>
+ <source>Don't expect to build up the weak by pulling down the strong.</source>
<translation>Не ждите, чтобы создать слабое, потянув вниз сильное.</translation>
</message>
<message>
<location filename="../BootSplash.cpp" line="65"/>
- <source>You can&apos;t know too much, but you can say too much.</source>
+ <source>You can't know too much, but you can say too much.</source>
<translation>Вы не можете знать слишком много, но вы можете сказать слишком много.</translation>
</message>
<message>
@@ -350,7 +350,7 @@
</message>
<message>
<location filename="../BootSplash.cpp" line="97"/>
- <source>Only two things are infinite, the universe and human stupidity, and I&apos;m not sure about the former.</source>
+ <source>Only two things are infinite, the universe and human stupidity, and I'm not sure about the former.</source>
<translation>Только две вещи бесконечны, вселенная и человеческая глупость.</translation>
</message>
<message>
@@ -360,7 +360,7 @@
</message>
<message>
<location filename="../BootSplash.cpp" line="101"/>
- <source>Do, or do not. There is no &apos;try&apos;.</source>
+ <source>Do, or do not. There is no 'try'.</source>
<translation>Делай, или не делай. Не пробуй.</translation>
</message>
<message>
@@ -380,7 +380,7 @@
</message>
<message>
<location filename="../BootSplash.cpp" line="109"/>
- <source>It&apos;s kind of fun to do the impossible.</source>
+ <source>It's kind of fun to do the impossible.</source>
<translation>Это своего рода забава - сделать невозможное.</translation>
</message>
<message>
@@ -692,7 +692,7 @@
<message>
<location filename="../desktop-plugins/LDPlugin.cpp" line="37"/>
<source>Modify Item</source>
- <translation type="unfinished"></translation>
+ <translation>Изменение свойств</translation>
</message>
<message>
<location filename="../desktop-plugins/LDPlugin.cpp" line="45"/>
diff --git a/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_ru.ts b/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_ru.ts
index 4a4a0488..bddbf0c2 100644
--- a/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_ru.ts
+++ b/src-qt5/desktop-utils/lumina-fm/i18n/lumina-fm_ru.ts
@@ -331,8 +331,8 @@
</message>
<message>
<location filename="../widgets/DirWidget2.cpp" line="462"/>
- <source>The &quot;lumina-fileinfo&quot; utility could not be found on the system. Please install it first.</source>
- <translation>Утилита &quot;Lumina-FileInfo&quot; не может быть найдена в системе. Пожалуйста, установите ее в первую очередь.</translation>
+ <source>The "lumina-fileinfo" utility could not be found on the system. Please install it first.</source>
+ <translation>Утилита "Lumina-FileInfo" не может быть найдена в системе. Пожалуйста, установите ее в первую очередь.</translation>
</message>
<message>
<location filename="../widgets/DirWidget2.cpp" line="488"/>
@@ -565,8 +565,8 @@ New Location: %2</source>
</message>
<message>
<location filename="../gitWizard.ui" line="232"/>
- <source>Click &quot;Next&quot; to start downloading the repository</source>
- <translation>Нажмите &quot;Далее&quot;, чтобы начать загрузку хранилища</translation>
+ <source>Click "Next" to start downloading the repository</source>
+ <translation>Нажмите "Далее", чтобы начать загрузку хранилища</translation>
</message>
<message>
<location filename="../gitWizard.h" line="58"/>
@@ -1167,7 +1167,7 @@ New Location: %2</source>
<message>
<location filename="../TrayUI.cpp" line="91"/>
<source>New Tasks Running</source>
- <translation type="unfinished"></translation>
+ <translation>Выполнение новых задач</translation>
</message>
</context>
</TS>
diff --git a/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_ru.ts b/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_ru.ts
index dbbf8792..cfcc9c57 100644
--- a/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_ru.ts
+++ b/src-qt5/desktop-utils/lumina-screenshot/i18n/l-screenshot_ru.ts
@@ -94,7 +94,7 @@
<message>
<location filename="../MainUI.ui" line="433"/>
<source>Select Area</source>
- <translation type="unfinished"></translation>
+ <translation>Выберите область</translation>
</message>
<message>
<location filename="../MainUI.ui" line="445"/>
diff --git a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_ru.ts b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_ru.ts
index 571c8d8f..06794fbf 100644
--- a/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_ru.ts
+++ b/src-qt5/desktop-utils/lumina-textedit/i18n/l-te_ru.ts
@@ -45,7 +45,7 @@
<message>
<location filename="../DnDTabBar.h" line="43"/>
<source>Detach Tab</source>
- <translation type="unfinished"></translation>
+ <translation>Отсоединить вкладку</translation>
</message>
</context>
<context>
@@ -122,7 +122,7 @@
<message>
<location filename="../MainUI.ui" line="220"/>
<source>Tabs Location</source>
- <translation type="unfinished"></translation>
+ <translation>Расположение вкладок</translation>
</message>
<message>
<location filename="../MainUI.ui" line="237"/>
@@ -244,22 +244,22 @@
<message>
<location filename="../MainUI.ui" line="409"/>
<source>Top</source>
- <translation type="unfinished"></translation>
+ <translation>Вверх</translation>
</message>
<message>
<location filename="../MainUI.ui" line="417"/>
<source>Bottom</source>
- <translation type="unfinished"></translation>
+ <translation>Вниз</translation>
</message>
<message>
<location filename="../MainUI.ui" line="425"/>
<source>Left</source>
- <translation type="unfinished"></translation>
+ <translation>Влево</translation>
</message>
<message>
<location filename="../MainUI.ui" line="433"/>
<source>Right</source>
- <translation type="unfinished"></translation>
+ <translation>Вправо</translation>
</message>
<message>
<location filename="../MainUI.cpp" line="61"/>
bgstack15