From 7d3d33375316da0f02f323d7c282e72ee40265b4 Mon Sep 17 00:00:00 2001
From: Denis Kuzmenok <denis.kuzmenok@gmail.com>
Date: Mon, 27 Nov 2017 10:17:34 +0200
Subject: [PATCH] changed translations and settings layout

---
 resources/language/English/strings.po   |  38 ++++-
 resources/language/Russian/strings.po   | 176 ++++++++++++++++++++----
 resources/language/Ukrainian/strings.po |   4 +-
 resources/language/messages.pot         |  38 ++++-
 resources/settings.xml                  |  31 +++--
 5 files changed, 236 insertions(+), 51 deletions(-)

diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po
index ffeecd27f..818e3e1be 100644
--- a/resources/language/English/strings.po
+++ b/resources/language/English/strings.po
@@ -21,7 +21,7 @@ msgid "General"
 msgstr ""
 
 msgctxt "#30001"
-msgid "Download path (not FAT32)"
+msgid "Download path"
 msgstr ""
 
 msgctxt "#30002"
@@ -397,7 +397,7 @@ msgid "Disable background progress dialog"
 msgstr ""
 
 msgctxt "#30095"
-msgid "Resume playback from library integration"
+msgid "Sync watched progress with Kodi"
 msgstr ""
 
 msgctxt "#30096"
@@ -1002,15 +1002,15 @@ msgid "Download storage type"
 msgstr ""
 
 msgctxt "#30316"
-msgid "File"
+msgid "Use files"
 msgstr ""
 
 msgctxt "#30317"
-msgid "Memory"
+msgid "Use memory"
 msgstr ""
 
 msgctxt "#30318"
-msgid "Memory size to use for each torrent"
+msgid "Memory size to use for each torrent (Mb)"
 msgstr ""
 
 msgctxt "#30319"
@@ -1026,7 +1026,7 @@ msgid "Stop"
 msgstr ""
 
 msgctxt "#30322"
-msgid "FAT32"
+msgid "Use Fat32 files"
 msgstr ""
 
 msgctxt "#30323"
@@ -1034,5 +1034,29 @@ msgid "New search"
 msgstr ""
 
 msgctxt "#30324"
-msgid "Force stream selection from settings"
+msgid "Force stream auto-selection from settings"
+msgstr ""
+
+msgctxt "#30325"
+msgid "Download"
+msgstr ""
+
+msgctxt "#30326"
+msgid "Kodi library"
+msgstr ""
+
+msgctxt "#30327"
+msgid "Storage"
+msgstr ""
+
+msgctxt "#30328"
+msgid "Disable TCP"
+msgstr ""
+
+msgctxt "#30329"
+msgid "Disable UTP"
+msgstr ""
+
+msgctxt "#30330"
+msgid "Update Trakt"
 msgstr ""
diff --git a/resources/language/Russian/strings.po b/resources/language/Russian/strings.po
index 3049e7613..91fabcf53 100644
--- a/resources/language/Russian/strings.po
+++ b/resources/language/Russian/strings.po
@@ -21,8 +21,8 @@ msgid "General"
 msgstr "Общие"
 
 msgctxt "#30001"
-msgid "Download path (not FAT32)"
-msgstr "Путь для загрузок (кроме FAT32)"
+msgid "Download path"
+msgstr "Путь для загрузок"
 
 msgctxt "#30002"
 msgid "Keep files after playback/download stops"
@@ -30,7 +30,7 @@ msgstr "Сохранять файлы после просмотра"
 
 msgctxt "#30003"
 msgid "Buffer size (MB)"
-msgstr "Размер буфера (МБ)"
+msgstr "Размер буфера перед просмотром (МБ)"
 
 msgctxt "#30004"
 msgid "Max upload rate (kB/s)"
@@ -117,8 +117,8 @@ msgid "Get updates for pre-releases"
 msgstr "Получать обновления для пре-релизов"
 
 msgctxt "#30025"
-msgid "Limit rates after buffering only"
-msgstr "Ограничить скорость только после буферизации"
+msgid "Limit rates after initial buffering only"
+msgstr "Ограничить скорость только после начала просмотра"
 
 msgctxt "#30026"
 msgid "Library path"
@@ -129,8 +129,8 @@ msgid "Connections limit"
 msgstr "Лимит подключений"
 
 msgctxt "#30028"
-msgid "Do not ask to keep downloading"
-msgstr "Разрешить скачивание без просмотра"
+msgid "Download after play was stopped"
+msgstr "Продолжать скачивание после просмотра"
 
 msgctxt "#30029"
 msgid "Session saving frequency (seconds)"
@@ -182,7 +182,7 @@ msgstr "ключ API"
 
 msgctxt "#30041"
 msgid "Stream sorting"
-msgstr "Сортировка стримов"
+msgstr "Сортировка результатов"
 
 msgctxt "#30042"
 msgid "Sorting mode for Movies"
@@ -206,11 +206,11 @@ msgstr "баланс"
 
 msgctxt "#30047"
 msgid "Resolution preference for Movies"
-msgstr "Предпочтительное разрешение для фильмов"
+msgstr "Приоритет разрешений фильмов"
 
 msgctxt "#30048"
 msgid "Resolution preference for TV Shows"
-msgstr "Предпочтительное резрешение для сериалов"
+msgstr "Приоритет разрешений сериалов"
 
 msgctxt "#30049"
 msgid "Percentage of additional seeders required before choosing next resolution"
@@ -370,7 +370,7 @@ msgstr "Спрашивать об удалении файлов после пр
 
 msgctxt "#30088"
 msgid "Initial buffering timeout (seconds)"
-msgstr "Тайм-аут предварительной буфферизации (секунд)"
+msgstr "Тайм-аут пре-буфферизации (секунд)"
 
 msgctxt "#30089"
 msgid "Automatically re-scan Kodi library after updates"
@@ -392,6 +392,26 @@ msgctxt "#30093"
 msgid "Do Not Disturb mode"
 msgstr "Режим 'Не беспокоить'"
 
+msgctxt "#30094"
+msgid "Disable background progress dialog"
+msgstr "Отключить окно прогресса в фоне"
+
+msgctxt "#30095"
+msgid "Sync watched progress with Kodi"
+msgstr "Сохранять прогресс просмотра"
+
+msgctxt "#30096"
+msgid "Never"
+msgstr "Никогда"
+
+msgctxt "#30097"
+msgid "Always"
+msgstr "Всегда"
+
+msgctxt "#30098"
+msgid "Active torrents only"
+msgstr "Только активные торренты"
+
 # Interface
 msgctxt "#30100"
 msgid "Elementum has crashed, restarting..."
@@ -455,7 +475,7 @@ msgstr ""
 
 msgctxt "#30115"
 msgid "TV show scraper used by Kodi library"
-msgstr "Скреппер для Сериалов, используемый в библиотеке Kodi"
+msgstr "Скреппер для Сериалов в Kodi"
 
 msgctxt "#30116"
 msgid "Looks like Elementum is still starting up, give it a few seconds..."
@@ -925,18 +945,126 @@ msgctxt "#30300"
 msgid "All Premieres"
 msgstr "Все Премьеры"
 
-#~ msgctxt "#30021"
-#~ msgid "Enable pagination"
-#~ msgstr "Выводить фильмы и сериалы постранично"
+msgctxt "#30301"
+msgid "Move finished downloads to separate folders"
+msgstr "Переместить в другую папку после завершения"
+
+msgctxt "#30302"
+msgid "Files will only be moved after seeding is finished (see[CR]"
+"- BitTorrent settings), and will wait if currently playing"
+msgstr "Файлы будут перемещены после завершения сидирования,[CR]"
+"и после завершения просмотра"
+
+msgctxt "#30303"
+msgid "RAR archive detected. Download will need to be completed before"
+" playback can start and will require around twice the amount of"
+" space, continue?"
+msgstr ""
+
+msgctxt "#30304"
+msgid "Error creating output pipe for 'unrar' command"
+msgstr ""
+
+msgctxt "#30305"
+msgid "Error starting 'unrar' command"
+msgstr ""
+
+msgctxt "#30306"
+msgid "Error waiting for 'unrar' command"
+msgstr ""
+
+msgctxt "#30307"
+msgid "Error reading from destination folder"
+msgstr "Ошибка чтения из папки назначения"
+
+msgctxt "#30308"
+msgid "Move completed"
+msgstr "Переместить завершенные"
+
+msgctxt "#30309"
+msgid "Keep"
+msgstr "Оставить"
+
+msgctxt "#30310"
+msgid "Ask to delete"
+msgstr "Спросить удалить"
+
+msgctxt "#30311"
+msgid "Delete"
+msgstr "Удалить"
+
+msgctxt "#30312"
+msgid "Keep files for not finished video"
+msgstr "Оставлять файлы для недосмотренных"
+
+msgctxt "#30313"
+msgid "Keep files for watched/downloaded video"
+msgstr "Оставлять файлы для просмотренных"
+
+msgctxt "#30314"
+msgid "Settings were not initialized.[CR]Save addon settings, then restart Kodi."
+msgstr "Настройки не сохранены[CR]Сохраните настройки плагина, потом перезагрузите Kodi."
+
+msgctxt "#30315"
+msgid "Download storage type"
+msgstr "Как сохранять торренты"
+
+msgctxt "#30316"
+msgid "Use files"
+msgstr "Использовать файлы"
+
+msgctxt "#30317"
+msgid "Use memory"
+msgstr "Использовать память"
+
+msgctxt "#30318"
+msgid "Memory size to use for each torrent (Mb)"
+msgstr "Размер памяти для каждого торрента (Мб)"
+
+msgctxt "#30319"
+msgid "Continue"
+msgstr "Продолжать"
+
+msgctxt "#30320"
+msgid "Ask to stop"
+msgstr "Спросить остановить"
+
+msgctxt "#30321"
+msgid "Stop"
+msgstr "Остановить"
+
+msgctxt "#30322"
+msgid "Use Fat32 files"
+msgstr "Использовать Fat32 файлы"
+
+msgctxt "#30323"
+msgid "New search"
+msgstr "Новый поиск"
+
+msgctxt "#30324"
+msgid "Force stream auto-selection from settings"
+msgstr "Использовать авто-выбор из настроек"
+
+msgctxt "#30325"
+msgid "Download"
+msgstr "Скачивание"
+
+msgctxt "#30326"
+msgid "Kodi library"
+msgstr "Библиотека Kodi"
+
+msgctxt "#30327"
+msgid "Storage"
+msgstr "Сохранение"
 
-#~ msgctxt "#30028"
-#~ msgid "Background handling of torrents"
-#~ msgstr "Фоновая обработка торрентов"
+msgctxt "#30328"
+msgid "Disable TCP"
+msgstr "Отключить TCP"
 
-#~ msgctxt "#30219"
-#~ msgid "Add/Remove from library"
-#~ msgstr "Добавить/удалить с библиотеки"
+msgctxt "#30329"
+msgid "Disable UTP"
+msgstr "Отключить UTP"
 
-#~ msgctxt "#30230"
-#~ msgid "Play/resume torrent"
-#~ msgstr "Играть/возобновить торрент"
+msgctxt "#30330"
+msgid "Update Trakt"
+msgstr "Обновить Trakt"
diff --git a/resources/language/Ukrainian/strings.po b/resources/language/Ukrainian/strings.po
index 9c7639d92..ac09e7a46 100644
--- a/resources/language/Ukrainian/strings.po
+++ b/resources/language/Ukrainian/strings.po
@@ -129,8 +129,8 @@ msgid "Connections limit"
 msgstr "Ліміт підключень"
 
 msgctxt "#30028"
-msgid "Do not ask to keep downloading"
-msgstr "Не запитувати продовжувати завантаження"
+msgid "Download after play was stopped"
+msgstr "Продовжувати завантаження пiсля завершення перегляду"
 
 msgctxt "#30029"
 msgid "Session saving frequency (seconds)"
diff --git a/resources/language/messages.pot b/resources/language/messages.pot
index 5685c4f0f..97333b077 100644
--- a/resources/language/messages.pot
+++ b/resources/language/messages.pot
@@ -25,7 +25,7 @@ msgid "General"
 msgstr ""
 
 msgctxt "#30001"
-msgid "Download path (not FAT32)"
+msgid "Download path"
 msgstr ""
 
 msgctxt "#30002"
@@ -401,7 +401,7 @@ msgid "Disable background progress dialog"
 msgstr ""
 
 msgctxt "#30095"
-msgid "Resume playback from library integration"
+msgid "Sync watched progress with Kodi"
 msgstr ""
 
 msgctxt "#30096"
@@ -1006,15 +1006,15 @@ msgid "Download storage type"
 msgstr ""
 
 msgctxt "#30316"
-msgid "File"
+msgid "Use files"
 msgstr ""
 
 msgctxt "#30317"
-msgid "Memory"
+msgid "Use memory"
 msgstr ""
 
 msgctxt "#30318"
-msgid "Memory size to use for each torrent"
+msgid "Memory size to use for each torrent (Mb)"
 msgstr ""
 
 msgctxt "#30319"
@@ -1030,7 +1030,7 @@ msgid "Stop"
 msgstr ""
 
 msgctxt "#30322"
-msgid "FAT32"
+msgid "Use Fat32 files"
 msgstr ""
 
 msgctxt "#30323"
@@ -1038,5 +1038,29 @@ msgid "New search"
 msgstr ""
 
 msgctxt "#30324"
-msgid "Force stream selection from settings"
+msgid "Force stream auto-selection from settings"
+msgstr ""
+
+msgctxt "#30325"
+msgid "Download"
+msgstr ""
+
+msgctxt "#30326"
+msgid "Kodi library"
+msgstr ""
+
+msgctxt "#30327"
+msgid "Storage"
+msgstr ""
+
+msgctxt "#30328"
+msgid "Disable TCP"
+msgstr ""
+
+msgctxt "#30329"
+msgid "Disable UTP"
+msgstr ""
+
+msgctxt "#30330"
+msgid "Update Trakt"
 msgstr ""
diff --git a/resources/settings.xml b/resources/settings.xml
index f9ded5738..d9da41fd1 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -1,23 +1,29 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
     <category label="30000">
-        <!-- General -->
-        <setting label="30000" type="lsep" />
+        <!-- Storage -->
+        <setting label="30327" type="lsep" />
         <setting id="download_storage" type="enum" label="30315" lvalues="30316|30317|30322" default="0" />
           <setting id="memory_size" label="30318" type="number" default="100" subsetting="true" visible="eq(-1,1)" />
         <setting id="download_path" type="folder" label="30001" source="auto" option="writeable" />
         <setting id="library_path" type="folder" label="30026" source="auto" option="writeable" />
-        <setting id="library_tv_scraper" label="30115" type="enum" lvalues="30114|30039|30056" />
-        <setting id="library_resume" label="30095" type="enum" lvalues="30096|30097|30098" default="2" />
+
+        <!-- Download -->
+        <setting label="30325" type="lsep" />
+        <setting id="keep_downloading" type="enum" label="30028" lvalues="30319|30320|30321" default="1" />
+        <setting id="keep_files_playing" type="enum" label="30312" lvalues="30309|30310|30311" default="1" />
+        <setting id="keep_files_finished" type="enum" label="30313" lvalues="30309|30310|30311" default="1" />
         <setting id="completed_move" type="bool" label="30301" default="false" />
           <setting id="completed_movies_path" type="folder" label="30214" source="auto" option="writeable" subsetting="true" visible="eq(-1,true)" />
           <setting id="completed_shows_path" type="folder" label="30215" source="auto" option="writeable" subsetting="true" visible="eq(-2,true)" />
           <setting id="completed_help" label="30302" type="text" enable="false" subsetting="true" visible="eq(-3,true)" />
         <setting id="choose_stream_auto" type="bool" label="30023" default="false" />
         <setting id="force_link_type" type="bool" label="30324" default="false" />
-        <setting id="keep_downloading" type="enum" label="30028" lvalues="30319|30320|30321" default="1" />
-        <setting id="keep_files_playing" type="enum" label="30312" lvalues="30309|30310|30311" default="1" />
-        <setting id="keep_files_finished" type="enum" label="30313" lvalues="30309|30310|30311" default="1" />
+
+        <!-- Library -->
+        <setting label="30326" type="lsep" />
+        <setting id="library_tv_scraper" label="30115" type="enum" lvalues="30114|30039|30056" />
+        <setting id="library_resume" label="30095" type="enum" lvalues="30096|30097|30098" default="2" />
         <setting id="results_per_page" label="30021" type="slider" option="int" range="3,1,30" default="9" />
         <setting id="enable_overlay_status" type="bool" label="30022" default="true" />
           <setting id="overlay_status_offset" type="number" label="30030" default="150" subsetting="true" visible="eq(-1,true)" />
@@ -25,7 +31,6 @@
         <setting id="add_specials" type="bool" label="30055" default="false" />
         <setting id="unaired_seasons" type="bool" label="30284" default="false" />
         <setting id="unaired_episodes" type="bool" label="30285" default="false" />
-        <setting id="buffer_timeout" label="30088" type="slider" option="int" range="60,15,900" default="300" />
     </category>
     <category label="30033">
         <!-- Appearance -->
@@ -46,6 +51,7 @@
         <!-- BitTorrent -->
         <setting label="BitTorrent" type="lsep" />
         <setting id="buffer_size" label="30003" type="number" default="20" />
+        <setting id="buffer_timeout" label="30088" type="slider" option="int" range="60,15,900" default="300" />
         <setting id="max_upload_rate" label="30004" type="number" default="" />
         <setting id="max_download_rate" label="30005" type="number" default="" />
         <setting id="limit_after_buffering" label="30025" type="bool" default="false" />
@@ -55,10 +61,12 @@
         <setting id="seed_time_ratio_limit" label="30052" type="number" default="200" /> -->
         <setting id="seed_time_limit" label="30053" type="number" default="0" />
         <setting id="disable_dht" label="30050" type="bool" default="false" />
+        <setting id="disable_tcp" label="30328" type="bool" default="false" />
+        <setting id="disable_utp" label="30329" type="bool" default="false" />
         <!-- <setting id="disable_upnp" label="30063" type="bool" default="false" /> -->
         <setting id="encryption_policy" label="30064" type="enum" lvalues="30010|30065|30066" />
         <setting id="listen_port_min" label="30006" type="number" default="6881" />
-        <setting id="listen_port_max" label="30007" type="number" default="6887" />
+        <setting id="listen_port_max" label="30007" type="number" default="6891" />
         <setting id="listen_interfaces" label="30090" type="text" default="" />
         <setting id="outgoing_interfaces" label="30091" type="text" default="" />
         <!-- <setting id="tuned_storage" label="30086" type="bool" default="false" /> -->
@@ -74,11 +82,11 @@
         <setting id="percentage_additional_seeders" label="30049" type="number" default="25" />
         <!-- Providers -->
         <setting label="30239" type="lsep" />
-        <setting id="provider_disable_failing" label="30031" type="bool" default="true" />
+        <setting id="provider_disable_failing" label="30031" type="bool" default="false" />
         <setting id="provider_allowed_failures" label="30032" type="slider" option="int" range="0,1,10" default="3" />
         <setting label="30016" type="lsep" />
         <setting id="custom_provider_timeout_enabled" label="30017" type="bool" default="false" />
-        <setting id="custom_provider_timeout" label="30018" type="slider" option="int" range="10,1,30" default="10" visible="eq(-1,true)" />
+        <setting id="custom_provider_timeout" label="30018" type="slider" option="int" range="10,1,40" default="15" visible="eq(-1,true)" />
     </category>
     <!-- Proxy -->
     <!-- <category label="30008">
@@ -109,6 +117,7 @@
         <setting id="trakt_scrobble" type="bool" label="Scrobble" default="false" />
         <setting id="trakt_sync" label="30061" type="slider" option="int" range="0,1,24" default="0" />
         <setting id="trakt_token" type="text" label="Trakt token" default="" visible="false" />
+        <setting type="action" label="30330" action="RunPlugin(plugin://plugin.video.elementum/trakt/update)" />
         <setting id="trakt_refresh_token" type="text" label="Trakt refresh token" default="" visible="false" />
         <setting id="trakt_token_expiry" type="number" label="Trakt token expiry" default="0" visible="false" />
         <setting label="CloudHole" type="lsep" />