diff --git a/ajax.php b/ajax.php index 7f9e535..c58e773 100644 --- a/ajax.php +++ b/ajax.php @@ -25,7 +25,7 @@ if (!defined("TIMEZONE")) define("TIMEZONE", "UTC"); $logLinesMMDVM = getMMDVMLog(); $reverseLogLinesMMDVM = $logLinesMMDVM; -array_multisort($reverseLogLinesMMDVM,SORT_DESC); +rsort($reverseLogLinesMMDVM); if ($_GET['section'] == "mode") { $mode = getActualMode(getLastHeard($reverseLogLinesMMDVM, TRUE), $mmdvmconfigs); echo $mode; diff --git a/config/networks.php b/config/networks.php new file mode 100644 index 0000000..f001558 --- /dev/null +++ b/config/networks.php @@ -0,0 +1,21 @@ + diff --git a/credits.php b/credits.php index 6effd70..4b29f9b 100644 --- a/credits.php +++ b/credits.php @@ -42,6 +42,7 @@ textdomain('messages');
  • dg0cco
  • sa7bnt
  • ct2jay
  • +
  • oe7jkt
  • diff --git a/include/functions.php b/include/functions.php index e1fac35..d5425ae 100644 --- a/include/functions.php +++ b/include/functions.php @@ -209,7 +209,7 @@ function getYSFGatewayLog() { // Open Logfile and copy loglines into LogLines-Array() $logPath = YSFGATEWAYLOGPATH."/".YSFGATEWAYLOGPREFIX."-".date("Y-m-d").".log"; //$logLines = explode("\n", `egrep -h "D:|M:" $logPath`); - $logLines = explode("\n", `egrep -h "Starting|DISCONNECT|Connect|Automatic" $logPath`); + $logLines = explode("\n", `egrep -h "Starting|DISCONNECT|Connect|Automatic|Disconnecting" $logPath`); return $logLines; } @@ -473,7 +473,7 @@ function getHeardList($logLines, $onlyLast) { $rssi = ""; $ts1alias = "---"; $ts2alias = "---"; - if ($onlyLast && count($heardList )> 4) { + if ($onlyLast && count($heardList )> 20) { return $heardList; } } @@ -845,13 +845,38 @@ function decodeAlias($logLine) { $tok4 = encode(substr($logLine, 49, 2)); $tok5 = encode(substr($logLine, 52, 2)); $tok6 = encode(substr($logLine, 55, 2)); - $tok7 = encode(dechex(hexdec(substr($logLine, 58, 2))/2)); +// https://github.com/g4klx/MMDVMHost/commit/bba5cbc0bad65f32dde6f673255a05534ebc13ab +// $tok7 = encode(dechex(hexdec(substr($logLine, 58, 2))/2)); + $tok7 = encode(substr($logLine, 58, 2)); return $tok1.$tok2.$tok3.$tok4.$tok5.$tok6.$tok7; } - function getGitVersion(){ - exec("git rev-parse HEAD", $output); - return 'GitID #'.substr($output[0],0,7).''; + if (file_exists(".git")) { + exec("git rev-parse HEAD", $output); + return 'GitID #'.substr($output[0],0,7).''; + } else { + return 'GitID unknown'; + } +} + +function getDMRReflectors() { + $data = file_get_contents("http://ham-dmr.de/reflector.db"); + $rows = explode("\n",$data); + $refls = array(); + foreach($rows as $row) { + $refls[] = str_getcsv($row,"@",''); + } + return $refls; +} + +function getBrandMeisterDMRMasterList() { + $data = file_get_contents("http://185.79.71.94/dmr/dmrmaster.php"); + $rows = explode("\n",$data); + $masters = array(); + foreach($rows as $row) { + $masters[] = str_getcsv($row,"@",''); + } + return $masters; } ?> diff --git a/include/lh_ajax.php b/include/lh_ajax.php index 99e3e1e..8639e50 100644 --- a/include/lh_ajax.php +++ b/include/lh_ajax.php @@ -1,9 +1,12 @@
    -
    +
    diff --git a/include/tools.php b/include/tools.php index ed6eff8..3e788ef 100644 --- a/include/tools.php +++ b/include/tools.php @@ -123,4 +123,14 @@ function encode($hex) { else return ""; } + +function recursive_array_search($needle,$haystack) { + foreach($haystack as $key=>$value) { + $current_key=$key; + if($needle===$value OR (is_array($value) && recursive_array_search($needle,$value) !== false)) { + return $current_key; + } + } + return false; +} ?> diff --git a/index.php b/index.php index d4a1e69..7f62ff2 100644 --- a/index.php +++ b/index.php @@ -22,6 +22,8 @@ bindtextdomain('messages', dirname(__FILE__).'/locale/'); setlocale(LC_ALL, LANG_LOCALE.'.'.$codeset); textdomain('messages'); + +include("config/networks.php"); include "include/tools.php"; startStopwatch(); showLapTime("Start of page"); @@ -69,24 +71,37 @@ include "version.php"; ?>:

    MMDVMHost by G4KLX Version:
    Firmware: 0 ) { - echo "
    "; - echo _("DMR-Network: ").getDMRNetwork(); + if (defined("JSONNETWORK")) { + $key = recursive_array_search(getDMRNetwork(),$networks); + $network = $networks[$key]; + echo "
    "; + echo _("Configuration").": ".$network['label']; + + } else { + if (strlen(getDMRNetwork()) > 0 ) { + echo "
    "; + echo _("DMR-Network: ").getDMRNetwork(); + } } ?>

    '; + foreach ($networks as $network) { + echo ' '; + } + + } else { ?> +
    +
    + + + +
    +\n" +"Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: en_GB\n" +"Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: index.php:55 +#: include/sysinfo_ajax.php:3 +msgid "System Info" +msgstr "" + +#: include/ysfgatewayinfo.php:5 +msgid "YSFGateway-Infos" +msgstr "" + +#: include/ysfgatewayinfo.php:13 +msgid "YSFGateway Process is running" +msgstr "" + +#: include/ysfgatewayinfo.php:16 +msgid "YSFGateway Process is down!" +msgstr "" + +#: include/ysfgatewayinfo.php:25 +msgid "YSFReflectors reported active" +msgstr "" + +#: include/ysfgatewayinfo.php:37 +msgid "No." +msgstr "" + +#: include/ysfgatewayinfo.php:38 include/localtx_ajax.php:19 +#: include/lh_ajax.php:19 include/txinfo.php:16 +msgid "Name" +msgstr "" + +#: include/ysfgatewayinfo.php:39 +msgid "Description" +msgstr "" + +#: include/ysfgatewayinfo.php:40 +msgid "ID" +msgstr "" + +#: include/ysfgatewayinfo.php:41 +msgid "Connections" +msgstr "" + +#: include/localtx_ajax.php:6 +msgid "Today's local transmissions" +msgstr "" + +#: include/localtx_ajax.php:13 include/lh_ajax.php:13 include/txinfo.php:10 +msgid "Time" +msgstr "" + +#: include/localtx_ajax.php:14 include/lh_ajax.php:14 include/txinfo.php:11 +msgid "Mode" +msgstr "" + +#: include/localtx_ajax.php:15 include/lh_ajax.php:15 include/txinfo.php:12 +msgid "Callsign" +msgstr "" + +#: include/localtx_ajax.php:23 include/lh_ajax.php:23 include/txinfo.php:25 +msgid "DSTAR-ID" +msgstr "" + +#: include/localtx_ajax.php:24 include/lh_ajax.php:24 include/txinfo.php:26 +msgid "Target" +msgstr "" + +#: include/localtx_ajax.php:25 include/lh_ajax.php:25 include/txinfo.php:27 +msgid "Source" +msgstr "" + +#: include/localtx_ajax.php:26 include/lh_ajax.php:26 +msgid "Dur (s)" +msgstr "" + +#: include/localtx_ajax.php:27 include/lh_ajax.php:27 +msgid "Loss" +msgstr "" + +#: include/localtx_ajax.php:28 include/lh_ajax.php:28 +msgid "BER" +msgstr "" + +#: include/localtx_ajax.php:30 +msgid "RSSI (min)" +msgstr "" + +#: include/localtx_ajax.php:31 +msgid "RSSI (max)" +msgstr "" + +#: include/localtx_ajax.php:32 include/localtx_ajax.php:33 +msgid "RSSI (avg)" +msgstr "" + +#: include/repeaterinfo.php:3 +msgid "Repeater Info" +msgstr "" + +#: include/repeaterinfo.php:9 +msgid "Current Mode" +msgstr "" + +#: include/repeaterinfo.php:13 +msgid "D-Star linked to" +msgstr "" + +#: include/repeaterinfo.php:18 +msgid "YSF linked to" +msgstr "" + +#: include/repeaterinfo.php:23 +msgid "DMR TS1 last linked to" +msgstr "" + +#: include/repeaterinfo.php:24 +msgid "DMR TS2 last linked to" +msgstr "" + +#: include/repeaterinfo.php:48 +msgid "Location" +msgstr "" + +#: include/repeaterinfo.php:49 +msgid "TX-Freq." +msgstr "" + +#: include/repeaterinfo.php:50 +msgid "RX-Freq." +msgstr "" + +#: include/repeaterinfo.php:54 +msgid "YSFGateway" +msgstr "" + +#: include/repeaterinfo.php:59 +msgid "DMR CC" +msgstr "" + +#: include/repeaterinfo.php:63 +msgid "DMR-Master" +msgstr "" + +#: include/repeaterinfo.php:64 +msgid "TS1" +msgstr "" + +#: include/repeaterinfo.php:65 +msgid "TS2" +msgstr "" + +#: include/repeaterinfo.php:97 include/repeaterinfo.php:104 +msgid "enabled" +msgstr "" + +#: include/repeaterinfo.php:99 include/repeaterinfo.php:106 +msgid "disabled" +msgstr "" + +#: include/tools.php:73 +msgid "" +"You are using an old config.php. Please configure your Dashboard by calling " +"setup.php!" +msgstr "" + +#: include/tools.php:79 +msgid "" +"You forgot to remove setup.php in root-directory of your dashboard or you " +"forgot to configure it! Please delete the file or configure your Dashboard " +"by calling setup.php!" +msgstr "" + +#: include/modes.php:3 +msgid "Enabled Modes" +msgstr "" + +#: include/lh_ajax.php:6 +msgid "Last Heard List of today's" +msgstr "" + +#: include/lh_ajax.php:6 +msgid "callsigns." +msgstr "" + +#: include/disk.php:3 +msgid "Disk Use" +msgstr "" + +#: include/disk.php:10 +msgid "File System" +msgstr "" + +#: include/disk.php:11 +msgid "Mount Point" +msgstr "" + +#: include/disk.php:12 +msgid "Use" +msgstr "" + +#: include/disk.php:13 +msgid "Free" +msgstr "" + +#: include/disk.php:14 +msgid "Used" +msgstr "" + +#: include/disk.php:15 +msgid "Total" +msgstr "" + +#: include/txinfo.php:3 +msgid "Currently TXing" +msgstr "" + +#: include/txinfo.php:21 +msgid "Talker Alias" +msgstr "" + +#: include/txinfo.php:28 +msgid "TX-Time" +msgstr "" + +#: scripts/rebootmmdvm.php:50 scripts/halt.php:49 scripts/log.php:53 +#: scripts/reboot.php:50 index.php:59 msgid "for" msgstr "" -#: index.php:57 +#: scripts/rebootmmdvm.php:52 scripts/halt.php:51 scripts/log.php:55 +#: scripts/reboot.php:52 index.php:61 msgid "Repeater" msgstr "" -#: index.php:59 +#: scripts/rebootmmdvm.php:54 scripts/halt.php:53 scripts/log.php:57 +#: scripts/reboot.php:54 index.php:63 msgid "Hotspot" msgstr "" -#: index.php:66 -msgid "DMR-Network: " +#: scripts/rebootmmdvm.php:58 scripts/reboot.php:58 +msgid "Home" msgstr "" -#: index.php:96 -msgid "View Log" +#: scripts/rebootmmdvm.php:67 scripts/reboot.php:66 +msgid "Executing" msgstr "" -#: index.php:97 -msgid "Reboot MMDVMHost" +#: scripts/rebootmmdvm.php:67 +msgid "Reboot MMDVMHost service in progress" msgstr "" -#: index.php:98 -msgid "Reboot System" -msgstr "" - -#: index.php:99 -msgid "ShutDown System" -msgstr "" - -#: index.php:104 -msgid "DMRplus" -msgstr "" - -#: index.php:105 -msgid "BrandMeister" -msgstr "" - -#: index.php:155 -msgid "Last Reload" -msgstr "" - -#: index.php:165 -msgid "stop refreshing" -msgstr "" - -#: index.php:167 -msgid "start refreshing" -msgstr "" - -#: index.php:170 +#: scripts/rebootmmdvm.php:90 scripts/halt.php:89 scripts/log.php:134 +#: scripts/reboot.php:89 index.php:174 msgid "get your own at:" msgstr "" -#: index.php:170 +#: scripts/rebootmmdvm.php:90 scripts/halt.php:89 scripts/log.php:134 +#: scripts/reboot.php:89 index.php:174 credits.php:13 credits.php:17 msgid "Credits" msgstr "" + +#: scripts/halt.php:66 +msgid "Halt in progress...bye" +msgstr "" + +#: scripts/log.php:61 index.php:100 +msgid "View Log" +msgstr "" + +#: scripts/log.php:62 index.php:101 +msgid "Reboot MMDVMHost" +msgstr "" + +#: scripts/log.php:63 index.php:102 +msgid "Reboot System" +msgstr "" + +#: scripts/log.php:64 index.php:103 +msgid "ShutDown System" +msgstr "" + +#: scripts/log.php:68 index.php:108 +msgid "DMRplus" +msgstr "" + +#: scripts/log.php:69 index.php:109 +msgid "BrandMeister" +msgstr "" + +#: scripts/log.php:76 +msgid "Viewing log" +msgstr "" + +#: scripts/log.php:82 +msgid "Level" +msgstr "" + +#: scripts/log.php:83 +msgid "Timestamp" +msgstr "" + +#: scripts/log.php:84 +msgid "Info" +msgstr "" + +#: scripts/reboot.php:66 +msgid "Reboot system in progress" +msgstr "" + +#: ajax.php:214 +msgid "Power" +msgstr "" + +#: ajax.php:219 +msgid "CPU-Temperature" +msgstr "" + +#: ajax.php:224 +msgid "CPU-Frequency" +msgstr "" + +#: ajax.php:228 +msgid "System-Load" +msgstr "" + +#: ajax.php:229 +msgid "CPU-Usage" +msgstr "" + +#: ajax.php:230 +msgid "Uptime" +msgstr "" + +#: ajax.php:231 +msgid "Idle" +msgstr "" + +#: ajax.php:237 +msgid "online" +msgstr "" + +#: ajax.php:237 +msgid "on battery" +msgstr "" + +#: index.php:70 +msgid "DMR-Network: " +msgstr "" + +#: index.php:159 +msgid "Last Reload" +msgstr "" + +#: index.php:169 +msgid "stop refreshing" +msgstr "" + +#: index.php:171 +msgid "start refreshing" +msgstr "" + +#: credits.php:20 +msgid "" +"I think, after all the time this dashboard is developed mainly by myself, it " +"is time to say \"Thank you\" to all those, wo delivered some ideas or code " +"into this project." +msgstr "" + +#: credits.php:21 +msgid "This are explicit named following persons:" +msgstr "" + +#: credits.php:31 +msgid "and some others..." +msgstr "" + +#: credits.php:33 +msgid "" +"Those, who felt forgotten, feel free to commit a change into github of this " +"file." +msgstr "" + +#: credits.php:34 +msgid "Many thanks to you all!" +msgstr "" + +#: credits.php:35 +msgid "Best 73, Kim, DG9VH" +msgstr "" + +#: setup.php:26 +msgid "" +"You forgot to give write-permissions to your webserver-user, see point 3 in " +"linux-step-by-step.md!" +msgstr "" + +#: setup.php:41 setup.php:50 +msgid "Setup-Process" +msgstr "" + +#: setup.php:42 +msgid "" +"Your config-file is written in config/config.php, please remove setup.php " +"for security reasons!" +msgstr "" + +#: setup.php:43 +msgid "Your dashboard is now available." +msgstr "" + +#: setup.php:51 +msgid "Please give necessary information below" +msgstr "" + +#: setup.php:56 +msgid "MMDVMHost-Configuration" +msgstr "" + +#: setup.php:58 +msgid "Path to MMDVMHost-logfile" +msgstr "" + +#: setup.php:62 +msgid "Path to MMDVM.ini" +msgstr "" + +#: setup.php:66 +msgid "MMDVM.ini-filename" +msgstr "" + +#: setup.php:70 +msgid "Path to MMDVMHost-executable" +msgstr "" + +#: setup.php:74 +msgid "Enable extended lookup (show names)" +msgstr "" + +#: setup.php:78 +msgid "Show Talker Alias" +msgstr "" + +#: setup.php:82 +msgid "Path to DMR-ID-Database-File (including filename)" +msgstr "" + +#: setup.php:87 +msgid "YSFGateway-Configuration" +msgstr "" + +#: setup.php:89 +msgid "Enable YSFGateway" +msgstr "" + +#: setup.php:93 +msgid "Path to YSFGateway-logfile" +msgstr "" + +#: setup.php:97 +msgid "Logfile-prefix" +msgstr "" + +#: setup.php:101 +msgid "Path to YSFGateway.ini" +msgstr "" + +#: setup.php:105 +msgid "YSFGateway.ini-filename" +msgstr "" + +#: setup.php:109 +msgid "Path to YSFHosts.txt" +msgstr "" + +#: setup.php:113 +msgid "YSFHosts.txt-filename" +msgstr "" + +#: setup.php:118 +msgid "ircddbgateway-Configuration" +msgstr "" + +#: setup.php:120 +msgid "Path to Links.log" +msgstr "" + +#: setup.php:124 +msgid "Name of ircddbgateway-executeable" +msgstr "" + +#: setup.php:129 +msgid "Global Configuration" +msgstr "" + +#: setup.php:188 +msgid "Locale" +msgstr "" + +#: setup.php:192 +msgid "URL to Logo" +msgstr "" + +#: setup.php:196 +msgid "URL to DMRplus-Logo" +msgstr "" + +#: setup.php:200 +msgid "URL to BrandMeister-Logo" +msgstr "" + +#: setup.php:204 +msgid "Refresh page after in seconds" +msgstr "" + +#: setup.php:208 +msgid "Show System Info" +msgstr "" + +#: setup.php:212 +msgid "Show Disk Use" +msgstr "" + +#: setup.php:216 +msgid "Show Repeater Info" +msgstr "" + +#: setup.php:220 +msgid "Show Enabled Modes" +msgstr "" + +#: setup.php:224 +msgid "Show Last Heard List of today's" +msgstr "" + +#: setup.php:228 +msgid "Show Today's local transmissions" +msgstr "" + +#: setup.php:232 +msgid "Show progressbars" +msgstr "" + +#: setup.php:236 +msgid "Enable CPU-temperature-warning" +msgstr "" + +#: setup.php:240 +msgid "Warning temperature" +msgstr "" + +#: setup.php:244 +msgid "Enable Network-Switching-Function" +msgstr "" + +#: setup.php:248 +msgid "Username for switching networks:" +msgstr "" + +#: setup.php:252 +msgid "Password for switching networks:" +msgstr "" + +#: setup.php:257 +msgid "Enable Management-Functions below" +msgstr "" + +#: setup.php:261 +msgid "Username for view log:" +msgstr "" + +#: setup.php:265 +msgid "Password for view log:" +msgstr "" + +#: setup.php:269 +msgid "Username for halt:" +msgstr "" + +#: setup.php:273 +msgid "Password for halt:" +msgstr "" + +#: setup.php:277 +msgid "Username for reboot:" +msgstr "" + +#: setup.php:281 +msgid "Password for reboot:" +msgstr "" + +#: setup.php:285 +msgid "Username for restart:" +msgstr "" + +#: setup.php:289 +msgid "Password for restart:" +msgstr "" + +#: setup.php:293 +msgid "Reboot MMDVMHost command:" +msgstr "" + +#: setup.php:297 +msgid "Reboot system command:" +msgstr "" + +#: setup.php:301 +msgid "Halt system command:" +msgstr "" + +#: setup.php:305 +msgid "Show Powerstate (online or battery, wiringpi needed)" +msgstr "" + +#: setup.php:309 +msgid "GPIO pin to monitor:" +msgstr "" + +#: setup.php:313 +msgid "State that signalizes online-state:" +msgstr "" + +#: setup.php:317 +msgid "Show link to QRZ.com on Callsigns" +msgstr "" + +#: setup.php:321 +msgid "RSSI value" +msgstr "" + +#: setup.php:323 +msgid "minimal" +msgstr "" + +#: setup.php:324 +msgid "maximal" +msgstr "" + +#: setup.php:325 +msgid "average" +msgstr "" + +#: setup.php:331 +msgid "Save configuration" +msgstr "" + +#: include/functions.php:13 include/functions.php:15 +msgid "compiled" +msgstr "" + +#: include/functions.php:161 +msgid "ircddbgateway is down!" +msgstr "" + +#: include/functions.php:164 include/functions.php:175 +msgid "Remote gateway configured - not checked!" +msgstr "" + +#: include/functions.php:172 +msgid "YSFGateway is down!" +msgstr "" + +#: include/functions.php:182 +msgid "MMDVMHost is down!" +msgstr "" + +#: include/functions.php:550 +msgid "idle" +msgstr "" + +#: include/functions.php:623 +msgid "ircddbgateway not running!" +msgstr "" + +#: include/functions.php:640 include/functions.php:656 +#: include/functions.php:741 +msgid "not linked" +msgstr "" + +#: include/functions.php:692 +msgid "something went wrong!" +msgstr "" + +#: include/functions.php:706 include/functions.php:724 +msgid "Reflector not linked" +msgstr "" + +#: include/functions.php:708 include/functions.php:719 +msgid "Reflector" +msgstr "" + +#: include/functions.php:719 +msgid "not cfmd" +msgstr "" + +#: include/functions.php:743 +msgid "YSFGateway not running" +msgstr "" + +#: include/functions.php:830 +msgid "DMRIDs.dat not correct!" +msgstr "" + +#: index.php:78 +msgid "Configuration" +msgstr "" + +#: setup.php:209 +msgid "Use networks.php instead of configuration below" +msgstr "" + +#: include/lh_ajax.php:6 +msgid "Cached" +msgstr "" + diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo index 1b9a78a..d5c8e8f 100644 Binary files a/locale/es_ES/LC_MESSAGES/messages.mo and b/locale/es_ES/LC_MESSAGES/messages.mo differ diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po index 2fca34c..85e75b9 100644 --- a/locale/es_ES/LC_MESSAGES/messages.po +++ b/locale/es_ES/LC_MESSAGES/messages.po @@ -732,3 +732,16 @@ msgstr "YSFGateway no está funcionando" #: include/functions.php:830 msgid "DMRIDs.dat not correct!" msgstr "DMRIDs.dat incorrecto!" + +#: index.php:78 +msgid "Configuration" +msgstr "" + +#: setup.php:209 +msgid "Use networks.php instead of configuration below" +msgstr "" + +#: include/lh_ajax.php:6 +msgid "Cached" +msgstr "En caché" + diff --git a/locale/pl_PL/LC_MESSAGES/messages.mo b/locale/pl_PL/LC_MESSAGES/messages.mo new file mode 100644 index 0000000..4ec9171 Binary files /dev/null and b/locale/pl_PL/LC_MESSAGES/messages.mo differ diff --git a/locale/pl_PL/LC_MESSAGES/messages.po b/locale/pl_PL/LC_MESSAGES/messages.po new file mode 100644 index 0000000..d43af7b --- /dev/null +++ b/locale/pl_PL/LC_MESSAGES/messages.po @@ -0,0 +1,739 @@ +# Translation-Template +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: The Polish language for MMDVMHost Dashboard \n" +"Report-Msgid-Bugs-To: dg9vh@darc.de\n" +"POT-Creation-Date: 2017-03-21 20:58+0000\n" +"PO-Revision-Date: 2017-03-21 20:58+0300\n" +"Last-Translator: Kim - DG9VH \n" +"Language: pl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language-Team: pl\n" + +#: include/sysinfo_ajax.php:3 +msgid "System Info" +msgstr "Informacja systemu" + +#: include/ysfgatewayinfo.php:5 +msgid "YSFGateway-Infos" +msgstr "YSFGateway-informacje" + +#: include/ysfgatewayinfo.php:13 +msgid "YSFGateway Process is running" +msgstr "YSFGateway proces jest uruchomiony" + +#: include/ysfgatewayinfo.php:16 +msgid "YSFGateway Process is down!" +msgstr "YSFGateway proces jest wstrzymany" + +#: include/ysfgatewayinfo.php:25 +msgid "YSFReflectors reported active" +msgstr "YSFReflectors zgłoszono jako aktywne" + +#: include/ysfgatewayinfo.php:37 +msgid "No." +msgstr "Numer" + +#: include/ysfgatewayinfo.php:38 include/localtx_ajax.php:19 +#: include/lh_ajax.php:19 include/txinfo.php:16 +msgid "Name" +msgstr "Nazwa" + +#: include/ysfgatewayinfo.php:39 +msgid "Description" +msgstr "Opis" + +#: include/ysfgatewayinfo.php:40 +msgid "ID" +msgstr "ID" + +#: include/ysfgatewayinfo.php:41 +msgid "Connections" +msgstr "Połączenia" + +#: include/localtx_ajax.php:6 +msgid "Today's local transmissions" +msgstr "Dzisiejsze lokalne przekładnie" + +#: include/localtx_ajax.php:13 include/lh_ajax.php:13 include/txinfo.php:10 +msgid "Time" +msgstr "Czas" + +#: include/localtx_ajax.php:14 include/lh_ajax.php:14 include/txinfo.php:11 +msgid "Mode" +msgstr "Tryb" + +#: include/localtx_ajax.php:15 include/lh_ajax.php:15 include/txinfo.php:12 +msgid "Callsign" +msgstr "Znak" + +#: include/localtx_ajax.php:23 include/lh_ajax.php:23 include/txinfo.php:25 +msgid "DSTAR-ID" +msgstr "DSTAR-ID" + +#: include/localtx_ajax.php:24 include/lh_ajax.php:24 include/txinfo.php:26 +msgid "Target" +msgstr "Cel" + +#: include/localtx_ajax.php:25 include/lh_ajax.php:25 include/txinfo.php:27 +msgid "Source" +msgstr "Źródło" + +#: include/localtx_ajax.php:26 include/lh_ajax.php:26 +msgid "Dur (s)" +msgstr "TX (s)" + +#: include/localtx_ajax.php:27 include/lh_ajax.php:27 +msgid "Loss" +msgstr "Utrata" + +#: include/localtx_ajax.php:28 include/lh_ajax.php:28 +msgid "BER" +msgstr "BER%" + +#: include/localtx_ajax.php:30 +msgid "RSSI (min)" +msgstr "RSSI" + +#: include/localtx_ajax.php:31 +msgid "RSSI (max)" +msgstr "RSSI" + +#: include/localtx_ajax.php:32 include/localtx_ajax.php:33 +msgid "RSSI (avg)" +msgstr "RSSI" + +#: include/repeaterinfo.php:3 +msgid "Repeater Info" +msgstr "Informacja o przekaźniku" + +#: include/repeaterinfo.php:9 +msgid "Current Mode" +msgstr "Aktualny tryb" + +#: include/repeaterinfo.php:13 +msgid "D-Star linked to" +msgstr "D-Star powiązane z" + +#: include/repeaterinfo.php:18 +msgid "YSF linked to" +msgstr "YSF powiązane z" + +#: include/repeaterinfo.php:23 +msgid "DMR TS1 last linked to" +msgstr "DMR TS1 ostatnio połączony z" + +#: include/repeaterinfo.php:24 +msgid "DMR TS2 last linked to" +msgstr "DMR TS2 ostatnio połączony z" + +#: include/repeaterinfo.php:48 +msgid "Location" +msgstr "Lokalizacja" + +#: include/repeaterinfo.php:49 +msgid "TX-Freq." +msgstr "częstotliwość TX" + +#: include/repeaterinfo.php:50 +msgid "RX-Freq." +msgstr "częstotliwość RX" + +#: include/repeaterinfo.php:54 +msgid "YSFGateway" +msgstr "YSFGateway" + +#: include/repeaterinfo.php:59 +msgid "DMR CC" +msgstr "DMR CC" + +#: include/repeaterinfo.php:63 +msgid "DMR-Master" +msgstr "DMR-Master" + +#: include/repeaterinfo.php:64 +msgid "TS1" +msgstr "TS1" + +#: include/repeaterinfo.php:65 +msgid "TS2" +msgstr "TS2" + +#: include/repeaterinfo.php:97 include/repeaterinfo.php:104 +msgid "enabled" +msgstr "włączony" + +#: include/repeaterinfo.php:99 include/repeaterinfo.php:106 +msgid "disabled" +msgstr "wyłączony" + +#: include/tools.php:73 +msgid "" +"You are using an old config.php. Please configure your Dashboard by calling " +"setup.php!" +msgstr "Używasz starej config.php. Proszę skonfiguruj pulpit, używając " +"setup.php!" + +#: include/tools.php:79 +msgid "" +"You forgot to remove setup.php in root-directory of your dashboard or you " +"forgot to configure it! Please delete the file or configure your Dashboard " +"by calling setup.php!" +msgstr "Zapomniałeś usunąć setup.php w katalogu głównym twojego panel nawigacyjnego lub" +"zapomniałeś skonfigurować! Usuń plik lub skonfiguruj panel nawigacyjny" +"używając setup.php!" + +#: include/modes.php:3 +msgid "Enabled Modes" +msgstr "Tryby włączone " + +#: include/lh_ajax.php:6 +msgid "Last Heard List of today's" +msgstr "Ostatnia dziś słuchana lista " + +#: include/lh_ajax.php:6 +msgid "callsigns." +msgstr "znaki" + +#: include/disk.php:3 +msgid "Disk Use" +msgstr "Użycie dysku" + +#: include/disk.php:10 +msgid "File System" +msgstr "System plików" + +#: include/disk.php:11 +msgid "Mount Point" +msgstr "Punkt instalacji" + +#: include/disk.php:12 +msgid "Use" +msgstr "Użycie" + +#: include/disk.php:13 +msgid "Free" +msgstr "Wolne miejsce" + +#: include/disk.php:14 +msgid "Used" +msgstr "W użytku" + +#: include/disk.php:15 +msgid "Total" +msgstr "Razem" + +#: include/txinfo.php:3 +msgid "Currently TXing" +msgstr "Bieżący TXing" + +#: include/txinfo.php:21 +msgid "Talker Alias" +msgstr "Talker Alias" + +#: include/txinfo.php:28 +msgid "TX-Time" +msgstr "czas TX" + +#: scripts/rebootmmdvm.php:50 scripts/halt.php:49 scripts/log.php:53 +#: scripts/reboot.php:50 index.php:59 +msgid "for" +msgstr "dla" + +#: scripts/rebootmmdvm.php:52 scripts/halt.php:51 scripts/log.php:55 +#: scripts/reboot.php:52 index.php:61 +msgid "Repeater" +msgstr "Przekaźnik" + +#: scripts/rebootmmdvm.php:54 scripts/halt.php:53 scripts/log.php:57 +#: scripts/reboot.php:54 index.php:63 +msgid "Hotspot" +msgstr "Hotspot" + +#: scripts/rebootmmdvm.php:58 scripts/reboot.php:58 +msgid "Home" +msgstr "Start" + +#: scripts/rebootmmdvm.php:67 scripts/reboot.php:66 +msgid "Executing" +msgstr "Wykonywanie" + +#: scripts/rebootmmdvm.php:67 +msgid "Reboot MMDVMHost service in progress" +msgstr "Ponowne uruchomienie usługi MMDVMHost w toku" + +#: scripts/rebootmmdvm.php:90 scripts/halt.php:89 scripts/log.php:134 +#: scripts/reboot.php:89 index.php:174 +msgid "get your own at:" +msgstr "weź własne do" + +#: scripts/rebootmmdvm.php:90 scripts/halt.php:89 scripts/log.php:134 +#: scripts/reboot.php:89 index.php:174 credits.php:13 credits.php:17 +msgid "Credits" +msgstr "Dziękujemy" + +#: scripts/halt.php:66 +msgid "Halt in progress...bye" +msgstr "Postęp zakończenia ... do widzenia" + +#: scripts/log.php:61 index.php:100 +msgid "View Log" +msgstr "Wyświetl log" + +#: scripts/log.php:62 index.php:101 +msgid "Reboot MMDVMHost" +msgstr "Ponowne uruchomie MMDVMHost" + +#: scripts/log.php:63 index.php:102 +msgid "Reboot System" +msgstr "Ponowne uruchomie systemu" + +#: scripts/log.php:64 index.php:103 +msgid "ShutDown System" +msgstr "Zamknięcie systemu" + +#: scripts/log.php:68 index.php:108 +msgid "DMRplus" +msgstr "DMRplus" + +#: scripts/log.php:69 index.php:109 +msgid "BrandMeister" +msgstr "BrandMeister" + +#: scripts/log.php:76 +msgid "Viewing log" +msgstr "Przeglądanie logu" + +#: scripts/log.php:82 +msgid "Level" +msgstr "Poziom" + +#: scripts/log.php:83 +msgid "Timestamp" +msgstr "Datownik" + +#: scripts/log.php:84 +msgid "Info" +msgstr "Informacje" + +#: scripts/reboot.php:66 +msgid "Reboot system in progress" +msgstr "Ponowne uruchomie systemu w toku" + +#: ajax.php:214 +msgid "Power" +msgstr "Zaśilenie" + +#: ajax.php:219 +msgid "CPU-Temperature" +msgstr "Temperatura procesora" + +#: ajax.php:224 +msgid "CPU-Frequency" +msgstr "Częstotliwość procesora" + +#: ajax.php:228 +msgid "System-Load" +msgstr "Ładowanie systemu" + +#: ajax.php:229 +msgid "CPU-Usage" +msgstr "Użycie procesora" + +#: ajax.php:230 +msgid "Uptime" +msgstr "Uptime" + +#: ajax.php:231 +msgid "Idle" +msgstr "Bezczynność" + +#: ajax.php:237 +msgid "online" +msgstr "online" + +#: ajax.php:237 +msgid "on battery" +msgstr "na baterii" + +#: index.php:70 +msgid "DMR-Network: " +msgstr "Śieć DMR: " + +#: index.php:159 +msgid "Last Reload" +msgstr "Ostatnia aktualizacja" + +#: index.php:169 +msgid "stop refreshing" +msgstr "zakończenie odświeżania" + +#: index.php:171 +msgid "start refreshing" +msgstr "start odświeżania" + +#: credits.php:20 +msgid "" +"I think, after all the time this dashboard is developed mainly by myself, it " +"is time to say \"Thank you\" to all those, wo delivered some ideas or code " +"into this project." +msgstr "Mam wrażenie, że panel nawigacyjny jest rozwijany głównie przez głównie przezemnie, więc " +"czas, aby powiedzieć \" dziękuję \" wszystkim tym, którzy dodali swoje pomysłóy lub kodu do tego projektu." + + +#: credits.php:21 +msgid "This are explicit named following persons:" +msgstr "Są to następujące osóby:" + +#: credits.php:31 +msgid "and some others..." +msgstr "i inne ..." + +#: credits.php:33 +msgid "" +"Those, who felt forgotten, feel free to commit a change into github of this " +"file." +msgstr "Ci, którzy poczuli się zapomnieni, mogą swobodnie wprowadzać zmiany tego pliku w github" + +#: credits.php:34 +msgid "Many thanks to you all!" +msgstr "Wielkie dzięki wam wszystkim!" + +#: credits.php:35 +msgid "Best 73, Kim, DG9VH" +msgstr "Best 73, Kim, DG9VH" + +#: setup.php:26 +msgid "" +"You forgot to give write-permissions to your webserver-user, see point 3 in " +"linux-step-by-step.md!" +msgstr "Zapomniałeś nadać uprawnienia do zapisu na swoim serwerze WWW, sprawdz punkt 3 na" +"linux-step-by-step.md!" + + +#: setup.php:41 setup.php:50 +msgid "Setup-Process" +msgstr "proces instalacji" + +#: setup.php:42 +msgid "" +"Your config-file is written in config/config.php, please remove setup.php " +"for security reasons!" +msgstr "Twój plik konfiguracyjny jest zapisany w config/config.php, proszę usuń plik setup.php " +"ze względów bezpieczeństwa!" + +#: setup.php:43 +msgid "Your dashboard is now available." +msgstr "Twoj panel nawigacyjny jest teraz dostępny." + +#: setup.php:51 +msgid "Please give necessary information below" +msgstr "Proszę podać poniżej niezbędne informacje" + +#: setup.php:56 +msgid "MMDVMHost-Configuration" +msgstr "konfiguracja MMDVMHost" + +#: setup.php:58 +msgid "Path to MMDVMHost-logfile" +msgstr "ścieżka do pliku log-MMDVMHost" + +#: setup.php:62 +msgid "Path to MMDVM.ini" +msgstr "ścieżka do MMDVM.ini" + +#: setup.php:66 +msgid "MMDVM.ini-filename" +msgstr "nazwa pliku MMDVM.ini" + +#: setup.php:70 +msgid "Path to MMDVMHost-executable" +msgstr "ścieżka do MMDVMHost-executable" + +#: setup.php:74 +msgid "Enable extended lookup (show names)" +msgstr "Włącz wyszukiwanie rozszerzone (pokaż nazwy)" + +#: setup.php:78 +msgid "Show Talker Alias" +msgstr "Pokaż Talker Alias" + +#: setup.php:82 +msgid "Path to DMR-ID-Database-File (including filename)" +msgstr "Ścieżka do DMR-ID-Database-File (w tym nazwa pliku)" + +#: setup.php:87 +msgid "YSFGateway-Configuration" +msgstr "Konfiguracja YSFGateway" + +#: setup.php:89 +msgid "Enable YSFGateway" +msgstr "Włącz YSFGateway" + +#: setup.php:93 +msgid "Path to YSFGateway-logfile" +msgstr "Ścieżka do" + +#: setup.php:97 +msgid "Logfile-prefix" +msgstr "Przedrostek logfile" + +#: setup.php:101 +msgid "Path to YSFGateway.ini" +msgstr "Ścieżka do" + +#: setup.php:105 +msgid "YSFGateway.ini-filename" +msgstr "Nazwa pliku YSFHosts.ini" + +#: setup.php:109 +msgid "Path to YSFHosts.txt" +msgstr "Ścieżka do" + +#: setup.php:113 +msgid "YSFHosts.txt-filename" +msgstr "Nazwa pliku YSFHosts.txt" + +#: setup.php:118 +msgid "ircddbgateway-Configuration" +msgstr "Konfiguracja ircddbgateway" + +#: setup.php:120 +msgid "Path to Links.log" +msgstr "Ścieżka do" + +#: setup.php:124 +msgid "Name of ircddbgateway-executeable" +msgstr "Nazwa ircddbgateway-executeable" + +#: setup.php:129 +msgid "Global Configuration" +msgstr "Globalna konfiguracja" + +#: setup.php:188 +msgid "Locale" +msgstr "Lokalizacja" + +#: setup.php:192 +msgid "URL to Logo" +msgstr "Adres URL do Logo" + +#: setup.php:196 +msgid "URL to DMRplus-Logo" +msgstr "Adres URL do DMRplus-Logo" + +#: setup.php:200 +msgid "URL to BrandMeister-Logo" +msgstr "Adres URL do BrandMeister-Logo" + +#: setup.php:204 +msgid "Refresh page after in seconds" +msgstr "Odśwież stronę za kilka sekund" + +#: setup.php:208 +msgid "Show System Info" +msgstr "Pokaż informacje o systemie" + +#: setup.php:212 +msgid "Show Disk Use" +msgstr "Pokaż użycie dysku" + +#: setup.php:216 +msgid "Show Repeater Info" +msgstr "Pokaż informacje o przekaźniku" + +#: setup.php:220 +msgid "Show Enabled Modes" +msgstr "Pokaż włączone tryby" + +#: setup.php:224 +msgid "Show Last Heard List of today's" +msgstr "Pokaż listę dziś ostatnio słuchanych" + +#: setup.php:228 +msgid "Show Today's local transmissions" +msgstr "Pokaż dzisiejsze lokalne transmisje" + +#: setup.php:232 +msgid "Show progressbars" +msgstr "Pokaż paski postępu" + +#: setup.php:236 +msgid "Enable CPU-temperature-warning" +msgstr "Włącz ostrzeżenie o temperaturze CPU" + +#: setup.php:240 +msgid "Warning temperature" +msgstr "Temperatura ostrzegawcza" + +#: setup.php:244 +msgid "Enable Network-Switching-Function" +msgstr "Włącz funkcję przełączania sieciowego" + +#: setup.php:248 +msgid "Username for switching networks:" +msgstr "Nazwa użytkownika do przełączania sieci:" + +#: setup.php:252 +msgid "Password for switching networks:" +msgstr "Hasło do przełączania sieci:" + +#: setup.php:257 +msgid "Enable Management-Functions below" +msgstr "Włącz funkcje zarządzania poniżej" + +#: setup.php:261 +msgid "Username for view log:" +msgstr "Nazwa użytkownika dla pilku rejestru:" + +#: setup.php:265 +msgid "Password for view log:" +msgstr "Hasło dla pilku rejestru:" + +#: setup.php:269 +msgid "Username for halt:" +msgstr "Nazwa użytkownika do wstrzymania:" + +#: setup.php:273 +msgid "Password for halt:" +msgstr "Hasło do wstrzymania:" + +#: setup.php:277 +msgid "Username for reboot:" +msgstr "Nazwa użytkownika do ponownego uruchomienia:" + +#: setup.php:281 +msgid "Password for reboot:" +msgstr "Hasło do ponownego uruchomienia:" + +#: setup.php:285 +msgid "Username for restart:" +msgstr "Użytkownik restartu:" + +#: setup.php:289 +msgid "Password for restart:" +msgstr "Hasło do ponownego uruchomienia:" + +#: setup.php:293 +msgid "Reboot MMDVMHost command:" +msgstr "polecenie do ponownego uruchomienia MMDVMHosta:" + +#: setup.php:297 +msgid "Reboot system command:" +msgstr "polecenie do ponownego uruchomienia systemu:" + +#: setup.php:301 +msgid "Halt system command:" +msgstr "polecenie do zatrzymania systemu:" + +#: setup.php:305 +msgid "Show Powerstate (online or battery, wiringpi needed)" +msgstr "Pokaż stan zasilania (online lub bateria, potrzebne zasilanie)" + +#: setup.php:309 +msgid "GPIO pin to monitor:" +msgstr "Gniazdo GPIO do monitorowania:" + +#: setup.php:313 +msgid "State that signalizes online-state:" +msgstr "Status sygnalizujący stan online:" + +#: setup.php:317 +msgid "Show link to QRZ.com on Callsigns" +msgstr "Pokaż link do QRZ.com na znakach" + +#: setup.php:321 +msgid "RSSI value" +msgstr "zawartość RSSI" + +#: setup.php:323 +msgid "minimal" +msgstr "minimalnie" + +#: setup.php:324 +msgid "maximal" +msgstr "maksymalnie" + +#: setup.php:325 +msgid "average" +msgstr "średnio" + +#: setup.php:331 +msgid "Save configuration" +msgstr "Zapisz konfigurację" + +#: include/functions.php:13 include/functions.php:15 +msgid "compiled" +msgstr "skompilowane" + +#: include/functions.php:161 +msgid "ircddbgateway is down!" +msgstr "ircddbgateway jest wyciszony!" + +#: include/functions.php:164 include/functions.php:175 +msgid "Remote gateway configured - not checked!" +msgstr "Zdalna bramka skonfigurowana - nie sprawdzono!" + +#: include/functions.php:172 +msgid "YSFGateway is down!" +msgstr "YSFGateway jest wyciszony!" + +#: include/functions.php:182 +msgid "MMDVMHost is down!" +msgstr "MMDVMHost jest wyciszony!" + +#: include/functions.php:550 +msgid "idle" +msgstr "bezczynny" + +#: include/functions.php:623 +msgid "ircddbgateway not running!" +msgstr "ircddbgateway nie działa!" + +#: include/functions.php:640 include/functions.php:656 +#: include/functions.php:741 +msgid "not linked" +msgstr "niepołączony" + +#: include/functions.php:692 +msgid "something went wrong!" +msgstr "coś poszło nie tak!" + +#: include/functions.php:706 include/functions.php:724 +msgid "Reflector not linked" +msgstr "Reflektor niepołączony" + +#: include/functions.php:708 include/functions.php:719 +msgid "Reflector" +msgstr "Reflektor" + +#: include/functions.php:719 +msgid "not cfmd" +msgstr "nie znaleziono cfmd" + +#: include/functions.php:743 +msgid "YSFGateway not running" +msgstr "YSFGateway nie działa" + +#: include/functions.php:830 +msgid "DMRIDs.dat not correct!" +msgstr "DMRIDs.dat nie jest poprawny!" + +#: index.php:78 +msgid "Configuration" +msgstr "" + +#: setup.php:209 +msgid "Use networks.php instead of configuration below" +msgstr "" + +#: include/lh_ajax.php:6 +msgid "Cached" +msgstr "" + diff --git a/locale/pl_PL/settings.php b/locale/pl_PL/settings.php new file mode 100644 index 0000000..2432ad9 --- /dev/null +++ b/locale/pl_PL/settings.php @@ -0,0 +1,28 @@ + \ No newline at end of file diff --git a/locale/pt_PT/LC_MESSAGES/messages.mo b/locale/pt_PT/LC_MESSAGES/messages.mo index ae4e1cf..536bc09 100644 Binary files a/locale/pt_PT/LC_MESSAGES/messages.mo and b/locale/pt_PT/LC_MESSAGES/messages.mo differ diff --git a/locale/pt_PT/LC_MESSAGES/messages.po b/locale/pt_PT/LC_MESSAGES/messages.po index d1e7e91..f41cbca 100644 --- a/locale/pt_PT/LC_MESSAGES/messages.po +++ b/locale/pt_PT/LC_MESSAGES/messages.po @@ -9,10 +9,10 @@ msgstr "" "Project-Id-Version: 2017-03-14\n" "Report-Msgid-Bugs-To: dg9vh@darc.de\n" "POT-Creation-Date: 2017-03-14 13:47+0000\n" -"PO-Revision-Date: 2017-03-14 21:30+0000\n" +"PO-Revision-Date: 2017-03-23 23:35+0000\n" "Last-Translator: Paulo - CT2JAY \n" "Language-Team: LANGUAGE \n" -"Language: de\n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -660,3 +660,15 @@ msgstr "Médio" #: setup.php:331 msgid "Save configuration" msgstr "Gravar configuração" + +#: index.php:78 +msgid "Configuration" +msgstr "Configuração" + +#: setup.php:209 +msgid "Use networks.php instead of configuration below" +msgstr "Use networks.php em vez da configuração abaixo" + +#: include/lh_ajax.php:6 +msgid "Cached" +msgstr "Em cache" diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo index bdc3db2..8247d91 100644 Binary files a/locale/ru_RU/LC_MESSAGES/messages.mo and b/locale/ru_RU/LC_MESSAGES/messages.mo differ diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po index f38d614..f0350b0 100644 --- a/locale/ru_RU/LC_MESSAGES/messages.po +++ b/locale/ru_RU/LC_MESSAGES/messages.po @@ -395,7 +395,7 @@ msgstr "Вы забыли задать требуемые разрешение #: setup.php:41 setup.php:50 msgid "Setup-Process" -msgstr "Процесс установки" +msgstr "Настройка параметров панели управления" #: setup.php:42 msgid "Your config-file is written in config/config.php, please remove setup.php for security reasons!" @@ -463,7 +463,7 @@ msgstr "Путь к папке с YSFGateway.ini" #: setup.php:105 msgid "YSFGateway.ini-filename" -msgstr "Имя файла настроеек (обычно YSFGateway.ini)" +msgstr "Имя файла настроек (обычно YSFGateway.ini)" #: setup.php:109 msgid "Path to YSFHosts.txt" @@ -571,11 +571,11 @@ msgstr "Пароль для просмотра логов:" #: setup.php:269 msgid "Username for halt:" -msgstr "Логин для оставнки системы:" +msgstr "Логин для остановки системы:" #: setup.php:273 msgid "Password for halt:" -msgstr "Пароль для оставнки системы:" +msgstr "Пароль для остановки системы:" #: setup.php:277 msgid "Username for reboot:" @@ -696,3 +696,16 @@ msgstr "YSFGateway не запущен" #: include/functions.php:830 msgid "DMRIDs.dat not correct!" msgstr "Некорректный файл DMRIDs.dat!" + +#: index.php:78 +msgid "Configuration" +msgstr "Конфигурация" + +#: setup.php:209 +msgid "Use networks.php instead of configuration below" +msgstr "Использовать данные из файла networks.php вместо кофигурации ниже" + +#: include/lh_ajax.php:6 +msgid "Cached" +msgstr "Кэширование" + diff --git a/locale/sv_SE/LC_MESSAGES/messages.mo b/locale/sv_SE/LC_MESSAGES/messages.mo index b0ce1b1..387bca8 100644 Binary files a/locale/sv_SE/LC_MESSAGES/messages.mo and b/locale/sv_SE/LC_MESSAGES/messages.mo differ diff --git a/locale/sv_SE/LC_MESSAGES/messages.po b/locale/sv_SE/LC_MESSAGES/messages.po index b319f7c..d15e3f9 100644 --- a/locale/sv_SE/LC_MESSAGES/messages.po +++ b/locale/sv_SE/LC_MESSAGES/messages.po @@ -720,4 +720,17 @@ msgstr "YSFGateway kör inte" #: include/functions.php:830 msgid "DMRIDs.dat not correct!" -msgstr "DMRIDs.dat ej korrekt!" \ No newline at end of file +msgstr "DMRIDs.dat ej korrekt!" + +#: index.php:78 +msgid "Configuration" +msgstr "" + +#: setup.php:209 +msgid "Use networks.php instead of configuration below" +msgstr "" + +#: include/lh_ajax.php:6 +msgid "Cached" +msgstr "Cachad" + diff --git a/messages.pot b/messages.pot index f4f2ab1..5401d87 100644 --- a/messages.pot +++ b/messages.pot @@ -717,3 +717,11 @@ msgstr "" #: include/functions.php:830 msgid "DMRIDs.dat not correct!" msgstr "" + +#: index.php:78 +msgid "Configuration" +msgstr "" + +#: setup.php:209 +msgid "Use networks.php instead of configuration below" +msgstr "" diff --git a/scripts/switchnetwork.php b/scripts/switchnetwork.php index 04f6011..e9ad61e 100644 --- a/scripts/switchnetwork.php +++ b/scripts/switchnetwork.php @@ -7,6 +7,7 @@ $start = $time; // do not touch this includes!!! Never ever!!! include "../config/config.php"; +include("../config/networks.php"); include "../include/tools.php"; include "../include/functions.php"; include "../include/init.php"; @@ -53,16 +54,28 @@ if (!isset($_SERVER['PHP_AUTH_USER']) && SWITCHNETWORKUSER !== "" && SWITCHNETWO "; + echo "INI:".$network['ini']; + setDMRNetwork($network['label']); + exec( "sudo cp ".MMDVMINIPATH."/".$network['ini'].".ini ".MMDVMINIPATH."/".MMDVMINIFILENAME ); + exec( REBOOTMMDVM ); +} else { + if ($_GET['network'] == "DMRPLUS") { + setDMRNetwork("DMRplus"); + exec( "sudo cp ".MMDVMINIPATH."/DMRPLUS.ini ".MMDVMINIPATH."/".MMDVMINIFILENAME ); + exec( REBOOTMMDVM ); + } + if ($_GET['network'] == "BRANDMEISTER") { + setDMRNetwork("BrandMeister"); + exec( "sudo cp ".MMDVMINIPATH."/BRANDMEISTER.ini ".MMDVMINIPATH."/".MMDVMINIFILENAME ); + exec( REBOOTMMDVM ); + } } + ?> diff --git a/scripts/switchreflector.php b/scripts/switchreflector.php new file mode 100644 index 0000000..cdedbc0 --- /dev/null +++ b/scripts/switchreflector.php @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + <?php echo getCallsign($mmdvmconfigs) ?> - MMDVM-Dashboard by DG9VH + + + + + + + +
    + +'; + } else { + + header('WWW-Authenticate: Basic realm="Dashboard"'); + header('HTTP/1.0 401 Unauthorized'); + echo 'Zur Ausführung bitte die geforderten Login-Daten eingeben!'; + exit; + } + } +?> | get your own at: https://github.com/dg9vh/MMDVMHost-Dashboard +
    + + diff --git a/setup.php b/setup.php index b041ea3..6e0381f 100644 --- a/setup.php +++ b/setup.php @@ -205,6 +205,10 @@ get_tz_options(constant("TIMEZONE"), "Timezone", ''); " name="LOGO" class="form-control" placeholder="http://your-logo" aria-describedby="LOGO">
    +
    + +
    >
    +
    " name="DMRPLUSLOGO" class="form-control" placeholder="http://your-logo" aria-describedby="DMRPLUSLOGO"> @@ -257,6 +261,10 @@ get_tz_options(constant("TIMEZONE"), "Timezone", '');
    >
    +
    + +
    >
    +
    " name="SWITCHNETWORKUSER" class="form-control" placeholder="username" aria-describedby="SWITCHNETWORKUSER"> diff --git a/switching-networks.md b/switching-networks.md index 3767a47..5b96088 100644 --- a/switching-networks.md +++ b/switching-networks.md @@ -1,6 +1,7 @@ # Switching Networks To make switching networks possible you have to fulfill following conditions: -1. add www-user to the /etc/sudoers file to be able to execute following commands: cp, killall, MMDVMHost + +* add www-user to the /etc/sudoers file to be able to execute following commands: cp, killall, MMDVMHost You can do this for example with following line: @@ -10,8 +11,9 @@ To make switching networks possible you have to fulfill following conditions: HINT: PLEASE(!) only use visudo for editing the sudoers-file! This validates the file before writing it on the hard-disk. Otherwise there is heavy danger to damange your sudo-system, if you got any error/typo within the line! +* create two or more ini-files containing your configurations. If not using the new variant via /config/networks.php, create one with the name DMRPLUS.ini and the other with the name BRANDMEISTER.ini within the same directory where your MMDVM.ini resists, that contains the configurations for the corresponding networks. -2. create two ini-files, one with the name DMRPLUS.ini and the other with the name BRANDMEISTER.ini within the same directory where your MMDVM.ini resists, that contains the configurations for the corresponding networks. + If you want to use the new variant via /config/networks.php edit the file networks.php to fit your needs and refer to the created ini-files only by using the prefix and not the full name with .ini at the end! ## Security Hint It is absolutely not recommended to put ALL into the sudoers line! The commands above are heavy enougth! diff --git a/version.php b/version.php index 02a3a75..6041e60 100644 --- a/version.php +++ b/version.php @@ -1,3 +1,3 @@