From ab03016c7ee8bcc091428dc4ffee9d3985d37983 Mon Sep 17 00:00:00 2001 From: dg9vh Date: Wed, 22 Mar 2017 20:42:58 +0000 Subject: [PATCH 01/20] hope to solve problems with YSFReflector State --- include/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/functions.php b/include/functions.php index e1fac35..13a07fb 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; } From 3a84ae674ba031ebd8f9689e4c63844f9914a9ab Mon Sep 17 00:00:00 2001 From: dg9vh Date: Wed, 22 Mar 2017 21:29:28 +0000 Subject: [PATCH 02/20] fixed issue with mode-display --- ajax.php | 4 ++-- version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ajax.php b/ajax.php index 7f9e535..d2e0ef8 100644 --- a/ajax.php +++ b/ajax.php @@ -25,9 +25,9 @@ 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); + $mode = getActualMode(getLastHeard($reverseLogLinesMMDVM, FALSE), $mmdvmconfigs); echo $mode; } if ($_GET['section'] == "lastHeard") { diff --git a/version.php b/version.php index 02a3a75..bb60924 100644 --- a/version.php +++ b/version.php @@ -1,3 +1,3 @@ From 5666e8215710613a606cf6a65651b9c63bbd749f Mon Sep 17 00:00:00 2001 From: dg9vh Date: Wed, 22 Mar 2017 21:42:29 +0000 Subject: [PATCH 03/20] fixed high load with last commit --- ajax.php | 2 +- include/functions.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ajax.php b/ajax.php index d2e0ef8..c58e773 100644 --- a/ajax.php +++ b/ajax.php @@ -27,7 +27,7 @@ $logLinesMMDVM = getMMDVMLog(); $reverseLogLinesMMDVM = $logLinesMMDVM; rsort($reverseLogLinesMMDVM); if ($_GET['section'] == "mode") { - $mode = getActualMode(getLastHeard($reverseLogLinesMMDVM, FALSE), $mmdvmconfigs); + $mode = getActualMode(getLastHeard($reverseLogLinesMMDVM, TRUE), $mmdvmconfigs); echo $mode; } if ($_GET['section'] == "lastHeard") { diff --git a/include/functions.php b/include/functions.php index 13a07fb..bf905ca 100644 --- a/include/functions.php +++ b/include/functions.php @@ -473,7 +473,7 @@ function getHeardList($logLines, $onlyLast) { $rssi = ""; $ts1alias = "---"; $ts2alias = "---"; - if ($onlyLast && count($heardList )> 4) { + if ($onlyLast && count($heardList )> 20) { return $heardList; } } From da971c437c47d70ec9b4a34fa53e4315737b7a58 Mon Sep 17 00:00:00 2001 From: dg9vh Date: Thu, 23 Mar 2017 09:07:24 +0000 Subject: [PATCH 04/20] added polish language support --- locale/pl_PL/LC_MESSAGES/messages.mo | Bin 0 -> 11942 bytes locale/pl_PL/LC_MESSAGES/messages.po | 726 +++++++++++++++++++++++++++ locale/pl_PL/settings.php | 28 ++ version.php | 2 +- 4 files changed, 755 insertions(+), 1 deletion(-) create mode 100644 locale/pl_PL/LC_MESSAGES/messages.mo create mode 100644 locale/pl_PL/LC_MESSAGES/messages.po create mode 100644 locale/pl_PL/settings.php diff --git a/locale/pl_PL/LC_MESSAGES/messages.mo b/locale/pl_PL/LC_MESSAGES/messages.mo new file mode 100644 index 0000000000000000000000000000000000000000..bc66cffcc2c6e25c89dbac8fef4fa18b438ae775 GIT binary patch literal 11942 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 literal 0 HcmV?d00001 diff --git a/locale/pl_PL/LC_MESSAGES/messages.po b/locale/pl_PL/LC_MESSAGES/messages.po new file mode 100644 index 0000000..26146c9 --- /dev/null +++ b/locale/pl_PL/LC_MESSAGES/messages.po @@ -0,0 +1,726 @@ +# 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 "" + +#: 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!" 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/version.php b/version.php index bb60924..d9e9b70 100644 --- a/version.php +++ b/version.php @@ -1,3 +1,3 @@ From f8be14d465fc9821098aba52bfdbf7edbc41b66a Mon Sep 17 00:00:00 2001 From: dg9vh Date: Thu, 23 Mar 2017 14:23:54 +0000 Subject: [PATCH 05/20] small update of pl_PL --- locale/pl_PL/LC_MESSAGES/messages.mo | Bin 11942 -> 11985 bytes locale/pl_PL/LC_MESSAGES/messages.po | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/locale/pl_PL/LC_MESSAGES/messages.mo b/locale/pl_PL/LC_MESSAGES/messages.mo index bc66cffcc2c6e25c89dbac8fef4fa18b438ae775..4ec9171dcdb08bb4669193ce45751d738e3b331a 100644 GIT binary patch delta 3740 zcmYk-d9amb0SDlZ%f84?2tpnNE(l=?NV(xsco7wo1S~cQ5j1vf!K5P~D6$I_1V$mC zVPORmqt!5qj(@~3VWX3&m4!3f)I>C)&d}8JJNILTckb^z@AsW^-u*jw@08lcHm~V=5Ds)ezxTyw&W4!d%s~m z|9f^UifZw`N((nW<|mkUV|Qi@moOb&!R~Be8l1*-G>hqIL3#a9`Th!i(*3pU!ylI( zV<*=q*;oHXonfSddS(X0nFdF)8ON|IZ!5i<8Q|jbdIR&hJ1z4Yc@ z4&=*ByZ>Omf12h}H0x&lbECWI$NtP4!+0TY_Nr@DGJwrYLtB{@c#>AB_$f`Qc!d?dMST`$n1OcDdK&D- zbTE)v$*Y;I9m5Q0JhLSWna{1KcB;iwD*lQWyku#AM{O4;n2ygdU+iq7=kZdm3)m;iql@w zaA%J|?8!8I5!2D&(hdhv~S^&sZAh z%^bR6%;!fjpBuw$!9-^1XD}TsWZGNG3}g%a6+23Q$!bRY2bDDR9<$V^n3;9-2xMmG zGadF}I;dwF9L@o}iv2l*gSd*>f`j}tUu6dVAv4g{mBt^oZWa5V2K%|8&tfPu)7#mP zvzW(f4Rf0JGXp!wWBe8K6T8}n(#|?&LOZCh;%TP6SD697!wld=>B&CT#w9vaexTz; zjbG@_{ICpR&Oie*z^TkiEMfL?88fg=Oo!Xb>*ty89j2y>H%dQZKG)NaLALhFs>_;qmhQQ>FhaZD*N=c)tfT^9E*s<4Px%PG$x?ojDVWn8RFMsgga~ z#WeI9GxKcdr_hrXHZVUhv+0Q}7BK@{%}e+bW@+DMzW+Y+`%zclxcA+e>x-Gkdn5!Qa8O$_%D|5IO zFlT8sv*f#&eqLbO`7Nude4t{xiaNc|z^N-zq^qUw{enUf2M)!ma z!OUz8^SND2JHKEPj+T_KOIGO0Tqs}2{@5l{_umrB<^4IXqeZY(+|z`Uc7Kxk4_NlsrDq)M}0Y z0Y|AnBw2xR<^8E#Th_A@DVNG^wOZr(N_DYJlWO*5r!>e887?_256aatOzcjvSyHyi zJ@QB{ln3PQTFpNgI-A9}CENO0Ia{t*c~aKN44El6<@x`i%C{ut%Q8u3=R#Q^pOZnd zOYWCdl9K&?qE>5s$$l>{uXA?JmK@lYk{`L0-SVh>Pg-UFpHewn_MWY9gXENcS1y#4 zD;lZ2Uh8$tIoGM~Ip_NG>Qm%Kd06JlSeYx$B;`B$uRYtdcunpoJ!F8)$%S&6^pej= zbJ-`;BZiC56o}hxoO>;nFk)~ NG`{13SNgo$?*B69MDqXu delta 3701 zcmYk;3ry8j0LSqoT)E%_ML|M!2-`+w(|jH(RhQX5y9 zq0|r$S=iK=t9Yate<-6vjS0jt7>*OL1!iGO%*9r?21BqIgK;}H$GzyrL#Xf7qMkpF zt&MTaX(~b7xPoo*SL=VMF|_4rbrgl|FcH;YGODAAsE(%C>)H169PGsXkHVG{!IfFbr8yMGy@N+!Dw`0Z;ZeJ*72x;X4&hNsOL7L2DS~Wu^a<%IKAofQPy$T zp6gU>PXA^B6;|Ekp=OkiOx_ftzF3BBu-y6{Y9)?aFQA^gg&O!Bd)5Zs?*_ZBZ<$qXDSTQ&3wr5BX=7@~0zi#2#3Q zYWEcC`}N4!%{6;{H-h!o2SF@@K8V217=wK=+1_7+8dwQxMJmvXhfzy>*51E^94F&u zlseSyuq$>#ZOt%i3TjKHI<_(cHPURr~x?3si>hCKwb%T)WX^hwZvUe6NyE&pM*LasW`ofF`4M1e{+;+YH3cO_WVaw$5&AeJU|_~ z2!75qz-ZKS@u)2rh+6s)s1DLl?Pa3|vI6;M@~yj31O5UXHFS~+eVDVT8UBu%+25!R z19&CWfg9CeB*vfzyW3MAGW_x?KSnX{`6tOz5bc@#%^4X zM!i-!sMB168dw>g!ab;;)`dKzh8Ce_l#jG+HlbFo8a3c!r~%ZWR_2Voe=W-KKX`*1 z`auck;@^7@YG8d(E0BiT!*tYu=Ak;uwbxrvXQmWs${ezOk9zJVYD-)3W6%%dP%EG5 zP|+82P+u%SFIL$HzP6sTUcsJx{u^q>9+pc3jIkzId!Yv0A2s7-)FGaR+L}C6JI+BW zn)!K5z?UX0awdXhN^#jyv9UkrfNsh-P zt|y~c?|&&3-URb8YNS6PV=&iI9X98rX)k-CJ|B)6SUR$*CJS}w3amRYkn0-j`>5|7 zMmL^BE&VC zikev#>bX2rJ4M(8pCzvol>=llnL!2<6|JU9oPPhGqq31`WLh>AZHtOVuQTx!=}X2C zt(cZmS_1$Ax7<76utN7!~#Npx2BlKDjCWiq<4qXI6bkS)Zwx449;j3R4E zAMz4;g)AfeNf~*byhgT>bfWT>A5)4u$a0cKD#$D{gs3$3Z#Ma_eJ6A*buDWZNhO=f zI-)b7eQYe+`+4?a4JMNTWU9R4MUk#1ju0 jNJ_{HB#f*lDxLh8C$U*=M(Cix+KRB$*0uMd&bRm Date: Thu, 23 Mar 2017 19:40:34 +0000 Subject: [PATCH 06/20] changes related to https://github.com/dg9vh/MMDVMHost-Dashboard/issues/130 and added missing strings into internationalisations... --- config/networks.php | 21 + include/tools.php | 10 + index.php | 47 +- locale/da_DK/LC_MESSAGES/messages.po | 8 + locale/de_DE/LC_MESSAGES/messages.mo | Bin 11508 -> 11674 bytes locale/de_DE/LC_MESSAGES/messages.po | 8 + locale/en_GB/LC_MESSAGES/messages.po | 735 +++++++++++++++++++++++++-- locale/es_ES/LC_MESSAGES/messages.po | 8 + locale/pl_PL/LC_MESSAGES/messages.po | 8 + locale/pt_PT/LC_MESSAGES/messages.po | 8 + locale/ru_RU/LC_MESSAGES/messages.po | 8 + locale/sv_SE/LC_MESSAGES/messages.po | 10 +- messages.pot | 8 + scripts/switchnetwork.php | 30 +- setup.php | 4 + switching-networks.md | 6 +- version.php | 2 +- 17 files changed, 853 insertions(+), 68 deletions(-) create mode 100644 config/networks.php 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/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..987e979 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 { ?> m&s5`*wl48%+J^J`dx^V?V* zD{-^FAB6n#n)>{$!-dvZ4ZC7}>}4H^8cQas!+dOj3s4VSkLqwMs-wO3{D}Sh1UBXR zS&YOVtRZw7O8+L7MhiaZjp`r`HIp3F17~AZEW&!Y)Vc{Z&_nk8Bh-CYPy@S;uj4JO zjHRLe&(~QuVq^L@+i0kx<4E<*hp0+iK+Wt+q%e!dH}bnhYm z%*XtRz^fRIm6@HM+Ya^p_;Bjaq)d{%Fw&Zex;_J&;e3q8E%y3F)WB|{Dsc}Ttj%at z;tr_m$;f^)X{aUjp!Qk;YH7;6wy_JfCWov?Q6oKu+DxZVugxc@2bE)6yo$rIHXA@| zo`R}CIzEKisFE+ihPVQ$zS)HufcF>;J@71Q0Ov6dKSw>V8sAbSYM@Hm6q&5)j1CS! z#$Yl~1D=O^@FG-4t5BuhiCW^fPy;)GEREM(rlA|}p&k^zRrEfpg0&s$uNky;{1r$* zo%chPJQ=kYMxjcUjnP<$y1oxJ&{L>^UBF}b73wEPW}<_0P)k~d>UcA1Acws) zv^&qBc6B*wlikHu7}mo7Lz0NPZy>6)HBhqfvXpjT+cu)Gyi&)X0ybmf#%f``@AV$S>$%5Tj4Pwy5W(paz(M zs^C0iKweWyLo?fs>fi`!hUYL5ucHPM+1kHpdZF$gjjWEzMBTs4Uf+qDz}r|2&!axS zXs_Q!?SKKLE-EmkIdth7agQGChUO$O?;AzzB^%<(;8>kB1 zve$#6{S%Bp^%IBH>E9&MXoJ0V0W(mWBnMUMBGimaQA@EKRmwA{0e*v8f}c@qeFycu zKpv{KZiE_GOH_puQ3D%@Uadu{y-;9XY2AbB=zU}orX2GyfHKU)0=$8@@o~J|&iA62 z==T1%U=V5mV^9-vp*CRws$vV5)B=i0dI?85@s@~LY^i%){_ZD)zVQ&ipeIO z*kccFwQcnlF&WME#qG2|xY5lL7c5(FU1LSX%QKdGN^Oq?D+H zI(X&H0MA*jux9~*5(ZNx`OAMyz4K=c;q(C)8H zUM3mj!DBTi?MVR1C*6tOnh> ^yHo+PQh`qSt}7LkRdKS?LqM7zHgnM2Y@#qm-_ z16vcl*A5v^I+2w`M;nq%^p+Kn*GR>&gNEeNsK+OAb~~^iMJPmwY{F@WQ4sCiQ%LtiM7{i;ySXccwDV4?H#wvlb@9{EjKoMO13lAo$GO>q&ZpXPHL9>-&@_zBv)ou{(;pE zmQ@QG^uPxPS~T4l)MaR%XO`=~56bnVcsx#8tmD5s*2!~wTyB%(a&xc8^vTOD4vnsR K;M=IMfPVlAGkm-N delta 3740 zcmYk;d2o$a9LDh@vI>bNH1^zxEVUJhpd^--1QEMbRpQ#ISemG&#VgiQu?4lqmQ=%J zI*n=7Fsbby%_!6Av}3fRWQNWZ6GoZR_WQi|n8}$u_jBI&-uu4i{LXnVdnP@e==>Jp zzr)aulQyIvz?fRBX~YX{N|-SX(TkBd0~=!@Ho>(Rj@vN=k76)ZVkmxtL3jc6z3)+< z{{@>GuBjKXx(1#?k1nuWU2LVLW_zP|?BalRO1@PzdW zzQXZCjOG5uk74Kr@u(Rjqb`_+{x}Sq;YjOr)Bp?Z@fOtQ%1{HVz+?Co`r#z*ruTEK z)36oCvoVzWn^knEy4j4X#17QV_8~T7#;{@7BLjp9|+hnm{wuu?JOw zIMh<6BY$Q%FOFuGL#H|BqX*ZcW>|sU@f>n(^T-;&M$le~!j_nfno$<&dvj3NU4aR> z12w_3s3pB%y%I_Nb>dfh;tp!&50L7ar>Gl*aJ3E?i(0A-)Qu*f-p@lV-8$sYY~`gb zmSZAbL|ykU)c2ntb20wSslQG{F?|__dLs#=aR?^kOnZJWYG9S9id3Tquc1m@XU{id zbnGt^k6O|cjKx&c(s-?T4jrvYp>-K*q(!LBv;pc=KHI8K?r~--D z8hfBho`o%N98ye^hZ;Z;>UvHw9SvYR>O#9v71)nd$$W`S%3MMZ-azhYo}&gD$<=ki zHmDmUqAJ-BwY0-f0~(K7l0~S`ZAPx+m?L!fGpBh`X@5knZSJ6M{2cYg2o`!icEhz; zisvz&otKOE(1Sy{nm%${fU}c z9qLB^pgtGOqoK_fg{nvl>hVlP{>)TfG}D!+%9Wr7Sc#hXX?uJ*n)O$yf93?sY;K@R z^%xVek;ivF2{q76)WEW_8go%UvC%wxI^Q03qmHNnq@b>sj;g?9>vYt_-ivX3BP!s8 zF0dL^x{at!c+h&vdKL9p-9=U6K57Cl(1U*MeM=dOx^V((AgQQLnT4#P@uK#YGf-wRm`Yt&zB<)Op9O)p%GxmbwT@g9z(92wZB6OS0KMD6}EbT=7lM%AdbzK)@I z8$<8`sOvdHMDhuF*>=%cNmL0cYNil1 z9wfJo=Jj2&j0`7Qn!e<7vX{6`>(8&M`x~G&Q~Qt%BC5<9(vzsEbjRGD?_a>d^p_HC z!ZG%I4i?+KDxubmjC6ZEepW4SE^+i|l#+C^k0cXqnvY07l0>?Y?L=)inMqdbfL1`J zyFLD&hin&PAwto1))-w@^X`djF0_kKpA?fE`d(Vq;f zcdTw%z2mp&PbNdi3bKG?kv!s0)OK=z_t~F?sX9YzNfO9B9niXyHl!B`AQi+*-X>GY zBGQ3mllrX@2NOu+`X}knAqU8D;&^yDNXC-6L~T4NaeKbsgU$2@kgj9|nNQM)+NVU5 z(Br38M8b(5*+}Av+E&tpd_iJJ4`K!lE-4Aiu6i1FE4V78#fHGDL+wgKs^%tk3-})Z C*hb<2 diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po index 04f5df2..1a05ed4 100644 --- a/locale/de_DE/LC_MESSAGES/messages.po +++ b/locale/de_DE/LC_MESSAGES/messages.po @@ -717,3 +717,11 @@ msgstr "YSFGateway läuft nicht" #: include/functions.php:830 msgid "DMRIDs.dat not correct!" msgstr "DMRIDs.dat nicht korrekt!" + +#: index.php:78 +msgid "Configuration" +msgstr "Konfiguration" + +#: setup.php:209 +msgid "Use networks.php instead of configuration below" +msgstr "Nutze networks.php statt d. Konfig. unten" diff --git a/locale/en_GB/LC_MESSAGES/messages.po b/locale/en_GB/LC_MESSAGES/messages.po index 9781c02..5401d87 100644 --- a/locale/en_GB/LC_MESSAGES/messages.po +++ b/locale/en_GB/LC_MESSAGES/messages.po @@ -8,71 +8,720 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-03-13 18:38+0000\n" +"POT-Creation-Date: 2017-03-14 13:47+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: DG9VH \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 "" diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po index 2fca34c..70f1c90 100644 --- a/locale/es_ES/LC_MESSAGES/messages.po +++ b/locale/es_ES/LC_MESSAGES/messages.po @@ -732,3 +732,11 @@ 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 "" diff --git a/locale/pl_PL/LC_MESSAGES/messages.po b/locale/pl_PL/LC_MESSAGES/messages.po index 90aa7b4..e7e5000 100644 --- a/locale/pl_PL/LC_MESSAGES/messages.po +++ b/locale/pl_PL/LC_MESSAGES/messages.po @@ -724,3 +724,11 @@ 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 "" diff --git a/locale/pt_PT/LC_MESSAGES/messages.po b/locale/pt_PT/LC_MESSAGES/messages.po index d1e7e91..fb960b6 100644 --- a/locale/pt_PT/LC_MESSAGES/messages.po +++ b/locale/pt_PT/LC_MESSAGES/messages.po @@ -660,3 +660,11 @@ msgstr "Médio" #: setup.php:331 msgid "Save configuration" msgstr "Gravar configuração" + +#: index.php:78 +msgid "Configuration" +msgstr "" + +#: setup.php:209 +msgid "Use networks.php instead of configuration below" +msgstr "" diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po index f38d614..90e8ece 100644 --- a/locale/ru_RU/LC_MESSAGES/messages.po +++ b/locale/ru_RU/LC_MESSAGES/messages.po @@ -696,3 +696,11 @@ 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 "" diff --git a/locale/sv_SE/LC_MESSAGES/messages.po b/locale/sv_SE/LC_MESSAGES/messages.po index b319f7c..2ecf5ac 100644 --- a/locale/sv_SE/LC_MESSAGES/messages.po +++ b/locale/sv_SE/LC_MESSAGES/messages.po @@ -720,4 +720,12 @@ 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 "" \ No newline at end of file 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..a0de2a9 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,27 @@ 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/setup.php b/setup.php index b041ea3..5cb6689 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"> 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 d9e9b70..28265c9 100644 --- a/version.php +++ b/version.php @@ -1,3 +1,3 @@ From 06e66970d6730164f97e0669876222a5674f40fc Mon Sep 17 00:00:00 2001 From: CT2JAY Date: Thu, 23 Mar 2017 22:39:01 +0000 Subject: [PATCH 07/20] changes related to #130 - Portuguese translation --- locale/pt_PT/LC_MESSAGES/messages.mo | Bin 11021 -> 11227 bytes locale/pt_PT/LC_MESSAGES/messages.po | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/pt_PT/LC_MESSAGES/messages.mo b/locale/pt_PT/LC_MESSAGES/messages.mo index ae4e1cfe1f36cadd16080869d2158ae2ca94ac3d..5df124b4a206db2867c6df8a1bac205617804bc5 100644 GIT binary patch delta 3654 zcmZA2drXyO0LSr1#S0={2o=TPRlK4C;w3W^4Jk+)9k&1$s zBsIsTPSfQ`(^fX4)SOzYEf+OiTe&PR>yJ!btG>T;9twNM?|h!;eb4*6&+R>IO8+jy zcP%VvyW!YJdXVsz#$3mCZTaBX5Nb>d+=!3iCTxfMkw0^cj}G`D2ID1cgWn*3<~koC zcpF>e1JwP^+WYVGnf4Sqav};_VLW!h5!O^xUvg0mdQlCnL_KI7>H(W=eYd?{i&30E zf<5t~^%i!b-kx5^7@si?1vQ+48bKPW!7L2Ic^Hlht>vf=?zHt|sPEOII(7jM;g{GP zmohqCUtul7?$p;~2+ueBDKP8iC~5}kP$T;Q>8zUgxR z4@8YT0kwo_sQc4V1M;A+Glf+Y9IQr->;w+MOUR%3%i58c_ z*bm=E4eSDH39necwf-2!{OiJ9PH4mrkwKXj>@+OV71L(GHn2qYdBGkys(ZOoeRGzTsuOiE9Zlad# z0mh(VI<*A7tqG{9A8j3r>SzjTucT`J^*T&PHI##~=)sq;8nw1JP@D5tjKtqjQ`?E@ zh`_GMpiBa)11YHXrl2~If$=yK)m{Z^z`jZfbl%h=ZJJZ);1%T0+~q?(ZpDsM!yQl$ zibPFyJZcG_Ms;igYDscY9VhL2Eddj&I^ z8FLNQ;0Riwk7g8V$*)YQ&LEln9}3AbP`Jb+rF&ru!y34JgBe;YbSp%vgH&7k9h1y)LoxpFrgWAk^_i$8T!|WR8S-cL zIKDtbXQ=6mS5XZ=z(fq=q^5AZH48PBg{Y3~Ks9*WdKvY@brT0;3%;y@46!Dmf74ns zeYP+MwU+s)DJ?*R@5fhi~aEc=HeHqkqzq`a13gRCSXf+p_U>KHR5vAgLk1idH}WQ zPGbU|Lp|pYjN3!TT`z=y*9O|rFak3@Hy0)evS0iTtm%d z5Tnpu=!=?>vB6+R@8T)PdDzfCk~^g@HlGi&to(E|B=QCO|h4#gR_W3 zbi6=@kvB;JnND0pNAmzpKYeBgRZWZj+v#|P3?W)mjcx(atEkPV(d*E!Wes5uni*s- zSw)5t?d~$NiIkH}@;Z5r=-5J7A^(3v?LYq}(S<5~a6Cma$P;8K(Xo$g_Lulihdqhb zklPf=V@6MiNLY8Ao)qB;80MDIrtHE~0l@M=+U9qR1$+ zkff8zL`MW!Nd}S_(s;bAf@5pTF_-ML^+@bR`cw@MofSOSlUKahRpjy3Z3-=HGswwz z7nOJy&o7KCm{;I<@(YXHu3X1E*O}wZ|M#o;PL6wlx1{dR&J96r5{Ej8Lq`oAUUjYe zg60K9Rg)smh9)l?Oy0CaW8XnUH>($Z+jhAj>}V8*RSu5 Gpnm{q!C)x> delta 3456 zcmYk<4NO&K9LMoTxF}q@3iy%=%0)=fG(m~fG|iV%(*#q|@HNGhh)kt4tc#jtDj1<@ zp<9}%)3!*qoYgXzb7r%JE@s*=%V=&*%_w!w*7tYspUr3d&gVJj-gBPUbDbA*%clpL z;yl|NWfw^xo(Sj8;-66*D1&{@h2s$Hh{N$d%t8L#91b0@5OvFHjKngG#x2+mt5NrT zg!+CB#yA&n-%x4Gg$C?`=ge#9<-BeCP(!h(2PL8!NJTY}Zs)`7^Rd{I>yt1E3(X3Q z<-7)yu^xT2@0zKo=PjrQ{)Zm)(#=lT!AwDQaEP5}qrR7q>R16Dz-1VQ@eEI&_cW8S zJLhSrc1B|a?YqfTGy~I6Bb$Zv!R4bKuma<772c1V&As;dSEvWp+4*VI$j_jbt_5}f zE!2RbnTF2j$AF(o78Q*w7c;O3`Ewtdhf#auICjHJsFB=3-PeVu>%sjo6-Oc4$Q7WL zaH&~hmYJ1t%)dswlM8gteT-`0b4kZs`pK{XW44%Fw}u?J?N?w^ACULNvQx5Um@ zn;Y%=4ou|pLzs!*b!7f^gSxK{bVLT_QqYfCsHx1g>#LCEb(>I2R*l+Bdr(Vo!aReT z`X=*NR7aapd*vGHZMYerq6c|ckiHm=Ihci7`wghgS&s3z9W}MJ*cFc=gK=k29cV^9 z?*^&^w^7fziyCMc(@2x9GjhoV`cm;z8HxP4`5e^Km8b`{M;mo*dLr7V3Kwu?P#WOz;0sRO-1fkGtn$G7Id-b*LWiMNQceRKv$m z9Xw^%&!R?p0oCwD)MmYIpZnOUy1z5({vN0qO2Zhv{{yIKO-EvG8|Si74?Mu|=$rcl zwN}Sb-)k^0p&I-P_24jCl|Iyxb+z+e$fUUbsQbsDIxrOzY2W3kf+eU2RGa%yJ^u_f z;-jb~sYgxe_oyYgjB4Np_QELUnLfFGs1A;^^O>lD6rSB7 z{JC=+^u2#kJ@@kas*c5C9d<+g;$5)oO{j*NQ8V~A>Uq(OQuimBX^G6gMlgU28rg7E zN5-Q%G8wh03Xo^Gb*SCE2lblnxAUWz#QE2#rTYan1DDZ{I_Nn`sP7F$ozL~+ z4i8}rt!iW=P*b0S`urt)04q_O>jz8oq<-XjJb|LkXw``k?kq1~M5g z8+HG3)IckO=dAx>D!Sn`>UH@MwFJ$mp5H>PWkhOd31U!Fn1$K{Gf*?M4B2mPBWei_ zqL%0+mf}U+fb$skw|E6t(!Q(h6Y5dFzM&3eV_UAzM|EH^da)SWVJUiW18RoKQJZp~ zeO`~c{}g($!Onk1&D?LOCBKb}jjd#c@O( zDJQH-aJ1kCkhjSQl0}{+JID;Jzg|C0S8JI@sC5we8@^sc`~R*@&jy=56E+sJzI9;qODbu!6(vW}>{Nc8i)lZ27y zNfH@G-XiVEAW}+RCB;M=xJ;A$CY3S7M|dOLQli%>oT$tuPm%2;m24#{Y~En$ZN7^u zh~5a5NU|_kJ}T(yI#N3&R%XSDlZqt38;I;H|yc`?BYM`gbvS diff --git a/locale/pt_PT/LC_MESSAGES/messages.po b/locale/pt_PT/LC_MESSAGES/messages.po index fb960b6..78bd912 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" @@ -663,8 +663,8 @@ msgstr "Gravar configuração" #: index.php:78 msgid "Configuration" -msgstr "" +msgstr "Configuração" #: setup.php:209 msgid "Use networks.php instead of configuration below" -msgstr "" +msgstr "Use networks.php em vez da configuração abaixo" From 372c1f517941de42d6c3587d617f1467dddba4e4 Mon Sep 17 00:00:00 2001 From: Sergei Date: Fri, 24 Mar 2017 21:28:15 +0300 Subject: [PATCH 08/20] Update messages.po --- locale/ru_RU/LC_MESSAGES/messages.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po index 90e8ece..80e0201 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!" @@ -699,8 +699,8 @@ msgstr "Некорректный файл DMRIDs.dat!" #: index.php:78 msgid "Configuration" -msgstr "" +msgstr "Конфигурация" #: setup.php:209 msgid "Use networks.php instead of configuration below" -msgstr "" +msgstr "Использовать данные из файла networks.php вместо кофигурации ниже" From 7a2f6fef24f9cf7ec91b7f10d9508039e95b5049 Mon Sep 17 00:00:00 2001 From: dg9vh Date: Fri, 24 Mar 2017 18:59:27 +0000 Subject: [PATCH 09/20] updated ru_RU messages.mo --- locale/ru_RU/LC_MESSAGES/messages.mo | Bin 15002 -> 15289 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo index bdc3db22d1327d893d201c268ac350f59a6ab15a..1169855c7de2c3181efe83e0ff6fc821b631496c 100644 GIT binary patch delta 4046 zcmZA32~bs49LMqF4u~v@zSP94p%S8Lxn!ofWMwWXu9Zv3lAwVigsJsFamUoq4BXPx zLaawQ0A;$}*d2beg7d)V{y>4lSPHe?RBmckfyL=iI9$IR|pR-!`qk z-cVjAZY2sD81oBW3gJLm6J|_3T#Lj+<&tMRKYk$9hjXD1V8(|%8 z*7L#0pVzeD7{P^(*bsYT3+!(lhZ@UFREN3f!NsTsH={b-iR$PLd;X67{U}Cr{Uo-- zi`Gy&jii6mmC9}WFaXs-GHNDSs0J5ceO!i7xXQX6HPA|X{xRyl^QeLSjIZJESQm>U z1HW&wZo^jeZ+1~pNADroHy@!gaT+zVFOlq-^QaCkV^jRo8p4S((#F~ob>9e7y9xGu z3MvChs3l#DUcxNrpqXvL=J*ymcmg%UpRqgMK>9S@*$8qlYR`b__sNv03phGS3z&qc3BR79mamRL`r8oZAB z@Ps?e9-~n+9ggjBEb6{oyd9UJ2DlH$;Bg#+Et$nooQfJiDL#fDwIly(D3*g}I1K62 zOhh$27dzr|)Ps9bOK=A7#$QnbjNwOl7oNgFSQo=%xQ0zp8F>JE(;PugUW6m@EUKZHSYvwPqsX6G&4EWv6(-?1RAvU# zi87jCO+sDwW>e8_T!i{!6(f^2WvEoS$bK?Gae;w$!h1L$jqFoXh+6YfDCHd#JTdM1`F_BtVS)(UpN^(>iys1ukf!PDg(z*ug7PowZDwoJU37cMs*`g z*a1WEFb3g=*cVUR>*2goTAEhKB{K@uaXu=8+c2E|&DT^i@e-=TNo)Y^fiw_I6I)yNPee7Gg37>R)OVm7HNdk-vdnj=4202$gFVr!wH;4IDa%2vQ85m} zYSc(?Snpvv&FgR|M+u@tpu4q_|(ybt+r zLFEb;8e#~&Y2=X@fpMsT^+gSADryD`QTLUioZbD@a{rgk#0uCcu5-NGbE5t}*3!x3B49p-J6a5L53_^Qnl}>IdjX2kvqM|oT z<+T82A+99UzajhncU&i0zeR-7`xFsJ3?cqoW^z(YXo*zxy;w|?=!7zXctRChCLw#z zU$jpWiD!wewtxToo5h7a#9%^Y4KawAM+_iTW)u0uHbU?II6~zyLf;6LwE@fm>n^Ll z9oiGMWe1f)&0iZqWdspUXouD(qKNy6fy8}8H-fLOzdXaSF0qZ-7SWpMKs-kz6SZY&Z3R0Lk%U7`A^1F) zb%cs`djb(m%qLzZYD*~<|Ns9-Q^_XU5|0upj}SfmwZK0tuiCn}o0v|#M5GZZgvyHn z%;Q)3??A*+(8FRYMnm)@(%b1g$l9=pdraDQP8UNgx;Y>@JnVDO@!E>phr^Kys z5BUn*D!1IX$d~8t^(}F$e5=dzqmP7k+{|gdZy}d!+ym}A?q0_|%q8w}tKACw!@i=g zdbKYa72l%hV!Wq(P3Jcncwh46b7PHr&{ybI;yxZ)=qq&Gw|Vjq{jGE>9J;J@=y@+q wAEfF34V_2S1D(4y4n5c0JVdw3p`|K!zguD44Qkf6S~nYaqgy_r`-tGb0i1{XMF0Q* delta 3786 zcmYk-32;qU9LMn^lE@yilB7IIBq5>1nvz%(5(Gu;5ls+FEVTyd6Kad5NCZI|dkJHV zbVE@^J5#A9=!_0iHKS9Vj-kwG%$RAvzxQrU&bPCyK^EKA@8?Y_yrPv-%S>D7} zoIk@T?r&TehHempnn4d#hbica85o44Eb~wUEVRzIqpmxO8dwb;$Ft~yQ@ESH&$i6P zFwXPQoBNyfRLHv7hRQ?*YG(V9q?n_q4nD&GJZD*l%E$xDe^A%?bCD(xggUpOGSC6F zltYn^8P373nPpQ6#wBROEvOmRU^l#i^le^Py0H6V&ftB6BgW!Q@{Jp-f+PKz-32+hH2^z*$!NKGeWYqcUij;gT}9>X!%fLh}yHi9w`hvArr zN_i%>#&Jk8O#x~E#i;)5rBpP4ov4oXpfXT}WXYUCCS|Up4eufMG_O$u4WxH<7=gM$ z94eFjP)nPE8qj#uk}O7Dw+-pXZVpr7W6pC>YHuTbn@6Y{zefEqfQ4RwU2!8;Y z&YO;Zq7Bozn9{$gO0UDW#Tewrq@ur`yTQ!FFB~= z03HDuhUz#Hb)$I8UZ@lgL``HEs{d@%-dKn$?ajym6%C+~X=)R_My+{UUSFC?JZbM&qb&SLx zQP(}gj@Zm*4GhN`28O9vhUs`0HGoKFGa1uR{TxJ1>>ARQX=u;-tK+|Eh(Q;w(hobL zQa=*=U><6KRhFl)j`IuXf}8nKcif7~$Ytz}cToNK@bb{_qfkqgi2T&_jkY^CS2hhA z*&0m7EvONGZ(aBYcH!KsgL93OP)jicmD;JO?{l#^mZ9DoyHFXufy&$~?1fRxHW4S= zsVIe|sOS124n&_=o?XmDbyS5t@fOCR2L~=S-7ps?qGtFtDx)_n?_2Fp(D5{(UR(i; zhB+B~G!>;P9oZ+Q82Ok39Nxhnko{@g7@am_Bx;~NIp}veI2`w&2Ji@#+7}p)Askp; zGYGRV4>RzBQ@e3b;2)5NF{loI#(wBa-t^pO;55v~H2e;gLSORD@|q#28RsJ(Q^-M? zIgVPwpHKsTYU%Q}GXudGuK)j7Dq8!&sLeAP)!|I6#O3IPExS55PdN7FJQ~%WgIbz- z$j2Pypc~&pW$-!rV`rW{-6t8f_8Az@{Y?=SrTheHt#6|`^581{APLoB8fxaVke8yV zLJi;xBq`TGHOAOl6^#W)%*?Dzs~azfqCl+&#D%7vclX=QFK1&PQ<9 z3eK0YKI!PqGs#9a9wnXnF@~@FaBsoVm05yYL z)P*Ie4i2L>(RtJx?LG!#Bl@BbqgOv+s7$6HNi_M$_{}gvWjUb?(CjFqwf-ZhGC?!W z*=F9y6;^#7YNRE^Bw{o1f7wH29ia^HRGAz?MFUY8Lrf)#h~b1XqC}u>RuWnt&2$5y&7~4V9Cy^5|A48~*APnWyHTl%wW+BvmaWrW5w& z9IA<-#D0RMcf8qFVLyVc;n-X|QKgcYMSQ3e%2FcFQFHDQrT+s$k8U5UT?{0uh>wX} zVkW^}vYUfcRud|di77R1_>?Yb-?d-QVr9ZWdH)qbu(I)3ZsO!a*Myw?k5}8B+ z;Yz6N;{J}e(`-yu3#APaOU%~^MLRiy(A&|Cs3B$$6N&eT#Y8kQfoNL1ILRXP4ryBE zaPkRplCax293aLLa|xC4M7g8JGmqPd0Yn#KB(Z=!nuH!xm14r5a3MY-VhEKT zgdWusM0ZKK~qk6O>xkKJp%+I{0=t8Q3Zf2m<({pStE4aK&G^{}q~ jO#Q|BOZ8{#&)0ud{%=A^d1dF&+WrZr-D;;LPWAi`)bVI| From 03285d601159cb2fdf5a2fabab68e7c89d808d3f Mon Sep 17 00:00:00 2001 From: dg9vh Date: Sat, 25 Mar 2017 19:45:02 +0000 Subject: [PATCH 10/20] closes https://github.com/dg9vh/MMDVMHost-Dashboard/issues/130 --- scripts/switchnetwork.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/switchnetwork.php b/scripts/switchnetwork.php index a0de2a9..e9ad61e 100644 --- a/scripts/switchnetwork.php +++ b/scripts/switchnetwork.php @@ -56,7 +56,8 @@ checkSetup(); include "../include/sysinfo.php"; if (defined("JSONNETWORK")) { $netname = $_GET['network']; - $network = $networks[$netname]; + $key = recursive_array_search($netname,$networks); + $network = $networks[$key]; echo "
"; echo "INI:".$network['ini']; setDMRNetwork($network['label']); From 50811fb2562325fb808c2c1cb3b245a869bfa1da Mon Sep 17 00:00:00 2001 From: phl0 Date: Mon, 27 Mar 2017 13:53:25 +0200 Subject: [PATCH 11/20] Check if .git dir exists before accessing it --- include/functions.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/functions.php b/include/functions.php index bf905ca..6b363bb 100644 --- a/include/functions.php +++ b/include/functions.php @@ -851,7 +851,11 @@ function decodeAlias($logLine) { 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'; + } } ?> From 4a8110e4290f48782b3782839827f6d31bb625d4 Mon Sep 17 00:00:00 2001 From: CT2JAY Date: Mon, 27 Mar 2017 21:51:24 +0100 Subject: [PATCH 12/20] LH - How many callsigns in cache --- include/lh_ajax.php | 5 ++++- locale/da_DK/LC_MESSAGES/messages.po | 4 ++++ locale/de_DE/LC_MESSAGES/messages.mo | Bin 11674 -> 11717 bytes locale/de_DE/LC_MESSAGES/messages.po | 5 +++++ locale/en_GB/LC_MESSAGES/messages.mo | Bin 379 -> 380 bytes locale/en_GB/LC_MESSAGES/messages.po | 5 +++++ locale/es_ES/LC_MESSAGES/messages.mo | Bin 11904 -> 11937 bytes locale/es_ES/LC_MESSAGES/messages.po | 5 +++++ locale/pl_PL/LC_MESSAGES/messages.po | 5 +++++ locale/ru_RU/LC_MESSAGES/messages.mo | Bin 15289 -> 15335 bytes locale/ru_RU/LC_MESSAGES/messages.po | 5 +++++ locale/sv_SE/LC_MESSAGES/messages.mo | Bin 11669 -> 11699 bytes locale/sv_SE/LC_MESSAGES/messages.po | 7 ++++++- 13 files changed, 39 insertions(+), 2 deletions(-) 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/locale/da_DK/LC_MESSAGES/messages.po b/locale/da_DK/LC_MESSAGES/messages.po index f9a334e..d69b16b 100644 --- a/locale/da_DK/LC_MESSAGES/messages.po +++ b/locale/da_DK/LC_MESSAGES/messages.po @@ -728,3 +728,7 @@ 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/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo index a16565e796252d12239b963942662f95c4ce397d..61dfc706f830388dd8240320501983a4e6d73372 100644 GIT binary patch delta 3795 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 F{|6b_Og{hs diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po index 1a05ed4..c469abf 100644 --- a/locale/de_DE/LC_MESSAGES/messages.po +++ b/locale/de_DE/LC_MESSAGES/messages.po @@ -725,3 +725,8 @@ msgstr "Konfiguration" #: setup.php:209 msgid "Use networks.php instead of configuration below" msgstr "Nutze networks.php statt d. Konfig. unten" + +#: include/lh_ajax.php:6 +msgid "Cached" +msgstr "Zwischengespeichert" + diff --git a/locale/en_GB/LC_MESSAGES/messages.mo b/locale/en_GB/LC_MESSAGES/messages.mo index a71c3e1d31ffbac58f17c8dfcf5db6551f014d1c..13ae36385b92b5063b222bc41cab20ba2e8153da 100644 GIT binary patch delta 66 zcmey(^oMDJ3Zv6R)ogYX1w&&i6Z47F?IqkoeS8%B9DQ9CY+QXEJ$)P;U0i}(gM%l& WGMFsSXv*&F;TRO`8ZtSOQ3(K(HxnoT delta 66 zcmeyv^qXmd3Zvsh)ogZS1w#ufV~dH??L}PNEyFw%Y*NxK%Q75N5{r`cQc@?rGhj{4 Wi+6XLEXQcdT3V8(YcV;BQ3(LMJrsrj diff --git a/locale/en_GB/LC_MESSAGES/messages.po b/locale/en_GB/LC_MESSAGES/messages.po index 5401d87..ebab6ed 100644 --- a/locale/en_GB/LC_MESSAGES/messages.po +++ b/locale/en_GB/LC_MESSAGES/messages.po @@ -725,3 +725,8 @@ 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 1b9a78a8f88757d57accefe44a21ff505117a9d2..d5c8e8ffe153a23b5e1f624b009c1730d547be78 100644 GIT binary patch delta 3756 zcmYk-3rv+|9LMoTLGgfGgvh+r!7CRf@qXc`nPiH132&Kzh^U3)t)nLDtBKb#DKv=G zBvCN28;)tIjhsv7M!GrY)U{Gs%+_))TTNSif9E`B^BKSMdEWP&^FGh}f1dZSDXTKe z`6)VhpP|)~u4H{1W18_+C@-|-5yk}J3XDN7w#S_qjvrzqR-p?|Vp}|i?eGGIVH1Yn z4b=B$bx3i{8PoumFd8pg@1QF3mon7Rb zp{NR^qLwrp9b)G5qC4|qEbc-#9zxw=1E%10WDFC^Mvz@mdnOq>VLEokeAM?gp{`qo zeXtgFgI7^YdLxGVtJ7>x+_yeL-FaKSP4!G9Y5+I(#1W{a%0UgZ)V^PgTDpVCpQ+)c z8=l2@yotJQFn6i%hsRQXZpw7ACz7qHsPhx?In2UAxWS(P8a1&Cs7hQzH@2Wk>|$0r zpM>l)<3TNH25PTOM=i}-$99TQYf@s}i<)UUYBN=$9-CvR3)N#Hp2ca{f?D$tYy?$c zGF7e=Ab;ixFDmUlWDN5NHE;|YKwnJ2LL86V zupYlh4?8ahHHsVNp>AL^s)Bn_6WNcNaJ5g?|4aLU)2IqGpl@wamAHnQ;7!!-et`U$ zaJIfKoM25sU3fTZpt05rRE1}wZX^eFeJ@5bzS&0SNGpCyQ4>hz=St7}7}T0ivBz^! zo2dXba1m;)x1a{xZ7sLw52Kdk1ZoLSqbkybn$R!kXsuf4$j7J)MX}{|;V!5P!r3r&Oxp9BGm5pVhWbo<3`le@Ea!Lzo^g0yIFtDWQf~80S{`oPD8EzEL6#s zp)S1DT8;W%BWhxo@giPF{nS?SVJ%%1`korp_3BaAYeJ24H_q{Q?r}nQe&2rZ5vl?) z-TkHOhAQ0v)Fw?sT`(Ip&}!5j6`>}!6Z>EZYDrJo<1^Ts3X_wOK=GQXof7tQT!_s1if(lNv7 z=#9y!nJ>U0Sb-Yw3cB%6)Gm&tuDW0%a!oS@`3W#y)Kjwu+u}h~iI1R`>POVTzhV&n z?UVI?Oh*;ae+b=?3sssJ3_&*z)7v;5b1@j}QJ?!3HGzxR25+M(*J96yFbhpA4z)-6 zqb4v4U5szW(qTExB-9-*N8MQ|a?|ECYSaCUn$SO}HEl(mRk`-4--Yg|^8-*z=|Meq z)9i5`^5mH{sJ&K(jyBOrI$HC~_5%-4Kef?GJbKt4cinMCw>r)vFc$bJ%NS|hEyHkI02#qWp8x4lH-${K=Ny*M*Vgemj|7oJ+uf_*-9$1?}-?0&x^6-px)X;X8~DACX!FddZP9knM+>R0c`~tN0P{4 z@+R3uCKK(OQW9v|n8o%$n=#PXQog6CzwZQ7J3>dh`(xrFRV2`=108&ygpzXNCTjYr z4zw|J(gO$9qfZ>C(a$F1$!4;gOi^hHNib0>BYJihlTk#iGl?flbwC?Hx{+a|4LMHc zlUGR|SxI`4+2qL<#=$HS{=`X*Z{8rEkXjN)Dv5sS3W(ZFve(z+KOL5k7s&IZ9no*Z zXrlHm*+le{tM)dDBCW}8(ub&hKq6Go&**d~152|aGK2FL=P#%`5%FE5E3MF-mz%fv M{IR-%XJe!O2V|m3vH$=8 delta 3730 zcmYk+36RcZ0LSqM%kHKuYbDzBvaCfUR}>}X&gxh?EeauLL|gQdP_j8Uca&>eIVR1R zni@Guhp91{>CjZus8LN*)O3xR`hMT{F|*I?@BKXg|NGzP{=YAcm^UK%b#6vQpzI>~ zWM=IUzQ^Mi@j)3?FN9h+8XMwRyco;y5?q8ixEix@8)o4itcwRQ6OW+(_YwO1=U6|4 zWH>{m4mbY6OVMw&F*=40Xh%J;G4@9r9Eo=H5ZckScs(b6zYv>ozZ{$6tI?0K0oT7_ z0sV)X48slz(HV3>8@vHCa1iF<(C8R+fMxM|Ir`jobYN9jiLYTzypP`ezBKwEHsyLe z)}{ZjfC{S~mZ2+AfzE6rvM6CY+Q93Wi*H1aqbu@F^e^tX}vV?I4@hT4DjZRRhqDhNIt4Mz?M;@)uU{aRu(cB0P$= z`wRO2eviK}_HYbcxT!`+1Cx^A!rw zE$xN{*bCj7(b36CD(*>HbS^s5`RHL=n-S(&@GvcKDP{MCmFU<;V-<&hfDh@(snqFc6=WF$6Pjg3U|~$bf!nq(|rp03xD!q!@0Zy z+7xZL1=>-&Xg73;Z$c+B0Bye%JsVSTd$I;=K*a&H;^)fuy$!nO-Q#s%^dCyl4#%J! zO^VJ&_x>q#E0&^Lw-#NA-RMBxL6`nm^b{s-=vOK>@Gm;!4354XU5?JI03Fa((H`g? z_d`#83Hm!RD_&QkZ^wt&7QaHD&rGBT(g+<$euDk?ly>BXd)^IQs$#U^G0{cn3@Xuq z?Zx-;0QwUJ_b#gy zCmNfgXQCInLM7;umd5XAqI3SY{E=m~WirHuwKlDjq=h+VTjQovMZKFxv1Eau0D;E|j%Yo+9-~5gA1+?yco^ zazB|%1{1gDda{#jAgSX1dwAS`_uTRr=|f!Vg@o56ReT#NV|@|!C3A=?a0juJlJZn7 zeI~4SBtzr9cF{5%Ns^w-&7?osNV*VTpT|j0(wVRuVKuR=Bjd=^UQlL|F{v7F2y!;V zlf>=mPA-(2sB9w7lLyIIGSK(`B`Qx4%e~}2GTsZyG;%ZHT!xp)4Du|o_$I7O)zTkL zVL`n1j9e(3+0X16o!x~xxvkW0ubq&ewCLZ7~?X4D(9|5&}Za`u-u%d7uC&ImoX diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po index 70f1c90..85e75b9 100644 --- a/locale/es_ES/LC_MESSAGES/messages.po +++ b/locale/es_ES/LC_MESSAGES/messages.po @@ -740,3 +740,8 @@ 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.po b/locale/pl_PL/LC_MESSAGES/messages.po index e7e5000..d43af7b 100644 --- a/locale/pl_PL/LC_MESSAGES/messages.po +++ b/locale/pl_PL/LC_MESSAGES/messages.po @@ -732,3 +732,8 @@ 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/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo index 1169855c7de2c3181efe83e0ff6fc821b631496c..c707f34c95e3dd02219f1783622375c9d34dc7dd 100644 GIT binary patch delta 3797 zcmYk;4Ukn;0SE8{i(e?qhb#gL?g{~xpq3bhh!6-QT4EqjDTbyLnU*Gk`al###4=Jq zF%`s*R6+@p3>#=tr%aco#H_GUlW}J>E3?8z`~BZur_SvE{?5Jcy>rjky|Crd-IvyO z_2_hSQ8vgSa>HJwyw3l0c2MqYETw^W@j$NU0o=kae3D)H8}7$fxi{bBzWfLCz4y33 z5AfxE*qhp^m1dPRFw~(NM==eY%3hpWIhX0vVy3|xc@Wny4gQe1;ZK+w{k%HgQGNa* z`@8-!TiC(PTHL=3Q0eZ%cn;th%ncSWBU;KdxPqN{2Yd4F$}LPspRLaS%zSST)3Nt? zANO&Sj@-z6zA3tYc}%4*w=y?+fmWfs%FIL?GqS(ZES5b?1N-$T#b0TxY++{Pn99k_ z_s(J3ol~7(!py*Y*0Q#1RQ#1Y9Wt^_Y~s^w<}PN0@AGK(vJv#5Ost&A?47yn!==oC z)-k_(f@$}+9LzRmfIWJe|Ey_mpT+@|!zzzsMm~;av7Ex(;7ktWJZ7nGXKwUB_4#&Y z>Ha`}iTs&)b-nV3?Hwqzr}Q{!QC?> zJ=x4b%oIIo&Z62-M&Me8ZmA__s`aH9lUSb}<-AqGo^TT|X zr*V)CkTsvj%)k{qnAb8>zK*?lKdnNkZC6PLo@W|-nd!jmJd$rP4fgY^%+O)Xln$rC zmrt>ov#1Yc5!2ySOuKh6H+qPf*=@{HKSv#_l^0dAHt#TB>}i41&=9&*Ml(}9o%&Md zFgISr{B9*L;ASr2Ks#?cAK+QMz+Ia8EHi+=Ff-ZFj_sW1zq3ku+*H}0`NCjkCXQq} z@G)j4#xWh7#O(4})Mi=0{BC9C9Zb9TG9%tt`8YGvPcr+j{7NM^c!k*{Z*yJ;H#59+ z;0mv;Y^Fub+OK0qvXSY)&zPCn#dPc)roAq9Y-X@Ovt%Dx4(c!aj5gj%!udnFkZ!cZ#@s^qfAHt#MAkAj^_lUnZ)IJ|E2>w zU6{#tnTDo0WTcnTy~`4&;d?lUKVp8jiy3i8CnMO0c|%UAJe$urzmOd{YM^E0iOh^# zJg{b3RF=AshPE*cyuhs8Zn{T#i`i@keyF`;M{|_(6PONO&U|kThw-P(n!m{`&A*wM z?XLIvyf+&-p{9}-%E`=>E@Y-|1CQkk{3yE)ZlA)j%=3N=$8Z}@Wy6s6cBXK+^K0p^ zY<18?d5yE#MdKOZMa+!W7FLy;st?vOkJrP@8|^6?eEA(SQ}5CKD#z-DYMIJUutxi~ z{Fqtuo%C1Q9P+!Sj~FCRVLGsyW~^53Q}I`R=`e}^s!pnuLDqrDZ=fg}>8hnJu zvyEAr!RGY~9M6-uj+wzWTK>}FZI%&_r%PoT2j%&{MkQ!X;ZnMfa%D|x8*=qobjVEof|>evn7z|%OQ*r9%=ect16sk%z$WHB(8hG6!H=@n8kzl9j#p{sY-Vk* zW~OW%v#X!tShg`89cmcyd^UCPJ-+08i@ObRzS{cS?0matGD|xBxKca-Wi1=|G`n-> zappgp=5-hPa&N8nVhi`?2&U(w*^Segj?G~@wwxKjM&^4vncu&~7VcyIvvh~^K#pe@ z&S2U(Z>0IpR4#MD?3c|nfO<*Kv-9n{a=tXk3`zN(%#z$R)-OD=CZQZuzv_A^XVynJZcI(UOvVbD`Y0;^F-d zs%0@#PHv~%U%8k!RCQBT-z^K7=k03gBNs?^+ez~O<*QC^l`LRN7Iul;mJ=l-I=f!W z!=>b*v~lX?7RN8jm2#(~OptHLLo!ZMZjw*R0vRJIUze+7t(+;-B;|85qF(d=smd$r zy8pe^g;DHT)x&yOE*_zJIn^;cte7> zJ=EXH^?!Kt)L$-lcOL0=E!RKvV2KWR<=_< z&ue5@`*y0X!b_nnmEqN;{duW;wmLtIz2pQrvbxsD+vUL(%NtMcH2eH>&)M|H#)fW9 ix9(WJAM#&P0(C?H delta 3753 zcmYk-3y@b;9S86OsPW!iUMr}uD31-5e1MAP14xZf(?!5H5on5LO4yp3e^fwFOmNX! z0?oGz+H>-eOeE@PspW(^(xlXAqp8g}GL6$XN}uoUW$es;|DSX3|Np<|+}}C(zwfj@ z(OP?Rz;3q}?Gf2qmh4{2zxY9KFWRd9rS#xx4&?3Z%MSMAqpagI?8R5ulW$h$wKCW*Kjv3=OErvc@Hzu$ExE$F`s*jnb^C0 zh##^$+Z(#xUsriIhZ(;-pp$`~qUx8Im`ZGA?(DBrz48__z(*Xwk1KmSNJaLkoXC9c zWahdp)$w^u1?DkJx|B63E4<{+)^RX@$tFI>+~K=Cm^*3Aar=6@a$n}o52Wgq!J7{iKh8|-X$PV_*^Z!|A$D6itK2Xn8VozoQdoz_d zkeT2i%r2isUoG>Q?=7xe&QxL*Gf;cweN3f)&fLhOtT%pnQ74<^4PM!;lz%f5xWLa= zHq!!T?N>5)(#}laVWu+AF%#X+RPIA&se0MD`P^_SQklg4ID?sZD{Glio6f;pTlpe$ z!Oxf)$g=@&Z%Yx2pHwV-Lqe-A#T+ z_F*d8QqxK47V|J};3516Q^G-GyPoq4IoWX=PvNV~g+?`(GLdJ}U%Azbua?I-kK38b zOf^U<+EO`>IbU0(lihd&^NZC^H(fR|rFxn6Q|URbYocR$q~p_QpO%%(ns?A&+2keP zdxz6GV*jpzE@mor75$aj?9I*W$v^TaZmrJOd8D#5!{}5wl^OUtrh<2~&iLhTI^W?3%z)?E0NDc3TBPk zIfa{;neMDS((MfH=5yTc{LMydc6_n*x!v&^&!jai<0h#N7qLIrvVk4Uo_UhP`1&OE zAEL9vi9OicXqkBf>p6~@*ip>H<}i0~J@dH^=KEVXlG~W2`-B78Xg&IIf95)qm`a{Y z#V$7yefpho!PM2ik1;Mml+z)6Nk)t+QoU z%#|O=U7csT9@d5W56jf*+$v6ytK>LIyIii5yCo0$Oi4RS@`I4Jx{Gp6r^bJvI+0(B z?0{YEKAn}4RZlxv>LlB7HyI>fk;!tb93*~XJKOiYc9&aaLFbvzUw))}fb1@cw!Z(2dq3`9|LguEw(b2t{489Z diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po index 80e0201..f93c50a 100644 --- a/locale/ru_RU/LC_MESSAGES/messages.po +++ b/locale/ru_RU/LC_MESSAGES/messages.po @@ -704,3 +704,8 @@ 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 b0ce1b10e64ac84ba79feef2da99c0ae32f0d18d..387bca89a6074da156d3ff92b573c8e1e931f9b1 100644 GIT binary patch delta 3753 zcmYkA9sZKtC; zrYI_tRb*~6#4cILmY5jgk4Y0-Vp~`wCd>Byz2|AtC;gqz^S=Rvrq z(opJ27gFSJOe5Y8=7F*z)R>mI5+kqx+u$|~!H+QvYcUAVU;uuFfp{HT<4tUZcTw;E z6?vay{-n~D8~>r+*p|C5VFzm*YAoYX9Ztm#I1km}d#H{!qB{D(UYFbFtFasRYq1Aj zvo>No`ZulUy%$e(M0Jpinn^0E!5QemY;2DUt?N+(-EFUrpuA^4sHhS?9YKemwmF~wP z=gcIdwsbP;tW8I4O`&5eC8#~wZLL6!vm@;rPQmmrI4N>BrEs;H>JTGRkeq8j=fwE}05RWsirlQZ|xi%*a~O$4oKpfRWh z2cbF`g<9ft)D~x>29%H5lC8+=9CMV48aj{snV)#j(*BP0VP2p*j^F_3jnTLaQ?L}z z;#ExM?Od<8#!WcjN0z#-hFl zhFMck4bQaCXIdAd2DS#Z1rBNgJ5XCwi+bOe=&*X`G8Op?YGhAQ9eFtV?jEBWj6of) zfvCMsLUk|^-GLx)HJPXh6rr~85US&I*avT*+JD-e{nwKDd3_DHMxEA3)KYgw9liwA z08>#*pNHD2O{jrw!4tRx^;J8J&!7iKpawb`>C>d4Rx%&e&)Oc2Z{&`>QHq*TnROrP zb6kfyOy^NEx?ycZb@VT)Bfp-$>rmvDi9ii>2=Zr!^PmaL#ok!xP|>MAfLgi>n22|g z<6t6t`5cH*Tu(v%Od$__u^QFUHPj3nF$VoFHL!JH_)C!;RT|4HgeZd`6 z1CMbihSR(Dd=hHOb5R20Xypx)n}QMrc~HRA--jMFd>XJaeO(KY>> zB~;YGYShy2N7^zMkYivTS_7heGl)j*=@8V4j7H6Tn!TTcI#bI~?UkWEe)XuW_!{+1 z`!nkI$NWJ>`m=F*K^JR0YJd~448Osfm>$ay3-;{q8(=H8_2OkD?XhQ0SL7TS6~YRNw&v&lBnR6e2dK2e9!B%7${ zP^(NMnPekLBbs=UmbZ>nlcu6Q(|OPesH`R9h`tX>Ndi&Pk{@?#{HqrykPSpDkWN&x z$WFKB+gerQi4L-g!%Dkl9gp)#OLCA*BnQY4qQkPDB$L4;j#LtredKMjMHiF;lIPa= zK|_v=dxrFp9d7T7v7|;%?V^%P7LrNiGg3rU=8(DM9bHgXlGh05&m1PJ$#(Jv(YYxn zO+{Z)CH6vRq^WQO+_N;my}|k)p|X|iCqbl^G?imb75s?kbXO5CQAzaSK91%wwb`|* zN1I)br#_FQkWFL-nWFt)Mm$7iFVSap5gAETI*}-{R2P(iq$?Rl{K-kOfV@R=$STr@ zWRT{iH5ao;NVA*j-z+Adl6umE93s=n5~4DbRJb+%yM?>S81gC!B+JPtqEbeRiN3N` zHj}o*kL)1*h{_%kss%kkr6(Cwo*A0%$yt<_+i)s$PguaX?3_i}xeX(`%?kS;(mg?r delta 3730 zcmYk;d63R^0LSq!ty{L%YB%SuWvy#-Y_1%UMUIUe#b((kIxM0?(L-9Iv=VYAw^l=w zrb9I<88g+8Y0T89%otsNG~LvsruX~VubKVM^Lbw1-|u<$d;cB|6|XB!e3O>4E>QN9 z=45`Y5WdAv>+?pL+9-r8uoN5PUDyy8;FY)xQ*kZU!(CVx4`2g)6YJnn^zS}FzyAeZ z6+$BXK&3V}{>E$2Pc;J_Lq6J3Z_L1>)MOZTkc-Zs0Bx{8rr>Z)$6KP)(E%=q*Q?R*?M4SyiTm(1tck_+=I15RY1owO znb?5-!%`}&dZ<8GVjViOEy$vT-Dm@^V;a64{S;l1v(by__fq+i6G%s|v(Oc2i*Dsm zCmOT<-uN=!IFHW!XJqxlUuXyQXsr$Apj$Nz?Pvn}`7CtnmLsq59B(af59Z-V zXuCh5e}4g)OGs(L`g
1$i`gYMW0hhPET9q(^O2X+8mkt3Ler_d$-E#6OObeyk{ zi*9KT%)x%>)|5tPC8)S33!;nAkuE_G(@ONQS%WsT4Ljf-9D}FOJyRoT!BhV?k&0!N6?vmgr4p*$SYjn&4$x> z1hgsIaBH-qj?o_I5)VWtG7N3M1U(zGadM&tYe2;gzh;_k@Ep45b@=(xbo6&1JK81Q z9}pdh4rC&_^rh&)XQNBK3?0ZO^l8~1eFqbc=rk2O_zwNUKhXvo@(6gS($PI`iFVKd zZLk;e)i3}ZcnP|7OVN%uV_Q6kwtpI3sq<*NKeb~2J*5}9;S&Fg9=gn|s*!d^mwYI? zMbprM&A>{WjsC;QVA4d01w;eF_-UyQEo`gpx7etsDF`$RZNr6*tb z13jIc7==qd1RY@sI*>V-hZXVuTj=5a7;EDhY=`I2t*g(4Gj4%bVEbribf8_aHvNY_ zR6HaDF$If|Ho{mOjgO)Ye1d-OBs$Qq(2g%)^6;WF&SaF%I3Mk(FV?}rcs&Yje*(6m z|FDP(e;c+U+aHcae?Vu@pncVzW}qw58l8DTykCeOs?q3HmZ6W|v*=drKz>BSo9Nbk z7X2QR|Nj3+#V}_Ny*+L44kKd!DFX>KL#juuGHj=x^lU`8flj+GC z|Ib5?Qh1zrAbXL^WgwNU Date: Tue, 28 Mar 2017 08:28:39 +0000 Subject: [PATCH 13/20] added switch reflector button inspired by OE7JKT. Be sure to add /bin/sed into sudoers! Not finished completely, actually loads only DMRplus-Reflector-list. --- credits.php | 1 + include/functions.php | 26 ++++++++++- index.php | 18 ++++++++ scripts/switchreflector.php | 92 +++++++++++++++++++++++++++++++++++++ setup.php | 4 ++ 5 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 scripts/switchreflector.php 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 bf905ca..a5d8e12 100644 --- a/include/functions.php +++ b/include/functions.php @@ -849,9 +849,33 @@ function decodeAlias($logLine) { return $tok1.$tok2.$tok3.$tok4.$tok5.$tok6.$tok7; } - function getGitVersion(){ exec("git rev-parse HEAD", $output); return 'GitID #'.substr($output[0],0,7).''; } + +function getDMRReflectors($network) { + $refls = array(); + switch ($network) { + case "DMRPLUS": + $refls = getDMRReflectorsFromURL("http://ham-dmr.de/reflector.db"); + break; + case "BRANDMEISTER": + $refls = getDMRReflectorsFromURL("http://185.79.71.94/reflector.db"); + break; + + } + return $refls; + +} + +function getDMRReflectorsFromURL($url) { + $data = file_get_contents($url); + $rows = explode("\n",$data); + $refls = array(); + foreach($rows as $row) { + $refls[] = str_getcsv($row,"@",''); + } + return $refls; +} ?> diff --git a/index.php b/index.php index 987e979..ab21365 100644 --- a/index.php +++ b/index.php @@ -133,6 +133,24 @@ if (defined("ENABLENETWORKSWITCHING")) { ?> + +
    +
    + + + +
    + + + + + + + + + + + + + + + <?php echo getCallsign($mmdvmconfigs) ?> - MMDVM-Dashboard by DG9VH + + + +
    +

    MMDVM-Dashboard by DG9VH for :

    +

    MMDVMHost by G4KLX Version:

    + + + +
    + + + +
    + +'; + } 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 5cb6689..6e0381f 100644 --- a/setup.php +++ b/setup.php @@ -261,6 +261,10 @@ get_tz_options(constant("TIMEZONE"), "Timezone", '');
    >
    +
    + +
    >
    +
    " name="SWITCHNETWORKUSER" class="form-control" placeholder="username" aria-describedby="SWITCHNETWORKUSER"> From ad39b44c0c9e2645b791b4db2081122a055c38a6 Mon Sep 17 00:00:00 2001 From: dg9vh Date: Tue, 28 Mar 2017 08:29:35 +0000 Subject: [PATCH 14/20] Merge branch 'master' of https://github.com/dg9vh/MMDVMHost-Dashboard # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit. --- include/functions.php | 8 ++++++-- include/lh_ajax.php | 5 ++++- locale/da_DK/LC_MESSAGES/messages.po | 4 ++++ locale/de_DE/LC_MESSAGES/messages.mo | Bin 11674 -> 11717 bytes locale/de_DE/LC_MESSAGES/messages.po | 5 +++++ locale/en_GB/LC_MESSAGES/messages.mo | Bin 379 -> 380 bytes locale/en_GB/LC_MESSAGES/messages.po | 5 +++++ locale/es_ES/LC_MESSAGES/messages.mo | Bin 11904 -> 11937 bytes locale/es_ES/LC_MESSAGES/messages.po | 5 +++++ locale/pl_PL/LC_MESSAGES/messages.po | 5 +++++ locale/ru_RU/LC_MESSAGES/messages.mo | Bin 15289 -> 15335 bytes locale/ru_RU/LC_MESSAGES/messages.po | 5 +++++ locale/sv_SE/LC_MESSAGES/messages.mo | Bin 11669 -> 11699 bytes locale/sv_SE/LC_MESSAGES/messages.po | 7 ++++++- 14 files changed, 45 insertions(+), 4 deletions(-) diff --git a/include/functions.php b/include/functions.php index a5d8e12..bdd2bef 100644 --- a/include/functions.php +++ b/include/functions.php @@ -850,8 +850,12 @@ function decodeAlias($logLine) { } 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($network) { 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/locale/da_DK/LC_MESSAGES/messages.po b/locale/da_DK/LC_MESSAGES/messages.po index f9a334e..d69b16b 100644 --- a/locale/da_DK/LC_MESSAGES/messages.po +++ b/locale/da_DK/LC_MESSAGES/messages.po @@ -728,3 +728,7 @@ 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/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo index a16565e796252d12239b963942662f95c4ce397d..61dfc706f830388dd8240320501983a4e6d73372 100644 GIT binary patch delta 3795 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 F{|6b_Og{hs diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po index 1a05ed4..c469abf 100644 --- a/locale/de_DE/LC_MESSAGES/messages.po +++ b/locale/de_DE/LC_MESSAGES/messages.po @@ -725,3 +725,8 @@ msgstr "Konfiguration" #: setup.php:209 msgid "Use networks.php instead of configuration below" msgstr "Nutze networks.php statt d. Konfig. unten" + +#: include/lh_ajax.php:6 +msgid "Cached" +msgstr "Zwischengespeichert" + diff --git a/locale/en_GB/LC_MESSAGES/messages.mo b/locale/en_GB/LC_MESSAGES/messages.mo index a71c3e1d31ffbac58f17c8dfcf5db6551f014d1c..13ae36385b92b5063b222bc41cab20ba2e8153da 100644 GIT binary patch delta 66 zcmey(^oMDJ3Zv6R)ogYX1w&&i6Z47F?IqkoeS8%B9DQ9CY+QXEJ$)P;U0i}(gM%l& WGMFsSXv*&F;TRO`8ZtSOQ3(K(HxnoT delta 66 zcmeyv^qXmd3Zvsh)ogZS1w#ufV~dH??L}PNEyFw%Y*NxK%Q75N5{r`cQc@?rGhj{4 Wi+6XLEXQcdT3V8(YcV;BQ3(LMJrsrj diff --git a/locale/en_GB/LC_MESSAGES/messages.po b/locale/en_GB/LC_MESSAGES/messages.po index 5401d87..ebab6ed 100644 --- a/locale/en_GB/LC_MESSAGES/messages.po +++ b/locale/en_GB/LC_MESSAGES/messages.po @@ -725,3 +725,8 @@ 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 1b9a78a8f88757d57accefe44a21ff505117a9d2..d5c8e8ffe153a23b5e1f624b009c1730d547be78 100644 GIT binary patch delta 3756 zcmYk-3rv+|9LMoTLGgfGgvh+r!7CRf@qXc`nPiH132&Kzh^U3)t)nLDtBKb#DKv=G zBvCN28;)tIjhsv7M!GrY)U{Gs%+_))TTNSif9E`B^BKSMdEWP&^FGh}f1dZSDXTKe z`6)VhpP|)~u4H{1W18_+C@-|-5yk}J3XDN7w#S_qjvrzqR-p?|Vp}|i?eGGIVH1Yn z4b=B$bx3i{8PoumFd8pg@1QF3mon7Rb zp{NR^qLwrp9b)G5qC4|qEbc-#9zxw=1E%10WDFC^Mvz@mdnOq>VLEokeAM?gp{`qo zeXtgFgI7^YdLxGVtJ7>x+_yeL-FaKSP4!G9Y5+I(#1W{a%0UgZ)V^PgTDpVCpQ+)c z8=l2@yotJQFn6i%hsRQXZpw7ACz7qHsPhx?In2UAxWS(P8a1&Cs7hQzH@2Wk>|$0r zpM>l)<3TNH25PTOM=i}-$99TQYf@s}i<)UUYBN=$9-CvR3)N#Hp2ca{f?D$tYy?$c zGF7e=Ab;ixFDmUlWDN5NHE;|YKwnJ2LL86V zupYlh4?8ahHHsVNp>AL^s)Bn_6WNcNaJ5g?|4aLU)2IqGpl@wamAHnQ;7!!-et`U$ zaJIfKoM25sU3fTZpt05rRE1}wZX^eFeJ@5bzS&0SNGpCyQ4>hz=St7}7}T0ivBz^! zo2dXba1m;)x1a{xZ7sLw52Kdk1ZoLSqbkybn$R!kXsuf4$j7J)MX}{|;V!5P!r3r&Oxp9BGm5pVhWbo<3`le@Ea!Lzo^g0yIFtDWQf~80S{`oPD8EzEL6#s zp)S1DT8;W%BWhxo@giPF{nS?SVJ%%1`korp_3BaAYeJ24H_q{Q?r}nQe&2rZ5vl?) z-TkHOhAQ0v)Fw?sT`(Ip&}!5j6`>}!6Z>EZYDrJo<1^Ts3X_wOK=GQXof7tQT!_s1if(lNv7 z=#9y!nJ>U0Sb-Yw3cB%6)Gm&tuDW0%a!oS@`3W#y)Kjwu+u}h~iI1R`>POVTzhV&n z?UVI?Oh*;ae+b=?3sssJ3_&*z)7v;5b1@j}QJ?!3HGzxR25+M(*J96yFbhpA4z)-6 zqb4v4U5szW(qTExB-9-*N8MQ|a?|ECYSaCUn$SO}HEl(mRk`-4--Yg|^8-*z=|Meq z)9i5`^5mH{sJ&K(jyBOrI$HC~_5%-4Kef?GJbKt4cinMCw>r)vFc$bJ%NS|hEyHkI02#qWp8x4lH-${K=Ny*M*Vgemj|7oJ+uf_*-9$1?}-?0&x^6-px)X;X8~DACX!FddZP9knM+>R0c`~tN0P{4 z@+R3uCKK(OQW9v|n8o%$n=#PXQog6CzwZQ7J3>dh`(xrFRV2`=108&ygpzXNCTjYr z4zw|J(gO$9qfZ>C(a$F1$!4;gOi^hHNib0>BYJihlTk#iGl?flbwC?Hx{+a|4LMHc zlUGR|SxI`4+2qL<#=$HS{=`X*Z{8rEkXjN)Dv5sS3W(ZFve(z+KOL5k7s&IZ9no*Z zXrlHm*+le{tM)dDBCW}8(ub&hKq6Go&**d~152|aGK2FL=P#%`5%FE5E3MF-mz%fv M{IR-%XJe!O2V|m3vH$=8 delta 3730 zcmYk+36RcZ0LSqM%kHKuYbDzBvaCfUR}>}X&gxh?EeauLL|gQdP_j8Uca&>eIVR1R zni@Guhp91{>CjZus8LN*)O3xR`hMT{F|*I?@BKXg|NGzP{=YAcm^UK%b#6vQpzI>~ zWM=IUzQ^Mi@j)3?FN9h+8XMwRyco;y5?q8ixEix@8)o4itcwRQ6OW+(_YwO1=U6|4 zWH>{m4mbY6OVMw&F*=40Xh%J;G4@9r9Eo=H5ZckScs(b6zYv>ozZ{$6tI?0K0oT7_ z0sV)X48slz(HV3>8@vHCa1iF<(C8R+fMxM|Ir`jobYN9jiLYTzypP`ezBKwEHsyLe z)}{ZjfC{S~mZ2+AfzE6rvM6CY+Q93Wi*H1aqbu@F^e^tX}vV?I4@hT4DjZRRhqDhNIt4Mz?M;@)uU{aRu(cB0P$= z`wRO2eviK}_HYbcxT!`+1Cx^A!rw zE$xN{*bCj7(b36CD(*>HbS^s5`RHL=n-S(&@GvcKDP{MCmFU<;V-<&hfDh@(snqFc6=WF$6Pjg3U|~$bf!nq(|rp03xD!q!@0Zy z+7xZL1=>-&Xg73;Z$c+B0Bye%JsVSTd$I;=K*a&H;^)fuy$!nO-Q#s%^dCyl4#%J! zO^VJ&_x>q#E0&^Lw-#NA-RMBxL6`nm^b{s-=vOK>@Gm;!4354XU5?JI03Fa((H`g? z_d`#83Hm!RD_&QkZ^wt&7QaHD&rGBT(g+<$euDk?ly>BXd)^IQs$#U^G0{cn3@Xuq z?Zx-;0QwUJ_b#gy zCmNfgXQCInLM7;umd5XAqI3SY{E=m~WirHuwKlDjq=h+VTjQovMZKFxv1Eau0D;E|j%Yo+9-~5gA1+?yco^ zazB|%1{1gDda{#jAgSX1dwAS`_uTRr=|f!Vg@o56ReT#NV|@|!C3A=?a0juJlJZn7 zeI~4SBtzr9cF{5%Ns^w-&7?osNV*VTpT|j0(wVRuVKuR=Bjd=^UQlL|F{v7F2y!;V zlf>=mPA-(2sB9w7lLyIIGSK(`B`Qx4%e~}2GTsZyG;%ZHT!xp)4Du|o_$I7O)zTkL zVL`n1j9e(3+0X16o!x~xxvkW0ubq&ewCLZ7~?X4D(9|5&}Za`u-u%d7uC&ImoX diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po index 70f1c90..85e75b9 100644 --- a/locale/es_ES/LC_MESSAGES/messages.po +++ b/locale/es_ES/LC_MESSAGES/messages.po @@ -740,3 +740,8 @@ 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.po b/locale/pl_PL/LC_MESSAGES/messages.po index e7e5000..d43af7b 100644 --- a/locale/pl_PL/LC_MESSAGES/messages.po +++ b/locale/pl_PL/LC_MESSAGES/messages.po @@ -732,3 +732,8 @@ 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/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo index 1169855c7de2c3181efe83e0ff6fc821b631496c..c707f34c95e3dd02219f1783622375c9d34dc7dd 100644 GIT binary patch delta 3797 zcmYk;4Ukn;0SE8{i(e?qhb#gL?g{~xpq3bhh!6-QT4EqjDTbyLnU*Gk`al###4=Jq zF%`s*R6+@p3>#=tr%aco#H_GUlW}J>E3?8z`~BZur_SvE{?5Jcy>rjky|Crd-IvyO z_2_hSQ8vgSa>HJwyw3l0c2MqYETw^W@j$NU0o=kae3D)H8}7$fxi{bBzWfLCz4y33 z5AfxE*qhp^m1dPRFw~(NM==eY%3hpWIhX0vVy3|xc@Wny4gQe1;ZK+w{k%HgQGNa* z`@8-!TiC(PTHL=3Q0eZ%cn;th%ncSWBU;KdxPqN{2Yd4F$}LPspRLaS%zSST)3Nt? zANO&Sj@-z6zA3tYc}%4*w=y?+fmWfs%FIL?GqS(ZES5b?1N-$T#b0TxY++{Pn99k_ z_s(J3ol~7(!py*Y*0Q#1RQ#1Y9Wt^_Y~s^w<}PN0@AGK(vJv#5Ost&A?47yn!==oC z)-k_(f@$}+9LzRmfIWJe|Ey_mpT+@|!zzzsMm~;av7Ex(;7ktWJZ7nGXKwUB_4#&Y z>Ha`}iTs&)b-nV3?Hwqzr}Q{!QC?> zJ=x4b%oIIo&Z62-M&Me8ZmA__s`aH9lUSb}<-AqGo^TT|X zr*V)CkTsvj%)k{qnAb8>zK*?lKdnNkZC6PLo@W|-nd!jmJd$rP4fgY^%+O)Xln$rC zmrt>ov#1Yc5!2ySOuKh6H+qPf*=@{HKSv#_l^0dAHt#TB>}i41&=9&*Ml(}9o%&Md zFgISr{B9*L;ASr2Ks#?cAK+QMz+Ia8EHi+=Ff-ZFj_sW1zq3ku+*H}0`NCjkCXQq} z@G)j4#xWh7#O(4})Mi=0{BC9C9Zb9TG9%tt`8YGvPcr+j{7NM^c!k*{Z*yJ;H#59+ z;0mv;Y^Fub+OK0qvXSY)&zPCn#dPc)roAq9Y-X@Ovt%Dx4(c!aj5gj%!udnFkZ!cZ#@s^qfAHt#MAkAj^_lUnZ)IJ|E2>w zU6{#tnTDo0WTcnTy~`4&;d?lUKVp8jiy3i8CnMO0c|%UAJe$urzmOd{YM^E0iOh^# zJg{b3RF=AshPE*cyuhs8Zn{T#i`i@keyF`;M{|_(6PONO&U|kThw-P(n!m{`&A*wM z?XLIvyf+&-p{9}-%E`=>E@Y-|1CQkk{3yE)ZlA)j%=3N=$8Z}@Wy6s6cBXK+^K0p^ zY<18?d5yE#MdKOZMa+!W7FLy;st?vOkJrP@8|^6?eEA(SQ}5CKD#z-DYMIJUutxi~ z{Fqtuo%C1Q9P+!Sj~FCRVLGsyW~^53Q}I`R=`e}^s!pnuLDqrDZ=fg}>8hnJu zvyEAr!RGY~9M6-uj+wzWTK>}FZI%&_r%PoT2j%&{MkQ!X;ZnMfa%D|x8*=qobjVEof|>evn7z|%OQ*r9%=ect16sk%z$WHB(8hG6!H=@n8kzl9j#p{sY-Vk* zW~OW%v#X!tShg`89cmcyd^UCPJ-+08i@ObRzS{cS?0matGD|xBxKca-Wi1=|G`n-> zappgp=5-hPa&N8nVhi`?2&U(w*^Segj?G~@wwxKjM&^4vncu&~7VcyIvvh~^K#pe@ z&S2U(Z>0IpR4#MD?3c|nfO<*Kv-9n{a=tXk3`zN(%#z$R)-OD=CZQZuzv_A^XVynJZcI(UOvVbD`Y0;^F-d zs%0@#PHv~%U%8k!RCQBT-z^K7=k03gBNs?^+ez~O<*QC^l`LRN7Iul;mJ=l-I=f!W z!=>b*v~lX?7RN8jm2#(~OptHLLo!ZMZjw*R0vRJIUze+7t(+;-B;|85qF(d=smd$r zy8pe^g;DHT)x&yOE*_zJIn^;cte7> zJ=EXH^?!Kt)L$-lcOL0=E!RKvV2KWR<=_< z&ue5@`*y0X!b_nnmEqN;{duW;wmLtIz2pQrvbxsD+vUL(%NtMcH2eH>&)M|H#)fW9 ix9(WJAM#&P0(C?H delta 3753 zcmYk-3y@b;9S86OsPW!iUMr}uD31-5e1MAP14xZf(?!5H5on5LO4yp3e^fwFOmNX! z0?oGz+H>-eOeE@PspW(^(xlXAqp8g}GL6$XN}uoUW$es;|DSX3|Np<|+}}C(zwfj@ z(OP?Rz;3q}?Gf2qmh4{2zxY9KFWRd9rS#xx4&?3Z%MSMAqpagI?8R5ulW$h$wKCW*Kjv3=OErvc@Hzu$ExE$F`s*jnb^C0 zh##^$+Z(#xUsriIhZ(;-pp$`~qUx8Im`ZGA?(DBrz48__z(*Xwk1KmSNJaLkoXC9c zWahdp)$w^u1?DkJx|B63E4<{+)^RX@$tFI>+~K=Cm^*3Aar=6@a$n}o52Wgq!J7{iKh8|-X$PV_*^Z!|A$D6itK2Xn8VozoQdoz_d zkeT2i%r2isUoG>Q?=7xe&QxL*Gf;cweN3f)&fLhOtT%pnQ74<^4PM!;lz%f5xWLa= zHq!!T?N>5)(#}laVWu+AF%#X+RPIA&se0MD`P^_SQklg4ID?sZD{Glio6f;pTlpe$ z!Oxf)$g=@&Z%Yx2pHwV-Lqe-A#T+ z_F*d8QqxK47V|J};3516Q^G-GyPoq4IoWX=PvNV~g+?`(GLdJ}U%Azbua?I-kK38b zOf^U<+EO`>IbU0(lihd&^NZC^H(fR|rFxn6Q|URbYocR$q~p_QpO%%(ns?A&+2keP zdxz6GV*jpzE@mor75$aj?9I*W$v^TaZmrJOd8D#5!{}5wl^OUtrh<2~&iLhTI^W?3%z)?E0NDc3TBPk zIfa{;neMDS((MfH=5yTc{LMydc6_n*x!v&^&!jai<0h#N7qLIrvVk4Uo_UhP`1&OE zAEL9vi9OicXqkBf>p6~@*ip>H<}i0~J@dH^=KEVXlG~W2`-B78Xg&IIf95)qm`a{Y z#V$7yefpho!PM2ik1;Mml+z)6Nk)t+QoU z%#|O=U7csT9@d5W56jf*+$v6ytK>LIyIii5yCo0$Oi4RS@`I4Jx{Gp6r^bJvI+0(B z?0{YEKAn}4RZlxv>LlB7HyI>fk;!tb93*~XJKOiYc9&aaLFbvzUw))}fb1@cw!Z(2dq3`9|LguEw(b2t{489Z diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po index 80e0201..f93c50a 100644 --- a/locale/ru_RU/LC_MESSAGES/messages.po +++ b/locale/ru_RU/LC_MESSAGES/messages.po @@ -704,3 +704,8 @@ 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 b0ce1b10e64ac84ba79feef2da99c0ae32f0d18d..387bca89a6074da156d3ff92b573c8e1e931f9b1 100644 GIT binary patch delta 3753 zcmYkA9sZKtC; zrYI_tRb*~6#4cILmY5jgk4Y0-Vp~`wCd>Byz2|AtC;gqz^S=Rvrq z(opJ27gFSJOe5Y8=7F*z)R>mI5+kqx+u$|~!H+QvYcUAVU;uuFfp{HT<4tUZcTw;E z6?vay{-n~D8~>r+*p|C5VFzm*YAoYX9Ztm#I1km}d#H{!qB{D(UYFbFtFasRYq1Aj zvo>No`ZulUy%$e(M0Jpinn^0E!5QemY;2DUt?N+(-EFUrpuA^4sHhS?9YKemwmF~wP z=gcIdwsbP;tW8I4O`&5eC8#~wZLL6!vm@;rPQmmrI4N>BrEs;H>JTGRkeq8j=fwE}05RWsirlQZ|xi%*a~O$4oKpfRWh z2cbF`g<9ft)D~x>29%H5lC8+=9CMV48aj{snV)#j(*BP0VP2p*j^F_3jnTLaQ?L}z z;#ExM?Od<8#!WcjN0z#-hFl zhFMck4bQaCXIdAd2DS#Z1rBNgJ5XCwi+bOe=&*X`G8Op?YGhAQ9eFtV?jEBWj6of) zfvCMsLUk|^-GLx)HJPXh6rr~85US&I*avT*+JD-e{nwKDd3_DHMxEA3)KYgw9liwA z08>#*pNHD2O{jrw!4tRx^;J8J&!7iKpawb`>C>d4Rx%&e&)Oc2Z{&`>QHq*TnROrP zb6kfyOy^NEx?ycZb@VT)Bfp-$>rmvDi9ii>2=Zr!^PmaL#ok!xP|>MAfLgi>n22|g z<6t6t`5cH*Tu(v%Od$__u^QFUHPj3nF$VoFHL!JH_)C!;RT|4HgeZd`6 z1CMbihSR(Dd=hHOb5R20Xypx)n}QMrc~HRA--jMFd>XJaeO(KY>> zB~;YGYShy2N7^zMkYivTS_7heGl)j*=@8V4j7H6Tn!TTcI#bI~?UkWEe)XuW_!{+1 z`!nkI$NWJ>`m=F*K^JR0YJd~448Osfm>$ay3-;{q8(=H8_2OkD?XhQ0SL7TS6~YRNw&v&lBnR6e2dK2e9!B%7${ zP^(NMnPekLBbs=UmbZ>nlcu6Q(|OPesH`R9h`tX>Ndi&Pk{@?#{HqrykPSpDkWN&x z$WFKB+gerQi4L-g!%Dkl9gp)#OLCA*BnQY4qQkPDB$L4;j#LtredKMjMHiF;lIPa= zK|_v=dxrFp9d7T7v7|;%?V^%P7LrNiGg3rU=8(DM9bHgXlGh05&m1PJ$#(Jv(YYxn zO+{Z)CH6vRq^WQO+_N;my}|k)p|X|iCqbl^G?imb75s?kbXO5CQAzaSK91%wwb`|* zN1I)br#_FQkWFL-nWFt)Mm$7iFVSap5gAETI*}-{R2P(iq$?Rl{K-kOfV@R=$STr@ zWRT{iH5ao;NVA*j-z+Adl6umE93s=n5~4DbRJb+%yM?>S81gC!B+JPtqEbeRiN3N` zHj}o*kL)1*h{_%kss%kkr6(Cwo*A0%$yt<_+i)s$PguaX?3_i}xeX(`%?kS;(mg?r delta 3730 zcmYk;d63R^0LSq!ty{L%YB%SuWvy#-Y_1%UMUIUe#b((kIxM0?(L-9Iv=VYAw^l=w zrb9I<88g+8Y0T89%otsNG~LvsruX~VubKVM^Lbw1-|u<$d;cB|6|XB!e3O>4E>QN9 z=45`Y5WdAv>+?pL+9-r8uoN5PUDyy8;FY)xQ*kZU!(CVx4`2g)6YJnn^zS}FzyAeZ z6+$BXK&3V}{>E$2Pc;J_Lq6J3Z_L1>)MOZTkc-Zs0Bx{8rr>Z)$6KP)(E%=q*Q?R*?M4SyiTm(1tck_+=I15RY1owO znb?5-!%`}&dZ<8GVjViOEy$vT-Dm@^V;a64{S;l1v(by__fq+i6G%s|v(Oc2i*Dsm zCmOT<-uN=!IFHW!XJqxlUuXyQXsr$Apj$Nz?Pvn}`7CtnmLsq59B(af59Z-V zXuCh5e}4g)OGs(L`g
    1$i`gYMW0hhPET9q(^O2X+8mkt3Ler_d$-E#6OObeyk{ zi*9KT%)x%>)|5tPC8)S33!;nAkuE_G(@ONQS%WsT4Ljf-9D}FOJyRoT!BhV?k&0!N6?vmgr4p*$SYjn&4$x> z1hgsIaBH-qj?o_I5)VWtG7N3M1U(zGadM&tYe2;gzh;_k@Ep45b@=(xbo6&1JK81Q z9}pdh4rC&_^rh&)XQNBK3?0ZO^l8~1eFqbc=rk2O_zwNUKhXvo@(6gS($PI`iFVKd zZLk;e)i3}ZcnP|7OVN%uV_Q6kwtpI3sq<*NKeb~2J*5}9;S&Fg9=gn|s*!d^mwYI? zMbprM&A>{WjsC;QVA4d01w;eF_-UyQEo`gpx7etsDF`$RZNr6*tb z13jIc7==qd1RY@sI*>V-hZXVuTj=5a7;EDhY=`I2t*g(4Gj4%bVEbribf8_aHvNY_ zR6HaDF$If|Ho{mOjgO)Ye1d-OBs$Qq(2g%)^6;WF&SaF%I3Mk(FV?}rcs&Yje*(6m z|FDP(e;c+U+aHcae?Vu@pncVzW}qw58l8DTykCeOs?q3HmZ6W|v*=drKz>BSo9Nbk z7X2QR|Nj3+#V}_Ny*+L44kKd!DFX>KL#juuGHj=x^lU`8flj+GC z|Ib5?Qh1zrAbXL^WgwNU Date: Tue, 28 Mar 2017 08:35:17 +0000 Subject: [PATCH 15/20] merge fix --- include/functions.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/functions.php b/include/functions.php index 8c84ce3..bdd2bef 100644 --- a/include/functions.php +++ b/include/functions.php @@ -856,7 +856,6 @@ function getGitVersion(){ } else { return 'GitID unknown'; } -<<<<<<< HEAD } function getDMRReflectors($network) { @@ -882,7 +881,5 @@ function getDMRReflectorsFromURL($url) { $refls[] = str_getcsv($row,"@",''); } return $refls; -======= ->>>>>>> 45c79329737e865e19bb761c4f3b3321107b09ba } ?> From a30645e4651bd162da4e91a8b53ddae4e76bced1 Mon Sep 17 00:00:00 2001 From: CT2JAY Date: Tue, 28 Mar 2017 12:37:06 +0100 Subject: [PATCH 16/20] Fix forgotten translation pt_PT --- locale/pt_PT/LC_MESSAGES/messages.mo | Bin 11227 -> 11259 bytes locale/pt_PT/LC_MESSAGES/messages.po | 4 ++++ 2 files changed, 4 insertions(+) diff --git a/locale/pt_PT/LC_MESSAGES/messages.mo b/locale/pt_PT/LC_MESSAGES/messages.mo index 5df124b4a206db2867c6df8a1bac205617804bc5..536bc092552e718acb87c60d8787c6a59a9304b9 100644 GIT binary patch delta 3524 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 diff --git a/locale/pt_PT/LC_MESSAGES/messages.po b/locale/pt_PT/LC_MESSAGES/messages.po index 78bd912..f41cbca 100644 --- a/locale/pt_PT/LC_MESSAGES/messages.po +++ b/locale/pt_PT/LC_MESSAGES/messages.po @@ -668,3 +668,7 @@ 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" From 8fa0bce46c4f84d09547a5cc148f3b3c08b2983d Mon Sep 17 00:00:00 2001 From: dg9vh Date: Tue, 28 Mar 2017 20:20:10 +0000 Subject: [PATCH 17/20] makes switchRefl. only working on DMRplus-Network, not on BM because options-line in MMDVM.ini is not supported by BrandMeister --- include/functions.php | 29 ++++++++++++----------------- index.php | 6 +++--- version.php | 2 +- 3 files changed, 16 insertions(+), 21 deletions(-) diff --git a/include/functions.php b/include/functions.php index bdd2bef..974b077 100644 --- a/include/functions.php +++ b/include/functions.php @@ -858,23 +858,8 @@ function getGitVersion(){ } } -function getDMRReflectors($network) { - $refls = array(); - switch ($network) { - case "DMRPLUS": - $refls = getDMRReflectorsFromURL("http://ham-dmr.de/reflector.db"); - break; - case "BRANDMEISTER": - $refls = getDMRReflectorsFromURL("http://185.79.71.94/reflector.db"); - break; - - } - return $refls; - -} - -function getDMRReflectorsFromURL($url) { - $data = file_get_contents($url); +function getDMRReflectors() { + $data = file_get_contents("http://ham-dmr.de/reflector.db"); $rows = explode("\n",$data); $refls = array(); foreach($rows as $row) { @@ -882,4 +867,14 @@ function getDMRReflectorsFromURL($url) { } 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/index.php b/index.php index ab21365..7f62ff2 100644 --- a/index.php +++ b/index.php @@ -135,15 +135,15 @@ if (defined("ENABLENETWORKSWITCHING")) {