using apt_option everywhere

BACKERS.md

@@ -1,19 +1,21 @@
-# Sponors 
+## Sponors 
 
-Development of RaspAP is made possible thanks to our awesome sponsors!
+Development of RaspAP is made possible thanks to our awesome sponsors. If you use RaspAP in a commerical application, consider sponsoring the project at a commerical tier. There are several benefits for sponsors at this level. Find out more about [becoming a sponsor](https://github.com/sponsors/billz).
-You can join them by [becoming a sponsor](https://github.com/sponsors/billz).
 
-### 💖 Benefactors
+#### 💖 Benefactors
 
-### 🏆 Gilded supporters 
+#### 🏆 Gilded supporters 
 
-### 🤖 Robot fuelers 
+#### 🤖 Robot fuelers 
 
-### ☕️  Coffee supporters 
+#### ☕️  Coffee supporters 
 
-# Donors
+## Donors
 
-One-time donors are vital to the continued development of this project. Join them by pledging via [Beerpay](https://beerpay.io/billz/raspap-webgui) or [PayPal](https://paypal.me/billzgithub).
+Recurring and one-time donors are vital to the continued development of this project. Join these awesome donors by pledging via [OpenCollective](https://opencollective.com/raspap) or [PayPal](https://paypal.me/billzgithub).
 
-### PayPal
+## PayPal
 Ray E - "This project is awesome and just works; saved me and my client tons of work. Thank you!" - $20  
+Erin C - "Just got Raspap up and running, looks very cool, thanks!" -$20 CAD  
+Ralf J - "Thanks for RaspAP including OpenVPN. It was a big help for me." -€15  
+Olivier G -€15 EUR  

README.md

@@ -1,13 +1,13 @@
 ![](https://i.imgur.com/xeKD93p.png)
-[![Release 2.3.1](https://img.shields.io/badge/Release-2.3.1-green.svg)](https://github.com/billz/raspap-webgui/releases) [![Awesome](https://awesome.re/badge.svg)](https://github.com/thibmaek/awesome-raspberry-pi) [![Financial Contributors on Open Collective](https://opencollective.com/raspap/all/badge.svg?label=financial+contributors)](https://opencollective.com/raspap) ![https://travis-ci.com/billz/raspap-webgui/](https://img.shields.io/travis/com/billz/raspap-webgui/master) [![Twitter URL](https://img.shields.io/twitter/url?label=%40RaspAP&logoColor=%23d8224c&url=https%3A%2F%2Ftwitter.com%2Frasp_ap)](https://twitter.com/rasp_ap) [![Subreddit subscribers](https://img.shields.io/reddit/subreddit-subscribers/RaspAP?style=social)](https://www.reddit.com/r/RaspAP/)
+[![Release 2.4](https://img.shields.io/badge/Release-2.4-green.svg)](https://github.com/billz/raspap-webgui/releases) [![Awesome](https://awesome.re/badge.svg)](https://github.com/thibmaek/awesome-raspberry-pi) [![Financial Contributors on Open Collective](https://opencollective.com/raspap/all/badge.svg?label=financial+contributors)](https://opencollective.com/raspap) ![https://travis-ci.com/billz/raspap-webgui/](https://img.shields.io/travis/com/billz/raspap-webgui/master) [![Twitter URL](https://img.shields.io/twitter/url?label=%40RaspAP&logoColor=%23d8224c&url=https%3A%2F%2Ftwitter.com%2Frasp_ap)](https://twitter.com/rasp_ap) [![Subreddit subscribers](https://img.shields.io/reddit/subreddit-subscribers/RaspAP?style=social)](https://www.reddit.com/r/RaspAP/)
 
-RaspAP lets you quickly get a WiFi access point up and running to share the internet connectivity of a Raspberry Pi. Our famous [Quick installer](#quick-installer) creates a known-good default configuration that "just works" on all current Raspberry Pis with onboard wireless. A handsome responsive interface gives you control over the relevant services and networking options. OpenVPN client support, SSL, security audits, themes and multilingual options round out the package. 
+RaspAP lets you quickly get a WiFi access point up and running to share the connectivity of many popular [Debian-based devices](#supported-operating-systems), including the Raspberry Pi. Our popular [Quick installer](#quick-installer) creates a known-good default configuration that "just works" on all current Raspberry Pis with onboard wireless. A responsive interface gives you control over the relevant services and networking options. Advanced DHCP settings, OpenVPN client support, SSL, security audits, themes and multilingual options are included.
 
 RaspAP has been featured on sites such as [Instructables](http://www.instructables.com/id/Raspberry-Pi-As-Completely-Wireless-Router/), [Adafruit](https://blog.adafruit.com/2016/06/24/raspap-wifi-configuration-portal-piday-raspberrypi-raspberry_pi/), [Raspberry Pi Weekly](https://www.raspberrypi.org/weekly/commander/) and [Awesome Raspberry Pi](https://project-awesome.org/thibmaek/awesome-raspberry-pi) and implemented in countless projects.
 
-We hope you enjoy using RaspAP as much as we do creating it. Tell us how you use this with [your own Pi-powered projects](https://github.com/billz/raspap-awesome)!
+We hope you enjoy using RaspAP as much as we do creating it. Tell us how you use this with [your own projects](https://github.com/billz/raspap-awesome).
 
-![](https://i.imgur.com/7LsxEGP.gif)
+![](https://i.imgur.com/BdEinwg.gif)
 ![](https://i.imgur.com/EiIpdOS.gif)
 ![](https://i.imgur.com/eCjUS1H.gif)
 ![](https://i.imgur.com/5FT2BcS.gif)
@@ -41,12 +41,12 @@ sudo reboot
 ```
 2. Set the WiFi country in raspi-config's **Localisation Options**: `sudo raspi-config`
 
-3. If you have a Raspberry Pi without an onboard WiFi chipset, the [**Edimax Wireless 802.11b/g/n nano USB adapter**](https://www.edimax.com/edimax/merchandise/merchandise_detail/data/edimax/global/wireless_adapters_n150/ew-7811un) is an excellent option – it's small, cheap and has good driver support.
+3. If you have a device without an onboard WiFi chipset, the [**Edimax Wireless 802.11b/g/n nano USB adapter**](https://www.edimax.com/edimax/merchandise/merchandise_detail/data/edimax/global/wireless_adapters_n150/ew-7811un) is an excellent option – it's small, cheap and has good driver support.
 
 With the prerequisites done, you can proceed with either the Quick installer or Manual installation steps below.
 
 ## Quick installer
-Install RaspAP from your RaspberryPi's shell prompt:
+Install RaspAP from your device's shell prompt:
 ```sh
 curl -sL https://install.raspap.com | bash
 ```
@@ -61,14 +61,10 @@ configured as an access point as follows:
 * SSID: `raspi-webgui`
 * Password: ChangeMe
 
-**Note:** As the name suggests, the Quick Installer is a great way to quickly setup a new AP. However, it does not automagically detect the unique configuration of your RPi. Best results are obtained by connecting an RPi to ethernet (`eth0`) or as a WiFi client, also known as managed mode, with `wlan0`. For the latter, refer to [this FAQ](https://github.com/billz/raspap-webgui/wiki/FAQs#how-do-i-prepare-the-sd-card-to-connect-to-wifi-in-headless-mode). Please [read this](https://github.com/billz/raspap-webgui/wiki/Reporting-issues) before reporting an issue.
+**Note:** As the name suggests, the Quick Installer is a great way to quickly setup a new AP. However, it does not automagically detect the unique configuration of your system. Best results are obtained by connecting to ethernet (`eth0`) or as a WiFi client, also known as managed mode, with `wlan0`. For the latter, refer to [this FAQ](https://github.com/billz/raspap-webgui/wiki/FAQs#how-do-i-prepare-the-sd-card-to-connect-to-wifi-in-headless-mode). Please [read this](https://github.com/billz/raspap-webgui/wiki/Reporting-issues) before reporting an issue.
 
 ## Ad Blocking
-This feature is currently in beta. We encourage testing and feedback from users of RaspAP. To enable ad blocking, simply use the installer to (re)install RaspAP using the `--adblock` option:
+This feature uses DNS blacklisting to block requests for ads, trackers and other undesirable hosts. To enable ad blocking, simply respond to the prompt during the installation. As a beta release, we encourage testing and feedback from users of RaspAP.
-
-```
-curl -sL https://install.raspap.com | bash -s -- --adblock
-```
 
 Details are [provided here](https://github.com/billz/raspap-webgui/wiki/Ad-blocking-(Beta)). 
 
@@ -77,14 +73,14 @@ By default RaspAP configures a routed AP for your clients to connect to. A bridg
 
 ![](https://i.imgur.com/J5VKSay.png)
 
-**Note:** In bridged mode, all routing capabilities are handled by your upstream router. Because your router assigns IP addresses to your RPi's hotspot and its clients, you might not be able to reach the RaspAP web interface from the default `10.3.141.1` address. Instead use your RPi's hostname followed by `.local` to access the RaspAP web interface. With Raspbian default settings, this should look like `raspberrypi.local`.
+**Note:** In bridged mode, all routing capabilities are handled by your upstream router. Because your router assigns IP addresses to your device's hotspot and its clients, you might not be able to reach the RaspAP web interface from the default `10.3.141.1` address. Instead use your RPi's hostname followed by `.local` to access the RaspAP web interface. With Raspbian default settings, this should look like `raspberrypi.local`. Alternate methods are [discussed here](https://www.raspberrypi.org/documentation/remote-access/ip-address.md).
 
 More information on Bridged AP mode is provided [on our wiki](https://github.com/billz/raspap-webgui/wiki/Bridged-AP-mode).
 
 ## Simultaneous AP and Wifi client
-RaspAP lets you easily create an AP with a Wifi client configuration. With your RPi configured in managed mode, enable the AP from the **Advanced** tab of **Configure hotspot** by sliding the **Wifi client AP mode** toggle. Save settings and start the hotspot. The managed mode AP is functional without restart.
+RaspAP lets you easily create an AP with a Wifi client configuration. With your system configured in managed mode, enable the AP from the **Advanced** tab of **Configure hotspot** by sliding the **Wifi client AP mode** toggle. Save settings and start the hotspot. The managed mode AP is functional without restart.
 
-**Note:** This option is disabled until you configure your RPi as a wireless client. For a Raspberry Pi operating in [managed mode](https://github.com/billz/raspap-webgui/wiki/FAQs#how-do-i-prepare-the-sd-card-to-connect-to-wifi-in-headless-mode) without an `eth0` connection, this configuration must be enabled _before_ a reboot. 
+**Note:** This option is disabled until you configure your system as a wireless client. For a device operating in [managed mode](https://github.com/billz/raspap-webgui/wiki/FAQs#how-do-i-prepare-the-sd-card-to-connect-to-wifi-in-headless-mode) without an `eth0` connection, this configuration must be enabled _before_ a reboot. 
 
 ## Support us
 RaspAP is free software, but powered by your support. If you find RaspAP useful for your personal or commercial projects, please [become a GitHub sponsor](https://github.com/sponsors/billz), join the project on [Open Collective](https://opencollective.com/raspap) or make a one-time donation with [PayPal](https://www.paypal.com/paypalme2/billzgithub). Any of these options makes a big difference!
@@ -95,7 +91,7 @@ RaspAP is free software, but powered by your support. If you find RaspAP useful
 Detailed manual setup instructions are provided [on our wiki](https://github.com/billz/raspap-webgui/wiki/Manual-installation).
 
 ## 802.11ac 5GHz support
-RaspAP provides an 802.11ac wireless mode option for supported hardware (currently the RPi 3B+/4) and wireless regulatory domains. See [this FAQ](https://github.com/billz/raspap-webgui/wiki/FAQs#80211ac) for more information. 
+RaspAP provides an 802.11ac wireless mode option for supported hardware (currently the RPi 3B+/4 and compatible Orange Pi models) and wireless regulatory domains. See [this FAQ](https://github.com/billz/raspap-webgui/wiki/FAQs#80211ac) for more information. 
 
 ## Supported operating systems
 RaspAP was originally made for Raspbian, but now also installs on the following Debian-based distros.
@@ -116,24 +112,25 @@ RaspAP uses [GNU Gettext](https://www.gnu.org/software/gettext/) to manage multi
 
 The following translations are currently maintained by the project:
 
-- Deutsch
-- Français
-- Italiano
-- Português
-- Svenska
-- Nederlands
-- 简体中文 (Chinese Simplified)
-- Indonesian
-- 한국어 (Korean)
-- 日本語 (Japanese)
-- Tiếng Việt (Vietnamese)
 - Čeština
-- Русский
+- 正體中文 (Chinese traditional)
+- 简体中文 (Chinese Simplified)
+- Dansk
+- Deutsch
 - Español
 - Finnish
-- Sinhala
+- Français
-- Türkçe
 - ελληνικό (Greek)
+- Indonesian
+- Italiano
+- 日本語 (Japanese)
+- 한국어 (Korean)
+- Nederlands
+- Português
+- Русский
+- Svenska
+- Türkçe
+- Tiếng Việt (Vietnamese)
 
 If your language is not in the list above, why not [contribute a translation](https://github.com/billz/raspap-webgui/wiki/Translations#contributing-a-translation)? Contributors will receive credit as the original translators.
 
@@ -159,7 +156,7 @@ To configure an OpenVPN client, upload a valid .ovpn file and, optionally, speci
 
 ## How to contribute
 1. Fork the project in your account and create a new branch: `your-great-feature`.
-2. Open an issue in the repository describing the feature contribution you'd like to make. This will help us get you started on the right foot.
+2. Open an issue in the repository describing the feature contribution you'd like to make.
 3. Commit changes in your feature branch.
 4. Open a pull request and reference the initial issue in the pull request message.
 
@@ -171,17 +168,14 @@ Please [read this](https://github.com/billz/raspap-webgui/wiki/Reporting-issues)
 ## Contributors
 
 ### Code Contributors
-
 This project exists thanks to all the awesome people who [contribute](CONTRIBUTING.md) their time and expertise.
 
 <a href="https://github.com/billz/raspap-webgui/graphs/contributors"><img src="https://opencollective.com/raspap/contributors.svg?width=890&button=false" /></a>
 
 ### Financial Contributors
-
 Become a [financial contributor](https://opencollective.com/raspap/contribute) and help us sustain our community. 
 
 #### Individuals
-
 <a href="https://opencollective.com/raspap"><img src="https://opencollective.com/raspap/individuals.svg?width=890"></a>
 
 #### Organizations

app/css/hackernews.css

@@ -20,6 +20,10 @@ a:focus, a:hover {
   color: #666;
 }
 
+h2 {
+  font-size: 2rem !important;
+}
+
 h4 {
   font-size: 1.3rem;
   color: #212529;

app/css/lightsout.css

@@ -12,6 +12,10 @@ html * {
   color: #afafaf;
 }
 
+h2 {
+  font-size: 2rem !important;
+}
+
 h4 {
   font-size: 1.3rem;
 }

config/config.php

@@ -1,6 +1,6 @@
 <?php
 
-define('RASPI_VERSION', '2.3.1');
+define('RASPI_VERSION', '2.4');
 define('RASPI_CONFIG', '/etc/raspap');
 define('RASPI_CONFIG_NETWORKING', RASPI_CONFIG.'/networking');
 define('RASPI_ADMIN_DETAILS', RASPI_CONFIG.'/raspap.auth');

config/dns-servers.json

@@ -3,6 +3,10 @@
     "1.0.0.1",
     "1.1.1.1"
   ],
+  "Freenom World": [
+    "80.80.80.80",
+    "80.80.81.81"
+  ],
   "German Privacy Foundation": [
     "62.141.58.13",
     "85.25.251.254",

includes/defaults.php

@@ -5,7 +5,7 @@ if (!defined('RASPI_CONFIG')) {
 }
 
 $defaults = [
-  'RASPI_VERSION' => '2.3.1',
+  'RASPI_VERSION' => '2.4',
   'RASPI_CONFIG_NETWORKING' => RASPI_CONFIG.'/networking',
   'RASPI_ADMIN_DETAILS' => RASPI_CONFIG.'/raspap.auth',
   'RASPI_WIFI_CLIENT_INTERFACE' => 'wlan0',

includes/locale.php

@@ -33,7 +33,11 @@ if (empty($_SESSION['locale']) && strlen($_SERVER['HTTP_ACCEPT_LANGUAGE']) >= 2)
         $locale = "nl_NL.UTF-8";
         break;
     case "zh":
+        if ($_SERVER['HTTP_ACCEPT_LANGUAGE'] == 'zh_TW') {
+            $locale = "zh_TW.UTF-8";
+        } else {
             $locale = "zh_CN.UTF-8";
+        }
         break;
     case "cs":
         $locale = "cs_CZ.UTF-8";
@@ -47,8 +51,8 @@ if (empty($_SESSION['locale']) && strlen($_SERVER['HTTP_ACCEPT_LANGUAGE']) >= 2)
     case "fi":
         $locale = "fi_FI.UTF-8";
         break;
-    case "si":
+    case "da":
-        $locale = "si_LK.UTF-8";
+        $locale = "da_DK.UTF-8";
         break;
     case "tr":
         $locale = "tr_TR.UTF-8";

includes/system.php

@@ -106,24 +106,25 @@ function DisplaySystem()
     // define locales
     $arrLocales = array(
         'en_GB.UTF-8' => 'English',
-        'de_DE.UTF-8' => 'Deutsch',
-        'fr_FR.UTF-8' => 'Français',
-        'it_IT.UTF-8' => 'Italiano',
-        'pt_BR.UTF-8' => 'Português',
-        'sv_SE.UTF-8' => 'Svenska',
-        'nl_NL.UTF-8' => 'Nederlands',
-        'zh_CN.UTF-8' => '简体中文 (Chinese simplified)',
-        'id_ID.UTF-8' => 'Indonesian',
-        'ko_KR.UTF-8' => '한국어 (Korean)',
-        'ja_JP.UTF-8' => '日本語 (Japanese)',
-        'vi_VN.UTF-8' => 'Tiếng Việt',
         'cs_CZ.UTF-8' => 'Čeština',
-        'ru_RU.UTF-8' => 'Русский',
+        'zh_TW.UTF-8' => '正體中文 (Chinese traditional)',
+        'zh_CN.UTF-8' => '简体中文 (Chinese simplified)',
+        'da_DK.UTF-8' => 'Dansk',
+        'de_DE.UTF-8' => 'Deutsch',
         'es_MX.UTF-8' => 'Español',
         'fi_FI.UTF-8' => 'Finnish',
-        'si_LK.UTF-8' => 'Sinhala',
+        'fr_FR.UTF-8' => 'Français',
+        'el_GR.UTF-8' => 'Ελληνικά',
+        'id_ID.UTF-8' => 'Indonesian',
+        'it_IT.UTF-8' => 'Italiano',
+        'ja_JP.UTF-8' => '日本語 (Japanese)',
+        'ko_KR.UTF-8' => '한국어 (Korean)',
+        'nl_NL.UTF-8' => 'Nederlands',
+        'pt_BR.UTF-8' => 'Português',
+        'ru_RU.UTF-8' => 'Русский',
+        'sv_SE.UTF-8' => 'Svenska',
         'tr_TR.UTF-8' => 'Türkçe',
-        'el_GR.UTF-8' => 'Ελληνικά'
+        'vi_VN.UTF-8' => 'Tiếng Việt (Vietnamese)'
     );
 
     echo renderTemplate("system", compact("arrLocales", "status", "system", "ServerPort"));

index.php

@@ -13,7 +13,7 @@
  * @author  Lawrence Yau <sirlagz@gmail.com>
  * @author  Bill Zimmerman <billzimmerman@gmail.com>
  * @license GNU General Public License, version 3 (GPL-3.0)
- * @version 2.3.1
+ * @version 2.4
  * @link    https://github.com/billz/raspap-webgui
  * @see     http://sirlagz.net/2013/02/08/raspap-webgui/
  */
@@ -122,9 +122,15 @@ $bridgedEnabled = $arrHostapdConf['BridgedEnable'];
           </div>
           <div class="col-xs ml-2">
             <div class="ml-1">Status</div>
-            <div class="info-item-xs"><span class="icon"><i class="fas fa-circle <?php echo ($hostapd_led); ?>"></i></span> Hotspot <?php echo _($hostapd_status); ?></div>
+            <div class="info-item-xs"><span class="icon">
-            <div class="info-item-xs"><span class="icon"><i class="fas fa-circle <?php echo ($memused_led); ?>"></i></i></span> Memory Use: <?php echo htmlspecialchars($memused, ENT_QUOTES); ?>%</div>
+              <i class="fas fa-circle <?php echo ($hostapd_led); ?>"></i></span> <?php echo _("Hotspot").' '. _($hostapd_status); ?>
-            <div class="info-item-xs"><span class="icon"><i class="fas fa-circle <?php echo ($cputemp_led); ?>"></i></span> CPU Temp: <?php echo htmlspecialchars($cputemp, ENT_QUOTES); ?>°C</div>
+            </div>
+            <div class="info-item-xs"><span class="icon">
+              <i class="fas fa-circle <?php echo ($memused_led); ?>"></i></span> <?php echo _("Memory Use").': '. htmlspecialchars($memused, ENT_QUOTES); ?>%
+            </div>
+            <div class="info-item-xs"><span class="icon">
+              <i class="fas fa-circle <?php echo ($cputemp_led); ?>"></i></span> <?php echo _("CPU Temp").': '. htmlspecialchars($cputemp, ENT_QUOTES); ?>°C
+            </div>
           </div>
         </div>
         <li class="nav-item">

installers/common.sh

@@ -22,6 +22,7 @@ readonly raspap_dnsmasq="/etc/dnsmasq.d/090_raspap.conf"
 readonly raspap_adblock="/etc/dnsmasq.d/090_adblock.conf"
 readonly raspap_sysctl="/etc/sysctl.d/90_raspap.conf"
 readonly rulesv4="/etc/iptables/rules.v4"
+readonly notracking_url="https://raw.githubusercontent.com/notracking/hosts-blocklists/master/"
 webroot_dir="/var/www/html"
 git_source_url="https://github.com/$repo"  # $repo from install.raspap.com
 
@@ -70,7 +71,7 @@ function _get_linux_distro() {
         CODENAME=$VERSION_CODENAME
         DESC=$PRETTY_NAME
     else
-        _install_error "Unsupported Linux distribution"
+        _install_status 1 "Unsupported Linux distribution"
     fi
 }
 
@@ -87,9 +88,9 @@ function _set_php_package() {
             php_package="php7.0-cgi"
             phpcgiconf="/etc/php/7.0/cgi/php.ini" ;;
         "8")
-            _install_error "${DESC} and php5 are not supported. Please upgrade." ;;
+            _install_status 1 "${DESC} and php5 are not supported. Please upgrade." ;;
         *)
-            _install_error "${DESC} is unsupported. Please install on a supported distro." ;;
+            _install_status 1 "${DESC} is unsupported. Please install on a supported distro." ;;
     esac
 }
 
@@ -99,8 +100,8 @@ function _install_dependencies() {
     _set_php_package
     if [ "$php_package" = "php7.4-cgi" ]; then
         echo "Adding apt-repository ppa:ondrej/php"
-        sudo apt-get install $apt_option software-properties-common || _install_error "Unable to install dependency"
+        sudo apt-get install $apt_option software-properties-common || _install_status 1 "Unable to install dependency"
-        sudo add-apt-repository $apt_option ppa:ondrej/php || _install_error "Unable to add-apt-repository ppa:ondrej/php"
+        sudo add-apt-repository $apt_option ppa:ondrej/php || _install_status 1 "Unable to add-apt-repository ppa:ondrej/php"
     fi
     if [ ${OS,,} = "debian" ] || [ ${OS,,} = "ubuntu" ]; then
         dhcpcd_package="dhcpcd5"
@@ -108,7 +109,8 @@ function _install_dependencies() {
     # Set dconf-set-selections
     echo iptables-persistent iptables-persistent/autosave_v4 boolean true | sudo debconf-set-selections
     echo iptables-persistent iptables-persistent/autosave_v6 boolean true | sudo debconf-set-selections
-    sudo apt-get install $apt_option lighttpd git hostapd dnsmasq iptables-persistent $php_package $dhcpcd_package vnstat qrencode || _install_error "Unable to install dependencies"
+    sudo apt-get install $apt_option lighttpd git hostapd dnsmasq iptables-persistent $php_package $dhcpcd_package vnstat qrencode || _install_status 1 "Unable to install dependencies"
+    _install_status 0
 }
 
 # Enables PHP for lighttpd and restarts service for settings to take effect
@@ -116,16 +118,16 @@ function _enable_php_lighttpd() {
     _install_log "Enabling PHP for lighttpd"
     sudo lighttpd-enable-mod fastcgi-php    
     sudo service lighttpd force-reload
-    sudo systemctl restart lighttpd.service || _install_error "Unable to restart lighttpd"
+    sudo systemctl restart lighttpd.service || _install_status 1 "Unable to restart lighttpd"
 }
 
 # Verifies existence and permissions of RaspAP directory
 function _create_raspap_directories() {
     _install_log "Creating RaspAP directories"
     if [ -d "$raspap_dir" ]; then
-        sudo mv $raspap_dir "$raspap_dir.`date +%F-%R`" || _install_error "Unable to move old '$raspap_dir' out of the way"
+        sudo mv $raspap_dir "$raspap_dir.`date +%F-%R`" || _install_status 1 "Unable to move old '$raspap_dir' out of the way"
     fi
-    sudo mkdir -p "$raspap_dir" || _install_error "Unable to create directory '$raspap_dir'"
+    sudo mkdir -p "$raspap_dir" || _install_status 1 "Unable to create directory '$raspap_dir'"
 
     # Create a directory for existing file backups.
     sudo mkdir -p "$raspap_dir/backups"
@@ -137,40 +139,43 @@ function _create_raspap_directories() {
     echo "Adding /etc/dhcpcd.conf as base configuration"
     cat /etc/dhcpcd.conf | sudo tee -a /etc/raspap/networking/defaults > /dev/null
     echo "Changing file ownership of $raspap_dir"
-    sudo chown -R $raspap_user:$raspap_user "$raspap_dir" || _install_error "Unable to change file ownership for '$raspap_dir'"
+    sudo chown -R $raspap_user:$raspap_user "$raspap_dir" || _install_status 1 "Unable to change file ownership for '$raspap_dir'"
 }
 
 # Generate hostapd logging and service control scripts
 function _create_hostapd_scripts() {
     _install_log "Creating hostapd logging & control scripts"
-    sudo mkdir $raspap_dir/hostapd || _install_error "Unable to create directory '$raspap_dir/hostapd'"
+    sudo mkdir $raspap_dir/hostapd || _install_status 1 "Unable to create directory '$raspap_dir/hostapd'"
 
     # Move logging shell scripts 
-    sudo cp "$webroot_dir/installers/"*log.sh "$raspap_dir/hostapd" || _install_error "Unable to move logging scripts"
+    sudo cp "$webroot_dir/installers/"*log.sh "$raspap_dir/hostapd" || _install_status 1 "Unable to move logging scripts"
     # Move service control shell scripts
-    sudo cp "$webroot_dir/installers/"service*.sh "$raspap_dir/hostapd" || _install_error "Unable to move service control scripts"
+    sudo cp "$webroot_dir/installers/"service*.sh "$raspap_dir/hostapd" || _install_status 1 "Unable to move service control scripts"
     # Make enablelog.sh and disablelog.sh not writable by www-data group.
-    sudo chown -c root:"$raspap_user" "$raspap_dir/hostapd/"*.sh || _install_error "Unable change owner and/or group"
+    sudo chown -c root:"$raspap_user" "$raspap_dir/hostapd/"*.sh || _install_status 1 "Unable change owner and/or group"
-    sudo chmod 750 "$raspap_dir/hostapd/"*.sh || _install_error "Unable to change file permissions"
+    sudo chmod 750 "$raspap_dir/hostapd/"*.sh || _install_status 1 "Unable to change file permissions"
+    _install_status 0
 }
 
 # Generate lighttpd service control scripts
 function _create_lighttpd_scripts() {
     _install_log "Creating lighttpd control scripts"
-    sudo mkdir $raspap_dir/lighttpd || _install_error "Unable to create directory '$raspap_dir/lighttpd"
+    sudo mkdir $raspap_dir/lighttpd || _install_status 1 "Unable to create directory '$raspap_dir/lighttpd"
 
     # Move service control shell scripts
-    sudo cp "$webroot_dir/installers/"configport.sh "$raspap_dir/lighttpd" || _install_error "Unable to move service control scripts"
+    echo "Copying configport.sh to $raspap_dir/lighttpd"
+    sudo cp "$webroot_dir/installers/"configport.sh "$raspap_dir/lighttpd" || _install_status 1 "Unable to move service control scripts"
     # Make configport.sh writable by www-data group
-    sudo chown -c root:"$raspap_user" "$raspap_dir/lighttpd/"*.sh || _install_error "Unable change owner and/or group"
+    echo "Changing file ownership"
-    sudo chmod 750 "$raspap_dir/lighttpd/"*.sh || _install_error "Unable to change file permissions"
+    sudo chown -c root:"$raspap_user" "$raspap_dir/lighttpd/"*.sh || _install_status 1 "Unable change owner and/or group"
+    sudo chmod 750 "$raspap_dir/lighttpd/"*.sh || _install_status 1 "Unable to change file permissions"
+    _install_status 0
 }
 
-# Prompt to install adblock
+# Prompt to install ad blocking
 function _prompt_install_adblock() {
-    if [ "$install_adblock" == 1 ]; then
     _install_log "Configure ad blocking (Beta)"
-        echo -n "Download blocklists and enable ad blocking? [Y/n]: "
+    echo -n "Install ad blocking and enable list management? [Y/n]: "
     if [ "$assume_yes" == 0 ]; then
         read answer < /dev/tty
         if [ "$answer" != "${answer#[Nn]}" ]; then
@@ -178,14 +183,16 @@ function _prompt_install_adblock() {
         else
             _install_adblock
         fi
-        fi
+    elif [ "$adblock_option" == 1 ]; then
+        _install_adblock
+    else
+        echo "(Skipped)"
     fi
 }
 
 # Download notracking adblock lists and enable option
 function _install_adblock() {
-    _install_log "Creating ad block base configuration (Beta)"
+    _install_log "Creating ad blocking base configuration (Beta)"
-    notracking_url="https://raw.githubusercontent.com/notracking/hosts-blocklists/master/"
     if [ ! -d "$raspap_dir/adblock" ]; then
         echo "Creating $raspap_dir/adblock"
         sudo mkdir -p "$raspap_dir/adblock"
@@ -193,44 +200,44 @@ function _install_adblock() {
     if [ ! -f /tmp/hostnames.txt ]; then
         echo "Fetching latest hostnames list"
         wget ${notracking_url}hostnames.txt -q --show-progress --progress=bar:force -O /tmp/hostnames.txt 2>&1 \
-            || _install_error "Unable to download notracking hostnames"
+            || _install_status 1 "Unable to download notracking hostnames"
     fi
     if [ ! -f /tmp/domains.txt ]; then
         echo "Fetching latest domains list"
         wget ${notracking_url}domains.txt -q --show-progress --progress=bar:force -O /tmp/domains.txt 2>&1 \
-            || _install_error "Unable to download notracking domains"
+            || _install_status 1 "Unable to download notracking domains"
     fi
     echo "Adding blocklists to $raspap_dir/adblock"
-    sudo cp /tmp/hostnames.txt $raspap_dir/adblock || _install_error "Unable to move notracking hostnames"
+    sudo cp /tmp/hostnames.txt $raspap_dir/adblock || _install_status 1 "Unable to move notracking hostnames"
-    sudo cp /tmp/domains.txt $raspap_dir/adblock || _install_error "Unable to move notracking domains"
+    sudo cp /tmp/domains.txt $raspap_dir/adblock || _install_status 1 "Unable to move notracking domains"
 
     echo "Moving and setting permissions for blocklist update script"
-    sudo cp "$webroot_dir/installers/"update_blocklist.sh "$raspap_dir/adblock" || _install_error "Unable to move blocklist update script"
+    sudo cp "$webroot_dir/installers/"update_blocklist.sh "$raspap_dir/adblock" || _install_status 1 "Unable to move blocklist update script"
 
     # Make blocklists and update script writable by www-data group
-    sudo chown -c root:"$raspap_user" "$raspap_dir/adblock/"*.* || _install_error "Unable to change owner/group"
+    sudo chown -c root:"$raspap_user" "$raspap_dir/adblock/"*.* || _install_status 1 "Unable to change owner/group"
     sudo chmod 750 "$raspap_dir/adblock/"*.sh || install_error "Unable to change file permissions"
 
     # Create 090_adblock.conf and write values to /etc/dnsmasq.d
     if [ ! -f "$raspap_adblock" ]; then
         echo "Adding 090_addblock.conf to /etc/dnsmasq.d"
         sudo touch "$raspap_adblock"
-        echo "conf-file=$raspap_dir/adblock/domains.txt" | sudo tee -a "$raspap_adblock" > /dev/null || _install_error "Unable to write to $raspap_adblock"
+        echo "conf-file=$raspap_dir/adblock/domains.txt" | sudo tee -a "$raspap_adblock" > /dev/null || _install_status 1 "Unable to write to $raspap_adblock"
-        echo "addn-hosts=$raspap_dir/adblock/hostnames.txt" | sudo tee -a "$raspap_adblock" > /dev/null || _install_error "Unable to write to $raspap_adblock"
+        echo "addn-hosts=$raspap_dir/adblock/hostnames.txt" | sudo tee -a "$raspap_adblock" > /dev/null || _install_status 1 "Unable to write to $raspap_adblock"
     fi
 
     # Remove dhcp-option=6 in dnsmasq.d/090_raspap.conf to force local DNS resolution for DHCP clients
     echo "Enabling local DNS name resolution for DHCP clients"
-    sudo sed -i '/dhcp-option=6/d' $raspap_dnsmasq || _install_error "Unable to modify $raspap_dnsmasq"
+    sudo sed -i '/dhcp-option=6/d' $raspap_dnsmasq || _install_status 1 "Unable to modify $raspap_dnsmasq"
 
     echo "Enabling ad blocking management option"
-    sudo sed -i "s/\('RASPI_ADBLOCK_ENABLED', \)false/\1true/g" "$webroot_dir/includes/config.php" || _install_error "Unable to modify config.php"
+    sudo sed -i "s/\('RASPI_ADBLOCK_ENABLED', \)false/\1true/g" "$webroot_dir/includes/config.php" || _install_status 1 "Unable to modify config.php"
-    echo "Done."
+    _install_status 0
 }
 
 # Prompt to install openvpn
 function _prompt_install_openvpn() {
-    _install_log "Setting up OpenVPN support"
+    _install_log "Configure OpenVPN support"
     echo -n "Install OpenVPN and enable client configuration? [Y/n]: "
     if [ "$assume_yes" == 0 ]; then
         read answer < /dev/tty
@@ -241,55 +248,59 @@ function _prompt_install_openvpn() {
         fi
     elif [ "$ovpn_option" == 1 ]; then
         _install_openvpn
+    else
+        echo "(Skipped)"
     fi
 }
 
 # Install openvpn and enable client configuration option
 function _install_openvpn() {
     _install_log "Installing OpenVPN and enabling client configuration"
-    sudo apt-get install $apt_option openvpn || _install_error "Unable to install openvpn"
+    sudo apt-get install $apt_option openvpn || _install_status 1 "Unable to install openvpn"
-    sudo sed -i "s/\('RASPI_OPENVPN_ENABLED', \)false/\1true/g" "$webroot_dir/includes/config.php" || _install_error "Unable to modify config.php"
+    sudo sed -i "s/\('RASPI_OPENVPN_ENABLED', \)false/\1true/g" "$webroot_dir/includes/config.php" || _install_status 1 "Unable to modify config.php"
     echo "Enabling openvpn-client service on boot"
-    sudo systemctl enable openvpn-client@client || _install_error "Unable to enable openvpn-client daemon"
+    sudo systemctl enable openvpn-client@client || _install_status 1 "Unable to enable openvpn-client daemon"
-    _create_openvpn_scripts || _install_error "Unable to create openvpn control scripts"
+    _create_openvpn_scripts || _install_status 1 "Unable to create openvpn control scripts"
 }
 
 # Generate openvpn logging and auth control scripts
 function _create_openvpn_scripts() {
     _install_log "Creating OpenVPN control scripts"
-    sudo mkdir $raspap_dir/openvpn || _install_error "Unable to create directory '$raspap_dir/openvpn'"
+    sudo mkdir $raspap_dir/openvpn || _install_status 1 "Unable to create directory '$raspap_dir/openvpn'"
 
    # Move service auth control shell scripts
-    sudo cp "$webroot_dir/installers/"configauth.sh "$raspap_dir/openvpn" || _install_error "Unable to move auth control script"
+    sudo cp "$webroot_dir/installers/"configauth.sh "$raspap_dir/openvpn" || _install_status 1 "Unable to move auth control script"
     # Make configauth.sh writable by www-data group
-    sudo chown -c root:"$raspap_user" "$raspap_dir/openvpn/"*.sh || _install_error "Unable change owner and/or group"
+    sudo chown -c root:"$raspap_user" "$raspap_dir/openvpn/"*.sh || _install_status 1 "Unable change owner and/or group"
-    sudo chmod 750 "$raspap_dir/openvpn/"*.sh || _install_error "Unable to change file permissions"
+    sudo chmod 750 "$raspap_dir/openvpn/"*.sh || _install_status 1 "Unable to change file permissions"
+    _install_status 0
 }
 
 # Fetches latest files from github to webroot
 function _download_latest_files() {
     if [ ! -d "$webroot_dir" ]; then
-        sudo mkdir -p $webroot_dir || _install_error "Unable to create new webroot directory"
+        sudo mkdir -p $webroot_dir || _install_status 1 "Unable to create new webroot directory"
     fi
 
     if [ -d "$webroot_dir" ]; then
-        sudo mv $webroot_dir "$webroot_dir.`date +%F-%R`" || _install_error "Unable to remove old webroot directory"
+        sudo mv $webroot_dir "$webroot_dir.`date +%F-%R`" || _install_status 1 "Unable to remove old webroot directory"
     fi
 
     _install_log "Cloning latest files from github"
-    git clone --branch $branch --depth 1 $git_source_url /tmp/raspap-webgui || _install_error "Unable to download files from github"
+    git clone --branch $branch --depth 1 $git_source_url /tmp/raspap-webgui || _install_status 1 "Unable to download files from github"
 
-    sudo mv /tmp/raspap-webgui $webroot_dir || _install_error "Unable to move raspap-webgui to web root"
+    sudo mv /tmp/raspap-webgui $webroot_dir || _install_status 1 "Unable to move raspap-webgui to web root"
+    _install_status 0
 }
 
 # Sets files ownership in web root directory
 function _change_file_ownership() {
     if [ ! -d "$webroot_dir" ]; then
-        _install_error "Web root directory doesn't exist"
+        _install_status 1 "Web root directory doesn't exist"
     fi
 
     _install_log "Changing file ownership in web root directory"
-    sudo chown -R $raspap_user:$raspap_user "$webroot_dir" || _install_error "Unable to change file ownership for '$webroot_dir'"
+    sudo chown -R $raspap_user:$raspap_user "$webroot_dir" || _install_status 1 "Unable to change file ownership for '$webroot_dir'"
 }
 
 # Check for existing configuration files
@@ -321,58 +332,63 @@ function _check_for_old_configs() {
             sudo ln -sf "${raspap_dir}/backups/${filename}.`date +%F-%R`" "${raspap_dir}/backups/${filename}"
         fi
     done
+    _install_status 0
 }
 
 # Move configuration file to the correct location
 function _move_config_file() {
     if [ ! -d "$raspap_dir" ]; then
-        _install_error "'$raspap_dir' directory doesn't exist"
+        _install_status 1 "'$raspap_dir' directory doesn't exist"
     fi
 
-    _install_log "Moving configuration file to '$raspap_dir'"
+    _install_log "Moving configuration file to $raspap_dir"
-    sudo cp "$webroot_dir"/raspap.php "$raspap_dir" || _install_error "Unable to move files to '$raspap_dir'"
+    sudo cp "$webroot_dir"/raspap.php "$raspap_dir" || _install_status 1 "Unable to move files to '$raspap_dir'"
-    sudo chown -R $raspap_user:$raspap_user "$raspap_dir" || _install_error "Unable to change file ownership for '$raspap_dir'"
+    sudo chown -R $raspap_user:$raspap_user "$raspap_dir" || _install_status 1 "Unable to change file ownership for '$raspap_dir'"
 }
 
 # Set up default configuration
 function _default_configuration() {
     _install_log "Applying default configuration to installed services"
     if [ -f /etc/default/hostapd ]; then
-        sudo mv /etc/default/hostapd /tmp/default_hostapd.old || _install_error "Unable to remove old /etc/default/hostapd file"
+        sudo mv /etc/default/hostapd /tmp/default_hostapd.old || _install_status 1 "Unable to remove old /etc/default/hostapd file"
     fi
-    sudo cp $webroot_dir/config/default_hostapd /etc/default/hostapd || _install_error "Unable to move hostapd defaults file"
+    sudo cp $webroot_dir/config/default_hostapd /etc/default/hostapd || _install_status 1 "Unable to move hostapd defaults file"
-    sudo cp $webroot_dir/config/hostapd.conf /etc/hostapd/hostapd.conf || _install_error "Unable to move hostapd configuration file"
+    sudo cp $webroot_dir/config/hostapd.conf /etc/hostapd/hostapd.conf || _install_status 1 "Unable to move hostapd configuration file"
-    sudo cp $webroot_dir/config/dnsmasq.conf $raspap_dnsmasq || _install_error "Unable to move dnsmasq configuration file"
+    sudo cp $webroot_dir/config/dnsmasq.conf $raspap_dnsmasq || _install_status 1 "Unable to move dnsmasq configuration file"
-    sudo cp $webroot_dir/config/dhcpcd.conf /etc/dhcpcd.conf || _install_error "Unable to move dhcpcd configuration file"
+    sudo cp $webroot_dir/config/dhcpcd.conf /etc/dhcpcd.conf || _install_status 1 "Unable to move dhcpcd configuration file"
 
+    echo "Checking for existence of /etc/dnsmasq.d"
     [ -d /etc/dnsmasq.d ] || sudo mkdir /etc/dnsmasq.d
 
+    echo "Copying bridged AP config to /etc/systemd/network"
     sudo systemctl stop systemd-networkd
     sudo systemctl disable systemd-networkd
-    sudo cp $webroot_dir/config/raspap-bridge-br0.netdev /etc/systemd/network/raspap-bridge-br0.netdev || _install_error "Unable to move br0 netdev file"
+    sudo cp $webroot_dir/config/raspap-bridge-br0.netdev /etc/systemd/network/raspap-bridge-br0.netdev || _install_status 1 "Unable to move br0 netdev file"
-    sudo cp $webroot_dir/config/raspap-br0-member-eth0.network /etc/systemd/network/raspap-br0-member-eth0.network || _install_error "Unable to move br0 member file"
+    sudo cp $webroot_dir/config/raspap-br0-member-eth0.network /etc/systemd/network/raspap-br0-member-eth0.network || _install_status 1 "Unable to move br0 member file"
 
+    echo "Copying primary RaspAP config to includes/config.php"
     if [ ! -f "$webroot_dir/includes/config.php" ]; then
         sudo cp "$webroot_dir/config/config.php" "$webroot_dir/includes/config.php"
     fi
+    _install_status 0
 }
 
 # Install and enable RaspAP daemon
 function _enable_raspap_daemon() {
     _install_log "Enabling RaspAP daemon"
     echo "Disable with: sudo systemctl disable raspapd.service"
-    sudo cp $webroot_dir/installers/raspapd.service /lib/systemd/system/ || _install_error "Unable to move raspap.service file"
+    sudo cp $webroot_dir/installers/raspapd.service /lib/systemd/system/ || _install_status 1 "Unable to move raspap.service file"
     sudo systemctl daemon-reload
-    sudo systemctl enable raspapd.service || _install_error "Failed to enable raspap.service"
+    sudo systemctl enable raspapd.service || _install_status 1 "Failed to enable raspap.service"
 }
 
 # Configure IP forwarding, set IP tables rules, prompt to install RaspAP daemon
 function _configure_networking() {
     _install_log "Configuring networking"
     echo "Enabling IP forwarding"
-    echo "net.ipv4.ip_forward=1" | sudo tee $raspap_sysctl > /dev/null || _install_error "Unable to set IP forwarding"
+    echo "net.ipv4.ip_forward=1" | sudo tee $raspap_sysctl > /dev/null || _install_status 1 "Unable to set IP forwarding"
-    sudo sysctl -p $raspap_sysctl || _install_error "Unable to execute sysctl"
+    sudo sysctl -p $raspap_sysctl || _install_status 1 "Unable to execute sysctl"
-    sudo /etc/init.d/procps restart || _install_error "Unable to execute procps"
+    sudo /etc/init.d/procps restart || _install_status 1 "Unable to execute procps"
 
     echo "Checking iptables rules"
     rules=(
@@ -385,14 +401,14 @@ function _configure_networking() {
         else
             rule=$(sed -e 's/^\(-A POSTROUTING\)/-t nat \1/' <<< $rule)
             echo "Adding rule: ${rule}"
-            sudo iptables $rule || _install_error "Unable to execute iptables"
+            sudo iptables $rule || _install_status 1 "Unable to execute iptables"
             added=true
         fi
     done
     # Persist rules if added
     if [ "$added" = true ]; then
         echo "Persisting IP tables rules"
-        sudo iptables-save | sudo tee $rulesv4 > /dev/null || _install_error "Unable to execute iptables-save"
+        sudo iptables-save | sudo tee $rulesv4 > /dev/null || _install_status 1 "Unable to execute iptables-save"
     fi
 
     # Prompt to install RaspAP daemon
@@ -408,6 +424,7 @@ function _configure_networking() {
         echo -e
         _enable_raspap_daemon
     fi
+    _install_status 0
  }
 
 # Add sudoers file to /etc/sudoers.d/ and set file permissions
@@ -416,8 +433,8 @@ function _patch_system_files() {
     # Create sudoers if not present
     if [ ! -f $raspap_sudoers ]; then
         _install_log "Adding raspap.sudoers to ${raspap_sudoers}"
-        sudo cp "$webroot_dir/installers/raspap.sudoers" $raspap_sudoers || _install_error "Unable to apply raspap.sudoers to $raspap_sudoers"
+        sudo cp "$webroot_dir/installers/raspap.sudoers" $raspap_sudoers || _install_status 1 "Unable to apply raspap.sudoers to $raspap_sudoers"
-        sudo chmod 0440 $raspap_sudoers || _install_error "Unable to change file permissions for $raspap_sudoers"
+        sudo chmod 0440 $raspap_sudoers || _install_status 1 "Unable to change file permissions for $raspap_sudoers"
     fi
 
     # Add symlink to prevent wpa_cli cmds from breaking with multiple wlan interfaces
@@ -430,6 +447,7 @@ function _patch_system_files() {
     _install_log "Unmasking and enabling hostapd service"
     sudo systemctl unmask hostapd.service
     sudo systemctl enable hostapd.service
+    _install_status 0
 }
 
 
@@ -479,7 +497,7 @@ function _optimize_php() {
             if [ -f "/usr/sbin/phpenmod" ]; then
                 sudo phpenmod opcache
             else
-                _install_warning "phpenmod not found."
+                _install_status 2 "phpenmod not found."
             fi
         fi
     fi
@@ -497,7 +515,7 @@ function _install_complete() {
                 echo "Installation reboot aborted."
                 exit 0
             fi
-            sudo shutdown -r now || _install_error "Unable to execute shutdown"
+            sudo shutdown -r now || _install_status 1 "Unable to execute shutdown"
         fi
     fi
 }
@@ -518,8 +536,8 @@ function _install_raspap() {
     _move_config_file
     _default_configuration
     _configure_networking
-    _prompt_install_openvpn
     _prompt_install_adblock
+    _prompt_install_openvpn
     _patch_system_files
     _install_complete
 }

installers/raspbian.sh

@@ -12,6 +12,8 @@
 #    Installs mkcert and generates an SSL certificate for lighttpd
 # -o, --openvpn <flag>
 #    Used with -y, --yes, sets OpenVPN install option (0=no install)
+# -a, --adblock <flag>
+#    Used with -y, --yes, sets Adblock install option (0=no install)
 # -r, --repo, --repository <name>
 #    Overrides the default GitHub repo (billz/raspap-webgui)
 # -b, --branch <name>
@@ -36,6 +38,17 @@ repo="billz/raspap-webgui"
 branch="master"
 assume_yes=0
 ovpn_option=1
+adblock_option=1
+
+# Define colors
+readonly ANSI_RED="\033[0;31m"
+readonly ANSI_GREEN="\033[0;32m"
+readonly ANSI_YELLOW="\033[0;33m"
+readonly ANSI_RASPBERRY="\033[0;35m"
+readonly ANSI_ERROR="\033[1;37;41m"
+readonly ANSI_RESET="\033[m"
+
+# Fetch latest release from GitHub API
 readonly RASPAP_LATEST=$(curl -s "https://api.github.com/repos/$repo/releases/latest" | grep -Po '"tag_name": "\K.*?(?=")' )
 
 # Define usage notes
@@ -44,6 +57,7 @@ Usage: raspbian.sh [OPTION]\n
 -y, --yes, --assume-yes\n\tAssumes "yes" as an answer to all prompts
 -c, --cert, --certificate\n\tInstalls an SSL certificate for lighttpd
 -o, --openvpn <flag>\n\tUsed with -y, --yes, sets OpenVPN install option (0=no install)
+-a, --adblock <flag>\n\tUsed with -y, --yes, sets Adblock install option (0=no install)
 -r, --repo, --repository <name>\n\tOverrides the default GitHub repo (billz/raspap-webgui)
 -b, --branch <name>\n\tOverrides the default git branch (master)
 -h, --help\n\tOutputs usage notes and exits
@@ -63,7 +77,8 @@ while :; do
         shift
         ;;
         -a|--adblock)
-        install_adblock=1
+        adblock_option="$2"
+        shift
         ;;
         -c|--cert|--certificate)
         install_cert=1
@@ -81,7 +96,7 @@ while :; do
         exit 1
         ;;
         -v|--version)
-        printf "RaspAP v${RASPAP_LATEST} - simple AP setup and wifi mangement for the RaspberryPi\n"
+        printf "RaspAP v${RASPAP_LATEST} - Simple AP setup & WiFi management for Debian-based devices\n"
         exit 1
         ;;
         -*|--*)
@@ -100,10 +115,7 @@ UPDATE_URL="https://raw.githubusercontent.com/$repo/$branch/"
 
 # Outputs a welcome message
 function _display_welcome() {
-    raspberry='\033[0;35m'
+    echo -e "${ANSI_RASPBERRY}\n"
-    green='\033[1;32m'
-
-    echo -e "${raspberry}\n"
     echo -e " 888888ba                              .d888888   888888ba"
     echo -e " 88     8b                            d8     88   88     8b"
     echo -e "a88aaaa8P' .d8888b. .d8888b. 88d888b. 88aaaaa88a a88aaaa8P"
@@ -112,29 +124,28 @@ function _display_welcome() {
     echo -e " dP     dP  88888P8  88888P  88Y888P  88     88   dP"
     echo -e "                             88"
     echo -e "                             dP       version ${RASPAP_LATEST}"
-    echo -e "${green}"
+    echo -e "${ANSI_GREEN}"
-    echo -e "The Quick Installer will guide you through a few easy steps\n\n"
+    echo -e "The Quick Installer will guide you through a few easy steps${ANSI_RESET}\n\n"
 }
 
 # Outputs a RaspAP Install log line
 function _install_log() {
-    echo -e "\033[1;32mRaspAP Install: $*\033[m"
+    echo -e "${ANSI_GREEN}RaspAP Install: $1${ANSI_RESET}"
 }
 
-# Outputs a RaspAP Install Error log line and exits with status code 1
+# Outputs a RaspAP status indicator
-function _install_error() {
+function _install_status() {
-    echo -e "\033[1;37;41mRaspAP Install Error: $*\033[m"
+    case $1 in
-    exit 1
+        0)
-}
+        echo -e "[$ANSI_GREEN \U2713 ok $ANSI_RESET] $2"
-
+        ;;
-# Outputs a RaspAP Warning line
+        1)
-function _install_warning() {
+        echo -e "[$ANSI_RED \U2718 error $ANSI_RESET] $ANSI_ERROR $2 $ANSI_RESET"
-    echo -e "\033[1;33mWarning: $*\033[m"
+        ;;
-}
+        2)
-
+        echo -e "[$ANSI_YELLOW \U26A0 warning $ANSI_RESET] $2"
-# Outputs a RaspAP divider
+        ;;
-function _install_divider() {
+    esac
-    echo -e "\033[1;32m***************************************************************$*\033[m"
 }
 
 function _update_system_packages() {

installers/uninstall.sh

@@ -1,66 +1,95 @@
 #!/bin/bash
-raspap_dir="/etc/raspap"
+#
-raspap_user="www-data"
+# RaspAP uninstall functions
-version=`sed 's/\..*//' /etc/debian_version`
+# Author: @billz <billzimmerman@gmail.com>
+# License: GNU General Public License v3.0
+#
+# You are not obligated to bundle the LICENSE file with your RaspAP projects as long
+# as you leave these references intact in the header comments of your source files.
 
-# Determine Raspbian version and set default home location for lighttpd 
+# Exit on error
+set -o errexit
+# Exit on error inside functions
+set -o errtrace
+# Turn on traces, disabled by default
+# set -o xtrace
+
+# Set defaults
+readonly raspap_dir="/etc/raspap"
+readonly raspap_user="www-data"
+readonly raspap_sudoers="/etc/sudoers.d/090_raspap"
+readonly raspap_dnsmasq="/etc/dnsmasq.d/090_raspap.conf"
+readonly raspap_sysctl="/etc/sysctl.d/90_raspap.conf"
+readonly rulesv4="/etc/iptables/rules.v4"
 webroot_dir="/var/www/html"
-if [ $version -eq 10 ]; then
-    version_msg="Raspbian 10.0 (Buster)"
-    php_package="php7.1-cgi"
-elif [ $version -eq 9 ]; then
-    version_msg="Raspbian 9.0 (Stretch)" 
-    php_package="php7.0-cgi"
-else 
-    version_msg="Raspbian 8.0 (Jessie) or earlier"
-    webroot_dir="/var/www" 
-    php_package="php5-cgi" 
-fi
 
-phpcgiconf=""
+# Determines host Linux distrubtion details
-if [ "$php_package" = "php7.1-cgi" ]; then
+function _get_linux_distro() {
-    phpcgiconf="/etc/php/7.1/cgi/php.ini"
+    if type lsb_release >/dev/null 2>&1; then # linuxbase.org
-elif [ "$php_package" = "php7.0-cgi" ]; then
+        OS=$(lsb_release -si)
-    phpcgiconf="/etc/php/7.0/cgi/php.ini"
+        RELEASE=$(lsb_release -sr)
-elif [ "$php_package" = "php5-cgi" ]; then
+        CODENAME=$(lsb_release -sc)
-    phpcgiconf="/etc/php5/cgi/php.ini"
+        DESC=$(lsb_release -sd)
+    elif [ -f /etc/os-release ]; then # freedesktop.org
+        . /etc/os-release
+        OS=$ID
+        RELEASE=$VERSION_ID
+        CODENAME=$VERSION_CODENAME
+        DESC=$PRETTY_NAME
+    else
+        _install_error "Unsupported Linux distribution"
     fi
+}
+
+# Sets php package option based on Linux version, abort if unsupported distro
+function _set_php_package() {
+    case $RELEASE in
+        "18.04"|"19.10") # Ubuntu Server
+            php_package="php7.4-cgi"
+            phpcgiconf="/etc/php/7.4/cgi/php.ini" ;;
+        "10")
+            php_package="php7.3-cgi"
+            phpcgiconf="/etc/php/7.3/cgi/php.ini" ;;
+        "9")
+            php_package="php7.0-cgi"
+            phpcgiconf="/etc/php/7.0/cgi/php.ini" ;;
+    esac
+}
 
 # Outputs a RaspAP Install log line
-function install_log() {
+function _install_log() {
-    echo -e "\033[1;32mRaspAP Install: $*\033[m"
+    echo -e "\033[1;32mRaspAP Uninstall: $*\033[m"
 }
 
 # Outputs a RaspAP Install Error log line and exits with status code 1
-function install_error() {
+function _install_error() {
-    echo -e "\033[1;37;41mRaspAP Install Error: $*\033[m"
+    echo -e "\033[1;37;41mRaspAP Uninstall Error: $*\033[m"
     exit 1
 }
 
 # Checks to make sure uninstallation info is correct
-function config_uninstallation() {
+function _config_uninstallation() {
-    install_log "Configure installation"
+    _install_log "Configure uninstall of RaspAP"
-    echo "Detected ${version_msg}" 
+    _get_linux_distro
-    echo "Install directory: ${raspap_dir}"
+    echo "Detected ${DESC}" 
-    echo "Lighttpd directory: ${webroot_dir}"
+    echo "RaspAP install directory: ${raspap_dir}"
-    echo -n "Uninstall RaspAP with these values? [y/N]: "
+    echo -n "Lighttpd install directory: ${webroot_dir}? [Y/n]: "
     read answer
-    if [[ $answer != "y" ]]; then
+    if [ "$answer" != "${answer#[Nn]}" ]; then
+        read -e -p "Enter alternate lighttpd directory: " -i "/var/www/html" webroot_dir
+    fi
+    echo "Uninstall from lighttpd directory: ${webroot_dir}"
+    echo -n "Uninstall RaspAP with these values? [Y/n]: "
+    read answer
+    if [[ "$answer" != "${answer#[Nn]}" ]]; then
         echo "Installation aborted."
         exit 0
     fi
 }
 
 # Checks for/restore backup files
-function check_for_backups() {
+function _check_for_backups() {
     if [ -d "$raspap_dir/backups" ]; then
-        if [ -f "$raspap_dir/backups/interfaces" ]; then
-            echo -n "Restore the last interfaces file? [y/N]: "
-            read answer
-            if [[ $answer -eq 'y' ]]; then
-                sudo cp "$raspap_dir/backups/interfaces" /etc/network/interfaces
-            fi
-        fi
         if [ -f "$raspap_dir/backups/hostapd.conf" ]; then
             echo -n "Restore the last hostapd configuration file? [y/N]: "
             read answer
@@ -89,63 +118,101 @@ function check_for_backups() {
                 sudo cp "$raspap_dir/backups/php.ini" "$phpcgiconf"
             fi
         fi
-        if [ -f "$raspap_dir/backups/rc.local" ]; then
-            echo -n "Restore the last rc.local file? [y/N]: "
-            read answer
-            if [[ $answer -eq 'y' ]]; then
-                sudo cp "$raspap_dir/backups/rc.local" /etc/rc.local
-            else
-                echo -n "Remove RaspAP Lines from /etc/rc.local? [Y/n]: "
-                if [[ $answer -ne 'n' ]]; then
-                    sed -i '/#RASPAP/d' /etc/rc.local
-                fi
-            fi
-        fi
     fi
 }
 
 # Removes RaspAP directories
-function remove_raspap_directories() {
+function _remove_raspap_directories() {
-    install_log "Removing RaspAP Directories"
+    _install_log "Removing RaspAP Directories"
     if [ ! -d "$raspap_dir" ]; then
-        install_error "RaspAP Configuration directory not found. Exiting!"
+        _install_error "RaspAP Configuration directory not found. Exiting."
     fi
 
     if [ ! -d "$webroot_dir" ]; then
-        install_error "RaspAP Installation directory not found. Exiting!"
+        _install_error "RaspAP Installation directory not found. Exiting."
     fi
+    sudo rm -rf "$webroot_dir"/* || _install_error "Unable to remove $webroot_dir"
+    sudo rm -rf "$raspap_dir" || _install_error "Unable to remove $raspap_dir"
+}
 
-    sudo rm -rf "$webroot_dir"/*
+# Removes raspapd.service
-    sudo rm -rf "$raspap_dir"
+function _remove_raspap_service() {
+    _install_log "Removing raspapd.service"
+    sudo rm /lib/systemd/system/raspapd.service || _install_error "Unable to remove raspap.service file"
+    sudo systemctl daemon-reload
+    sudo systemctl disable raspapd.service || _install_error "Failed to disable raspap.service"
+    echo "Done."
+}
 
+# Restores networking config to pre-install defaults
+function _restore_networking() {
+    _install_log "Restoring networking config to pre-install defaults"
+    echo "Disabling IP forwarding in $raspap_sysctl"
+    sudo rm $raspap_sysctl || _install_error "Unable to remove $raspap_sysctl"
+    sudo /etc/init.d/procps restart || _install_error "Unable to execute procps"
+    echo "Checking iptables rules"
+    rules=(
+    "-A POSTROUTING -j MASQUERADE"
+    "-A POSTROUTING -s 192.168.50.0/24 ! -d 192.168.50.0/24 -j MASQUERADE"
+    )
+    for rule in "${rules[@]}"; do
+        if grep -- "$rule" $rulesv4 > /dev/null; then
+            rule=$(sed -e 's/^\(-A POSTROUTING\)/-t nat -D POSTROUTING/' <<< $rule)
+            echo "Removing rule: ${rule}"
+            sudo iptables $rule || _install_error "Unable to execute iptables"
+            removed=true
+        fi
+    done
+    # Persist rules if removed
+    if [ "$removed" = true ]; then
+        echo "Removing persistent iptables rules"
+        sudo iptables-save | sudo tee $rulesv4 > /dev/null || _install_error "Unable to execute iptables-save"
+    fi
+    echo "Done."
 }
 
 # Removes installed packages
-function remove_installed_packages() {
+function _remove_installed_packages() {
-    install_log "Removing installed packages"
+    _install_log "Removing installed packages"
-    echo -n "Remove the following installed packages? lighttpd $php_package git hostapd dnsmasq vnstat [y/N]: "
+    _set_php_package
+    if [ ${OS,,} = "debian" ] || [ ${OS,,} = "ubuntu" ]; then
+        dhcpcd_package="dhcpcd5"
+    else
+        dhcpcd_package="dnsmasq"
+    fi
+    echo -n "Remove the following installed packages? lighttpd hostapd iptables-persistent $php_package $dhcpcd_package vnstat qrencode [y/N]: "
     read answer
     if [ "$answer" != 'n' ] && [ "$answer" != 'N' ]; then
         echo "Removing packages."
-        sudo apt-get remove lighttpd $php_package git hostapd dnsmasq vnstat
+        sudo apt-get remove lighttpd hostapd iptables-persistent $php_package $dhcpcd_package vnstat qrencode || _install_error "Unable to remove installed packages"
-        sudo apt-get autoremove
+        sudo apt-get autoremove || _install_error "Unable to run apt autoremove"
     else
         echo "Leaving packages installed."
     fi
 }
 
 # Removes www-data from sudoers
-function clean_sudoers() {
+function _remove_sudoers() {
-    # should this check for only our commands?
+    _install_log "Removing sudoers permissions"
-    sudo sed -i '/www-data/d' /etc/sudoers
+    echo "Removing ${raspap_sudoers}" 
+    sudo rm "$raspap_sudoers" || _install_error "Unable to remove $raspap_sudoers"
+    echo "Done."
 }
 
-function remove_raspap() {
+function _uninstall_complete() {
-    config_uninstallation
+    _install_log "Uninstall completed"
-    check_for_backups
+    echo "It is recommended that you reboot your system as a final step."
-    remove_raspap_directories
-    remove_installed_packages
-    clean_sudoers
 }
 
-remove_raspap
+function _remove_raspap() {
+    _config_uninstallation
+    _check_for_backups
+    _remove_raspap_service
+    _restore_networking
+    _remove_raspap_directories
+    _remove_installed_packages
+    _remove_sudoers
+    _uninstall_complete
+}
+
+_remove_raspap

locale/cs_CZ/LC_MESSAGES/messages.po

@@ -1,22 +1,19 @@
-# RaspAP Portable Object file
-# Project home: https://github.com/billz/raspap-webgui
-# Licensed under the GNU General Public License v3.0
-# This file is distributed under the same license as the RaspAP package
-# FIRST AUTHOR billzimmerman@gmail.com, 2017
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.2.1\n"
+"Project-Id-Version: raspap\n"
 "Report-Msgid-Bugs-To: Bill Zimmerman <billzimmerman@gmail.com>\n"
 "POT-Creation-Date: 2017-10-19 08:56+0000\n"
-"PO-Revision-Date: 2019-10-21 23:15+0000\n"
+"PO-Revision-Date: 2020-04-17 06:37\n"
-"Last-Translator: Rudolf Vallo <r.vallo@seznam.cz>\n"
+"Last-Translator: Jiri Brejcha <jirka@jiribrejcha.net>\n"
-"Language-Team: \n"
+"Language-Team: Czech\n"
 "Language: cs_CZ\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 3;\n"
+"X-Crowdin-Project: raspap\n"
+"X-Crowdin-Language: cs\n"
+"X-Crowdin-File: /master/locale/en_US/LC_MESSAGES/messages.po\n"
 
 #: index.php
 msgid "RaspAP Wifi Configuration Portal"
@@ -26,22 +23,28 @@ msgid "Toggle navigation"
 msgstr "Přepni navigaci"
 
 msgid "RaspAP Wifi Portal"
-msgstr "RaspAP Wifi Portál"
+msgstr "RaspAP Wi-Fi Portál"
 
 msgid "Dashboard"
 msgstr "Přehled"
 
 msgid "WiFi client"
-msgstr "WiFi klienta"
+msgstr "Wi-Fi klient"
 
 msgid "Hotspot"
-msgstr "Hotspot(u)"
+msgstr "Hotspot"
+
+msgid "Memory Use"
+msgstr "Využití paměti"
+
+msgid "CPU Temp"
+msgstr "Teplota procesoru"
 
 msgid "Networking"
 msgstr "Sítě"
 
 msgid "DHCP Server"
-msgstr "DHCP Serveru"
+msgstr "DHCP server"
 
 msgid "OpenVPN"
 msgstr "OpenVPN"
@@ -50,7 +53,7 @@ msgid "TOR proxy"
 msgstr "TOR proxy"
 
 msgid "Authentication"
-msgstr "Autentifikace"
+msgstr "Autentizace"
 
 msgid "Change Theme"
 msgstr "Změnit vzhled"
@@ -63,7 +66,7 @@ msgstr "Info o RaspAP"
 
 #: includes/admin.php
 msgid "Authentication settings"
-msgstr "Nastavení ověřování"
+msgstr "Nastavení přístupu"
 
 msgid "New passwords do not match"
 msgstr "Nová hesla se neshodují"
@@ -109,19 +112,19 @@ msgid "Passphrase"
 msgstr "Heslo"
 
 msgid "Wifi settings updated successfully"
-msgstr "Wifi nastavení úspěšně aktualizováno"
+msgstr "Wi-Fi nastavení úspěšně aktualizováno"
 
 msgid "Wifi settings updated but cannot restart (cannot execute 'wpa_cli reconfigure')"
-msgstr "Wifi nastavení aktualizováno, ale nerestartováno (nemohu spustit 'wpa_cli reconfigure')"
+msgstr "Wi-Fi nastavení aktualizováno, ale nerestartováno (nemohu spustit 'wpa_cli reconfigure')"
 
 msgid "Wifi settings failed to be updated"
-msgstr "Wifi nastavení se nepodařilo aktualizovat"
+msgstr "Wi-Fi nastavení se nepodařilo aktualizovat"
 
 msgid "Failed to update wifi settings"
-msgstr "Failed nastavení se nepodařilo aktualizovat"
+msgstr "Nepodařilo se aktualizovat nastavení Wi-Fi"
 
 msgid "Rescan"
-msgstr "Prohledat"
+msgstr "Vyhledat sítě"
 
 msgid "Update"
 msgstr "Aktualizovat"
@@ -139,7 +142,7 @@ msgid "Hide"
 msgstr "Skrýt"
 
 msgid "Not configured"
-msgstr "Not configured"
+msgstr "Není nakonfigurováno"
 
 msgid "<strong>Note:</strong> WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP"
 msgstr "<strong>Poznámka:</strong> WEP přístupový bod je zobrazen jako 'bez zabezpečení' ''. RaspAP zatím nepodporuje připojení k WEP sítím"
@@ -152,16 +155,16 @@ msgid "Interface Name"
 msgstr "Jméno rozhraní"
 
 msgid "IPv4 Address"
-msgstr "IPv4 Adresa"
+msgstr "IPv4 adresa"
 
 msgid "IPv6 Address"
-msgstr "IPv6 Adresa"
+msgstr "IPv6 adresa"
 
 msgid "Subnet Mask"
-msgstr "Subnet Maska"
+msgstr "Maska podsítě"
 
 msgid "Mac Address"
-msgstr "Mac Adresa"
+msgstr "MAC Adresa"
 
 msgid "Interface Statistics"
 msgstr "Statistiky rozhraní"
@@ -178,20 +181,20 @@ msgstr "Odeslané Pakety"
 msgid "Transferred Bytes"
 msgstr "Odeslané Bajty"
 
-msgid "Wireless Information"
+msgid "Wireless Client"
-msgstr "Bezdrátové informace"
+msgstr "Bezdrátový klient"
 
 msgid "Connected To"
-msgstr "Připojeno K"
+msgstr "Připojeno k"
 
 msgid "AP Mac Address"
-msgstr "AP Mac Adresa"
+msgstr "MAC adresa AP"
 
 msgid "Bitrate"
-msgstr "Bitrate"
+msgstr "Datový tok"
 
 msgid "Signal Level"
-msgstr "Signal Level"
+msgstr "Úroveň signálu"
 
 msgid "Transmit Power"
 msgstr "Vysílací výkon"
@@ -200,19 +203,19 @@ msgid "Frequency"
 msgstr "Frekvence"
 
 msgid "Link Quality"
-msgstr "Kvalita Linky"
+msgstr "Kvalita spojení"
 
 msgid "Information provided by ip and iw and from system"
-msgstr "Informace získány od ip, iw a systému"
+msgstr "Informace získány z ip, iw a systému"
 
 msgid "No MAC Address Found"
 msgstr "Žádná MAC Adresa Nenalezena"
 
 msgid "No IP Address Found"
-msgstr "Žádná IP Adresa Nenalezena"
+msgstr "IP adresa nenalezena"
 
 msgid "No Subnet Mask Found"
-msgstr "Žádná maska nenalezena"
+msgstr "Nenalezena žádná maska podsítě"
 
 msgid "No Data"
 msgstr "Žádná Data"
@@ -230,10 +233,10 @@ msgid "Interface already down"
 msgstr "Rozhraní je už vypnuté"
 
 msgid "Start wlan0"
-msgstr "Start wlan0"
+msgstr "Spustit wlan0"
 
 msgid "Stop wlan0"
-msgstr "Stop wlan0"
+msgstr "Zastavit wlan0"
 
 msgid "Connected Devices"
 msgstr "Připojená zařízení"
@@ -248,26 +251,29 @@ msgstr "Seznam zařízení"
 msgid "Interface"
 msgstr "Rozhraní"
 
+msgid "DNS Server"
+msgstr "DNS server"
+
 msgid "Starting IP Address"
 msgstr "Počáteční IP Adresa"
 
 msgid "Ending IP Address"
-msgstr "Konečná IP Adresa"
+msgstr "Konečná IP adresa"
 
 msgid "Static Leases"
-msgstr "Statická zapůjčení"
+msgstr "Staticky přidělené adresy"
 
 msgid "Add static DHCP lease"
-msgstr "Přidat statický zapůjčení DHCP"
+msgstr "Přidělit statickou IP adresu pomocí DHCP serveru"
 
 msgid "Lease Time"
-msgstr "Čas Zápujčky"
+msgstr "Délka zápůjčky IP adresy"
 
 msgid "Interval"
 msgstr "Interval"
 
 msgid "Active DHCP leases"
-msgstr "Aktivní DHCP zápujčky"
+msgstr "IP adresy přidělené DHCP serverem"
 
 msgid "Expire time"
 msgstr "Čas Expirace"
@@ -276,7 +282,7 @@ msgid "MAC Address"
 msgstr "MAC Adresa"
 
 msgid "Host name"
-msgstr "Název klienta"
+msgstr "Klient"
 
 msgid "Client ID"
 msgstr "Klient ID"
@@ -318,31 +324,31 @@ msgid "Dnsmasq is not running"
 msgstr "Dnsmasq neběží"
 
 msgid "Upstream DNS servers"
-msgstr "Upstream DNS servers"
+msgstr "Upstream servery DNS"
 
 msgid "Only ever query DNS servers configured below"
-msgstr "Only ever query DNS servers configured below"
+msgstr "Použít pouze DNS servery nakonfigurované níže"
 
 msgid "Enable this option if you want RaspAP to <b>send DNS queries to the servers configured below exclusively</b>. By default RaspAP also uses its upstream DHCP server's name servers."
-msgstr "Enable this option if you want RaspAP to <b>send DNS queries to the servers configured below exclusively</b>. By default RaspAP also uses its upstream DHCP server's name servers."
+msgstr "Povolte tuto možnost, pokud chcete, aby RaspAP <b>odesílalo DNS dotazy pouze na servery nakonfigurované níže</b>. Ve výchozím nastavení RaspAP používá upstream DNS servery přidělené DHCP serverem."
 
 msgid "This option adds <code>no-resolv</code> to the dnsmasq configuration."
-msgstr "This option adds <code>no-resolv</code> to the dnsmasq configuration."
+msgstr "Tato volba přidává do konfigurace dnsmasq <code>no-resolv</code>."
 
 msgid "Add upstream DNS server"
-msgstr "Add upstream DNS server"
+msgstr "Přidat upstream DNS server"
 
 msgid "Format"
-msgstr "Format"
+msgstr "Formát"
 
 msgid "Choose a hosted server"
-msgstr "Choose a hosted server"
+msgstr "Veřejný DNS server"
 
 msgid "Log DHCP requests"
-msgstr "Log DHCP requests"
+msgstr "Logovat DHCP požadavky"
 
 msgid "Log DNS queries"
-msgstr "Log DNS queries"
+msgstr "Logovat DNS dotazy"
 
 #: includes/hostapd.php
 msgid "Basic"
@@ -355,7 +361,7 @@ msgid "Basic settings"
 msgstr "Základní nastavení"
 
 msgid "Wireless Mode"
-msgstr "Bezdrátový mód"
+msgstr "Bezdrátový režim"
 
 msgid "Security settings"
 msgstr "Nastavení Zabezpečení"
@@ -367,13 +373,13 @@ msgid "Encryption Type"
 msgstr "Typ šifrování"
 
 msgid "PSK"
-msgstr "PSK"
+msgstr "Heslo"
 
 msgid "Advanced settings"
 msgstr "Pokročilé nastavení"
 
 msgid "Country Code"
-msgstr "Kód země"
+msgstr "Země"
 
 msgid "Information provided by hostapd"
 msgstr "Zdroj informací hostapd"
@@ -397,16 +403,16 @@ msgid "WPA passphrase must be between 8 and 63 characters"
 msgstr "WPA heslo musí být mezi 8 a 63 znaky"
 
 msgid "Unknown interface"
-msgstr "Neznáme rozhraní"
+msgstr "Neznámé rozhraní"
 
 msgid "Country code must be blank or two characters"
 msgstr "Kód země musí být prázdný nebo obsahovat dva znaky"
 
 msgid "Wifi Hotspot settings saved"
-msgstr "Nastavení Wifi Hotspotu uloženo"
+msgstr "Nastavení Wi-Fi Hotspotu uloženo"
 
 msgid "Unable to save wifi hotspot settings"
-msgstr "Nemohu uložit nastavení wifi hotspotu"
+msgstr "Nemohu uložit nastavení Wi-Fi hotspotu"
 
 msgid "Start hotspot"
 msgstr "Spustit hotspot"
@@ -415,19 +421,22 @@ msgid "Stop hotspot"
 msgstr "Zastavit hotspot"
 
 msgid "Restart hotspot"
-msgstr "Restartujte hotspot"
+msgstr "Restartovat hotspot"
 
 msgid "Enable logging"
 msgstr "Zapnout logování"
 
 msgid "Logfile output"
-msgstr "Výstop logu"
+msgstr "Logovat do souboru"
 
 msgid "WiFi client AP mode"
-msgstr "AP režim WiFi klienta"
+msgstr "AP v klientském Wi-Fi režimu"
+
+msgid "Bridged AP mode"
+msgstr "Bridged AP režim"
 
 msgid "Hide SSID in broadcast"
-msgstr "Skrýt ve vysílání SSID"
+msgstr "Skrýt SSID"
 
 msgid "Maximum number of clients"
 msgstr "Maximální počet klientů"
@@ -437,7 +446,7 @@ msgstr "Konfiguruje max_num_sta volbu hostapd. Výchozí a maximální hodnota j
 
 #: includes/networking.php
 msgid "Summary"
-msgstr "Shrnutí"
+msgstr "Přehled"
 
 msgid "Current settings"
 msgstr "Aktuální nastavení"
@@ -445,9 +454,6 @@ msgstr "Aktuální nastavení"
 msgid "Default Gateway"
 msgstr "Výchozí brána"
 
-msgid "DNS Server"
-msgstr "DNS Server"
-
 msgid "Alternate DNS Server"
 msgstr "Alternativní DNS Server"
 
@@ -455,10 +461,10 @@ msgid "Adapter IP Address Settings"
 msgstr "Nastavení IP Adresy adaptéru"
 
 msgid "Enable Fallback to Static Option"
-msgstr "Povolit Záložní nastavení Statické IP"
+msgstr "Použít statickou IP adresu pokud není přidělena DHCP serverem"
 
 msgid "Static IP"
-msgstr "Statická IP"
+msgstr "Statická IP adresa"
 
 msgid "Enabled"
 msgstr "Zapnuto"
@@ -470,10 +476,10 @@ msgid "Static IP Options"
 msgstr "Možnosti statické IP"
 
 msgid "Apply settings"
-msgstr "Aplikovat nastavení"
+msgstr "Použít nastavení"
 
 msgid "Information provided by /sys/class/net"
-msgstr "Informace získány od /sys/class/net"
+msgstr "Informace získány z /sys/class/net"
 
 #: includes/system.php
 msgid "System Information"
@@ -495,13 +501,13 @@ msgid "Console"
 msgstr "Konzole"
 
 msgid "Hostname"
-msgstr "Hostname"
+msgstr "Název počítače"
 
 msgid "Pi Revision"
 msgstr "Pi Revize"
 
 msgid "Uptime"
-msgstr "Doba využití"
+msgstr "V provozu"
 
 msgid "Memory Used"
 msgstr "Využití paměti"
@@ -510,23 +516,23 @@ msgid "CPU Load"
 msgstr "Vytížení procesoru"
 
 msgid "Reboot"
-msgstr "Rebootovat"
+msgstr "Restartovat"
 
 msgid "Shutdown"
 msgstr "Vypnout"
 
 msgid "System Rebooting Now!"
-msgstr "Systém nyní rebootuje!"
+msgstr "Systém je restartován!"
 
 msgid "System Shutting Down Now!"
 msgstr "Systém se nyní vypíná!"
 
 #: includes/themes.php
 msgid "Theme settings"
-msgstr "Nastavení témat"
+msgstr "Nastavení vzhledu"
 
 msgid "Select a theme"
-msgstr "Vybrat téma"
+msgstr "Vybrat šablonu"
 
 #: includes/data_usage.php
 msgid "Data usage"
@@ -536,13 +542,13 @@ msgid "Data usage monitoring"
 msgstr "Sledování využití dat"
 
 msgid "Hourly traffic amount"
-msgstr "Hodinový objem návštěvnosti"
+msgstr "Hodinový provoz"
 
 msgid "Daily traffic amount"
-msgstr "Denní objem návštěvnosti"
+msgstr "Denní provoz"
 
 msgid "Monthly traffic amount"
-msgstr "Měsíční objem návštěvnosti"
+msgstr "Měsíční provoz"
 
 msgid "Hourly"
 msgstr "Hodinový"
@@ -566,7 +572,7 @@ msgid "Receive MB"
 msgstr "Přijato MB"
 
 msgid "Information provided by vnstat"
-msgstr "Informace získány od vnstat"
+msgstr "Informace získány z vnstat"
 
 msgid "Loading {0} bandwidth chart"
 msgstr "Načítám {0} graf šířky pásma"
@@ -588,7 +594,7 @@ msgid "Select OpenVPN configuration file (.ovpn)"
 msgstr "Vyberte konfigurační soubor OpenVPN (.ovpn)"
 
 msgid "Client Log"
-msgstr "Protokol klienta"
+msgstr "Klientský log"
 
 msgid "Port"
 msgstr "Port"
@@ -597,7 +603,7 @@ msgid "Protocol"
 msgstr "Protokol"
 
 msgid "Root CA certificate"
-msgstr "Root CA certifikát"
+msgstr "Kořenový certifikát CA"
 
 msgid "Server certificate"
 msgstr "Certifikát serveru"
@@ -628,16 +634,16 @@ msgstr "Pokus o zastavení openvpn"
 
 #: includes/torproxy.php
 msgid "TOR is not running"
-msgstr "TOR není spuštěno"
+msgstr "TOR není spuštěn"
 
 msgid "TOR is running"
 msgstr "TOR není spuštěn"
 
 msgid "Relay"
-msgstr "Přepínač"
+msgstr "Relay"
 
 msgid "Relay settings"
-msgstr "Nastavení přepínače"
+msgstr "Nastavení TOR Relay"
 
 msgid "Nickname"
 msgstr "Přezdívka"
@@ -660,6 +666,10 @@ msgstr "Pokus o spuštění TOR"
 msgid "Attempting to stop TOR"
 msgstr "Pokus o zastavení TOR"
 
+#: template/dashboard.php
+msgid "Bridged AP mode is enabled. For Hostname and IP, see your router's admin page."
+msgstr "Bridged AP režim je povolen. Název a IP adresu najdete ve webovém rozhraní vašeho routeru."
+
 #: common form controls
 msgid "Save settings"
 msgstr "Uložit nastavení"
@@ -681,3 +691,46 @@ msgstr "nahoru"
 
 msgid "down"
 msgstr "dolů"
+
+msgid "adblock"
+msgstr "adblock"
+
+msgid "Ad Blocking"
+msgstr "Blokování reklam"
+
+msgid "Start Ad Blocking"
+msgstr "Povolit blokování reklam"
+
+msgid "Restart Ad Blocking"
+msgstr "Restartovat blokování reklam"
+
+msgid "Blocklist settings"
+msgstr "Nastavení blocklistu"
+
+msgid "Enable blocklists"
+msgstr "Blokovat obsah"
+
+msgid "Enable this option if you want RaspAP to <b>block DNS requests for ads, tracking and other virtual garbage</b>. Blocklists are gathered from multiple, actively maintained sources and automatically updated, cleaned, optimized and moderated on a daily basis."
+msgstr "Povolte tuto možnost, pokud chcete, aby RaspAP <b>blokovalo DNS požadavky na reklamy, sledování a další virtuální havěť</b>. Blocklisty jsou shromažďovány z více aktivně udržovaných zdrojů a automaticky aktualizovány, čištěny, optimalizovány a denně moderovány."
+
+msgid "This option adds <code>conf-file</code> and <code>addn-hosts</code> to the dnsmasq configuration."
+msgstr "Tato funkce přidává <code>conf-file</code> a <code>addn-hosts</code> do konfigurace dnsmasq."
+
+msgid "Choose a blocklist provider"
+msgstr "Vyberte poskytovatele blocklistu"
+
+msgid "Hostnames blocklist last updated"
+msgstr "Seznam blokovaných hostitelů naposledy aktualizován"
+
+msgid "Domains blocklist last updated"
+msgstr "Seznam blokovaných domén naposledy aktualizován"
+
+msgid "Update now"
+msgstr "Aktualizovat nyní"
+
+msgid "Statistics"
+msgstr "Statistiky"
+
+msgid "Information provided by adblock"
+msgstr "Informace jsou poskytované službou adblock"
+

locale/da_DK/LC_MESSAGES/messages.po

@@ -0,0 +1,736 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: raspap\n"
+"Report-Msgid-Bugs-To: Bill Zimmerman <billzimmerman@gmail.com>\n"
+"POT-Creation-Date: 2017-10-19 08:56+0000\n"
+"PO-Revision-Date: 2020-04-12 10:21\n"
+"Last-Translator: Bill Zimmerman <billzimmerman@gmail.com>\n"
+"Language-Team: Danish\n"
+"Language: da_DK\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Crowdin-Project: raspap\n"
+"X-Crowdin-Language: da\n"
+"X-Crowdin-File: /master/locale/en_US/LC_MESSAGES/messages.po\n"
+
+#: index.php
+msgid "RaspAP Wifi Configuration Portal"
+msgstr "RaspAP Wifi Konfigurationsportal"
+
+msgid "Toggle navigation"
+msgstr "Skift navigation"
+
+msgid "RaspAP Wifi Portal"
+msgstr "RaspAP Wifi Portal"
+
+msgid "Dashboard"
+msgstr "Oversigt"
+
+msgid "WiFi client"
+msgstr "WiFi-klient"
+
+msgid "Hotspot"
+msgstr "Hotspot"
+
+msgid "Memory Use"
+msgstr "Brugt hukommelse"
+
+msgid "CPU Temp"
+msgstr "CPU Temperatur"
+
+msgid "Networking"
+msgstr "Netværk"
+
+msgid "DHCP Server"
+msgstr "DHCP Server"
+
+msgid "OpenVPN"
+msgstr "OpenVPN"
+
+msgid "TOR proxy"
+msgstr "TOR proxy"
+
+msgid "Authentication"
+msgstr "Godkendelse"
+
+msgid "Change Theme"
+msgstr "Skift tema"
+
+msgid "System"
+msgstr "System"
+
+msgid "About RaspAP"
+msgstr "Om RaspAP"
+
+#: includes/admin.php
+msgid "Authentication settings"
+msgstr "Godkendelsesindstillinger"
+
+msgid "New passwords do not match"
+msgstr "Nye adgangskoder matcher ikke"
+
+msgid "Username must not be empty"
+msgstr "Brugernavn må ikke være tomt"
+
+msgid "Admin password updated"
+msgstr "Administratorkodeord opdateret"
+
+msgid "Failed to update admin password"
+msgstr "Opdatering af administratorkodeord mislykkedes"
+
+msgid "Old password does not match"
+msgstr "Gammelt kodeord ikke korrekt"
+
+msgid "Username"
+msgstr "Brugernavn"
+
+msgid "Old password"
+msgstr "Gammel adgangskode"
+
+msgid "New password"
+msgstr "Ny adgangskode"
+
+msgid "Repeat new password"
+msgstr "Gentag ny adgangskode"
+
+#: includes/configure_client.php
+msgid "Client settings"
+msgstr "Klientindstilinger"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Channel"
+msgstr "Kanal"
+
+msgid "Security"
+msgstr "Sikkerhed"
+
+msgid "Passphrase"
+msgstr "Adgangskode"
+
+msgid "Wifi settings updated successfully"
+msgstr "Wifi-indstillinger opdateret"
+
+msgid "Wifi settings updated but cannot restart (cannot execute 'wpa_cli reconfigure')"
+msgstr "Wifi-indstillinger opdateret, men kan ikke genstarte (kan ikke køre 'wpa_cli reconfigure')"
+
+msgid "Wifi settings failed to be updated"
+msgstr "Wifi-indstillinger kunne ikke opdateres"
+
+msgid "Failed to update wifi settings"
+msgstr "Opdatering af Wifi-indstillinger mislykkedes"
+
+msgid "Rescan"
+msgstr "Scan igen"
+
+msgid "Update"
+msgstr "Opdatér"
+
+msgid "Add"
+msgstr "Tilføj"
+
+msgid "Delete"
+msgstr "Slet"
+
+msgid "Show"
+msgstr "Vis"
+
+msgid "Hide"
+msgstr "Skjul"
+
+msgid "Not configured"
+msgstr "Ikke konfigureret"
+
+msgid "<strong>Note:</strong> WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP"
+msgstr "<strong>Note:</strong> WEP access points vises som 'Åben'. RaspAP understøtter i øjeblikket ikke forbindelser til WEP"
+
+#: includes/dashboard.php
+msgid "Interface Information"
+msgstr "Interfaceinformation"
+
+msgid "Interface Name"
+msgstr "Interfacenavn"
+
+msgid "IPv4 Address"
+msgstr "IPv4 adresse"
+
+msgid "IPv6 Address"
+msgstr "IPv6 adresse"
+
+msgid "Subnet Mask"
+msgstr "Undernetmaske"
+
+msgid "Mac Address"
+msgstr "Mac-adresse"
+
+msgid "Interface Statistics"
+msgstr "Interfacestatistik"
+
+msgid "Received Packets"
+msgstr "Modtagne pakker"
+
+msgid "Received Bytes"
+msgstr "Modtagne bytes"
+
+msgid "Transferred Packets"
+msgstr "Overførte pakker"
+
+msgid "Transferred Bytes"
+msgstr "Overførte bytes"
+
+msgid "Wireless Information"
+msgstr "Trådløs information"
+
+msgid "Connected To"
+msgstr "Forbundet til"
+
+msgid "AP Mac Address"
+msgstr "AP Mac-adresse"
+
+msgid "Bitrate"
+msgstr "Bitrate"
+
+msgid "Signal Level"
+msgstr "Signalniveau"
+
+msgid "Transmit Power"
+msgstr "Sendeeffekt"
+
+msgid "Frequency"
+msgstr "Frekvens"
+
+msgid "Link Quality"
+msgstr "Link-kvalitet"
+
+msgid "Information provided by ip and iw and from system"
+msgstr "Oplysninger leveret af ip og iw og fra system"
+
+msgid "No MAC Address Found"
+msgstr "Ingen MAC-adresse fundet"
+
+msgid "No IP Address Found"
+msgstr "Ingen IP-adresse fundet"
+
+msgid "No Subnet Mask Found"
+msgstr "Ingen undernetmaske fundet"
+
+msgid "No Data"
+msgstr "Ingen data"
+
+msgid "Not connected"
+msgstr "Ikke forbundet"
+
+msgid "Interface is up"
+msgstr "Interface kører"
+
+msgid "Interface is down"
+msgstr "Interface kører ikke"
+
+msgid "Interface already down"
+msgstr "Interface allerede nede"
+
+msgid "Start wlan0"
+msgstr "Start wlan0"
+
+msgid "Stop wlan0"
+msgstr "Stop wlan0"
+
+msgid "Connected Devices"
+msgstr "Forbundne enheder"
+
+#: includes/dhcp.php
+msgid "DHCP server settings"
+msgstr "DHCP-serverindstillinger"
+
+msgid "Client list"
+msgstr "Klientliste"
+
+msgid "Interface"
+msgstr "Interface"
+
+msgid "DNS Server"
+msgstr "DNS-server"
+
+msgid "Starting IP Address"
+msgstr "Start IP-adresse"
+
+msgid "Ending IP Address"
+msgstr "Slut IP-adresse"
+
+msgid "Static Leases"
+msgstr "Statiske Leases"
+
+msgid "Add static DHCP lease"
+msgstr "Tilføj statisk DHCP-lease"
+
+msgid "Lease Time"
+msgstr "Lease-tid"
+
+msgid "Interval"
+msgstr "Interval"
+
+msgid "Active DHCP leases"
+msgstr "Aktive DHCP-leases"
+
+msgid "Expire time"
+msgstr "Udløbstid"
+
+msgid "MAC Address"
+msgstr "MAC-adresse"
+
+msgid "Host name"
+msgstr "Hostnavn"
+
+msgid "Client ID"
+msgstr "Klient-ID"
+
+msgid "Information provided by Dnsmasq"
+msgstr "Oplysninger leveret af Dnsmasq"
+
+msgid "Stop dnsmasq"
+msgstr "Stop dnsmasq"
+
+msgid "Start dnsmasq"
+msgstr "Start dnsmasq"
+
+msgid "Dnsmasq configuration updated successfully"
+msgstr "Dnsmasq-konfiguration blev opdateret"
+
+msgid "dnsmasq already running"
+msgstr "dnsmasq kører allerede"
+
+msgid "Successfully started dnsmasq"
+msgstr "dnsmasq blev startet"
+
+msgid "Failed to start dnsmasq"
+msgstr "Kunne ikke starte dnsmasq"
+
+msgid "Successfully stopped dnsmasq"
+msgstr "Dnsmasq blev stoppet"
+
+msgid "Failed to stop dnsmasq"
+msgstr "Kunne ikke stoppe dnsmasq"
+
+msgid "dnsmasq already stopped"
+msgstr "dnsmasq er allerede stoppet"
+
+msgid "Dnsmasq is running"
+msgstr "Dnsmasq kører"
+
+msgid "Dnsmasq is not running"
+msgstr "Dnsmasq kører ikke"
+
+msgid "Upstream DNS servers"
+msgstr "Upstream DNS-servere"
+
+msgid "Only ever query DNS servers configured below"
+msgstr "Spørg kun følgende DNS-servere"
+
+msgid "Enable this option if you want RaspAP to <b>send DNS queries to the servers configured below exclusively</b>. By default RaspAP also uses its upstream DHCP server's name servers."
+msgstr "Aktivér denne indstilling, hvis du vil have RaspAP til <b>udelukkende at sende DNS-forespørgsler til serverne, der er konfigureret nedenfor </b>. Som standard bruger RaspAP også navneservere på den originale DHCP-server."
+
+msgid "This option adds <code>no-resolv</code> to the dnsmasq configuration."
+msgstr "Denne mulighed tilføjer <code>no-resolv</code> til dnsmasq konfigurationen."
+
+msgid "Add upstream DNS server"
+msgstr "Tilføj upstream DNS server"
+
+msgid "Format"
+msgstr "Format"
+
+msgid "Choose a hosted server"
+msgstr "Vælg en hostet server"
+
+msgid "Log DHCP requests"
+msgstr "Log DHCP anmodninger"
+
+msgid "Log DNS queries"
+msgstr "Log DNS-forespørgsler"
+
+#: includes/hostapd.php
+msgid "Basic"
+msgstr "Grundindst"
+
+msgid "Advanced"
+msgstr "Avanceret"
+
+msgid "Basic settings"
+msgstr "Grundindstillinger"
+
+msgid "Wireless Mode"
+msgstr "Trådløs tilstand"
+
+msgid "Security settings"
+msgstr "Sikkerhedsindstillinger"
+
+msgid "Security type"
+msgstr "Sikkerhedstype"
+
+msgid "Encryption Type"
+msgstr "Krypteringstype"
+
+msgid "PSK"
+msgstr "PSK"
+
+msgid "Advanced settings"
+msgstr "Avancerede indstillinger"
+
+msgid "Country Code"
+msgstr "Landekode"
+
+msgid "Information provided by hostapd"
+msgstr "Oplysninger leveret af hostapd"
+
+msgid "Attempting to start hotspot"
+msgstr "Forsøger at starte hotspot"
+
+msgid "Attempting to stop hotspot"
+msgstr "Forsøger at standse hotspot"
+
+msgid "HostAPD is not running"
+msgstr "HostAPD kører ikke"
+
+msgid "HostAPD is running"
+msgstr "HostAPD kører"
+
+msgid "SSID must be between 1 and 32 characters"
+msgstr "SSID skal være mellem 1 og 32 tegn"
+
+msgid "WPA passphrase must be between 8 and 63 characters"
+msgstr "WPA kode skal være mellem 8 og 63 tegn"
+
+msgid "Unknown interface"
+msgstr "Ukendt interface"
+
+msgid "Country code must be blank or two characters"
+msgstr "Landekode skal være tomt, eller have to tegn"
+
+msgid "Wifi Hotspot settings saved"
+msgstr "Wifi Hotspot-indstillinger gemt"
+
+msgid "Unable to save wifi hotspot settings"
+msgstr "Kunne ikke gemme wifi-hotspot-indstillinger"
+
+msgid "Start hotspot"
+msgstr "Start hotspot"
+
+msgid "Stop hotspot"
+msgstr "Stop hotspot"
+
+msgid "Restart hotspot"
+msgstr "Genstart hotspot"
+
+msgid "Enable logging"
+msgstr "Aktivér logning"
+
+msgid "Logfile output"
+msgstr "Logfil output"
+
+msgid "WiFi client AP mode"
+msgstr "WiFi klient AP-tilstand"
+
+msgid "Bridged AP mode"
+msgstr "Bridged AP-tilstand"
+
+msgid "Hide SSID in broadcast"
+msgstr "Skjul SSID"
+
+msgid "Maximum number of clients"
+msgstr "Maksimal klientantal"
+
+msgid "Configures the max_num_sta option of hostapd. The default and maximum is 2007. If empty or 0, the default applies."
+msgstr "Konfigurerer max_num_sta i hostapd. Standard og maksimum er 2007. Hvis tom eller 0, bruges standard."
+
+#: includes/networking.php
+msgid "Summary"
+msgstr "Oversigt"
+
+msgid "Current settings"
+msgstr "Nuværende indstillinger"
+
+msgid "Default Gateway"
+msgstr "Standard-gateway"
+
+msgid "Alternate DNS Server"
+msgstr "Alternativ DNS-server"
+
+msgid "Adapter IP Address Settings"
+msgstr "Adapter IP-adresseindstillinger"
+
+msgid "Enable Fallback to Static Option"
+msgstr "Aktivér Fallback til statisk mulighed"
+
+msgid "Static IP"
+msgstr "Statisk IP"
+
+msgid "Enabled"
+msgstr "Aktiveret"
+
+msgid "Disabled"
+msgstr "Deaktiveret"
+
+msgid "Static IP Options"
+msgstr "Statiske IP-indstillinger"
+
+msgid "Apply settings"
+msgstr "Anvend indstillinger"
+
+msgid "Information provided by /sys/class/net"
+msgstr "Oplysninger leveret af /sys/class/net"
+
+#: includes/system.php
+msgid "System Information"
+msgstr "Systemoplysninger"
+
+msgid "Language"
+msgstr "Sprog"
+
+msgid "Language settings"
+msgstr "Sprogindstillinger"
+
+msgid "Select a language"
+msgstr "Vælg et sprog"
+
+msgid "Language setting saved"
+msgstr "Sprogindstillinger gemt"
+
+msgid "Console"
+msgstr "Konsol"
+
+msgid "Hostname"
+msgstr "Hostnavn"
+
+msgid "Pi Revision"
+msgstr "Pi-revision"
+
+msgid "Uptime"
+msgstr "Oppetid"
+
+msgid "Memory Used"
+msgstr "Brugt hukommelse"
+
+msgid "CPU Load"
+msgstr "CPU-belasting"
+
+msgid "Reboot"
+msgstr "Genstart"
+
+msgid "Shutdown"
+msgstr "Luk ned"
+
+msgid "System Rebooting Now!"
+msgstr "Systemet genstarter nu!"
+
+msgid "System Shutting Down Now!"
+msgstr "Systemet lukker ned nu!"
+
+#: includes/themes.php
+msgid "Theme settings"
+msgstr "Temaindstillinger"
+
+msgid "Select a theme"
+msgstr "Vælg et tema"
+
+#: includes/data_usage.php
+msgid "Data usage"
+msgstr "Dataforbrug"
+
+msgid "Data usage monitoring"
+msgstr "Overvågning af dataforbrug"
+
+msgid "Hourly traffic amount"
+msgstr "Timevis trafikmængde"
+
+msgid "Daily traffic amount"
+msgstr "Daglig trafikmængde"
+
+msgid "Monthly traffic amount"
+msgstr "Månedsvis trafikmængde"
+
+msgid "Hourly"
+msgstr "Timevis"
+
+msgid "Daily"
+msgstr "Daglig"
+
+msgid "Monthly"
+msgstr "Månedlig"
+
+msgid "interface"
+msgstr "Interface"
+
+msgid "date"
+msgstr "Dato"
+
+msgid "Send MB"
+msgstr "Sendte MB"
+
+msgid "Receive MB"
+msgstr "Modtagne MB"
+
+msgid "Information provided by vnstat"
+msgstr "Oplysninger leveret af vnstat"
+
+msgid "Loading {0} bandwidth chart"
+msgstr "Indlæser {0} båndbreddediagram"
+
+msgid "Showing {0} to {1} of {2} entries"
+msgstr "Viser {0} til {1} ​​af {2} poster"
+
+#: includes/openvpn.php
+msgid "OpenVPN is not running"
+msgstr "OpenVPN kører ikke"
+
+msgid "OpenVPN is running"
+msgstr "OpenVPN kører"
+
+msgid "Server settings"
+msgstr "Serverindstillinger"
+
+msgid "Select OpenVPN configuration file (.ovpn)"
+msgstr "Vælg OpenVPN-konfigurationsfil (.ovpn)"
+
+msgid "Client Log"
+msgstr "Klientlog"
+
+msgid "Port"
+msgstr "Port"
+
+msgid "Protocol"
+msgstr "Protokol"
+
+msgid "Root CA certificate"
+msgstr "Root-CA-certifikat"
+
+msgid "Server certificate"
+msgstr "Servercertifikat"
+
+msgid "Diffie Hellman parameters"
+msgstr "Diffie Hellman-parametre"
+
+msgid "KeepAlive"
+msgstr "KeepAlive"
+
+msgid "Server log"
+msgstr "Serverlog"
+
+msgid "Start OpenVPN"
+msgstr "Start OpenVPN"
+
+msgid "Stop OpenVPN"
+msgstr "Stop OpenVPN"
+
+msgid "Information provided by openvpn"
+msgstr "Oplysninger leveret af OpenVPN"
+
+msgid "Attempting to start openvpn"
+msgstr "Forsøger at starte OpenVPN"
+
+msgid "Attempting to stop openvpn"
+msgstr "Forsøger at stoppe OpenVPN"
+
+#: includes/torproxy.php
+msgid "TOR is not running"
+msgstr "TOR kører ikke"
+
+msgid "TOR is running"
+msgstr "TOR kører"
+
+msgid "Relay"
+msgstr "Relæ"
+
+msgid "Relay settings"
+msgstr "Relæindstillinger"
+
+msgid "Nickname"
+msgstr "Kaldenavn"
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "Start TOR"
+msgstr "Start TOR"
+
+msgid "Stop TOR"
+msgstr "Stop TOR"
+
+msgid "Information provided by tor"
+msgstr "Oplysninger leveret af TOR"
+
+msgid "Attempting to start TOR"
+msgstr "Forsøger at starte TOR"
+
+msgid "Attempting to stop TOR"
+msgstr "Forsøger at stoppe TOR"
+
+#: template/dashboard.php
+msgid "Bridged AP mode is enabled. For Hostname and IP, see your router's admin page."
+msgstr "Bridged AP-tilstand er aktiveret. For værtsnavn og IP, se din routers administratorside."
+
+#: common form controls
+msgid "Save settings"
+msgstr "Gem indstillinger"
+
+msgid "Refresh"
+msgstr "Opdater"
+
+msgid "running"
+msgstr "Kører"
+
+msgid "stopped"
+msgstr "stoppet"
+
+msgid "Remove"
+msgstr "Fjern"
+
+msgid "up"
+msgstr "oppe"
+
+msgid "down"
+msgstr "nede"
+
+msgid "adblock"
+msgstr "adblock"
+
+msgid "Ad Blocking"
+msgstr "Annonceblokering"
+
+msgid "Start Ad Blocking"
+msgstr "Start annonceblokering"
+
+msgid "Restart Ad Blocking"
+msgstr "Genstart annonceblokering"
+
+msgid "Blocklist settings"
+msgstr "Blokeringslisteindstillinger"
+
+msgid "Enable blocklists"
+msgstr "Aktivér blokeringsliste"
+
+msgid "Enable this option if you want RaspAP to <b>block DNS requests for ads, tracking and other virtual garbage</b>. Blocklists are gathered from multiple, actively maintained sources and automatically updated, cleaned, optimized and moderated on a daily basis."
+msgstr "Aktivér denne indstilling, hvis du vil have RaspAP til at <b> blokere DNS-anmodninger om annoncer, sporing og andet virtuelt affald </b>. Blokeringslister samles fra flere, aktivt vedligeholdte kilder og opdateres, renses, optimeres og modereres automatisk dagligt."
+
+msgid "This option adds <code>conf-file</code> and <code>addn-hosts</code> to the dnsmasq configuration."
+msgstr "Denne mulighed tilføjer <code> conf-file </code> og <code> addn-hosts </code> til dnsmasq-konfigurationen."
+
+msgid "Choose a blocklist provider"
+msgstr "Vælg en blokeringslisteudbyder"
+
+msgid "Hostnames blocklist last updated"
+msgstr "Hostnames blokeringsliste senest opdateret"
+
+msgid "Domains blocklist last updated"
+msgstr "Domæneblokeringsliste senest opdateret"
+
+msgid "Update now"
+msgstr "Opdater nu"
+
+msgid "Statistics"
+msgstr "Statistikker"
+
+msgid "Information provided by adblock"
+msgstr "Information leveret af adblock"
+

locale/de_DE/LC_MESSAGES/messages.po

@@ -1,26 +1,23 @@
-# RaspAP Portable Object file
-# Project home: https://github.com/billz/raspap-webgui
-# Licensed under the GNU General Public License v3.0
-# This file is distributed under the same license as the RaspAP package
-# FIRST AUTHOR billzimmerman@gmail.com, 2017
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.2.1\n"
+"Project-Id-Version: raspap\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: Bill Zimmerman <billzimmerman@gmail.com>\n"
 "POT-Creation-Date: 2017-10-19 08:56+0000\n"
-"PO-Revision-Date: 2019-10-21 23:15+0000\n"
+"PO-Revision-Date: 2020-04-12 10:21\n"
-"Last-Translator: Tino Undeutsch\n"
+"Last-Translator: Bill Zimmerman <billzimmerman@gmail.com>\n"
-"Language-Team: \n"
+"Language-Team: German\n"
 "Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Crowdin-Project: raspap\n"
+"X-Crowdin-Language: de\n"
+"X-Crowdin-File: /master/locale/en_US/LC_MESSAGES/messages.po\n"
 
 #: index.php
 msgid "RaspAP Wifi Configuration Portal"
-msgstr "RaspAP WLAN Konfiguration Portal"
+msgstr "RaspAP Wifi Konfigurationsportal"
 
 msgid "Toggle navigation"
 msgstr "Navigation umschalten"
@@ -37,11 +34,17 @@ msgstr "WLAN Client"
 msgid "Hotspot"
 msgstr "Hotspot"
 
+msgid "Memory Use"
+msgstr ""
+
+msgid "CPU Temp"
+msgstr ""
+
 msgid "Networking"
 msgstr "Netzwerk"
 
 msgid "DHCP Server"
-msgstr "DHCP Server"
+msgstr "DHCP-Server"
 
 msgid "OpenVPN"
 msgstr "OpenVPN"
@@ -72,10 +75,10 @@ msgid "Username must not be empty"
 msgstr "Benutzername darf nicht leer sein"
 
 msgid "Admin password updated"
-msgstr "Administrator Passwort aktualisiert"
+msgstr "Admin-Passwort aktualisiert"
 
 msgid "Failed to update admin password"
-msgstr "Aktualisierung Admin Password fehlgeschlagen"
+msgstr "Fehler beim Aktualisieren des Admin-Passwortes"
 
 msgid "Old password does not match"
 msgstr "Altes Passwort nicht korrekt"
@@ -84,7 +87,7 @@ msgid "Username"
 msgstr "Benutzername"
 
 msgid "Old password"
-msgstr "Altes Passwort"
+msgstr "Altes Password"
 
 msgid "New password"
 msgstr "Neues Passwort"
@@ -106,7 +109,7 @@ msgid "Security"
 msgstr "Sicherheit"
 
 msgid "Passphrase"
-msgstr "Passphrase"
+msgstr "Passwort"
 
 msgid "Wifi settings updated successfully"
 msgstr "WLAN Einstellungen erfolgreich aktualisert"
@@ -191,7 +194,7 @@ msgid "Bitrate"
 msgstr "Bitrate"
 
 msgid "Signal Level"
-msgstr "Signalstärke"
+msgstr "Signalpegel"
 
 msgid "Transmit Power"
 msgstr "Sendeleistung"
@@ -230,10 +233,10 @@ msgid "Interface already down"
 msgstr "Schnittstelle bereits aus"
 
 msgid "Start wlan0"
-msgstr "Start wlan0"
+msgstr "wlan0 starten"
 
 msgid "Stop wlan0"
-msgstr "Stop wlan0"
+msgstr "wlan0 beenden"
 
 msgid "Connected Devices"
 msgstr "Verbundene Geräte"
@@ -248,6 +251,9 @@ msgstr "Client Liste"
 msgid "Interface"
 msgstr "Schnittstelle"
 
+msgid "DNS Server"
+msgstr "DNS-Server"
+
 msgid "Starting IP Address"
 msgstr "Erste IP Addresse"
 
@@ -279,16 +285,16 @@ msgid "Host name"
 msgstr "Rechnername"
 
 msgid "Client ID"
-msgstr "Client ID"
+msgstr "Client-ID"
 
 msgid "Information provided by Dnsmasq"
 msgstr "Informationen von 'Dnsmasq'"
 
 msgid "Stop dnsmasq"
-msgstr "Stop dnsmasq"
+msgstr "dnsmasq beenden"
 
 msgid "Start dnsmasq"
-msgstr "Start dnsmasq"
+msgstr "dnsmasq starten"
 
 msgid "Dnsmasq configuration updated successfully"
 msgstr "Dnsmasq Konfiguration erfolgreich übernommen"
@@ -318,31 +324,31 @@ msgid "Dnsmasq is not running"
 msgstr "Dnsmasq läuft nicht"
 
 msgid "Upstream DNS servers"
-msgstr "Upstream DNS servers"
+msgstr "Upstream DNS-Server"
 
 msgid "Only ever query DNS servers configured below"
-msgstr "Only ever query DNS servers configured below"
+msgstr "Nur folgende DNS-Server abfragen"
 
 msgid "Enable this option if you want RaspAP to <b>send DNS queries to the servers configured below exclusively</b>. By default RaspAP also uses its upstream DHCP server's name servers."
-msgstr "Enable this option if you want RaspAP to <b>send DNS queries to the servers configured below exclusively</b>. By default RaspAP also uses its upstream DHCP server's name servers."
+msgstr "Aktivieren Sie diese Option, wenn Sie möchten, dass RaspAP <b>DNS-Abfragen an die unten konfigurierten Server sendet.</b>Standardmäßig verwendet RaspAP auch die Nameserver des ursprünglichen DHCP-Servers."
 
 msgid "This option adds <code>no-resolv</code> to the dnsmasq configuration."
-msgstr "This option adds <code>no-resolv</code> to the dnsmasq configuration."
+msgstr "Diese Option fügt <code>no-resolv</code> zur dnsmasq-Konfiguration hinzu."
 
 msgid "Add upstream DNS server"
-msgstr "Add upstream DNS server"
+msgstr "Upstream DNS-Server hinzufügen"
 
 msgid "Format"
 msgstr "Format"
 
 msgid "Choose a hosted server"
-msgstr "Choose a hosted server"
+msgstr "Gehosteten Server auswählen"
 
 msgid "Log DHCP requests"
-msgstr "Log DHCP requests"
+msgstr "DHCP-Anfragen protokollieren"
 
 msgid "Log DNS queries"
-msgstr "Log DNS queries"
+msgstr "DNS-Anfragen protokollieren"
 
 #: includes/hostapd.php
 msgid "Basic"
@@ -426,6 +432,9 @@ msgstr "Logfile Ausgabe"
 msgid "WiFi client AP mode"
 msgstr "AP-Modus von WiFI-Client"
 
+msgid "Bridged AP mode"
+msgstr ""
+
 msgid "Hide SSID in broadcast"
 msgstr "SSID in der Übertragung ausblenden"
 
@@ -445,9 +454,6 @@ msgstr "Aktuelle Einstellungen"
 msgid "Default Gateway"
 msgstr "Standardgateway"
 
-msgid "DNS Server"
-msgstr "DNS Server"
-
 msgid "Alternate DNS Server"
 msgstr "DNS-Server wechseln"
 
@@ -606,7 +612,7 @@ msgid "Diffie Hellman parameters"
 msgstr "Diffie-Hellman-Parameter"
 
 msgid "KeepAlive"
-msgstr "KeepAlive"
+msgstr ""
 
 msgid "Server log"
 msgstr "Serverprotokoll"
@@ -660,6 +666,10 @@ msgstr "Versuch, TOR zu starten"
 msgid "Attempting to stop TOR"
 msgstr "Versuch, TOR zu stoppen"
 
+#: template/dashboard.php
+msgid "Bridged AP mode is enabled. For Hostname and IP, see your router's admin page."
+msgstr ""
+
 #: common form controls
 msgid "Save settings"
 msgstr "Einstellungen speichern"
@@ -682,3 +692,45 @@ msgstr "oben"
 msgid "down"
 msgstr "unten"
 
+msgid "adblock"
+msgstr ""
+
+msgid "Ad Blocking"
+msgstr ""
+
+msgid "Start Ad Blocking"
+msgstr ""
+
+msgid "Restart Ad Blocking"
+msgstr ""
+
+msgid "Blocklist settings"
+msgstr ""
+
+msgid "Enable blocklists"
+msgstr ""
+
+msgid "Enable this option if you want RaspAP to <b>block DNS requests for ads, tracking and other virtual garbage</b>. Blocklists are gathered from multiple, actively maintained sources and automatically updated, cleaned, optimized and moderated on a daily basis."
+msgstr ""
+
+msgid "This option adds <code>conf-file</code> and <code>addn-hosts</code> to the dnsmasq configuration."
+msgstr ""
+
+msgid "Choose a blocklist provider"
+msgstr ""
+
+msgid "Hostnames blocklist last updated"
+msgstr ""
+
+msgid "Domains blocklist last updated"
+msgstr ""
+
+msgid "Update now"
+msgstr "Jetzt aktualisieren"
+
+msgid "Statistics"
+msgstr "Statistiken"
+
+msgid "Information provided by adblock"
+msgstr ""
+

locale/en_US/LC_MESSAGES/messages.po

@@ -37,6 +37,12 @@ msgstr "WiFi client"
 msgid "Hotspot"
 msgstr "Hotspot"
 
+msgid "Memory Use"
+msgstr "Memory Use"
+
+msgid "CPU Temp"
+msgstr "CPU Temp"
+
 msgid "Networking"
 msgstr "Networking"
 
@@ -178,8 +184,8 @@ msgstr "Transferred Packets"
 msgid "Transferred Bytes"
 msgstr "Transferred Bytes"
 
-msgid "Wireless Information"
+msgid "Wireless Client"
-msgstr "Wireless Information"
+msgstr "Wireless Client"
 
 msgid "Connected To"
 msgstr "Connected To"

locale/it_IT/LC_MESSAGES/messages.po

@@ -1,22 +1,19 @@
-# RaspAP Portable Object file
-# Project home: https://github.com/billz/raspap-webgui
-# Licensed under the GNU General Public License v3.0
-# This file is distributed under the same license as the RaspAP package
-# FIRST AUTHOR Simone Rizzo <simone.rizzo@live.com>, 2017
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.2.1\n"
+"Project-Id-Version: raspap\n"
 "Report-Msgid-Bugs-To: Bill Zimmerman <billzimmerman@gmail.com>\n"
 "POT-Creation-Date: 2017-10-19 08:56+0000\n"
-"PO-Revision-Date: 2019-10-21 23:15+0000\n"
+"PO-Revision-Date: 2020-04-12 10:21\n"
-"Last-Translator: Simone Rizzo <simone.rizzo@live.com>\n"
+"Last-Translator: Marco Fantauzzo <marco97pa@live.it>\n"
-"Language-Team: \n"
+"Language-Team: Italian\n"
-"Language: en_US\n"
+"Language: it_IT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Crowdin-Project: raspap\n"
+"X-Crowdin-Language: it\n"
+"X-Crowdin-File: /master/locale/en_US/LC_MESSAGES/messages.po\n"
 
 #: index.php
 msgid "RaspAP Wifi Configuration Portal"
@@ -26,7 +23,7 @@ msgid "Toggle navigation"
 msgstr "Mostra/nascondi navigazione"
 
 msgid "RaspAP Wifi Portal"
-msgstr "RaspAP Wifi Portal"
+msgstr "Portale RaspAP WiFi"
 
 msgid "Dashboard"
 msgstr "Dashboard"
@@ -37,6 +34,12 @@ msgstr "Client WiFi"
 msgid "Hotspot"
 msgstr "Hotspot"
 
+msgid "Memory Use"
+msgstr "Memoria utilizzata"
+
+msgid "CPU Temp"
+msgstr "Temperatura CPU"
+
 msgid "Networking"
 msgstr "Rete"
 
@@ -109,19 +112,19 @@ msgid "Passphrase"
 msgstr "Chiave di sicurezza"
 
 msgid "Wifi settings updated successfully"
-msgstr "Impostazioni Wifi aggiornate con successo"
+msgstr "Impostazioni WiFi aggiornate con successo"
 
-msgid "Wifi settings updated but cannot restart (cannon execute 'wpa_cli reconfigure')"
+msgid "Wifi settings updated but cannot restart (cannot execute 'wpa_cli reconfigure')"
-msgstr "Impostazioni Wifi aggiornate ma impossibile riavviare (impossibile eseguire 'wpa_cli reconfigure')"
+msgstr "Impostazioni WiFi aggiornate, ma non è stato possibile riavviare (impossibile eseguire 'wpa_cli reconfigure')"
 
 msgid "Wifi settings failed to be updated"
-msgstr "Non è stato possibile aggiornare le impostazioni Wifi"
+msgstr "Non è stato possibile aggiornare le impostazioni WiFi"
 
 msgid "Failed to update wifi settings"
-msgstr "Impossibile aggiornare le impostazioni Wifi"
+msgstr "Impossibile aggiornare le impostazioni WiFi"
 
 msgid "Rescan"
-msgstr "Ripeti la scan"
+msgstr "Riscansiona"
 
 msgid "Update"
 msgstr "Aggiorna"
@@ -203,13 +206,13 @@ msgid "Link Quality"
 msgstr "Qualità collegamento"
 
 msgid "Information provided by ip and iw and from system"
-msgstr "Informazioni fornite dall'ip e iw a dal sistema"
+msgstr "Informazioni fornite da ip, iw e dal sistema"
 
 msgid "No MAC Address Found"
 msgstr "Indirizzo MAC non trovato"
 
 msgid "No IP Address Found"
-msgstr "Indirizzo IP no trovato"
+msgstr "Indirizzo IP non trovato"
 
 msgid "No Subnet Mask Found"
 msgstr "Subnet mask non trovata"
@@ -248,6 +251,9 @@ msgstr "Lista client"
 msgid "Interface"
 msgstr "Interfaccia"
 
+msgid "DNS Server"
+msgstr "Server DNS"
+
 msgid "Starting IP Address"
 msgstr "Indirizzo IP iniziale"
 
@@ -282,7 +288,7 @@ msgid "Client ID"
 msgstr "ID client"
 
 msgid "Information provided by Dnsmasq"
-msgstr "Informazioni fornite da Dnsmasq"
+msgstr "Informazioni fornite da dnsmasq"
 
 msgid "Stop dnsmasq"
 msgstr "Ferma dnsmasq"
@@ -294,22 +300,22 @@ msgid "Dnsmasq configuration updated successfully"
 msgstr "Configurazione Dnsmasq aggiornata con successo"
 
 msgid "dnsmasq already running"
-msgstr "dnsmasq è già in esecuzione"
+msgstr "Dnsmasq è già in esecuzione"
 
 msgid "Successfully started dnsmasq"
-msgstr "dnsmasq avviato con successo"
+msgstr "Dnsmasq è stato avviato con successo"
 
 msgid "Failed to start dnsmasq"
 msgstr "Impossibile avviare dnsmasq"
 
 msgid "Successfully stopped dnsmasq"
-msgstr "dnsmasq fermato con successo"
+msgstr "Dnsmasq è stato fermato con successo"
 
 msgid "Failed to stop dnsmasq"
 msgstr "Impossibile fermare dnsmasq"
 
 msgid "dnsmasq already stopped"
-msgstr "dnsmasq è già stoppato"
+msgstr "Dnsmasq è già stoppato"
 
 msgid "Dnsmasq is running"
 msgstr "Dnsmasq è in esecuzione"
@@ -321,28 +327,28 @@ msgid "Upstream DNS servers"
 msgstr "Upstream DNS servers"
 
 msgid "Only ever query DNS servers configured below"
-msgstr "Only ever query DNS servers configured below"
+msgstr "Cerca sempre soltanto i server DNS configurati qui sotto"
 
 msgid "Enable this option if you want RaspAP to <b>send DNS queries to the servers configured below exclusively</b>. By default RaspAP also uses its upstream DHCP server's name servers."
-msgstr "Enable this option if you want RaspAP to <b>send DNS queries to the servers configured below exclusively</b>. By default RaspAP also uses its upstream DHCP server's name servers."
+msgstr "Abilita questa opzione se desideri che RaspAP <b>invii query DNS esclusivamente ai server configurati di seguito</b>. Per impostazione predefinita RaspAP utilizza anche i nomi degli upstream DHCP server."
 
 msgid "This option adds <code>no-resolv</code> to the dnsmasq configuration."
-msgstr "This option adds <code>no-resolv</code> to the dnsmasq configuration."
+msgstr "Questa opzione aggiunge <code>no-resolv</code> alla configurazione dnsmasq."
 
 msgid "Add upstream DNS server"
-msgstr "Add upstream DNS server"
+msgstr "Aggiungi server DNS upstream"
 
 msgid "Format"
-msgstr "Format"
+msgstr "Formato"
 
 msgid "Choose a hosted server"
-msgstr "Choose a hosted server"
+msgstr "Scegli un hosted server"
 
 msgid "Log DHCP requests"
-msgstr "Log DHCP requests"
+msgstr "Registra le richieste DHCP"
 
 msgid "Log DNS queries"
-msgstr "Log DNS queries"
+msgstr "Registra query DNS"
 
 #: includes/hostapd.php
 msgid "Basic"
@@ -400,13 +406,13 @@ msgid "Unknown interface"
 msgstr "Interfaccia sconosciuta"
 
 msgid "Country code must be blank or two characters"
-msgstr "Il codice paese deve essere o vuoto o di due caratteri"
+msgstr "Il codice paese deve essere vuoto o di due caratteri"
 
 msgid "Wifi Hotspot settings saved"
-msgstr "Impostazioni hotspot Wifi salvate"
+msgstr "Impostazioni hotspot WiFi salvate"
 
 msgid "Unable to save wifi hotspot settings"
-msgstr "Impossibile salvare le impostazioni dell'hotspot Wifi"
+msgstr "Impossibile salvare le impostazioni dell'hotspot WiFi"
 
 msgid "Start hotspot"
 msgstr "Avvia l'hotspot"
@@ -426,8 +432,11 @@ msgstr "File di log in uscita"
 msgid "WiFi client AP mode"
 msgstr "AP WiFi modalità client"
 
+msgid "Bridged AP mode"
+msgstr "Modalità AP Bridged"
+
 msgid "Hide SSID in broadcast"
-msgstr "Nascondere la trasmissione del SSID"
+msgstr "Nascondi la trasmissione del SSID"
 
 msgid "Maximum number of clients"
 msgstr "Numero massimo di client"
@@ -445,9 +454,6 @@ msgstr "Impostazioni attuali"
 msgid "Default Gateway"
 msgstr "Gateway predefinito"
 
-msgid "DNS Server"
-msgstr "Server DNS"
-
 msgid "Alternate DNS Server"
 msgstr "Server DNS alternativo"
 
@@ -455,7 +461,7 @@ msgid "Adapter IP Address Settings"
 msgstr "Impostazioni dell'indirizzo IP dell'adattatore"
 
 msgid "Enable Fallback to Static Option"
-msgstr "Abilita l'opzione statica di fallback"
+msgstr "Abilita il fallback alle Opzioni IP statiche"
 
 msgid "Static IP"
 msgstr "IP statico"
@@ -498,7 +504,7 @@ msgid "Hostname"
 msgstr "Nome host"
 
 msgid "Pi Revision"
-msgstr "Revisione Pi"
+msgstr "Modello Pi"
 
 msgid "Uptime"
 msgstr "Tempo di attività"
@@ -560,10 +566,10 @@ msgid "date"
 msgstr "data"
 
 msgid "Send MB"
-msgstr "Invia MB"
+msgstr "MB inviati"
 
 msgid "Receive MB"
-msgstr "Ricevi MB"
+msgstr "MB ricevuti"
 
 msgid "Information provided by vnstat"
 msgstr "Informazioni fornite da vnstat"
@@ -618,13 +624,13 @@ msgid "Stop OpenVPN"
 msgstr "Arresta OpenVPN"
 
 msgid "Information provided by openvpn"
-msgstr "Informazioni fornite da openvpn"
+msgstr "Informazioni fornite da OpenVPN"
 
 msgid "Attempting to start openvpn"
-msgstr "Tentativo di avviare openvpn in corso"
+msgstr "Tentativo di avviare OpenVPN in corso"
 
 msgid "Attempting to stop openvpn"
-msgstr "Tentativo di arrestare openvpn in corso"
+msgstr "Tentativo di arrestare OpenVPN in corso"
 
 #: includes/torproxy.php
 msgid "TOR is not running"
@@ -640,7 +646,7 @@ msgid "Relay settings"
 msgstr "Impostazioni di inoltro"
 
 msgid "Nickname"
-msgstr "Nickname"
+msgstr "Soprannome"
 
 msgid "Address"
 msgstr "Indirizzo"
@@ -652,7 +658,7 @@ msgid "Stop TOR"
 msgstr "Arresta TOR"
 
 msgid "Information provided by tor"
-msgstr "Informazioni fornite da tor"
+msgstr "Informazioni fornite da TOR"
 
 msgid "Attempting to start TOR"
 msgstr "Tentativo di avviare TOR in corso"
@@ -660,6 +666,10 @@ msgstr "Tentativo di avviare TOR in corso"
 msgid "Attempting to stop TOR"
 msgstr "Tentativo di arrestare TOR in corso"
 
+#: template/dashboard.php
+msgid "Bridged AP mode is enabled. For Hostname and IP, see your router's admin page."
+msgstr "La modalità AP Bridged è abilitata. Per l'hostname e l'IP, consulta la pagina di amministrazione del router."
+
 #: common form controls
 msgid "Save settings"
 msgstr "Salva impostazioni"
@@ -677,8 +687,50 @@ msgid "Remove"
 msgstr "Rimuovi"
 
 msgid "up"
-msgstr "su"
+msgstr "attivo"
 
 msgid "down"
-msgstr "giù"
+msgstr "disattivo"
+
+msgid "adblock"
+msgstr "AdBlock"
+
+msgid "Ad Blocking"
+msgstr "Blocco degli annunci"
+
+msgid "Start Ad Blocking"
+msgstr "Avvia blocco degli annunci"
+
+msgid "Restart Ad Blocking"
+msgstr "Riavvia blocco degli annunci"
+
+msgid "Blocklist settings"
+msgstr "Impostazioni Blocklist"
+
+msgid "Enable blocklists"
+msgstr "Abilita blocklist"
+
+msgid "Enable this option if you want RaspAP to <b>block DNS requests for ads, tracking and other virtual garbage</b>. Blocklists are gathered from multiple, actively maintained sources and automatically updated, cleaned, optimized and moderated on a daily basis."
+msgstr "Abilita questa opzione se vuoi che RaspAP blocchi <b>le richieste DNS per pubblicità, tracciamento e altra spazzatura virtuale</b>. Le Blocklist sono raccolte da fonti multiple, gestite attivamente e automaticamente aggiornate, pulite, ottimizzate e moderate su base quotidiana."
+
+msgid "This option adds <code>conf-file</code> and <code>addn-hosts</code> to the dnsmasq configuration."
+msgstr "Questa opzione aggiunge <code>conf-file</code> e <code>addn-host</code> alla configurazione dnsmasq."
+
+msgid "Choose a blocklist provider"
+msgstr "Scegli un provider di blocklist"
+
+msgid "Hostnames blocklist last updated"
+msgstr "Ultimo aggiornamento blocklist hostnames"
+
+msgid "Domains blocklist last updated"
+msgstr "Ultimo aggiornamento blocklist domini"
+
+msgid "Update now"
+msgstr "Aggiorna adesso"
+
+msgid "Statistics"
+msgstr "Statistiche"
+
+msgid "Information provided by adblock"
+msgstr "Informazioni fornite da Adblock"
 

locale/si_LK/LC_MESSAGES/messages.po

@@ -1,668 +0,0 @@
-# RaspAP Portable Object file
-# Project home: https://github.com/billz/raspap-webgui
-# Licensed under the GNU General Public License v3.0
-# This file is distributed under the same license as the RaspAP package
-# FIRST AUTHOR billzimmerman@gmail.com, 2017
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: 1.2.1\n"
-"Report-Msgid-Bugs-To: Bill Zimmerman <billzimmerman@gmail.com>\n"
-"POT-Creation-Date: 2017-10-19 08:56+0000\n"
-"PO-Revision-Date: 2019-10-21 23:15+0000\n"
-"Last-Translator: Bill Zimmerman <billzimmerman@gmail.com>\n"
-"Language-Team: \n"
-"Language: si_LK\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: index.php
-msgid "RaspAP Wifi Configuration Portal"
-msgstr "RaspAP Wifi සැකසුම් වෙබ් අඩවිය"
-
-msgid "Toggle navigation"
-msgstr "හුවමාරුවීම"
-
-msgid "RaspAP Wifi Portal"
-msgstr "RaspAP Wifi වෙබ් අඩවිය"
-
-msgid "Dashboard"
-msgstr "උපකාරක පුවරුව"
-
-msgid "WiFi client"
-msgstr "WiFi සේවාලාභි "
-
-msgid "Hotspot"
-msgstr "හොට්ස්පොට් සැකසුම"
-
-msgid "Networking"
-msgstr "ජාලකරණ සැකසුම"
-
-msgid "DHCP Server"
-msgstr "DHCP සර්වර් සැකසුම"
-
-msgid "OpenVPN"
-msgstr "OpenVPN සැකසුම" 
-
-msgid "TOR proxy"
-msgstr "TOR proxy සැකසුම"
-
-msgid "Authentication"
-msgstr "සත්‍යාපනය වින්‍යාස කරන්න"
-
-msgid "Change Theme"
-msgstr "පසුබිම් සැකසුම"
-
-msgid "System"
-msgstr "පද්ධතිය"
-
-#: includes/admin.php
-msgid "Authentication settings"
-msgstr "Authentication settings"
-
-msgid "New passwords do not match"
-msgstr "නව මුරපදයන් නොගැලපේ"
-
-msgid "Username must not be empty"
-msgstr "පරිශීලක නාමය හිස් නොවිය යුතුය"
-
-msgid "Admin password updated"
-msgstr "පරිපාලක මුරපදය යාවත්කාලීන වීම සාර්ථකයි"
-
-msgid "Failed to update admin password"
-msgstr "පරිපාලක මුරපදය යාවත්කාලීන කිරීම අසාර්ථකයි"
-
-msgid "Old password does not match"
-msgstr "පැරණි  මුරපදය නොගැලපේ"
-
-msgid "Username"
-msgstr "පරිශීලක නාමය"
-
-msgid "Old password"
-msgstr "පැරණි  මුරපදය"
-
-msgid "New password"
-msgstr "නව මුරපදය"
-
-msgid "Repeat new password"
-msgstr "නව මුරපදය නැවත සිදු කරන්න"
-
-#: includes/configure_client.php
-msgid "Client settings"
-msgstr "සේවාදායක සැකසුම්"
-
-msgid "SSID"
-msgstr "සේවා නිර්ණය කිරීම"
-
-msgid "Channel"
-msgstr "නාලිකාව"
-
-msgid "Security"
-msgstr "ආරක්ෂාව"
-
-msgid "Passphrase"
-msgstr "මුරපදය"
-
-msgid "Wifi settings updated successfully"
-msgstr "Wifi සැකසුම්  යාවත්කාලීන වීම සාර්ථකයි"
-
-msgid "Wifi settings updated but cannot restart (cannot execute 'wpa_cli reconfigure')"
-msgstr "Wifi සැකසුම් යාවත්කාලීන කර ඇති නමුත් එය නැවත ආරම්භ කළ නොහැක (wpa_cli reconfigure ක්‍රියාත්මක කළ නොහැක)"
-
-msgid "Wifi settings failed to be updated"
-msgstr "Wifi සැකසුම් යාවත්කාලීන කිරීම නොහැකිය"
-
-msgid "Failed to update wifi settings"
-msgstr "Wifi සැකසුම් යාවත්කාල කිරීමට අසමත් විය"
-
-msgid "Rescan"
-msgstr "නැවත සුපිරික්සා කරන්න"
-
-msgid "Update"
-msgstr "යාවත්කාලීන කිරීම"
-
-msgid "Add"
-msgstr "එක් කරන්න"
-
-msgid "Delete"
-msgstr "මකා දමන්න"
-
-msgid "Show"
-msgstr "Show"
-
-msgid "Hide"
-msgstr "Hide"
-
-msgid "Not configured"
-msgstr "Not configured"
-
-msgid "<strong>Note:</strong> WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP"
-msgstr "<strong> සටහන: </ strong> WEP ප්‍රවේශ වීමේ ස්ථාන 'විවෘත' ලෙස පෙනේ. RaspAP දැනට WEP වෙත සම්බන්ධ වීමට සහාය නොදේ"
-
-#: includes/dashboard.php
-msgid "Interface Information"
-msgstr "අතුරුමුහුණත් තොරතුරු"
-
-msgid "Interface Name"
-msgstr "අතුරුමුහුණත නම"
-
-msgid "IP Address"
-msgstr "IP ලිපිනය"
-
-msgid "Subnet Mask"
-msgstr "උපජාල ආවරණය"
-
-msgid "Mac Address"
-msgstr "Mac ලිපිනය"
-
-msgid "Interface Statistics"
-msgstr "අතුරු මුහුණත සංඛ්‍යාලේඛන"
-
-msgid "Received Packets"
-msgstr "ලබාගත් දත්ත පැකට් ප්‍රමාණය"
-
-msgid "Received Bytes"
-msgstr "ලැබුණු බයිට් ප්‍රමාණය"
-
-msgid "Transferred Packets"
-msgstr "යවන ලද  දත්ත පැකට් ප්‍රමාණය"
-
-msgid "Transferred Bytes"
-msgstr "යවන ලද  බයිට් ප්‍රමාණය"
-
-msgid "Wireless Information"
-msgstr "රැහැන් රහිත පද්ධතියේ තොරතුරු"
-
-msgid "Connected To"
-msgstr "සම්බන්ධයි"
-
-msgid "AP Mac Address"
-msgstr "AP Mac ලිපිනය"
-
-msgid "Bitrate"
-msgstr "බිට් අනුපාතය"
-
-msgid "Signal Level"
-msgstr "සංඥා මට්ටම"
-
-msgid "Transmit Power"
-msgstr "සම්පේශණ බලය"
-
-msgid "Frequency"
-msgstr "සංඛ්‍යාතය"
-
-msgid "Link Quality"
-msgstr "සබැඳියෙහි  ගුණත්වය"
-
-msgid "Information provided by ip and iw and from system"
-msgstr "ip සහ iw සපයන ලද තොරතුරු"
-
-msgid "No MAC Address Found"
-msgstr "MAC ලිපිනයක් නොමැත"
-
-msgid "No IP Address Found"
-msgstr "කිසිදු IP ලිපිනයක් සොයාගත නොහැකි විය"
-
-msgid "No Subnet Mask Found"
-msgstr "උපජාල ආවරණයක් සොයාගත නොහැකි විය"
-
-msgid "No Data"
-msgstr "දත්ත නැත"
-
-msgid "Not connected"
-msgstr "සම්බන්ධ නොවේ"
-
-msgid "Interface is up"
-msgstr "අතුරුමුහුණත සක්‍රීය විය"
-
-msgid "Interface is down"
-msgstr "අතුරුමුහුණත අක්‍රීය විය"
-
-msgid "Interface already down"
-msgstr "අතුරුමුහුණත අක්‍රීය වී ඇත"
-
-msgid "Start wlan0"
-msgstr "wlan0 ආරම්භ කරන්න"
-
-msgid "Stop wlan0"
-msgstr "wlan0 නතර කරන්න"
-
-msgid "Connected Devices"
-msgstr "සම්බන්ධිත උපකරණ"
-
-#: includes/dhcp.php
-msgid "DHCP server settings"
-msgstr "සර්වර සැකසීම්"
-
-msgid "Client list"
-msgstr "සේවාදායක ලැයිස්තුව"
-
-msgid "Interface"
-msgstr "Interface"
-
-msgid "Starting IP Address"
-msgstr "IP ලිපිනය ආරම්භ කිරීම"
-
-msgid "Ending IP Address"
-msgstr "IP ලිපිනය අවසන් කිරීම"
-
-msgid "Static Leases"
-msgstr "Static Leases"
-
-msgid "Add static DHCP lease"
-msgstr "Add static DHCP lease"
-
-msgid "Lease Time"
-msgstr "කල් පිරෙන කාලය"
-
-msgid "Interval"
-msgstr "කාල පරතරය"
-
-msgid "Active DHCP leases"
-msgstr "ක්‍රියාකාරී DHCP කාලය"
-
-msgid "Expire time"
-msgstr "කල් ඉකුත්වන්න කාලය"
-
-msgid "MAC Address"
-msgstr "MAC ලිපිනය "
-
-msgid "Host name"
-msgstr "Host නාමය"
-
-msgid "Client ID"
-msgstr "සේවාලාභී හැඳුනුම්පත් අංකය "
-
-msgid "Information provided by Dnsmasq"
-msgstr "Dnsmasq විසින් සපයන ලද තොරතුරු"
-
-msgid "Stop dnsmasq"
-msgstr "Dnsmasq නතර කරන්න"
-
-msgid "Start dnsmasq"
-msgstr "dnsmasq ආරම්භ කරන්න "
-
-msgid "Dnsmasq configuration updated successfully"
-msgstr "Dnsmasq සැකසීම  සාර්ථකව යාවත්කාලීන කර ඇත"
-
-msgid "dnsmasq already running"
-msgstr "dnsmasq දැනටමත් ක්‍රියාත්මක වේ"
-
-msgid "Successfully started dnsmasq"
-msgstr "dnsmasq සාර්ථකව ආරම්භ විය "
-
-msgid "Failed to start dnsmasq"
-msgstr "Dnsmasq ආරම්භ කිරීමට අපොහොසත් විය"
-
-msgid "Successfully stopped dnsmasq"
-msgstr " dnsmasq සාර්ථකව නතර කරන ලදී "
-
-msgid "Failed to stop dnsmasq"
-msgstr "Failed to stop dnsmasq"
-
-msgid "dnsmasq already stopped"
-msgstr "dnsmasq already stopped"
-
-msgid "Dnsmasq is running"
-msgstr "Dnsmasq is running"
-
-msgid "Dnsmasq is not running"
-msgstr "Dnsmasq ක්‍රියාත්මක නොවේ"
-
-msgid "Upstream DNS servers"
-msgstr "Upstream DNS servers"
-
-msgid "Only ever query DNS servers configured below"
-msgstr "Only ever query DNS servers configured below"
-
-msgid "Enable this option if you want RaspAP to <b>send DNS queries to the servers configured below exclusively</b>. By default RaspAP also uses its upstream DHCP server's name servers."
-msgstr "Enable this option if you want RaspAP to <b>send DNS queries to the servers configured below exclusively</b>. By default RaspAP also uses its upstream DHCP server's name servers."
-
-msgid "This option adds <code>no-resolv</code> to the dnsmasq configuration."
-msgstr "This option adds <code>no-resolv</code> to the dnsmasq configuration."
-
-msgid "Add upstream DNS server"
-msgstr "Add upstream DNS server"
-
-msgid "Format"
-msgstr "Format"
-
-msgid "Choose a hosted server"
-msgstr "Choose a hosted server"
-
-msgid "Log DHCP requests"
-msgstr "Log DHCP requests"
-
-msgid "Log DNS queries"
-msgstr "Log DNS queries"
-
-#: includes/hostapd.php
-msgid "Basic"
-msgstr "මූලික"
-
-msgid "Advanced"
-msgstr "උසස්"
-
-msgid "Basic settings"
-msgstr "මූලික සැකසුම්"
-
-msgid "Wireless Mode"
-msgstr "රැහැන් රහිත ක්‍රම "
-
-msgid "Security settings"
-msgstr "ආරක්ෂක සැකසුම්"
-
-msgid "Security type"
-msgstr "ආරක්ෂක ක්‍රමය  "
-
-msgid "Encryption Type"
-msgstr "ගුප්තකේතන වර්ගය"
-
-msgid "PSK"
-msgstr "පූර්ව යෝජිත යතුර (PSK)"
-
-msgid "Advanced settings"
-msgstr "උසස් සැකසුම්"
-
-msgid "Country Code"
-msgstr "රටේ කේතය"
-
-msgid "Information provided by hostapd"
-msgstr "hostapd විසින් සපයන ලද තොරතුරු"
-
-msgid "Attempting to start hotspot"
-msgstr "Hotspot ආරම්භ කිරීමට උත්සාහ කිරීම"
-
-msgid "Attempting to stop hotspot"
-msgstr "Hotspot නතර කිරීමට උත්සාහ කිරීම"
-
-msgid "HostAPD is not running"
-msgstr "HostAPD ක්‍රියාත්මක නොවේ"
-
-msgid "HostAPD is running"
-msgstr "HostAPD ක්‍රියාත්මක වේ"
-
-msgid "SSID must be between 1 and 32 characters"
-msgstr "SSID අක්ෂර 1 සිට 32 දක්වා විය යුතුය"
-
-msgid "WPA passphrase must be between 8 and 63 characters"
-msgstr "WPA රහස්පදය අක්ෂර 8 සිට  63 අතර විය යුතුය"
-
-msgid "Unknown interface"
-msgstr "නොදන්නා අතුරු මුහුණතක්"
-
-msgid "Country code must be blank or two characters"
-msgstr "රටේ කේතය හිස් ව හෝ අක්ෂර දෙකක්  විය යුතුය"
-
-msgid "Wifi Hotspot settings saved"
-msgstr "Wifi හොට්ස්පොට් සැකසීම් සුරකින ලදි"
-
-msgid "Unable to save wifi hotspot settings"
-msgstr "WiFi hotspot සැකසුම් සුරැකීමට නොහැකි විය"
-
-msgid "Start hotspot"
-msgstr "hotspot ආරම්භ කරන්න "
-
-msgid "Stop hotspot"
-msgstr "hotspot නතර  කරන්න"
-
-msgid "Restart hotspot"
-msgstr "hotspot නැවත ආරම්භ"
-
-msgid "Enable logging"
-msgstr "ඇතුල්වීම සක්‍රිය කරන්න "
-
-msgid "Logfile output"
-msgstr " ලොග්ෆයිල් නිමැවුම "
-
-msgid "WiFi client AP mode"
-msgstr "WiFi client AP mode"
-
-msgid "Hide SSID in broadcast"
-msgstr "Hide SSID in broadcast"
-
-msgid "Maximum number of clients"
-msgstr "Maximum number of clients"
-
-msgid "Configures the max_num_sta option of hostapd. The default and maximum is 2007. If empty or 0, the default applies."
-msgstr "Configures the max_num_sta option of hostapd. The default and maximum is 2007. If empty or 0, the default applies."
-
-#: includes/networking.php
-msgid "Summary"
-msgstr "Summary"
-
-msgid "Current settings"
-msgstr "වත්මන් සැකසුම්"
-
-msgid "Default Gateway"
-msgstr "මුලික දොරටුව"
-
-msgid "DNS Server"
-msgstr "DNS සේවාදායකය"
-
-msgid "Alternate DNS Server"
-msgstr "විකල්ප DNS සේවාදායකය"
-
-msgid "Adapter IP Address Settings"
-msgstr "ඇඩැප්ටරහි IP ලිපින සැකසුම්"
-
-msgid "Enable Fallback to Static Option"
-msgstr "ස්ථාවර  විකල්ප ක්‍රමයට   සක්‍රිය කරන්න  "
-
-msgid "Static IP"
-msgstr "Static IP"
-
-msgid "Enabled"
-msgstr "සක්‍රිය කර ඇත "
-
-msgid "Disabled"
-msgstr "ක්‍රියා විරහිත වී ඇත "
-
-msgid "Static IP Options"
-msgstr "ස්ථාවර  IP ක්‍රම "
-
-msgid "Apply settings"
-msgstr "සැකසීම් කරන්න"
-
-msgid "Information provided by /sys/class/net"
-msgstr "/ Sys / class / net විසින් සපයන ලද තොරතුරු"
-
-#: includes/system.php
-msgid "System Information"
-msgstr "පද්ධති තොරතුරු"
-
-msgid "Language"
-msgstr "භාෂාව"
-
-msgid "Language settings"
-msgstr "භාෂා සැකසුම්"
-
-msgid "Select a language"
-msgstr "භාෂාව තෝරන්න"
-
-msgid "Language setting saved"
-msgstr "භාෂා සැකසුම්  සුරකිනි "
-
-msgid "Console"
-msgstr "පාලන පුවරුව"
-
-msgid "Hostname"
-msgstr "සත්කාරක නාමය"
-
-msgid "Pi Revision"
-msgstr "Pi සංශෝදිතය "
-
-msgid "Uptime"
-msgstr "ක්‍රියාත්මක කළා සිමාව "
-
-msgid "Memory Used"
-msgstr "භාවිතා කල මතක ධාරිතාවය  "
-
-msgid "CPU Load"
-msgstr "CPU ධාරිතාවය"
-
-msgid "Reboot"
-msgstr "නැවත ආරම්භ කරන්න"
-
-msgid "Shutdown"
-msgstr "වසා දමන්න"
-
-msgid "System Rebooting Now!"
-msgstr "දැන් .... පද්ධතිය නැවත ක්‍රියාත්මක කරන්න  !"
-
-msgid "System Shutting Down Now!"
-msgstr "දැන් .... පද්ධතිය වසා දමන්න  !"
-
-#: includes/themes.php
-msgid "Theme settings"
-msgstr "තේමා සැකසුම්"
-
-msgid "Select a theme"
-msgstr "තේමාවක් තෝරන්න"
-
-#: includes/data_usage.php
-msgid "Data usage"
-msgstr "දත්ත භාවිතය"
-
-msgid "Data usage monitoring"
-msgstr "දත්ත භාවිතය පිළිබඳ අධීක්ෂණය"
-
-msgid "Hourly traffic amount"
-msgstr "Hourly traffic amount"
-
-msgid "Daily traffic amount"
-msgstr "Daily traffic amount"
-
-msgid "Monthly traffic amount"
-msgstr "මාසිකව ප්ර වාහනය  කරන ලද දත්ත ප්ර මාණය"
-
-msgid "interface"
-msgstr "අතුරුමුහුණත"
-
-msgid "date"
-msgstr "දිනය "
-
-msgid "Send MB"
-msgstr "යවන ලද  MB"
-
-msgid "Receive MB"
-msgstr "ලැබුණු  MB"
-
-msgid "Information provided by vnstat"
-msgstr "Vnstat විසින් සපයන ලද තොරතුරු"
-
-msgid "Loading {0} bandwidth chart"
-msgstr "දත්ත පරාස  වගු {0}  ආරම්භ වෙමින් පවතී  "
-
-msgid "Showing {0} to {1} of {2} entries"
-msgstr "{0} දක්වා  {1} / {2} ඇතුළත් කිරීම් පෙන්වමින් පවතී  "
-
-#: includes/openvpn.php
-msgid "OpenVPN is not running"
-msgstr "OpenVPN is not running"
-
-msgid "OpenVPN is running"
-msgstr "OpenVPN is running"
-
-msgid "Server settings"
-msgstr "Server settings"
-
-msgid "Select OpenVPN configuration file (.ovpn)"
-msgstr "Select OpenVPN configuration file (.ovpn)"
-
-msgid "Client Log"
-msgstr "Client Log"
-
-msgid "Port"
-msgstr "Port"
-
-msgid "Protocol"
-msgstr "Protocol"
-
-msgid "Root CA certificate"
-msgstr "Root CA certificate"
-
-msgid "Server certificate"
-msgstr "Server certificate"
-
-msgid "Diffie Hellman parameters"
-msgstr "Diffie Hellman parameters"
-
-msgid "KeepAlive"
-msgstr "KeepAlive"
-
-msgid "Server log"
-msgstr "Server log"
-
-msgid "Start OpenVPN"
-msgstr "Start OpenVPN"
-
-msgid "Stop OpenVPN"
-msgstr "Stop OpenVPN"
-
-msgid "Information provided by openvpn"
-msgstr "Information provided by openvpn"
-
-msgid "Attempting to start openvpn"
-msgstr "Attempting to start openvpn"
-
-msgid "Attempting to stop openvpn"
-msgstr "Attempting to stop openvpn"
-
-#: includes/torproxy.php
-msgid "TOR is not running"
-msgstr "TOR is not running"
-
-msgid "TOR is running"
-msgstr "TOR is running"
-
-msgid "Relay"
-msgstr "Relay"
-
-msgid "Relay settings"
-msgstr "Relay settings"
-
-msgid "Nickname"
-msgstr "Nickname"
-
-msgid "Address"
-msgstr "Address"
-
-msgid "Start TOR"
-msgstr "Start TOR"
-
-msgid "Stop TOR"
-msgstr "Stop TOR"
-
-msgid "Information provided by tor"
-msgstr "Information provided by tor"
-
-msgid "Attempting to start TOR"
-msgstr "Attempting to start TOR"
-
-msgid "Attempting to stop TOR"
-msgstr "Attempting to stop TOR"
-
-#: common form controls
-msgid "Save settings"
-msgstr "සැකසුම් සුරකින්න"
-
-msgid "Refresh"
-msgstr "ප්‍රාණවත් කරන්න"
-
-msgid "running"
-msgstr "running"
-
-msgid "stopped"
-msgstr "stopped"
-
-msgid "Remove"
-msgstr "Remove"
-
-msgid "up"
-msgstr "up"
-
-msgid "down"
-msgstr "down"

locale/zh_CN/LC_MESSAGES/messages.po

@@ -1,22 +1,19 @@
-# RaspAP Portable Object file
-# Project home: https://github.com/billz/raspap-webgui
-# Licensed under the GNU General Public License v3.0
-# This file is distributed under the same license as the RaspAP package
-# FIRST AUTHOR billzimmerman@gmail.com, 2017
-#
-#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.2.1\n"
+"Project-Id-Version: raspap\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: Bill Zimmerman <billzimmerman@gmail.com>\n"
 "POT-Creation-Date: 2017-10-19 08:56+0000\n"
-"PO-Revision-Date: 2019-10-21 23:15+0000\n"
+"PO-Revision-Date: 2020-04-14 08:51\n"
 "Last-Translator: BANKA2017 <kdwnil@hotmail.com>\n"
-"Language-Team: \n"
+"Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Crowdin-Project: raspap\n"
+"X-Crowdin-Language: zh-CN\n"
+"X-Crowdin-File: /master/locale/en_US/LC_MESSAGES/messages.po\n"
 
 #: index.php
 msgid "RaspAP Wifi Configuration Portal"
@@ -37,6 +34,12 @@ msgstr "WLAN客户端设置"
 msgid "Hotspot"
 msgstr "WLAN热点设置"
 
+msgid "Memory Use"
+msgstr "内存用量"
+
+msgid "CPU Temp"
+msgstr "CPU 温度"
+
 msgid "Networking"
 msgstr "网络设置"
 
@@ -178,8 +181,8 @@ msgstr "传送包"
 msgid "Transferred Bytes"
 msgstr "传送数据"
 
-msgid "Wireless Information"
+msgid "Wireless Client"
-msgstr "WLAN信息"
+msgstr "无线客户端"
 
 msgid "Connected To"
 msgstr "已连接"
@@ -248,6 +251,9 @@ msgstr "客户端列表"
 msgid "Interface"
 msgstr "接口"
 
+msgid "DNS Server"
+msgstr "DNS服务器"
+
 msgid "Starting IP Address"
 msgstr "起始IP地址"
 
@@ -318,31 +324,31 @@ msgid "Dnsmasq is not running"
 msgstr "Dnsmasq未在运行"
 
 msgid "Upstream DNS servers"
-msgstr "Upstream DNS servers"
+msgstr "上游DNS服务器"
 
 msgid "Only ever query DNS servers configured below"
-msgstr "Only ever query DNS servers configured below"
+msgstr "仅使用下面配置的 DNS 服务器查询"
 
 msgid "Enable this option if you want RaspAP to <b>send DNS queries to the servers configured below exclusively</b>. By default RaspAP also uses its upstream DHCP server's name servers."
-msgstr "Enable this option if you want RaspAP to <b>send DNS queries to the servers configured below exclusively</b>. By default RaspAP also uses its upstream DHCP server's name servers."
+msgstr "如果您希望 RaspAP <b>只向下面配置的服务器发起 DNS 查询</b>，请启用此项。RaspAP 默认还使用上游 DHCP 服务器上的名称服务器"
 
 msgid "This option adds <code>no-resolv</code> to the dnsmasq configuration."
-msgstr "This option adds <code>no-resolv</code> to the dnsmasq configuration."
+msgstr "此项将会添加 <code>no-resolv</code> 到 dnsmasq 配置"
 
 msgid "Add upstream DNS server"
-msgstr "Add upstream DNS server"
+msgstr "添加上游DNS服务器"
 
 msgid "Format"
-msgstr "Format"
+msgstr "格式"
 
 msgid "Choose a hosted server"
-msgstr "Choose a hosted server"
+msgstr "选择托管服务器"
 
 msgid "Log DHCP requests"
-msgstr "Log DHCP requests"
+msgstr "记录 DHCP 请求"
 
 msgid "Log DNS queries"
-msgstr "Log DNS queries"
+msgstr "记录 DNS 查询"
 
 #: includes/hostapd.php
 msgid "Basic"
@@ -426,6 +432,9 @@ msgstr "log信息输出"
 msgid "WiFi client AP mode"
 msgstr "无线网客户端AP模式"
 
+msgid "Bridged AP mode"
+msgstr "桥接 AP 模式"
+
 msgid "Hide SSID in broadcast"
 msgstr "在广播中隐藏SSID"
 
@@ -445,9 +454,6 @@ msgstr "当前设置"
 msgid "Default Gateway"
 msgstr "默认网关"
 
-msgid "DNS Server"
-msgstr "DNS服务器"
-
 msgid "Alternate DNS Server"
 msgstr "备用DNS服务器"
 
@@ -660,6 +666,10 @@ msgstr "正尝试启动TOR"
 msgid "Attempting to stop TOR"
 msgstr "正尝试停止TOR"
 
+#: template/dashboard.php
+msgid "Bridged AP mode is enabled. For Hostname and IP, see your router's admin page."
+msgstr "桥接 AP 模式已启用。对于主机名和 IP，请查看您的路由器管理页面。"
+
 #: common form controls
 msgid "Save settings"
 msgstr "保存设置"
@@ -681,3 +691,46 @@ msgstr "上"
 
 msgid "down"
 msgstr "下"
+
+msgid "adblock"
+msgstr "广告屏蔽"
+
+msgid "Ad Blocking"
+msgstr "广告屏蔽"
+
+msgid "Start Ad Blocking"
+msgstr "启用广告屏蔽服务"
+
+msgid "Restart Ad Blocking"
+msgstr "重启广告屏蔽服务"
+
+msgid "Blocklist settings"
+msgstr "屏蔽列表设置"
+
+msgid "Enable blocklists"
+msgstr "启用屏蔽列表"
+
+msgid "Enable this option if you want RaspAP to <b>block DNS requests for ads, tracking and other virtual garbage</b>. Blocklists are gathered from multiple, actively maintained sources and automatically updated, cleaned, optimized and moderated on a daily basis."
+msgstr "如果您想 RaspAP <b>屏蔽广告、跟踪和其他虚拟垃圾的 DNS 请求</b>，请启用此选项。 屏蔽列表是从多个活跃的源收集的，并每日自动更新、清理、优化和调节。"
+
+msgid "This option adds <code>conf-file</code> and <code>addn-hosts</code> to the dnsmasq configuration."
+msgstr "此项将会添加 <code>conf-file</code> 及 <code>addn-hosts</code> 到 dnsmasq 配置"
+
+msgid "Choose a blocklist provider"
+msgstr "选择一个屏蔽列表提供者"
+
+msgid "Hostnames blocklist last updated"
+msgstr "屏蔽主机名列表最近更新"
+
+msgid "Domains blocklist last updated"
+msgstr "屏蔽域名列表最后更新"
+
+msgid "Update now"
+msgstr "立即更新"
+
+msgid "Statistics"
+msgstr "统计"
+
+msgid "Information provided by adblock"
+msgstr "信息由 adblock 提供"
+

locale/zh_TW/LC_MESSAGES/messages.po

@@ -0,0 +1,736 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: raspap\n"
+"Report-Msgid-Bugs-To: Bill Zimmerman <billzimmerman@gmail.com>\n"
+"POT-Creation-Date: 2017-10-19 08:56+0000\n"
+"PO-Revision-Date: 2020-04-15 07:13\n"
+"Last-Translator: Mike Hsiao <squareface0323@gmail.com>\n"
+"Language-Team: Chinese Traditional\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Crowdin-Project: raspap\n"
+"X-Crowdin-Language: zh-TW\n"
+"X-Crowdin-File: /master/locale/en_US/LC_MESSAGES/messages.po\n"
+
+#: index.php
+msgid "RaspAP Wifi Configuration Portal"
+msgstr "RaspAP Wi-Fi 設定中心"
+
+msgid "Toggle navigation"
+msgstr "切換導航"
+
+msgid "RaspAP Wifi Portal"
+msgstr "RaspAP Wi-Fi 中心"
+
+msgid "Dashboard"
+msgstr "總覽"
+
+msgid "WiFi client"
+msgstr "Wi-Fi 用戶端"
+
+msgid "Hotspot"
+msgstr "熱點"
+
+msgid "Memory Use"
+msgstr "記憶體使用量"
+
+msgid "CPU Temp"
+msgstr "CPU 溫度"
+
+msgid "Networking"
+msgstr "網路界面"
+
+msgid "DHCP Server"
+msgstr "DHCP 伺服器"
+
+msgid "OpenVPN"
+msgstr "OpenVPN"
+
+msgid "TOR proxy"
+msgstr "TOR 代理伺服器"
+
+msgid "Authentication"
+msgstr "使用者帳戶"
+
+msgid "Change Theme"
+msgstr "變更主題"
+
+msgid "System"
+msgstr "系統"
+
+msgid "About RaspAP"
+msgstr "關於 RaspAP"
+
+#: includes/admin.php
+msgid "Authentication settings"
+msgstr "認證設定"
+
+msgid "New passwords do not match"
+msgstr "兩次新密碼輸入不一致"
+
+msgid "Username must not be empty"
+msgstr "使用者名稱不能為空白"
+
+msgid "Admin password updated"
+msgstr "管理員密碼已更新"
+
+msgid "Failed to update admin password"
+msgstr "管理員密碼更新失敗"
+
+msgid "Old password does not match"
+msgstr "原有密碼輸入不正確"
+
+msgid "Username"
+msgstr "使用者名稱"
+
+msgid "Old password"
+msgstr "原有密碼"
+
+msgid "New password"
+msgstr "新密碼"
+
+msgid "Repeat new password"
+msgstr "請再輸入新的密碼"
+
+#: includes/configure_client.php
+msgid "Client settings"
+msgstr "用戶端設定"
+
+msgid "SSID"
+msgstr "SSID"
+
+msgid "Channel"
+msgstr "頻道"
+
+msgid "Security"
+msgstr "安全性"
+
+msgid "Passphrase"
+msgstr "密碼"
+
+msgid "Wifi settings updated successfully"
+msgstr "Wi-Fi 設定更新成功"
+
+msgid "Wifi settings updated but cannot restart (cannot execute 'wpa_cli reconfigure')"
+msgstr "Wi-Fi 設定已更新，但無法重啟 (無法執行 'wpa_cli reconfigure')"
+
+msgid "Wifi settings failed to be updated"
+msgstr "Wi-Fi 設定更新失敗"
+
+msgid "Failed to update wifi settings"
+msgstr "Wi-Fi 設定更新失敗"
+
+msgid "Rescan"
+msgstr "重新掃瞄"
+
+msgid "Update"
+msgstr "更新"
+
+msgid "Add"
+msgstr "新增"
+
+msgid "Delete"
+msgstr "刪除"
+
+msgid "Show"
+msgstr "顯示"
+
+msgid "Hide"
+msgstr "隱藏"
+
+msgid "Not configured"
+msgstr "未設定"
+
+msgid "<strong>Note:</strong> WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP"
+msgstr "<strong>小提醒：</strong>使用 WEP 認證的基地台，密碼在建立連線後才輸入，因此連線前會顯示為不需認證。RaspAP 目前不支援 WEP 連線。"
+
+#: includes/dashboard.php
+msgid "Interface Information"
+msgstr "介面資訊"
+
+msgid "Interface Name"
+msgstr "介面名稱"
+
+msgid "IPv4 Address"
+msgstr "IPv4 位址"
+
+msgid "IPv6 Address"
+msgstr "IPv6 位址"
+
+msgid "Subnet Mask"
+msgstr "子網路遮罩"
+
+msgid "Mac Address"
+msgstr "MAC 位址"
+
+msgid "Interface Statistics"
+msgstr "介面統計"
+
+msgid "Received Packets"
+msgstr "已接收封包"
+
+msgid "Received Bytes"
+msgstr "已接收位元組"
+
+msgid "Transferred Packets"
+msgstr "已傳送封包"
+
+msgid "Transferred Bytes"
+msgstr "已傳送位元組"
+
+msgid "Wireless Client"
+msgstr "無線用戶端"
+
+msgid "Connected To"
+msgstr "已連接至"
+
+msgid "AP Mac Address"
+msgstr "AP MAC 位址"
+
+msgid "Bitrate"
+msgstr "位元率"
+
+msgid "Signal Level"
+msgstr "信號強度"
+
+msgid "Transmit Power"
+msgstr "傳輸功率"
+
+msgid "Frequency"
+msgstr "頻率"
+
+msgid "Link Quality"
+msgstr "連線品質"
+
+msgid "Information provided by ip and iw and from system"
+msgstr "資訊自 ip、iw 及系統取得"
+
+msgid "No MAC Address Found"
+msgstr "找不到 MAC 位址"
+
+msgid "No IP Address Found"
+msgstr "找不到 IP 位址"
+
+msgid "No Subnet Mask Found"
+msgstr "找不到子網路遮罩"
+
+msgid "No Data"
+msgstr "無數據"
+
+msgid "Not connected"
+msgstr "尚未連線"
+
+msgid "Interface is up"
+msgstr "界面運作中"
+
+msgid "Interface is down"
+msgstr "界面停止中"
+
+msgid "Interface already down"
+msgstr "界面已停止運作"
+
+msgid "Start wlan0"
+msgstr "啟動 wlan0"
+
+msgid "Stop wlan0"
+msgstr "停止 wlan0"
+
+msgid "Connected Devices"
+msgstr "已連接裝置"
+
+#: includes/dhcp.php
+msgid "DHCP server settings"
+msgstr "DHCP 伺服器設定"
+
+msgid "Client list"
+msgstr "用戶端清單"
+
+msgid "Interface"
+msgstr "界面"
+
+msgid "DNS Server"
+msgstr "DNS 伺服器"
+
+msgid "Starting IP Address"
+msgstr "起始 IP 位址"
+
+msgid "Ending IP Address"
+msgstr "終止 IP 位址"
+
+msgid "Static Leases"
+msgstr "靜態租約"
+
+msgid "Add static DHCP lease"
+msgstr "加入靜態 DHCP 租約"
+
+msgid "Lease Time"
+msgstr "租約時間"
+
+msgid "Interval"
+msgstr "時間單位"
+
+msgid "Active DHCP leases"
+msgstr "使用中的 DHCP 租約"
+
+msgid "Expire time"
+msgstr "到期時間"
+
+msgid "MAC Address"
+msgstr "MAC 位址"
+
+msgid "Host name"
+msgstr "主機名稱"
+
+msgid "Client ID"
+msgstr "用戶 ID"
+
+msgid "Information provided by Dnsmasq"
+msgstr "資訊自 Dnsmasq 取得"
+
+msgid "Stop dnsmasq"
+msgstr "停止 dnsmasq"
+
+msgid "Start dnsmasq"
+msgstr "啟動 dnsmasq"
+
+msgid "Dnsmasq configuration updated successfully"
+msgstr "dnsmasq 組態已成功更新"
+
+msgid "dnsmasq already running"
+msgstr "dnsmasq 已在執行中"
+
+msgid "Successfully started dnsmasq"
+msgstr "dnsmasq 已成功啟動"
+
+msgid "Failed to start dnsmasq"
+msgstr "無法啟動 dnsmasq"
+
+msgid "Successfully stopped dnsmasq"
+msgstr "dnsmasq 已成功停止"
+
+msgid "Failed to stop dnsmasq"
+msgstr "無法停止 dnsmasq"
+
+msgid "dnsmasq already stopped"
+msgstr "dnsmasq 已停止"
+
+msgid "Dnsmasq is running"
+msgstr "dnsmasq 正在執行中"
+
+msgid "Dnsmasq is not running"
+msgstr "Dnsmasq 未執行中"
+
+msgid "Upstream DNS servers"
+msgstr "上層 DNS 伺服器"
+
+msgid "Only ever query DNS servers configured below"
+msgstr "僅使用以下 DNS 伺服器"
+
+msgid "Enable this option if you want RaspAP to <b>send DNS queries to the servers configured below exclusively</b>. By default RaspAP also uses its upstream DHCP server's name servers."
+msgstr "啟用此選項會讓 RaspAP <b>只從下列 DNS 伺服器查詢網址的對應 IP</b>。RaspAP 預設使用其上層 DHCP 伺服器的 DNS 服務。"
+
+msgid "This option adds <code>no-resolv</code> to the dnsmasq configuration."
+msgstr "此選項會將<code>no-resolv</code>加入 dnsmasq 組態中"
+
+msgid "Add upstream DNS server"
+msgstr "新增上層 DNS 伺服器"
+
+msgid "Format"
+msgstr "格式"
+
+msgid "Choose a hosted server"
+msgstr "選擇常用伺服器"
+
+msgid "Log DHCP requests"
+msgstr "記錄 DHCP 要求"
+
+msgid "Log DNS queries"
+msgstr "記錄 DNS 查詢"
+
+#: includes/hostapd.php
+msgid "Basic"
+msgstr "基本"
+
+msgid "Advanced"
+msgstr "進階"
+
+msgid "Basic settings"
+msgstr "基本設定"
+
+msgid "Wireless Mode"
+msgstr "無線模式"
+
+msgid "Security settings"
+msgstr "安全性設定"
+
+msgid "Security type"
+msgstr "安全性類型"
+
+msgid "Encryption Type"
+msgstr "加密類型"
+
+msgid "PSK"
+msgstr "密碼"
+
+msgid "Advanced settings"
+msgstr "進階設定"
+
+msgid "Country Code"
+msgstr "國碼"
+
+msgid "Information provided by hostapd"
+msgstr "資訊自 hoastapd 取得"
+
+msgid "Attempting to start hotspot"
+msgstr "嘗試啟動熱點中"
+
+msgid "Attempting to stop hotspot"
+msgstr "嘗試停止熱點中"
+
+msgid "HostAPD is not running"
+msgstr "HostAPD 未執行中"
+
+msgid "HostAPD is running"
+msgstr "HostAPD 執行中"
+
+msgid "SSID must be between 1 and 32 characters"
+msgstr "SSID 必須包含 1 至 32 個字元"
+
+msgid "WPA passphrase must be between 8 and 63 characters"
+msgstr "WPA 密碼必須包含 8 至 63 個字元"
+
+msgid "Unknown interface"
+msgstr "未知界面"
+
+msgid "Country code must be blank or two characters"
+msgstr "國碼必須為空或兩個英文字母"
+
+msgid "Wifi Hotspot settings saved"
+msgstr "Wi-Fi 熱點設定已儲存"
+
+msgid "Unable to save wifi hotspot settings"
+msgstr "無法儲存 Wi-Fi 熱點設定"
+
+msgid "Start hotspot"
+msgstr "啟動熱點"
+
+msgid "Stop hotspot"
+msgstr "停止熱點"
+
+msgid "Restart hotspot"
+msgstr "重啟熱點"
+
+msgid "Enable logging"
+msgstr "啟用日誌記錄"
+
+msgid "Logfile output"
+msgstr "日誌紀錄"
+
+msgid "WiFi client AP mode"
+msgstr "Wi-Fi 用戶兼熱點模式"
+
+msgid "Bridged AP mode"
+msgstr "橋接模式"
+
+msgid "Hide SSID in broadcast"
+msgstr "隱藏 SSID 廣播"
+
+msgid "Maximum number of clients"
+msgstr "最大用戶數量"
+
+msgid "Configures the max_num_sta option of hostapd. The default and maximum is 2007. If empty or 0, the default applies."
+msgstr "設定於 hastapd 的 max_num_sta 參數，預設及最大值為 2007。設為 0 或空白則套用預設值。"
+
+#: includes/networking.php
+msgid "Summary"
+msgstr "概要"
+
+msgid "Current settings"
+msgstr "目前設定"
+
+msgid "Default Gateway"
+msgstr "預設閘道"
+
+msgid "Alternate DNS Server"
+msgstr "備用 DNS 伺服器"
+
+msgid "Adapter IP Address Settings"
+msgstr "界面卡 IP 位址設定"
+
+msgid "Enable Fallback to Static Option"
+msgstr "DHCP 失敗時採用靜態 IP"
+
+msgid "Static IP"
+msgstr "靜態 IP"
+
+msgid "Enabled"
+msgstr "啟用"
+
+msgid "Disabled"
+msgstr "停用"
+
+msgid "Static IP Options"
+msgstr "靜態 IP 選項"
+
+msgid "Apply settings"
+msgstr "套用設定"
+
+msgid "Information provided by /sys/class/net"
+msgstr "資訊自 /sys/class/net 取得"
+
+#: includes/system.php
+msgid "System Information"
+msgstr "系統資訊"
+
+msgid "Language"
+msgstr "語言"
+
+msgid "Language settings"
+msgstr "語言設定"
+
+msgid "Select a language"
+msgstr "選擇語言"
+
+msgid "Language setting saved"
+msgstr "語言設定已儲存"
+
+msgid "Console"
+msgstr "命令列"
+
+msgid "Hostname"
+msgstr "主機名稱"
+
+msgid "Pi Revision"
+msgstr "樹苺派版本"
+
+msgid "Uptime"
+msgstr "上線時間"
+
+msgid "Memory Used"
+msgstr "記憶體用量"
+
+msgid "CPU Load"
+msgstr "CPU 使用率"
+
+msgid "Reboot"
+msgstr "重新啟動"
+
+msgid "Shutdown"
+msgstr "關機"
+
+msgid "System Rebooting Now!"
+msgstr "系統重啟中！"
+
+msgid "System Shutting Down Now!"
+msgstr "系統關機中！"
+
+#: includes/themes.php
+msgid "Theme settings"
+msgstr "主題設定"
+
+msgid "Select a theme"
+msgstr "選擇主題"
+
+#: includes/data_usage.php
+msgid "Data usage"
+msgstr "數據用量"
+
+msgid "Data usage monitoring"
+msgstr "數據用量監控"
+
+msgid "Hourly traffic amount"
+msgstr "每小時數據用量"
+
+msgid "Daily traffic amount"
+msgstr "每日數據用量"
+
+msgid "Monthly traffic amount"
+msgstr "每月數據用量"
+
+msgid "Hourly"
+msgstr "每小時"
+
+msgid "Daily"
+msgstr "每日"
+
+msgid "Monthly"
+msgstr "每月"
+
+msgid "interface"
+msgstr "界面"
+
+msgid "date"
+msgstr "日期"
+
+msgid "Send MB"
+msgstr "傳送 MB"
+
+msgid "Receive MB"
+msgstr "接受 MB"
+
+msgid "Information provided by vnstat"
+msgstr "資訊自 vnstat 取得"
+
+msgid "Loading {0} bandwidth chart"
+msgstr "載入 {0} 圖表中"
+
+msgid "Showing {0} to {1} of {2} entries"
+msgstr "顯示 {2} 個項目中的第 {0} 至 {1} 項"
+
+#: includes/openvpn.php
+msgid "OpenVPN is not running"
+msgstr "OpenVPN 未執行中"
+
+msgid "OpenVPN is running"
+msgstr "OpenVPN 執行中"
+
+msgid "Server settings"
+msgstr "伺服器設定"
+
+msgid "Select OpenVPN configuration file (.ovpn)"
+msgstr "選擇 OpenVPN 組態檔案 (.ovpn)"
+
+msgid "Client Log"
+msgstr "用戶端日誌"
+
+msgid "Port"
+msgstr "埠"
+
+msgid "Protocol"
+msgstr "協定"
+
+msgid "Root CA certificate"
+msgstr "根憑證"
+
+msgid "Server certificate"
+msgstr "伺服器憑證"
+
+msgid "Diffie Hellman parameters"
+msgstr "Diffie-Hellman 參數"
+
+msgid "KeepAlive"
+msgstr "KeepAlive"
+
+msgid "Server log"
+msgstr "伺服器日誌"
+
+msgid "Start OpenVPN"
+msgstr "啟動 OpenVPN"
+
+msgid "Stop OpenVPN"
+msgstr "停止 OpenVPN"
+
+msgid "Information provided by openvpn"
+msgstr "資訊自 openvpn 取得"
+
+msgid "Attempting to start openvpn"
+msgstr "嘗試啟動 OpenVPN"
+
+msgid "Attempting to stop openvpn"
+msgstr "嘗試停止 OpenVPN"
+
+#: includes/torproxy.php
+msgid "TOR is not running"
+msgstr "TOR 未執行中"
+
+msgid "TOR is running"
+msgstr "TOR 執行中"
+
+msgid "Relay"
+msgstr "中繼"
+
+msgid "Relay settings"
+msgstr "中繼設定"
+
+msgid "Nickname"
+msgstr "暱稱"
+
+msgid "Address"
+msgstr "位址"
+
+msgid "Start TOR"
+msgstr "啟動 TOR"
+
+msgid "Stop TOR"
+msgstr "停止 TOR"
+
+msgid "Information provided by tor"
+msgstr "資訊自 tor 取得"
+
+msgid "Attempting to start TOR"
+msgstr "嘗試啟動 TOR"
+
+msgid "Attempting to stop TOR"
+msgstr "嘗試停止 TOR"
+
+#: template/dashboard.php
+msgid "Bridged AP mode is enabled. For Hostname and IP, see your router's admin page."
+msgstr "橋接模式已啟用。請由路由器的管理頁面查詢主機名稱及 IP。"
+
+#: common form controls
+msgid "Save settings"
+msgstr "儲存設定"
+
+msgid "Refresh"
+msgstr "重新整理"
+
+msgid "running"
+msgstr "執行中"
+
+msgid "stopped"
+msgstr "已停止"
+
+msgid "Remove"
+msgstr "移除"
+
+msgid "up"
+msgstr "執行中"
+
+msgid "down"
+msgstr "已停止"
+
+msgid "adblock"
+msgstr "adblock"
+
+msgid "Ad Blocking"
+msgstr "廣告攔截"
+
+msgid "Start Ad Blocking"
+msgstr "啟動廣告攔截"
+
+msgid "Restart Ad Blocking"
+msgstr "重啟廣告攔截"
+
+msgid "Blocklist settings"
+msgstr "攔截清單設定"
+
+msgid "Enable blocklists"
+msgstr "啟用攔截清單"
+
+msgid "Enable this option if you want RaspAP to <b>block DNS requests for ads, tracking and other virtual garbage</b>. Blocklists are gathered from multiple, actively maintained sources and automatically updated, cleaned, optimized and moderated on a daily basis."
+msgstr "啟用此選項後，RaspAP會<b>攔截廣告、追蹤的 DNS 要求及其它虛擬垃圾</b>。攔截清單由多個維護中的來源集合而成，每天自動更新、清除、優化及調整。"
+
+msgid "This option adds <code>conf-file</code> and <code>addn-hosts</code> to the dnsmasq configuration."
+msgstr "此選項將<code>conf-file</code>及<code>addn-hosts</code>加入 dnsmasq 組態中"
+
+msgid "Choose a blocklist provider"
+msgstr "選擇攔截清單來源"
+
+msgid "Hostnames blocklist last updated"
+msgstr "主機名稱清單最後更新"
+
+msgid "Domains blocklist last updated"
+msgstr "網域清單最後更新"
+
+msgid "Update now"
+msgstr "立即更新"
+
+msgid "Statistics"
+msgstr "統計"
+
+msgid "Information provided by adblock"
+msgstr "資訊自 adblock 取得"
+

templates/about.php

@@ -1,3 +1,8 @@
+<?php
+
+require_once 'app/lib/Parsedown.php';
+
+?>
 <div class="row">
   <div class="col-lg-12">
     <div class="card">
@@ -8,13 +13,22 @@
           </div>
         </div><!-- ./row -->
       </div><!-- ./card-header -->
-      <div class="card-body text-center">
+      <div class="card-body">
-        <h3><?php echo _("RaspAP") . " v" . RASPI_VERSION; ?></h3>
+
-        <h5><a href="https://github.com/billz/raspap-webgui/blob/master/LICENSE">GNU General Public License v3.0</a></h5>
+        <!-- Nav tabs -->
-        <p><img class="authors" src="app/img/authors-8bit-200px.png"></p>
+        <ul class="nav nav-tabs">
-        <p>RaspAP is a co-creation of <a href="https://github.com/billz">@billz</a> and <a href="https://github.com/sirlagz">@SirLagz</a><br />
+          <li class="nav-item"><a class="nav-link active" href="#aboutgeneral" data-toggle="tab"><?php echo _("About"); ?></a></li>
-          with the contributions of our <a href="https://github.com/billz/raspap-webgui/graphs/contributors">community</a>.</p>
+          <li class="nav-item"><a class="nav-link" href="#aboutsponsors" data-toggle="tab"><?php echo _("Sponsors"); ?></a></li>
-          <p><i class="fab fa-github"></i> <a href="https://github.com/billz/raspap-webgui">https://github.com/billz/raspap-webgui</a></p>
+        </ul>
+        <!-- /.nav-tabs -->
+
+        <!-- Tab panes -->
+        <div class="tab-content">
+          <?php echo renderTemplate("about/general", $__template_data) ?>
+          <?php echo renderTemplate("about/sponsors", $__template_data) ?>
+        </div>
+        <!-- /.tab-content -->
+
       </div><!-- /.card-body -->
       <div class="card-footer"></div>
     </div><!-- /.card -->

templates/about/general.php

@@ -0,0 +1,22 @@
+<!-- about general tab -->
+<div class="tab-pane active" id="aboutgeneral">
+  <div class="row">
+    <div class="col-md-8">
+      <h2 class="mt-3"><?php echo _("RaspAP") . " v" . RASPI_VERSION; ?></h2>
+        <div class="ml-5 mt-3"><img class="about-logo" src="app/img/raspAP-logo.png" style="width: 175px; height:175px"></div>
+        <div class="mt-3">RaspAP is a co-creation of <a href="https://github.com/billz">billz</a> and <a href="https://github.com/sirlagz">SirLagz</a>
+          with the contributions of our <a href="https://github.com/billz/raspap-webgui/graphs/contributors">developer community</a>
+          and <a href="https://crowdin.com/project/raspap">language translators</a>.</div>
+        <div class="mt-3">Learn more about joining the project as a <a href="https://github.com/billz/raspap-webgui/blob/master/CONTRIBUTING.md">code contributor</a>,
+        <a href="https://github.com/billz/raspap-webgui/wiki/Translations">translator</a> or <a href="https://github.com/billz/raspap-webgui/blob/master/BACKERS.md">financial sponsor</a>.</div>
+        <div class="mt-3 project-links">
+        <div class="row">
+          <div class="col-md-6">GitHub <i class="fab fa-github"></i> <a href="https://github.com/billz/raspap-webgui">raspap-webgui</a></div>
+          <div class="col-md-6">Twitter <span style="color: #55acee"><i class="fab fa-twitter"></i></span> <a href="https://twitter.com/rasp_ap">@RaspAP</a></div>
+          <div class="col-md-6">Reddit <span style="color: #ff4500"><i class="fab fa-reddit"></i></span> <a href="https://www.reddit.com/r/RaspAP/">/r/raspap</a></div>
+          <div class="col-md-6">License <i class="fas fa-balance-scale"></i> <a href="https://github.com/billz/raspap-webgui/blob/master/LICENSE">GPL-3.0</a></div>
+        </div>
+        </div>
+    </div>
+  </div><!-- /.row -->
+</div><!-- /.tab-pane | general tab -->

templates/about/sponsors.php

@@ -0,0 +1,13 @@
+<!-- about sponsors tab -->
+<div class="tab-pane fade" id="aboutsponsors">
+  <div class="row">
+    <div class="col-lg-12 mt-3">
+      <?php 
+      $Parsedown = new Parsedown();
+      $strContent = file_get_contents($_SERVER['DOCUMENT_ROOT'].'/BACKERS.md');
+      echo $Parsedown->text($strContent);
+      ?>
+    </div>
+  </div><!-- /.row -->
+</div><!-- /.tab-pane | sponsors tab -->
+