Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/development'
Browse files Browse the repository at this point in the history
  • Loading branch information
JMSDOnline committed Apr 20, 2017
2 parents f3ba7bd + ba05d65 commit 073c475
Show file tree
Hide file tree
Showing 142 changed files with 1,269 additions and 376 deletions.
3 changes: 2 additions & 1 deletion packages/package/install/installpackage-plexpy
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ cp ${local_setup}templates/sysd/plexpy.template /etc/systemd/system/plexpy.servi
systemctl enable plexpy > /dev/null 2>&1
systemctl start plexpy
systemctl stop plexpy
sleep 5
systemctl start plexpy
systemctl stop plexpy
sed -i "s/http_root.*/http_root = \"plexpy\"/g" /opt/plexpy/config.ini
sed -i "s/http_host.*/http_host = localhost/g" /opt/plexpy/config.ini
systemctl start plexpy
Expand Down
29 changes: 29 additions & 0 deletions packages/system/theme/themeSelect-defaulted
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#!/bin/bash
#
# [Quick Box :: Set Defaulted Theme function]
#
# QuickLab REPOS
# QuickLab _ packages : https://github.com/QuickBox/quickbox_packages
# LOCAL REPOS
# Local _ packages : /etc/QuickBox/packages
# Author : QuickBox.IO | JMSolo
# URL : https://quickbox.io
#
# QuickBox Copyright (C) 2017 QuickBox.io
# Licensed under GNU General Public License v3.0 GPL-3 (in short)
#
# You may copy, distribute and modify the software as long as you track
# changes/dates in source files. Any modifications to our software
# including (via compiler) GPL-licensed code must also be made available
# under the GPL along with build & install instructions.
#

local_dashboard=/etc/QuickBox/themes

rm -rf /srv/rutorrent/home/db/.smoked.lock >/dev/null 2>&1
cp -r ${local_dashboard}/defaulted/. /srv/rutorrent/home
printf "" > /srv/rutorrent/home/db/.defaulted.lock

#box upgrade

service apache2 reload
29 changes: 29 additions & 0 deletions packages/system/theme/themeSelect-smoked
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#!/bin/bash
#
# [Quick Box :: Set Defaulted Theme function]
#
# QuickLab REPOS
# QuickLab _ packages : https://github.com/QuickBox/quickbox_packages
# LOCAL REPOS
# Local _ packages : /etc/QuickBox/packages
# Author : QuickBox.IO | JMSolo
# URL : https://quickbox.io
#
# QuickBox Copyright (C) 2017 QuickBox.io
# Licensed under GNU General Public License v3.0 GPL-3 (in short)
#
# You may copy, distribute and modify the software as long as you track
# changes/dates in source files. Any modifications to our software
# including (via compiler) GPL-licensed code must also be made available
# under the GPL along with build & install instructions.
#

local_dashboard=/etc/QuickBox/themes

rm -rf /srv/rutorrent/home/db/.defaulted.lock >/dev/null 2>&1
cp -r ${local_dashboard}/smoked/. /srv/rutorrent/home
printf "" > /srv/rutorrent/home/db/.smoked.lock

#box upgrade

service apache2 reload
2 changes: 1 addition & 1 deletion rtplugins/_getdir/getdirs.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function compareEntries( $a, $b )
}
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<style>
body { background-color: window; color: windowtext; border: 0px; margin: 0px; padding: 0px; -moz-user-select:none; }
Expand Down
2 changes: 1 addition & 1 deletion rtplugins/_getdir/getfiles.php
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ function compareEntries( $a, $b )
}
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru" lang="ru">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<style>
body { background-color: window; color: windowtext; border: 0px; margin: 0px; padding: 0px; -moz-user-select:none; }
Expand Down
36 changes: 18 additions & 18 deletions rtplugins/_task/lang/zh-cn.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,22 @@
* Author:
*/

theUILang.tskCommand = "Running...";
theUILang.tskCommandDone = "Done.";
theUILang.tskConsole = "Console";
theUILang.tskErrors = "Diagnostics";
theUILang.tskBackground = "Hide";
theUILang.tskStart = "Started";
theUILang.tskFinish = "Finished";
theUILang.tskElapsed = "Elapsed";
theUILang.tskPlugin = "Plugin";
theUILang.tskDeletePrompt = "Do you really want to delete the selected task(s)?";
theUILang.tskDelete = "Delete tasks(s)";
theUILang.tskActivate = "Activate";
theUILang.tskRemove = "Remove";
theUILang.tskRefresh = "Refresh";
theUILang.tskRunning = "Running";
theUILang.tskArg = "Parameter";
theUILang.tskTasks = "Tasks";
theUILang.tskCommand = "运行中...";
theUILang.tskCommandDone = "已完成.";
theUILang.tskConsole = "控制台";
theUILang.tskErrors = "诊断";
theUILang.tskBackground = "隐藏";
theUILang.tskStart = "已开始";
theUILang.tskFinish = "已完成";
theUILang.tskElapsed = "已用时间";
theUILang.tskPlugin = "插件";
theUILang.tskDeletePrompt = "你真的要删除选中的任务吗?";
theUILang.tskDelete = "删除任务";
theUILang.tskActivate = "激活";
theUILang.tskRemove = "移除";
theUILang.tskRefresh = "刷新";
theUILang.tskRunning = "运行中";
theUILang.tskArg = "参数";
theUILang.tskTasks = "任务";

thePlugins.get("_task").langLoaded();
thePlugins.get("_task").langLoaded();
2 changes: 1 addition & 1 deletion rtplugins/autotools/lang/cs.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

theUILang.autotools = "Autotools";
theUILang.autotoolsEnableLabel = "Enable \"AutoLabel\" feature, Template:";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsPathToFinished = "Path to finished downloads";
theUILang.autotoolsEnableWatch = "Enable \"AutoWatch\" feature";
theUILang.autotoolsPathToWatch = "Path to base watch directory";
Expand All @@ -24,6 +23,7 @@
theUILang.autotoolsFileOpSoftLink = "Soft link";
theUILang.autotoolsAddLabel = "Add torrent's label to path";
theUILang.autotoolsAddName = "Add torrent's name to path";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsSkipMoveForFiles = "Skip torrents that contain files matching pattern";

thePlugins.get("autotools").langLoaded();
2 changes: 1 addition & 1 deletion rtplugins/autotools/lang/da.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

theUILang.autotools = "Autotools";
theUILang.autotoolsEnableLabel = "Enable \"AutoLabel\" feature, Template:";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsPathToFinished = "Path to finished downloads";
theUILang.autotoolsEnableWatch = "Enable \"AutoWatch\" feature";
theUILang.autotoolsPathToWatch = "Path to base watch directory";
Expand All @@ -24,6 +23,7 @@
theUILang.autotoolsFileOpSoftLink = "Soft link";
theUILang.autotoolsAddLabel = "Add torrent's label to path";
theUILang.autotoolsAddName = "Add torrent's name to path";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsSkipMoveForFiles = "Skip torrents that contain files matching pattern";

thePlugins.get("autotools").langLoaded();
2 changes: 1 addition & 1 deletion rtplugins/autotools/lang/de.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

theUILang.autotools = "Autotools";
theUILang.autotoolsEnableLabel = "Enable \"AutoLabel\" feature, Template:";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsPathToFinished = "Path to finished downloads";
theUILang.autotoolsEnableWatch = "Enable \"AutoWatch\" feature";
theUILang.autotoolsPathToWatch = "Path to base watch directory";
Expand All @@ -24,6 +23,7 @@
theUILang.autotoolsFileOpSoftLink = "Soft link";
theUILang.autotoolsAddLabel = "Add torrent's label to path";
theUILang.autotoolsAddName = "Add torrent's name to path";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsSkipMoveForFiles = "Skip torrents that contain files matching pattern";

thePlugins.get("autotools").langLoaded();
4 changes: 2 additions & 2 deletions rtplugins/autotools/lang/el.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

theUILang.autotools = "Αυτόματα Εργαλεία";
theUILang.autotoolsEnableLabel = "Ενεργοποίηση χαρακτηριστικού\"ΑυτόματηΕτικέτα\" , Πρότυπο:";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsPathToFinished = "Διαδρομή για το φάκελο ολοκληρωμένων λήψεων";
theUILang.autotoolsEnableWatch = "Ενεργοποίηση χαρακτηριστικού \"ΑυτόματηΠαρακολούθηση\"";
theUILang.autotoolsPathToWatch = "Διαδρομή για το βασικό φάκελο παρακολούθησης (watch)";
Expand All @@ -24,6 +23,7 @@
theUILang.autotoolsFileOpSoftLink = "Συντόμευση ονόματος αρχείου";
theUILang.autotoolsAddLabel = "Προσθήκη της ετικέτας του torrent στη διαδρομή";
theUILang.autotoolsAddName = "Προσθήκη του ονόματος του torrent στη διαδρομή";
theUILang.autotoolsSkipMoveForFiles = "Skip torrents that contain files matching pattern";
theUILang.autotoolsEnableMove = "Ενεργοποίηση \"ΑυτόματηΜετακίνηση\" αν η ετικέτα του torrent ταιράζει με το φίλτρο";
theUILang.autotoolsSkipMoveForFiles = "Παράλειψη των torrent που περιέχουν αρχεία που ταιριάζουν στο υπόδειγμα";

thePlugins.get("autotools").langLoaded();
2 changes: 1 addition & 1 deletion rtplugins/autotools/lang/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

theUILang.autotools = "Autotools";
theUILang.autotoolsEnableLabel = "Enable \"AutoLabel\" feature, Template:";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsPathToFinished = "Path to finished downloads";
theUILang.autotoolsEnableWatch = "Enable \"AutoWatch\" feature";
theUILang.autotoolsPathToWatch = "Path to base watch directory";
Expand All @@ -24,6 +23,7 @@
theUILang.autotoolsFileOpSoftLink = "Soft link";
theUILang.autotoolsAddLabel = "Add torrent's label to path";
theUILang.autotoolsAddName = "Add torrent's name to path";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsSkipMoveForFiles = "Skip torrents that contain files matching pattern";

thePlugins.get("autotools").langLoaded();
2 changes: 1 addition & 1 deletion rtplugins/autotools/lang/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

theUILang.autotools = "Autotools";
theUILang.autotoolsEnableLabel = "Habilitar \"AutoLabel\", Template:";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsPathToFinished = "Ruta para las descargas finalizadas";
theUILang.autotoolsEnableWatch = "Habilitar \"AutoWatch\" ";
theUILang.autotoolsPathToWatch = "Ruta al directorio watch";
Expand All @@ -24,6 +23,7 @@
theUILang.autotoolsFileOpSoftLink = "Enlace simbólico";
theUILang.autotoolsAddLabel = "Add torrent's label to path";
theUILang.autotoolsAddName = "Add torrent's name to path";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsSkipMoveForFiles = "Skip torrents that contain files matching pattern";

thePlugins.get("autotools").langLoaded();
2 changes: 1 addition & 1 deletion rtplugins/autotools/lang/fi.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

theUILang.autotools = "Autotools";
theUILang.autotoolsEnableLabel = "Enable \"AutoLabel\" feature, Template:";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsPathToFinished = "Path to finished downloads";
theUILang.autotoolsEnableWatch = "Enable \"AutoWatch\" feature";
theUILang.autotoolsPathToWatch = "Path to base watch directory";
Expand All @@ -24,6 +23,7 @@
theUILang.autotoolsFileOpSoftLink = "Soft link";
theUILang.autotoolsAddLabel = "Add torrent's label to path";
theUILang.autotoolsAddName = "Add torrent's name to path";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsSkipMoveForFiles = "Skip torrents that contain files matching pattern";

thePlugins.get("autotools").langLoaded();
4 changes: 2 additions & 2 deletions rtplugins/autotools/lang/fr.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

theUILang.autotools = "Autotools";
theUILang.autotoolsEnableLabel = "Activer la fonctionnalité 'AutoLabel'. Masque:";
theUILang.autotoolsEnableMove = "Activer la fonctionnalité 'AutoMove' si le label du torrent correspond au filtre";
theUILang.autotoolsPathToFinished = "Chemin vers le répertoire des torrents terminés";
theUILang.autotoolsEnableWatch = "Activer la fonctionnalité 'AutoWatch'.";
theUILang.autotoolsPathToWatch = "Chemin vers le répertoire à observer";
Expand All @@ -24,6 +23,7 @@
theUILang.autotoolsFileOpSoftLink = "Lien symbolique";
theUILang.autotoolsAddLabel = "Ajouter le label du torrent au chemin";
theUILang.autotoolsAddName = "Ajouter le nom du torrent au chemin";
theUILang.autotoolsSkipMoveForFiles = "Skip torrents that contain files matching pattern";
theUILang.autotoolsEnableMove = "Activer la fonctionnalité 'AutoMove' si le label du torrent correspond au filtre";
theUILang.autotoolsSkipMoveForFiles = "Ignorer les torrents qui contiennent des fichiers correspondants au modèle";

thePlugins.get("autotools").langLoaded();
2 changes: 1 addition & 1 deletion rtplugins/autotools/lang/hu.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

theUILang.autotools = "Auto Beállítás";
theUILang.autotoolsEnableLabel = "Engedélyezi az \"Auto címkézés\" funkciót, sablon:";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsPathToFinished = "Befejezett letöltési elérési út";
theUILang.autotoolsEnableWatch = "Engedélyezi az \"AutoWatch\" funkciót";
theUILang.autotoolsPathToWatch = "Watch mappa elérési út";
Expand All @@ -24,6 +23,7 @@
theUILang.autotoolsFileOpSoftLink = "Soft link";
theUILang.autotoolsAddLabel = "Add torrent's label to path";
theUILang.autotoolsAddName = "Add torrent's name to path";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsSkipMoveForFiles = "Skip torrents that contain files matching pattern";

thePlugins.get("autotools").langLoaded();
2 changes: 1 addition & 1 deletion rtplugins/autotools/lang/it.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

theUILang.autotools = "Autotools";
theUILang.autotoolsEnableLabel = "Enable \"AutoLabel\" feature, Template:";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsPathToFinished = "Path to finished downloads";
theUILang.autotoolsEnableWatch = "Enable \"AutoWatch\" feature";
theUILang.autotoolsPathToWatch = "Path to base watch directory";
Expand All @@ -24,6 +23,7 @@
theUILang.autotoolsFileOpSoftLink = "Soft link";
theUILang.autotoolsAddLabel = "Add torrent's label to path";
theUILang.autotoolsAddName = "Add torrent's name to path";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsSkipMoveForFiles = "Skip torrents that contain files matching pattern";

thePlugins.get("autotools").langLoaded();
2 changes: 1 addition & 1 deletion rtplugins/autotools/lang/ko.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

theUILang.autotools = "Autotools";
theUILang.autotoolsEnableLabel = "\"AutoLabel\" 기능 동작, 형식: ";
theUILang.autotoolsEnableMove = "\"AutoMove\" 기능 동작, 만약 토렌트 라벨이 다음 필터와 일치할 경우: ";
theUILang.autotoolsPathToFinished = "다운로드 완료시 사용할 경로";
theUILang.autotoolsEnableWatch = "\"AutoWatch\" 기능 동작";
theUILang.autotoolsPathToWatch = "감시할 디렉토리 경로";
Expand All @@ -24,6 +23,7 @@
theUILang.autotoolsFileOpSoftLink = "소프트 링크";
theUILang.autotoolsAddLabel = "토렌트 라벨을 경로에 덧붙임";
theUILang.autotoolsAddName = "토렌트 이름을 경로에 덧붙임";
theUILang.autotoolsEnableMove = "\"AutoMove\" 기능 동작, 만약 토렌트 라벨이 다음 필터와 일치할 경우: ";
theUILang.autotoolsSkipMoveForFiles = "Skip torrents that contain files matching pattern";

thePlugins.get("autotools").langLoaded();
2 changes: 1 addition & 1 deletion rtplugins/autotools/lang/lv.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

theUILang.autotools = "Autotools";
theUILang.autotoolsEnableLabel = "Enable \"AutoLabel\" feature, Template:";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsPathToFinished = "Path to finished downloads";
theUILang.autotoolsEnableWatch = "Enable \"AutoWatch\" feature";
theUILang.autotoolsPathToWatch = "Path to base watch directory";
Expand All @@ -24,6 +23,7 @@
theUILang.autotoolsFileOpSoftLink = "Soft link";
theUILang.autotoolsAddLabel = "Add torrent's label to path";
theUILang.autotoolsAddName = "Add torrent's name to path";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsSkipMoveForFiles = "Skip torrents that contain files matching pattern";

thePlugins.get("autotools").langLoaded();
2 changes: 1 addition & 1 deletion rtplugins/autotools/lang/nl.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

theUILang.autotools = "Autotools";
theUILang.autotoolsEnableLabel = "Aanzetten \"AutoLabel\" feature, Template:";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsPathToFinished = "Pad naar voltooide downloads";
theUILang.autotoolsEnableWatch = "Aanzetten \"AutoWatch\" feature";
theUILang.autotoolsPathToWatch = "Pad naar watch folder";
Expand All @@ -24,6 +23,7 @@
theUILang.autotoolsFileOpSoftLink = "Soft link";
theUILang.autotoolsAddLabel = "Add torrent's label to path";
theUILang.autotoolsAddName = "Add torrent's name to path";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsSkipMoveForFiles = "Skip torrents that contain files matching pattern";

thePlugins.get("autotools").langLoaded();
2 changes: 1 addition & 1 deletion rtplugins/autotools/lang/no.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

theUILang.autotools = "Autotools";
theUILang.autotoolsEnableLabel = "Enable \"AutoLabel\" feature, Template:";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsPathToFinished = "Path to finished downloads";
theUILang.autotoolsEnableWatch = "Enable \"AutoWatch\" feature";
theUILang.autotoolsPathToWatch = "Path to base watch directory";
Expand All @@ -24,6 +23,7 @@
theUILang.autotoolsFileOpSoftLink = "Soft link";
theUILang.autotoolsAddLabel = "Add torrent's label to path";
theUILang.autotoolsAddName = "Add torrent's name to path";
theUILang.autotoolsEnableMove = "Enable \"AutoMove\" if torrent's label matches filter";
theUILang.autotoolsSkipMoveForFiles = "Skip torrents that contain files matching pattern";

thePlugins.get("autotools").langLoaded();
2 changes: 1 addition & 1 deletion rtplugins/autotools/lang/pl.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

theUILang.autotools = "Autotools";
theUILang.autotoolsEnableLabel = "Włącz funkcję \"AutoEtykieta\", Template: ";
theUILang.autotoolsEnableMove = "Wlacz \"AutoMove\" jezeli funkcja torrentu pasuje do funkcji";
theUILang.autotoolsPathToFinished = "Ścieżka dla ukończonych pobierań";
theUILang.autotoolsEnableWatch = "Włącz funkcję \"AutoWatch\" ";
theUILang.autotoolsPathToWatch = "Ścieżka do bazowego katalogu obserwowanego";
Expand All @@ -24,6 +23,7 @@
theUILang.autotoolsFileOpSoftLink = "Soft link";
theUILang.autotoolsAddLabel = "Dodaj funkcje torrentu do sciezki";
theUILang.autotoolsAddName = "Dodaj nazwe torrentu do sciezki";
theUILang.autotoolsEnableMove = "Wlacz \"AutoMove\" jezeli funkcja torrentu pasuje do funkcji";
theUILang.autotoolsSkipMoveForFiles = "Skip torrents that contain files matching pattern";

thePlugins.get("autotools").langLoaded();
Loading

0 comments on commit 073c475

Please sign in to comment.