diff --git a/.circleci/config.yml b/.circleci/config.yml index 363c9a666..6edfc6799 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,6 @@ version: 2 jobs: prepare: machine: true - timezone: Europe/Paris working_directory: ~/ @@ -13,9 +12,8 @@ jobs: sudo apt-get update sudo apt-get install -yq build-essential git unzip ncurses-dev libz-dev libssl-dev python subversion gettext gawk wget curl rsync perl - build_x86: + build_x86_64: machine: true - timezone: Europe/Paris environment: - OMR_VERSION: $CIRCLE_TAG @@ -27,8 +25,65 @@ jobs: - run: name: cache command: | - echo "cache 5 $OMR_TARGET" > /tmp/cache-target - echo "cache 9 $OMR_TARGET $OMR_VERSION" > /tmp/cache-version + echo "cache 10 $OMR_TARGET" > /tmp/cache-target + echo "cache 14 $OMR_TARGET $OMR_VERSION" > /tmp/cache-version + + - restore_cache: + keys: + - cache-{{ checksum "/tmp/cache-version" }} + - cache-{{ checksum "/tmp/cache-target" }} + + - run: + name: Build toolchain + no_output_timeout: 30m + command: | + git clone https://github.com/ysurac/openmptcprouter || true + cd openmptcprouter + git pull || true + export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}" + export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL" + export OMR_FEED_SRC="${CIRCLE_BRANCH:-$CIRCLE_TAG}" + sh build.sh prepare {tools,toolchain}/install -j2 + echo -e "$OMR_PRIVKEY" > ~/openmptcprouter/$OMR_TARGET/source/key-build + echo -e "$OMR_PUBKEY" > ~/openmptcprouter/$OMR_TARGET/source/key-build.pub + + - save_cache: + key: cache-{{ checksum "/tmp/cache-target" }} + paths: + - openmptcprouter + + - run: + name: Build + no_output_timeout: 30m + command: make IGNORE_ERRORS=m -C ~/openmptcprouter/$OMR_TARGET/source package/{compile,install,index} target/install -j2 + + - run: + name: Deploy + command: | + ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/release + rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/release/$OMR_TARGET + rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin + + - save_cache: + key: cache-{{ checksum "/tmp/cache-version" }} + paths: + - openmptcprouter + + build_x86: + machine: true + + environment: + - OMR_VERSION: $CIRCLE_TAG + - OMR_TARGET: x86 + + working_directory: ~/ + + steps: + - run: + name: cache + command: | + echo "cache 10 $OMR_TARGET" > /tmp/cache-target + echo "cache 14 $OMR_TARGET $OMR_VERSION" > /tmp/cache-version - restore_cache: keys: @@ -73,7 +128,6 @@ jobs: build_rpi3: machine: true - timezone: Europe/Paris environment: - OMR_VERSION: $CIRCLE_TAG @@ -85,8 +139,65 @@ jobs: - run: name: cache command: | - echo "cache 7 $OMR_TARGET" > /tmp/cache-target - echo "cache 11 $OMR_TARGET $OMR_VERSION" > /tmp/cache-version + echo "cache 14 $OMR_TARGET" > /tmp/cache-target + echo "cache 18 $OMR_TARGET $OMR_VERSION" > /tmp/cache-version + + - restore_cache: + keys: + - cache-{{ checksum "/tmp/cache-version" }} + - cache-{{ checksum "/tmp/cache-target" }} + + - run: + name: Build toolchain + no_output_timeout: 30m + command: | + git clone https://github.com/ysurac/openmptcprouter || true + cd openmptcprouter + git pull || true + export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}" + export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL" + export OMR_FEED_SRC="${CIRCLE_BRANCH:-$CIRCLE_TAG}" + sh build.sh prepare {tools,toolchain}/install -j2 + echo -e "$OMR_PRIVKEY" > ~/openmptcprouter/$OMR_TARGET/source/key-build + echo -e "$OMR_PUBKEY" > ~/openmptcprouter/$OMR_TARGET/source/key-build.pub + + - save_cache: + key: cache-{{ checksum "/tmp/cache-target" }} + paths: + - openmptcprouter + + - run: + name: Build + no_output_timeout: 30m + command: make IGNORE_ERRORS=m -C ~/openmptcprouter/$OMR_TARGET/source package/{compile,install,index} target/compile -j2 package/compile -j2 target/install -j2 + + - run: + name: Deploy + command: | + ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/release + rsync -av --delete-after ~/openmptcprouter/$OMR_TARGET/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/release/$OMR_TARGET + rm -rf ~/openmptcprouter/$OMR_TARGET/source/bin + + - save_cache: + key: cache-{{ checksum "/tmp/cache-version" }} + paths: + - openmptcprouter + + build_rpi2: + machine: true + + environment: + - OMR_VERSION: $CIRCLE_TAG + - OMR_TARGET: rpi2 + + working_directory: ~/ + + steps: + - run: + name: cache + command: | + echo "cache 14 $OMR_TARGET" > /tmp/cache-target + echo "cache 18 $OMR_TARGET $OMR_VERSION" > /tmp/cache-version - restore_cache: keys: @@ -134,9 +245,15 @@ workflows: main: jobs: - prepare + - build_x86_64: + requires: + - prepare - build_x86: requires: - prepare - build_rpi3: requires: - prepare + - build_rpi2: + requires: + - prepare diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..0f4d1da62 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,5 @@ +Thanks for your contribution to OpenMPTCProuter! + +You need to follow contributing rules. + +Please remove this message before posting the pull request. diff --git a/6in4/Makefile b/6in4/Makefile index 36f05310c..49335fec6 100644 --- a/6in4/Makefile +++ b/6in4/Makefile @@ -1,5 +1,7 @@ # # Copyright (C) 2010-2015 OpenWrt.org +# Copyright (C) 2018 Ycarus (Yannick Chabanois) +# - Added gateway setting # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=6in4 -PKG_VERSION:=26 +PKG_VERSION:=270 PKG_RELEASE:=1 PKG_LICENSE:=GPL-2.0 diff --git a/6in4/files/6in4.sh b/6in4/files/6in4.sh index ae1a88349..cf17c86d8 100755 --- a/6in4/files/6in4.sh +++ b/6in4/files/6in4.sh @@ -41,7 +41,7 @@ proto_6in4_setup() { return } - ( proto_add_host_dependency "$cfg" "$peeraddr" "$tunlink" ) + [ -n "$tunlink" ] && ( proto_add_host_dependency "$cfg" "$peeraddr" "$tunlink" ) [ -z "$ipaddr" ] && { local wanif="$tunlink" diff --git a/CLA-entity.md b/CLA-entity.md new file mode 100644 index 000000000..43eb3cfeb --- /dev/null +++ b/CLA-entity.md @@ -0,0 +1,82 @@ +OpenMPTCProuter Entity Contributor License Agreement +================================================== + +Thank you for your interest in contributing to OpenMPTCProuter ("We" or "Us"). + +This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please submit a pull request with a file under the `/contributors` directory indicating your acceptance of this agreement. + +This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us. + +## 1. Definitions + +"You" means any Legal Entity on behalf of whom a Contribution has been received by Us. "Legal Entity" means an entity which is not a natural person. "Affiliates" means other Legal Entities that control, are controlled by, or under common control with that Legal Entity. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such Legal Entity, whether by contract or otherwise, (ii) ownership of fifty percent (50%) or more of the outstanding shares or securities which vote to elect the management or other persons who direct such Legal Entity or (iii) beneficial ownership of such entity. + +"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in . + +"Copyright" means all rights protecting works of authorship owned or controlled by You or Your Affiliates, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You. + +"Material" means the work of authorship which is made available by Us to third parties. When this Agreement covers more than one software project, the Material means the work of authorship to which the Contribution was Submitted. After You Submit the Contribution, it may be included in the Material. + +"Submit" means any form of electronic, verbal, or written communication sent to Us or our representatives, including but not limited to electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Us for the purpose of discussing and improving the Material, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution." + +"Submission Date" means the date on which You Submit a Contribution to Us. + +"Effective Date" means the date You execute this Agreement or the date You first Submit a Contribution to Us, whichever is earlier. + +## 2. Grant of Rights + +2.1 Copyright License + +(a) You retain ownership of the Copyright in Your Contribution and have the same rights to use or license the Contribution which You would have had without entering into the Agreement. + +(b) To the maximum extent permitted by the relevant law, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license under the Copyright covering the Contribution, with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform and distribute the Contribution as part of the Material; provided that this license is conditioned upon compliance with Section 2.3. + +2.2 Patent License + +For patent claims including, without limitation, method, process, and apparatus claims which You or Your Affiliates own, control or have the right to grant, now or in the future, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable patent license, with the right to sublicense these rights to multiple tiers of sublicensees, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contribution and the Contribution in combination with the Material (and portions of such combination). This license is granted only to the extent that the exercise of the licensed rights infringes such patent claims; and provided that this license is conditioned upon compliance with Section 2.3. + +2.3 Outbound License + +Based on the grant of rights in Sections 2.1 and 2.2, if We include Your Contribution in a Material, We may license the Contribution under any license, including copyleft, permissive, commercial, or proprietary licenses. As a condition on the exercise of this right, We agree to also license the Contribution under the terms of the license or licenses which We are using for the Material on the Submission Date. + +2.4 Moral Rights. If moral rights apply to the Contribution, to the maximum extent permitted by law, You waive and agree not to assert such moral rights against Us or our successors in interest, or any of our licensees, either direct or indirect. + +2.5 Our Rights. You acknowledge that We are not obligated to use Your Contribution as part of the Material and may decide to include any Contribution We consider appropriate. + +2.6 Reservation of Rights. Any rights not expressly licensed under this section are expressly reserved by You. + +## 3. Agreement + +You confirm that: + +(a) You have the legal authority to enter into this Agreement. + +(b) You or Your Affiliates own the Copyright and patent claims covering the Contribution which are required to grant the rights under Section 2. + +(c) The grant of rights under Section 2 does not violate any grant of rights which You or Your Affiliates have made to third parties. + +(d) You have followed the instructions in , if You do not own the Copyright in the entire work of authorship Submitted. + +## 4. Disclaimer + +EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD PERMITTED BY LAW. + +## 5. Consequential Damage Waiver + +TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED. + +## 6. Miscellaneous + +6.1 This Agreement will be governed by and construed in accordance with the laws of excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement. + +6.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings. + +6.3 If You or We assign the rights or obligations received through this Agreement to a third party, as a condition of the assignment, that third party must agree in writing to abide by all the rights and obligations in the Agreement. + +6.4 The failure of either party to require performance by the other party of any provision of this Agreement in one situation shall not affect the right of a party to require such performance at any time in the future. A waiver of performance under a provision in one situation shall not be considered a waiver of the performance of the provision in the future or a waiver of the provision in its entirety. + +6.5 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and which is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law. + +This agreement is derived from the Project Harmony CLA generator: +http://www.harmonyagreements.org/ +Harmony (HA-CLA-E-ANY) Version 1.0 diff --git a/CLA-individual.md b/CLA-individual.md new file mode 100644 index 000000000..bbbba1347 --- /dev/null +++ b/CLA-individual.md @@ -0,0 +1,83 @@ +OpenMPTCProuter Individual Contributor License Agreement +====================================================== + +Thank you for your interest in contributing to OpenMPTCProuter ("We" or "Us"). + +This contributor agreement ("Agreement") documents the rights granted by contributors to Us. To make this document effective, please submit a pull request with a file under the `/contributors` directory indicating your acceptance of this agreement. + +This is a legally binding document, so please read it carefully before agreeing to it. The Agreement may cover more than one software project managed by Us. + +## 1. Definitions + +"You" means the individual who Submits a Contribution to Us. + +"Contribution" means any work of authorship that is Submitted by You to Us in which You own or assert ownership of the Copyright. If You do not own the Copyright in the entire work of authorship, please follow the instructions in . + +"Copyright" means all rights protecting works of authorship owned or controlled by You, including copyright, moral and neighboring rights, as appropriate, for the full term of their existence including any extensions by You. + +"Material" means the work of authorship which is made available by Us to third parties. When this Agreement covers more than one software project, the Material means the work of authorship to which the Contribution was Submitted. After You Submit the Contribution, it may be included in the Material. + +"Submit" means any form of electronic, verbal, or written communication sent to Us or our representatives, including but not limited to electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Us for the purpose of discussing and improving the Material, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution." + +"Submission Date" means the date on which You Submit a Contribution to Us. + +"Effective Date" means the date You execute this Agreement or the date You first Submit a Contribution to Us, whichever is earlier. + +## 2. Grant of Rights + +2.1 Copyright License + +(a) You retain ownership of the Copyright in Your Contribution and have the same rights to use or license the Contribution which You would have had without entering into the Agreement. + +(b) To the maximum extent permitted by the relevant law, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable license under the Copyright covering the Contribution, with the right to sublicense such rights through multiple tiers of sublicensees, to reproduce, modify, display, perform and distribute the Contribution as part of the Material; provided that this license is conditioned upon compliance with Section 2.3. + +2.2 Patent License + +For patent claims including, without limitation, method, process, and apparatus claims which You own, control or have the right to grant, now or in the future, You grant to Us a perpetual, worldwide, non-exclusive, transferable, royalty-free, irrevocable patent license, with the right to sublicense these rights to multiple tiers of sublicensees, to make, have made, use, sell, offer for sale, import and otherwise transfer the Contribution and the Contribution in combination with the Material (and portions of such combination). This license is granted only to the extent that the exercise of the licensed rights infringes such patent claims; and provided that this license is conditioned upon compliance with Section 2.3. + +2.3 Outbound License + +Based on the grant of rights in Sections 2.1 and 2.2, if We include Your Contribution in a Material, We may license the Contribution under any license, including copyleft, permissive, commercial, or proprietary licenses. As a condition on the exercise of this right, We agree to also license the Contribution under the terms of the license or licenses which We are using for the Material on the Submission Date. + +2.4 Moral Rights. If moral rights apply to the Contribution, to the maximum extent permitted by law, You waive and agree not to assert such moral rights against Us or our successors in interest, or any of our licensees, either direct or indirect. + +2.5 Our Rights. You acknowledge that We are not obligated to use Your Contribution as part of the Material and may decide to include any Contribution We consider appropriate. + +2.6 Reservation of Rights. Any rights not expressly licensed under this section are expressly reserved by You. + +3. Agreement + +You confirm that: + +(a) You have the legal authority to enter into this Agreement. + +(b) You own the Copyright and patent claims covering the Contribution which are required to grant the rights under Section 2. + +(c) The grant of rights under Section 2 does not violate any grant of rights which You have made to third parties, including Your employer. If You are an employee, You have had Your employer approve this Agreement or sign the Entity version of this document. If You are less than eighteen years old, please have Your parents or guardian sign the Agreement. + +(d) You have followed the instructions in , if You do not own the Copyright in the entire work of authorship Submitted. + +## 4. Disclaimer + +EXCEPT FOR THE EXPRESS WARRANTIES IN SECTION 3, THE CONTRIBUTION IS PROVIDED "AS IS". MORE PARTICULARLY, ALL EXPRESS OR IMPLIED WARRANTIES INCLUDING, WITHOUT LIMITATION, ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE EXPRESSLY DISCLAIMED BY YOU TO US. TO THE EXTENT THAT ANY SUCH WARRANTIES CANNOT BE DISCLAIMED, SUCH WARRANTY IS LIMITED IN DURATION TO THE MINIMUM PERIOD PERMITTED BY LAW. + +## 5. Consequential Damage Waiver + +TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT WILL YOU BE LIABLE FOR ANY LOSS OF PROFITS, LOSS OF ANTICIPATED SAVINGS, LOSS OF DATA, INDIRECT, SPECIAL, INCIDENTAL, CONSEQUENTIAL AND EXEMPLARY DAMAGES ARISING OUT OF THIS AGREEMENT REGARDLESS OF THE LEGAL OR EQUITABLE THEORY (CONTRACT, TORT OR OTHERWISE) UPON WHICH THE CLAIM IS BASED. + +## 6. Miscellaneous + +6.1 This Agreement will be governed by and construed in accordance with the laws of excluding its conflicts of law provisions. Under certain circumstances, the governing law in this section might be superseded by the United Nations Convention on Contracts for the International Sale of Goods ("UN Convention") and the parties intend to avoid the application of the UN Convention to this Agreement and, thus, exclude the application of the UN Convention in its entirety to this Agreement. + +6.2 This Agreement sets out the entire agreement between You and Us for Your Contributions to Us and overrides all other agreements or understandings. + +6.3 If You or We assign the rights or obligations received through this Agreement to a third party, as a condition of the assignment, that third party must agree in writing to abide by all the rights and obligations in the Agreement. + +6.4 The failure of either party to require performance by the other party of any provision of this Agreement in one situation shall not affect the right of a party to require such performance at any time in the future. A waiver of performance under a provision in one situation shall not be considered a waiver of the performance of the provision in the future or a waiver of the provision in its entirety. + +6.5 If any provision of this Agreement is found void and unenforceable, such provision will be replaced to the extent possible with a provision that comes closest to the meaning of the original provision and which is enforceable. The terms and conditions set forth in this Agreement shall apply notwithstanding any failure of essential purpose of this Agreement or any limited remedy to the maximum extent possible under law. + +This agreement is derived from the Project Harmony CLA generator: +http://www.harmonyagreements.org/ +Harmony (HA-CLA-I-ANY) Version 1.0 + diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 000000000..05fbbc854 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,74 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of experience, +nationality, personal appearance, race, religion, or sexual identity and +orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or +advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at contact@openmptcprouter.com. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..83235db76 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,5 @@ +Contribution + +When submitting a pull request for the first time, you will need to agree to the contributor license agreement (for individuals or entities). To do this, in the pull request please create a file with a name like /contributors/{github_username}.md, and in the content of that file indicate your agreement. An example of what that file should contain can be seen in example agreement file. + +(This method of CLA "signing" is borrowed from Medium's open source project.) diff --git a/README.md b/README.md index 3bd6f0d65..36d1b351b 100644 --- a/README.md +++ b/README.md @@ -60,9 +60,9 @@ Added support to gateway set by user for 6in4. Used for IPv6 over the glorytun I ## luci-omr-bypass *Source:* [https://github.com/Ysurac/openmptcprouter-feeds/tree/master/luci-app-omr-bypass](https://github.com/Ysurac/openmptcprouter-feeds/tree/master/luci-app-omr-bypass) -*Description:* Luci interface to bypass domains with shadowsocks +*Description:* Luci interface to bypass domains, IPs and networks with shadowsocks -Domains added are bypassed when shadowsocks is used. This can be used when VPS IP is blacklisted from some sites. +Domains, IPs, networks and protocol (using DPI) added are bypassed when shadowsocks is used. This can be used when VPS IP is blacklisted from some sites. ## omr-tracker @@ -73,6 +73,18 @@ Domains added are bypassed when shadowsocks is used. This can be used when VPS I This is used for OpenMPTCProuter failover. +## omr-6in4 +*Source:* [https://github.com/Ysurac/openmptcprouter-feeds/tree/master/omr-6in4](https://github.com/Ysurac/openmptcprouter-feeds/tree/master/omr-6in4) + +*Description:* Set tunnel configuration by tracking tunnel configuration. + + +## omr-update +*Source:* [https://github.com/Ysurac/openmptcprouter-feeds/tree/master/omr-update](https://github.com/Ysurac/openmptcprouter-feeds/tree/master/omr-update) + +*Description:* Update old config with new settings. + + ## luci-omr-tracker *Source:* [https://github.com/Ysurac/openmptcprouter-feeds/tree/master/luci-app-omr-tracker](https://github.com/Ysurac/openmptcprouter-feeds/tree/master/luci-app-omr-tracker) @@ -97,3 +109,34 @@ Interface to omr-tracker. *Source:* [https://github.com/Ysurac/openmptcprouter-feeds/tree/master/mptcp](https://github.com/Ysurac/openmptcprouter-feeds/tree/master/mptcp) *Description:* This package set all MPTCP settings + + +## ndisc6 +*Source:* [http://www.remlab.net/files/ndisc6](http://www.remlab.net/files/ndisc6) + +*Description:* An ICMPv6 neighbour discovery tool + +This is used to check if there is no other IPv6 route announced on the network + + +## mlvpn +*Source:* [https://github.com/markfoodyburton/MLVPN/tree/new-reorder](https://github.com/markfoodyburton/MLVPN/tree/new-reorder) + +*Description:* Multi-link VPN + +This is an other way to aggregate same latency connections + + +## ndpi-filter +*Source:* [https://github.com/vel21ripn/nDPI](https://github.com/vel21ripn/nDPI) + +*Description:* Open Source Deep Packet Inspection Software Toolkit + +This is used to bypass a protocol + + +## tracebox +*Source:* [https://github.com/tracebox/tracebox](https://github.com/tracebox/tracebox) + +*Description:* A middlebox detection tool + diff --git a/contributors/example.md b/contributors/example.md new file mode 100644 index 000000000..654879dc4 --- /dev/null +++ b/contributors/example.md @@ -0,0 +1,9 @@ +2018-05-19 + +I hereby agree to the terms of the "OpenMPTCProuter Individual Contributor License Agreement", with MD5 checksum bc827a07eb93611d793ddb7c75083c00. + +I furthermore declare that I am authorized and able to make this agreement and sign this declaration. + +Signed, + +John Doe https://github.com/johndoe diff --git a/glorytun-udp/Makefile b/glorytun-udp/Makefile index e62fb9409..d3d95f76a 100644 --- a/glorytun-udp/Makefile +++ b/glorytun-udp/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 2015 OVH -# Copyright (C) 2017 Ycarus (Yannick Chabanois) +# Copyright (C) 2018 Ycarus (Yannick Chabanois) # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,13 +8,16 @@ include $(TOPDIR)/rules.mk +PKG_SOURCE_PROTO:=git +PKG_SOURCE_URL:=https://github.com/angt/glorytun.git +PKG_SOURCE_VERSION:=c15343f8f6fb275fe9bed56ca251bb801ea5d67b + PKG_NAME:=glorytun-udp -PKG_VERSION:=0.0.98-mud -PKG_RELEASE:=1 -PKG_SOURCE:=glorytun-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://github.com/angt/glorytun/releases/download/v$(PKG_VERSION) -PKG_BUILD_DIR:=$(BUILD_DIR)/glorytun-$(PKG_VERSION) -PKG_HASH:=34a02c83efbfa1742d639643eeeeeb35f43611c92e2fd93f2eedba065c2f9417 +PKG_VERSION:=0.0.99-mud +PKG_RELEASE:=17 + +PKG_FIXUP:=autoreconf + include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) @@ -42,3 +45,4 @@ define Package/$(PKG_NAME)/install endef $(eval $(call BuildPackage,$(PKG_NAME))) + diff --git a/glorytun-udp/init b/glorytun-udp/init index 3295f3baf..42259caa0 100755 --- a/glorytun-udp/init +++ b/glorytun-udp/init @@ -34,7 +34,7 @@ validate_section() { } start_instance() { - local enable key host port dev listener proto bind bindport mtu mtuauto chacha20 + local enable key host port listener proto bind bindport mtu mtuauto chacha20 dev validate_section "${1}" || { _err "validation failed" @@ -45,24 +45,30 @@ start_instance() { [ "${proto}" = "udp" ] || return 1 [ -n "${key}" ] || return 1 + [ "${key}" != "secretkey" ] || return 1 [ -n "${port}" ] || return 1 [ -n "${dev}" ] || return 1 echo "${key}" > /tmp/${PROG_NAME}-${1}.key key="" + if [ "$(uci -q get network.omrvpn)" != "" ]; then + uci -q set network.omrvpn.ifname=$dev + uci -q commit + fi + _log "starting ${PROG_NAME} ${1} instance $*" procd_open_instance procd_set_param command ${PROG} \ ${bind:+bind "$bind"} \ - ${bindport:+ "$port"} \ + ${bindport:+ "$bindport"} \ ${host:+to "$host"} \ ${port:+ "$port"} \ ${dev:+dev "$dev"} \ keyfile /tmp/${PROG_NAME}-${1}.key \ - ${mtu:+mtu "$mtu"} + persist [ "${chacha20}" = "1" ] && procd_append_param command chacha @@ -73,13 +79,37 @@ start_instance() { procd_set_param stderr 1 procd_close_instance + + #config_load network + #config_foreach add_glorytun_path interface + +} + +add_glorytun_path() { + case "$1" in + loopback|lan|if0|*tun*|ifb*) return ;; + esac + local multipath + network_get_ipaddr ipaddr "$1" + config_get multipath "$1" multipath "off" + case "$multipath" in + master|on) glorytun-udp path "$ipaddr" dev $dev up ;; + backup) glorytun-udp path "$ipaddr" dev $dev backup ;; + *) glorytun-udp path "$ipaddr" dev $dev down ;; + esac } start_service() { + local dev config_load glorytun config_foreach start_instance glorytun } +reload_service() { + stop + start +} + service_triggers() { procd_add_reload_trigger glorytun network } diff --git a/glorytun/Makefile b/glorytun/Makefile index 872df496a..923258146 100644 --- a/glorytun/Makefile +++ b/glorytun/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=glorytun PKG_VERSION:=0.0.35 -PKG_RELEASE:=5 +PKG_RELEASE:=6 PKG_SOURCE:=glorytun-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/angt/glorytun/releases/download/v$(PKG_VERSION) PKG_HASH:=49e4d8ea4ff2990300b37947b0bd0da3c8e0985bc6eddf29f4146306188fff64 diff --git a/glorytun/glorytun.config b/glorytun/glorytun.config index 06df550f3..a95274363 100644 --- a/glorytun/glorytun.config +++ b/glorytun/glorytun.config @@ -3,7 +3,8 @@ config glorytun 'vpn' option host '127.0.0.1' option port '65001' option dev 'tun0' - option key 'secretkey' + option key '' option mptcp '1' option proto 'tcp' option chacha20 '1' + option mtuauto '1' diff --git a/glorytun/init b/glorytun/init index 0aa2ae16b..ab7e6933e 100755 --- a/glorytun/init +++ b/glorytun/init @@ -42,12 +42,17 @@ start_instance() { [ "${enable}" = "1" ] || return 1 [ "${proto}" = "tcp" ] || return 1 [ -n "${key}" ] || return 1 + [ "${key}" != "secretkey" ] || return 1 [ -n "${port}" ] || return 1 [ -n "${dev}" ] || return 1 echo "${key}" > /tmp/${PROG_NAME}-${1}.key key="" + if [ "$(uci -q get network.omrvpn)" != "" ]; then + uci -q set network.omrvpn.ifname=${dev} + uci -q commit network + fi _log "starting ${PROG_NAME} ${1} instance $*" procd_open_instance @@ -64,7 +69,7 @@ start_instance() { procd_append_param command \ retry count -1 const 5000000 \ - timeout 9000 \ + timeout 40000 \ keepalive count 5 idle 60 interval 2 procd_set_param respawn 0 30 0 diff --git a/luci-app-glorytun/luasrc/model/cbi/glorytun-settings.lua b/luci-app-glorytun/luasrc/model/cbi/glorytun-settings.lua index 60def6362..aab2f460c 100644 --- a/luci-app-glorytun/luasrc/model/cbi/glorytun-settings.lua +++ b/luci-app-glorytun/luasrc/model/cbi/glorytun-settings.lua @@ -7,10 +7,10 @@ require("luci.model.uci") local basicParams = { - -- + -- -- Widget, Name, Default(s), Description -- - + { Flag,"enable",0, translate("Enable") }, { Value,"port",65001, translate("TCP port # for both local and remote") }, { Value,"dev","tun0", translate("Interface name") }, diff --git a/luci-app-glorytun/root/etc/hotplug.d/iface/30-glorytun b/luci-app-glorytun/root/etc/hotplug.d/iface/30-glorytun index 5210639a5..bdeb3d22b 100644 --- a/luci-app-glorytun/root/etc/hotplug.d/iface/30-glorytun +++ b/luci-app-glorytun/root/etc/hotplug.d/iface/30-glorytun @@ -17,9 +17,9 @@ set_default() { local iface config_get iface "$config" dev [ "$iface" = "$DEVICE" ] && { - config_get localip "$config" localip + config_get localip "$config" localip config_get remoteip "$config" remoteip - [ "$remoteip" != "" ] && [ "$localip" != "" ] && ip addr add $localip peer $remoteip dev $DEVICE + [ "$remoteip" != "" ] && [ "$localip" != "" ] && ifconfig $DEVICE $localip pointopoint $remoteip up } } diff --git a/luci-app-glorytun/root/etc/uci-defaults/1200-luci-glorytun b/luci-app-glorytun/root/etc/uci-defaults/1200-luci-glorytun new file mode 100644 index 000000000..791c73fe6 --- /dev/null +++ b/luci-app-glorytun/root/etc/uci-defaults/1200-luci-glorytun @@ -0,0 +1,56 @@ +#!/bin/sh + +uci -q batch <<-EOF >/dev/null + delete ucitrack.@glorytun[-1] + add ucitrack glorytun + set ucitrack.@glorytun[-1].init=glorytun + set ucitrack.@glorytun[-1].affects=glorytun-udp + delete ucitrack.@glorytun-udp[-1] + add ucitrack glorytun-udp + set ucitrack.@glorytun-udp[-1].init=glorytun-udp + commit ucitrack +EOF + +if [ "$(uci -q get network.glorytun)" = "" ] && [ "$(uci -q get network.omrvpn)" = "" ]; then + uci -q batch <<-EOF >/dev/null + delete network.glorytun + set network.glorytun=interface + set network.glorytun.ifname=tun0 + set network.glorytun.proto=dhcp + set network.glorytun.ip4table=vpn + set network.glorytun.multipath=off + set network.glorytun.leasetime=12h + set network.glorytun.mtu=1280 + commit network + EOF +# set network.glorytun.proto=static +# set network.glorytun.ipaddr=10.0.0.2 +# set network.glorytun.netmask=255.255.255.0 +# set network.glorytun.gateway=10.0.0.1 +fi + +if [ "$(uci -q show firewall | grep glorytun)" = "" ] && [ "$(uci -q get network.omrvpn)" = "" ]; then + uci -q batch <<-EOF >/dev/null + set firewall.zone_vpn=zone + set firewall.zone_vpn.name=vpn + set firewall.zone_vpn.network=glorytun + set firewall.zone_vpn.masq=1 + set firewall.zone_vpn.input=REJECT + set firewall.zone_vpn.forward=ACCEPT + set firewall.zone_vpn.output=ACCEPT + commit firewall + EOF +fi +if [ "$(uci -q show firewall | grep Allow-All-LAN-to-VPN)" = "" ]; then + uci -q batch <<-EOF >/dev/null + add firewall rule + set firewall.@rule[-1].enabled='1' + set firewall.@rule[-1].target='ACCEPT' + set firewall.@rule[-1].name='Allow-All-LAN-to-VPN' + set firewall.@rule[-1].dest='vpn' + set firewall.@rule[-1].src='lan' + commit firewall + EOF +fi +rm -f /tmp/luci-indexcache +exit 0 diff --git a/luci-app-glorytun/root/etc/uci-defaults/40_luci-glorytun b/luci-app-glorytun/root/etc/uci-defaults/40_luci-glorytun deleted file mode 100644 index d75431f4f..000000000 --- a/luci-app-glorytun/root/etc/uci-defaults/40_luci-glorytun +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -uci -q batch <<-EOF >/dev/null - delete ucitrack.@glorytun[-1] - add ucitrack glorytun - set ucitrack.@glorytun[-1].init=glorytun - set ucitrack.@glorytun[-1].affects=glorytun-udp - delete ucitrack.@glorytun-udp[-1] - add ucitrack glorytun-udp - set ucitrack.@glorytun-udp[-1].init=glorytun-udp - commit ucitrack -EOF - -uci -q batch <<-EOF >/dev/null - delete network.glorytun=interface - set network.glorytun=interface - set network.glorytun.ifname=tun0 - set network.glorytun.proto=dhcp - set network.glorytun.ip4table=vpn - set network.glorytun.multipath=off - set network.glorytun.leasetime=12h - commit network -EOF -uci -q batch <<-EOF >/dev/null - add firewall zone - set firewall.@zone[-1].name=vpn - set firewall.@zone[-1].network=glorytun - set firewall.@zone[-1].masq=1 - set firewall.@zone[-1].input=REJECT - set firewall.@zone[-1].forward=REJECT - set firewall.@zone[-1].output=ACCEPT - set firewall.allow_dhcp_request_vpn=rule - set firewall.allow_dhcp_request_vpn.name=Allow-DHCP-Request-VPN - set firewall.allow_dhcp_request_vpn.src=glorytun - set firewall.allow_dhcp_request_vpn.proto=udp - set firewall.allow_dhcp_request_vpn.dest_port=67 - set firewall.allow_dhcp_request_vpn.target=ACCEPT - set firewall.allow_dhcp_request_vpn.family=ipv4 - set firewall.redirect_vpn_to_lan=redirect - set firewall.redirect_vpn_to_lan.name=Redirect-VPN-to-LAN - set firewall.redirect_vpn_to_lan.src=vpn - set firewall.redirect_vpn_to_lan.dest=lan - set firewall.redirect_vpn_to_lan.proto=all - set firewall.redirect_vpn_to_lan.enabled=1 - set firewall.redirect_vpn_to_lan.src_dip=192.168.100.1 - commit firewall -EOF - -rm -f /tmp/luci-indexcache -exit 0 diff --git a/luci-app-iperf/Makefile b/luci-app-iperf/Makefile new file mode 100644 index 000000000..bb1700b16 --- /dev/null +++ b/luci-app-iperf/Makefile @@ -0,0 +1,15 @@ +# +# Copyright (C) 2018 Ycarus (Yannick Chabanois) +# +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=LuCI Support for iPerf3 +LUCI_DEPENDS:=+iperf3-ssl + +PKG_LICENSE:=GPLv3 + +include ../luci/luci.mk + +# call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-iperf/luasrc/controller/iperf.lua b/luci-app-iperf/luasrc/controller/iperf.lua new file mode 100644 index 000000000..434851278 --- /dev/null +++ b/luci-app-iperf/luasrc/controller/iperf.lua @@ -0,0 +1,50 @@ +local uci = luci.model.uci.cursor() +local ut = require "luci.util" + +module("luci.controller.iperf", package.seeall) + +function index() + --entry({"admin", "openmptcprouter", "iperf"}, cbi("iperf"), _("iperf")) + entry({"admin", "services", "iperf"}, alias("admin", "services", "iperf", "test"), _("iPerf"),8) + entry({"admin", "services", "iperf", "test"}, template("iperf/test"), nil,1) + entry({"admin", "services", "iperf", "run_test"}, post("run_test")).leaf = true +end + +function run_test(server,proto,mode,updown,omit,parallel,transmit,bitrate) + luci.http.prepare_content("text/plain") + local iperf + local addr = uci:get("iperf",server,"host") + local ports = uci:get("iperf",server,"ports") + local ipv = "4" + if proto == "ipv6" then + local ipv = "6" + end + + local t={} + for pt in ports:gmatch("([^,%s]+)") do + table.insert(t,pt) + end + local port = t[ math.random( #t ) ] + if mode == "tcp" then + if updown == "upload" then + iperf = io.popen("iperf3 -c %s -P %s -%s -p %s -O %s -t %s -J" % {ut.shellquote(addr),parallel,ipv,port,omit,transmit}) + else + iperf = io.popen("iperf3 -c %s -P %s -%s -p %s -O %s -R -t %s -J" % {ut.shellquote(addr),parallel,ipv,port,omit,transmit}) + end + else + if updown == "upload" then + iperf = io.popen("iperf3 -c %s -P %s -%s -p %s -O %s -t %s -u -b %s -J" % {ut.shellquote(addr),parallel,ipv,port,omit,transmit,bitrate}) + else + iperf = io.popen("iperf3 -c %s -P %s -%s -p %s -O %s -R -t %s -u -b %s -J" % {ut.shellquote(addr),parallel,ipv,port,omit,transmit,bitrate}) + end + end + if iperf then + while true do + local ln = iperf:read("*l") + if not ln then break end + luci.http.write(ln) + luci.http.write("\n") + end + end + return +end \ No newline at end of file diff --git a/luci-app-iperf/luasrc/view/iperf/test.htm b/luci-app-iperf/luasrc/view/iperf/test.htm new file mode 100644 index 000000000..660d7e4a8 --- /dev/null +++ b/luci-app-iperf/luasrc/view/iperf/test.htm @@ -0,0 +1,174 @@ +<%+header%> + +<% + local uci = require("luci.model.uci").cursor() +%> + + + + +<% if stderr and #stderr > 0 then %>
<%=pcdata(stderr)%>
<% end %> +
+
+

<%:iPerf speed tests%>

+
<%:This iPerf interface is in bêta. No support for this.%>
+
+ <%:Settings%> +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ <%:0 for unlimited. Need to be limited for UDP test%> +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+
+ +
+ + +
+<%+footer%> diff --git a/luci-app-iperf/root/etc/config/iperf b/luci-app-iperf/root/etc/config/iperf new file mode 100644 index 000000000..911c3a1e6 --- /dev/null +++ b/luci-app-iperf/root/etc/config/iperf @@ -0,0 +1,96 @@ +config server 'bouygues' + option host 'bouygues.iperf.fr' + option ipv4 '1' + option ipv6 '1' + option speed '10000' + option ports '5200,5201,5202,5203,5204,5205,5206,5207,5208,5209' + option tcp '1' + option udp '0' + option location 'Europe' + +config server 'online_ipv4' + option host 'ping.online.net' + option ipv4 '1' + option ipv6 '0' + option speed '10000' + option ports '5200,5201,5202,5203,5204,5205,5206,5207,5208,5209' + option tcp '1' + option udp '1' + option location 'Europe' + +config server 'online_ipv6' + option host 'ping.online.net' + option ipv4 '0' + option ipv6 '1' + option speed '10000' + option ports '5200,5201,5202,5203,5204,5205,5206,5207,5208,5209' + option tcp '1' + option udp '1' + option location 'Europe' + +config server 'serverius' + option host 'speedtest.serverius.net' + option ipv4 '1' + option ipv6 '1' + option speed '10000' + option ports '5002' + option tcp '1' + option udp '1' + option location 'Europe' + +config server 'eenet' + option host 'iperf.eenet.ee' + option ipv4 '1' + option ipv6 '0' + option ports '5201' + option tcp '1' + option udp '1' + option location 'Europe' + +config server 'volia' + option host 'iperf.volia.net' + option ipv4 '1' + option ipv6 '0' + option ports '5201' + option tcp '1' + option udp '1' + option location 'Europe' + +config server 'it_north' + option host 'iperf.it-north.net' + option ipv4 '1' + option ipv6 '0' + option speed '1000' + option ports '5200,5201,5202,5203,5204,5205,5206,5207,5208,5209' + option tcp '1' + option udp '1' + option location 'Asia' + +config server 'biznet' + option host 'iperf.biznetnetworkds.com' + option ipv4 '1' + option ipv6 '1' + option speed '1000' + option ports '5201,5202,5203' + option tcp '1' + option udp '0' + option location 'Asia' + +config server 'scottlinux' + option host 'iperf.scottlinux.com' + option ipv4 '1' + option ipv6 '1' + option speed '1000' + option ports '5201' + option tcp '1' + option udp '1' + option location 'America' + +config server 'he' + option host 'iperf.he.net' + option ipv4 '1' + option ipv6 '1' + option ports '5201' + option tcp '1' + option udp '1' + option location 'America' diff --git a/luci-app-mlvpn/Makefile b/luci-app-mlvpn/Makefile new file mode 100644 index 000000000..e9ad0fa78 --- /dev/null +++ b/luci-app-mlvpn/Makefile @@ -0,0 +1,15 @@ +# +# Copyright (C) 2018 Ycarus (Yannick Chabanois) +# +# + +include $(TOPDIR)/rules.mk + +LUCI_TITLE:=LuCI Support for MLVPN +LUCI_DEPENDS:=+mlvpn + +PKG_LICENSE:=GPLv3 + +include ../luci/luci.mk + +# call BuildPackage - OpenWrt buildroot signature diff --git a/luci-app-mlvpn/luasrc/controller/mlvpn.lua b/luci-app-mlvpn/luasrc/controller/mlvpn.lua new file mode 100644 index 000000000..aefd8c027 --- /dev/null +++ b/luci-app-mlvpn/luasrc/controller/mlvpn.lua @@ -0,0 +1,6 @@ +module("luci.controller.mlvpn", package.seeall) + +function index() + --entry({"admin", "openmptcprouter", "mlvpn"}, cbi("mlvpn"), _("MLVPN")) + entry({"admin", "services", "mlvpn"}, cbi("mlvpn"), _("MLVPN")) +end diff --git a/luci-app-mlvpn/luasrc/model/cbi/mlvpn.lua b/luci-app-mlvpn/luasrc/model/cbi/mlvpn.lua new file mode 100644 index 000000000..eaef23d7e --- /dev/null +++ b/luci-app-mlvpn/luasrc/model/cbi/mlvpn.lua @@ -0,0 +1,77 @@ +local net = require "luci.model.network".init() +local sys = require "luci.sys" +local ifaces = sys.net:devices() +local m, s, o + +m = Map("mlvpn", translate("MLVPN")) + +s = m:section(TypedSection, "mlvpn", translate("Settings")) +s.anonymous = true +s.addremove = false + +o = s:option(Flag, "enable", translate("Enable")) +o.rmempty = false + +o = s:option(Value, "timeout", translate("Timeout (s)")) +o.placeholder = "30" +o.default = "30" +o.datatype = "uinteger" +o.rmempty = false + +o = s:option(Value, "reorder_buffer_size", translate("Reorder buffer size")) +o.placeholder = "64" +o.default = "64" +o.datatype = "uinteger" +o.rmempty = false + +o = s:option(Value, "loss_tolerance", translate("Loss tolerance")) +o.placeholder = "50" +o.default = "50" +o.datatype = "uinteger" +o.rmempty = false + +o = s:option(Value, "host", translate("Remote host")) +o.placeholder = "128.128.128.128" +o.default = "128.128.128.128" +o.datatype = "host" +o.rmempty = false + +o = s:option(Value, "firstport", translate("First remote port"),translate("Interface will increase port used beginning with this")) +o.default = "65201" +o.datatype = "port" +o.rmempty = false + +o = s:option(Value, "password", translate("Password")) +o.password = true +o.rmempty = false + + +o = s:option(Value, "interface_name", translate("Interface name")) +o.placeholder = "mlvpn0" +o.default = "mlvpn0" +o.rmempty = false + +--o = s:option(Value, "mode", translate("Mode")) +--o:value("client") +--o:value("server") +--o.default = "client" +--o.rmempty = false + + +--s = m:section(TypedSection, "interface", translate("Interfaces")) +--s.template_addremove = "mlvpn/cbi-select-add" +--s.addremove = true +--s.add_select_options = { } +--s.add_select_options[''] = '' +--for _, iface in ipairs(ifaces) do +-- if not (iface == "lo" or iface:match("^ifb.*")) then +-- s.add_select_options[iface] = iface +-- end +--end + +--o = s:option(Value, "port", translate("Remote/Bind port")) +--o.placeholder = "65201" +--o.default = "65201" +--o.datatype = "port" + +return m diff --git a/luci-app-mlvpn/luasrc/view/mlvpn/cbi-select-add.htm b/luci-app-mlvpn/luasrc/view/mlvpn/cbi-select-add.htm new file mode 100644 index 000000000..9ee30d310 --- /dev/null +++ b/luci-app-mlvpn/luasrc/view/mlvpn/cbi-select-add.htm @@ -0,0 +1,10 @@ +
+ <% if self.invalid_cts then -%>
<% end %> + + + <% if self.invalid_cts then %>
<%:Invalid%>
<% end %> +
diff --git a/luci-app-mlvpn/po/fr/mlvpn.po b/luci-app-mlvpn/po/fr/mlvpn.po new file mode 100644 index 000000000..36e5e89ab --- /dev/null +++ b/luci-app-mlvpn/po/fr/mlvpn.po @@ -0,0 +1,61 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 2.0.6\n" +"Last-Translator: Ycarus \n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"Language: fr\n" + +msgid "Add" +msgstr "Ajouter" + +msgid "Enable" +msgstr "Activé" + +msgid "First remote port" +msgstr "Premier port distant" + +msgid "Interface name" +msgstr "Nom de l'interface" + +msgid "Interface will increase port used beginning with this" +msgstr "" + +msgid "Interfaces" +msgstr "Interfaces" + +msgid "Invalid" +msgstr "Invalide" + +msgid "Loss tolerance" +msgstr "" + +msgid "MLVPN" +msgstr "" + +msgid "Mode" +msgstr "" + +msgid "Password" +msgstr "Mot de passe" + +msgid "Remote host" +msgstr "Nom de l'hôte distant ou adresse IP" + +msgid "Remote/Bind port" +msgstr "Port de connexion distant" + +msgid "Reorder buffer size" +msgstr "" + +msgid "Settings" +msgstr "Paramètres" + +msgid "Timeout (s)" +msgstr "Délais d'attente (s)" diff --git a/luci-app-mlvpn/po/templates/mlvpn.pot b/luci-app-mlvpn/po/templates/mlvpn.pot new file mode 100644 index 000000000..0eecd2f65 --- /dev/null +++ b/luci-app-mlvpn/po/templates/mlvpn.pot @@ -0,0 +1,50 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8" + +msgid "Add" +msgstr "" + +msgid "Enable" +msgstr "" + +msgid "First remote port" +msgstr "" + +msgid "Interface name" +msgstr "" + +msgid "Interface will increase port used beginning with this" +msgstr "" + +msgid "Interfaces" +msgstr "" + +msgid "Invalid" +msgstr "" + +msgid "Loss tolerance" +msgstr "" + +msgid "MLVPN" +msgstr "" + +msgid "Mode" +msgstr "" + +msgid "Password" +msgstr "" + +msgid "Remote host" +msgstr "" + +msgid "Remote/Bind port" +msgstr "" + +msgid "Reorder buffer size" +msgstr "" + +msgid "Settings" +msgstr "" + +msgid "Timeout (s)" +msgstr "" diff --git a/luci-app-mptcp/luasrc/controller/mptcp.lua b/luci-app-mptcp/luasrc/controller/mptcp.lua index 07be67e47..88db23601 100644 --- a/luci-app-mptcp/luasrc/controller/mptcp.lua +++ b/luci-app-mptcp/luasrc/controller/mptcp.lua @@ -1,127 +1,127 @@ --- Copyright 2008 Steven Barth --- Copyright 2011 Jo-Philipp Wich --- Copyright 2018 Ycarus (Yannick Chabanois) --- Licensed to the public under the Apache License 2.0. - -module("luci.controller.mptcp", package.seeall) - -function index() - entry({"admin", "network", "mptcp"}, alias("admin", "network", "mptcp", "settings"), _("MPTCP")) - entry({"admin", "network", "mptcp", "settings"}, cbi("mptcp"), _("Settings"),2).leaf = true - entry({"admin", "network", "mptcp", "bandwidth"}, template("mptcp/multipath"), _("Bandwidth"), 3).leaf = true - entry({"admin", "network", "mptcp", "multipath_bandwidth"}, call("multipath_bandwidth")).leaf = true - entry({"admin", "network", "mptcp", "interface_bandwidth"}, call("interface_bandwidth")).leaf = true -end - -function interface_bandwidth(iface) - luci.http.prepare_content("application/json") - local bwc = io.popen("luci-bwc -i %q 2>/dev/null" % iface) - if bwc then - luci.http.write("[") - while true do - local ln = bwc:read("*l") - if not ln then break end - luci.http.write(ln) - end - luci.http.write("]") - bwc:close() - end -end - -function string.split(input, delimiter) - input = tostring(input) - delimiter = tostring(delimiter) - if (delimiter=='') then return false end - local pos,arr = 0, {} - -- for each divider found - for st,sp in function() return string.find(input, delimiter, pos, true) end do - table.insert(arr, string.sub(input, pos, st - 1)) - pos = sp + 1 - end - table.insert(arr, string.sub(input, pos)) - return arr -end - -function multipath_bandwidth() - local result = { }; - local uci = luci.model.uci.cursor() - local multipath=""; - local proto=""; - local res={ }; - local str=""; - local tmpstr=""; - - for _, dev in luci.util.vspairs(luci.sys.net.devices()) do - if dev ~= "lo" then - if dev == "eth0.2" then - multipath = uci:get("network", "wan", "multipath") - elseif dev == "4g-wwan0" then - multipath = uci:get("network", "wwan0", "multipath") - else - multipath = uci:get("network", dev, "multipath") - end - if multipath == "on" or multipath == "master" or multipath == "backup" or multipath == "handover" then - result[dev] = "[" .. string.gsub((luci.sys.exec("luci-bwc -i %q 2>/dev/null" % dev)), '[\r\n]', '') .. "]" - end - end - end - ---ȳʼ - res["total"]={ }; - for i=1,60 do - res["total"][i]={} - for j=1,5 do - res["total"][i][j]=0 - end - end - - --нӿڱ - for key,value in pairs(result) do - res[key]={} - value=(string.gsub(value, "^%[%[", "")) - value=(string.gsub(value, "%]%]", "")) - local temp1 = string.split(value, "],") - res[key][1]=temp1[1] - for i=2,60 do - res[key][i]={} - res[key][i]=(string.gsub(temp1[i], "%[", " ")) - end - for i=1,60 do - res[key][i] = string.split(res[key][i], ",") - for j=1,5 do - if "string"== type(res[key][i][j]) then - res[key][i][j]= tonumber(res[key][i][j]) - end - if "string"==type(res["total"][i][j]) then - res["total"][i][j]= tonumber(res["total"][i][j]) - end - if j ==1 then - res["total"][i][j] = res[key][i][j] - else - res["total"][i][j] = res["total"][i][j] + res[key][i][j] - end - end - end - end - ---ֵתַ - for i=1,60 do - for j=1,5 do - if "number"== type(res["total"][i][j]) then - res["total"][i][j]= tostring(res["total"][i][j]) - end - end - end - ---תַ - for i=1,60 do - if i == 60 then - tmpstr = "["..table.concat(res["total"][i], ",") - else - tmpstr = "["..table.concat(res["total"][i], ",").."]," - end - str = str..tmpstr - end - str = "["..str.."]]" - result["total"]=str - - luci.http.prepare_content("application/json") - luci.http.write_json(result) -end +-- Copyright 2008 Steven Barth +-- Copyright 2011 Jo-Philipp Wich +-- Copyright 2018 Ycarus (Yannick Chabanois) +-- Licensed to the public under the Apache License 2.0. + +module("luci.controller.mptcp", package.seeall) + +function index() + entry({"admin", "network", "mptcp"}, alias("admin", "network", "mptcp", "settings"), _("MPTCP")) + entry({"admin", "network", "mptcp", "settings"}, cbi("mptcp"), _("Settings"),2).leaf = true + entry({"admin", "network", "mptcp", "bandwidth"}, template("mptcp/multipath"), _("Bandwidth"), 3).leaf = true + entry({"admin", "network", "mptcp", "multipath_bandwidth"}, call("multipath_bandwidth")).leaf = true + entry({"admin", "network", "mptcp", "interface_bandwidth"}, call("interface_bandwidth")).leaf = true +end + +function interface_bandwidth(iface) + luci.http.prepare_content("application/json") + local bwc = io.popen("luci-bwc -i %q 2>/dev/null" % iface) + if bwc then + luci.http.write("[") + while true do + local ln = bwc:read("*l") + if not ln then break end + luci.http.write(ln) + end + luci.http.write("]") + bwc:close() + end +end + +function string.split(input, delimiter) + input = tostring(input) + delimiter = tostring(delimiter) + if (delimiter=='') then return false end + local pos,arr = 0, {} + -- for each divider found + for st,sp in function() return string.find(input, delimiter, pos, true) end do + table.insert(arr, string.sub(input, pos, st - 1)) + pos = sp + 1 + end + table.insert(arr, string.sub(input, pos)) + return arr +end + +function multipath_bandwidth() + local result = { }; + local uci = luci.model.uci.cursor() + local multipath=""; + local proto=""; + local res={ }; + local str=""; + local tmpstr=""; + + for _, dev in luci.util.vspairs(luci.sys.net.devices()) do + if dev ~= "lo" then + if dev == "eth0.2" then + multipath = uci:get("network", "wan", "multipath") + elseif dev == "4g-wwan0" then + multipath = uci:get("network", "wwan0", "multipath") + else + multipath = uci:get("network", dev, "multipath") + end + if multipath == "on" or multipath == "master" or multipath == "backup" or multipath == "handover" then + result[dev] = "[" .. string.gsub((luci.sys.exec("luci-bwc -i %q 2>/dev/null" % dev)), '[\r\n]', '') .. "]" + end + end + end) + ---ȳʼ + res["total"]={ }; + for i=1,60 do + res["total"][i]={} + for j=1,5 do + res["total"][i][j]=0 + end + end + + --нӿڱ + for key,value in pairs(result) do + res[key]={} + value=(string.gsub(value, "^%[%[", "")) + value=(string.gsub(value, "%]%]", "")) + local temp1 = string.split(value, "],") + res[key][1]=temp1[1] + for i=2,60 do + res[key][i]={} + res[key][i]=(string.gsub(temp1[i], "%[", " ")) + end + for i=1,60 do + res[key][i] = string.split(res[key][i], ",") + for j=1,5 do + if "string"== type(res[key][i][j]) then + res[key][i][j]= tonumber(res[key][i][j]) + end + if "string"==type(res["total"][i][j]) then + res["total"][i][j]= tonumber(res["total"][i][j]) + end + if j ==1 then + res["total"][i][j] = res[key][i][j] + else + res["total"][i][j] = res["total"][i][j] + res[key][i][j] + end + end + end + end + ---ֵתַ + for i=1,60 do + for j=1,5 do + if "number"== type(res["total"][i][j]) then + res["total"][i][j]= tostring(res["total"][i][j]) + end + end + end + ---תַ + for i=1,60 do + if i == 60 then + tmpstr = "["..table.concat(res["total"][i], ",") + else + tmpstr = "["..table.concat(res["total"][i], ",").."]," + end + str = str..tmpstr + end + str = "["..str.."]]" + result["total"]=str + + luci.http.prepare_content("application/json") + luci.http.write_json(result) +end diff --git a/luci-app-mptcp/luasrc/model/cbi/mptcp.lua b/luci-app-mptcp/luasrc/model/cbi/mptcp.lua index 079755b2e..2fd8299ff 100644 --- a/luci-app-mptcp/luasrc/model/cbi/mptcp.lua +++ b/luci-app-mptcp/luasrc/model/cbi/mptcp.lua @@ -3,20 +3,20 @@ local sys = require "luci.sys" local ifaces = sys.net:devices() local m, s, o -m = Map("network", translate("MPTCP"), translate("Networks MPTCP settings")) +m = Map("network", translate("MPTCP"), translate("Networks MPTCP settings. Visit http://multipath-tcp.org/pmwiki.php/Users/ConfigureMPTCP for help.")) s = m:section(TypedSection, "globals") local mtcpg = s:option(ListValue, "multipath", translate("Multipath TCP")) mtcpg:value("enable", translate("enable")) mtcpg:value("disable", translate("disable")) local mtcpck = s:option(ListValue, "mptcp_checksum", translate("Multipath TCP checksum")) -mtcpck:value("enable", translate("enable")) -mtcpck:value("disable", translate("disable")) +mtcpck:value(1, translate("enable")) +mtcpck:value(0, translate("disable")) local mtcppm = s:option(ListValue, "mptcp_path_manager", translate("Multipath TCP path-manager")) mtcppm:value("default", translate("default")) mtcppm:value("fullmesh", translate("fullmesh")) mtcppm:value("ndiffports", translate("ndiffports")) -mtcppm:value("blinder", translate("blinder")) +mtcppm:value("binder", translate("binder")) local mtcpsch = s:option(ListValue, "mptcp_scheduler", translate("Multipath TCP scheduler")) mtcpsch:value("default", translate("default")) mtcpsch:value("roundrobin", translate("round-robin")) @@ -29,6 +29,16 @@ local availablecong = sys.exec("sysctl net.ipv4.tcp_available_congestion_control for cong in string.gmatch(availablecong, "[^%s]+") do congestion:value(cong, translate(cong)) end +local mtcpfm_subflows = s:option(Value, "mptcp_fullmesh_num_subflows", translate("Fullmesh subflows for each pair of IP addresses")) +mtcpfm_subflows.datatype = "uinteger" +mtcpfm_subflows.rmempty = false +local mtcpfm_createonerr = s:option(ListValue, "mptcp_fullmesh_create_on_err", translate("Re-create fullmesh subflows after a timeout")) +mtcpfm_createonerr:value(1, translate("enable")) +mtcpfm_createonerr:value(0, translate("disable")) + +local mtcpnd_subflows = s:option(Value, "mptcp_ndiffports_num_subflows", translate("ndiffports subflows number")) +mtcpnd_subflows.datatype = "uinteger" +mtcpnd_subflows.rmempty = false s = m:section(TypedSection, "interface", translate("Interfaces Settings")) mptcp = s:option(ListValue, "multipath", translate("Multipath TCP"), translate("One interface must be set as master")) diff --git a/luci-app-mptcp/luasrc/view/mptcp/multipath.htm b/luci-app-mptcp/luasrc/view/mptcp/multipath.htm index c153bf870..dabd969c5 100644 --- a/luci-app-mptcp/luasrc/view/mptcp/multipath.htm +++ b/luci-app-mptcp/luasrc/view/mptcp/multipath.htm @@ -1,813 +1,813 @@ -<% --- Copyright 2010 Jo-Philipp Wich (jow@openwrt.org) --- Copyright 2015 OVH (OverTheBox@ovh.net) --- Simon Lelievre (simon.lelievre@corp.ovh.com) --- Sebastien Duponcheel (sebastien.duponcheel@ovh.net) --- --- This file is part of OverTheBox for OpenWrt. --- --- OverTheBox is free software: you can redistribute it and/or modify --- it under the terms of the GNU General Public License as published by --- the Free Software Foundation, either version 3 of the License, or --- (at your option) any later version. --- --- OverTheBox is distributed in the hope that it will be useful, --- but WITHOUT ANY WARRANTY; without even the implied warranty of --- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the --- GNU General Public License for more details. --- --- You should have received a copy of the GNU General Public License --- along with OverTheBox. If not, see (http://www.gnu.org/licenses/) --%> -<%- - local ntm = require "luci.model.network".init() - local uci = require "luci.model.uci".cursor() - - local dev - local devices = { "all" } - local multipath = "" - - for _, dev in luci.util.vspairs(luci.sys.net.devices()) do - if dev ~= "lo" and not ntm:ignore_interface(dev) then - if dev == "eth0.2" then - multipath = uci:get("network", "wan", "multipath") - elseif dev == "4g-wwan0" then - multipath = uci:get("network", "wwan0", "multipath") - else - multipath = uci:get("network", dev, "multipath") - end - if multipath == "on" or multipath == "master" or multipath == "backup" or multipath== "handover" then - devices[#devices+1] = dev - end - end - end - - local curdev = luci.dispatcher.context.requestpath - curdev = curdev[#curdev] ~= "bandwidth" and curdev[#curdev] or devices[1] - if curdev == "" then - curdev = "all" - end --%> - -<%+header%> - - - - - -

<%:Realtime Traffic%>

- - - -<% if curdev == "all" then %> - -<%:Download:%> - -
-
- -
- -<%:Upload:%> - -
-
- -
-
- -<% else %> - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - -
<%:Inbound:%>0 <%:kbit/s%>
(0 <%:kB/s%>)		<%:Average:%>0 <%:kbit/s%>
(0 <%:kB/s%>)		<%:Peak:%>0 <%:kbit/s%>
(0 <%:kB/s%>)
<%:Outbound:%>0 <%:kbit/s%>
(0 <%:kB/s%>)		<%:Average:%>0 <%:kbit/s%>
(0 <%:kB/s%>)		<%:Peak:%>0 <%:kbit/s%>
(0 <%:kB/s%>)
- -<% end %> - - -<%+footer%> +<% +-- Copyright 2010 Jo-Philipp Wich (jow@openwrt.org) +-- Copyright 2015 OVH (OverTheBox@ovh.net) +-- Simon Lelievre (simon.lelievre@corp.ovh.com) +-- Sebastien Duponcheel (sebastien.duponcheel@ovh.net) +-- Copyright 2018 Ycarus - Yannick Chabanois (ycarus@zugaina.org) +-- +-- This file is part of OverTheBox for OpenWrt. +-- +-- OverTheBox is free software: you can redistribute it and/or modify +-- it under the terms of the GNU General Public License as published by +-- the Free Software Foundation, either version 3 of the License, or +-- (at your option) any later version. +-- +-- OverTheBox is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-- GNU General Public License for more details. +-- +-- You should have received a copy of the GNU General Public License +-- along with OverTheBox. If not, see (http://www.gnu.org/licenses/) +-%> +<%- + local ntm = require "luci.model.network".init() + local uci = require "luci.model.uci".cursor() + + local dev + local devices = { "all" } + local multipath = "" + + for _, dev in luci.util.vspairs(luci.sys.net.devices()) do + if dev ~= "lo" and not ntm:ignore_interface(dev) then + if dev == "eth0.2" then + multipath = uci:get("network", "wan", "multipath") + elseif dev == "4g-wwan0" then + multipath = uci:get("network", "wwan0", "multipath") + else + multipath = uci:get("network", dev, "multipath") + end + if multipath == "on" or multipath == "master" or multipath == "backup" or multipath== "handover" then + devices[#devices+1] = dev + end + end + end + + local curdev = luci.http.formvalue("dev") or "all" +-%> + +<%+header%> + + + + + +

<%:Realtime Traffic%>

+ + + +<% if curdev == "all" then %> + +<%:Download:%> + +
-
+ +
+ +<%:Upload:%> + +
-
+ +
+
+ +<% else %> + + +
-
+
+ + + + + + + + + + + + + + + + + + + + + + +
<%:Inbound:%>0 <%:kbit/s%>
(0 <%:kB/s%>)		<%:Average:%>0 <%:kbit/s%>
(0 <%:kB/s%>)		<%:Peak:%>0 <%:kbit/s%>
(0 <%:kB/s%>)
<%:Outbound:%>0 <%:kbit/s%>
(0 <%:kB/s%>)		<%:Average:%>0 <%:kbit/s%>
(0 <%:kB/s%>)		<%:Peak:%>0 <%:kbit/s%>
(0 <%:kB/s%>)
+ +<% end %> + + +<%+footer%> diff --git a/luci-app-nginx-ha/Makefile b/luci-app-nginx-ha/Makefile index c9e835813..267d00238 100644 --- a/luci-app-nginx-ha/Makefile +++ b/luci-app-nginx-ha/Makefile @@ -9,6 +9,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI Support for nginx load balancing LUCI_DEPENDS:=+nginx +KCONFIG:=CONFIG_NGINX_STREAM PKG_LICENSE:=MIT diff --git a/luci-app-nginx-ha/luasrc/model/cbi/nginx-ha.lua b/luci-app-nginx-ha/luasrc/model/cbi/nginx-ha.lua index 7f4a43d22..375545274 100644 --- a/luci-app-nginx-ha/luasrc/model/cbi/nginx-ha.lua +++ b/luci-app-nginx-ha/luasrc/model/cbi/nginx-ha.lua @@ -6,29 +6,20 @@ else m = Map("nginx-ha", translate("Nginx High Availability"), "%s - %s" %{translate("Nginx High Availability"), translate("NOT RUNNING")}) end -s = m:section(TypedSection, "general", translate("General Setting")) -s.anonymous = true +s = m:section(TypedSection, "nginxha", translate("Settings")) +s.addremove = true o = s:option(Flag, "enable", translate("Enable")) o.rmempty = false -o = s:option(Value, "startup_delay", translate("Startup Delay")) -o:value(0, translate("Not enabled")) -for _, v in ipairs({5, 10, 15, 25, 40}) do - o:value(v, translate("%u seconds") %{v}) -end -o.datatype = "uinteger" -o.default = 0 -o.rmempty = false - o = s:option(Value, "listen", translate("Listen Address:Port")) o.placeholder = "0.0.0.0:6666" o.default = "0.0.0.0:6666" o.rmempty = false o = s:option(Value, "timeout", translate("Timeout Connect (ms)")) -o.placeholder = "666" -o.default = "666" +o.placeholder = "1000" +o.default = "1000" o.datatype = "range(33, 10000)" o.rmempty = false diff --git a/luci-app-nginx-ha/root/etc/config/nginx-ha b/luci-app-nginx-ha/root/etc/config/nginx-ha index b6cfa9761..66d3b08c3 100644 --- a/luci-app-nginx-ha/root/etc/config/nginx-ha +++ b/luci-app-nginx-ha/root/etc/config/nginx-ha @@ -1,8 +1,14 @@ -config general 'general' +config nginxha 'ShadowSocks' option enable '0' option retries '1' option timeout '1000' option listen '0.0.0.0:65101' - option startup_delay '5' list upstreams '1.2.3.4:65101 weight=1 max_fails=3 fail_timeout=30s' + +config nginxha 'VPN' + option enable '0' + option retries '1' + option timeout '1000' + option listen '0.0.0.0:65001' + list upstreams '1.2.3.4:65001 weight=1 max_fails=3 fail_timeout=30s' diff --git a/luci-app-nginx-ha/root/etc/init.d/nginx-ha b/luci-app-nginx-ha/root/etc/init.d/nginx-ha index fee654f12..34f990de5 100755 --- a/luci-app-nginx-ha/root/etc/init.d/nginx-ha +++ b/luci-app-nginx-ha/root/etc/init.d/nginx-ha @@ -20,11 +20,10 @@ _err() { } validate_section() { - uci_validate_section nginx-ha general "${1}" \ + uci_validate_section nginx-ha nginxha "${1}" \ 'enable:bool:0' \ 'retries:uinteger:3' \ 'timeout:uinteger:4000' \ - 'startup_delay:uinteger:5' \ 'listen:string' \ 'upstreams:list(string)' } @@ -33,12 +32,6 @@ genline_srv(){ echo " server $1;" } -boot() { - local delay=$(uci -q get $NAME.general.startup_delay) - (sleep ${delay:-0} && start >/dev/null 2>&1) & - return 0 -} - start_instance() { local enable retries timeout startup_delay listen upstreams @@ -49,6 +42,28 @@ start_instance() { [ "$enable" = 1 ] || return 1 + stream="${stream} + upstream ${1} { + zone dynamic 64k; + $(config_list_foreach "${1}" "upstreams" genline_srv) + } + + server { + listen ${listen:-0.0.0.0:6666} udp; + listen ${listen:-0.0.0.0:6666} so_keepalive=off; + proxy_pass ${1}; + } + " +} + +start_service() { + local stream="" + config_load nginx-ha + config_foreach start_instance nginxha + + [ -z "$stream" ] && return + + mkdir -p /var/log/nginx mkdir -p /var/etc cat <<-EOF > /var/etc/$PROG_NAME.cfg user nobody nogroup; @@ -62,19 +77,7 @@ start_instance() { } stream { - upstream allservers { - zone dynamic 64k; - $(config_list_foreach "${1}" "upstreams" genline_srv) - } - - server { - listen ${listen:-0.0.0.0:6666} udp; - proxy_pass allservers; - } - server { - listen ${listen:-0.0.0.0:6666}; - proxy_pass allservers; - } + ${stream} } EOF @@ -83,11 +86,8 @@ start_instance() { procd_set_param file /var/etc/$PROG_NAME.cfg procd_set_param respawn procd_close_instance -} -start_service() { - config_load nginx-ha - config_foreach start_instance general + } reload_service() { diff --git a/luci-app-omr-bypass/Makefile b/luci-app-omr-bypass/Makefile index 60e9d6f7b..fddbae423 100644 --- a/luci-app-omr-bypass/Makefile +++ b/luci-app-omr-bypass/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI Interface to bypass domains -LUCI_DEPENDS:=+dnsmasq-full +shadowsocks-libev-ss-rules +LUCI_DEPENDS:=+dnsmasq-full +shadowsocks-libev-ss-rules +iptables-mod-ndpi +iptables-mod-extra +kmod-ipt-ndpi +iptables PKG_LICENSE:=GPLv3 diff --git a/luci-app-omr-bypass/luasrc/controller/omr-bypass.lua b/luci-app-omr-bypass/luasrc/controller/omr-bypass.lua index 7bb049a4a..1af7a9b9e 100644 --- a/luci-app-omr-bypass/luasrc/controller/omr-bypass.lua +++ b/luci-app-omr-bypass/luasrc/controller/omr-bypass.lua @@ -17,25 +17,35 @@ function bypass_add() local ip_ipset = {} for _, k in pairs(hosts) do if k ~= "" then - if dt.ipaddr(k) then + if dt.ipmask(k) then table.insert(ip_ipset, k) else domains_ipset = domains_ipset .. '/' .. k end end end - ucic:delete("omr-bypass","ips","ip") - if table.getn(ip_ipset) > 0 then - for _, i in pairs(ip_ipset) do - ucic:set_list("omr-bypass","ips","ip",ip_ipset) + ucic:set_list("omr-bypass","ips","ip",ip_ipset) + + local dpi = luci.http.formvalue("cbid.omr-bypass.dpi") + if dpi ~= "" then + if (type(dpi) ~= "table") then + dpi = {dpi} end + ucic:set_list("omr-bypass","dpi","proto",dpi) + else + ucic:delete("omr-bypass","dpi","proto") end + + local interface = luci.http.formvalue("cbid.omr-bypass.interface") or "" + ucic:set("omr-bypass","defaults","ifname",interface) + ucic:save("omr-bypass") ucic:commit("omr-bypass") ucic:set_list("dhcp",ucic:get_first("dhcp","dnsmasq"),"ipset",domains_ipset .. "/ss_rules_dst_bypass") ucic:save("dhcp") ucic:commit("dhcp") --luci.sys.exec("/etc/init.d/dnsmasq restart") + luci.sys.exec("/etc/init.d/omr-bypass restart") luci.http.redirect(luci.dispatcher.build_url("admin/services/omr-bypass")) return end \ No newline at end of file diff --git a/luci-app-omr-bypass/luasrc/view/omr-bypass/bypass.htm b/luci-app-omr-bypass/luasrc/view/omr-bypass/bypass.htm index ab8442f04..1ee44e742 100644 --- a/luci-app-omr-bypass/luasrc/view/omr-bypass/bypass.htm +++ b/luci-app-omr-bypass/luasrc/view/omr-bypass/bypass.htm @@ -1,13 +1,18 @@ <%+header%> - + <% local uci = require("luci.model.uci").cursor() local hosts = uci:get_list("dhcp", uci:get_first("dhcp","dnsmasq"), "ipset") local ips = uci:get_list("omr-bypass", "ips", "ip") + local dpi = uci:get_list("omr-bypass", "dpi", "proto") + local tmpfile = os.tmpname() + local dpi_available_proto = luci.util.execi("cat /proc/net/xt_ndpi/proto | awk '{print $3}' | sort -u | head -n -1") + local sys = require "luci.sys" + local ifaces = sys.net:devices() + local bypassif = uci:get("omr-bypass","defaults","ifname") or "" %> - <% if stderr and #stderr > 0 then %>
<%=pcdata(stderr)%>
<% end %>
@@ -25,7 +30,8 @@ for hst in string.gmatch(host,"([^/]*)/") do if hst ~= "" then %> -
+ +
<% end end @@ -34,14 +40,87 @@ j = j+1 %>
+
+
+ <%:You need to use OpenMPTCProuter as DNS server when you want to bypass a domain%> +
<% end if j == 1 then %> -
+ +
+ +
+ <%:You need to use OpenMPTCProuter as DNS server when you want to bypass a domain%> +
<% end %> + + + +
+
<%:Set protocols you want to bypass.%>
+
+ +
+<% + local allprt="""" + local protos = {} + for l in io.lines("/proc/net/xt_ndpi/proto") do + local a,b,c,d = l:match('(%w+) (%w+)') + if b ~= "2" and not string.match(b,"custom") then + table.insert(protos,b) + end + end + table.sort(protos) + for _,b in ipairs(protos) do + allprt=allprt .. ","" .. b .. """ + end +%> + + +
+<% + local k = 1 + for _ , proto in pairs(dpi) do + k = k+1 +%> +
+<% + end + if k == 1 then +%> +
+<% + end +%> +
+
+
+
+ +
+
<%:Set interface you want to use for bypassed traffic.%>
+
+ +
+ +
+
+ <%:If empty, multipath master interface is used if up else any other up interface.%>
diff --git a/luci-app-omr-bypass/po/fr/omr-bypass.po b/luci-app-omr-bypass/po/fr/omr-bypass.po index 188c4b691..c88f9c47a 100644 --- a/luci-app-omr-bypass/po/fr/omr-bypass.po +++ b/luci-app-omr-bypass/po/fr/omr-bypass.po @@ -18,11 +18,37 @@ msgstr "Contourne" msgid "Domain, IP or network" msgstr "Domaine, IP ou réseau" +msgid "" +"If empty, multipath master interface is used if up else any other up " +"interface." +msgstr "" +"Si vide, l'interface définie en tant que maître multipath est utilisée si " +"elle fonctionne, sinon une autre interface sera utilisée." + msgid "OMR-Bypass" msgstr "" +msgid "Protocol" +msgstr "Protocole" + msgid "Set domains name, ips or networks you want to bypass." -msgstr "Configurer les domaines, adresses IPs ou réseaux que vous voulez contourner." +msgstr "" +"Configurer les domaines, adresses IPs ou réseaux que vous voulez contourner." + +msgid "Set interface you want to use for bypassed traffic." +msgstr "" +"Configurer l'interface que vous souhaitez utiliser pour le trafic à " +"contourner." + +msgid "Set protocols you want to bypass." +msgstr "Configurer les protocoles que vous voulez contourner." + +msgid "" +"You need to use OpenMPTCProuter as DNS server when you want to bypass a " +"domain" +msgstr "" +"Vous devez utiliser OpenMPTCProuter en tant que serveur DNS quand vous " +"souhaitez contourner un domaine" #~ msgid "Domains" #~ msgstr "Domaines" diff --git a/luci-app-omr-bypass/po/templates/omr-bypass.pot b/luci-app-omr-bypass/po/templates/omr-bypass.pot index 1937c7ac0..f96144608 100644 --- a/luci-app-omr-bypass/po/templates/omr-bypass.pot +++ b/luci-app-omr-bypass/po/templates/omr-bypass.pot @@ -7,8 +7,27 @@ msgstr "" msgid "Domain, IP or network" msgstr "" +msgid "" +"If empty, multipath master interface is used if up else any other up " +"interface." +msgstr "" + msgid "OMR-Bypass" msgstr "" +msgid "Protocol" +msgstr "" + msgid "Set domains name, ips or networks you want to bypass." msgstr "" + +msgid "Set interface you want to use for bypassed traffic." +msgstr "" + +msgid "Set protocols you want to bypass." +msgstr "" + +msgid "" +"You need to use OpenMPTCProuter as DNS server when you want to bypass a " +"domain" +msgstr "" diff --git a/luci-app-omr-bypass/root/etc/config/omr-bypass b/luci-app-omr-bypass/root/etc/config/omr-bypass index dd5fe7665..f62f6b418 100644 --- a/luci-app-omr-bypass/root/etc/config/omr-bypass +++ b/luci-app-omr-bypass/root/etc/config/omr-bypass @@ -1 +1,5 @@ -config bypass 'ips' \ No newline at end of file +config defaults 'defaults' + +config bypass 'ips' + +config bypass 'dpi' diff --git a/luci-app-omr-bypass/root/etc/init.d/omr-bypass b/luci-app-omr-bypass/root/etc/init.d/omr-bypass index f6f37059e..f33b2cdba 100755 --- a/luci-app-omr-bypass/root/etc/init.d/omr-bypass +++ b/luci-app-omr-bypass/root/etc/init.d/omr-bypass @@ -1,22 +1,62 @@ #!/bin/sh /etc/rc.common -# shellcheck disable=SC2039 -# vim: set noexpandtab tabstop=4 shiftwidth=4 softtabstop=4 : +# Copyright (C) 2018 Ycarus (Yannick Chabanois) -# shellcheck disable=SC2034 -{ - START=90 - STOP=10 - USE_PROCD=1 -} +START=99 +STOP=10 +USE_PROCD=1 + +. /usr/lib/unbound/iptools.sh _bypass_ip() { local ip="$1" - ipset add ss_rules_dst_bypass $ip + valid_ip4=$( valid_subnet4 $ip) + valid_ip6=$( valid_subnet6 $ip) + if [ "$valid_ip4" = "ok" ]; then + ipset add ss_rules_dst_bypass $ip + elif [ "$valid_ip6" = "ok" ]; then + ipset add ss_rules6_dst_bypass $ip + fi +} + +_bypass_proto() { + local proto="$1" + [ -z "$proto" ] && return + ndpi_rules="-A omr-bypass-dpi -m ndpi --$proto -j MARK --set-mark 0x539 + $ndpi_rules" } start_service() { + ipset -q flush ss_rules_dst_bypass > /dev/null 2>&1 + ipset -q --exist restore <<-EOF + create ss_rules_dst_bypass hash:net hashsize 64 + EOF + config_load omr-bypass config_list_foreach ips "ip" _bypass_ip + + ip rule add prio 1 fwmark 0x539 lookup 991337 > /dev/null 2>&1 + + if [ "$(iptables -w 40 -t mangle -L | grep 'match-set ss_rules_dst_bypass dst MARK set')" = "" ]; then + iptables-restore --wait=60 --noflush <<-EOF + *mangle + -A PREROUTING -m set --match-set ss_rules_dst_bypass dst -j MARK --set-mark 0x539 + COMMIT + EOF + fi + + iptables-save --counters | grep -v omr-bypass-dpi | iptables-restore --counters + local ndpi_rules="" + config_list_foreach dpi "proto" _bypass_proto + ndpi_rules=$(echo $ndpi_rules | awk 'NF') + if [ "$ndpi_rules" != "" ]; then + iptables-restore --wait=60 --noflush <<-EOF + *mangle + :omr-bypass-dpi - + -A PREROUTING -m addrtype ! --dst-type LOCAL -j omr-bypass-dpi + $ndpi_rules + COMMIT + EOF + fi } service_triggers() { @@ -24,6 +64,5 @@ service_triggers() { } reload_service() { - stop start } diff --git a/luci-app-omr-bypass/root/etc/uci-defaults/41_omr-bypass b/luci-app-omr-bypass/root/etc/uci-defaults/41_omr-bypass index bd9381dc5..89a1eec76 100644 --- a/luci-app-omr-bypass/root/etc/uci-defaults/41_omr-bypass +++ b/luci-app-omr-bypass/root/etc/uci-defaults/41_omr-bypass @@ -7,5 +7,22 @@ uci -q batch <<-EOF >/dev/null commit ucitrack EOF +if [ "$(uci -q get omr-bypass.dpi)" = "" ]; then + uci -q batch <<-EOF >/dev/null + set omr-bypass.dpi=bypass + EOF +fi + +if [ "$(uci -q get omr-bypass.default)" = "" ]; then + uci -q batch <<-EOF >/dev/null + set omr-bypass.defaults=defaults + EOF +fi + +if [ "$(uci -q get ucitrack.@shadowsocks-libev[-1].affects)" = "" ]; then + uci -q batch <<-EOF >/dev/null + set ucitrack.@shadowsocks-libev[-1].affects=omr-bypass + EOF +fi rm -f /tmp/luci-indexcache exit 0 diff --git a/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua b/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua index fd079951f..00a17ba11 100644 --- a/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua +++ b/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua @@ -5,7 +5,7 @@ local m, s, o m = Map("omr-tracker", translate("OMR-Tracker")) -s = m:section(TypedSection, "shadowsocks", translate("ShadowSocks tracker Settings"), translate("Detect if ShadowSocks is down and stop traffic redirection over it")) +s = m:section(TypedSection, "shadowsocks", translate("ShadowSocks tracker Settings"), translate("Detect if ShadowSocks is down and stop traffic redirection over it.")) s.anonymous = true s.addremove = false @@ -36,7 +36,7 @@ o.default = "2" o.datatype = "range(1, 100)" o.rmempty = false -o = s:option(DynamicList, "hosts", translate("Hosts")) +o = s:option(DynamicList, "hosts", translate("Hosts"), translate("IPs or domains must be available over http")) o.placeholder = "bing.com" o.default = { "bing.com", "google.com" } o.rmempty = false diff --git a/luci-app-openmptcprouter/Makefile b/luci-app-openmptcprouter/Makefile index 87df2cb3e..ca286381b 100644 --- a/luci-app-openmptcprouter/Makefile +++ b/luci-app-openmptcprouter/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=LuCI Support for OpenMPTCProuter -LUCI_DEPENDS:=+luci-lib-json +LUCI_DEPENDS:=+luci-lib-json +rdisc6 +curl +whois +bind-dig PKG_LICENSE:=GPLv3 include ../luci/luci.mk diff --git a/luci-app-openmptcprouter/htdocs/luci-static/resources/spinner.gif b/luci-app-openmptcprouter/htdocs/luci-static/resources/spinner.gif new file mode 100644 index 000000000..286e1bcd3 Binary files /dev/null and b/luci-app-openmptcprouter/htdocs/luci-static/resources/spinner.gif differ diff --git a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua index 5e451e864..929b95f28 100644 --- a/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua +++ b/luci-app-openmptcprouter/luasrc/controller/openmptcprouter.lua @@ -1,6 +1,7 @@ local tools = require "luci.tools.status" local sys = require "luci.sys" local json = require("luci.json") +local fs = require("nixio.fs") local ucic = luci.model.uci.cursor() module("luci.controller.openmptcprouter", package.seeall) @@ -22,30 +23,39 @@ function wizard_add() local gostatus = true if add_interface ~= "" then local i = 1 + local multipath_master = false ucic:foreach("network", "interface", function(s) local sectionname = s[".name"] if sectionname:match("^wan(%d+)$") then i = i + 1 end + if ucic:get("network",sectionname,"multipath") == "master" then + multipath_master = true + end end) - local defif = ucic:get("network","wan1","ifname") or "eth0" + local defif = ucic:get("network","wan1_dev","ifname") or "eth0" ucic:set("network","wan" .. i,"interface") ucic:set("network","wan" .. i,"ifname",defif) ucic:set("network","wan" .. i,"proto","static") ucic:set("network","wan" .. i,"type","macvlan") ucic:set("network","wan" .. i,"ip4table","wan") - ucic:set("network","wan" .. i,"multipath","on") + if multipath_master then + ucic:set("network","wan" .. i,"multipath","on") + else + ucic:set("network","wan" .. i,"multipath","master") + end ucic:set("network","wan" .. i,"defaultroute","0") ucic:save("network") ucic:commit("network") -- Dirty way to add new interface to firewall... luci.sys.call("uci -q add_list firewall.@zone[1].network=wan" .. i) + luci.sys.call("uci -q commit firewall") luci.sys.call("/etc/init.d/macvlan restart >/dev/null 2>/dev/null") gostatus = false end - local delete_intf = luci.http.formvaluetable("delete") + local delete_intf = luci.http.formvaluetable("delete") or "" if delete_intf ~= "" then for intf, _ in pairs(delete_intf) do ucic:delete("network",intf) @@ -55,34 +65,6 @@ function wizard_add() end gostatus = false end - - local server_ip = luci.http.formvalue("server_ip") - - -- Set ShadowSocks settings - local shadowsocks_key = luci.http.formvalue("shadowsocks_key") - if shadowsocks_key ~= "" then - ucic:set("shadowsocks-libev","sss0","server",server_ip) - ucic:set("shadowsocks-libev","sss0","key",shadowsocks_key) - ucic:set("shadowsocks-libev","sss0","method","aes-256-cfb") - ucic:set("shadowsocks-libev","sss0","server_port","65101") - ucic:set("shadowsocks-libev","sss0","disabled",0) - ucic:save("shadowsocks-libev") - ucic:commit("shadowsocks-libev") - end - - -- Set Glorytun TCP settings - local glorytun_key = luci.http.formvalue("glorytun_key") - if glorytun_key ~= "" then - ucic:set("glorytun","vpn","host",server_ip) - ucic:set("glorytun","vpn","port","65001") - ucic:set("glorytun","vpn","key",glorytun_key) - ucic:set("glorytun","vpn","enable",1) - ucic:set("glorytun","vpn","mptcp",1) - ucic:set("glorytun","vpn","chacha20",1) - ucic:set("glorytun","vpn","proto","tcp") - ucic:save("glorytun") - ucic:commit("glorytun") - end -- Set interfaces settings local interfaces = luci.http.formvaluetable("intf") @@ -93,12 +75,221 @@ function wizard_add() ucic:set("network",intf,"ipaddr",ipaddr) ucic:set("network",intf,"netmask",netmask) ucic:set("network",intf,"gateway",gateway) + + local downloadspeed = luci.http.formvalue("cbid.sqm.%s.download" % intf) or "" + local uploadspeed = luci.http.formvalue("cbid.sqm.%s.upload" % intf) or "" + if downloadspeed ~= "" and uploadspeed ~= "" then + ucic:set("sqm",intf,"download",downloadspeed) + ucic:set("sqm",intf,"upload",uploadspeed) + ucic:set("sqm",intf,"enabled","1") + else + ucic:set("sqm",intf,"enabled","0") + end end + ucic:save("sqm") + ucic:commit("sqm") ucic:save("network") ucic:commit("network") + + -- Get VPN set by default + local default_vpn = luci.http.formvalue("default_vpn") or "glorytun_tcp" + local vpn_port = "" + local vpn_intf = "" + if default_vpn:match("^glorytun.*") then + vpn_port = 65001 + vpn_intf = "tun0" + elseif default_vpn == "mlvpn" then + vpn_port = 65201 + vpn_intf = "mlvpn0" + elseif default_vpn == "openvpn" then + vpn_port = 65301 + vpn_intf = "tun0" + end + if vpn_intf ~= "" then + ucic:set("network","omrvpn","ifname",vpn_intf) + ucic:save("network") + ucic:commit("network") + end + ucic:set("openmptcprouter","settings","vpn",default_vpn) + ucic:save("openmptcprouter") + ucic:commit("openmptcprouter") + + -- Get all servers ips + local server_ip = luci.http.formvalue("server_ip") or "" + -- We have an IP, so set it everywhere + if server_ip ~= "" then + local ss_ip + -- Check if we have more than one IP, in this case use Nginx HA + if (type(server_ip) == "table") then + local ss_servers = {} + local vpn_servers = {} + local k = 0 + for _, ip in pairs(server_ip) do + if k == 0 then + ss_ip=ip + table.insert(ss_servers,ip .. ":65101 max_fails=3 fail_timeout=30s") + if vpn_port ~= "" then + table.insert(vpn_servers,ip .. ":" .. vpn_port .. " max_fails=3 fail_timeout=30s") + end + ucic:set("qos","serverin","srchost",ip) + ucic:set("qos","serverout","dsthost",ip) + ucic:save("qos") + ucic:commit("qos") + else + table.insert(ss_servers,ip .. ":65101 backup") + if vpn_port ~= "" then + table.insert(vpn_servers,ip .. ":" .. vpn_port .. " backup") + end + end + k = k + 1 + end + ucic:set("nginx-ha","ShadowSocks","enable","1") + ucic:set("nginx-ha","VPN","enable","1") + ucic:set("nginx-ha","ShadowSocks","upstreams",ss_servers) + ucic:set("nginx-ha","VPN","upstreams",vpn_servers) + ucic:save("nginx-ha") + ucic:commit("nginx-ha") + server_ip = "127.0.0.1" + ucic:set("shadowsocks-libev","sss0","server",ss_ip) + ucic:save("shadowsocks-libev") + ucic:commit("shadowsocks-libev") + else + ucic:set("nginx-ha","ShadowSocks","enable","0") + ucic:set("nginx-ha","VPN","enable","0") + ucic:set("qos","serverin","srchost",server_ip) + ucic:set("qos","serverout","dsthost",server_ip) + ucic:save("qos") + ucic:commit("qos") + ucic:set("shadowsocks-libev","sss0","server",server_ip) + ucic:save("shadowsocks-libev") + ucic:commit("shadowsocks-libev") + end + ucic:set("glorytun","vpn","host",server_ip) + ucic:save("glorytun") + ucic:commit("glorytun") + ucic:set("mlvpn","general","host",server_ip) + ucic:save("mlvpn") + ucic:commit("mlvpn") + luci.sys.call("uci -q del openvpn.omr.remote") + luci.sys.call("uci -q add_list openvpn.omr.remote=" .. server_ip) + ucic:save("openvpn") + ucic:commit("openvpn") + ucic:set("qos","serverin","srchost",server_ip) + ucic:set("qos","serverout","dsthost",server_ip) + ucic:save("qos") + ucic:commit("qos") + end + + -- Set ShadowSocks settings + local shadowsocks_key = luci.http.formvalue("shadowsocks_key") + if shadowsocks_key ~= "" then + ucic:set("shadowsocks-libev","sss0","key",shadowsocks_key) + ucic:set("shadowsocks-libev","sss0","method","chacha20") + ucic:set("shadowsocks-libev","sss0","server_port","65101") + ucic:set("shadowsocks-libev","sss0","disabled",0) + ucic:save("shadowsocks-libev") + ucic:commit("shadowsocks-libev") + else + ucic:set("shadowsocks-libev","sss0","key","") + ucic:set("shadowsocks-libev","sss0","disabled",1) + ucic:save("shadowsocks-libev") + ucic:commit("shadowsocks-libev") + end + + -- Set Glorytun settings + if default_vpn:match("^glorytun.*") then + ucic:set("glorytun","vpn","enable",1) + ucic:save("glorytun") + ucic:commit("glorytun") + else + ucic:set("glorytun","vpn","enable",0) + ucic:save("glorytun") + ucic:commit("glorytun") + end + + local glorytun_key = luci.http.formvalue("glorytun_key") + if glorytun_key ~= "" then + ucic:set("glorytun","vpn","port","65001") + ucic:set("glorytun","vpn","key",glorytun_key) + ucic:set("glorytun","vpn","mptcp",1) + ucic:set("glorytun","vpn","chacha20",1) + if default_vpn == "glorytun_udp" then + ucic:set("glorytun","vpn","proto","udp") + else + ucic:set("glorytun","vpn","proto","tcp") + end + ucic:save("glorytun") + ucic:commit("glorytun") + else + ucic:set("glorytun","vpn","key","") + ucic:set("glorytun","vpn","enable",0) + ucic:set("glorytun","vpn","proto","tcp") + ucic:save("glorytun") + ucic:commit("glorytun") + end + + -- Set MLVPN settings + if default_vpn == "mlvpn" then + ucic:set("mlvpn","general","enable",1) + ucic:save("mlvpn") + ucic:commit("mlvpn") + else + ucic:set("mlvpn","general","enable",0) + ucic:save("mlvpn") + ucic:commit("mlvpn") + end + + local mlvpn_password = luci.http.formvalue("mlvpn_password") + if mlvpn_password ~= "" then + ucic:set("mlvpn","general","password",mlvpn_password) + ucic:set("mlvpn","general","firstport","65201") + ucic:set("mlvpn","general","interface_name","mlvpn0") + ucic:save("mlvpn") + ucic:commit("mlvpn") + else + ucic:set("mlvpn","general","enable",0) + ucic:set("mlvpn","general","password","") + ucic:save("mlvpn") + ucic:commit("mlvpn") + end + + local openvpn_key = luci.http.formvalue("openvpn_key") + if openvpn_key ~= "" then + local openvpn_key_path = "/etc/luci-uploads/openvpn.key" + local fp + luci.http.setfilehandler( + function(meta, chunk, eof) + if not fp and meta and meta.name == "openvpn_key" then + fp = io.open(openvpn_key_path, "w") + end + if fp and chunk then + fp:write(chunk) + end + if fp and eof then + fp:close() + end + end) + ucic:set("openvpn","omr","secret",openvpn_key_path) + ucic:commit("openvpn") + end + + if default_vpn == "openvpn" then + ucic:set("openvpn","omr","enabled",1) + ucic:save("openvpn") + ucic:commit("openvpn") + else + ucic:set("openvpn","omr","enabled",0) + ucic:save("openvpn") + ucic:commit("openvpn") + end + luci.sys.call("(env -i /bin/ubus call network reload) >/dev/null 2>/dev/null") + luci.sys.call("/etc/init.d/shadowsocks restart >/dev/null 2>/dev/null") luci.sys.call("/etc/init.d/glorytun restart >/dev/null 2>/dev/null") - if gostatus then + luci.sys.call("/etc/init.d/glorytun-udp restart >/dev/null 2>/dev/null") + luci.sys.call("/etc/init.d/mlvpn restart >/dev/null 2>/dev/null") + luci.sys.call("/etc/init.d/openvpn restart >/dev/null 2>/dev/null") + if gostatus == true then luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/status")) else luci.http.redirect(luci.dispatcher.build_url("admin/system/openmptcprouter/wizard")) @@ -110,20 +301,39 @@ function settings_add() -- Set tcp_keepalive_time local tcp_keepalive_time = luci.http.formvalue("tcp_keepalive_time") luci.sys.exec("sysctl -w net.ipv4.tcp_keepalive_time=%s" % tcp_keepalive_time) - luci.sys.exec("sed -i 's:^net.ipv4.tcp_keepalive_time = [0-9]*:net.ipv4.tcp_keepalive_time=%s:' /etc/sysctl.d/zzz_openmptcprouter.conf" % tcp_keepalive_time) + luci.sys.exec("sed -i 's:^net.ipv4.tcp_keepalive_time=[0-9]*:net.ipv4.tcp_keepalive_time=%s:' /etc/sysctl.d/zzz_openmptcprouter.conf" % tcp_keepalive_time) + + -- Set tcp_fin_timeout + local tcp_fin_timeout = luci.http.formvalue("tcp_fin_timeout") + luci.sys.exec("sysctl -w net.ipv4.tcp_fin_timeoute=%s" % tcp_fin_timeout) + luci.sys.exec("sed -i 's:^net.ipv4.tcp_fin_timeout=[0-9]*:net.ipv4.tcp_fin_timeout=%s:' /etc/sysctl.d/zzz_openmptcprouter.conf" % tcp_fin_timeout) -- Disable IPv6 local disable_ipv6 = luci.http.formvalue("disable_ipv6") or 0 luci.sys.exec("sysctl -w net.ipv6.conf.all.disable_ipv6=%s" % disable_ipv6) - luci.sys.exec("sed -i 's:^net.ipv6.conf.all.disable_ipv6 = [0-9]*:net.ipv6.conf.all.disable_ipv6=%s:' /etc/sysctl.d/zzz_openmptcprouter.conf" % disable_ipv6) + luci.sys.exec("sed -i 's:^net.ipv6.conf.all.disable_ipv6=[0-9]*:net.ipv6.conf.all.disable_ipv6=%s:' /etc/sysctl.d/zzz_openmptcprouter.conf" % disable_ipv6) ucic:set("firewall",ucic:get_first("firewall","defaults"),"disable_ipv6",disable_ipv6) ucic:save("firewall") ucic:commit("firewall") + ucic:set("dhcp","lan","ra_default",disable_ipv6) if disable_ipv6 == 1 then + luci.sys.call("uci -q del dhcp.lan.dhcpv6") + luci.sys.call("uci -q del dhcp.lan.ra") ucic:set("shadowsocks-libev","hi","local_address","0.0.0.0") else + ucic:set("dhcp","lan","dhcpv6","server") + ucic:set("dhcp","lan","ra","server") ucic:set("shadowsocks-libev","hi","local_address","::") end + ucic:save("dhcp") + ucic:commit("dhcp") + + local obfs = luci.http.formvalue("obfs") or 0 + ucic:foreach("shadowsocks-libev", "ss_redir", function (section) + ucic:set("shadowsocks-libev",section[".name"],"obfs",obfs) + end) + ucic:set("shadowsocks-libev","tracker","obfs",obfs) + ucic:save("shadowsocks-libev") ucic:commit("shadowsocks-libev") @@ -160,17 +370,65 @@ end function get_ip(interface) local dump = require("luci.util").ubus("network.interface.%s" % interface, "status", {}) - local ip + local ip = "" if dump and dump['ipv4-address'] then local _, ipv4address for _, ipv4address in ipairs(dump['ipv4-address']) do ip = dump['ipv4-address'][_].address end end + if ip == "" then + local dump = require("luci.util").ubus("network.interface.%s_4" % interface, "status", {}) + if dump and dump['ipv4-address'] then + local _, ipv4address + for _, ipv4address in ipairs(dump['ipv4-address']) do + ip = dump['ipv4-address'][_].address + end + end + end return ip end --- This function come from OverTheBox by OVH with very small changes +function get_device(interface) + local dump = require("luci.util").ubus("network.interface.%s" % interface, "status", {}) + return dump['l3_device'] +end + +function get_gateway(interface) + local gateway = "" + local dump = nil + + dump = require("luci.util").ubus("network.interface.%s" % interface, "status", {}) + + if dump and dump.route then + local _, route + for _, route in ipairs(dump.route) do + if dump.route[_].target == "0.0.0.0" then + gateway = dump.route[_].nexthop + end + end + end + + if gateway == "" then + dump = require("luci.util").ubus("network.interface.%s_4" % interface, "status", {}) + + if dump and dump.route then + local _, route + for _, route in ipairs(dump.route) do + if dump.route[_].target == "0.0.0.0" then + gateway = dump.route[_].nexthop + end + end + end + end + return gateway +end + +-- This function come from OverTheBox by OVH with some changes +-- Copyright 2015 OVH +-- Simon Lelievre (simon.lelievre@corp.ovh.com) +-- Sebastien Duponcheel +-- Under GPL3+ function interfaces_status() local ut = require "luci.util" local ntm = require "luci.model.network".init() @@ -181,22 +439,35 @@ function interfaces_status() -- OpenMPTCProuter info mArray.openmptcprouter = {} mArray.openmptcprouter["version"] = ut.trim(sys.exec("cat /etc/os-release | grep VERSION= | sed -e 's:VERSION=::'")) - -- Check that requester is in same network - mArray.openmptcprouter["service_addr"] = uci:get("shadowsocks", "proxy", "server") or "0.0.0.0" + + mArray.openmptcprouter["service_addr"] = uci:get("shadowsocks-libev", "proxy", "server") or "0.0.0.0" mArray.openmptcprouter["local_addr"] = uci:get("network", "lan", "ipaddr") - -- shadowsocksaddr - mArray.openmptcprouter["ss_addr"] = sys.exec("curl -s -4 --socks5 127.0.0.1:1111 -m 5 http://ip.openmptcprouter.com") - -- wanaddr - mArray.openmptcprouter["wan_addr"] = sys.exec("wget -4 -qO- -T 1 http://ip.openmptcprouter.com") - -- dns mArray.openmptcprouter["dns"] = false - local dns_test = sys.exec("dig openmptcprouter.com | grep 'ANWER: 0'") + local dns_test = sys.exec("dig openmptcprouter.com | grep 'ANSWER: 0'") if dns_test == "" then mArray.openmptcprouter["dns"] = true end + mArray.openmptcprouter["ss_addr"] = "" + --mArray.openmptcprouter["ss_addr6"] = "" + mArray.openmptcprouter["wan_addr"] = "" + mArray.openmptcprouter["wan_addr6"] = "" + local tracker_ip = "" + if mArray.openmptcprouter["dns"] == true then + -- shadowsocksaddr + tracker_ip = uci:get("shadowsocks-libev","tracker","local_address") or "" + local tracker_port = uci:get("shadowsocks-libev","tracker","local_port") + if tracker_ip ~= "" then + mArray.openmptcprouter["ss_addr"] = sys.exec("curl -s -4 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m 3 http://ip.openmptcprouter.com") + --mArray.openmptcprouter["ss_addr6"] = sys.exec("curl -s -6 --socks5 " .. tracker_ip .. ":" .. tracker_port .. " -m 3 http://ipv6.openmptcprouter.com") + end + -- wanaddr + mArray.openmptcprouter["wan_addr"] = sys.exec("wget -4 -qO- -T 1 http://ip.openmptcprouter.com") + mArray.openmptcprouter["wan_addr6"] = sys.exec("wget -6 -qO- -T 1 http://ipv6.openmptcprouter.com") + end + mArray.openmptcprouter["remote_addr"] = luci.http.getenv("REMOTE_ADDR") or "" mArray.openmptcprouter["remote_from_lease"] = false local leases=tools.dhcp_leases() @@ -209,23 +480,50 @@ function interfaces_status() -- Check openmptcprouter service are running mArray.openmptcprouter["tun_service"] = false - if string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?glorytun(-udp)?$'"), "%d+") then + if string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?glorytun(-udp)?$'"), "%d+") or string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?mlvpn?$'"), "%d+") or string.find(sys.exec("/usr/bin/pgrep '^(/usr/sbin/)?openvpn?$'"), "%d+") then mArray.openmptcprouter["tun_service"] = true - mArray.openmptcprouter["tun_ip"] = get_ip("glorytun") - local tunnel_ping_test = ut.trim(sys.exec("ping -W 1 -c 1 10.0.0.1 | grep '100% packet loss'")) - if tunnel_ping_test == "" then - mArray.openmptcprouter["tun_state"] = 'UP' - else - mArray.openmptcprouter["tun_state"] = 'DOWN' + mArray.openmptcprouter["tun_ip"] = get_ip("omrvpn") + local tun_dev = uci:get("network","omrvpn","ifname") + if tun_dev == "" then + tun_dev = get_device("omrvpn") + end + if tun_dev ~= "" then + local peer = get_gateway("omrvpn") + if peer == "" then + peer = ut.trim(sys.exec("ip -4 r list dev " .. tun_dev .. " | grep kernel | awk '/proto kernel/ {print $1}' | grep -v / | tr -d '\n'")) + end + if peer ~= "" then + local tunnel_ping_test = ut.trim(sys.exec("ping -W 1 -c 1 " .. peer .. " -I " .. tun_dev .. " | grep '100% packet loss'")) + if tunnel_ping_test == "" then + mArray.openmptcprouter["tun_state"] = 'UP' + else + mArray.openmptcprouter["tun_state"] = 'DOWN' + end + local tunnel_ping6_test = ut.trim(sys.exec("ping6 -W 1 -c 1 fe80::a00:1 -I 6in4-omr6in4 | grep '100% packet loss'")) + if tunnel_ping6_test == "" then + mArray.openmptcprouter["tun6_state"] = 'UP' + else + mArray.openmptcprouter["tun6_state"] = 'DOWN' + end + else + mArray.openmptcprouter["tun_state"] = 'DOWN' + mArray.openmptcprouter["tun6_state"] = 'DOWN' + end end - end + -- check Shadowsocks is running mArray.openmptcprouter["socks_service"] = false if string.find(sys.exec("/usr/bin/pgrep ss-redir"), "%d+") then mArray.openmptcprouter["socks_service"] = true end + mArray.openmptcprouter["socks_service_enabled"] = true + local ss_server = uci:get("shadowsocks-libev","sss0","disabled") or "0" + if ss_server == "1" then + mArray.openmptcprouter["socks_service_enabled"] = false + end + -- Add DHCP infos by parsing dnsmasq config file mArray.openmptcprouter.dhcpd = {} dnsmasq = ut.trim(sys.exec("cat /var/etc/dnsmasq.conf*")) @@ -249,6 +547,7 @@ function interfaces_status() end end end + -- Parse mptcp kernel info local mptcp = {} local fullmesh = ut.trim(sys.exec("cat /proc/net/mptcp_fullmesh")) @@ -275,61 +574,165 @@ function interfaces_status() local ipaddr = net:ipaddr() local gateway = section['gateway'] or "" local multipath = section['multipath'] + local enabled = section['auto'] --if not ipaddr or not gateway then return end -- Don't show if0 in the overview --if interface == "lo" then return end local ifname = section['ifname'] or "" + if ifname == "" then + ifname = get_device(interface) + end + --if multipath == "off" and not ifname:match("^tun.*") then return end if multipath == "off" then return end - - local asn + + if enabled == "0" then return end local connectivity - local multipath_state = ut.trim(sys.exec("multipath " .. ifname .. " | grep deactivated")) - if multipath_state == "" and ifname ~= "" then - connectivity = 'OK' + + if ifname ~= "" and ifname ~= nil then + if fs.access("/sys/class/net/" .. ifname) then + local multipath_state = ut.trim(sys.exec("multipath " .. ifname .. " | grep deactivated")) + if multipath_state == "" then + connectivity = 'OK' + else + connectivity = 'ERROR' + end + else + connectivity = 'ERROR' + end else connectivity = 'ERROR' end - local gw_ping - if gateway ~= "" then + if ipaddr == "" then + connectivity = 'ERROR' + end + + -- Detect WAN gateway status + local gw_ping = 'UP' + if gateway == "" then + gateway = get_gateway(interface) + end + if connectivity ~= "ERROR" and gateway == "" and ifname ~= nil then + if fs.access("/sys/class/net/" .. ifname) then + gateway = ut.trim(sys.exec("ip -4 r list dev " .. ifname .. " | grep kernel | awk '/proto kernel/ {print $1}' | grep -v / | tr -d '\n'")) + end + end + if connectivity ~= "ERROR" and gateway ~= "" then local gw_ping_test = ut.trim(sys.exec("ping -W 1 -c 1 " .. gateway .. " | grep '100% packet loss'")) - if gw_ping_test == "" then - gw_ping = 'UP' - else + if gw_ping_test ~= "" then gw_ping = 'DOWN' + if connectivity == "OK" then + connectivity = 'WARNING' + end + end + else + gw_ping = 'DOWN' + connectivity = 'ERROR' + end + + local latency = "" + local server_ping = '' + if connectivity ~= "ERROR" and ifname ~= "" and gateway ~= "" and gw_ping ~= "DOWN" and ifname ~= nil and mArray.openmptcprouter["wan_addr"] ~= "" then + local server_ping_test = sys.exec("ping -W 1 -c 1 -I " .. ifname .. " " .. mArray.openmptcprouter["wan_addr"]) + local server_ping_result = ut.trim(sys.exec("echo '" .. server_ping_test .. "' | grep '100% packet loss'")) + if server_ping_result ~= "" then + server_ping = 'DOWN' if connectivity == "OK" then connectivity = 'WARNING' end + else + server_ping = 'UP' + latency = ut.trim(sys.exec("echo '" .. server_ping_test .. "' | cut -d '/' -s -f4 | cut -d '.' -f1")) end end - local publicIP = "-" + local multipath_available + if connectivity ~= "ERROR" and mArray.openmptcprouter["dns"] == true and ifname ~= nil and ifname ~= "" and gateway ~= "" and gw_ping == "UP" then + -- Test if multipath can work on the connection + local multipath_available_state = ut.trim(sys.exec("omr-mptcp-intf " .. ifname .. " | grep 'Nay, Nay, Nay'")) + if multipath_available_state == "" then + multipath_available = 'OK' + else + multipath_available = 'ERROR' + if mArray.openmptcprouter["socks_service"] == true and connectivity == "OK" then + connectivity = 'ERROR' + elseif connectivity == "OK" then + connectivity = 'WARNING' + end + end + else + multipath_available = 'NO CHECK' + end - local latency = "-" + + -- Detect if WAN get an IPv6 + local ipv6_discover = 'NONE' + if ifname ~= nil then + if tonumber((sys.exec("sysctl net.ipv6.conf.all.disable_ipv6")):match(" %d+")) == 0 then + local ipv6_result = _ipv6_discover(ifname) + if type(ipv6_result) == "table" and #ipv6_result > 0 then + local ipv6_addr_test + for k,v in ipairs(ipv6_result) do + if v.RecursiveDnsServer then + if type(v.RecursiveDnsServer) ~= "table" then + ipv6_addr_test = sys.exec('ip -6 addr | grep ' .. v.RecursiveDnsServer) + if ipv6_addr_test == "" then + ipv6_discover = 'DETECTED' + if connectivity == "OK" then + connectivity = 'WARNING' + end + end + else + for i,j in ipairs(ipv6_result) do + ipv6_addr_test = sys.exec('ip -6 addr | grep ' .. j) + if ipv6_addr_test == "" then + ipv6_discover = 'DETECTED' + if connectivity == "OK" then + connectivity = 'WARNING' + end + end + end + end + end + end + end + end + end + + local publicIP = ut.trim(sys.exec("omr-ip-intf " .. ifname)) + local whois = "" + if publicIP ~= "" then + whois = ut.trim(sys.exec("whois " .. publicIP .. " | grep -i 'netname' | awk '{print $2}'")) + end local data = { label = section['label'] or interface, - name = interface, - link = net:adminlink(), - ifname = ifname, - ipaddr = ipaddr, - gateway = gateway, - multipath = section['multipath'], - status = connectivity, - wanip = publicIP, - latency = latency, - whois = asn and asn.as_description or "unknown", - qos = section['trafficcontrol'], - download = section['download'], - upload = section['upload'], - gw_ping = gw_ping, + name = interface, + link = net:adminlink(), + ifname = ifname, + ipaddr = ipaddr, + gateway = gateway, + multipath = section['multipath'], + status = connectivity, + wanip = publicIP, + latency = latency, + whois = whois or "unknown", + qos = section['trafficcontrol'], + download = section['download'], + upload = section['upload'], + gw_ping = gw_ping, + server_ping = server_ping, + ipv6_discover = ipv6_discover, + multipath_available = multipath_available, } - if ifname:match("^tun.*") then + if ifname ~= nil and ifname:match("^tun.*") then + table.insert(mArray.tunnels, data); + elseif ifname ~= nil and ifname:match("^mlvpn.*") then table.insert(mArray.tunnels, data); else table.insert(mArray.wans, data); @@ -338,4 +741,65 @@ function interfaces_status() luci.http.prepare_content("application/json") luci.http.write_json(mArray) -end \ No newline at end of file +end + +-- This come from OverTheBox by OVH +-- Copyright 2015 OVH +-- Simon Lelievre (simon.lelievre@corp.ovh.com) +-- Sebastien Duponcheel +-- Under GPL3+ +function _ipv6_discover(interface) + local result = {} + + --local ra6_list = (sys.exec("rdisc6 -nm " .. interface)) + local ra6_list = (sys.exec("rdisc6 -n1 -r1 " .. interface)) + -- dissect results + local lines = {} + local index = {} + ra6_list:gsub('[^\r\n]+', function(c) + table.insert(lines, c) + if c:match("Hop limit") then + table.insert(index, #lines) + end + end) + local ra6_result = {} + for k,v in ipairs(index) do + local istart = v + local iend = index[k+1] or #lines + + local entry = {} + for i=istart,iend - 1 do + local level = lines[i]:find('%w') + local line = lines[i]:sub(level) + + local param, value + if line:match('^from') then + param, value = line:match('(from)%s+(.*)$') + else + param, value = line:match('([^:]+):(.*)$') + -- Capitalize param name and remove spaces + param = param:gsub("(%a)([%w_']*)", function(first, rest) return first:upper()..rest:lower() end):gsub("[%s-]",'') + param = param:gsub("%.$", '') + -- Remove text between brackets, seconds and spaces + value = value:lower() + value = value:gsub("%(.*%)", '') + value = value:gsub("%s-seconds%s-", '') + value = value:gsub("^%s+", '') + value = value:gsub("%s+$", '') + end + + if entry[param] == nil then + entry[param] = value + elseif type(entry[param]) == "table" then + table.insert(entry[param], value) + else + old = entry[param] + entry[param] = {} + table.insert(entry[param], old) + table.insert(entry[param], value) + end + end + table.insert(ra6_result, entry) + end + return ra6_result +end diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm index 3a7fe070f..23948f599 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/settings.htm @@ -13,12 +13,28 @@ "> +
+ +
+ "> +
+
checked<% end %>>
+
+ +
+ checked<% end %>> +
+
+ <%:OBFS must be enabled on VPS%> +
+
+
<% if nixio.fs.access("/sys/devices/system/cpu/cpufreq/policy0/scaling_min_freq") then %>
@@ -57,7 +73,7 @@
- +
<%+footer%> diff --git a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm index 9caa00580..62822139a 100644 --- a/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm +++ b/luci-app-openmptcprouter/luasrc/view/openmptcprouter/wanstatus.htm @@ -22,13 +22,14 @@ -- Copyright 2018 Ycarus (Yannick Chabanois) ycarus@zugaina.org -- -- Small changes to make this work with OpenMPTCProuter +-- New features: DNS detection, IPv6 route received,... -%> <%+header%> + <% if stderr and #stderr > 0 then %>
<%=pcdata(stderr)%>
<% end %> -
+

<%:Wizard%>

<%:Server settings%>
<%:Put the values given by OpenMPTCProuter VPS script.%>
-
- +
+
- " data-type="ip4addr"> + <% + local has_nginxha = fs.access("/etc/config/nginx-ha") + if has_nginxha then + %> +
+ <% + end + local k = 0 + for _,server in ipairs(servers_ip) do + k = k+1 + %> + +
+ <% + end + %> +
+
+ <%:Server IP will be set for ShadowSocks, Glorytun, OpenVPN and MLVPN%>
+
" data-type="base64"> +
+
+ <%:ShadowSocks is used for TCP%> +
+ <% if nixio.fs.access("/usr/sbin/glorytun") or nixio.fs.access("/usr/sbin/glorytun-udp") then %>
"> +
+
+ <%:Glorytun TCP is used by default for UDP and ICMP%> +
+
+
+ <% end %> + <% if nixio.fs.access("/usr/sbin/mlvpn") then %> +
+ +
+ "> +
+
+ <%:MLVPN can replace Glorytun with connections with same latency%> +
+
+
+ <% end %> + <% if nixio.fs.access("/usr/sbin/openvpn") then %> +
+ +
+ + " /> +
+
+ <%:You need to upload OpenVPN key file generated by OpenMPTCProuter VPS script to use OpenVPN TCP%> +
+
+
+ <% end %> +
+ +
+ +
+
+ <%:Set the default VPN used for UDP and ICMP when ShadowSocks is enabled, for all traffic if ShadowSocks is disabled.%> +
@@ -54,7 +136,6 @@ " data-type="ip4addr">
- help <%:Set an IP in the same network as the modem%>
@@ -71,11 +152,36 @@ " data-type="ip4addr">
- help <%:Set here IP of the modem%>
+ <% + if nixio.fs.access("/etc/init.d/sqm") then + %> +
+ +
+ " data-type="uinteger"> +
+
+ <%:Set value between 80-95% of max download speed link. Used for SQM. Empty to disable.%> +
+
+
+
+ +
+ " data-type="uinteger"> +
+
+ <%:Set value between 80-95% of max upload speed link. Used for SQM. Empty to disable.%> +
+
+
+ <% + end + %>
<% end @@ -89,7 +195,8 @@
- +
+ <%+footer%> diff --git a/luci-app-openmptcprouter/po/fr/openmptcprouter.po b/luci-app-openmptcprouter/po/fr/openmptcprouter.po index 709749bd8..ed3466dfb 100644 --- a/luci-app-openmptcprouter/po/fr/openmptcprouter.po +++ b/luci-app-openmptcprouter/po/fr/openmptcprouter.po @@ -1,16 +1,16 @@ msgid "" msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" "Project-Id-Version: \n" "POT-Creation-Date: \n" "PO-Revision-Date: \n" +"Last-Translator: Ycarus \n" "Language-Team: \n" +"Language: fr\n" "MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 2.0.6\n" -"Last-Translator: Ycarus \n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"Language: fr\n" msgid "Add an interface" msgstr "Ajouter une interface" @@ -18,12 +18,18 @@ msgstr "Ajouter une interface" msgid "Advanced Settings" msgstr "Configuration avancé" +msgid "Default VPN" +msgstr "VPN par défaut" + msgid "Delete" msgstr "Supprimer" msgid "Disable IPv6" msgstr "Désactiver IPv6" +msgid "Glorytun TCP is used by default for UDP and ICMP" +msgstr "Glorytun est utilisé par défaut pour UDP et ICMP" + msgid "Glorytun key" msgstr "Clef Glorytun" @@ -37,11 +43,17 @@ msgid "IPv4 gateway" msgstr "Passerelle IPv4" msgid "IPv4 netmask" -msgstr "Masque de sous-réseau IPv6" +msgstr "Masque de sous-réseau IPv4" msgid "Interfaces settings" msgstr "Paramètres des interfaces" +msgid "MLVPN can replace Glorytun with connections with same latency" +msgstr "MLVPN peut remplacer Glorytun pour les connexions avec la même latence" + +msgid "MLVPN password" +msgstr "Mot de passe MLVPN" + msgid "Maximum scaling CPU frequency" msgstr "" @@ -57,6 +69,9 @@ msgstr "Paramètres réseaux" msgid "OpenMPTCProuter" msgstr "" +msgid "OpenVPN key" +msgstr "Clef OpenVPN" + msgid "Put the values given by OpenMPTCProuter VPS script." msgstr "Mettez les valeurs données par le script OpenMPTCProuter VPS." @@ -66,6 +81,10 @@ msgstr "" msgid "Server IP" msgstr "IP du serveur" +msgid "Server IP will be set for ShadowSocks, Glorytun, OpenVPN and MLVPN" +msgstr "" +"L'IP du serveur sera configuré pour ShadowSocks, Glorytun, OpenVPN et MLVPN" + msgid "Server settings" msgstr "Paramètres du serveur" @@ -75,9 +94,19 @@ msgstr "Mettez une IP dans le même réseau que le modem" msgid "Set here IP of the modem" msgstr "Mettez ici l'IP du modem" +msgid "" +"Set the default VPN used for UDP and ICMP when ShadowSocks is enabled, for " +"all traffic if ShadowSocks is disabled." +msgstr "" +"Configure le VPN utilisé par défaut pour UDP et ICMP quand ShadowSocks est " +"activé, pour tout le trafic quand ShadowSocks est désactivé." + msgid "Settings Wizard" msgstr "Assistant de configuration" +msgid "ShadowSocks is used for TCP" +msgstr "ShadowSocks est utilisé pour le TCP" + msgid "ShadowSocks key" msgstr "Clef de ShadowSocks" @@ -91,4 +120,23 @@ msgid "Wizard" msgstr "Assistant" msgid "You must disable DHCP on your modems and set IP in different networks." -msgstr "Vous devez désactiver DHCP sur vos modems et configurer leurs IP dans des réseaux différents." +msgstr "" +"Vous devez désactiver DHCP sur vos modems et configurer leurs IP dans des " +"réseaux différents." + +msgid "" +"You need to upload OpenVPN key file generated by OpenMPTCProuter VPS script " +"to use OpenVPN TCP" +msgstr "" +"Vous devez ajouter le fichier contenant la clef OpenVPN générée par le " +"script OpenMPTCProuter VPS pour utiliser OpenVPN TCP" + +#~ msgid "Glorytun is used for UDP and ICMP" +#~ msgstr "Glorytun est utilisé pour UDP et ICMP" + +#~ msgid "MLVPN can replace Glorytun with connection with same latency" +#~ msgstr "" +#~ "MLVPN peut remplacer Glorytun pour les connexions avec la même latence" + +#~ msgid "Server IP will be set for ShadowSocks, Glorytun and MLVPN" +#~ msgstr "L'IP du serveur sera configuré pour ShadowSocks, Glorytun et MLVPN" diff --git a/luci-app-openmptcprouter/po/templates/openmptcprouter.pot b/luci-app-openmptcprouter/po/templates/openmptcprouter.pot index 2dcad6806..ff206e434 100644 --- a/luci-app-openmptcprouter/po/templates/openmptcprouter.pot +++ b/luci-app-openmptcprouter/po/templates/openmptcprouter.pot @@ -7,12 +7,18 @@ msgstr "" msgid "Advanced Settings" msgstr "" +msgid "Default VPN" +msgstr "" + msgid "Delete" msgstr "" msgid "Disable IPv6" msgstr "" +msgid "Glorytun TCP is used by default for UDP and ICMP" +msgstr "" + msgid "Glorytun key" msgstr "" @@ -31,6 +37,12 @@ msgstr "" msgid "Interfaces settings" msgstr "" +msgid "MLVPN can replace Glorytun with connections with same latency" +msgstr "" + +msgid "MLVPN password" +msgstr "" + msgid "Maximum scaling CPU frequency" msgstr "" @@ -46,6 +58,9 @@ msgstr "" msgid "OpenMPTCProuter" msgstr "" +msgid "OpenVPN key" +msgstr "" + msgid "Put the values given by OpenMPTCProuter VPS script." msgstr "" @@ -55,6 +70,9 @@ msgstr "" msgid "Server IP" msgstr "" +msgid "Server IP will be set for ShadowSocks, Glorytun, OpenVPN and MLVPN" +msgstr "" + msgid "Server settings" msgstr "" @@ -64,9 +82,17 @@ msgstr "" msgid "Set here IP of the modem" msgstr "" +msgid "" +"Set the default VPN used for UDP and ICMP when ShadowSocks is enabled, for " +"all traffic if ShadowSocks is disabled." +msgstr "" + msgid "Settings Wizard" msgstr "" +msgid "ShadowSocks is used for TCP" +msgstr "" + msgid "ShadowSocks key" msgstr "" @@ -81,3 +107,8 @@ msgstr "" msgid "You must disable DHCP on your modems and set IP in different networks." msgstr "" + +msgid "" +"You need to upload OpenVPN key file generated by OpenMPTCProuter VPS script " +"to use OpenVPN TCP" +msgstr "" diff --git a/luci-app-openmptcprouter/root/bin/omr-ip-intf b/luci-app-openmptcprouter/root/bin/omr-ip-intf new file mode 100755 index 000000000..cb7946a62 --- /dev/null +++ b/luci-app-openmptcprouter/root/bin/omr-ip-intf @@ -0,0 +1,5 @@ +#!/bin/sh +checkip=$(dig +short A ip.openmptcprouter.com | tr -d "\n") +ipset add ss_rules_dst_bypass $checkip > /dev/null 2>&1 +curl -s -4 -m 3 --interface $1 http://ip.openmptcprouter.com +ipset del ss_rules_dst_bypass $checkip > /dev/null 2>&1 diff --git a/luci-app-openmptcprouter/root/bin/omr-mptcp-intf b/luci-app-openmptcprouter/root/bin/omr-mptcp-intf new file mode 100755 index 000000000..9967d9576 --- /dev/null +++ b/luci-app-openmptcprouter/root/bin/omr-mptcp-intf @@ -0,0 +1,5 @@ +#!/bin/sh +multipathip=$(dig +short A multipath-tcp.org | tr -d "\n") +ipset add ss_rules_dst_bypass $multipathip > /dev/null 2>&1 +curl -s -4 -m 3 --interface $1 http://www.multipath-tcp.org +ipset del ss_rules_dst_bypass $multipathip > /dev/null 2>&1 diff --git a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter index 8a8ee9980..3c195bbcd 100755 --- a/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter +++ b/luci-app-openmptcprouter/root/etc/init.d/openmptcprouter @@ -27,6 +27,7 @@ start_service() { } # remove sysctl already defined in /etc/sysctl.d/ sed -i -e '/tcp_fin_timeout/d' -e '/tcp_keepalive_time/d' -e '/nf_conntrack_max/d' /etc/sysctl.conf + sed -i -e '/tcp_fin_timeout/d' -e '/tcp_keepalive_time/d' -e '/nf_conntrack_max/d' /etc/sysctl.d/10-default.conf } reload_service() { diff --git a/luci-app-openmptcprouter/root/etc/sysctl.d/zzz_openmptcprouter.conf b/luci-app-openmptcprouter/root/etc/sysctl.d/zzz_openmptcprouter.conf index 12e1506ee..6f19bb344 100644 --- a/luci-app-openmptcprouter/root/etc/sysctl.d/zzz_openmptcprouter.conf +++ b/luci-app-openmptcprouter/root/etc/sysctl.d/zzz_openmptcprouter.conf @@ -1,2 +1,3 @@ -net.ipv4.tcp_keepalive_time = 1200 -net.ipv6.conf.all.disable_ipv6 = 0 \ No newline at end of file +net.ipv4.tcp_keepalive_time=7200 +net.ipv6.conf.all.disable_ipv6=0 +net.ipv4.tcp_fin_timeout=40 \ No newline at end of file diff --git a/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter b/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter index 4d6f95f9d..f6886ccb3 100755 --- a/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter +++ b/luci-app-openmptcprouter/root/etc/uci-defaults/openmptcprouter @@ -4,4 +4,20 @@ uci -q batch <<-EOF add ucitrack openmptcprouter set ucitrack.@openmptcprouter[-1].init=openmptcprouter commit ucitrack -EOF \ No newline at end of file +EOF +if [ "$(uci -q get qos.serverin)" = "" ]; then + uci -q batch <<-EOF + set qos.serverin=classify + set qos.serverin.target='Priority' + set qos.serverout=classify + set qos.serverout.target='Priority' + commit qos + EOF +fi +if [ "$(uci -q get qos.serverin.target)" = "" ]; then + uci -q batch <<-EOF + set qos.serverin.target='Priority' + set qos.serverout.target='Priority' + commit qos + EOF +fi diff --git a/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua b/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua index abc594ad3..a3102d67d 100644 --- a/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua +++ b/luci-app-shadowsocks-libev/luasrc/model/shadowsocks-libev.lua @@ -7,6 +7,7 @@ local ut = require("luci.util") local sys = require("luci.sys") local ds = require("luci.dispatcher") local nw = require("luci.model.network") +local ucic = luci.model.uci.cursor() nw.init() module("luci.model.shadowsocks-libev", function(m) setmetatable(m, {__index=function (self, k) @@ -24,7 +25,7 @@ function values_actions(o) end function values_redir(o, xmode) - o.map.uci.foreach("shadowsocks-libev", "ss_redir", function(sdata) + ucic:foreach("shadowsocks-libev", "ss_redir", function(sdata) local disabled = ucival_to_bool(sdata["disabled"]) local sname = sdata[".name"] local mode = sdata["mode"] or "tcp_only" @@ -38,7 +39,7 @@ function values_redir(o, xmode) end function values_serverlist(o) - o.map.uci.foreach("shadowsocks-libev", "server", function(sdata) + ucic:foreach("shadowsocks-libev", "server", function(sdata) local sname = sdata[".name"] local server = sdata["server"] local server_port = sdata["server_port"] diff --git a/luci-app-shadowsocks-libev/luasrc/view/shadowsocks-libev/add_instance.htm b/luci-app-shadowsocks-libev/luasrc/view/shadowsocks-libev/add_instance.htm index 219d89b07..f016dd47e 100644 --- a/luci-app-shadowsocks-libev/luasrc/view/shadowsocks-libev/add_instance.htm +++ b/luci-app-shadowsocks-libev/luasrc/view/shadowsocks-libev/add_instance.htm @@ -1,24 +1,17 @@
-
- - - - - - -
- - - - - -
+
+ +
+
+ +
+
+ +<%- end) %> diff --git a/luci-base/luasrc/view/cbi/apply_xhr.htm b/luci-base/luasrc/view/cbi/apply_xhr.htm deleted file mode 100644 index daa57c1db..000000000 --- a/luci-base/luasrc/view/cbi/apply_xhr.htm +++ /dev/null @@ -1,43 +0,0 @@ -<% export("cbi_apply_xhr", function(id, configs, redirect) -%> -
- <%:Applying changes%> - - - <%:Loading%> - <%:Waiting for changes to be applied...%> -
-<%- end) %> diff --git a/luci-base/luasrc/view/cbi/button.htm b/luci-base/luasrc/view/cbi/button.htm index 30f8ddfda..6ccba58f2 100644 --- a/luci-base/luasrc/view/cbi/button.htm +++ b/luci-base/luasrc/view/cbi/button.htm @@ -1,6 +1,6 @@ <%+cbi/valueheader%> <% if self:cfgvalue(section) ~= false then %> - " type="submit"<%= attr("name", cbid) .. attr("id", cbid) .. attr("value", self.inputtitle or self.title)%> /> + " type="submit"<%= attr("name", cbid) .. attr("id", cbid) .. attr("value", self.inputtitle or self.title)%> /> <% else %> - <% end %> diff --git a/luci-base/luasrc/view/cbi/cell_valuefooter.htm b/luci-base/luasrc/view/cbi/cell_valuefooter.htm index 786ee43d1..bdd6bc968 100644 --- a/luci-base/luasrc/view/cbi/cell_valuefooter.htm +++ b/luci-base/luasrc/view/cbi/cell_valuefooter.htm @@ -1,2 +1,2 @@ - + diff --git a/luci-base/luasrc/view/cbi/cell_valueheader.htm b/luci-base/luasrc/view/cbi/cell_valueheader.htm index 9c9c21814..ea0568f40 100644 --- a/luci-base/luasrc/view/cbi/cell_valueheader.htm +++ b/luci-base/luasrc/view/cbi/cell_valueheader.htm @@ -1,2 +1,12 @@ - +<%- + local title = luci.util.trim(striptags(self.title)) + local descr = luci.util.trim(striptags(self.description)) + local ftype = self.typename or (self.template and self.template:gsub("^.+/", "")) +-%> +
0, "data-type", ftype) .. + ifattr(title and #title > 0, "data-title", title) .. + ifattr(descr and #descr > 0, "data-description", descr) +%>>
" data-index="<%=self.index%>" data-depends="<%=pcdata(self:deplist2json(section))%>"> diff --git a/luci-base/luasrc/view/cbi/dropdown.htm b/luci-base/luasrc/view/cbi/dropdown.htm new file mode 100644 index 000000000..cf8c03d22 --- /dev/null +++ b/luci-base/luasrc/view/cbi/dropdown.htm @@ -0,0 +1,54 @@ +<%+cbi/valueheader%> + +<%- + local selected = { } + + if self.multiple then + local val + for val in luci.util.imatch(self:cfgvalue(section)) do + selected[val] = true + end + else + selected[self:cfgvalue(section)] = true + end + + if not next(selected) and self.default then + selected[self.default] = true + end +-%> + +
> +
    + <% local i, key; for i, key in pairs(self.keylist) do %> + > + <%=pcdata(self.vallist[i])%> + + <% end %> + <% if self.custom then %> +
  • + + /> +
    • + <% end %> +
+
+ +<%+cbi/valuefooter%> diff --git a/luci-base/luasrc/view/cbi/firewall_zoneforwards.htm b/luci-base/luasrc/view/cbi/firewall_zoneforwards.htm index 546fd8e85..b38e4b13d 100644 --- a/luci-base/luasrc/view/cbi/firewall_zoneforwards.htm +++ b/luci-base/luasrc/view/cbi/firewall_zoneforwards.htm @@ -14,46 +14,59 @@ local def = fwm:get_defaults() local zone = fwm:get_zone(value) local empty = true + + local function render_zone(zone) +-%> + +<%- + end -%> <% if zone then %> -
- -  ⇒  - <% for _, fwd in ipairs(zone:get_forwardings_by("src")) do - fz = fwd:dest_zone() - if fz then - empty = false %> -   - <% end end %> - <% if empty then %> +
+
+ <%=render_zone(zone)%> +
+ ⇒ +
+ <% + for _, fwd in ipairs(zone:get_forwardings_by("src")) do + fz = fwd:dest_zone() + if fz then + empty = false + render_zone(fz) + end + end + if empty then + %> <% end %> +
<% end %> diff --git a/luci-base/luasrc/view/cbi/firewall_zonelist.htm b/luci-base/luasrc/view/cbi/firewall_zonelist.htm index b4260707e..3a108020b 100644 --- a/luci-base/luasrc/view/cbi/firewall_zonelist.htm +++ b/luci-base/luasrc/view/cbi/firewall_zonelist.htm @@ -24,26 +24,42 @@ end -%> - -
    +
    > + +
      <% if self.allowlocal then %> -
    • - />   - > - style="background-color:<%=fwm.zone.get_color()%>" class="zonebadge"> +
    • > + <%:Device%> - <% if self.allowany and self.allowlocal then %>(<%:input%>)<% end %> - + <% if self.allowany and self.allowlocal then -%> + (<%= self.alias ~= "dest" + and translate("output") or translate("input") %>) + <%- end %> + +
      • + <% elseif self.widget ~= "checkbox" and (self.rmempty or self.optional) then %> +
    • > + + <%:unspecified%> +
      • <% end %> <% if self.allowany then %> -
    • - />   - > - style="background-color:<%=fwm.zone.get_color()%>" class="zonebadge"> +
    • > + <%:Any zone%> <% if self.allowany and self.allowlocal then %>(<%:forward%>)<% end %> - +
      • <% end %> <% @@ -51,45 +67,42 @@ if zone:name() ~= self.exclude then selected = selected or (value == zone:name()) %> -
    • - />   - > - style="background-color:<%=zone:get_color()%>" class="zonebadge"> + > + <%=zone:name()%>: - <% + <%- local zempty = true for _, net in ipairs(zone:get_networks()) do net = nwm:get_network(net) if net then zempty = false - %> + -%> <%=net:name()%>: - <% + <%- local nempty = true for _, iface in ipairs(net:is_bridge() and net:get_interfaces() or { net:get_interface() }) do nempty = false %> - style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" /> + src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" /> <% end %> - <% if nempty then %><%:(empty)%><% end %> + <% if nempty then %><%:(empty)%><% end -%> - <% end end %> - <% if zempty then %><%:(empty)%><% end %> - + <%- end end -%> + <%- if zempty then %><%:(empty)%><% end -%> +
      • <% end end %> <% if self.widget ~= "checkbox" and not self.nocreate then %> -
    • - />   - > -
      - <%:unspecified -or- create:%>  - onfocus="document.getElementById('<%=cbid%>_new').checked=true" /> -
      +
    • + + <%:create%>: + + +
      • <% end %>
    - +
    <%+cbi/valuefooter%> diff --git a/luci-base/luasrc/view/cbi/footer.htm b/luci-base/luasrc/view/cbi/footer.htm index e6acfb069..ed632202c 100644 --- a/luci-base/luasrc/view/cbi/footer.htm +++ b/luci-base/luasrc/view/cbi/footer.htm @@ -1,25 +1,39 @@ - <%- if pageaction then -%> -
    - <% if redirect and not flow.hidebackbtn then %> -
    - -
    - <% end %> +<% + local display_back = (redirect and not flow.hidebackbtn) + local display_skip = (flow.skip) + local display_apply = (not autoapply and not flow.hideapplybtn) + local display_save = (not flow.hidesavebtn) + local display_reset = (not flow.hideresetbtn) + + if pageaction and + (display_back or display_skip or display_apply or display_save or display_reset) + then + %>
    <% + + if display_back then + %> <% + end + + if display_skip then + %> <% + end + + if display_apply then + %> <% + end + + if display_save then + %> <% + end + + if display_reset then + %> <% + end + + %>
    <% + end +%> - <% if flow.skip then %> - - <% end %> - <% if not autoapply and not flow.hideapplybtn then %> - - <% end %> - <% if not flow.hidesavebtn then %> - - <% end %> - <% if not flow.hideresetbtn then %> - - <% end %> -
    - <%- end -%> diff --git a/luci-base/luasrc/view/cbi/full_valuefooter.htm b/luci-base/luasrc/view/cbi/full_valuefooter.htm index f78093676..d4ad093ef 100644 --- a/luci-base/luasrc/view/cbi/full_valuefooter.htm +++ b/luci-base/luasrc/view/cbi/full_valuefooter.htm @@ -3,7 +3,6 @@
    <%- end %>
    - <%:help%> <%=self.description%>
    <%- end %> diff --git a/luci-base/luasrc/view/cbi/header.htm b/luci-base/luasrc/view/cbi/header.htm index 9710bae8f..821fa3efa 100644 --- a/luci-base/luasrc/view/cbi/header.htm +++ b/luci-base/luasrc/view/cbi/header.htm @@ -1,18 +1,17 @@ <%+header%> -
    +>
    - diff --git a/luci-base/luasrc/view/cbi/map.htm b/luci-base/luasrc/view/cbi/map.htm index e3210add6..d65a16167 100644 --- a/luci-base/luasrc/view/cbi/map.htm +++ b/luci-base/luasrc/view/cbi/map.htm @@ -1,14 +1,10 @@ <%- if firstmap and messages then local msg; for _, msg in ipairs(messages) do -%> -
    <%=pcdata(msg)%>
    +
    <%=pcdata(msg)%>
    <%- end end -%> -<%-+cbi/apply_xhr-%> -
    <% if self.title and #self.title > 0 then %>

    <%=self.title%>

    <% end %> <% if self.description and #self.description > 0 then %>
    <%=self.description%>
    <% end %> - <%- if firstmap and applymap then cbi_apply_xhr(self.config, parsechain, redirect) end -%> - <% if self.tabbed then %>
      <%- self.selected_tab = luci.http.formvalue("tab.m-" .. self.config) %> @@ -20,7 +16,6 @@ <% end %>
    -
    <% for i, section in ipairs(self.children) do %>
    style="display:none"<% end %>> <% section:render() %> @@ -42,6 +37,4 @@ <% else %> <%- self:render_children() %> <% end %> - -
    diff --git a/luci-base/luasrc/view/cbi/network_ifacelist.htm b/luci-base/luasrc/view/cbi/network_ifacelist.htm index 62dbde7dd..a97e9ef6d 100644 --- a/luci-base/luasrc/view/cbi/network_ifacelist.htm +++ b/luci-base/luasrc/view/cbi/network_ifacelist.htm @@ -19,71 +19,73 @@ if value then for value in utl.imatch(value) do - checked[value] = true + for value in utl.imatch(value) do + checked[value] = true + end end else local n = self.network and net:get_network(self.network) if n then - local i - for _, i in ipairs(n:get_interfaces() or { n:get_interface() }) do - checked[i:name()] = true + local a = n:is_alias() + if a then + checked['@' .. a] = true + else + local i + for _, i in ipairs(n:get_interfaces() or { n:get_interface() }) do + checked[i:name()] = true + end end end end -%> -
      - <% for _, iface in ipairs(ifaces) do - local link = iface:adminlink() - if (not self.nobridges or not iface:is_bridge()) and - (not self.noinactive or iface:is_up()) and - iface:name() ~= self.exclude - then %> -
    • - " data-update="click change"<%= - attr("type", self.widget or "radio") .. - attr("id", cbid .. "." .. iface:name()) .. - attr("name", cbid) .. attr("value", iface:name()) .. - ifattr(checked[iface:name()], "checked", "checked") - %> /> - <%- if not self.widget or self.widget == "checkbox" or self.widget == "radio" then -%> - > - <%- end -%> -   - > - <% if link then -%><% end -%> - style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" /> - <% if link then -%><% end -%> - <%=pcdata(iface:get_i18n())%> - <% local ns = iface:get_networks(); if #ns > 0 then %>( - <%- local i, n; for i, n in ipairs(ns) do -%> - <%-= (i>1) and ', ' -%> - <%=n:name()%> - <%- end -%> - )<% end %> - -
      • - <% end end %> - <% if not self.nocreate then %> -
    • - " data-update="click change"<%= - attr("type", self.widget or "radio") .. - attr("id", cbid .. "_custom") .. - attr("name", cbid) .. - attr("value", " ") - %> /> - <%- if not self.widget or self.widget == "checkbox" or self.widget == "radio" then -%> - > - <%- end -%> -   - > - - <%:Custom Interface%>: - - -
      • - <% end %> -
    + +
    > + +
      + <% for _, iface in ipairs(ifaces) do + if (not self.noaliases or iface:type() ~= "alias") and + (not self.nobridges or not iface:is_bridge()) and + (not self.noinactive or iface:is_up()) and + iface:name() ~= self.exclude + then %> + > + src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" /> + <%=pcdata(iface:name())%> + + <%=pcdata(iface:get_i18n())%> + <% local ns = iface:get_networks(); if #ns > 0 then %>( + <%- local i, n; for i, n in ipairs(ns) do -%> + <%-= (i>1) and ', ' -%> + <%=n:name()%> + <%- end -%> + )<% end %> + + + <% end end %> + <% if not self.nocreate then %> +
    • + + <%:Custom Interface%>: + + +
      • + <% end %> +
    +
    <%+cbi/valuefooter%> diff --git a/luci-base/luasrc/view/cbi/network_netlist.htm b/luci-base/luasrc/view/cbi/network_netlist.htm index 8bf1a70a2..ba6ebb843 100644 --- a/luci-base/luasrc/view/cbi/network_netlist.htm +++ b/luci-base/luasrc/view/cbi/network_netlist.htm @@ -20,66 +20,62 @@ end -%> -
      - <% for _, net in ipairs(networks) do - if (net:name() ~= "loopback") and - (net:name() ~= self.exclude) and - (not self.novirtual or not net:is_virtual()) - then %> -
    • - " data-update="click change"<%= - attr("type", self.widget or "radio") .. - attr("id", cbid .. "." .. net:name()) .. - attr("name", cbid) .. attr("value", net:name()) .. - ifattr(checked[net:name()], "checked", "checked") - %> />   - > +
      > + +
        + <% if self.widget ~= "checkbox" then %> +
      • > + <%:unspecified%> +
        • + <% end %> + + <% for _, net in ipairs(networks) do + if (net:name() ~= "loopback") and + (net:name() ~= self.exclude) and + (not self.novirtual or not net:is_virtual()) + then %> + > <%=net:name()%>: <% local empty = true for _, iface in ipairs(net:is_bridge() and net:get_interfaces() or { net:get_interface() }) do if not iface:is_bridge() then empty = false - %> + -%> style="width:16px; height:16px; vertical-align:middle" src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" /> - <% end end %> - <% if empty then %><%:(no interfaces attached)%><% end %> + <%- end end %> + <% if empty then %> + <%:(no interfaces attached)%> + - + <% end %> - - - <% end end %> + + <% end end %> - <% if not self.nocreate then %> -
      • - " data-update="click change"<%=attr("type", self.widget or "radio") .. attr("id", cbid .. "_new") .. attr("name", cbid) .. attr("value", "-") .. ifattr(not value and self.widget ~= "checkbox", "checked", "checked")%> />   - <%- if not self.widget or self.widget == "checkbox" or self.widget == "radio" then -%> - > - <%- end -%> -
        - > + <% if not self.nocreate then %> +
      • > + <%- if self.widget == "checkbox" then -%> <%:create:%> <%- else -%> <%:unspecified -or- create:%> - <%- end -%>  + <%- end -%> + - onfocus="document.getElementById('<%=cbid%>_new').checked=true" /> -
      -
      • - <% elseif self.widget ~= "checkbox" and self.unspecified then %> -
    • - " data-update="click change"<%= - attr("type", self.widget or "radio") .. - attr("id", cbid .. "_uns") .. - attr("name", cbid) .. - attr("value", "") .. - ifattr(not value or #value == 0, "checked", "checked") - %> />   -
      - ><%:unspecified%> -
      -
      • - <% end %> -
    + + + <% end %> +
+
<%+cbi/valuefooter%> diff --git a/luci-base/luasrc/view/cbi/nsection.htm b/luci-base/luasrc/view/cbi/nsection.htm index abf67596f..63abc5773 100644 --- a/luci-base/luasrc/view/cbi/nsection.htm +++ b/luci-base/luasrc/view/cbi/nsection.htm @@ -1,5 +1,5 @@ <% if self:cfgvalue(self.section) then section = self.section %> -
+
<% if self.title and #self.title > 0 then -%> <%=self.title%> <%- end %> @@ -15,17 +15,16 @@
<%+cbi/ucisection%>
-
-
+
<% elseif self.addremove then %> <% if self.template_addremove then include(self.template_addremove) else -%> -
+
<% if self.title and #self.title > 0 then -%> <%=self.title%> <%- end %>
<%=self.description%>
-
+
<%- end %> <% end %> diff --git a/luci-base/luasrc/view/cbi/nullsection.htm b/luci-base/luasrc/view/cbi/nullsection.htm index ef169593a..7230719d1 100644 --- a/luci-base/luasrc/view/cbi/nullsection.htm +++ b/luci-base/luasrc/view/cbi/nullsection.htm @@ -1,4 +1,4 @@ -
+
<% if self.title and #self.title > 0 then -%> <%=self.title%> <%- end %> @@ -25,8 +25,7 @@
<%- end %> -
-
+ <%- if type(self.hidden) == "table" then for k, v in pairs(self.hidden) do diff --git a/luci-base/luasrc/view/cbi/simpleform.htm b/luci-base/luasrc/view/cbi/simpleform.htm index 3b758d70e..3e10724ec 100644 --- a/luci-base/luasrc/view/cbi/simpleform.htm +++ b/luci-base/luasrc/view/cbi/simpleform.htm @@ -1,59 +1,77 @@ -<% if not self.embedded then %> - -
- - - -
-<% end %> -
- <% if self.title and #self.title > 0 then %>

<%=self.title%>

<% end %> - <% if self.description and #self.description > 0 then %>
<%=self.description%>
<% end %> - <% self:render_children() %> -
-
-<%- if self.message then %> -
<%=self.message%>
-<%- end %> -<%- if self.errmessage then %> -
<%=self.errmessage%>
-<%- end %> -<% if not self.embedded then %> -
-<%- - if type(self.hidden) == "table" then - for k, v in pairs(self.hidden) do --%> - -<%- +<% + if not self.embedded then + %> + + <% + end + + %>
<% + + if self.title and #self.title > 0 then + %>

<%=self.title%>

<% + end + + if self.description and #self.description > 0 then + %>
<%=self.description%>
<% + end + + self:render_children() + + %>
<% + + if self.message then + %>
<%=self.message%>
<% + end + + if self.errmessage then + %>
<%=self.errmessage%>
<% + end + + if not self.embedded then + if type(self.hidden) == "table" then + local k, v + for k, v in pairs(self.hidden) do + %><% + end end + + local display_back = (redirect) + local display_cancel = (self.cancel ~= false and self.on_cancel) + local display_skip = (self.flow and self.flow.skip) + local display_submit = (self.submit ~= false) + local display_reset = (self.reset ~= false) + + if display_back or display_cancel or display_skip or display_submit or display_reset then + %>
<% + + if display_back then + %> <% + end + + if display_cancel then + local label = pcdata(self.cancel or translate("Cancel")) + %> <% + end + + if display_skip then + %> <% + end + + if display_submit then + local label = pcdata(self.submit or translate("Submit")) + %> <% + end + + if display_reset then + local label = pcdata(self.reset or translate("Reset")) + %> <% + end + + %>
<% + end + + %><% end %> -<% if redirect then %> -
- -
-<% end %> -<%- if self.flow and self.flow.skip then %> - -<% end %> -<%- if self.submit ~= false then %> - -<% end %> -<%- if self.reset ~= false then %> - -<% end %> -<%- if self.cancel ~= false and self.on_cancel then %> - -<% end %> -
- -<% end %> diff --git a/luci-base/luasrc/view/cbi/tblsection.htm b/luci-base/luasrc/view/cbi/tblsection.htm index 3cb87563f..408dfa7fe 100644 --- a/luci-base/luasrc/view/cbi/tblsection.htm +++ b/luci-base/luasrc/view/cbi/tblsection.htm @@ -1,8 +1,13 @@ <%- -local rowcnt = 1 +local rowcnt = 0 + function rowstyle() rowcnt = rowcnt + 1 - return (rowcnt % 2) + 1 + if rowcnt % 2 == 0 then + return " cbi-rowstyle-1" + else + return " cbi-rowstyle-2" + end end function width(o) @@ -14,86 +19,138 @@ function width(o) end return '' end + +local has_titles = false +local has_descriptions = false + +local anonclass = (not self.anonymous or self.sectiontitle) and "named" or "anonymous" +local titlename = ifattr(not self.anonymous or self.sectiontitle, "data-title", translate("Name")) + +local i, k +for i, k in pairs(self.children) do + if not k.typename then + k.typename = k.template and k.template:gsub("^.+/", "") or "" + end + + if not has_titles and k.title and #k.title > 0 then + has_titles = true + end + + if not has_descriptions and k.description and #k.description > 0 then + has_descriptions = true + end +end + +function render_titles() + if not has_titles then + return + end + + %>
><% + + local i, k + for i, k in ipairs(self.children) do + if not k.optional then + %>
><% + + if k.titleref then + %><% + end + + write(k.title) + + if k.titleref then + %><% + end + + %>
<% + end + end + + if self.sortable or self.extedit or self.addremove then + %>
<% + end + + %>
<% + + rowcnt = rowcnt + 1 +end + +function render_descriptions() + if not has_descriptions then + return + end + + %>
<% + + local i, k + for i, k in ipairs(self.children) do + if not k.optional then + %>
><% + + write(k.description) + + %>
<% + end + end + + if self.sortable or self.extedit or self.addremove then + %>
<% + end + + %>
<% + + rowcnt = rowcnt + 1 +end + -%> -
+
<% if self.title and #self.title > 0 then -%> - <%=self.title%> +

<%=self.title%>

<%- end %> <%- if self.sortable then -%> <%- end -%>
<%=self.description%>
-
- <%- local count = 0 -%> - - - <%- if not self.anonymous then -%> - <%- if self.sectionhead then -%> - - <%- else -%> - - <%- end -%> - <%- count = count +1; end -%> - <%- for i, k in pairs(self.children) do if not k.optional then -%> - - <%- count = count + 1; end; end; if self.sortable then -%> - - <%- count = count + 1; end; if self.extedit or self.addremove then -%> - - <%- count = count + 1; end -%> - - - <%- if not self.anonymous then -%> - <%- if self.sectiondesc then -%> - - <%- else -%> - - <%- end -%> - <%- end -%> - <%- for i, k in pairs(self.children) do if not k.optional then -%> - - <%- end; end; if self.sortable then -%> - - <%- end; if self.extedit or self.addremove then -%> - - <%- end -%> - - <%- local isempty = true - for i, k in ipairs(self:cfgsections()) do - section = k - isempty = false - scope = { valueheader = "cbi/cell_valueheader", valuefooter = "cbi/cell_valuefooter" } - -%> - - <% if not self.anonymous then -%> - - <%- end %> +
+ <%- + render_titles() + render_descriptions() + local isempty, section, i, k = true, nil, nil + for i, k in ipairs(self:cfgsections()) do + isempty = false + section = k - <%- - for k, node in ipairs(self.children) do - if not node.optional then - node:render(section, scope or {}) - end + local sectionname = striptags((type(self.sectiontitle) == "function") and self:sectiontitle(section) or k) + local sectiontitle = ifattr(sectionname and (not self.anonymous or self.sectiontitle), "data-title", sectionname) + local colorclass = (self.extedit or self.rowcolors) and rowstyle() or "" + local scope = { + valueheader = "cbi/cell_valueheader", + valuefooter = "cbi/cell_valuefooter" + } + -%> +
> + <%- + local node + for k, node in ipairs(self.children) do + if not node.optional then + node:render(section, scope or {}) end - -%> + end + -%> - <%- if self.sortable then -%> -
- <%- end -%> - - <%- if self.extedit or self.addremove then -%> - - <%- end -%> - + + <%- end -%> + + <%- end -%> - <%- if isempty then -%> - - - - <%- end -%> -
<%=self.sectionhead%> > - <%- if k.titleref then -%><%- end -%> - <%-=k.title-%> - <%- if k.titleref then -%><%- end -%> - <%:Sort%> 
<%=self.sectiondesc%>><%=k.description%>

<%=(type(self.sectiontitle) == "function") and self:sectiontitle(section) or k%>

 - - - - <%- if self.extedit then -%> + <%- if self.sortable or self.extedit or self.addremove then -%> +
+
+ <%- if self.sortable then -%> + + + <% end; if self.extedit then -%> onclick="location.href='<%=self.extedit:format(section)%>'" @@ -101,45 +158,46 @@ end %> onclick="location.href='<%=self:extedit(section)%>'" <%- end %> alt="<%:Edit%>" title="<%:Edit%>" /> - <%- end; if self.addremove then %> + <% end; if self.addremove then %> <%- end -%> -

<%:This section contains no values yet%>
- - <% if self.error then %> -
-
    <% for _, c in pairs(self.error) do for _, e in ipairs(c) do -%> -
  • <%=pcdata(e):gsub("\n","
    ")%>
    • - <%- end end %>
-
- <% end %> - - <%- if self.addremove then -%> - <% if self.template_addremove then include(self.template_addremove) else -%> -
- <% if self.anonymous then %> - - <% else %> - <% if self.invalid_cts then -%>
<% end %> - - - <% if self.invalid_cts then -%> -
<%:Invalid%>
- <%- end %> - <% end %> -
- <%- end %> + <%- if isempty then -%> +
+
<%:This section contains no values yet%>
+
<%- end -%>
-
+ + <% if self.error then %> +
+
    <% for _, c in pairs(self.error) do for _, e in ipairs(c) do -%> +
  • <%=pcdata(e):gsub("\n","
    ")%>
    • + <%- end end %>
+
+ <% end %> + + <%- if self.addremove then -%> + <% if self.template_addremove then include(self.template_addremove) else -%> +
+ <% if self.anonymous then %> + + <% else %> + <% if self.invalid_cts then -%> +
<%:Invalid%>
+ <%- end %> +
+ +
+ + <% end %> +
+ <%- end %> + <%- end -%> + diff --git a/luci-base/luasrc/view/cbi/tsection.htm b/luci-base/luasrc/view/cbi/tsection.htm index 726521ae3..1a13df0c0 100644 --- a/luci-base/luasrc/view/cbi/tsection.htm +++ b/luci-base/luasrc/view/cbi/tsection.htm @@ -1,4 +1,4 @@ -
+
<% if self.title and #self.title > 0 then -%> <%=self.title%> <%- end %> @@ -20,10 +20,9 @@ <%+cbi/tabmenu%> -
+
<%+cbi/ucisection%> -
-
+
<%- end %> <% if isempty then -%> @@ -36,14 +35,15 @@ <% if self.anonymous then -%> <%- else -%> - <% if self.invalid_cts then -%>
<% end %> - - <% if self.invalid_cts then -%> -
<%:Invalid%>
+
<%:Invalid%>
<%- end %> +
+ +
+ <%- end %> <%- end %> <%- end %> -
+ diff --git a/luci-base/luasrc/view/cbi/ucisection.htm b/luci-base/luasrc/view/cbi/ucisection.htm index 2cb1e75d0..8fa11d68f 100644 --- a/luci-base/luasrc/view/cbi/ucisection.htm +++ b/luci-base/luasrc/view/cbi/ucisection.htm @@ -32,25 +32,25 @@ <% if self.optionals[section] and #self.optionals[section] > 0 or self.dynamic then %>
- <% + <%- if self.dynamic then local keys, vals, name, opt = { }, { } for name, opt in pairs(self.optionals[section]) do keys[#keys+1] = name vals[#vals+1] = opt.title end - %> + -%> 0, "data-choices", luci.util.json_encode({keys, vals})) %> /> - <% else %> + <%- else -%> - <% end %> + <%- end -%>
<% end %> diff --git a/luci-base/luasrc/view/cbi/upload.htm b/luci-base/luasrc/view/cbi/upload.htm index 4fb5201aa..3c3d82b65 100644 --- a/luci-base/luasrc/view/cbi/upload.htm +++ b/luci-base/luasrc/view/cbi/upload.htm @@ -8,7 +8,7 @@ <%:Uploaded File%> (<%=t.byte_format(s.size)%>) <% if self.unsafeupload then %> /> - " alt="<%:Replace entry%>" title="<%:Replace entry%>" src="<%=resource%>/cbi/reload.gif" /> + " alt="<%:Replace entry%>" title="<%:Replace entry%>" src="<%=resource%>/cbi/reload.gif" /> <% end %> <% end %> diff --git a/luci-base/luasrc/view/cbi/value.htm b/luci-base/luasrc/view/cbi/value.htm index c8c905eb1..74908ba7d 100644 --- a/luci-base/luasrc/view/cbi/value.htm +++ b/luci-base/luasrc/view/cbi/value.htm @@ -1,10 +1,16 @@ <%+cbi/valueheader%> + <%- if self.password then -%> + /> + <%- end -%> 0, "data-choices", { self.keylist, self.vallist }) %> /> - <% if self.password then %><% end %> + <%- if self.password then -%> +
∗
+ <% end %> <%+cbi/valuefooter%> diff --git a/luci-base/luasrc/view/footer.htm b/luci-base/luasrc/view/footer.htm index f3574b6b1..1667d3aa9 100644 --- a/luci-base/luasrc/view/footer.htm +++ b/luci-base/luasrc/view/footer.htm @@ -4,4 +4,27 @@ Licensed to the public under the Apache License 2.0. -%> -<% include("themes/" .. theme .. "/footer") %> \ No newline at end of file +<% + local is_rollback_pending, rollback_time_remaining, rollback_session, rollback_token = luci.model.uci:rollback_pending() + + if is_rollback_pending or trigger_apply or trigger_revert then + include("cbi/apply_widget") + cbi_apply_widget(redirect, rollback_token) +%> + + +<% + end + + include("themes/" .. theme .. "/footer") +%> diff --git a/luci-base/luasrc/view/sysauth.htm b/luci-base/luasrc/view/sysauth.htm index b3ec9b761..9b0e2de78 100644 --- a/luci-base/luasrc/view/sysauth.htm +++ b/luci-base/luasrc/view/sysauth.htm @@ -8,7 +8,9 @@
<%- if fuser then %> -
<%:Invalid username and/or password! Please try again.%>
+
+

<%:Invalid username and/or password! Please try again.%>

+
<% end -%>
@@ -16,23 +18,23 @@
<%:Please enter your username and password.%>
-
+
- +
- +
-
+
-
+
diff --git a/luci-base/po/ca/base.po b/luci-base/po/ca/base.po index b08344b40..cbd222ff8 100644 --- a/luci-base/po/ca/base.po +++ b/luci-base/po/ca/base.po @@ -49,6 +49,9 @@ msgstr "" msgid "-- match by uuid --" msgstr "" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "Càrrega d'1 minut:" @@ -155,9 +158,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "Consultes concurrents max." -msgid "%s - %s" -msgstr "%s - %s" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -174,9 +174,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -213,9 +210,6 @@ msgstr "Número de dispositiu ATM" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Concentrador d'accés" @@ -225,9 +219,6 @@ msgstr "Punt d'accés" msgid "Actions" msgstr "Accions" -msgid "Activate this network" -msgstr "Activa aquesta xarxa" - msgid "Active IPv4-Routes" msgstr "Rutes IPv4 actives" @@ -280,19 +271,31 @@ msgstr "" msgid "Alert" msgstr "Alerta" -msgid "" -"Allocate IP addresses sequentially, starting from the lowest available " -"address" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" msgstr "" msgid "Allocate IP sequentially" msgstr "" +msgid "" +"Allocate IP addresses sequentially, starting from the lowest available " +"address" +msgstr "" + msgid "Allow SSH password authentication" msgstr "" "Permetre l'autenticació SSH amb " "contrasenya" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "Permet-les totes menys les llistades" @@ -323,12 +326,12 @@ msgstr "Permet respostes del rang 127.0.0.0/8, p.e. per serveis RBL" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -406,11 +409,14 @@ msgstr "Configuració d'antena" msgid "Any zone" msgstr "Qualsevol zona" -msgid "Apply" -msgstr "Aplica" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" -msgstr "Aplicant els canvis" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -426,6 +432,9 @@ msgstr "" msgid "Associated Stations" msgstr "Estacions associades" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -502,12 +511,12 @@ msgstr "Enrere al resum" msgid "Back to scan results" msgstr "Enrere als resultats de l'escaneig" +msgid "Backup" +msgstr "Còpia de seguretat" + msgid "Backup / Flash Firmware" msgstr "Còpia de seguretat i microprogramari" -msgid "Backup / Restore" -msgstr "Còpia de seguretat i restauració de la configuració" - msgid "Backup file list" msgstr "Llista de còpies de seguretat" @@ -517,7 +526,7 @@ msgstr "Adreça mal especificada!" msgid "Band" msgstr "" -msgid "Behind NAT" +msgid "Beacon Interval" msgstr "" msgid "" @@ -578,6 +587,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "Ús de CPU (%)" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "Cancel·la" @@ -593,12 +605,20 @@ msgstr "Canvis" msgid "Changes applied." msgstr "Canvis aplicats." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Canvia la paraula clau de l'administrador per accedir al dispositiu" msgid "Channel" msgstr "Canal" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Comprovació" @@ -637,13 +657,10 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" "Fes clic a \"Genera l'arxiu\" per obtenir un fitxer .tar.gz amb els fitxers " -"de configuració actuals. Per restablir el microprogramari al seu estat " -"inicial, fes clic a \"Restableix la configuració\" (només funciona amb " -"imatges squashfs)." +"de configuració actuals." msgid "Client" msgstr "Client" @@ -678,12 +695,18 @@ msgstr "" msgid "Configuration" msgstr "Configuració" -msgid "Configuration applied." -msgstr "S'ha aplicat la configuració." +msgid "Configuration failed" +msgstr "" msgid "Configuration files will be kept." msgstr "Es mantindran els fitxers de configuració." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Confirmació" @@ -696,12 +719,18 @@ msgstr "Connectat" msgid "Connection Limit" msgstr "Límit de connexió" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "Connexions" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "País" @@ -755,9 +784,6 @@ msgstr "" "Personalitza el comportament dels LEDs del dispositiu, si és possible." -msgid "DHCP Leases" -msgstr "Arrendaments DHCP" - msgid "DHCP Server" msgstr "Servidor DHCP" @@ -770,9 +796,6 @@ msgstr "Client DHCP" msgid "DHCP-Options" msgstr "Opcions DHCP" -msgid "DHCPv6 Leases" -msgstr "Arrendaments DHCPv6" - msgid "DHCPv6 client" msgstr "" @@ -812,6 +835,9 @@ msgstr "" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "DUID" @@ -830,9 +856,6 @@ msgstr "Passarel·la per defecte" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Estat per defecte" @@ -851,6 +874,9 @@ msgstr "Suprimeix" msgid "Delete this network" msgstr "Suprimeix aquesta xarxa" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "Descripció" @@ -869,7 +895,10 @@ msgstr "Configuració de dispositiu" msgid "Device is rebooting..." msgstr "" -msgid "Device unreachable" +msgid "Device unreachable!" +msgstr "" + +msgid "Device unreachable! Still waiting for device..." msgstr "" msgid "Diagnostics" @@ -897,15 +926,27 @@ msgstr "" msgid "Disable Encryption" msgstr "" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "Inhabilitat" msgid "Disabled (default)" msgstr "" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "Descarta les respostes RFC1918 des de dalt" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Mostrant només els paquets que contenen" @@ -957,6 +998,9 @@ msgstr "" "No reenviïs les peticions DNS " "sense el nom DNS" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "Descarrega i instal·la el paquet" @@ -1070,6 +1114,9 @@ msgstr "" msgid "Enable this mount" msgstr "" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "" @@ -1102,6 +1149,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "Esborrant..." @@ -1160,6 +1213,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Fitxer" @@ -1178,6 +1234,9 @@ msgstr "Filtra privat" msgid "Filter useless" msgstr "Filtra els no útils" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1231,6 +1290,9 @@ msgstr "Escrivint a la memòria flaix..." msgid "Force" msgstr "Força" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "Força el CCMP (AES)" @@ -1281,7 +1343,7 @@ msgstr "Espai lliure" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1293,6 +1355,9 @@ msgstr "Només GPRS" msgid "Gateway" msgstr "Passarel·la" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "Ports de passarel·la" @@ -1355,9 +1420,6 @@ msgstr "Penja" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1372,9 +1434,6 @@ msgstr "" "Aquí pots afegir-hi les claus SSH públiques (una per línia) per entrar per " "SSH amb autenticació per clau." -msgid "Hermes 802.11b Wireless Controller" -msgstr "Controlador sense fil Hermes 802.11b" - msgid "Hide ESSID" msgstr "" "No mostris l'ESSID" @@ -1391,6 +1450,9 @@ msgstr "" msgid "Host-IP or Network" msgstr "Xarxa o adreça IP" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "Nom de màquina" @@ -1412,14 +1474,20 @@ msgstr "" msgid "IP address" msgstr "Adreça IP" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "IPv4" msgid "IPv4 Firewall" msgstr "Tallafocs IPv4" -msgid "IPv4 WAN Status" -msgstr "Estat WAN IPv4" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "Adreça IPv4" @@ -1469,15 +1537,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "Estat WAN IPv6" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "Adreça IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1584,6 +1649,9 @@ msgstr "Entrant:" msgid "Info" msgstr "Informació" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "Script d'inici" @@ -1620,21 +1688,12 @@ msgstr "Visió de conjunt de la interfície" msgid "Interface is reconnecting..." msgstr "La interfície s'està reconnectant..." -msgid "Interface is shutting down..." -msgstr "La interfície s'està aturant..." - msgid "Interface name" msgstr "" msgid "Interface not present or not connected yet." msgstr "" -msgid "Interface reconnected" -msgstr "" - -msgid "Interface shut down" -msgstr "" - msgid "Interfaces" msgstr "Interfícies" @@ -1825,6 +1884,9 @@ msgstr "Càrrega mitjana" msgid "Loading" msgstr "Carregant" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1889,6 +1951,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "" +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "Adreça MAC" @@ -1904,6 +1969,9 @@ msgstr "Llista MAC" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -1983,6 +2051,9 @@ msgstr "" msgid "Modem device" msgstr "Dispositiu mòdem" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "Temps d'espera d'inici de mòdem" @@ -2056,9 +2127,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Candidats de servidor NTP" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nom" @@ -2083,6 +2151,9 @@ msgstr "Utilitats de xarxa" msgid "Network boot image" msgstr "Imatge d'inici de xarxa" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "Xarxa sense interfícies." @@ -2104,6 +2175,9 @@ msgstr "Cap fitxer trobat" msgid "No information available" msgstr "No hi ha informació disponible" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "Sense memòria cau negativa" @@ -2122,6 +2196,9 @@ msgstr "No hi ha cap contrasenya establerta!" msgid "No rules in this chain" msgstr "No hi ha regles en aquesta cadena" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "Cap zona assignada" @@ -2182,6 +2259,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2233,12 +2313,6 @@ msgstr "Opció treta" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2259,6 +2333,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2337,6 +2414,9 @@ msgstr "PID" msgid "PIN" msgstr "PIN" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2424,6 +2504,9 @@ msgstr "Màxim:" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2492,9 +2575,6 @@ msgstr "" msgid "Prevents client-to-client communication" msgstr "Evita la comunicació client a client" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "" - msgid "Private Key" msgstr "" @@ -2543,6 +2623,11 @@ msgstr "" msgid "Quality" msgstr "Calidad" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2561,9 +2646,6 @@ msgstr "RX" msgid "RX Rate" msgstr "Velocitat RX" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "Controlador sense fil RaLink 802.11%s" - msgid "Radius-Accounting-Port" msgstr "" @@ -2582,6 +2664,9 @@ msgstr "" msgid "Radius-Authentication-Server" msgstr "" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" @@ -2590,28 +2675,18 @@ msgstr "" "\"Dynamic Host Configuration Protocol\">DHCP" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" msgid "Really reset all changes?" msgstr "" -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" - msgid "Really switch protocol?" msgstr "" @@ -2657,9 +2732,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "Reconnex aquesta interfície" -msgid "Reconnecting interface" -msgstr "Reconnectant la interfície" - msgid "References" msgstr "Referències" @@ -2699,9 +2771,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2751,6 +2820,12 @@ msgstr "Reinicia" msgid "Restart Firewall" msgstr "Reinicia el tallafocs" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "Restauració de la configuració" + msgid "Restore backup" msgstr "Restaura còpia de seguretat" @@ -2760,6 +2835,15 @@ msgstr "Mostra/amaga la contrasenya" msgid "Revert" msgstr "Reverteix" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Arrel" @@ -2775,9 +2859,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2803,14 +2884,6 @@ msgstr "" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2838,12 +2911,12 @@ msgstr "Desa" msgid "Save & Apply" msgstr "Desa i aplica" -msgid "Save & Apply" -msgstr "Desa i aplica" - msgid "Scan" msgstr "Escaneja" +msgid "Scan request failed" +msgstr "" + msgid "Scheduled Tasks" msgstr "Tasques programades" @@ -2867,17 +2940,6 @@ msgstr "Clients separats" msgid "Server Settings" msgstr "Ajusts de servidor" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Nom de servei" @@ -2896,6 +2958,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "Configura la sincronització de l'hora" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "" @@ -2905,15 +2973,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "" msgid "Shutdown this interface" msgstr "Atura aquesta interfície" -msgid "Shutdown this network" -msgstr "Atura aquesta xarxa" - msgid "Signal" msgstr "Senyal" @@ -2965,15 +3033,9 @@ msgid "" "instructions." msgstr "" -msgid "Sort" -msgstr "Ordena" - msgid "Source" msgstr "Origen" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "Especifica el directori a que el dispositiu està adjuntat" @@ -3012,6 +3074,12 @@ msgstr "Inici" msgid "Start priority" msgstr "Prioritat d'inici" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "Arrencada" @@ -3162,9 +3230,22 @@ msgstr "" "Els caràcters permets són: A-Z, a-z, 0-9 i _" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3191,9 +3272,6 @@ msgstr "" "
Fes clic a \"Procedeix\" a continuació per començar el procés " "d'escriptura a la memòria flaix." -msgid "The following changes have been committed" -msgstr "S'han comès els següents canvis" - msgid "The following changes have been reverted" msgstr "S'han desfet els següents canvis" @@ -3258,11 +3336,6 @@ msgstr "" "connectar-te de nou a l'encaminador, depenent de la configuració que hi " "tinguis." -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3273,8 +3346,8 @@ msgstr "" msgid "There are no active leases." msgstr "No hi ha arrendaments actius." -msgid "There are no pending changes to apply!" -msgstr "No hi ha canvis pendents per aplicar!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "No hi ha canvis pendents per revertir!" @@ -3376,10 +3449,13 @@ msgstr "Zona horària" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" "Per restaurar els fitxers de configuració, pots pujar una còpia de seguretat " -"generada anteriorment aquí." +"generada anteriorment aquí. Per restablir el microprogramari al seu estat " +"inicial, fes clic a \"Restableix la configuració\" (només funciona amb " +"imatges squashfs)." msgid "Tone" msgstr "" @@ -3423,15 +3499,6 @@ msgstr "Interfície del túnel" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Potència Tx" @@ -3456,9 +3523,27 @@ msgstr "" msgid "UUID" msgstr "UUID" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3468,6 +3553,9 @@ msgstr "Desconegut" msgid "Unknown Error, password not changed!" msgstr "La contrasenya no s'ha canviat a causa d'un error desconegut!" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "Sense gestionar" @@ -3477,9 +3565,18 @@ msgstr "" msgid "Unsaved Changes" msgstr "Canvis sense desar" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "Tipus de protocol no suportat." +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "Actualitza les llistes" @@ -3607,18 +3704,15 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "Classe de venidor per enviar al sol·licitar DHCP" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Verifica" msgid "Version" msgstr "Versió" +msgid "Virtual dynamic interface" +msgstr "" + msgid "WDS" msgstr "WDS" @@ -3644,16 +3738,15 @@ msgstr "" "La xifratge WPA requereix que sigui instal·lat el wpa_supplicant (pel mode " "client) o el hostapd (pels modes AP i ad hoc)." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "Esperant que s'apliquin els canvis..." msgid "Waiting for command to complete..." msgstr "Esperant que s'acabi l'ordre..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "Esperant el dispositiu..." @@ -3668,12 +3761,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3695,8 +3782,11 @@ msgstr "Resum sense fils" msgid "Wireless Security" msgstr "Seguretat sense fils" -msgid "Wireless is disabled or not associated" -msgstr "El dispositiu sense fils està inhabilitat o sense associar" +msgid "Wireless is disabled" +msgstr "El dispositiu sense fils està inhabilitat" + +msgid "Wireless is not associated" +msgstr "El dispositiu sense fils està sense associar" msgid "Wireless is restarting..." msgstr "El dispositiu sense fils està reiniciant..." @@ -3707,12 +3797,6 @@ msgstr "La xarxa sense fil està inhabilitada" msgid "Wireless network is enabled" msgstr "La xarxa sense fils està habilitada" -msgid "Wireless restarted" -msgstr "Sense fils reinciat" - -msgid "Wireless shut down" -msgstr "Sense fils aturat" - msgid "Write received DNS requests to syslog" msgstr "Escriure les peticions DNS rebudes al registre del sistema" @@ -3753,6 +3837,9 @@ msgstr "" msgid "bridged" msgstr "pontejat" +msgid "create" +msgstr "" + msgid "create:" msgstr "crea:" @@ -3790,9 +3877,6 @@ msgstr "" msgid "half-duplex" msgstr "" -msgid "help" -msgstr "ajuda" - msgid "hidden" msgstr "amagat" @@ -3817,10 +3901,10 @@ msgstr "kbit/s" msgid "local DNS file" msgstr "fitxer DNS local" -msgid "minimum 1280, maximum 1480" +msgid "minutes" msgstr "" -msgid "minutes" +msgid "mixed WPA/WPA2" msgstr "" msgid "no" @@ -3844,6 +3928,9 @@ msgstr "engegat" msgid "open" msgstr "obert" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" @@ -3895,6 +3982,69 @@ msgstr "sí" msgid "« Back" msgstr "« Enrere" +#~ msgid "%s - %s" +#~ msgstr "%s - %s" + +#~ msgid "Activate this network" +#~ msgstr "Activa aquesta xarxa" + +#~ msgid "Hermes 802.11b Wireless Controller" +#~ msgstr "Controlador sense fil Hermes 802.11b" + +#~ msgid "Interface is shutting down..." +#~ msgstr "La interfície s'està aturant..." + +#~ msgid "RaLink 802.11%s Wireless Controller" +#~ msgstr "Controlador sense fil RaLink 802.11%s" + +#~ msgid "Reconnecting interface" +#~ msgstr "Reconnectant la interfície" + +#~ msgid "Shutdown this network" +#~ msgstr "Atura aquesta xarxa" + +#~ msgid "Wireless restarted" +#~ msgstr "Sense fils reinciat" + +#~ msgid "Wireless shut down" +#~ msgstr "Sense fils aturat" + +#~ msgid "DHCP Leases" +#~ msgstr "Arrendaments DHCP" + +#~ msgid "DHCPv6 Leases" +#~ msgstr "Arrendaments DHCPv6" + +#~ msgid "Sort" +#~ msgstr "Ordena" + +#~ msgid "help" +#~ msgstr "ajuda" + +#~ msgid "IPv4 WAN Status" +#~ msgstr "Estat WAN IPv4" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "Estat WAN IPv6" + +#~ msgid "Apply" +#~ msgstr "Aplica" + +#~ msgid "Applying changes" +#~ msgstr "Aplicant els canvis" + +#~ msgid "Configuration applied." +#~ msgstr "S'ha aplicat la configuració." + +#~ msgid "Save & Apply" +#~ msgstr "Desa i aplica" + +#~ msgid "The following changes have been committed" +#~ msgstr "S'han comès els següents canvis" + +#~ msgid "There are no pending changes to apply!" +#~ msgstr "No hi ha canvis pendents per aplicar!" + #~ msgid "Action" #~ msgstr "Acció" diff --git a/luci-base/po/cs/base.po b/luci-base/po/cs/base.po index aa4144758..4075c5b06 100644 --- a/luci-base/po/cs/base.po +++ b/luci-base/po/cs/base.po @@ -47,6 +47,9 @@ msgstr "" msgid "-- match by uuid --" msgstr "" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "Zatížení za 1 minutu:" @@ -152,9 +155,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "Nejvyšší počet souběžných dotazů" -msgid "%s - %s" -msgstr "%s - %s" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -169,9 +169,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -208,9 +205,6 @@ msgstr "číslo ATM zařízení" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Přístupový koncentrátor" @@ -220,9 +214,6 @@ msgstr "Přístupový bod" msgid "Actions" msgstr "Akce" -msgid "Activate this network" -msgstr "Aktivovat tuto síť" - msgid "Active IPv4-Routes" msgstr "" "Aktivní záznamy ve směrovací tabulce SSH password authentication" msgstr "Povolit SSH autentizaci heslem" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "Povolit vše mimo uvedené" @@ -319,12 +322,12 @@ msgstr "Povolit upstream odpovědi na 127.0.0.0/8 rozsah, např. pro RBL služby msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -402,11 +405,14 @@ msgstr "Konfigurace antén" msgid "Any zone" msgstr "Libovolná zóna" -msgid "Apply" -msgstr "Použít" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" -msgstr "Probíhá uplatňování nastavení" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -422,6 +428,9 @@ msgstr "" msgid "Associated Stations" msgstr "Připojení klienti" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -497,12 +506,12 @@ msgstr "Zpět k přehledu" msgid "Back to scan results" msgstr "Zpět k výsledkům vyhledávání" +msgid "Backup" +msgstr "Zálohovat" + msgid "Backup / Flash Firmware" msgstr "Zálohovat / nahrát firmware" -msgid "Backup / Restore" -msgstr "Zálohovat / obnovit" - msgid "Backup file list" msgstr "Seznam souborů k zálohování" @@ -512,7 +521,7 @@ msgstr "Zadána neplatná adresa!" msgid "Band" msgstr "" -msgid "Behind NAT" +msgid "Beacon Interval" msgstr "" msgid "" @@ -571,6 +580,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "Vytížení CPU (%)" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "Storno" @@ -586,12 +598,20 @@ msgstr "Změny" msgid "Changes applied." msgstr "Změny aplikovány." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Změní administrátorské heslo pro přístup k zařízení" msgid "Channel" msgstr "Kanál" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Kontrola" @@ -630,12 +650,9 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" -"Pro stažení archivu tar s aktuální konfigurací stiskněte \"Vytvořit archiv" -"\". Pro obnovení továrního nastavení stiskněte \"Obnovit výchozí\" (možné " -"pouze s obrazy squashfs)." +"Pro stažení archivu tar s aktuální konfigurací stiskněte \"Vytvořit archiv\"." msgid "Client" msgstr "Klient" @@ -672,12 +689,18 @@ msgstr "" msgid "Configuration" msgstr "Nastavení" -msgid "Configuration applied." -msgstr "Nastavení uplatněno." +msgid "Configuration failed" +msgstr "" msgid "Configuration files will be kept." msgstr "Konfigurační soubory budou zachovány." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Ověření" @@ -690,12 +713,18 @@ msgstr "Připojeno" msgid "Connection Limit" msgstr "Omezení počtu připojení" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "Připojení" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Země" @@ -749,9 +778,6 @@ msgstr "" "Upraví chování LED diod zařízení " "pokud je to možné." -msgid "DHCP Leases" -msgstr "DHCP výpůjčky" - msgid "DHCP Server" msgstr "DHCP server" @@ -764,9 +790,6 @@ msgstr "DHCP klient" msgid "DHCP-Options" msgstr "Volby DHCP" -msgid "DHCPv6 Leases" -msgstr "DHCPv6 přidělené IP" - msgid "DHCPv6 client" msgstr "" @@ -806,6 +829,9 @@ msgstr "" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "DUID" @@ -824,9 +850,6 @@ msgstr "Výchozí brána" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Výchozí stav" @@ -847,6 +870,9 @@ msgstr "Odstranit" msgid "Delete this network" msgstr "Odstranit tuto síť" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "Popis" @@ -865,7 +891,10 @@ msgstr "Nastavení zařízení" msgid "Device is rebooting..." msgstr "" -msgid "Device unreachable" +msgid "Device unreachable!" +msgstr "" + +msgid "Device unreachable! Still waiting for device..." msgstr "" msgid "Diagnostics" @@ -893,15 +922,27 @@ msgstr "Zakázat nastavení DNS" msgid "Disable Encryption" msgstr "" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "Zakázáno" msgid "Disabled (default)" msgstr "" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "Vyřadit upstream RFC1918 odpovědi" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Zobrazeny pouze balíčky obsahující" @@ -955,6 +996,9 @@ msgstr "" "Nepřeposílat DNS dotazy bez DNS jména" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "Stáhnout a nainstalovat balíček" @@ -1070,6 +1114,9 @@ msgstr "" msgid "Enable this mount" msgstr "Povolit tento přípojný bod" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "Povolit tento swapovací oddíl" @@ -1102,6 +1149,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "Odstraňování..." @@ -1162,6 +1215,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Soubor" @@ -1180,6 +1236,9 @@ msgstr "Filtrovat soukromé" msgid "Filter useless" msgstr "Filtrovat nepotřebné" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1233,6 +1292,9 @@ msgstr "Nahrávám..." msgid "Force" msgstr "Vynutit" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "Vynutit CCMP (AES)" @@ -1283,7 +1345,7 @@ msgstr "Volné místo" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1295,6 +1357,9 @@ msgstr "Pouze GPRS" msgid "Gateway" msgstr "Brána" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "Porty brány" @@ -1355,9 +1420,6 @@ msgstr "Zavěsit" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1371,9 +1433,6 @@ msgid "" msgstr "" "Vložte veřejné klíče (na každý řadek jeden) pro ověřovaní SSH přístupu." -msgid "Hermes 802.11b Wireless Controller" -msgstr "Hermes 802.11b bezdrátový ovladač" - msgid "Hide ESSID" msgstr "Skrývat ESSID" @@ -1390,6 +1449,9 @@ msgid "Host-IP or Network" msgstr "" "IP adresa hostitele nebo síť" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "Jméno hostitele" @@ -1411,14 +1473,20 @@ msgstr "" msgid "IP address" msgstr "IP adresy" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "IPv4" msgid "IPv4 Firewall" msgstr "IPv4 firewall" -msgid "IPv4 WAN Status" -msgstr "Stav IPv4 WAN" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "IPv4 adresa" @@ -1468,15 +1536,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "Stav IPv6 WAN" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "IPv6 adresa" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1583,6 +1648,9 @@ msgstr "Příchozí:" msgid "Info" msgstr "Info" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "Initskript" @@ -1619,21 +1687,12 @@ msgstr "Přehled rozhraní" msgid "Interface is reconnecting..." msgstr "Rozhraní se znovu připojuje..." -msgid "Interface is shutting down..." -msgstr "Rozhraní se vypíná..." - msgid "Interface name" msgstr "" msgid "Interface not present or not connected yet." msgstr "Rozhraní není přítomné nebo je dosud nepřipojeno." -msgid "Interface reconnected" -msgstr "Rozhraní bylo znovu připojeno" - -msgid "Interface shut down" -msgstr "Rozhraní bylo vypnuto" - msgid "Interfaces" msgstr "Rozhraní" @@ -1827,6 +1886,9 @@ msgstr "Zátěž průměrná" msgid "Loading" msgstr "Načítání" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1897,6 +1959,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "Nejnižší zapůjčenou adresu použít jako offset síťové adresy." +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "MAC-Adresa" @@ -1912,6 +1977,9 @@ msgstr "Seznam Mac" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -1991,6 +2059,9 @@ msgstr "" msgid "Modem device" msgstr "Modemové zařízení" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "Časový limit inicializace modemu" @@ -2064,9 +2135,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Kandidáti NTP serveru" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Název" @@ -2091,6 +2159,9 @@ msgstr "Síťové nástroje" msgid "Network boot image" msgstr "Síťový bootovací obraz" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "Síť bez rozhraní." @@ -2112,6 +2183,9 @@ msgstr "Nebyly nalezeny žádné soubory" msgid "No information available" msgstr "Údaje nejsou k dispozici" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "Žádná negativní mezipaměť" @@ -2130,6 +2204,9 @@ msgstr "Žádné heslo!" msgid "No rules in this chain" msgstr "Žádná pravidla v tomto řetězci" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "Žádná zóna nepřiřazena" @@ -2190,6 +2267,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Vypnutí prodlevy" @@ -2240,12 +2320,6 @@ msgstr "Volba odstraněna" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2266,6 +2340,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2346,6 +2423,9 @@ msgstr "PID" msgid "PIN" msgstr "PIN" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2433,6 +2513,9 @@ msgstr "Špička:" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2503,9 +2586,6 @@ msgstr "" msgid "Prevents client-to-client communication" msgstr "Zabraňuje komunikaci klient-klient" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "Prism2/2.5/3 802.11b Wireless Controller" - msgid "Private Key" msgstr "" @@ -2554,6 +2634,11 @@ msgstr "" msgid "Quality" msgstr "Kvalita" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2572,9 +2657,6 @@ msgstr "RX" msgid "RX Rate" msgstr "RX Rate" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "RaLink 802.11%s Wireless Controller" - msgid "Radius-Accounting-Port" msgstr "Port pro Radius-Accounting" @@ -2593,6 +2675,9 @@ msgstr "Tajný klíč pro Radius-Authentication" msgid "Radius-Authentication-Server" msgstr "Server Radius-Authentication" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" @@ -2601,15 +2686,12 @@ msgstr "" "Host Configuration Protocol\">DHCP Serveru" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" -"Opravdu odstranit toto rozhraní? Odstranění nelze vrátit zpět!\n" -"Můžete ztratit přístup k zařízení, pokud jste připojeni prostřednictvím " -"tohoto rozhraní." msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" "Opravdu odstranit bezdrátovou síť? Odstranění nelze vrátit zpět!\n" @@ -2619,23 +2701,6 @@ msgstr "" msgid "Really reset all changes?" msgstr "Opravdu resetovat všechny změny?" -#, fuzzy -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" -"Opravdu vypnout síť ?\n" -"Můžete ztratit přístup k zařízení, pokud jste připojeni prostřednictvím " -"tohoto rozhraní." - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" -"Opravdu vypnout rozhraní \"%s\" ?\n" -"Můžete ztratit přístup k zařízení, pokud jste připojeni prostřednictvím " -"tohoto rozhraní." - msgid "Really switch protocol?" msgstr "Opravdu prohodit protokol?" @@ -2681,9 +2746,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "Přepojit toto rozhraní" -msgid "Reconnecting interface" -msgstr "Přepojuji rozhraní" - msgid "References" msgstr "Reference" @@ -2723,9 +2785,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2776,6 +2835,12 @@ msgstr "Restart" msgid "Restart Firewall" msgstr "Restartovat firewall" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "Obnovit" + msgid "Restore backup" msgstr "Obnovit zálohu" @@ -2785,6 +2850,15 @@ msgstr "Odhalit/skrýt heslo" msgid "Revert" msgstr "Vrátit zpět" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Root" @@ -2800,9 +2874,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2827,14 +2898,6 @@ msgstr "Spustit kontrolu souborového systému" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2862,12 +2925,12 @@ msgstr "Uložit" msgid "Save & Apply" msgstr "Uložit & použít" -msgid "Save & Apply" -msgstr "Uložit & použít" - msgid "Scan" msgstr "Skenovat" +msgid "Scan request failed" +msgstr "" + msgid "Scheduled Tasks" msgstr "Naplánované úlohy" @@ -2893,17 +2956,6 @@ msgstr "Oddělovat klienty" msgid "Server Settings" msgstr "Nastavení serveru" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Název služby" @@ -2922,6 +2974,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "Nastavit synchronizaci času" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "Nastavit DHCP server" @@ -2931,15 +2989,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "Ukázat aktuální seznam záložních souborů" msgid "Shutdown this interface" msgstr "Shodit toho rozhraní" -msgid "Shutdown this network" -msgstr "Shodit tuto síť" - msgid "Signal" msgstr "Signál" @@ -2994,15 +3052,9 @@ msgstr "" "systému. Nový obraz firmwaru musí být zapsán ručně. Prosím, obraťte se na " "wiki pro zařízení specifické instalační instrukce." -msgid "Sort" -msgstr "Seřadit" - msgid "Source" msgstr "Zdroj" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -3043,6 +3095,12 @@ msgstr "Start" msgid "Start priority" msgstr "Priorita spouštění" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "Po spuštění" @@ -3202,9 +3260,22 @@ msgstr "" "Povolené znaky jsou: A-Z, a-z, 0-9 a " "_" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3230,9 +3301,6 @@ msgstr "" "souboru s originálním souborem pro zajištění integrity dat.
Kliknutím " "na \"Pokračovat\" spustíte proceduru flashování." -msgid "The following changes have been committed" -msgstr "Následující změny byly provedeny" - msgid "The following changes have been reverted" msgstr "Následující změny byly vráceny" @@ -3301,11 +3369,6 @@ msgstr "" "nastavení, bude možná nutné obnovit adresu vašeho počítače, aby jste se " "mohli znovu připojit." -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3314,8 +3377,8 @@ msgstr "" msgid "There are no active leases." msgstr "Nejsou žádné aktivní zápůjčky." -msgid "There are no pending changes to apply!" -msgstr "Nejsou zde žádné nevyřízené změny k aplikaci!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Nejsou zde žádné nevyřízené změny k navrácení!" @@ -3416,10 +3479,12 @@ msgstr "Časové pásmo" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" "Zde můžete nahrát dříve vygenerovaný záložní archiv, pokud chcete obnovit " -"konfigurační soubory." +"konfigurační soubory. Pro obnovení továrního nastavení stiskněte \"Obnovit " +"výchozí\" (možné pouze s obrazy squashfs)." msgid "Tone" msgstr "" @@ -3463,15 +3528,6 @@ msgstr "Rozhraní tunelu" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Tx-Power" @@ -3496,9 +3552,27 @@ msgstr "" msgid "UUID" msgstr "UUID" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3508,6 +3582,9 @@ msgstr "Neznámý" msgid "Unknown Error, password not changed!" msgstr "Neznámá chyba, heslo nebylo změněno!" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "Nespravovaný" @@ -3517,9 +3594,18 @@ msgstr "" msgid "Unsaved Changes" msgstr "Neuložené změny" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "Nepodporovaný typ protokolu." +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "Aktualizovat seznamy" @@ -3650,18 +3736,15 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Ověřit" msgid "Version" msgstr "Verze" +msgid "Virtual dynamic interface" +msgstr "" + msgid "WDS" msgstr "WDS" @@ -3687,16 +3770,15 @@ msgstr "" "Šifrování WPA vyžaduje nainstalovaný wpa_supplicant (pro klientský režim) " "nebo hostapd (pro AP a ad-hoc režim)." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "Čekání na realizaci změn..." msgid "Waiting for command to complete..." msgstr "Čekání na dokončení příkazu..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3711,12 +3793,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3738,8 +3814,11 @@ msgstr "Přehled bezdrátových sití" msgid "Wireless Security" msgstr "Zabezpečení bezdrátové sítě" -msgid "Wireless is disabled or not associated" -msgstr "Bezdrátová síť je vypnuta nebo nespojena" +msgid "Wireless is disabled" +msgstr "Bezdrátová síť vypnuta" + +msgid "Wireless is not associated" +msgstr "Bezdrátová síť nespojena" msgid "Wireless is restarting..." msgstr "Probíhá restartování bezdrátové sítě..." @@ -3750,12 +3829,6 @@ msgstr "Bezdrátová síť je zakázána" msgid "Wireless network is enabled" msgstr "Bezdrátová síť je povolena" -msgid "Wireless restarted" -msgstr "Bezdrátová síť restartována" - -msgid "Wireless shut down" -msgstr "Bezdrátová síť vypnuta" - msgid "Write received DNS requests to syslog" msgstr "Zapisovat přijaté požadavky DNS do systemového logu" @@ -3794,6 +3867,9 @@ msgstr "baseT" msgid "bridged" msgstr "přemostěný" +msgid "create" +msgstr "" + msgid "create:" msgstr "" @@ -3831,9 +3907,6 @@ msgstr "plný-duplex" msgid "half-duplex" msgstr "poloviční-duplex" -msgid "help" -msgstr "pomoc" - msgid "hidden" msgstr "skrytý" @@ -3858,10 +3931,10 @@ msgstr "kbit/s" msgid "local DNS file" msgstr "místní DNS soubor" -msgid "minimum 1280, maximum 1480" +msgid "minutes" msgstr "" -msgid "minutes" +msgid "mixed WPA/WPA2" msgstr "" msgid "no" @@ -3885,6 +3958,9 @@ msgstr "on" msgid "open" msgstr "" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" @@ -3936,6 +4012,103 @@ msgstr "ano" msgid "« Back" msgstr "« Zpět" +#~ msgid "%s - %s" +#~ msgstr "%s - %s" + +#~ msgid "Activate this network" +#~ msgstr "Aktivovat tuto síť" + +#~ msgid "Hermes 802.11b Wireless Controller" +#~ msgstr "Hermes 802.11b bezdrátový ovladač" + +#~ msgid "Interface is shutting down..." +#~ msgstr "Rozhraní se vypíná..." + +#~ msgid "Interface reconnected" +#~ msgstr "Rozhraní bylo znovu připojeno" + +#~ msgid "Interface shut down" +#~ msgstr "Rozhraní bylo vypnuto" + +#~ msgid "Prism2/2.5/3 802.11b Wireless Controller" +#~ msgstr "Prism2/2.5/3 802.11b Wireless Controller" + +#~ msgid "RaLink 802.11%s Wireless Controller" +#~ msgstr "RaLink 802.11%s Wireless Controller" + +#~ msgid "" +#~ "Really shutdown interface \"%s\"? You might lose access to this device if " +#~ "you are connected via this interface." +#~ msgstr "" +#~ "Opravdu vypnout rozhraní \"%s\" ?\n" +#~ "Můžete ztratit přístup k zařízení, pokud jste připojeni prostřednictvím " +#~ "tohoto rozhraní." + +#~ msgid "Reconnecting interface" +#~ msgstr "Přepojuji rozhraní" + +#~ msgid "Shutdown this network" +#~ msgstr "Shodit tuto síť" + +#~ msgid "Wireless restarted" +#~ msgstr "Bezdrátová síť restartována" + +#~ msgid "Wireless shut down" +#~ msgstr "Bezdrátová síť vypnuta" + +#~ msgid "DHCP Leases" +#~ msgstr "DHCP výpůjčky" + +#~ msgid "DHCPv6 Leases" +#~ msgstr "DHCPv6 přidělené IP" + +#~ msgid "" +#~ "Really delete this interface? The deletion cannot be undone! You might " +#~ "lose access to this device if you are connected via this interface." +#~ msgstr "" +#~ "Opravdu odstranit toto rozhraní? Odstranění nelze vrátit zpět!\n" +#~ "Můžete ztratit přístup k zařízení, pokud jste připojeni prostřednictvím " +#~ "tohoto rozhraní." + +#, fuzzy +#~ msgid "" +#~ "Really shut down network? You might lose access to this device if you are " +#~ "connected via this interface." +#~ msgstr "" +#~ "Opravdu vypnout síť ?\n" +#~ "Můžete ztratit přístup k zařízení, pokud jste připojeni prostřednictvím " +#~ "tohoto rozhraní." + +#~ msgid "Sort" +#~ msgstr "Seřadit" + +#~ msgid "help" +#~ msgstr "pomoc" + +#~ msgid "IPv4 WAN Status" +#~ msgstr "Stav IPv4 WAN" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "Stav IPv6 WAN" + +#~ msgid "Apply" +#~ msgstr "Použít" + +#~ msgid "Applying changes" +#~ msgstr "Probíhá uplatňování nastavení" + +#~ msgid "Configuration applied." +#~ msgstr "Nastavení uplatněno." + +#~ msgid "Save & Apply" +#~ msgstr "Uložit & použít" + +#~ msgid "The following changes have been committed" +#~ msgstr "Následující změny byly provedeny" + +#~ msgid "There are no pending changes to apply!" +#~ msgstr "Nejsou zde žádné nevyřízené změny k aplikaci!" + #~ msgid "Action" #~ msgstr "Akce" diff --git a/luci-base/po/de/base.po b/luci-base/po/de/base.po index 574ddf184..cb599601f 100644 --- a/luci-base/po/de/base.po +++ b/luci-base/po/de/base.po @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-05-26 17:57+0200\n" -"PO-Revision-Date: 2018-01-09 08:01+0100\n" +"PO-Revision-Date: 2018-07-15 12:25+0200\n" "Last-Translator: JoeSemler \n" "Language: de\n" "MIME-Version: 1.0\n" @@ -49,6 +49,9 @@ msgstr "-- anhand Label selektieren --" msgid "-- match by uuid --" msgstr "-- UUID vergleichen --" +msgid "-- please select --" +msgstr "-- Bitte auswählen --" + msgid "1 Minute Load:" msgstr "Systemlast (1 Minute):" @@ -135,6 +138,8 @@ msgstr "MAC-Adresse" msgid "DUID" msgstr "" +"DUID" msgid "" "Max. Max. concurrent queries" msgstr "Max. Anzahl gleichzeitiger Abfragen" -msgid "%s - %s" -msgstr "%s - %s" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -172,9 +174,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -185,7 +184,7 @@ msgid "ARP retry threshold" msgstr "Grenzwert für ARP-Auflösungsversuche" msgid "ATM (Asynchronous Transfer Mode)" -msgstr "" +msgstr "ATM (Asynchroner Transfer-Modus)" msgid "ATM Bridges" msgstr "ATM Brücken" @@ -211,9 +210,6 @@ msgstr "ATM Geräteindex" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Access Concentrator" @@ -223,9 +219,6 @@ msgstr "Access Point" msgid "Actions" msgstr "Aktionen" -msgid "Activate this network" -msgstr "Dieses Netzwerk aktivieren" - msgid "Active IPv4-Routes" msgstr "Aktive IPv4-Routen" @@ -277,6 +270,15 @@ msgstr "Vollständige Sendeleistung (ACTATP)" msgid "Alert" msgstr "Alarm" +msgid "Alias Interface" +msgstr "Alias-Schnittstelle" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -290,6 +292,9 @@ msgstr "IPs sequenziell vergeben" msgid "Allow SSH password authentication" msgstr "Erlaube Anmeldung per Passwort" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "Alle außer gelistete erlauben" @@ -322,16 +327,14 @@ msgstr "" msgid "Allowed IPs" msgstr "Erlaubte IP-Adressen" -msgid "" -"Also see Tunneling Comparison on SIXXS" -msgstr "" -"Siehe auch Tunneling Comparison bei SIXXS." - msgid "Always announce default router" msgstr "Immer Defaultrouter ankündigen" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" +msgstr "" + msgid "Annex" msgstr "" @@ -409,11 +412,16 @@ msgstr "Antennenkonfiguration" msgid "Any zone" msgstr "Beliebige Zone" -msgid "Apply" -msgstr "Anwenden" +msgid "Apply request failed with status %h" +msgstr "" +"Anforderung zur Anwendung der Änderungen mit Status %h " +"fehlgeschlagen" -msgid "Applying changes" -msgstr "Änderungen werden angewandt" +msgid "Apply unchecked" +msgstr "Ungeprüft anwenden" + +msgid "Architecture" +msgstr "Architektur" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -433,6 +441,9 @@ msgstr "" msgid "Associated Stations" msgstr "Assoziierte Clients" +msgid "Associations" +msgstr "Assoziierungen" + msgid "Auth Group" msgstr "Berechtigungsgruppe" @@ -508,12 +519,12 @@ msgstr "Zurück zur Übersicht" msgid "Back to scan results" msgstr "Zurück zu den Scan-Ergebnissen" +msgid "Backup" +msgstr "Sichern" + msgid "Backup / Flash Firmware" msgstr "Backup / Firmware Update" -msgid "Backup / Restore" -msgstr "Sichern / Wiederherstellen" - msgid "Backup file list" msgstr "Liste zu sichernder Dateien" @@ -523,8 +534,8 @@ msgstr "Ungültige Adresse angegeben!" msgid "Band" msgstr "Frequenztyp" -msgid "Behind NAT" -msgstr "NAT" +msgid "Beacon Interval" +msgstr "" msgid "" "Below is the determined list of files to backup. It consists of changed " @@ -589,6 +600,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "CPU-Nutzung (%)" +msgid "Call failed" +msgstr "Anruf fehlgeschlagen" + msgid "Cancel" msgstr "Abbrechen" @@ -604,12 +618,22 @@ msgstr "Änderungen" msgid "Changes applied." msgstr "Änderungen angewendet." +msgid "Changes have been reverted." +msgstr "Änderungen wurden verworfen" + msgid "Changes the administrator password for accessing the device" msgstr "Ändert das Administratorpasswort für den Zugriff auf dieses Gerät" msgid "Channel" msgstr "Kanal" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" +"Kanal %d ist in der Regulierungszone \"%s\" nicht verfügbar und wurde " +"automatisch auf %d gesetzt." + msgid "Check" msgstr "Prüfen" @@ -649,13 +673,10 @@ msgstr "Cisco UDP-Kapselung" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" "Zum Herunterladen der aktuellen Konfigurationsdateien als gepacktes Archiv " -"\"Sicherung erstellen\" drücken. \"Konfiguration zurücksetzen\" stellt den " -"Auslieferungszustand des Systems wieder her (nur möglich bei squashfs-" -"Images)." +"\"Sicherung erstellen\" drücken." msgid "Client" msgstr "Client" @@ -696,12 +717,18 @@ msgstr "" msgid "Configuration" msgstr "Konfiguration" -msgid "Configuration applied." -msgstr "Konfiguration angewendet." +msgid "Configuration failed" +msgstr "Konfiguration fehlgeschlagen" msgid "Configuration files will be kept." msgstr "Konfigurationsdateien sichern" +msgid "Configuration has been applied." +msgstr "Die Konfiguration wurde angewendet." + +msgid "Configuration has been rolled back!" +msgstr "Die Konfiguration wurde zurückgerollt!" + msgid "Confirmation" msgstr "Bestätigung" @@ -714,12 +741,22 @@ msgstr "Verbunden" msgid "Connection Limit" msgstr "Verbindungslimit" -msgid "Connection to server fails when TLS cannot be used" -msgstr "TLS zwingend vorraussetzen und abbrechen wenn TLS fehlschlägt." +msgid "Connection attempt failed" +msgstr "Verbindungsversuch fehlgeschlagen" msgid "Connections" msgstr "Verbindungen" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" +"Das Gerät konnte nach Anwendung der Konfigurationsänderungen nicht mehr " +"erreicht werden. Unter Umständen müssen Sie sich neu verbinden wenn " +"netzwerkbezogene Einstellungen wie die IP-Adresse oder W-LAN Passwörter " +"geändert wurden." + msgid "Country" msgstr "Land" @@ -767,15 +804,15 @@ msgid "" "Custom files (certificates, scripts) may remain on the system. To prevent " "this, perform a factory-reset first." msgstr "" +"Eigene Dateien wir Zertifikate oder Scripte können unter Umständen auf dem " +"System verbleiben. Um dies zu vermeiden, sollte zuerst auf " +"Werkseinstellungen zurückgesetzt werden." msgid "" "Customizes the behaviour of the device LEDs if possible." msgstr "Passt das Verhalten der Geräte-LEDs an - wenn dies möglich ist." -msgid "DHCP Leases" -msgstr "DHCP-Leases" - msgid "DHCP Server" msgstr "DHCP-Server" @@ -788,9 +825,6 @@ msgstr "DHCP Client" msgid "DHCP-Options" msgstr "DHCP-Optionen" -msgid "DHCPv6 Leases" -msgstr "DHCPv6-Leases" - msgid "DHCPv6 client" msgstr "DHCPv6 Client" @@ -830,6 +864,9 @@ msgstr "" msgid "DSL line mode" msgstr "DSL Leitungsmodus" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "DUID" @@ -848,9 +885,6 @@ msgstr "Default Gateway" msgid "Default is stateless + stateful" msgstr "Der Standardwert ist zustandslos und zustandsorientiert" -msgid "Default route" -msgstr "Default Route" - msgid "Default state" msgstr "Ausgangszustand" @@ -871,6 +905,9 @@ msgstr "Löschen" msgid "Delete this network" msgstr "Dieses Netzwerk löschen" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "Beschreibung" @@ -889,9 +926,12 @@ msgstr "Gerätekonfiguration" msgid "Device is rebooting..." msgstr "Das Gerät startet neu..." -msgid "Device unreachable" +msgid "Device unreachable!" msgstr "Das Gerät ist nicht erreichbar" +msgid "Device unreachable! Still waiting for device..." +msgstr "Gerät nicht erreichbar! Wartet immer noch..." + msgid "Diagnostics" msgstr "Diagnosen" @@ -917,15 +957,27 @@ msgstr "DNS-Verarbeitung deaktivieren" msgid "Disable Encryption" msgstr "Verschlüsselung deaktivieren" +msgid "Disable this network" +msgstr "Dieses Netzwerk deaktivieren" + msgid "Disabled" msgstr "Deaktiviert" msgid "Disabled (default)" msgstr "Deaktiviert (Standard)" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "Eingehende RFC1918-Antworten verwerfen" +msgid "Disconnection attempt failed" +msgstr "Verbindungstrennung fehlgeschlagen" + +msgid "Dismiss" +msgstr "Schließen" + msgid "Displaying only packages containing" msgstr "Nur Pakete mit folgendem Inhalt anzeigen" @@ -980,6 +1032,9 @@ msgid "" "DNS-Name" msgstr "Anfragen ohne Domainnamen nicht weiterleiten" +msgid "Down" +msgstr "runter" + msgid "Download and install package" msgstr "Paket herunterladen und installieren" @@ -987,7 +1042,7 @@ msgid "Download backup" msgstr "Backup herunterladen" msgid "Downstream SNR offset" -msgstr "" +msgstr "Downstream SNR-Offset" msgid "Dropbear Instance" msgstr "Dropbear Instanz" @@ -1047,6 +1102,8 @@ msgid "" "Enable IGMP " "snooping" msgstr "" +"IGMP-Erkennung " +"aktivieren" msgid "Enable STP" msgstr "STP aktivieren" @@ -1097,6 +1154,9 @@ msgstr "Das DF-Bit (Nicht fragmentieren) auf gekapselten Paketen setzen." msgid "Enable this mount" msgstr "Diesen Mountpunkt aktivieren" +msgid "Enable this network" +msgstr "Dieses Netzwerk aktivieren" + msgid "Enable this swap" msgstr "Diesen Auslagerungsspeicher aktivieren" @@ -1107,7 +1167,7 @@ msgid "Enabled" msgstr "Aktiviert" msgid "Enables IGMP snooping on this bridge" -msgstr "" +msgstr "Aktiviert die automatische IGMP-Erkennung auf dieser Netzwerkbrücke" msgid "" "Enables fast roaming among access points that belong to the same Mobility " @@ -1131,6 +1191,12 @@ msgstr "Entfernter Server" msgid "Endpoint Port" msgstr "Entfernter Port" +msgid "Enter custom value" +msgstr "Eigenen Wert angeben" + +msgid "Enter custom values" +msgstr "Eigene Werte angeben" + msgid "Erasing..." msgstr "Lösche..." @@ -1184,13 +1250,18 @@ msgid "Extra SSH command options" msgstr "Zusätzliche SSH-Kommando-Optionen" msgid "FT over DS" -msgstr "" +msgstr "FT-über-DS" msgid "FT over the Air" -msgstr "" +msgstr "FT-drahtlos" msgid "FT protocol" +msgstr "FT Protokoll" + +msgid "Failed to confirm apply within %ds, waiting for rollback…" msgstr "" +"Konnte nicht innerhalb von %d Sekunden bestätigen, warte auf Zurückrollen " +"der Änderungen..." msgid "File" msgstr "Datei" @@ -1210,6 +1281,9 @@ msgstr "Private Anfragen filtern" msgid "Filter useless" msgstr "Windowsanfragen filtern" +msgid "Finalizing failed" +msgstr "Finalisierung fehlgeschlagen" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1266,6 +1340,9 @@ msgstr "Firmware wird installiert..." msgid "Force" msgstr "Start erzwingen" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "CCMP (AES) erzwingen" @@ -1318,10 +1395,10 @@ msgstr "Freier Platz" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" "Weitere Informationen zu WireGuard-Schnittstellen und Peers unter wireguard.io." +"\"http://wireguard.com\">wireguard.com." msgid "GHz" msgstr "GHz" @@ -1332,6 +1409,9 @@ msgstr "Nur GPRS" msgid "Gateway" msgstr "Gateway" +msgid "Gateway address is invalid" +msgstr "Gateway-Adresse ist ungültig" + msgid "Gateway ports" msgstr "Gateway-Ports" @@ -1394,9 +1474,6 @@ msgstr "Auflegen" msgid "Header Error Code Errors (HEC)" msgstr "Anzahl Header-Error-Code-Fehler (HEC)" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1410,9 +1487,6 @@ msgid "" msgstr "" "Hier können öffentliche SSH-Schlüssel reinkopiert werden (einer pro Zeile)." -msgid "Hermes 802.11b Wireless Controller" -msgstr "Hermes 802.11b W-LAN Adapter" - msgid "Hide ESSID" msgstr "ESSID verstecken" @@ -1428,6 +1502,9 @@ msgstr "Host Verfallsdatum" msgid "Host-IP or Network" msgstr "Host-IP oder Netzwerk" +msgid "Host-Uniq tag content" +msgstr "\"Host-Uniq\"-Bezeichner" + msgid "Hostname" msgstr "Hostname" @@ -1449,14 +1526,20 @@ msgstr "IP-Adressen" msgid "IP address" msgstr "IP-Adresse" +msgid "IP address in invalid" +msgstr "IP-Adresse ist ungültig" + +msgid "IP address is missing" +msgstr "IP-Adresse fehlt" + msgid "IPv4" msgstr "IPv4" msgid "IPv4 Firewall" msgstr "IPv4 Firewall" -msgid "IPv4 WAN Status" -msgstr "IPv4 WAN Status" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "IPv4 Adresse" @@ -1506,15 +1589,12 @@ msgstr "IPv6 Einstellungen" msgid "IPv6 ULA-Prefix" msgstr "IPv6 ULA-Präfix" -msgid "IPv6 WAN Status" -msgstr "IPv6 WAN Status" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "IPv6 Adresse" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "Zum lokalen Tunnelendpunkt delegierte IPv6-Adresse (optional)" - msgid "IPv6 assignment hint" msgstr "IPv6 Zuweisungshinweis" @@ -1626,6 +1706,9 @@ msgstr "Eingehend:" msgid "Info" msgstr "Info" +msgid "Initialization failure" +msgstr "Initialisierung fehlgeschlagen" + msgid "Initscript" msgstr "Startscript" @@ -1665,21 +1748,12 @@ msgstr "Schnittstellenübersicht" msgid "Interface is reconnecting..." msgstr "Schnittstelle verbindet neu..." -msgid "Interface is shutting down..." -msgstr "Schnittstelle fährt herunter..." - msgid "Interface name" msgstr "Schnittstellenname" msgid "Interface not present or not connected yet." msgstr "Schnittstelle existiert nicht oder ist nicht verbunden." -msgid "Interface reconnected" -msgstr "Schnittstelle neu verbunden" - -msgid "Interface shut down" -msgstr "Schnittstelle heruntergefahren" - msgid "Interfaces" msgstr "Schnittstellen" @@ -1887,6 +1961,9 @@ msgstr "Durchschnittslast" msgid "Loading" msgstr "Lade" +msgid "Local IP address is invalid" +msgstr "Lokale IP-Adresse ist ungültig" + msgid "Local IP address to assign" msgstr "Lokale IP-Adresse" @@ -1959,6 +2036,9 @@ msgstr "Signalverlustsekunden (LOSS)" msgid "Lowest leased address as offset from the network address." msgstr "Kleinste vergebene Adresse (Netzwerkadresse + x)" +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "MAC-Adresse" @@ -1974,6 +2054,9 @@ msgstr "MAC-Adressliste" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "MAP-Regel ist ungültig" + msgid "MB/s" msgstr "MB/s" @@ -2056,6 +2139,9 @@ msgstr "Modell" msgid "Modem device" msgstr "Modemgerät" +msgid "Modem information query failed" +msgstr "Modem-Informationsabfrage fehlgeschlagen" + msgid "Modem init timeout" msgstr "Wartezeit für Modeminitialisierung" @@ -2129,9 +2215,6 @@ msgstr "" msgid "NTP server candidates" msgstr "NTP Server Kandidaten" -msgid "NTP sync time-out" -msgstr "NTP Synchronisierungstimeout" - msgid "Name" msgstr "Name" @@ -2156,6 +2239,9 @@ msgstr "Netzwerk-Werkzeuge" msgid "Network boot image" msgstr "Netzwerk-Boot-Image" +msgid "Network device is not present" +msgstr "Netzwerkgerät ist nicht vorhanden" + msgid "Network without interfaces." msgstr "Netzwerk ohne Schnittstellen." @@ -2177,6 +2263,9 @@ msgstr "Keine Dateien gefunden" msgid "No information available" msgstr "Keine Informationen verfügbar" +msgid "No matching prefix delegation" +msgstr "Kein passendes delegiertes Prefix" + msgid "No negative cache" msgstr "Kein Negativ-Cache" @@ -2196,6 +2285,9 @@ msgstr "Kein Passwort gesetzt!" msgid "No rules in this chain" msgstr "Keine Regeln in dieser Kette" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "Keine Zone zugewiesen" @@ -2243,6 +2335,8 @@ msgstr "DNS-Auflösung" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +"Anzahl der zwischengespeicherten DNS-Einträge. Maximum sind 10000 Einträge, " +"\"0\" deaktiviert die Zwischenspeicherung." msgid "OK" msgstr "OK" @@ -2256,6 +2350,9 @@ msgstr "Chiffriertes Gruppenpasswort" msgid "Obfuscated Password" msgstr "Chiffriertes Passwort" +msgid "Obtain IPv6-Address" +msgstr "IPv6-Adresse beziehen" + msgid "Off-State Delay" msgstr "Verzögerung für Ausschalt-Zustand" @@ -2307,14 +2404,6 @@ msgstr "Option entfernt" msgid "Optional" msgstr "Optional" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" -"Optional, angeben um den Standardserver (tic.sixxs.net) zu überschreiben" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" -"Optional, angeben wenn das SIXSS Konto mehr als einen Tunnel beinhaltet" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2343,6 +2432,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "Optional. Routen für erlaubte IP-Adressen erzeugen." +msgid "Optional. Description of peer." +msgstr "Optionale Beschreibung des entfernten VPN-Partners." + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2429,6 +2521,9 @@ msgstr "PID" msgid "PIN" msgstr "PIN" +msgid "PIN code rejected" +msgstr "PIN-Code abgelehnt" + msgid "PMK R1 Push" msgstr "" @@ -2457,7 +2552,7 @@ msgid "PSID-bits length" msgstr "PSID-Bitlänge" msgid "PTM/EFM (Packet Transfer Mode)" -msgstr "" +msgstr "PTM/EFM (Paket-Transfer-Modus)" msgid "Package libiwinfo required!" msgstr "Benötige das libiwinfo Paket!" @@ -2490,7 +2585,7 @@ msgid "Password successfully changed!" msgstr "Passwort erfolgreich geändert!" msgid "Password2" -msgstr "" +msgstr "Passwort Bestätigung" msgid "Path to CA-Certificate" msgstr "Pfad zum CA-Zertifikat" @@ -2516,6 +2611,9 @@ msgstr "Spitze:" msgid "Peer IP address to assign" msgstr "Entfernte IP-Adresse" +msgid "Peer address is missing" +msgstr "Entfernte IP-Adresse fehlt" + msgid "Peers" msgstr "Verbindungspartner" @@ -2586,9 +2684,6 @@ msgstr "Verhindert das Binden an diese Schnittstellen" msgid "Prevents client-to-client communication" msgstr "Unterbindet Client-Client-Verkehr" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "Prism2/2.5/3 802.11b W-LAN Adapter" - msgid "Private Key" msgstr "Privater Schlüssel" @@ -2639,6 +2734,11 @@ msgstr "" msgid "Quality" msgstr "Qualität" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "R0-Schlüsselgültigkeit" @@ -2646,7 +2746,7 @@ msgid "R1 Key Holder" msgstr "R1-Schlüsselinhaber" msgid "RFC3947 NAT-T mode" -msgstr "" +msgstr "RFC3947 \"NAT-T\"-Modus" msgid "RTS/CTS Threshold" msgstr "RTS/CTS-Schwelle" @@ -2658,9 +2758,6 @@ msgstr "RX" msgid "RX Rate" msgstr "RX-Rate" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "RaLink 802.11%s W-LAN Adapter" - msgid "Radius-Accounting-Port" msgstr "Radius-Accounting-Port" @@ -2679,22 +2776,26 @@ msgstr "Radius-Authentication-Secret" msgid "Radius-Authentication-Server" msgstr "Radius-Authentication-Server" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" +"Hexadezimal-kodierte Zeichensequenz. Nur angeben wenn der Internetanbieter " +"einen bestimmten Wert erwartet." + msgid "" "Read /etc/ethers to configure the DHCP-Server" msgstr "Lese Informationen aus /etc/ethers um den DHCP-Server zu konfigurieren" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" -"Diese Schnittstelle wirklich löschen? Der Schritt kann nicht rückgängig " -"gemacht werden!\n" -"Der Zugriff auf das Gerät könnte verlorengehen wenn Sie über diese " -"Schnittstelle verbunden sind." +"Diese Schnittstelle wirklich löschen? Das Löschen kann nicht rückgängig " +"gemacht werden! Der Kontakt zum Gerät könnte verloren gehen wenn die " +"Verbidung über diese Schnittstelle erfolgt." msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" "Dieses Drahtlosnetzwerk wirklich löschen? Der Schritt kann nicht rückgängig " @@ -2705,23 +2806,6 @@ msgstr "" msgid "Really reset all changes?" msgstr "Sollen wirklich alle Änderungen verworfen werden?" -#, fuzzy -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" -"Das Netzwerk wirklich herunterfahren?\n" -"Der Zugriff auf das Gerät könnte verlorengehen wenn Sie über diese " -"Schnittstelle verbunden sind." - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" -"Die Schnitstelle \"%s\" wirklich herunterfahren?\n" -"Der Zugriff auf das Gerät könnte verlorengehen wenn Sie über diese " -"Schnittstelle verbunden sind." - msgid "Really switch protocol?" msgstr "Protokoll wirklich wechseln?" @@ -2767,9 +2851,6 @@ msgstr "Empfohlen. IP-Adresse der WireGuard-Schnittstelle." msgid "Reconnect this interface" msgstr "Diese Schnittstelle neu verbinden" -msgid "Reconnecting interface" -msgstr "Verbinde Schnittstelle neu" - msgid "References" msgstr "Verweise" @@ -2809,9 +2890,6 @@ msgstr "IPv6-Adresse anfordern" msgid "Request IPv6-prefix of length" msgstr "IPv6-Präfix dieser Länge anfordern" -msgid "Require TLS" -msgstr "TLS erfordern" - msgid "Required" msgstr "Benötigt" @@ -2870,6 +2948,12 @@ msgstr "Neustarten" msgid "Restart Firewall" msgstr "Firewall neu starten" +msgid "Restart radio interface" +msgstr "W-LAN-Gerät neu starten" + +msgid "Restore" +msgstr "Wiederherstellen" + msgid "Restore backup" msgstr "Sicherung wiederherstellen" @@ -2879,6 +2963,15 @@ msgstr "Passwort zeigen/verstecken" msgid "Revert" msgstr "Verwerfen" +msgid "Revert changes" +msgstr "Änderungen verwerfen" + +msgid "Revert request failed with status %h" +msgstr "Anforderung zum Verwerfen mit Status %h fehlgeschlagen" + +msgid "Reverting configuration…" +msgstr "Verwerfe Konfigurationsänderungen..." + msgid "Root" msgstr "Root" @@ -2894,9 +2987,6 @@ msgstr "Erlaubte IP-Addressen routen" msgid "Route type" msgstr "Routen-Typ" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "Geroutetes IPv6-Präfix für nachgelagerte Schnittstellen" - msgid "Router Advertisement-Service" msgstr "Router-Advertisement-Dienst" @@ -2922,14 +3012,6 @@ msgstr "Dateisystemprüfung durchführen" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2957,12 +3039,12 @@ msgstr "Speichern" msgid "Save & Apply" msgstr "Speichern & Anwenden" -msgid "Save & Apply" -msgstr "Speichern & Anwenden" - msgid "Scan" msgstr "Scan" +msgid "Scan request failed" +msgstr "" + msgid "Scheduled Tasks" msgstr "Geplante Aufgaben" @@ -2988,19 +3070,6 @@ msgstr "Clients isolieren" msgid "Server Settings" msgstr "Servereinstellungen" -msgid "Server password" -msgstr "Server Passwort" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" -"Server Passwort bzw. das tunnelspezifische Passwort wenn der Benutzername " -"eine Tunnel-ID beinhaltet." - -msgid "Server username" -msgstr "Server Benutzername" - msgid "Service Name" msgstr "Service-Name" @@ -3022,6 +3091,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "Zeitsynchronisierung einrichten" +msgid "Setting PLMN failed" +msgstr "Setzen der PLMN fehlgeschlagen" + +msgid "Setting operation mode failed" +msgstr "Setzen des Betriebsmodus fehlgeschlagen" + msgid "Setup DHCP Server" msgstr "DHCP Server einrichten" @@ -3031,15 +3106,15 @@ msgstr "schwerwiegende Fehlersekunden (SES)" msgid "Short GI" msgstr "kurzes Guardintervall" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "Zeige aktuelle Liste der gesicherten Dateien" msgid "Shutdown this interface" msgstr "Diese Schnittstelle herunterfahren" -msgid "Shutdown this network" -msgstr "Dieses Netzwerk herunterfahren" - msgid "Signal" msgstr "Signal" @@ -3056,7 +3131,7 @@ msgid "Size (.ipk)" msgstr "Größe (.ipk)" msgid "Size of DNS query cache" -msgstr "" +msgstr "Größe des DNS-Caches" msgid "Skip" msgstr "Überspringen" @@ -3074,7 +3149,7 @@ msgid "Software" msgstr "Paketverwaltung" msgid "Software VLAN" -msgstr "" +msgstr "Software-VLAN" msgid "Some fields are invalid, cannot save values!" msgstr "Einige Felder sind ungültig, kann das Formular nicht speichern!" @@ -3095,15 +3170,9 @@ msgstr "" "geflasht werden. Weitere Informationen sowie gerätespezifische " "Installationsanleitungen entnehmen Sie bitte dem Wiki." -msgid "Sort" -msgstr "Sortieren" - msgid "Source" msgstr "Quelle" -msgid "Source routing" -msgstr "Quell-Routing" - msgid "Specifies the directory the device is attached to" msgstr "Nennt das Verzeichnis, an welches das Gerät angebunden ist" @@ -3150,6 +3219,12 @@ msgstr "Start" msgid "Start priority" msgstr "Startpriorität" +msgid "Starting configuration apply…" +msgstr "Starte Anwendung der Konfigurationsänderungen..." + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "Systemstart" @@ -3198,7 +3273,7 @@ msgstr "" "Logeinträge für erfolgreiche Operationen dieser Protokolle unterdrücken" msgid "Swap" -msgstr "" +msgstr "Auslagerungsspeicher" msgid "Swap Entry" msgstr "Auslagerungsdatei" @@ -3219,10 +3294,10 @@ msgstr "" "unpassend sein." msgid "Switch Port Mask" -msgstr "" +msgstr "Switch-Port-Maske" msgid "Switch VLAN" -msgstr "" +msgstr "Switch-VLAN" msgid "Switch protocol" msgstr "Wechsle Protokoll" @@ -3319,11 +3394,32 @@ msgstr "" "Erlaubte Buchstaben sind: A-Z, a-z, 0-9 and _" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "Das Backup-Archiv scheint keine valide GZip-Datei zu sein." + msgid "The configuration file could not be loaded due to the following error:" msgstr "" "Die Konfigurationsdatei konnte aufgrund der folgenden Fehler nicht geladen " "werden:" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" +"Das Gerät konnte nach dem Anwenden der ausstehenden Änderungen innerhalb von " +"%d Sekunden nicht mehr erreicht werden, daher wurde die Änderungen aus " +"Sicherheitsgründen zurückgerollt. Wenn Sie der Meinung sind, dass die " +"Änderungen trotzdem korrekt sind, wenden sie die Änderungen ungeprüft an. " +"Alternativ können Sie diese Meldung schließen und die Konfiguration weiter " +"bearbeiten bevor Sie das Anwenden neu versuchen oder alle austehenden " +"Änderungen verwerfen um den aktuell funktionierenden Konfigurationsstand " +"beizubehalten." + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3345,9 +3441,6 @@ msgstr "" "Integrität sicherzustellen.
Klicken Sie \"Fortfahren\" um die Flash-" "Prozedur zu starten." -msgid "The following changes have been committed" -msgstr "Die folgenden Änderungen wurden angewendet" - msgid "The following changes have been reverted" msgstr "Die folgenden Änderungen wurden verworfen" @@ -3421,13 +3514,6 @@ msgstr "" "Konfiguration ist es notwendig, dass Sie auf Ihrem Computer eine neue IP-" "Adresse beziehen müssen um auf das Gerät zugreifen zu können." -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" -"Der lokale Tunnel-Endpunkt ist hinter einem NAT. Standard ist deaktiviert, " -"nur auf AYIYA anwendbar." - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3438,8 +3524,8 @@ msgstr "" msgid "There are no active leases." msgstr "Es gibt z.Z. keine aktiven Leases." -msgid "There are no pending changes to apply!" -msgstr "Es gibt keine ausstehenen Änderungen anzuwenden!" +msgid "There are no changes to apply." +msgstr "Es gibt keine ausstehenden Änderungen anzuwenden." msgid "There are no pending changes to revert!" msgstr "Es gibt keine ausstehenen Änderungen zurückzusetzen!" @@ -3552,10 +3638,13 @@ msgstr "Zeitzone" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" "Zum Wiederherstellen der Konfiguration kann hier ein bereits vorhandenes " -"Backup-Archiv hochgeladen werden." +"Backup-Archiv hochgeladen werden. \"Konfiguration zurücksetzen\" stellt den " +"Auslieferungszustand des Systems wieder her (nur möglich bei squashfs-" +"Images)." msgid "Tone" msgstr "Ton" @@ -3600,15 +3689,6 @@ msgstr "Tunnelschnittstelle" msgid "Tunnel Link" msgstr "Basisschnittstelle" -msgid "Tunnel broker protocol" -msgstr "Tunnel-Boker-Protokoll" - -msgid "Tunnel setup server" -msgstr "Tunnel-Setup-Server" - -msgid "Tunnel type" -msgstr "Tunneltyp" - msgid "Tx-Power" msgstr "Sendestärke" @@ -3633,9 +3713,27 @@ msgstr "USB Anschlüsse" msgid "UUID" msgstr "UUID" +msgid "Unable to determine device name" +msgstr "Gerätename konnte nicht bestimmt werden" + +msgid "Unable to determine external IP address" +msgstr "Externe IP-Adresse konnte nicht bestimmt werden" + +msgid "Unable to determine upstream interface" +msgstr "Externe Netzwerkschnittstelle konnte nicht bestimmt werden" + msgid "Unable to dispatch" msgstr "Kann Anfrage nicht zustellen" +msgid "Unable to obtain client ID" +msgstr "Client-ID konnte nicht bezogen werden" + +msgid "Unable to resolve AFTR host name" +msgstr "Der AFTR-Hostname konnte nicht aufgelöst werden" + +msgid "Unable to resolve peer host name" +msgstr "Der Name des entfernten Hosts konnte nicht aufgelöst werden" + msgid "Unavailable Seconds (UAS)" msgstr "Nicht verfügbare Sekunden (UAS)" @@ -3645,6 +3743,9 @@ msgstr "Unbekannt" msgid "Unknown Error, password not changed!" msgstr "Unbekannter Fehler, Passwort nicht geändert!" +msgid "Unknown error (%s)" +msgstr "Protokollfehler: %s" + msgid "Unmanaged" msgstr "Ignoriert" @@ -3654,9 +3755,18 @@ msgstr "Aushängen" msgid "Unsaved Changes" msgstr "Ungespeicherte Änderungen" +msgid "Unsupported MAP type" +msgstr "Nicht unterstützter MAP-Typ" + +msgid "Unsupported modem" +msgstr "Nicht unterstütztes Modem" + msgid "Unsupported protocol type." msgstr "Nicht unterstützter Protokolltyp." +msgid "Up" +msgstr "Hoch" + msgid "Update lists" msgstr "Listen aktualisieren" @@ -3782,7 +3892,7 @@ msgid "VPN Server's certificate SHA1 hash" msgstr "SHA1-Hash des VPN-Server-Zertifikates" msgid "VPNC (CISCO 3000 (and others) VPN)" -msgstr "" +msgstr "VPNC (VPN für CISCO 3000 und Ähnliche)" msgid "Vendor" msgstr "Hersteller" @@ -3790,18 +3900,15 @@ msgstr "Hersteller" msgid "Vendor Class to send when requesting DHCP" msgstr "Bei DHCP-Anfragen gesendete Vendor-Klasse" -msgid "Verbose" -msgstr "Umfangreiche Ausgaben" - -msgid "Verbose logging by aiccu daemon" -msgstr "Aktiviert erweiterte Protokollierung durch den AICCU-Prozess" - msgid "Verify" msgstr "Verifizieren" msgid "Version" msgstr "Version" +msgid "Virtual dynamic interface" +msgstr "Virtuelle dynamisches Schnittstelle" + msgid "WDS" msgstr "WDS" @@ -3827,18 +3934,15 @@ msgstr "" "WPA-Verschlüsselung benötigt wpa_supplicant (für Client-Modus) oder hostapd " "(für AP oder Ad-Hoc Modus)." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" -"Warte die angegebene Anzahl an Sekunden auf NTP-Synchronisierung, der Wert 0 " -"deaktiviert das Warten (optional)" - msgid "Waiting for changes to be applied..." msgstr "Änderungen werden angewandt..." msgid "Waiting for command to complete..." msgstr "Der Befehl wird ausgeführt..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "Warte auf das Anwenden der Konfigurationsänderungen... %d Sekunden" + msgid "Waiting for device..." msgstr "Warte auf Gerät..." @@ -3857,13 +3961,6 @@ msgstr "" "Wenn PSK in Verwendung ist, können PMK-Schlüssel lokal ohne Inter-Access-" "Point-Kommunikation erzeugt werden." -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" -"Gibt an, ob eine IPv6-Default-Route durch den Tunnel etabliert werden soll" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "Gibt an, ob nur Pakete von delegierten Präfixen geroutet werden sollen" - msgid "Width" msgstr "Breite" @@ -3885,8 +3982,11 @@ msgstr "Drahtlosübersicht" msgid "Wireless Security" msgstr "WLAN-Verschlüsselung" -msgid "Wireless is disabled or not associated" -msgstr "WLAN ist deaktiviert oder nicht assoziiert" +msgid "Wireless is disabled" +msgstr "W-LAN ist deaktiviert" + +msgid "Wireless is not associated" +msgstr "W-LAN ist nicht assoziiert" msgid "Wireless is restarting..." msgstr "WLAN startet neu..." @@ -3897,12 +3997,6 @@ msgstr "Das WLAN-Netzwerk ist deaktiviert" msgid "Wireless network is enabled" msgstr "Das WLAN-Netzwerk ist aktiviert" -msgid "Wireless restarted" -msgstr "WLAN neu gestartet" - -msgid "Wireless shut down" -msgstr "WLAN heruntergefahren" - msgid "Write received DNS requests to syslog" msgstr "Empfangene DNS-Anfragen in das Systemprotokoll schreiben" @@ -3943,6 +4037,9 @@ msgstr "baseT" msgid "bridged" msgstr "bridged" +msgid "create" +msgstr "erzeugen" + msgid "create:" msgstr "erstelle:" @@ -3978,9 +4075,6 @@ msgstr "Voll-Duplex" msgid "half-duplex" msgstr "Halb-Duplex" -msgid "help" -msgstr "Hilfe" - msgid "hidden" msgstr "versteckt" @@ -4005,12 +4099,12 @@ msgstr "kbit/s" msgid "local DNS file" msgstr "Lokale DNS-Datei" -msgid "minimum 1280, maximum 1480" -msgstr "Minimum 1280, Maximum 1480" - msgid "minutes" msgstr "Minuten" +msgid "mixed WPA/WPA2" +msgstr "" + msgid "no" msgstr "nein" @@ -4032,11 +4126,14 @@ msgstr "ein" msgid "open" msgstr "offen" +msgid "output" +msgstr "ausgehend" + msgid "overlay" msgstr "Overlay" msgid "random" -msgstr "" +msgstr "zufällig" msgid "relay mode" msgstr "Relay-Modus" @@ -4082,108 +4179,96 @@ msgstr "ja" msgid "« Back" msgstr "« Zurück" +<<<<<<< HEAD +======= -#~ msgid "Action" -#~ msgstr "Aktion" +#~ msgid "%s - %s" +#~ msgstr "%s - %s" -#~ msgid "Buttons" -#~ msgstr "Knöpfe" +#~ msgid "Activate this network" +#~ msgstr "Dieses Netzwerk aktivieren" -#~ msgid "Handler" -#~ msgstr "Handler" +#~ msgid "Hermes 802.11b Wireless Controller" +#~ msgstr "Hermes 802.11b W-LAN Adapter" -#~ msgid "Maximum hold time" -#~ msgstr "Maximalzeit zum Halten der Verbindung" +#~ msgid "Interface is shutting down..." +#~ msgstr "Schnittstelle fährt herunter..." -#~ msgid "Minimum hold time" -#~ msgstr "Minimalzeit zum Halten der Verbindung" +#~ msgid "Interface reconnected" +#~ msgstr "Schnittstelle neu verbunden" -#~ msgid "Path to executable which handles the button event" -#~ msgstr "Ausführbare Datei welche das Schalter-Ereignis verarbeitet" +#~ msgid "Interface shut down" +#~ msgstr "Schnittstelle heruntergefahren" -#~ msgid "Specifies the button state to handle" -#~ msgstr "Gibt den zu behandelnden Tastenstatus an" +#~ msgid "Prism2/2.5/3 802.11b Wireless Controller" +#~ msgstr "Prism2/2.5/3 802.11b W-LAN Adapter" -#~ msgid "This page allows the configuration of custom button actions" +#~ msgid "RaLink 802.11%s Wireless Controller" +#~ msgstr "RaLink 802.11%s W-LAN Adapter" + +#~ msgid "" +#~ "Really shut down network? You might lose access to this device if you are " +#~ "connected via this interface" #~ msgstr "" -#~ "Diese Seite ermöglicht die Konfiguration benutzerdefinierter " -#~ "Tastenaktionen" +#~ "Dieses Netzwerk wirklich herunterfahren? Der Kontakt zum Gerät könnte " +#~ "verloren gehen wenn die Verbindung über dieses Netzwerk erfolgt." -#~ msgid "Leasetime" -#~ msgstr "Laufzeit" - -#~ msgid "Optional." -#~ msgstr "Optional" - -#~ msgid "AuthGroup" -#~ msgstr "Berechtigungsgruppe" - -#~ msgid "automatic" -#~ msgstr "automatisch" - -#~ msgid "AR Support" -#~ msgstr "AR-Unterstützung" - -#~ msgid "Atheros 802.11%s Wireless Controller" -#~ msgstr "Atheros 802.11%s W-LAN Adapter" - -#~ msgid "Background Scan" -#~ msgstr "Hintergrundscan" - -#~ msgid "Compression" -#~ msgstr "Kompression" - -#~ msgid "Disable HW-Beacon timer" -#~ msgstr "Deaktiviere Hardware-Beacon Zeitgeber" - -#~ msgid "Do not send probe responses" -#~ msgstr "Scan-Anforderungen nicht beantworten" - -#~ msgid "Fast Frames" -#~ msgstr "Schnelle Frames" - -#~ msgid "Maximum Rate" -#~ msgstr "Höchstübertragungsrate" - -#~ msgid "Minimum Rate" -#~ msgstr "Mindestübertragungsrate" - -#~ msgid "Multicast Rate" -#~ msgstr "Multicastrate" - -#~ msgid "Outdoor Channels" -#~ msgstr "Funkkanal für den Ausseneinsatz" - -#~ msgid "Regulatory Domain" -#~ msgstr "Geltungsbereich (Regulatory Domain)" - -#~ msgid "Separate WDS" -#~ msgstr "Separates WDS" - -#~ msgid "Static WDS" -#~ msgstr "Statisches WDS" - -#~ msgid "Turbo Mode" -#~ msgstr "Turbo Modus" - -#~ msgid "XR Support" -#~ msgstr "XR-Unterstützung" - -#~ msgid "An additional network will be created if you leave this unchecked." +#~ msgid "" +#~ "Really shutdown interface \"%s\"? You might lose access to this device if " +#~ "you are connected via this interface." #~ msgstr "" -#~ "Erzeugt ein zusätzliches Netzwerk wenn diese Option nicht ausgewählt ist" +#~ "Die Schnitstelle \"%s\" wirklich herunterfahren?\n" +#~ "Der Zugriff auf das Gerät könnte verlorengehen wenn Sie über diese " +#~ "Schnittstelle verbunden sind." -#~ msgid "Join Network: Settings" -#~ msgstr "Netzwerk beitreten: Einstellungen" +#~ msgid "Reconnecting interface" +#~ msgstr "Verbinde Schnittstelle neu" -#~ msgid "CPU" -#~ msgstr "Prozessor" +#~ msgid "Shutdown this network" +#~ msgstr "Dieses Netzwerk herunterfahren" -#~ msgid "Port %d" -#~ msgstr "Port %d" +#~ msgid "Wireless is disabled or not associated" +#~ msgstr "WLAN ist deaktiviert oder nicht assoziiert" -#~ msgid "Port %d is untagged in multiple VLANs!" -#~ msgstr "Port %d ist untagged in mehreren VLANs!" +#~ msgid "Wireless restarted" +#~ msgstr "WLAN neu gestartet" -#~ msgid "VLAN Interface" -#~ msgstr "VLAN Schnittstelle" +#~ msgid "Wireless shut down" +#~ msgstr "WLAN heruntergefahren" + +#~ msgid "DHCP Leases" +#~ msgstr "DHCP-Leases" + +#~ msgid "DHCPv6 Leases" +#~ msgstr "DHCPv6-Leases" + +#~ msgid "" +#~ "Really delete this interface? The deletion cannot be undone! You might " +#~ "lose access to this device if you are connected via this interface." +#~ msgstr "" +#~ "Diese Schnittstelle wirklich löschen? Der Schritt kann nicht rückgängig " +#~ "gemacht werden!\n" +#~ "Der Zugriff auf das Gerät könnte verlorengehen wenn Sie über diese " +#~ "Schnittstelle verbunden sind." + +#, fuzzy +#~ msgid "" +#~ "Really shut down network? You might lose access to this device if you are " +#~ "connected via this interface." +#~ msgstr "" +#~ "Das Netzwerk wirklich herunterfahren?\n" +#~ "Der Zugriff auf das Gerät könnte verlorengehen wenn Sie über diese " +#~ "Schnittstelle verbunden sind." + +#~ msgid "Sort" +#~ msgstr "Sortieren" + +#~ msgid "help" +#~ msgstr "Hilfe" + +#~ msgid "IPv4 WAN Status" +#~ msgstr "IPv4 WAN Status" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "IPv6 WAN Status" +>>>>>>> 86660f92d... i18n: sync translations diff --git a/luci-base/po/el/base.po b/luci-base/po/el/base.po index f746db32a..cb5706930 100644 --- a/luci-base/po/el/base.po +++ b/luci-base/po/el/base.po @@ -49,6 +49,9 @@ msgstr "" msgid "-- match by uuid --" msgstr "" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "Φορτίο 1 λεπτού:" @@ -155,9 +158,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "Μεγ. πλήθος ταυτόχρονων ερωτηματων" -msgid "%s - %s" -msgstr "" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -172,9 +172,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -211,9 +208,6 @@ msgstr "Αριθμός συσκευής ATM" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Συγκεντρωτής Πρόσβασης " @@ -223,9 +217,6 @@ msgstr "Σημείο Πρόσβασης" msgid "Actions" msgstr "Ενέργειες" -msgid "Activate this network" -msgstr "Ενεργοποίηση αυτού του δικτύου" - msgid "Active IPv4-Routes" msgstr "" "Ενεργές Διαδρομές IPv4" @@ -280,6 +271,15 @@ msgstr "" msgid "Alert" msgstr "Ειδοποίηση" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -293,6 +293,9 @@ msgstr "" "Επιτρέπει την εξουσιοδότηση SSH με " "κωδικό πρόσβασης" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "Να επιτρέπονται όλες, εκτός από αυτές στη λίστα" @@ -326,12 +329,12 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -409,11 +412,14 @@ msgstr "" msgid "Any zone" msgstr "Οιαδήποτε ζώνη" -msgid "Apply" -msgstr "Εφαρμογή" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" -msgstr "Εφαρμογή αλλαγών" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -429,6 +435,9 @@ msgstr "" msgid "Associated Stations" msgstr "Συνδεδεμένοι Σταθμοί" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -504,12 +513,12 @@ msgstr "Πίσω προς επισκόπηση" msgid "Back to scan results" msgstr "Πίσω στα αποτελέσματα σάρωσης" +msgid "Backup" +msgstr "Αποθήκευση" + msgid "Backup / Flash Firmware" msgstr "Αντίγραφο ασφαλείας / Εγγραφή FLASH Υλικολογισμικό" -msgid "Backup / Restore" -msgstr "Αποθήκευση / Επαναφορά Αντίγραφου Ασφαλείας" - msgid "Backup file list" msgstr "Λίστα αρχείων για αντίγραφο ασφαλείας" @@ -520,7 +529,7 @@ msgstr "Μη έγκυρη διεύθυνση!" msgid "Band" msgstr "" -msgid "Behind NAT" +msgid "Beacon Interval" msgstr "" msgid "" @@ -580,6 +589,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "Χρήση CPU (%)" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "Ακύρωση" @@ -595,12 +607,20 @@ msgstr "Αλλαγές" msgid "Changes applied." msgstr "Αλλαγές εφαρμόστηκαν." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Αλλάζει τον κωδικό διαχειριστή για πρόσβαση στη συσκευή" msgid "Channel" msgstr "Κανάλι" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Έλεγχος" @@ -637,13 +657,10 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" "Κλικ στο \"Δημιουργία αρχείου\" για να κατεβάσετε ένα tar αρχείο με τα " -"τρέχοντα αρχεία παραμετροποίησης. Για να επαναφέρετε το υλικολογισμικό στην " -"αρχική του κατάσταση, κάντε κλικ στο \"Εκτέλεσε επαναφορά\" (δυνατό μόνο σε " -"squashfs εικόνες)." +"τρέχοντα αρχεία παραμετροποίησης." msgid "Client" msgstr "Πελάτης" @@ -681,12 +698,18 @@ msgstr "" msgid "Configuration" msgstr "Παραμετροποίηση" -msgid "Configuration applied." -msgstr "Η Παραμετροποίηση εφαρμόστηκε." +msgid "Configuration failed" +msgstr "" msgid "Configuration files will be kept." msgstr "Τα αρχεία παραμετροποίησης θα διατηρηθούν." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Επιβεβαίωση" @@ -699,12 +722,18 @@ msgstr "Συνδεδεμένος" msgid "Connection Limit" msgstr "Όριο Συνδέσεων" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "Συνδέσεις" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Χώρα" @@ -758,9 +787,6 @@ msgstr "" "Ρυθμίζει, αν είναι δυνατόν, την συμπεριφορά των LED της συσκευής." -msgid "DHCP Leases" -msgstr "DHCP Leases" - msgid "DHCP Server" msgstr "Εξυπηρετητής DHCP" @@ -773,9 +799,6 @@ msgstr "Πελάτης DHCP" msgid "DHCP-Options" msgstr "Επιλογές DHCP" -msgid "DHCPv6 Leases" -msgstr "" - msgid "DHCPv6 client" msgstr "" @@ -815,6 +838,9 @@ msgstr "" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "" @@ -833,9 +859,6 @@ msgstr "Προεπιλεγμένη πύλη" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Προεπιλεγμένη κατάσταση" @@ -856,6 +879,9 @@ msgstr "Διαγραφή" msgid "Delete this network" msgstr "Διαγραφή αυτού του δικτύου" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "Περιγραφή" @@ -874,7 +900,10 @@ msgstr "Παραμετροποίηση Συσκευής" msgid "Device is rebooting..." msgstr "" -msgid "Device unreachable" +msgid "Device unreachable!" +msgstr "" + +msgid "Device unreachable! Still waiting for device..." msgstr "" msgid "Diagnostics" @@ -902,15 +931,27 @@ msgstr "Απενεργοποίηση ρυθμίσεων DNS" msgid "Disable Encryption" msgstr "" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "Απενεργοποιημένο" msgid "Disabled (default)" msgstr "" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "Αγνόησε τις απαντήσεις ανοδικής ροής RFC1918" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Εμφάνιση μόνο πακέτων που περιέχουν" @@ -966,6 +1007,9 @@ msgstr "" "Να μην προωθούνται ερωτήματα DNS " "χωρίς όνομα τομέα DNS" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "Κατέβασμα και εγκατάσταση πακέτου" @@ -1082,6 +1126,9 @@ msgstr "" msgid "Enable this mount" msgstr "Ενεργοποίηση αυτής της προσάρτησης" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "Ενεργοποίηση αυτής της swap" @@ -1114,6 +1161,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "Διαγράφεται..." @@ -1175,6 +1228,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Αρχείο" @@ -1193,6 +1249,9 @@ msgstr "Φιλτράρισμα ιδιωτικών" msgid "Filter useless" msgstr "Φιλτράρισμα άχρηστων" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1246,6 +1305,9 @@ msgstr "Φλασάρεται..." msgid "Force" msgstr "Επιβολή" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "Επιβολή CCMP (AES)" @@ -1297,7 +1359,7 @@ msgstr "Ελεύθερος χώρος" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1309,6 +1371,9 @@ msgstr "" msgid "Gateway" msgstr "Πύλη" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "Θύρες πύλης" @@ -1369,9 +1434,6 @@ msgstr "Κρέμασμα" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1384,9 +1446,6 @@ msgid "" "authentication." msgstr "" -msgid "Hermes 802.11b Wireless Controller" -msgstr "" - msgid "Hide ESSID" msgstr "Κρυφό ESSID" @@ -1403,6 +1462,9 @@ msgid "Host-IP or Network" msgstr "" "IP Υπολογιστή ή Δικτύου" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "Όνομα Υπολογιστή" @@ -1424,13 +1486,19 @@ msgstr "" msgid "IP address" msgstr "Διεύθυνση IP" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "IPv4" msgid "IPv4 Firewall" msgstr "IPv4 Τείχος Προστασίας" -msgid "IPv4 WAN Status" +msgid "IPv4 Upstream" msgstr "" msgid "IPv4 address" @@ -1481,15 +1549,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "Κατάσταση IPv6 WAN" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "Διεύθυνση IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1600,6 +1665,9 @@ msgstr "" msgid "Info" msgstr "Πληροφορίες" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "Σενάριο εκκίνησης" @@ -1636,21 +1704,12 @@ msgstr "Επισκόπηση Διεπαφής" msgid "Interface is reconnecting..." msgstr "Η διεπαφή επανασυνδέεται..." -msgid "Interface is shutting down..." -msgstr "Η διεπαφή απενεργοποιείται..." - msgid "Interface name" msgstr "" msgid "Interface not present or not connected yet." msgstr "Η διεπαφή δεν υπάρχει ή δεν έχει συνδεθεί ακόμη." -msgid "Interface reconnected" -msgstr "Η διεπαφή επανασυνδέθηκε" - -msgid "Interface shut down" -msgstr "Η διεπαφή απενεργοποιήθηκε" - msgid "Interfaces" msgstr "Διεπαφές" @@ -1839,6 +1898,9 @@ msgstr "Μέσος όρος φόρτου" msgid "Loading" msgstr "Φόρτωση" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1903,6 +1965,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "" +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "MAC-Διεύθυνση" @@ -1918,6 +1983,9 @@ msgstr "Λίστα MAC" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "" @@ -1998,6 +2066,9 @@ msgstr "" msgid "Modem device" msgstr "Συσκευή Modem" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "" @@ -2072,9 +2143,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Όνομα" @@ -2099,6 +2167,9 @@ msgstr "Εργαλεία Δικτύου" msgid "Network boot image" msgstr "" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "" @@ -2120,6 +2191,9 @@ msgstr "Δε βρέθηκαν αρχεία" msgid "No information available" msgstr "Δεν υπάρχουν πληροφορίες διαθέσιμες" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "" @@ -2138,6 +2212,9 @@ msgstr "Δεν έχει οριστεί κωδικός πρόσβασης!" msgid "No rules in this chain" msgstr "Δεν υπάρχει κανόνας σε αυτή την αλυσίδα" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "Δεν έχει ανατεθεί ζώνη" @@ -2198,6 +2275,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2249,12 +2329,6 @@ msgstr "Η επιλογή αφαιρέθηκε" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2275,6 +2349,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2353,6 +2430,9 @@ msgstr "PID" msgid "PIN" msgstr "PIN" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2440,6 +2520,9 @@ msgstr "" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2509,9 +2592,6 @@ msgstr "" msgid "Prevents client-to-client communication" msgstr "Αποτρέπει την επικοινωνία μεταξύ πελατών" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "" - msgid "Private Key" msgstr "" @@ -2560,6 +2640,11 @@ msgstr "" msgid "Quality" msgstr "" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2578,9 +2663,6 @@ msgstr "RX" msgid "RX Rate" msgstr "" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "" - msgid "Radius-Accounting-Port" msgstr "" @@ -2599,6 +2681,9 @@ msgstr "" msgid "Radius-Authentication-Server" msgstr "" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" @@ -2607,28 +2692,18 @@ msgstr "" "εξυπηρετητή DHCP" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" msgid "Really reset all changes?" msgstr "Αρχικοποίηση όλων των αλλαγών;" -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" - msgid "Really switch protocol?" msgstr "Αλλαγή πρωτοκόλλου;" @@ -2674,9 +2749,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "Επανασύνδεση της διεπαφής" -msgid "Reconnecting interface" -msgstr "Επανασύνδεση της διεπαφής" - msgid "References" msgstr "Αναφορές" @@ -2716,9 +2788,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2768,6 +2837,12 @@ msgstr "Επανεκκίνηση" msgid "Restart Firewall" msgstr "Επανεκκίνηση Τείχους Προστασίας" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "Επαναφορά Αντίγραφου Ασφαλείας" + msgid "Restore backup" msgstr "Επαναφορά αντιγράφου ασφαλείας" @@ -2777,6 +2852,15 @@ msgstr "" msgid "Revert" msgstr "Αναίρεση" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Root" @@ -2792,9 +2876,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2821,14 +2902,6 @@ msgstr "Εκτέλεση ελέγχου συστήματος αρχείων" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2856,12 +2929,12 @@ msgstr "Αποθήκευση" msgid "Save & Apply" msgstr "Αποθήκευση & Εφαρμογή" -msgid "Save & Apply" -msgstr "Αποθήκευση & Εφαρμογή" - msgid "Scan" msgstr "Σάρωση" +msgid "Scan request failed" +msgstr "" + msgid "Scheduled Tasks" msgstr "Προγραμματισμένες Εργασίες" @@ -2886,17 +2959,6 @@ msgstr "Απομόνωση Πελατών" msgid "Server Settings" msgstr "Ρυθμίσεις Εξυπηρετητή" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Όνομα Υπηρεσίας" @@ -2914,6 +2976,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "Ρύθμιση Εξυπηρετητή DHCP" @@ -2923,15 +2991,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "" msgid "Shutdown this interface" msgstr "Απενεργοποίηση αυτής της διεπαφής" -msgid "Shutdown this network" -msgstr "Απενεργοποίηση αυτού του δικτύου" - msgid "Signal" msgstr "Σήμα" @@ -2983,15 +3051,9 @@ msgid "" "instructions." msgstr "" -msgid "Sort" -msgstr "Ταξινόμηση" - msgid "Source" msgstr "Πηγή" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -3032,6 +3094,12 @@ msgstr "Αρχή" msgid "Start priority" msgstr "Προτεραιότητα εκκίνησης" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "Εκκίνηση" @@ -3180,9 +3248,22 @@ msgstr "" "Οι επιτρεπόμενοι χαρακτήρες είναι: A-Z, a-z, " "0-9 και _" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3205,9 +3286,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "Οι παρακάτω αλλαγές έχουν υποβληθεί" - msgid "The following changes have been reverted" msgstr "Οι παρακάτω αλλαγές έχουν αναιρεθεί" @@ -3265,11 +3343,6 @@ msgstr "" "είναι πιθανό να χρειαστεί να ανανεώσετε την διεύθυνση του υπολογιστή σας για " "να αποκτήσετε ξανά πρόσβαση στη συσκευή." -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3280,7 +3353,7 @@ msgstr "" msgid "There are no active leases." msgstr "Δεν υπάρχουν ενεργά leases." -msgid "There are no pending changes to apply!" +msgid "There are no changes to apply." msgstr "" msgid "There are no pending changes to revert!" @@ -3377,8 +3450,13 @@ msgstr "Ζώνη ώρας" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" +"To restore configuration files, you can upload a previously generated backup " +"archive here. Για να επαναφέρετε το υλικολογισμικό στην αρχική του " +"κατάσταση, κάντε κλικ στο \"Εκτέλεσε επαναφορά\" (δυνατό μόνο σε squashfs " +"εικόνες)." msgid "Tone" msgstr "" @@ -3422,15 +3500,6 @@ msgstr "Διεπαφή Τούνελ" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Ισχύς Εκπομπής" @@ -3455,9 +3524,27 @@ msgstr "" msgid "UUID" msgstr "UUID" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3467,6 +3554,9 @@ msgstr "Άγνωστο" msgid "Unknown Error, password not changed!" msgstr "Άγνωστο Λάθος. ο κωδικός πρόσβασης δεν άλλαξε!" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "" @@ -3476,9 +3566,18 @@ msgstr "" msgid "Unsaved Changes" msgstr "Μη-αποθηκευμένες Αλλαγές" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "" +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "" @@ -3603,18 +3702,15 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" msgid "Version" msgstr "Έκδοση" +msgid "Virtual dynamic interface" +msgstr "" + msgid "WDS" msgstr "WDS" @@ -3638,16 +3734,15 @@ msgid "" "and ad-hoc mode) to be installed." msgstr "" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3662,12 +3757,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3689,8 +3778,11 @@ msgstr "Επισκόπηση Ασύρματου Δικτύου" msgid "Wireless Security" msgstr "Ασφάλεια Ασύρματου Δικτύου" -msgid "Wireless is disabled or not associated" -msgstr "Το ασύρματο δίκτυο είναι απενεργοποιημένο ή μη συνδεδεμένο" +msgid "Wireless is disabled" +msgstr "Το ασύρματο δίκτυο είναι απενεργοποιημένο" + +msgid "Wireless is not associated" +msgstr "Το ασύρματο δίκτυο μη συνδεδεμένο" msgid "Wireless is restarting..." msgstr "Το ασύρματο δίκτυο επανεκκινείται..." @@ -3701,12 +3793,6 @@ msgstr "Το ασύρματο δίκτυο είναι ανενεργό" msgid "Wireless network is enabled" msgstr "Το ασύρματο δίκτυο είναι ενεργό" -msgid "Wireless restarted" -msgstr "Το ασύρματο δίκτυο επανεκκινήθηκε" - -msgid "Wireless shut down" -msgstr "Το ασύρματο δίκτυο τερματίστηκε" - msgid "Write received DNS requests to syslog" msgstr "Καταγραφή των ληφθέντων DNS αιτήσεων στο syslog" @@ -3745,6 +3831,9 @@ msgstr "" msgid "bridged" msgstr "" +msgid "create" +msgstr "" + msgid "create:" msgstr "" @@ -3783,9 +3872,6 @@ msgstr "" msgid "half-duplex" msgstr "" -msgid "help" -msgstr "βοήθεια" - msgid "hidden" msgstr "" @@ -3810,10 +3896,10 @@ msgstr "" msgid "local DNS file" msgstr "τοπικό αρχείο DNS" -msgid "minimum 1280, maximum 1480" +msgid "minutes" msgstr "" -msgid "minutes" +msgid "mixed WPA/WPA2" msgstr "" msgid "no" @@ -3837,6 +3923,9 @@ msgstr "ανοιχτό" msgid "open" msgstr "" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" @@ -3888,6 +3977,57 @@ msgstr "ναι" msgid "« Back" msgstr "« Πίσω" +#~ msgid "Activate this network" +#~ msgstr "Ενεργοποίηση αυτού του δικτύου" + +#~ msgid "Interface is shutting down..." +#~ msgstr "Η διεπαφή απενεργοποιείται..." + +#~ msgid "Interface reconnected" +#~ msgstr "Η διεπαφή επανασυνδέθηκε" + +#~ msgid "Interface shut down" +#~ msgstr "Η διεπαφή απενεργοποιήθηκε" + +#~ msgid "Reconnecting interface" +#~ msgstr "Επανασύνδεση της διεπαφής" + +#~ msgid "Shutdown this network" +#~ msgstr "Απενεργοποίηση αυτού του δικτύου" + +#~ msgid "Wireless restarted" +#~ msgstr "Το ασύρματο δίκτυο επανεκκινήθηκε" + +#~ msgid "Wireless shut down" +#~ msgstr "Το ασύρματο δίκτυο τερματίστηκε" + +#~ msgid "DHCP Leases" +#~ msgstr "DHCP Leases" + +#~ msgid "Sort" +#~ msgstr "Ταξινόμηση" + +#~ msgid "help" +#~ msgstr "βοήθεια" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "Κατάσταση IPv6 WAN" + +#~ msgid "Apply" +#~ msgstr "Εφαρμογή" + +#~ msgid "Applying changes" +#~ msgstr "Εφαρμογή αλλαγών" + +#~ msgid "Configuration applied." +#~ msgstr "Η Παραμετροποίηση εφαρμόστηκε." + +#~ msgid "Save & Apply" +#~ msgstr "Αποθήκευση & Εφαρμογή" + +#~ msgid "The following changes have been committed" +#~ msgstr "Οι παρακάτω αλλαγές έχουν υποβληθεί" + #~ msgid "Action" #~ msgstr "Ενέργεια" diff --git a/luci-base/po/en/base.po b/luci-base/po/en/base.po index 50a7c9281..dc5c22a65 100644 --- a/luci-base/po/en/base.po +++ b/luci-base/po/en/base.po @@ -49,6 +49,9 @@ msgstr "" msgid "-- match by uuid --" msgstr "" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "1 Minute Load:" @@ -155,9 +158,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "Max. concurrent queries" -msgid "%s - %s" -msgstr "" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -172,9 +172,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -211,9 +208,6 @@ msgstr "ATM device number" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Access Concentrator" @@ -223,9 +217,6 @@ msgstr "Access Point" msgid "Actions" msgstr "Actions" -msgid "Activate this network" -msgstr "Activate this network" - msgid "Active IPv4-Routes" msgstr "Active IPv4-Routes" @@ -277,6 +268,15 @@ msgstr "" msgid "Alert" msgstr "Alert" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -288,6 +288,9 @@ msgstr "" msgid "Allow SSH password authentication" msgstr "Allow SSH password authentication" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "Allow all except listed" @@ -317,12 +320,12 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -400,11 +403,14 @@ msgstr "" msgid "Any zone" msgstr "Any zone" -msgid "Apply" -msgstr "Apply" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" -msgstr "Applying changes" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -420,6 +426,9 @@ msgstr "" msgid "Associated Stations" msgstr "Associated Stations" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -495,12 +504,12 @@ msgstr "Back to overview" msgid "Back to scan results" msgstr "Back to scan results" +msgid "Backup" +msgstr "" + msgid "Backup / Flash Firmware" msgstr "Backup / Flash Firmware" -msgid "Backup / Restore" -msgstr "Backup / Restore" - msgid "Backup file list" msgstr "Backup file list" @@ -510,7 +519,7 @@ msgstr "Bad address specified!" msgid "Band" msgstr "" -msgid "Behind NAT" +msgid "Beacon Interval" msgstr "" msgid "" @@ -569,6 +578,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "CPU usage (%)" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "Cancel" @@ -584,12 +596,20 @@ msgstr "Changes" msgid "Changes applied." msgstr "Changes applied." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Changes the administrator password for accessing the device" msgid "Channel" msgstr "Channel" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Check" @@ -626,12 +646,10 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgid "Client" msgstr "Client" @@ -668,12 +686,18 @@ msgstr "" msgid "Configuration" msgstr "Configuration" -msgid "Configuration applied." -msgstr "Configuration applied." +msgid "Configuration failed" +msgstr "" msgid "Configuration files will be kept." msgstr "Configuration files will be kept." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Confirmation" @@ -686,12 +710,18 @@ msgstr "Connected" msgid "Connection Limit" msgstr "Connection Limit" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "Connections" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Country" @@ -745,9 +775,6 @@ msgstr "" "Customizes the behaviour of the device LEDs if possible." -msgid "DHCP Leases" -msgstr "DHCP Leases" - msgid "DHCP Server" msgstr "DHCP Server" @@ -760,9 +787,6 @@ msgstr "DHCP client" msgid "DHCP-Options" msgstr "DHCP-Options" -msgid "DHCPv6 Leases" -msgstr "" - msgid "DHCPv6 client" msgstr "" @@ -802,6 +826,9 @@ msgstr "" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "" @@ -820,9 +847,6 @@ msgstr "Default gateway" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Default state" @@ -844,6 +868,9 @@ msgstr "Delete" msgid "Delete this network" msgstr "Delete this network" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "Description" @@ -862,7 +889,10 @@ msgstr "Device Configuration" msgid "Device is rebooting..." msgstr "" -msgid "Device unreachable" +msgid "Device unreachable!" +msgstr "" + +msgid "Device unreachable! Still waiting for device..." msgstr "" msgid "Diagnostics" @@ -888,15 +918,27 @@ msgstr "" msgid "Disable Encryption" msgstr "" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "Disabled" msgid "Disabled (default)" msgstr "" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "" @@ -948,6 +990,9 @@ msgstr "" "Don't forward DNS-Requests " "without DNS-Name" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "Download and install package" @@ -1061,6 +1106,9 @@ msgstr "" msgid "Enable this mount" msgstr "" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "" @@ -1093,6 +1141,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "" @@ -1151,6 +1205,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "" @@ -1169,6 +1226,9 @@ msgstr "Filter private" msgid "Filter useless" msgstr "Filter useless" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1222,6 +1282,9 @@ msgstr "" msgid "Force" msgstr "Force" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "" @@ -1272,7 +1335,7 @@ msgstr "" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1284,6 +1347,9 @@ msgstr "" msgid "Gateway" msgstr "" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "" @@ -1344,9 +1410,6 @@ msgstr "Hang Up" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1359,9 +1422,6 @@ msgid "" "authentication." msgstr "" -msgid "Hermes 802.11b Wireless Controller" -msgstr "" - msgid "Hide ESSID" msgstr "Hide ESSID" @@ -1377,6 +1437,9 @@ msgstr "" msgid "Host-IP or Network" msgstr "Host-IP or Network" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "Hostname" @@ -1398,13 +1461,19 @@ msgstr "" msgid "IP address" msgstr "IP address" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "" msgid "IPv4 Firewall" msgstr "" -msgid "IPv4 WAN Status" +msgid "IPv4 Upstream" msgstr "" msgid "IPv4 address" @@ -1455,15 +1524,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" +msgid "IPv6 Upstream" msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1569,6 +1635,9 @@ msgstr "" msgid "Info" msgstr "" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "Initscript" @@ -1605,21 +1674,12 @@ msgstr "" msgid "Interface is reconnecting..." msgstr "" -msgid "Interface is shutting down..." -msgstr "" - msgid "Interface name" msgstr "" msgid "Interface not present or not connected yet." msgstr "" -msgid "Interface reconnected" -msgstr "" - -msgid "Interface shut down" -msgstr "" - msgid "Interfaces" msgstr "Interfaces" @@ -1808,6 +1868,9 @@ msgstr "" msgid "Loading" msgstr "" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1872,6 +1935,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "" +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "" @@ -1887,6 +1953,9 @@ msgstr "MAC-List" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "" @@ -1966,6 +2035,9 @@ msgstr "" msgid "Modem device" msgstr "Modem device" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "" @@ -2039,9 +2111,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Name" @@ -2066,6 +2135,9 @@ msgstr "" msgid "Network boot image" msgstr "" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "" @@ -2087,6 +2159,9 @@ msgstr "" msgid "No information available" msgstr "" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "" @@ -2105,6 +2180,9 @@ msgstr "" msgid "No rules in this chain" msgstr "No rules in this chain" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "" @@ -2165,6 +2243,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2216,12 +2297,6 @@ msgstr "" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2242,6 +2317,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2320,6 +2398,9 @@ msgstr "PID" msgid "PIN" msgstr "" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2407,6 +2488,9 @@ msgstr "" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2475,9 +2559,6 @@ msgstr "" msgid "Prevents client-to-client communication" msgstr "Prevents client-to-client communication" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "" - msgid "Private Key" msgstr "" @@ -2526,6 +2607,11 @@ msgstr "" msgid "Quality" msgstr "" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2544,9 +2630,6 @@ msgstr "RX" msgid "RX Rate" msgstr "" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "" - msgid "Radius-Accounting-Port" msgstr "" @@ -2565,6 +2648,9 @@ msgstr "" msgid "Radius-Authentication-Server" msgstr "" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" @@ -2573,28 +2659,18 @@ msgstr "" "Configuration Protocol\">DHCP-Server" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" msgid "Really reset all changes?" msgstr "" -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" - msgid "Really switch protocol?" msgstr "" @@ -2640,9 +2716,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "" -msgid "Reconnecting interface" -msgstr "" - msgid "References" msgstr "References" @@ -2682,9 +2755,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2734,6 +2804,12 @@ msgstr "Restart" msgid "Restart Firewall" msgstr "Restart Firewall" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "" + msgid "Restore backup" msgstr "Restore backup" @@ -2743,6 +2819,15 @@ msgstr "" msgid "Revert" msgstr "Revert" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2758,9 +2843,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2786,14 +2868,6 @@ msgstr "" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2821,12 +2895,12 @@ msgstr "Save" msgid "Save & Apply" msgstr "Save & Apply" -msgid "Save & Apply" -msgstr "" - msgid "Scan" msgstr "Scan" +msgid "Scan request failed" +msgstr "" + msgid "Scheduled Tasks" msgstr "Scheduled Tasks" @@ -2850,17 +2924,6 @@ msgstr "Separate Clients" msgid "Server Settings" msgstr "" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "" @@ -2878,6 +2941,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "" @@ -2887,15 +2956,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "" msgid "Shutdown this interface" msgstr "" -msgid "Shutdown this network" -msgstr "" - msgid "Signal" msgstr "Signal" @@ -2947,15 +3016,9 @@ msgid "" "instructions." msgstr "" -msgid "Sort" -msgstr "" - msgid "Source" msgstr "Source" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -2994,6 +3057,12 @@ msgstr "Start" msgid "Start priority" msgstr "Start priority" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "" @@ -3140,9 +3209,22 @@ msgid "" "code> and _" msgstr "" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3165,9 +3247,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "The following changes have been reverted" @@ -3225,11 +3304,6 @@ msgstr "" "address of your computer to reach the device again, depending on your " "settings." -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3240,7 +3314,7 @@ msgstr "" msgid "There are no active leases." msgstr "" -msgid "There are no pending changes to apply!" +msgid "There are no changes to apply." msgstr "" msgid "There are no pending changes to revert!" @@ -3334,8 +3408,12 @@ msgstr "Timezone" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" +"To restore configuration files, you can upload a previously generated backup " +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgid "Tone" msgstr "" @@ -3379,15 +3457,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3412,9 +3481,27 @@ msgstr "" msgid "UUID" msgstr "" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3424,6 +3511,9 @@ msgstr "" msgid "Unknown Error, password not changed!" msgstr "" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "" @@ -3433,9 +3523,18 @@ msgstr "" msgid "Unsaved Changes" msgstr "Unsaved Changes" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "" +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "" @@ -3560,18 +3659,15 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" msgid "Version" msgstr "Version" +msgid "Virtual dynamic interface" +msgstr "" + msgid "WDS" msgstr "WDS" @@ -3597,16 +3693,15 @@ msgstr "" "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " "and ad-hoc mode) to be installed." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3621,12 +3716,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3648,7 +3737,10 @@ msgstr "Wireless Overview" msgid "Wireless Security" msgstr "Wireless Security" -msgid "Wireless is disabled or not associated" +msgid "Wireless is disabled" +msgstr "" + +msgid "Wireless is not associated" msgstr "" msgid "Wireless is restarting..." @@ -3660,12 +3752,6 @@ msgstr "" msgid "Wireless network is enabled" msgstr "" -msgid "Wireless restarted" -msgstr "" - -msgid "Wireless shut down" -msgstr "" - msgid "Write received DNS requests to syslog" msgstr "" @@ -3703,6 +3789,9 @@ msgstr "" msgid "bridged" msgstr "" +msgid "create" +msgstr "" + msgid "create:" msgstr "" @@ -3740,9 +3829,6 @@ msgstr "" msgid "half-duplex" msgstr "" -msgid "help" -msgstr "help" - msgid "hidden" msgstr "" @@ -3767,10 +3853,10 @@ msgstr "" msgid "local DNS file" msgstr "local DNS file" -msgid "minimum 1280, maximum 1480" +msgid "minutes" msgstr "" -msgid "minutes" +msgid "mixed WPA/WPA2" msgstr "" msgid "no" @@ -3794,6 +3880,9 @@ msgstr "" msgid "open" msgstr "" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" @@ -3845,6 +3934,27 @@ msgstr "" msgid "« Back" msgstr "« Back" +#~ msgid "Activate this network" +#~ msgstr "Activate this network" + +#~ msgid "Backup / Restore" +#~ msgstr "Backup / Restore" + +#~ msgid "DHCP Leases" +#~ msgstr "DHCP Leases" + +#~ msgid "help" +#~ msgstr "help" + +#~ msgid "Apply" +#~ msgstr "Apply" + +#~ msgid "Applying changes" +#~ msgstr "Applying changes" + +#~ msgid "Configuration applied." +#~ msgstr "Configuration applied." + #~ msgid "Action" #~ msgstr "Action" diff --git a/luci-base/po/es/base.po b/luci-base/po/es/base.po index 8aed2e9ee..635dc1160 100644 --- a/luci-base/po/es/base.po +++ b/luci-base/po/es/base.po @@ -49,6 +49,9 @@ msgstr "" msgid "-- match by uuid --" msgstr "" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "Carga a 1 minuto:" @@ -157,9 +160,6 @@ msgstr "Tamaño máximo de paquetes EDNS0" msgid "Max. concurrent queries" msgstr "Máximo número de consultas concurrentes" -msgid "%s - %s" -msgstr "%s - %s" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -174,9 +174,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -213,9 +210,6 @@ msgstr "Número de dispositivo ATM" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Concentrador de acceso" @@ -225,9 +219,6 @@ msgstr "Punto de Acceso" msgid "Actions" msgstr "Acciones" -msgid "Activate this network" -msgstr "Activar esta red" - msgid "Active IPv4-Routes" msgstr "Rutas activas IPv4" @@ -281,6 +272,15 @@ msgstr "" msgid "Alert" msgstr "Alerta" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -294,6 +294,9 @@ msgstr "" "Permitir autenticación de contraseña via SSH" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "Permitir a todos excepto a los de la lista" @@ -323,12 +326,12 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -406,11 +409,14 @@ msgstr "Configuración de la antena" msgid "Any zone" msgstr "Cualquier zona" -msgid "Apply" -msgstr "Aplicar" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" -msgstr "Aplicando cambios" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -426,6 +432,9 @@ msgstr "" msgid "Associated Stations" msgstr "Estaciones asociadas" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -501,12 +510,12 @@ msgstr "Volver al resumen" msgid "Back to scan results" msgstr "Volver a resultados de la exploración" +msgid "Backup" +msgstr "Salvar" + msgid "Backup / Flash Firmware" msgstr "Copia de seguridad / Grabar firmware" -msgid "Backup / Restore" -msgstr "Salvar / Restaurar" - msgid "Backup file list" msgstr "Salvar lista de ficheros" @@ -516,7 +525,7 @@ msgstr "¡Dirección no válida!" msgid "Band" msgstr "" -msgid "Behind NAT" +msgid "Beacon Interval" msgstr "" msgid "" @@ -576,6 +585,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "Uso de CPU (%)" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "Cancelar" @@ -591,12 +603,20 @@ msgstr "Cambios" msgid "Changes applied." msgstr "Cambios aplicados." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Cambie la contraseña del administrador para acceder al dispositivo" msgid "Channel" msgstr "Canal" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Comprobar" @@ -635,12 +655,10 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" "Pulse \"generar archivo\" para descargar un fichero tar con los ficheros de " -"configuración actuales. Para reiniciar el firmware a su estado inicial pulse " -"\"Reiniciar\" (sólo posible con imágenes squashfs)." +"configuración actuales." msgid "Client" msgstr "Cliente" @@ -677,12 +695,18 @@ msgstr "" msgid "Configuration" msgstr "Configuración" -msgid "Configuration applied." -msgstr "Configuración establecida." +msgid "Configuration failed" +msgstr "" msgid "Configuration files will be kept." msgstr "Se mantendrán los ficheros de configuración." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Confirmación" @@ -695,12 +719,18 @@ msgstr "Conectado" msgid "Connection Limit" msgstr "Límite de conexión" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "Conexiones" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "País" @@ -754,9 +784,6 @@ msgstr "" "Personaliza el comportamiento de los LEDs del dispositivo, si es posible." -msgid "DHCP Leases" -msgstr "Cesiones DHCP" - msgid "DHCP Server" msgstr "Servidor DHCP" @@ -769,9 +796,6 @@ msgstr "Cliente DHCP" msgid "DHCP-Options" msgstr "Opciones de DHCP" -msgid "DHCPv6 Leases" -msgstr "Cesiones DHCPv6" - msgid "DHCPv6 client" msgstr "" @@ -811,6 +835,9 @@ msgstr "" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "DUID" @@ -829,9 +856,6 @@ msgstr "Gateway por defecto" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Estado por defecto" @@ -853,6 +877,9 @@ msgstr "Eliminar" msgid "Delete this network" msgstr "Borrar esta red" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "Descripción" @@ -871,7 +898,10 @@ msgstr "Configuración del dispositivo" msgid "Device is rebooting..." msgstr "" -msgid "Device unreachable" +msgid "Device unreachable!" +msgstr "" + +msgid "Device unreachable! Still waiting for device..." msgstr "" msgid "Diagnostics" @@ -899,15 +929,27 @@ msgstr "Desactivar configuración de DNS" msgid "Disable Encryption" msgstr "" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "Desactivar" msgid "Disabled (default)" msgstr "" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "Descartar respuestas RFC1918 salientes" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Mostrar sólo paquete que contienen" @@ -961,6 +1003,9 @@ msgstr "" "No reenviar peticiones de DNS sin " "un nombre de DNS" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "Descargar e instalar paquete" @@ -1076,6 +1121,9 @@ msgstr "" msgid "Enable this mount" msgstr "Active este punto de montaje" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "Activar este swap" @@ -1108,6 +1156,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "Borrando..." @@ -1169,6 +1223,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Fichero" @@ -1187,6 +1244,9 @@ msgstr "Filtro privado" msgid "Filter useless" msgstr "Filtro inútil" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1240,6 +1300,9 @@ msgstr "Grabando..." msgid "Force" msgstr "Forzar" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "Forzar CCMP (AES)" @@ -1291,7 +1354,7 @@ msgstr "Espacio libre" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1303,6 +1366,9 @@ msgstr "Sólo GPRS" msgid "Gateway" msgstr "Pasarela" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "Puertos del gateway" @@ -1365,9 +1431,6 @@ msgstr "Suspender" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1379,9 +1442,6 @@ msgid "" "authentication." msgstr "Claves públicas SSH. Ponga una por línea." -msgid "Hermes 802.11b Wireless Controller" -msgstr "Controlador inalámbrico 802.11b Hermes" - msgid "Hide ESSID" msgstr "Ocultar ESSID" @@ -1399,6 +1459,9 @@ msgstr "" "Dirección IP de máquina o " "red" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "Nombre de máquina" @@ -1420,14 +1483,20 @@ msgstr "" msgid "IP address" msgstr "Dirección IP" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "IPv4" msgid "IPv4 Firewall" msgstr "Cortafuegos IPv4" -msgid "IPv4 WAN Status" -msgstr "Estado de la WAN IPv4" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "Dirección IPv4" @@ -1477,15 +1546,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "Estado de la WAN IPv6" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "Dirección IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1598,6 +1664,9 @@ msgstr "Entrantes:" msgid "Info" msgstr "Información" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "Nombre del script de inicio" @@ -1634,21 +1703,12 @@ msgstr "Resumen de interfaces" msgid "Interface is reconnecting..." msgstr "Reconectando interfaz..." -msgid "Interface is shutting down..." -msgstr "Parando interfaz..." - msgid "Interface name" msgstr "" msgid "Interface not present or not connected yet." msgstr "El interfaz no existe o no está aún conectado." -msgid "Interface reconnected" -msgstr "Interfaz reconectado" - -msgid "Interface shut down" -msgstr "Interfaz detenido" - msgid "Interfaces" msgstr "Interfaces" @@ -1840,6 +1900,9 @@ msgstr "Carga Media" msgid "Loading" msgstr "Cargando" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1911,6 +1974,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "Dirección cedida más baja como diferencia de la dirección de red." +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "Dirección MAC" @@ -1926,6 +1992,9 @@ msgstr "Lista de direcciones MAC" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -2005,6 +2074,9 @@ msgstr "" msgid "Modem device" msgstr "Dispositivo de módem" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "Espera de inicialización del modem" @@ -2078,9 +2150,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Servidores NTP a consultar" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nombre" @@ -2105,6 +2174,9 @@ msgstr "Utilidades de red" msgid "Network boot image" msgstr "Imagen de arranque en red" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "Red sin interfaces." @@ -2126,6 +2198,9 @@ msgstr "No se han encontrado ficheros" msgid "No information available" msgstr "No hay información disponible" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "Sin caché negativa" @@ -2144,6 +2219,9 @@ msgstr "¡Sin contraseña!" msgid "No rules in this chain" msgstr "No hay reglas en esta cadena" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "Sin zona asignada" @@ -2204,6 +2282,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Retraso de desconexión" @@ -2254,12 +2335,6 @@ msgstr "Opción eliminada" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2280,6 +2355,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2360,6 +2438,9 @@ msgstr "PID" msgid "PIN" msgstr "PIN" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2447,6 +2528,9 @@ msgstr "Pico:" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2517,9 +2601,6 @@ msgstr "" msgid "Prevents client-to-client communication" msgstr "Impide la comunicación cliente a cliente" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "Controlador inalámbrico 802.11n Prism2/2.5/3" - msgid "Private Key" msgstr "" @@ -2568,6 +2649,11 @@ msgstr "" msgid "Quality" msgstr "Calidad" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2586,9 +2672,6 @@ msgstr "RX" msgid "RX Rate" msgstr "Ratio RX" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "Controlador inalámbrico 802.11%s RaLink" - msgid "Radius-Accounting-Port" msgstr "Puerto de contabilidad Radius" @@ -2607,6 +2690,9 @@ msgstr "Secreto de autentificación Radius" msgid "Radius-Authentication-Server" msgstr "Servidor de autentificación Radius" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" @@ -2615,16 +2701,12 @@ msgstr "" "\"Dynamic Host Configuration Protocol\">DHCP" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" -"¿Está seguro de borrar esta interfaz?. ¡No será posible deshacer el " -"borrado!\n" -"Puede perder el acceso a este dispositivo si está conectado por esta " -"interfaz." msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" "¿Está seguro de borrar esta red inalámbrica?. ¡No será posible deshacer el " @@ -2634,21 +2716,6 @@ msgstr "" msgid "Really reset all changes?" msgstr "¿Está seguro de querer reiniciar todos los cambios?" -#, fuzzy -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" -"¿Está seguro de querer apagar esta red?.\n" -"Puede perder el acceso a este dispositivo si está conectado por esta red." - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" -"¿Está seguro de apagar la interfaz \"%s\"?.\n" -"Puede perder el acceso a este dispositivo si está conectado por interfaz." - msgid "Really switch protocol?" msgstr "¿Está seguro de querer cambiar el protocolo?" @@ -2694,9 +2761,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "Reconectar esta interfaz" -msgid "Reconnecting interface" -msgstr "Reconectando la interfaz" - msgid "References" msgstr "Referencias" @@ -2736,9 +2800,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2788,6 +2849,12 @@ msgstr "Rearrancar" msgid "Restart Firewall" msgstr "Rearrancar cortafuegos" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "Restaurar" + msgid "Restore backup" msgstr "Restaurar copia de seguridad" @@ -2797,6 +2864,15 @@ msgstr "Mostrar/ocultar contraseña" msgid "Revert" msgstr "Anular" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Raíz" @@ -2812,9 +2888,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2840,14 +2913,6 @@ msgstr "Comprobar el sistema de ficheros" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2875,12 +2940,12 @@ msgstr "Guardar" msgid "Save & Apply" msgstr "Guardar y aplicar" -msgid "Save & Apply" -msgstr "Guardar y aplicar" - msgid "Scan" msgstr "Explorar" +msgid "Scan request failed" +msgstr "" + msgid "Scheduled Tasks" msgstr "Tareas programadas" @@ -2906,17 +2971,6 @@ msgstr "Aislar clientes" msgid "Server Settings" msgstr "Configuración del servidor" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Nombre de servicio" @@ -2935,6 +2989,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "Sincronización horaria" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "Configuración del servidor DHCP" @@ -2944,15 +3004,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "Mostrar lista de ficheros a salvar" msgid "Shutdown this interface" msgstr "Apagar esta interfaz" -msgid "Shutdown this network" -msgstr "Apagar esta red" - msgid "Signal" msgstr "Señal" @@ -3007,15 +3067,9 @@ msgstr "" "grabarse manualmente. Por favor, mire el wiki para instrucciones de " "instalación específicas." -msgid "Sort" -msgstr "Ordenar" - msgid "Source" msgstr "Origen" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "Especifica el directorio al que está enlazado el dispositivo" @@ -3059,6 +3113,12 @@ msgstr "Arrancar" msgid "Start priority" msgstr "Prioridad de arranque" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "Arranque" @@ -3222,9 +3282,22 @@ msgstr "" "Los caracteres permitidos son: A-Z, a-z, " "0-9 y _" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3250,9 +3323,6 @@ msgstr "" "coinciden con los del original.
Pulse \"Proceder\" para empezar el " "grabado." -msgid "The following changes have been committed" -msgstr "Se han hecho los siguientes cambios" - msgid "The following changes have been reverted" msgstr "Se han anulado los siguientes cambios" @@ -3321,11 +3391,6 @@ msgstr "" "Espere unos minutos antes de reconectar. Es posible que tenga que renovar la " "conexión de su ordenador para poder acceder de nuevo al dispositivo." -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3336,8 +3401,8 @@ msgstr "" msgid "There are no active leases." msgstr "Sin cesiones activas." -msgid "There are no pending changes to apply!" -msgstr "¡No hay cambios pendientes!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "¡No hay cambios a anular!" @@ -3441,10 +3506,12 @@ msgstr "Zona horaria" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" "Para restaurar los ficheros de configuración, debe subir primero una copia " -"de seguridad." +"de seguridad. Para reiniciar el firmware a su estado inicial pulse " +"\"Reiniciar\" (sólo posible con imágenes squashfs)." msgid "Tone" msgstr "" @@ -3488,15 +3555,6 @@ msgstr "Interfaz de túnel" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Potencia-TX" @@ -3521,9 +3579,27 @@ msgstr "" msgid "UUID" msgstr "UUID" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "Imposible repartir" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3533,6 +3609,9 @@ msgstr "Desconocido" msgid "Unknown Error, password not changed!" msgstr "Error desconocido, ¡no se ha cambiado la contraseña!" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "No gestionado" @@ -3542,9 +3621,18 @@ msgstr "" msgid "Unsaved Changes" msgstr "Cambios no guardados" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "Tipo de protocolo no soportado." +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "Actualizar listas" @@ -3676,18 +3764,15 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "Clase de vendedor a enviar cuando solicite DHCP" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Verificar" msgid "Version" msgstr "Versión" +msgid "Virtual dynamic interface" +msgstr "" + msgid "WDS" msgstr "WDS" @@ -3713,16 +3798,15 @@ msgstr "" "WPA-Encryption necesita que estén instalados wpa_supplicant (para el modo " "cliente o hostapd (para los modos AP y ad-hoc)." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "Esperando a que se realicen los cambios..." msgid "Waiting for command to complete..." msgstr "Esperando a que termine el comando..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3737,12 +3821,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3764,8 +3842,11 @@ msgstr "Redes inalámbricas" msgid "Wireless Security" msgstr "Seguridad inalámbrica" -msgid "Wireless is disabled or not associated" -msgstr "Red inalámbrica desconectada o no asociada" +msgid "Wireless is disabled" +msgstr "Red inalámbrica desconectada" + +msgid "Wireless is not associated" +msgstr "Red inalámbrica no asociada" msgid "Wireless is restarting..." msgstr "Rearrancando red inalámbrica..." @@ -3776,12 +3857,6 @@ msgstr "Red inalámbrica desconectada" msgid "Wireless network is enabled" msgstr "Red inalámbrica conectada" -msgid "Wireless restarted" -msgstr "Red inalámbrica rearrancada" - -msgid "Wireless shut down" -msgstr "Apagando red inalámbrica" - msgid "Write received DNS requests to syslog" msgstr "Escribir las peticiones de DNS recibidas en el registro del sistema" @@ -3821,6 +3896,9 @@ msgstr "baseT" msgid "bridged" msgstr "puenteado" +msgid "create" +msgstr "" + msgid "create:" msgstr "crear:" @@ -3858,9 +3936,6 @@ msgstr "full dúplex" msgid "half-duplex" msgstr "half dúplex" -msgid "help" -msgstr "ayuda" - msgid "hidden" msgstr "oculto" @@ -3885,10 +3960,10 @@ msgstr "Kbit/s" msgid "local DNS file" msgstr "Archvo DNS local" -msgid "minimum 1280, maximum 1480" +msgid "minutes" msgstr "" -msgid "minutes" +msgid "mixed WPA/WPA2" msgstr "" msgid "no" @@ -3912,6 +3987,9 @@ msgstr "activo" msgid "open" msgstr "abierto" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" @@ -3963,6 +4041,102 @@ msgstr "sí" msgid "« Back" msgstr "« Volver" +#~ msgid "%s - %s" +#~ msgstr "%s - %s" + +#~ msgid "Activate this network" +#~ msgstr "Activar esta red" + +#~ msgid "Hermes 802.11b Wireless Controller" +#~ msgstr "Controlador inalámbrico 802.11b Hermes" + +#~ msgid "Interface is shutting down..." +#~ msgstr "Parando interfaz..." + +#~ msgid "Interface reconnected" +#~ msgstr "Interfaz reconectado" + +#~ msgid "Interface shut down" +#~ msgstr "Interfaz detenido" + +#~ msgid "Prism2/2.5/3 802.11b Wireless Controller" +#~ msgstr "Controlador inalámbrico 802.11n Prism2/2.5/3" + +#~ msgid "RaLink 802.11%s Wireless Controller" +#~ msgstr "Controlador inalámbrico 802.11%s RaLink" + +#~ msgid "" +#~ "Really shutdown interface \"%s\"? You might lose access to this device if " +#~ "you are connected via this interface." +#~ msgstr "" +#~ "¿Está seguro de apagar la interfaz \"%s\"?.\n" +#~ "Puede perder el acceso a este dispositivo si está conectado por interfaz." + +#~ msgid "Reconnecting interface" +#~ msgstr "Reconectando la interfaz" + +#~ msgid "Shutdown this network" +#~ msgstr "Apagar esta red" + +#~ msgid "Wireless restarted" +#~ msgstr "Red inalámbrica rearrancada" + +#~ msgid "Wireless shut down" +#~ msgstr "Apagando red inalámbrica" + +#~ msgid "DHCP Leases" +#~ msgstr "Cesiones DHCP" + +#~ msgid "DHCPv6 Leases" +#~ msgstr "Cesiones DHCPv6" + +#~ msgid "" +#~ "Really delete this interface? The deletion cannot be undone! You might " +#~ "lose access to this device if you are connected via this interface." +#~ msgstr "" +#~ "¿Está seguro de borrar esta interfaz?. ¡No será posible deshacer el " +#~ "borrado!\n" +#~ "Puede perder el acceso a este dispositivo si está conectado por esta " +#~ "interfaz." + +#, fuzzy +#~ msgid "" +#~ "Really shut down network? You might lose access to this device if you are " +#~ "connected via this interface." +#~ msgstr "" +#~ "¿Está seguro de querer apagar esta red?.\n" +#~ "Puede perder el acceso a este dispositivo si está conectado por esta red." + +#~ msgid "Sort" +#~ msgstr "Ordenar" + +#~ msgid "help" +#~ msgstr "ayuda" + +#~ msgid "IPv4 WAN Status" +#~ msgstr "Estado de la WAN IPv4" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "Estado de la WAN IPv6" + +#~ msgid "Apply" +#~ msgstr "Aplicar" + +#~ msgid "Applying changes" +#~ msgstr "Aplicando cambios" + +#~ msgid "Configuration applied." +#~ msgstr "Configuración establecida." + +#~ msgid "Save & Apply" +#~ msgstr "Guardar y aplicar" + +#~ msgid "The following changes have been committed" +#~ msgstr "Se han hecho los siguientes cambios" + +#~ msgid "There are no pending changes to apply!" +#~ msgstr "¡No hay cambios pendientes!" + #~ msgid "Action" #~ msgstr "Acción" diff --git a/luci-base/po/fr/base.po b/luci-base/po/fr/base.po index e09343815..3805627b6 100644 --- a/luci-base/po/fr/base.po +++ b/luci-base/po/fr/base.po @@ -49,6 +49,9 @@ msgstr "" msgid "-- match by uuid --" msgstr "" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "Charge sur 1 minute :" @@ -156,9 +159,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "Maximum de requêtes concurrentes" -msgid "%s - %s" -msgstr "%s - %s" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -173,9 +173,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -216,9 +213,6 @@ msgstr "Numéro de périphérique ATM" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Concentrateur d'accès" @@ -228,9 +222,6 @@ msgstr "Point d'accès" msgid "Actions" msgstr "Actions" -msgid "Activate this network" -msgstr "Activer ce réseau" - msgid "Active IPv4-Routes" msgstr "Routes IPv4 actives" @@ -283,6 +274,15 @@ msgstr "" msgid "Alert" msgstr "Alerte" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -296,6 +296,9 @@ msgstr "" "Autoriser l'authentification SSH par mot " "de passe" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "Autoriser tout sauf ce qui est listé" @@ -329,12 +332,12 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -412,11 +415,14 @@ msgstr "Configuration de l'antenne" msgid "Any zone" msgstr "N'importe quelle zone" -msgid "Apply" -msgstr "Appliquer" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" -msgstr "Changements en cours" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -432,6 +438,9 @@ msgstr "" msgid "Associated Stations" msgstr "Équipements associés" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -507,12 +516,12 @@ msgstr "Retour à la vue générale" msgid "Back to scan results" msgstr "Retour aux résultats de la recherche" +msgid "Backup" +msgstr "Sauvegarder" + msgid "Backup / Flash Firmware" msgstr "Sauvegarde / Mise à jour du micrologiciel" -msgid "Backup / Restore" -msgstr "Sauvegarder / Restaurer" - msgid "Backup file list" msgstr "Liste des fichiers de sauvegarde" @@ -522,7 +531,7 @@ msgstr "Adresse spécifiée incorrecte!" msgid "Band" msgstr "" -msgid "Behind NAT" +msgid "Beacon Interval" msgstr "" msgid "" @@ -581,6 +590,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "Utilisation CPU (%)" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "Annuler" @@ -596,12 +608,20 @@ msgstr "Changements" msgid "Changes applied." msgstr "Changements appliqués." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Change le mot de passe administrateur pour accéder à l'équipement" msgid "Channel" msgstr "Canal" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Vérification" @@ -641,13 +661,10 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" "Cliquer sur \"Construire l'archive\" pour télécharger une archive tar des " -"fichiers de la configuration actuelle. Pour réinitialiser le micrologiciel " -"dans son état initial, cliquer sur \"Réinitialiser\" (possible seulement " -"avec les images de type squashfs)." +"fichiers de la configuration actuelle." msgid "Client" msgstr "Client" @@ -684,12 +701,18 @@ msgstr "" msgid "Configuration" msgstr "Configuration" -msgid "Configuration applied." -msgstr "Configuration appliquée." +msgid "Configuration failed" +msgstr "" msgid "Configuration files will be kept." msgstr "Les fichiers de configuration seront préservés." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Confirmation" @@ -702,12 +725,18 @@ msgstr "Connecté" msgid "Connection Limit" msgstr "Limite de connexion" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "Connexions" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Pays" @@ -761,9 +790,6 @@ msgstr "" "Personnaliser le comportement des DELs si possible." -msgid "DHCP Leases" -msgstr "Baux DHCP" - msgid "DHCP Server" msgstr "Serveur DHCP" @@ -776,9 +802,6 @@ msgstr "client DHCP" msgid "DHCP-Options" msgstr "Options DHCP" -msgid "DHCPv6 Leases" -msgstr "Bails DHCPv6" - msgid "DHCPv6 client" msgstr "" @@ -818,6 +841,9 @@ msgstr "" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "DUID" @@ -836,9 +862,6 @@ msgstr "Passerelle par défaut" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "État par défaut" @@ -860,6 +883,9 @@ msgstr "Effacer" msgid "Delete this network" msgstr "Supprimer ce réseau" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "Description" @@ -878,7 +904,10 @@ msgstr "Configuration de l'équipement" msgid "Device is rebooting..." msgstr "" -msgid "Device unreachable" +msgid "Device unreachable!" +msgstr "" + +msgid "Device unreachable! Still waiting for device..." msgstr "" msgid "Diagnostics" @@ -906,15 +935,27 @@ msgstr "Désactiver la configuration DNS" msgid "Disable Encryption" msgstr "" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "Désactivé" msgid "Disabled (default)" msgstr "" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "Jeter les réponses en RFC1918 amont" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "N'afficher que les paquets contenant" @@ -971,6 +1012,9 @@ msgstr "" "Ne pas transmettre de requêtes DNS " "sans nom DNS" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "Télécharge et installe le paquet" @@ -1086,6 +1130,9 @@ msgstr "" msgid "Enable this mount" msgstr "Activer ce montage" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "Activer cette mémoire d'échange (swap)" @@ -1120,6 +1167,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "Effacement…" @@ -1181,6 +1234,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Fichier" @@ -1199,6 +1255,9 @@ msgstr "Filtrer les requêtes privées" msgid "Filter useless" msgstr "Filtrer les requêtes inutiles" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1252,6 +1311,9 @@ msgstr "Écriture…" msgid "Force" msgstr "Forcer" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "Forcer CCMP (AES)" @@ -1302,7 +1364,7 @@ msgstr "Espace libre" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1314,6 +1376,9 @@ msgstr "seulement GPRS" msgid "Gateway" msgstr "Passerelle" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "Ports de la passerelle" @@ -1376,9 +1441,6 @@ msgstr "Signal (HUP)" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1393,9 +1455,6 @@ msgstr "" "Vous pouvez copier ici des clés SSH publiques (une par ligne) pour une " "authentification SSH sur clés publiques." -msgid "Hermes 802.11b Wireless Controller" -msgstr "Contrôleur sans fil Hermes 802.11b" - msgid "Hide ESSID" msgstr "Cacher le ESSID" @@ -1411,6 +1470,9 @@ msgstr "Délai d'expiration pour les hôtes" msgid "Host-IP or Network" msgstr "adresse IP ou réseau" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "Nom d'hôte" @@ -1432,14 +1494,20 @@ msgstr "" msgid "IP address" msgstr "Adresse IP" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "IPv4" msgid "IPv4 Firewall" msgstr "Pare-feu IPv4" -msgid "IPv4 WAN Status" -msgstr "État IPv4 du WAN" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "Adresse IPv4" @@ -1489,15 +1557,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "État IPv6 du WAN" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "Adresse IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1606,6 +1671,9 @@ msgstr "Intérieur :" msgid "Info" msgstr "Info" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "Script d'initialisation" @@ -1642,21 +1710,12 @@ msgstr "Vue d'ensemble de l'interface" msgid "Interface is reconnecting..." msgstr "L'interface se reconnecte…" -msgid "Interface is shutting down..." -msgstr "L'interface s'arrête…" - msgid "Interface name" msgstr "" msgid "Interface not present or not connected yet." msgstr "L'interface n'est pas présente ou pas encore connectée." -msgid "Interface reconnected" -msgstr "Interface reconnectée" - -msgid "Interface shut down" -msgstr "Interface arrêtée" - msgid "Interfaces" msgstr "Interfaces" @@ -1852,6 +1911,9 @@ msgstr "Charge moyenne" msgid "Loading" msgstr "Chargement" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1925,6 +1987,9 @@ msgstr "" "Adresse allouée la plus basse, spécifiée par un décalage à partir de " "l'adresse réseau." +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "Adresse MAC" @@ -1940,6 +2005,9 @@ msgstr "Liste des adresses MAC" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -2019,6 +2087,9 @@ msgstr "" msgid "Modem device" msgstr "Interface Modem" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "Délai max. d'initialisation du modem" @@ -2092,9 +2163,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Serveurs NTP candidats" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nom" @@ -2119,6 +2187,9 @@ msgstr "Utilitaires réseau" msgid "Network boot image" msgstr "Image de démarrage réseau" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "Réseau sans interfaces." @@ -2140,6 +2211,9 @@ msgstr "Aucun fichier trouvé" msgid "No information available" msgstr "Information indisponible" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "Pas de cache négatif" @@ -2158,6 +2232,9 @@ msgstr "Pas de mot de passe positionné !" msgid "No rules in this chain" msgstr "Aucune règle dans cette chaîne" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "Aucune zone attribuée" @@ -2218,6 +2295,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Durée éteinte" @@ -2267,12 +2347,6 @@ msgstr "Option retirée" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2293,6 +2367,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2373,6 +2450,9 @@ msgstr "PID" msgid "PIN" msgstr "code PIN" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2460,6 +2540,9 @@ msgstr "Pic :" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2530,9 +2613,6 @@ msgstr "" msgid "Prevents client-to-client communication" msgstr "Empêche la communication directe entre clients" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "Contrôleur sans fil Prism2/2.5/3 802.11b" - msgid "Private Key" msgstr "" @@ -2581,6 +2661,11 @@ msgstr "" msgid "Quality" msgstr "Qualitée" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2599,9 +2684,6 @@ msgstr "Reçu" msgid "RX Rate" msgstr "Débit en réception" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "Contrôleur sans fil RaLink 802.11%s" - msgid "Radius-Accounting-Port" msgstr "Port de la comptabilisation Radius" @@ -2620,22 +2702,21 @@ msgstr "Secret de l'authentification Radius" msgid "Radius-Authentication-Server" msgstr "Serveur de l'authentification Radius" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" msgstr "Lire /etc/ethers pour configurer le serveur DHCP" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" -"Voulez-vous vraiment supprimer cette interface? L'effacement ne peut être " -"annulé!\n" -"Vous pourriez perdre l'accès à l'équipement si vous y êtes connecté par " -"cette interface." msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" "Voulez-vous vraiment supprimer ce réseau sans-fil? L'effacement ne peut être " @@ -2646,22 +2727,6 @@ msgstr "" msgid "Really reset all changes?" msgstr "Voulez-vous vraiment ré-initialiser toutes les modifications ?" -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" -"Voulez-vous vraiment arrêter l'interface %s ?\n" -"Vous pourriez perdre l'accès à l'équipement si vous y êtes connecté par " -"cette interface." - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" -"Voulez-vous vraiment arrêter l'interface %s ?\n" -"Vous pourriez perdre l'accès à l'équipement si vous y êtes connecté par " -"cette interface." - msgid "Really switch protocol?" msgstr "Voulez-vous vraiment changer de protocole ?" @@ -2707,9 +2772,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "Reconnecter cet interface" -msgid "Reconnecting interface" -msgstr "Reconnecte cet interface" - msgid "References" msgstr "Références" @@ -2749,9 +2811,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2801,6 +2860,12 @@ msgstr "Redémarrer" msgid "Restart Firewall" msgstr "Redémarrer le pare-feu" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "Restaurer" + msgid "Restore backup" msgstr "Restaurer une sauvegarde" @@ -2810,6 +2875,15 @@ msgstr "Montrer/cacher le mot de passe" msgid "Revert" msgstr "Revenir" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Racine" @@ -2825,9 +2899,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2854,14 +2925,6 @@ msgstr "Faire une vérification du système de fichiers" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2889,12 +2952,12 @@ msgstr "Sauvegarder" msgid "Save & Apply" msgstr "Sauvegarder et Appliquer" -msgid "Save & Apply" -msgstr "Sauvegarder et appliquer" - msgid "Scan" msgstr "Scan" +msgid "Scan request failed" +msgstr "" + msgid "Scheduled Tasks" msgstr "Tâches Régulières" @@ -2920,17 +2983,6 @@ msgstr "Isoler les clients" msgid "Server Settings" msgstr "Paramètres du serveur" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Nom du service" @@ -2949,6 +3001,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "Configurer la synchronisation de l'heure" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "Configurer le serveur DHCP" @@ -2958,15 +3016,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "Afficher la liste des fichiers de la sauvegarde actuelle" msgid "Shutdown this interface" msgstr "Arrêter cet interface" -msgid "Shutdown this network" -msgstr "Arrêter ce réseau" - msgid "Signal" msgstr "Signal" @@ -3022,15 +3080,9 @@ msgstr "" "au wiki pour connaître les instructions d'installation spécifiques à votre " "matériel." -msgid "Sort" -msgstr "Trier" - msgid "Source" msgstr "Source" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "Indique le répertoire auquel le périphérique est rattaché" @@ -3071,6 +3123,12 @@ msgstr "Démarrer" msgid "Start priority" msgstr "Priorité de démarrage" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "Démarrage" @@ -3234,9 +3292,22 @@ msgstr "" "Les caractères autorisés sont : A-Z, a-z, " "0-9 et _" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3260,9 +3331,6 @@ msgstr "" "assurer de son intégrité.
Cliquez sur \"Continuer\" pour lancer la " "procédure d'écriture." -msgid "The following changes have been committed" -msgstr "Les changements suivants ont été appliqués" - msgid "The following changes have been reverted" msgstr "Les changements suivants ont été annulés" @@ -3334,11 +3402,6 @@ msgstr "" "address of your computer to reach the device again, depending on your " "settings." -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3349,8 +3412,8 @@ msgstr "" msgid "There are no active leases." msgstr "Il n'y a aucun bail actif." -msgid "There are no pending changes to apply!" -msgstr "Il n'y a aucun changement en attente d'être appliqués !" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Il n'y a aucun changement à annuler !" @@ -3459,10 +3522,13 @@ msgstr "Fuseau horaire" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" "Pour restaurer les fichiers de configuration, vous pouvez charger ici une " -"archive de sauvegarde construite précédemment." +"archive de sauvegarde construite précédemment. Pour réinitialiser le " +"micrologiciel dans son état initial, cliquer sur \"Réinitialiser\" (possible " +"seulement avec les images de type squashfs)." msgid "Tone" msgstr "" @@ -3506,15 +3572,6 @@ msgstr "Interface du tunnel" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Puissance d'émission" @@ -3539,9 +3596,27 @@ msgstr "" msgid "UUID" msgstr "UUID" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "Impossible d'envoyer" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3551,6 +3626,9 @@ msgstr "Inconnu" msgid "Unknown Error, password not changed!" msgstr "Erreur inconnue, mot de passe inchangé !" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "non-géré" @@ -3560,9 +3638,18 @@ msgstr "" msgid "Unsaved Changes" msgstr "Changements non appliqués" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "Type de protocole non pris en charge." +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "Mettre les listes à jour" @@ -3695,18 +3782,15 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "Classe de fournisseur à envoyer dans les requêtes DHCP" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Vérifier" msgid "Version" msgstr "Version" +msgid "Virtual dynamic interface" +msgstr "" + msgid "WDS" msgstr "WDS" @@ -3732,16 +3816,15 @@ msgstr "" "Le chiffrage WPA nécessite l'installation du paquet wpa_supplicant (en mode " "client) ou hostapd (en mode Point d'accès ou Ad-hoc)." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "En attente de l'application des changements..." msgid "Waiting for command to complete..." msgstr "En attente de la fin de la commande..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3756,12 +3839,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3783,8 +3860,11 @@ msgstr "Présentation des réseaux sans-fil" msgid "Wireless Security" msgstr "Sécurité des réseaux sans-fil" -msgid "Wireless is disabled or not associated" -msgstr "Le Wi-Fi est désactivé ou non associé" +msgid "Wireless is disabled" +msgstr "Le Wi-Fi est désactivé" + +msgid "Wireless is not associated" +msgstr "Le Wi-Fi est non associé" msgid "Wireless is restarting..." msgstr "Le Wi-Fi est ré-initialisé…" @@ -3795,12 +3875,6 @@ msgstr "Le réseau Wi-Fi est désactivé" msgid "Wireless network is enabled" msgstr "Le réseau Wi-Fi est activé" -msgid "Wireless restarted" -msgstr "Wi-Fi ré-initialisé" - -msgid "Wireless shut down" -msgstr "Wi-Fi arrêté" - msgid "Write received DNS requests to syslog" msgstr "Écrire les requêtes DNS reçues dans syslog" @@ -3841,6 +3915,9 @@ msgstr "baseT" msgid "bridged" msgstr "ponté" +msgid "create" +msgstr "" + msgid "create:" msgstr "créer:" @@ -3876,9 +3953,6 @@ msgstr "full-duplex" msgid "half-duplex" msgstr "half-duplex" -msgid "help" -msgstr "aide" - msgid "hidden" msgstr "cacher" @@ -3903,10 +3977,10 @@ msgstr "kbit/s" msgid "local DNS file" msgstr "fichier de résolution local" -msgid "minimum 1280, maximum 1480" +msgid "minutes" msgstr "" -msgid "minutes" +msgid "mixed WPA/WPA2" msgstr "" msgid "no" @@ -3930,6 +4004,9 @@ msgstr "Actif" msgid "open" msgstr "ouvrir" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" @@ -3981,6 +4058,103 @@ msgstr "oui" msgid "« Back" msgstr "« Retour" +#~ msgid "%s - %s" +#~ msgstr "%s - %s" + +#~ msgid "Activate this network" +#~ msgstr "Activer ce réseau" + +#~ msgid "Hermes 802.11b Wireless Controller" +#~ msgstr "Contrôleur sans fil Hermes 802.11b" + +#~ msgid "Interface is shutting down..." +#~ msgstr "L'interface s'arrête…" + +#~ msgid "Interface reconnected" +#~ msgstr "Interface reconnectée" + +#~ msgid "Interface shut down" +#~ msgstr "Interface arrêtée" + +#~ msgid "Prism2/2.5/3 802.11b Wireless Controller" +#~ msgstr "Contrôleur sans fil Prism2/2.5/3 802.11b" + +#~ msgid "RaLink 802.11%s Wireless Controller" +#~ msgstr "Contrôleur sans fil RaLink 802.11%s" + +#~ msgid "" +#~ "Really shutdown interface \"%s\"? You might lose access to this device if " +#~ "you are connected via this interface." +#~ msgstr "" +#~ "Voulez-vous vraiment arrêter l'interface %s ?\n" +#~ "Vous pourriez perdre l'accès à l'équipement si vous y êtes connecté par " +#~ "cette interface." + +#~ msgid "Reconnecting interface" +#~ msgstr "Reconnecte cet interface" + +#~ msgid "Shutdown this network" +#~ msgstr "Arrêter ce réseau" + +#~ msgid "Wireless restarted" +#~ msgstr "Wi-Fi ré-initialisé" + +#~ msgid "Wireless shut down" +#~ msgstr "Wi-Fi arrêté" + +#~ msgid "DHCP Leases" +#~ msgstr "Baux DHCP" + +#~ msgid "DHCPv6 Leases" +#~ msgstr "Bails DHCPv6" + +#~ msgid "" +#~ "Really delete this interface? The deletion cannot be undone! You might " +#~ "lose access to this device if you are connected via this interface." +#~ msgstr "" +#~ "Voulez-vous vraiment supprimer cette interface? L'effacement ne peut être " +#~ "annulé!\n" +#~ "Vous pourriez perdre l'accès à l'équipement si vous y êtes connecté par " +#~ "cette interface." + +#~ msgid "" +#~ "Really shut down network? You might lose access to this device if you are " +#~ "connected via this interface." +#~ msgstr "" +#~ "Voulez-vous vraiment arrêter l'interface %s ?\n" +#~ "Vous pourriez perdre l'accès à l'équipement si vous y êtes connecté par " +#~ "cette interface." + +#~ msgid "Sort" +#~ msgstr "Trier" + +#~ msgid "help" +#~ msgstr "aide" + +#~ msgid "IPv4 WAN Status" +#~ msgstr "État IPv4 du WAN" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "État IPv6 du WAN" + +#~ msgid "Apply" +#~ msgstr "Appliquer" + +#~ msgid "Applying changes" +#~ msgstr "Changements en cours" + +#~ msgid "Configuration applied." +#~ msgstr "Configuration appliquée." + +#~ msgid "Save & Apply" +#~ msgstr "Sauvegarder et appliquer" + +#~ msgid "The following changes have been committed" +#~ msgstr "Les changements suivants ont été appliqués" + +#~ msgid "There are no pending changes to apply!" +#~ msgstr "Il n'y a aucun changement en attente d'être appliqués !" + #~ msgid "Action" #~ msgstr "Action" diff --git a/luci-base/po/he/base.po b/luci-base/po/he/base.po index cb4c74a3f..6a5be78fe 100644 --- a/luci-base/po/he/base.po +++ b/luci-base/po/he/base.po @@ -47,6 +47,9 @@ msgstr "" msgid "-- match by uuid --" msgstr "" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "עומס במשך דקה:" @@ -146,9 +149,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "" -msgid "%s - %s" -msgstr "" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -163,9 +163,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -203,9 +200,6 @@ msgstr "מס' התקן של ATM" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - #, fuzzy msgid "Access Concentrator" msgstr "מרכז גישות" @@ -216,9 +210,6 @@ msgstr "נקודת גישה" msgid "Actions" msgstr "פעולות" -msgid "Activate this network" -msgstr "הפעל רשת זו" - msgid "Active IPv4-Routes" msgstr "" @@ -275,6 +266,15 @@ msgstr "" msgid "Alert" msgstr "אזעקה" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -286,6 +286,9 @@ msgstr "" msgid "Allow SSH password authentication" msgstr "" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + #, fuzzy msgid "Allow all except listed" msgstr "אפשר הכל חוץ מהרשומים" @@ -316,12 +319,12 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -401,11 +404,14 @@ msgstr "הגדרות אנטנה" msgid "Any zone" msgstr "כל תחום" -msgid "Apply" -msgstr "החל" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" -msgstr "מחיל הגדרות" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -421,6 +427,9 @@ msgstr "" msgid "Associated Stations" msgstr "תחנות קשורות" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -496,12 +505,12 @@ msgstr "חזרה לסקירה" msgid "Back to scan results" msgstr "חזרה לתוצאות סריקה" +msgid "Backup" +msgstr "גיבוי" + msgid "Backup / Flash Firmware" msgstr "גיבוי / קושחת פלאש" -msgid "Backup / Restore" -msgstr "גיבוי / שחזור" - msgid "Backup file list" msgstr "גיבוי רשימת קבצים" @@ -511,7 +520,7 @@ msgstr "פורטה כתובת לא תקינה" msgid "Band" msgstr "" -msgid "Behind NAT" +msgid "Beacon Interval" msgstr "" msgid "" @@ -571,6 +580,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "שימוש מעבד (%)" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "בטל" @@ -586,12 +598,20 @@ msgstr "שינויים" msgid "Changes applied." msgstr "השינויים הוחלו" +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "משנה את סיסמת המנהל לגישה למכשיר" msgid "Channel" msgstr "ערוץ" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "לבדוק" @@ -624,8 +644,7 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" msgid "Client" @@ -661,12 +680,18 @@ msgstr "" msgid "Configuration" msgstr "הגדרות" -msgid "Configuration applied." -msgstr "הגדרות הוחלו" +msgid "Configuration failed" +msgstr "" msgid "Configuration files will be kept." msgstr "קבצי ההגדרות ישמרו." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "אישור" @@ -679,12 +704,18 @@ msgstr "מחובר" msgid "Connection Limit" msgstr "מגבלת חיבורים" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "חיבורים" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "מדינה" @@ -738,9 +769,6 @@ msgstr "" "מתאים את הגדרות ה-LED-ים במכשיר " "(אם אפשרי)." -msgid "DHCP Leases" -msgstr "הרשאות DHCP" - msgid "DHCP Server" msgstr "שרת DHCP" @@ -753,9 +781,6 @@ msgstr "לקוח DHCP" msgid "DHCP-Options" msgstr "אפשרויות-DHCP" -msgid "DHCPv6 Leases" -msgstr "הרשאות DHCPv6" - msgid "DHCPv6 client" msgstr "" @@ -795,6 +820,9 @@ msgstr "" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "" @@ -813,9 +841,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "" @@ -836,6 +861,9 @@ msgstr "למחוק" msgid "Delete this network" msgstr "מחק רשת זו" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "תיאור" @@ -854,7 +882,10 @@ msgstr "הגדרות מכשיר" msgid "Device is rebooting..." msgstr "" -msgid "Device unreachable" +msgid "Device unreachable!" +msgstr "" + +msgid "Device unreachable! Still waiting for device..." msgstr "" msgid "Diagnostics" @@ -880,15 +911,27 @@ msgstr "" msgid "Disable Encryption" msgstr "" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "" msgid "Disabled (default)" msgstr "" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "מציג רק חבילות המכילות" @@ -934,6 +977,9 @@ msgid "" "DNS-Name" msgstr "" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "הורד והתקן חבילות" @@ -1046,6 +1092,9 @@ msgstr "" msgid "Enable this mount" msgstr "" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "" @@ -1078,6 +1127,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "מוחק..." @@ -1136,6 +1191,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "" @@ -1154,6 +1212,9 @@ msgstr "" msgid "Filter useless" msgstr "" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1207,6 +1268,9 @@ msgstr "" msgid "Force" msgstr "" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "" @@ -1257,7 +1321,7 @@ msgstr "" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1269,6 +1333,9 @@ msgstr "" msgid "Gateway" msgstr "" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "" @@ -1329,9 +1396,6 @@ msgstr "" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1342,9 +1406,6 @@ msgid "" "authentication." msgstr "" -msgid "Hermes 802.11b Wireless Controller" -msgstr "" - msgid "Hide ESSID" msgstr "" @@ -1360,6 +1421,9 @@ msgstr "" msgid "Host-IP or Network" msgstr "" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "" @@ -1381,13 +1445,19 @@ msgstr "" msgid "IP address" msgstr "" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "" msgid "IPv4 Firewall" msgstr "" -msgid "IPv4 WAN Status" +msgid "IPv4 Upstream" msgstr "" msgid "IPv4 address" @@ -1438,15 +1508,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" +msgid "IPv6 Upstream" msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1547,6 +1614,9 @@ msgstr "" msgid "Info" msgstr "" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "" @@ -1583,21 +1653,12 @@ msgstr "" msgid "Interface is reconnecting..." msgstr "" -msgid "Interface is shutting down..." -msgstr "" - msgid "Interface name" msgstr "" msgid "Interface not present or not connected yet." msgstr "" -msgid "Interface reconnected" -msgstr "" - -msgid "Interface shut down" -msgstr "" - msgid "Interfaces" msgstr "" @@ -1783,6 +1844,9 @@ msgstr "עומס ממוצע" msgid "Loading" msgstr "טוען" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1847,6 +1911,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "" +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "" @@ -1862,6 +1929,9 @@ msgstr "" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "" @@ -1941,6 +2011,9 @@ msgstr "" msgid "Modem device" msgstr "" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "" @@ -2012,9 +2085,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "שם" @@ -2039,6 +2109,9 @@ msgstr "" msgid "Network boot image" msgstr "" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "" @@ -2060,6 +2133,9 @@ msgstr "" msgid "No information available" msgstr "" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "" @@ -2078,6 +2154,9 @@ msgstr "לא הוגדרה סיסמה!" msgid "No rules in this chain" msgstr "" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "" @@ -2138,6 +2217,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2183,12 +2265,6 @@ msgstr "" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2209,6 +2285,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2287,6 +2366,9 @@ msgstr "" msgid "PIN" msgstr "" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2374,6 +2456,9 @@ msgstr "" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2442,9 +2527,6 @@ msgstr "" msgid "Prevents client-to-client communication" msgstr "" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "" - msgid "Private Key" msgstr "" @@ -2493,6 +2575,11 @@ msgstr "" msgid "Quality" msgstr "" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2511,9 +2598,6 @@ msgstr "" msgid "RX Rate" msgstr "קצב קליטה" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "" - msgid "Radius-Accounting-Port" msgstr "" @@ -2532,37 +2616,27 @@ msgstr "" msgid "Radius-Authentication-Server" msgstr "" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" msgstr "" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" msgid "Really reset all changes?" msgstr "" -#, fuzzy -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" -"האם למחוק את הרשת האלחוטית הזו? המחיקה אינה ניתנת לביטול!\n" -"ייתכן ותאבד גישה לנתב הזה אם אתה מחובר דרך השרת הזו." - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" - msgid "Really switch protocol?" msgstr "" @@ -2608,9 +2682,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "" -msgid "Reconnecting interface" -msgstr "" - msgid "References" msgstr "" @@ -2650,9 +2721,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2702,6 +2770,12 @@ msgstr "" msgid "Restart Firewall" msgstr "" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "שחזור" + msgid "Restore backup" msgstr "" @@ -2711,6 +2785,15 @@ msgstr "" msgid "Revert" msgstr "" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2726,9 +2809,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2752,14 +2832,6 @@ msgstr "הרץ בדיקת מערכת קבצים" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2787,10 +2859,10 @@ msgstr "" msgid "Save & Apply" msgstr "" -msgid "Save & Apply" +msgid "Scan" msgstr "" -msgid "Scan" +msgid "Scan request failed" msgstr "" msgid "Scheduled Tasks" @@ -2816,17 +2888,6 @@ msgstr "" msgid "Server Settings" msgstr "" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "" @@ -2845,6 +2906,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "סנכרון זמן" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "" @@ -2854,15 +2921,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "" msgid "Shutdown this interface" msgstr "" -msgid "Shutdown this network" -msgstr "" - msgid "Signal" msgstr "" @@ -2916,15 +2983,9 @@ msgstr "" "סליחה, אין תמיכה בעדכון מערכת, ולכן קושחה חדשה חייבת להיצרב ידנית. אנא פנה " "אל ה-wiki של OpenWrt/LEDE עבור הוראות ספציפיות למכשיר שלך." -msgid "Sort" -msgstr "מיין" - msgid "Source" msgstr "מקור" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -2963,6 +3024,12 @@ msgstr "" msgid "Start priority" msgstr "" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "אתחול" @@ -3112,9 +3179,22 @@ msgid "" "code> and _" msgstr "" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3132,9 +3212,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "" @@ -3188,11 +3265,6 @@ msgid "" "settings." msgstr "" -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3201,7 +3273,7 @@ msgstr "" msgid "There are no active leases." msgstr "" -msgid "There are no pending changes to apply!" +msgid "There are no changes to apply." msgstr "" msgid "There are no pending changes to revert!" @@ -3291,7 +3363,8 @@ msgstr "אזור זמן" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" "על מנת לשחזר את קבצי ההגדרות, באפשרותך להעלות ארכיון גיבוי שנוצר לפני כן." @@ -3337,15 +3410,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "עוצמת שידור" @@ -3370,9 +3434,27 @@ msgstr "" msgid "UUID" msgstr "" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3382,6 +3464,9 @@ msgstr "" msgid "Unknown Error, password not changed!" msgstr "" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "" @@ -3391,9 +3476,18 @@ msgstr "" msgid "Unsaved Changes" msgstr "" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "" +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "" @@ -3518,18 +3612,15 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" msgid "Version" msgstr "גרסה" +msgid "Virtual dynamic interface" +msgstr "" + msgid "WDS" msgstr "" @@ -3553,16 +3644,15 @@ msgid "" "and ad-hoc mode) to be installed." msgstr "" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3577,12 +3667,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3604,7 +3688,10 @@ msgstr "" msgid "Wireless Security" msgstr "" -msgid "Wireless is disabled or not associated" +msgid "Wireless is disabled" +msgstr "" + +msgid "Wireless is not associated" msgstr "" msgid "Wireless is restarting..." @@ -3616,12 +3703,6 @@ msgstr "רשת אלחוטית מנוטרלת" msgid "Wireless network is enabled" msgstr "רשת אלחוטית מאופשרת" -msgid "Wireless restarted" -msgstr "" - -msgid "Wireless shut down" -msgstr "" - msgid "Write received DNS requests to syslog" msgstr "" @@ -3656,6 +3737,9 @@ msgstr "" msgid "bridged" msgstr "" +msgid "create" +msgstr "" + msgid "create:" msgstr "" @@ -3691,9 +3775,6 @@ msgstr "" msgid "half-duplex" msgstr "" -msgid "help" -msgstr "עזרה" - msgid "hidden" msgstr "" @@ -3718,10 +3799,10 @@ msgstr "" msgid "local DNS file" msgstr "" -msgid "minimum 1280, maximum 1480" +msgid "minutes" msgstr "" -msgid "minutes" +msgid "mixed WPA/WPA2" msgstr "" msgid "no" @@ -3745,6 +3826,9 @@ msgstr "פועל" msgid "open" msgstr "" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" @@ -3796,6 +3880,38 @@ msgstr "כן" msgid "« Back" msgstr "<< אחורה" +#~ msgid "Activate this network" +#~ msgstr "הפעל רשת זו" + +#~ msgid "DHCP Leases" +#~ msgstr "הרשאות DHCP" + +#~ msgid "DHCPv6 Leases" +#~ msgstr "הרשאות DHCPv6" + +#, fuzzy +#~ msgid "" +#~ "Really shut down network? You might lose access to this device if you are " +#~ "connected via this interface." +#~ msgstr "" +#~ "האם למחוק את הרשת האלחוטית הזו? המחיקה אינה ניתנת לביטול!\n" +#~ "ייתכן ותאבד גישה לנתב הזה אם אתה מחובר דרך השרת הזו." + +#~ msgid "Sort" +#~ msgstr "מיין" + +#~ msgid "help" +#~ msgstr "עזרה" + +#~ msgid "Apply" +#~ msgstr "החל" + +#~ msgid "Applying changes" +#~ msgstr "מחיל הגדרות" + +#~ msgid "Configuration applied." +#~ msgstr "הגדרות הוחלו" + #~ msgid "Action" #~ msgstr "פעולה" diff --git a/luci-base/po/hu/base.po b/luci-base/po/hu/base.po index e49b5303f..4b66806a8 100644 --- a/luci-base/po/hu/base.po +++ b/luci-base/po/hu/base.po @@ -47,6 +47,9 @@ msgstr "" msgid "-- match by uuid --" msgstr "" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "Terhelés (utolsó 1 perc):" @@ -153,9 +156,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "Max. párhuzamos lekérdezés" -msgid "%s - %s" -msgstr "%s - %s" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -170,9 +170,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -209,9 +206,6 @@ msgstr "ATM eszközszám" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Elérési központ" @@ -221,9 +215,6 @@ msgstr "Hozzáférési pont" msgid "Actions" msgstr "Műveletek" -msgid "Activate this network" -msgstr "Hálózat aktiválása" - msgid "Active IPv4-Routes" msgstr "" "Aktív IPv4 útvonalak" @@ -278,6 +269,15 @@ msgstr "" msgid "Alert" msgstr "Riasztás" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -290,6 +290,9 @@ msgid "Allow SSH password authentication" msgstr "" "SSH jelszó hitelesítés engedélyezése" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "Összes engedélyezése a felsoroltakon kívül" @@ -322,12 +325,12 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -405,11 +408,14 @@ msgstr "Antenna beállítások" msgid "Any zone" msgstr "Bármelyik zóna" -msgid "Apply" -msgstr "Alkalmaz" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" -msgstr "Módosítások alkalmazása" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -425,6 +431,9 @@ msgstr "" msgid "Associated Stations" msgstr "Kapcsolódó kliensek" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -500,12 +509,12 @@ msgstr "Vissza az áttekintéshez" msgid "Back to scan results" msgstr "Vissza a felderítési eredményekhez" +msgid "Backup" +msgstr "Mentés" + msgid "Backup / Flash Firmware" msgstr "Mentés / Firmware frissítés" -msgid "Backup / Restore" -msgstr "Mentés / Visszaállítás" - msgid "Backup file list" msgstr "Mentési fájl lista" @@ -515,7 +524,7 @@ msgstr "Hibás címet adott meg!" msgid "Band" msgstr "" -msgid "Behind NAT" +msgid "Beacon Interval" msgstr "" msgid "" @@ -575,6 +584,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "Processzor használat (%)" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "Mégsem" @@ -590,6 +602,9 @@ msgstr "Módosítások" msgid "Changes applied." msgstr "A módosítások alkalmazva." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "" "Itt módosíthatja az eszköz eléréséhez szükséges adminisztrátori jelszót" @@ -597,6 +612,11 @@ msgstr "" msgid "Channel" msgstr "Csatorna" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Ellenőrzés" @@ -636,13 +656,10 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" "Kattintson az \"Archívum készítése\" gombra a jelenlegi konfiguráció tar " -"archívumként történő letöltéséhez. A firmware kezdeti állapotának " -"visszaállításához kattintson a \"Visszaállítás végrehajtása\" gombra (csak " -"squashfs image-ek esetén lehetséges)." +"archívumként történő letöltéséhez." msgid "Client" msgstr "Ügyfél" @@ -679,12 +696,18 @@ msgstr "" msgid "Configuration" msgstr "Beállítás" -msgid "Configuration applied." -msgstr "Beállítások alkalmazva." +msgid "Configuration failed" +msgstr "" msgid "Configuration files will be kept." msgstr "A konfigurációs fájlok megmaradnak." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Megerősítés" @@ -697,12 +720,18 @@ msgstr "Kapcsolódva" msgid "Connection Limit" msgstr "Kapcsolati korlát" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "Kapcsolatok" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Ország" @@ -756,9 +785,6 @@ msgstr "" "Az eszköz LED-jei működésének " "testreszabása." -msgid "DHCP Leases" -msgstr "DHCP bérletek" - msgid "DHCP Server" msgstr "DHCP kiszolgáló" @@ -771,9 +797,6 @@ msgstr "DHCP ügyfél" msgid "DHCP-Options" msgstr "DHCP beállítások" -msgid "DHCPv6 Leases" -msgstr "DHCPv6 bérletek" - msgid "DHCPv6 client" msgstr "" @@ -813,6 +836,9 @@ msgstr "" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "DUID" @@ -831,9 +857,6 @@ msgstr "Alapértelmezett átjáró" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Alapértelmezett állapot" @@ -854,6 +877,9 @@ msgstr "Törlés" msgid "Delete this network" msgstr "Hálózat törlése" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "Leírás" @@ -872,7 +898,10 @@ msgstr "Eszköz beállítások" msgid "Device is rebooting..." msgstr "" -msgid "Device unreachable" +msgid "Device unreachable!" +msgstr "" + +msgid "Device unreachable! Still waiting for device..." msgstr "" msgid "Diagnostics" @@ -900,15 +929,27 @@ msgstr "DNS beállítás letiltása" msgid "Disable Encryption" msgstr "" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "Letiltva" msgid "Disabled (default)" msgstr "" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "Beérkező RFC1918 DHCP válaszok elvetése. " +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Csak azon csomagok megjelenítése, amelyek tartalmazzák" @@ -962,6 +1003,9 @@ msgstr "" "Ne továbbítsa a DNS-név nélküli " "DNS-kéréseket " +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "Csomag letöltése és telepítése" @@ -1079,6 +1123,9 @@ msgstr "" msgid "Enable this mount" msgstr "A csatolás engedélyezése" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "A lapozó terület engedélyezése" @@ -1111,6 +1158,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "Törlés..." @@ -1170,6 +1223,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Fájl" @@ -1188,6 +1244,9 @@ msgstr "Privát kérések szűrése" msgid "Filter useless" msgstr "Használhahatlan kérések szűrése" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1241,6 +1300,9 @@ msgstr "Flash-elés..." msgid "Force" msgstr "Kényszerítés" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "CCMP (AES) kényszerítése" @@ -1293,7 +1355,7 @@ msgstr "Szabad hely" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1305,6 +1367,9 @@ msgstr "Csak GPRS" msgid "Gateway" msgstr "Átjáró" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "Átjáró portok" @@ -1365,9 +1430,6 @@ msgstr "Befejezés" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1382,9 +1444,6 @@ msgstr "" "Nyilvános kulcs alapú SSH azonosításhoz itt adhat meg nyilvános SSH " "kulcsokat (soronként egyet)." -msgid "Hermes 802.11b Wireless Controller" -msgstr "Hermes 802.11b vezeték nélküli vezérlő" - msgid "Hide ESSID" msgstr "ESSID elrejtése" @@ -1400,6 +1459,9 @@ msgstr "Host lejárati idő" msgid "Host-IP or Network" msgstr "Host-IP vagy hálózat" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "Gépnév" @@ -1421,14 +1483,20 @@ msgstr "" msgid "IP address" msgstr "IP cím" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "IPv4" msgid "IPv4 Firewall" msgstr "IPv4 tűzfal" -msgid "IPv4 WAN Status" -msgstr "IPv4 WAN állapot" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "IPv4 cím" @@ -1478,15 +1546,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "IPv6 WAN állapot" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "IPv6 cím" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1596,6 +1661,9 @@ msgstr "Bejövő" msgid "Info" msgstr "Információk" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "Indítási állomány" @@ -1632,21 +1700,12 @@ msgstr "Interfész áttekintés" msgid "Interface is reconnecting..." msgstr "Interfész újracsatlakoztatása..." -msgid "Interface is shutting down..." -msgstr "Interfész leállítása..." - msgid "Interface name" msgstr "" msgid "Interface not present or not connected yet." msgstr "Az interfész nincs jelen, vagy még nincs csatlakoztatva." -msgid "Interface reconnected" -msgstr "Interfész újracsatlakoztatva" - -msgid "Interface shut down" -msgstr "Interfész leállítás" - msgid "Interfaces" msgstr "Interfészek" @@ -1842,6 +1901,9 @@ msgstr "Átlagos terhelés" msgid "Loading" msgstr "Betöltés" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1914,6 +1976,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "A legalacsonyabb bérleti címnek az interfész címétől való távolsága" +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "MAC-cím" @@ -1929,6 +1994,9 @@ msgstr "MAC-lista" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -2008,6 +2076,9 @@ msgstr "" msgid "Modem device" msgstr "Modemeszköz" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "Modem inicializálás időtúllépés" @@ -2081,9 +2152,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Kijelölt NTP kiszolgálók" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Név" @@ -2108,6 +2176,9 @@ msgstr "Hálózati eszközök" msgid "Network boot image" msgstr "Hálózati rendszertöltő lemezkép" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "Interfészhez nem rendelt hálózat" @@ -2129,6 +2200,9 @@ msgstr "Nem találhatók fájlok" msgid "No information available" msgstr "Nincs elérhető információ" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "Nincs negatív gyorsítótár" @@ -2147,6 +2221,9 @@ msgstr "Nincs jelszó!" msgid "No rules in this chain" msgstr "Ez a lánc nem tartalmaz szabályokat" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "Nincs hozzárendelt zóna" @@ -2207,6 +2284,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Kikapcsolt állapot késleltetés" @@ -2257,12 +2337,6 @@ msgstr "Beállítás eltávolítva" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2283,6 +2357,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2363,6 +2440,9 @@ msgstr "PID" msgid "PIN" msgstr "PIN" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2450,6 +2530,9 @@ msgstr "Csúcs:" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2520,9 +2603,6 @@ msgstr "" msgid "Prevents client-to-client communication" msgstr "Ügyfél-ügyfél közötti kommunikáció megakadályozása" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "Prism2/2.5/3 802.11b vezeték nélküli vezérlő" - msgid "Private Key" msgstr "" @@ -2571,6 +2651,11 @@ msgstr "" msgid "Quality" msgstr "Minőség" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2589,9 +2674,6 @@ msgstr "RX" msgid "RX Rate" msgstr "RX sebesség" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "RaLink 802.11%s vezeték nélküli vezérlő" - msgid "Radius-Accounting-Port" msgstr "Radius-Naplózási-Port" @@ -2610,6 +2692,9 @@ msgstr "Radius-Hitelesítés-Kulcs" msgid "Radius-Authentication-Server" msgstr "Radius-Hitelesítés-Kiszolgáló" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" @@ -2618,15 +2703,12 @@ msgstr "" "Configuration Protocol\">DHCP kiszolgáló beállításához" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" -"Biztosan törli az interfészt? A törlés nem visszavonható!\n" -" Lehet, hogy elveszti a hozzáférést az eszközhöz, amennyiben ezen az " -"interfészen keresztül kapcsolódik." msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" "Biztosan törli ezt a vezetéknélküli hálózatot? A törlés nem visszavonható!\n" @@ -2636,23 +2718,6 @@ msgstr "" msgid "Really reset all changes?" msgstr "Biztos, hogy visszavonja az összes módosítást?" -#, fuzzy -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" -"Biztos, hogy leállítja a hálózatot?!\n" -" Lehet, hogy elveszti a hozzáférést az eszközhöz, amennyiben ezen a " -"hálózaton keresztül kapcsolódik." - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" -"Biztos, hogy leállítja a \"%s\" interfészt?\n" -" Lehet, hogy elveszti a hozzáférést az eszközhöz, amennyiben ezen az " -"interfészen keresztül kapcsolódik." - msgid "Really switch protocol?" msgstr "Biztos, hogy cserélni szeretné a protokollt?" @@ -2698,9 +2763,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "Csatlakoztassa újra az interfészt" -msgid "Reconnecting interface" -msgstr "Interfész újracsatlakoztatása" - msgid "References" msgstr "Hivatkozások" @@ -2740,9 +2802,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2793,6 +2852,12 @@ msgstr "Újraindítás" msgid "Restart Firewall" msgstr "Tűzfal újraindítása" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "Visszaállítás" + msgid "Restore backup" msgstr "Biztonsági mentés visszaállítása" @@ -2802,6 +2867,15 @@ msgstr "Jelszó mutatása/elrejtése" msgid "Revert" msgstr "Visszavonás" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Gyökérkönyvtár" @@ -2817,9 +2891,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2845,14 +2916,6 @@ msgstr "Fájlrendszer ellenőrzés futtatása" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2880,12 +2943,12 @@ msgstr "Mentés" msgid "Save & Apply" msgstr "Mentés & Alkalmazás" -msgid "Save & Apply" -msgstr "Mentés & Alkalmazás" - msgid "Scan" msgstr "Felderítés" +msgid "Scan request failed" +msgstr "" + msgid "Scheduled Tasks" msgstr "Ütemezett feladatok" @@ -2911,17 +2974,6 @@ msgstr "Kliensek szétválasztása" msgid "Server Settings" msgstr "Kiszolgáló beállításai" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Szolgáltatás neve" @@ -2940,6 +2992,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "Idő szinkronizálás beállítása" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "DHCP kiszolgáló beállítása" @@ -2949,15 +3007,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "Mentendő fájlok aktuális listájának megjelenítése" msgid "Shutdown this interface" msgstr "Interfész leállítása" -msgid "Shutdown this network" -msgstr "Hálózat leállítása" - msgid "Signal" msgstr "Jel" @@ -3012,15 +3070,9 @@ msgstr "" "telepítését manuálisan kell elvégezni. Az eszközhöz tartozó telepítési " "utasításokért keresse fel az wiki-t." -msgid "Sort" -msgstr "Sorbarendezés" - msgid "Source" msgstr "Forrás" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "Megadja az eszköz csatlakozási könyvtárát." @@ -3062,6 +3114,12 @@ msgstr "Indítás" msgid "Start priority" msgstr "Indítás prioritása" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "Rendszerindítás" @@ -3223,9 +3281,22 @@ msgstr "" "A következő karakterek használhatók: A-Z, a-z, " "0-9 and _" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3252,9 +3323,6 @@ msgstr "" "ellenőrzéséhez.
Kattintson az alábbi \"Folytatás\" gombra a flash-elési " "eljárás elindításához." -msgid "The following changes have been committed" -msgstr "A következő módosítások lettek alkalmazva" - msgid "The following changes have been reverted" msgstr "A következő módosítások lettek visszavonva" @@ -3323,11 +3391,6 @@ msgstr "" "eléréséhez a beállításaitól függően szükséges lehet a számítógépe IP-címének " "megújítása." -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3338,8 +3401,8 @@ msgstr "" msgid "There are no active leases." msgstr "Nincsenek aktív bérletek." -msgid "There are no pending changes to apply!" -msgstr "Nincsenek alkalmazásra váró módosítások!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Nincsenek visszavonásra váró változtatások!" @@ -3447,10 +3510,13 @@ msgstr "Időzóna" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" "Itt tölthet fel egy korábban létrehozott biztonsági mentés archívumot a " -"konfigurációs fájlok visszaállításához." +"konfigurációs fájlok visszaállításához. A firmware kezdeti állapotának " +"visszaállításához kattintson a \"Visszaállítás végrehajtása\" gombra (csak " +"squashfs image-ek esetén lehetséges)." msgid "Tone" msgstr "" @@ -3494,15 +3560,6 @@ msgstr "Tunnel interfész" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Adóteljesítmény" @@ -3527,9 +3584,27 @@ msgstr "" msgid "UUID" msgstr "UUID" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "Nem indiítható" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3539,6 +3614,9 @@ msgstr "Ismeretlen" msgid "Unknown Error, password not changed!" msgstr "Ismeretlen hiba, a jelszó nem lett megváltoztatva!" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "Nem kezelt" @@ -3548,9 +3626,18 @@ msgstr "" msgid "Unsaved Changes" msgstr "El nem mentett módosítások" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "Nem támogatott protokoll típus." +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "Listák frissítése" @@ -3682,18 +3769,15 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "DHCP kérés során küldendő 'Vendor Class'" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Ellenőrzés" msgid "Version" msgstr "Verzió" +msgid "Virtual dynamic interface" +msgstr "" + msgid "WDS" msgstr "WDS" @@ -3719,16 +3803,15 @@ msgstr "" "WPA titkosításhoz kliens módnál 'wpa_supplicant', hozzáférési pont illetve " "ad-hoc módnál 'hostapd' telepítése szükséges." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "Várakozás a változtatások alkalmazására..." msgid "Waiting for command to complete..." msgstr "Várakozás a parancs befejezésére..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3743,12 +3826,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3770,8 +3847,11 @@ msgstr "Vezetéknélküli rész áttekintés" msgid "Wireless Security" msgstr "Vezetéknélküli biztonság" -msgid "Wireless is disabled or not associated" -msgstr "Vezetéknélküli hálózat le van tiltva vagy nincs kapcsolódva" +msgid "Wireless is disabled" +msgstr "Vezetéknélküli hálózat le van tiltva" + +msgid "Wireless is not associated" +msgstr "Vezetéknélküli hálózat nincs kapcsolódva" msgid "Wireless is restarting..." msgstr "Vezetéknélküli rész újraindítása folyamatban..." @@ -3782,12 +3862,6 @@ msgstr "Vezetéknélküli hálózat letiltva" msgid "Wireless network is enabled" msgstr "Vezetéknélküli hálózat engedélyezve" -msgid "Wireless restarted" -msgstr "Vezetéknélküli rész újraindítva" - -msgid "Wireless shut down" -msgstr "Vezetéknélküli rész leállítása" - msgid "Write received DNS requests to syslog" msgstr "A kapott DNS kéréseket írja a rendszernaplóba" @@ -3828,6 +3902,9 @@ msgstr "baseT" msgid "bridged" msgstr "áthidalt" +msgid "create" +msgstr "" + msgid "create:" msgstr "új:" @@ -3865,9 +3942,6 @@ msgstr "full-duplex" msgid "half-duplex" msgstr "half-duplex" -msgid "help" -msgstr "súgó" - msgid "hidden" msgstr "rejtett" @@ -3892,10 +3966,10 @@ msgstr "kbit/s" msgid "local DNS file" msgstr "helyi DNS fájl" -msgid "minimum 1280, maximum 1480" +msgid "minutes" msgstr "" -msgid "minutes" +msgid "mixed WPA/WPA2" msgstr "" msgid "no" @@ -3919,6 +3993,9 @@ msgstr "be" msgid "open" msgstr "nyitás" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" @@ -3970,6 +4047,103 @@ msgstr "igen" msgid "« Back" msgstr "« Vissza" +#~ msgid "%s - %s" +#~ msgstr "%s - %s" + +#~ msgid "Activate this network" +#~ msgstr "Hálózat aktiválása" + +#~ msgid "Hermes 802.11b Wireless Controller" +#~ msgstr "Hermes 802.11b vezeték nélküli vezérlő" + +#~ msgid "Interface is shutting down..." +#~ msgstr "Interfész leállítása..." + +#~ msgid "Interface reconnected" +#~ msgstr "Interfész újracsatlakoztatva" + +#~ msgid "Interface shut down" +#~ msgstr "Interfész leállítás" + +#~ msgid "Prism2/2.5/3 802.11b Wireless Controller" +#~ msgstr "Prism2/2.5/3 802.11b vezeték nélküli vezérlő" + +#~ msgid "RaLink 802.11%s Wireless Controller" +#~ msgstr "RaLink 802.11%s vezeték nélküli vezérlő" + +#~ msgid "" +#~ "Really shutdown interface \"%s\"? You might lose access to this device if " +#~ "you are connected via this interface." +#~ msgstr "" +#~ "Biztos, hogy leállítja a \"%s\" interfészt?\n" +#~ " Lehet, hogy elveszti a hozzáférést az eszközhöz, amennyiben ezen az " +#~ "interfészen keresztül kapcsolódik." + +#~ msgid "Reconnecting interface" +#~ msgstr "Interfész újracsatlakoztatása" + +#~ msgid "Shutdown this network" +#~ msgstr "Hálózat leállítása" + +#~ msgid "Wireless restarted" +#~ msgstr "Vezetéknélküli rész újraindítva" + +#~ msgid "Wireless shut down" +#~ msgstr "Vezetéknélküli rész leállítása" + +#~ msgid "DHCP Leases" +#~ msgstr "DHCP bérletek" + +#~ msgid "DHCPv6 Leases" +#~ msgstr "DHCPv6 bérletek" + +#~ msgid "" +#~ "Really delete this interface? The deletion cannot be undone! You might " +#~ "lose access to this device if you are connected via this interface." +#~ msgstr "" +#~ "Biztosan törli az interfészt? A törlés nem visszavonható!\n" +#~ " Lehet, hogy elveszti a hozzáférést az eszközhöz, amennyiben ezen az " +#~ "interfészen keresztül kapcsolódik." + +#, fuzzy +#~ msgid "" +#~ "Really shut down network? You might lose access to this device if you are " +#~ "connected via this interface." +#~ msgstr "" +#~ "Biztos, hogy leállítja a hálózatot?!\n" +#~ " Lehet, hogy elveszti a hozzáférést az eszközhöz, amennyiben ezen a " +#~ "hálózaton keresztül kapcsolódik." + +#~ msgid "Sort" +#~ msgstr "Sorbarendezés" + +#~ msgid "help" +#~ msgstr "súgó" + +#~ msgid "IPv4 WAN Status" +#~ msgstr "IPv4 WAN állapot" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "IPv6 WAN állapot" + +#~ msgid "Apply" +#~ msgstr "Alkalmaz" + +#~ msgid "Applying changes" +#~ msgstr "Módosítások alkalmazása" + +#~ msgid "Configuration applied." +#~ msgstr "Beállítások alkalmazva." + +#~ msgid "Save & Apply" +#~ msgstr "Mentés & Alkalmazás" + +#~ msgid "The following changes have been committed" +#~ msgstr "A következő módosítások lettek alkalmazva" + +#~ msgid "There are no pending changes to apply!" +#~ msgstr "Nincsenek alkalmazásra váró módosítások!" + #~ msgid "Action" #~ msgstr "Művelet" diff --git a/luci-base/po/it/base.po b/luci-base/po/it/base.po index ce866d9e7..e4769bf01 100644 --- a/luci-base/po/it/base.po +++ b/luci-base/po/it/base.po @@ -49,6 +49,9 @@ msgstr "" msgid "-- match by uuid --" msgstr "" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "Carico in 1 minuto:" @@ -158,9 +161,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "Max. Richiesta in uso" -msgid "%s - %s" -msgstr "%s - %s" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -177,9 +177,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -216,9 +213,6 @@ msgstr "Numero dispositivo ATM " msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Accesso Concentratore" @@ -228,9 +222,6 @@ msgstr "Punto di Accesso" msgid "Actions" msgstr "Azioni" -msgid "Activate this network" -msgstr "Attiva questa rete" - msgid "Active IPv4-Routes" msgstr "" "Instradamento IPv4 " @@ -287,6 +278,15 @@ msgstr "" msgid "Alert" msgstr "Allerta" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -300,6 +300,9 @@ msgstr "" "Permetti autenticazione SSH tramite " "password" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "Consenti tutti tranne quelli nell'elenco" @@ -331,12 +334,12 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -414,11 +417,14 @@ msgstr "Configurazione dell'Antenna" msgid "Any zone" msgstr "Qualsiasi Zona" -msgid "Apply" -msgstr "Applica" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" -msgstr "Applica modifiche" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -434,6 +440,9 @@ msgstr "" msgid "Associated Stations" msgstr "Dispositivi Wi-Fi connessi" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -509,12 +518,12 @@ msgstr "Ritorna alla panoramica" msgid "Back to scan results" msgstr "Ritorno ai risultati della scansione" +msgid "Backup" +msgstr "Copia di Sicurezza" + msgid "Backup / Flash Firmware" msgstr "Copia di Sicurezza / Flash Firmware" -msgid "Backup / Restore" -msgstr "Copia di Sicurezza / Ripristina" - msgid "Backup file list" msgstr "Elenco dei file di cui effettuare una copia di sicurezza" @@ -524,7 +533,7 @@ msgstr "E' stato specificato un indirizzo errato!" msgid "Band" msgstr "" -msgid "Behind NAT" +msgid "Beacon Interval" msgstr "" msgid "" @@ -583,6 +592,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "Uso CPU (%)" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "Annulla" @@ -598,12 +610,20 @@ msgstr "Modifiche" msgid "Changes applied." msgstr "Modifiche applicate." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Cambia la password di amministratore per accedere al dispositivo" msgid "Channel" msgstr "Canale" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Verifica" @@ -642,12 +662,10 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" "Premi su \"Genera archivio\" per scaricare un archivio tar di backup dei " -"file di configurazione attuali. Per ripristinare il firmware al suo stato " -"iniziale premi \"Esegui Ripristino\" (solo per firmware basati su squashfs)." +"file di configurazione attuali." msgid "Client" msgstr "Cliente" @@ -684,12 +702,18 @@ msgstr "" msgid "Configuration" msgstr "Configurazione" -msgid "Configuration applied." -msgstr "Configurazione salvata." +msgid "Configuration failed" +msgstr "" msgid "Configuration files will be kept." msgstr "I file di configurazione verranno mantenuti." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Conferma" @@ -702,12 +726,18 @@ msgstr "Connesso" msgid "Connection Limit" msgstr "Limite connessioni" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "Connessioni" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Nazione" @@ -761,9 +791,6 @@ msgstr "" "Personalizza la configurazione dei LED del sistema se possibile." -msgid "DHCP Leases" -msgstr "Contratti DHCP" - msgid "DHCP Server" msgstr "Server DHCP" @@ -776,9 +803,6 @@ msgstr "Cliente DHCP" msgid "DHCP-Options" msgstr "Opzioni DHCP" -msgid "DHCPv6 Leases" -msgstr "Contratti DHCPv6" - msgid "DHCPv6 client" msgstr "Cliente DHCPv6" @@ -818,6 +842,9 @@ msgstr "" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "DUID" @@ -836,9 +863,6 @@ msgstr "Gateway predefinito" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Stato Predefinito" @@ -860,6 +884,9 @@ msgstr "Elimina" msgid "Delete this network" msgstr "Rimuovi questa rete" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "Descrizione" @@ -878,9 +905,12 @@ msgstr "Configurazione del dispositivo" msgid "Device is rebooting..." msgstr "Dispositivo in riavvio..." -msgid "Device unreachable" +msgid "Device unreachable!" msgstr "Dispositivo irraggiungibile" +msgid "Device unreachable! Still waiting for device..." +msgstr "" + msgid "Diagnostics" msgstr "Diagnostica" @@ -906,15 +936,27 @@ msgstr "Disabilita il setup dei DNS" msgid "Disable Encryption" msgstr "Disabilita Crittografia" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "Disabilitato" msgid "Disabled (default)" msgstr "Disabilitato (default)" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "Ignora risposte RFC1918 upstream" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Visualizza solo i pacchetti contenenti" @@ -967,6 +1009,9 @@ msgstr "" "Non inoltrare le richieste DNS " "senza nome DNS" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "Scarica e installa pacchetto" @@ -1082,6 +1127,9 @@ msgstr "Abilita l'opzione DF (non Frammentare) dei pacchetti incapsulati" msgid "Enable this mount" msgstr "Abilita questo mount" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "Abilita questo swap" @@ -1114,6 +1162,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "Cancellazione..." @@ -1174,6 +1228,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "File" @@ -1192,6 +1249,9 @@ msgstr "Filtra privati" msgid "Filter useless" msgstr "Filtra inutili" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1245,6 +1305,9 @@ msgstr "Flashing..." msgid "Force" msgstr "Forza" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "Forza CCMP (AES)" @@ -1295,7 +1358,7 @@ msgstr "Spazio libero" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1307,6 +1370,9 @@ msgstr "Solo GPRS" msgid "Gateway" msgstr "Gateway" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "Porte Gateway" @@ -1369,9 +1435,6 @@ msgstr "Hangup" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1386,9 +1449,6 @@ msgstr "" "Qui è possibile incollare le chiavi pubbliche SSH (uno per riga) per " "l'autenticazione con chiave pubblica SSH." -msgid "Hermes 802.11b Wireless Controller" -msgstr "Dispositivo Wireless Hermes 802.11b" - msgid "Hide ESSID" msgstr "Nascondi ESSID" @@ -1405,6 +1465,9 @@ msgid "Host-IP or Network" msgstr "" "IP dell'host o rete" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "Hostname" @@ -1426,14 +1489,20 @@ msgstr "Indirizzi IP" msgid "IP address" msgstr "Indirizzo IP" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "IPv4" msgid "IPv4 Firewall" msgstr "IPv4 Firewall" -msgid "IPv4 WAN Status" -msgstr "Stato WAN IPv4" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "Indirizzi IPv4" @@ -1483,15 +1552,12 @@ msgstr "Impostazioni IPv6" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "Stato WAN IPv6" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "Indirizzi IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1603,6 +1669,9 @@ msgstr "In entrata:" msgid "Info" msgstr "Informazioni" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "Script di avvio" @@ -1639,21 +1708,12 @@ msgstr "Riassunto Interfaccia" msgid "Interface is reconnecting..." msgstr "L'interfaccia si sta ricollegando..." -msgid "Interface is shutting down..." -msgstr "L'intefaccia si sta spegnendo..." - msgid "Interface name" msgstr "Nome Interfaccia" msgid "Interface not present or not connected yet." msgstr "Interfaccia non presente o non ancora connessa." -msgid "Interface reconnected" -msgstr "Interfaccia ricollegata." - -msgid "Interface shut down" -msgstr "Interfaccia spenta" - msgid "Interfaces" msgstr "Interfacce" @@ -1844,6 +1904,9 @@ msgstr "Carico Medio" msgid "Loading" msgstr "Caricamento" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1914,6 +1977,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "" +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "" @@ -1929,6 +1995,9 @@ msgstr "Lista MAC" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "" @@ -2008,6 +2077,9 @@ msgstr "Modello" msgid "Modem device" msgstr "Dispositivo modem" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "" @@ -2081,9 +2153,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Candidati server NTP" -msgid "NTP sync time-out" -msgstr "Sincronizzazione NTP scaduta" - msgid "Name" msgstr "Nome" @@ -2108,6 +2177,9 @@ msgstr "Utilità di Rete" msgid "Network boot image" msgstr "" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "Rete senza interfaccia" @@ -2129,6 +2201,9 @@ msgstr "Nessun file trovato" msgid "No information available" msgstr "Nessuna informazione disponibile" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "" @@ -2147,6 +2222,9 @@ msgstr "Nessuna password immessa!" msgid "No rules in this chain" msgstr "Nessuna regola in questa catena" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "Nessuna zona assegnata" @@ -2207,6 +2285,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2257,12 +2338,6 @@ msgstr "Opzione cancellata" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2283,6 +2358,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2363,6 +2441,9 @@ msgstr "PID" msgid "PIN" msgstr "" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2450,6 +2531,9 @@ msgstr "Picco:" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2518,9 +2602,6 @@ msgstr "" msgid "Prevents client-to-client communication" msgstr "Impedisci la comunicazione fra Client" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "" - msgid "Private Key" msgstr "" @@ -2569,6 +2650,11 @@ msgstr "" msgid "Quality" msgstr "Qualità" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2587,9 +2673,6 @@ msgstr "" msgid "RX Rate" msgstr "Velocità RX" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "" - msgid "Radius-Accounting-Port" msgstr "" @@ -2608,6 +2691,9 @@ msgstr "" msgid "Radius-Authentication-Server" msgstr "" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" @@ -2616,31 +2702,21 @@ msgstr "" "\"Dynamic Host Configuration Protocol\">DHCP" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" +"Vuoi davvero rimuovere questa interfaccia wireless? La rimozione non può " +"essere ripristinata! Potresti perdere l'accesso a questo dispositivo se sei " +"connesso con questa rete." msgid "Really reset all changes?" msgstr "Azzerare veramente tutte le modifiche?" -#, fuzzy -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" -"Vuoi davvero spegnere questa interfaccia \"%s\" ?\\nPotresti perdere " -"l'accesso a questo router se stai usando questa interfaccia." - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" - msgid "Really switch protocol?" msgstr "Cambiare veramente il protocollo?" @@ -2686,9 +2762,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "Ricollega questa interfaccia" -msgid "Reconnecting interface" -msgstr "Sto ricollegando l'interfaccia" - msgid "References" msgstr "Riferimenti" @@ -2728,9 +2801,6 @@ msgstr "Richiede indirizzo-IPv6" msgid "Request IPv6-prefix of length" msgstr "Richiede prefisso-IPv6 di lunghezza" -msgid "Require TLS" -msgstr "Richiede TLS" - msgid "Required" msgstr "Richiesto" @@ -2780,6 +2850,12 @@ msgstr "Riavvia" msgid "Restart Firewall" msgstr "Riavvia Firewall" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "Ripristina" + msgid "Restore backup" msgstr "Ripristina backup" @@ -2789,6 +2865,15 @@ msgstr "Rivela/nascondi password" msgid "Revert" msgstr "Ripristina" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2804,9 +2889,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2832,14 +2914,6 @@ msgstr "Esegui controllo del filesystem" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2867,12 +2941,12 @@ msgstr "Salva" msgid "Save & Apply" msgstr "Salva & applica" -msgid "Save & Apply" -msgstr "Salva & Applica" - msgid "Scan" msgstr "Scan" +msgid "Scan request failed" +msgstr "" + msgid "Scheduled Tasks" msgstr "Operazioni programmate" @@ -2896,17 +2970,6 @@ msgstr "Isola utenti" msgid "Server Settings" msgstr "Impostazioni Server" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "" @@ -2924,6 +2987,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "" @@ -2933,15 +3002,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "" msgid "Shutdown this interface" msgstr "" -msgid "Shutdown this network" -msgstr "" - msgid "Signal" msgstr "Segnale" @@ -2997,15 +3066,9 @@ msgstr "" "riferimento al wiki per le istruzioni di installazione di dispositivi " "specifici." -msgid "Sort" -msgstr "Ordina" - msgid "Source" msgstr "Origine" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "Specifica la cartella a cui è collegato il dispositivo in" @@ -3048,6 +3111,12 @@ msgstr "Inizio" msgid "Start priority" msgstr "Priorità di avvio" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "Avvio" @@ -3209,9 +3278,22 @@ msgid "" "code> and _" msgstr "" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3233,9 +3315,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "Le seguenti modifiche sono state annullate" @@ -3293,11 +3372,6 @@ msgstr "" "address of your computer to reach the device again, depending on your " "settings." -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3308,8 +3382,8 @@ msgstr "" msgid "There are no active leases." msgstr "Non ci sono contratti attivi." -msgid "There are no pending changes to apply!" -msgstr "Non ci sono cambiamenti pendenti da applicare!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Non ci sono cambiamenti pendenti da regredire" @@ -3404,10 +3478,12 @@ msgstr "Fuso orario" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" "Per ripristinare i file configurazione, puoi inviare un archivio di backup " -"generato precedentemente qui." +"generato precedentemente qui. Per ripristinare il firmware al suo stato " +"iniziale premi \"Esegui Ripristino\" (solo per firmware basati su squashfs)." msgid "Tone" msgstr "" @@ -3451,15 +3527,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3484,9 +3551,27 @@ msgstr "Porte USB" msgid "UUID" msgstr "" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3496,6 +3581,9 @@ msgstr "Sconosciuto" msgid "Unknown Error, password not changed!" msgstr "Errore sconosciuto, password non cambiata!" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "Non gestito" @@ -3505,9 +3593,18 @@ msgstr "Smonta" msgid "Unsaved Changes" msgstr "Modifiche non salvate" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "Tipo protocollo non supportato." +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "Aggiorna liste" @@ -3641,18 +3738,15 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "Classe del Produttore da 'inviare al momento della richiesta DHCP" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Verifica" msgid "Version" msgstr "Versione" +msgid "Virtual dynamic interface" +msgstr "" + msgid "WDS" msgstr "WDS" @@ -3678,18 +3772,15 @@ msgstr "" "La crittografia WPA richiede wpa_supplicant (per la modalità client) o " "hostapd (per AP e modalità ad hoc) per essere installato." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" -"Attendi sincro NTP quei dati secondi, immetti 0 per disabilitare l'attesa " -"(opzionale)" - msgid "Waiting for changes to be applied..." msgstr "In attesa delle modifiche da applicare ..." msgid "Waiting for command to complete..." msgstr "In attesa del comando da completare..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3704,12 +3795,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3731,8 +3816,11 @@ msgstr "Panoramica Wireless" msgid "Wireless Security" msgstr "Sicurezza Wireless" -msgid "Wireless is disabled or not associated" -msgstr "La rete Wireless è disattivata o non associata" +msgid "Wireless is disabled" +msgstr "La rete Wireless è disattivata" + +msgid "Wireless is not associated" +msgstr "La rete Wireless è non associata" msgid "Wireless is restarting..." msgstr "Riavvio della Wireless..." @@ -3743,12 +3831,6 @@ msgstr "La rete Wireless è disattivata" msgid "Wireless network is enabled" msgstr "La rete wireless è attivata" -msgid "Wireless restarted" -msgstr "Wireless riavviato" - -msgid "Wireless shut down" -msgstr "Wireless spento" - msgid "Write received DNS requests to syslog" msgstr "Scrittura delle richiesta DNS ricevute nel syslog" @@ -3790,6 +3872,9 @@ msgstr "baseT" msgid "bridged" msgstr "ponte" +msgid "create" +msgstr "" + msgid "create:" msgstr "crea:" @@ -3827,9 +3912,6 @@ msgstr "full-duplex" msgid "half-duplex" msgstr "half-duplex" -msgid "help" -msgstr "aiuto" - msgid "hidden" msgstr "nascosto" @@ -3854,10 +3936,10 @@ msgstr "kbit/s" msgid "local DNS file" msgstr "File DNS locale" -msgid "minimum 1280, maximum 1480" +msgid "minutes" msgstr "" -msgid "minutes" +msgid "mixed WPA/WPA2" msgstr "" msgid "no" @@ -3881,6 +3963,9 @@ msgstr "acceso" msgid "open" msgstr "apri" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" @@ -3932,84 +4017,56 @@ msgstr "Sì" msgid "« Back" msgstr "« Indietro" -#~ msgid "Action" -#~ msgstr "Azione" +#~ msgid "%s - %s" +#~ msgstr "%s - %s" -#~ msgid "Buttons" -#~ msgstr "Pulsanti" +#~ msgid "Activate this network" +#~ msgstr "Attiva questa rete" -#~ msgid "Handler" -#~ msgstr "Gestore" +#~ msgid "Hermes 802.11b Wireless Controller" +#~ msgstr "Dispositivo Wireless Hermes 802.11b" -#~ msgid "Maximum hold time" -#~ msgstr "Tempo massimo di attesa" +#~ msgid "Interface is shutting down..." +#~ msgstr "L'intefaccia si sta spegnendo..." -#~ msgid "Minimum hold time" -#~ msgstr "Velocità minima" +#~ msgid "Interface reconnected" +#~ msgstr "Interfaccia ricollegata." -#~ msgid "Specifies the button state to handle" -#~ msgstr "Specifica lo stato del pulsante da gestire" +#~ msgid "Interface shut down" +#~ msgstr "Interfaccia spenta" -#~ msgid "Leasetime" -#~ msgstr "Tempo di contratto" +#~ msgid "" +#~ "Really shutdown interface \"%s\"? You might lose access to this device if " +#~ "you are connected via this interface." +#~ msgstr "" +#~ "Vuoi davvero spegnere questa interfaccia \"%s\"? Potresti perdere " +#~ "l'accesso a questo router se stai usando questa interfaccia." -#, fuzzy -#~ msgid "automatic" -#~ msgstr "statico" +#~ msgid "Reconnecting interface" +#~ msgstr "Sto ricollegando l'interfaccia" -#~ msgid "AR Support" -#~ msgstr "Supporto AR" +#~ msgid "Wireless restarted" +#~ msgstr "Wireless riavviato" -#~ msgid "Atheros 802.11%s Wireless Controller" -#~ msgstr "Dispositivo Wireless Atheros 802.11%s" +#~ msgid "Wireless shut down" +#~ msgstr "Wireless spento" -#~ msgid "Background Scan" -#~ msgstr "Scansione in background" +#~ msgid "DHCP Leases" +#~ msgstr "Contratti DHCP" -#~ msgid "Compression" -#~ msgstr "Compressione" +#~ msgid "DHCPv6 Leases" +#~ msgstr "Contratti DHCPv6" -#~ msgid "Disable HW-Beacon timer" -#~ msgstr "Disabilita Timer Beacon HW" +#~ msgid "" +#~ "Really shut down network?\\nYou might lose access to this device if you " +#~ "are connected via this interface." +#~ msgstr "" +#~ "Vuoi davvero spegnere questa interfaccia?\\nPotresti perdere l'accesso a " +#~ "questo router se sei connesso usando questa interfaccia." -#~ msgid "Do not send probe responses" -#~ msgstr "Disabilita Probe-Responses" - -#~ msgid "Fast Frames" -#~ msgstr "Frame veloci" - -#~ msgid "Maximum Rate" -#~ msgstr "Velocità massima" - -#~ msgid "Minimum Rate" -#~ msgstr "Velocità minima" - -#~ msgid "Multicast Rate" -#~ msgstr "Velocità multicast" - -#~ msgid "Separate WDS" -#~ msgstr "WDS separati" - -#~ msgid "Static WDS" -#~ msgstr "WDS statico" - -#~ msgid "Turbo Mode" -#~ msgstr "Modalità turbo" - -#~ msgid "XR Support" -#~ msgstr "Supporto XR" - -#~ msgid "An additional network will be created if you leave this unchecked." -#~ msgstr "Sarà creata una rete aggiuntiva se lasci questo senza spunta." - -#~ msgid "Join Network: Settings" -#~ msgstr "Aggiunta Rete: Impostazioni" - -#~ msgid "CPU" -#~ msgstr "CPU" - -#~ msgid "Port %d" -#~ msgstr "Porta %d" - -#~ msgid "VLAN Interface" -#~ msgstr "Interfaccia VLAN" +#~ msgid "" +#~ "Really shutdown interface \"%s\" ?\\nYou might lose access to this device " +#~ "if you are connected via this interface." +#~ msgstr "" +#~ "Vuoi davvero spegnere questa interfaccia \"%s\" ?\\nPotresti perdere " +#~ "l'accesso a questo router se stai usando questa interfaccia." diff --git a/luci-base/po/ja/base.po b/luci-base/po/ja/base.po index 07eeec5ee..fd60f84da 100644 --- a/luci-base/po/ja/base.po +++ b/luci-base/po/ja/base.po @@ -3,14 +3,14 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-06-10 03:40+0200\n" -"PO-Revision-Date: 2018-05-03 00:23+0900\n" +"PO-Revision-Date: 2018-07-20 15:27+0900\n" "Last-Translator: INAGAKI Hiroshi \n" "Language: ja\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-Generator: Poedit 2.0.7\n" +"X-Generator: Poedit 2.0.8\n" "Language-Team: \n" msgid "%.1f dB" @@ -49,6 +49,9 @@ msgstr "-- ラベルを指定 --" msgid "-- match by uuid --" msgstr "-- UUID を指定 --" +msgid "-- please select --" +msgstr "-- 選択してください --" + msgid "1 Minute Load:" msgstr "過去1分の負荷:" @@ -156,9 +159,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "最大 並列処理クエリ" -msgid "%s - %s" -msgstr "" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -175,9 +175,6 @@ msgstr "A43C + J43 + A43 + V43" msgid "ADSL" msgstr "ADSL" -msgid "AICCU (SIXXS)" -msgstr "AICCU (SIXXS)" - msgid "ANSI T1.413" msgstr "ANSI T1.413" @@ -211,9 +208,6 @@ msgstr "ATMデバイス番号" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Access Concentrator" @@ -223,9 +217,6 @@ msgstr "アクセスポイント" msgid "Actions" msgstr "動作" -msgid "Activate this network" -msgstr "このネットワークを有効にする" - msgid "Active IPv4-Routes" msgstr "" "稼働中の IPv4-経路情報" @@ -281,6 +272,15 @@ msgstr "" msgid "Alert" msgstr "警告" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "全てのサーバー" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -292,11 +292,14 @@ msgstr "" msgid "Allow SSH password authentication" msgstr "SSH パスワード認証を許可します。" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "AP モード動作時に、低 ACK（確認応答）状態の STA の切断を許可します。" + msgid "Allow all except listed" msgstr "リスト内の端末からのアクセスを禁止" msgid "Allow legacy 802.11b rates" -msgstr "" +msgstr "レガシー 802.11b レートを許可" msgid "Allow listed only" msgstr "リスト内の端末からのアクセスを許可" @@ -321,13 +324,15 @@ msgstr "" msgid "Allowed IPs" msgstr "許可されるIP" -msgid "" -"Also see Tunneling Comparison on SIXXS" -msgstr "" - msgid "Always announce default router" -msgstr "常にデフォルト ルーターとして通知する" +msgstr "常にデフォルト ルーターを通知する" + +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" +msgstr "" +"セカンダリ チャンネルの重複にかかわらず、常に 40MHz チャンネルを使用します。" +"このオプションの使用は、 IEEE 802.11n-2009 に準拠しません！" msgid "Annex" msgstr "" @@ -406,11 +411,14 @@ msgstr "アンテナ設定" msgid "Any zone" msgstr "全てのゾーン" -msgid "Apply" -msgstr "適用" +msgid "Apply request failed with status %h" +msgstr "適用リクエストはステータス %h により失敗しました" -msgid "Applying changes" -msgstr "変更を適用" +msgid "Apply unchecked" +msgstr "チェックなしの適用" + +msgid "Architecture" +msgstr "アーキテクチャ" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -424,7 +432,10 @@ msgid "" msgstr "" msgid "Associated Stations" -msgstr "認証済み端末" +msgstr "アソシエーション済み端末" + +msgid "Associations" +msgstr "アソシエーション数" msgid "Auth Group" msgstr "認証グループ" @@ -501,12 +512,12 @@ msgstr "概要へ戻る" msgid "Back to scan results" msgstr "スキャン結果へ戻る" +msgid "Backup" +msgstr "バックアップ" + msgid "Backup / Flash Firmware" msgstr "バックアップ / ファームウェア更新" -msgid "Backup / Restore" -msgstr "バックアップ / 復元" - msgid "Backup file list" msgstr "バックアップファイル リスト" @@ -516,8 +527,8 @@ msgstr "無効なアドレスです!" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" +msgid "Beacon Interval" +msgstr "ビーコン間隔" msgid "" "Below is the determined list of files to backup. It consists of changed " @@ -578,6 +589,9 @@ msgstr "CA証明書（空白の場合、初回の接続後に保存されます msgid "CPU usage (%)" msgstr "CPU使用率 (%)" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "キャンセル" @@ -593,12 +607,22 @@ msgstr "変更" msgid "Changes applied." msgstr "変更が適用されました。" +msgid "Changes have been reverted." +msgstr "変更は取り消されました。" + msgid "Changes the administrator password for accessing the device" msgstr "デバイスの管理者パスワードを変更します" msgid "Channel" msgstr "チャネル" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" +"チャンネル %d は、 %s 領域内では規制により利用できません。%d へ自動調整されま" +"した。" + msgid "Check" msgstr "チェック" @@ -638,13 +662,10 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" "\"バックアップ アーカイブの作成\"をクリックすると、現在の設定ファイルをtar形" -"式のアーカイブファイルとしてダウンロードします。設定のリセットを行う場" -"合、\"設定リセット\"をクリックしてください。(ただし、squashfsをお使いの場合の" -"み使用可能です)" +"式のアーカイブファイルとしてダウンロードします。" msgid "Client" msgstr "クライアント" @@ -685,12 +706,18 @@ msgstr "" msgid "Configuration" msgstr "設定" -msgid "Configuration applied." -msgstr "設定を適用しました。" +msgid "Configuration failed" +msgstr "" msgid "Configuration files will be kept." msgstr "設定ファイルは保持されます。" +msgid "Configuration has been applied." +msgstr "設定が適用されました。" + +msgid "Configuration has been rolled back!" +msgstr "設定はロールバックされました！" + msgid "Confirmation" msgstr "確認" @@ -703,12 +730,21 @@ msgstr "接続中" msgid "Connection Limit" msgstr "接続制限" -msgid "Connection to server fails when TLS cannot be used" -msgstr "TLSが使用できないとき、サーバーへの接続は失敗します。" +msgid "Connection attempt failed" +msgstr "接続の試行が失敗しました" msgid "Connections" msgstr "ネットワーク接続" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" +"設定の変更を適用後、デバイスへのアクセスを回復できませんでした。もし IP アド" +"レスや無線のセキュリティ認証情報などのネットワーク関連の設定を変更した場合、" +"再接続が必要かもしれません。" + msgid "Country" msgstr "国" @@ -766,9 +802,6 @@ msgstr "" "LED デバイスの挙動をカスタマイズ" "します。" -msgid "DHCP Leases" -msgstr "DHCPリース" - msgid "DHCP Server" msgstr "DHCPサーバー" @@ -781,9 +814,6 @@ msgstr "DHCP クライアント" msgid "DHCP-Options" msgstr "DHCPオプション" -msgid "DHCPv6 Leases" -msgstr "DHCPv6 リース" - msgid "DHCPv6 client" msgstr "DHCPv6 クライアント" @@ -823,6 +853,9 @@ msgstr "DSL ステータス" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "DTIM インターバル" + msgid "DUID" msgstr "DUID" @@ -841,9 +874,6 @@ msgstr "デフォルト ゲートウェイ" msgid "Default is stateless + stateful" msgstr "デフォルトは ステートレス + ステートフル です。" -msgid "Default route" -msgstr "デフォルト ルート" - msgid "Default state" msgstr "標準状態" @@ -864,6 +894,9 @@ msgstr "削除" msgid "Delete this network" msgstr "ネットワークを削除します" +msgid "Delivery Traffic Indication Message Interval" +msgstr "Delivery Traffic Indication Message インターバル" + msgid "Description" msgstr "詳細" @@ -882,9 +915,12 @@ msgstr "デバイス設定" msgid "Device is rebooting..." msgstr "デバイスを再起動中です..." -msgid "Device unreachable" +msgid "Device unreachable!" msgstr "デバイスに到達できません" +msgid "Device unreachable! Still waiting for device..." +msgstr "デバイスに到達できません！まだデバイスを待っています..." + msgid "Diagnostics" msgstr "診断機能" @@ -910,15 +946,27 @@ msgstr "DNSセットアップを無効にする" msgid "Disable Encryption" msgstr "暗号化を無効にする" +msgid "Disable this network" +msgstr "このネットワークを無効化" + msgid "Disabled" msgstr "無効" msgid "Disabled (default)" msgstr "無効（デフォルト）" +msgid "Disassociate On Low Acknowledgement" +msgstr "低 Acknowledgement 時のアソシエーション解除" + msgid "Discard upstream RFC1918 responses" msgstr "RFC1918の応答を破棄します" +msgid "Disconnection attempt failed" +msgstr "切断の試行が失敗しました" + +msgid "Dismiss" +msgstr "警告の除去" + msgid "Displaying only packages containing" msgstr "右記の文字列を含んだパッケージのみを表示中" @@ -971,6 +1019,9 @@ msgstr "" "DNS名の無い DNSリクエストを転送しません" +msgid "Down" +msgstr "下へ" + msgid "Download and install package" msgstr "パッケージのダウンロードとインストール" @@ -1020,6 +1071,8 @@ msgid "" "Edit the raw configuration data above to fix any error and hit \"Save\" to " "reload the page." msgstr "" +"上記の設定データを直接編集してエラーを修正し、 \"保存\" ボタンを押してこの" +"ページをリロードします。" msgid "Edit this interface" msgstr "インターフェースを編集" @@ -1088,6 +1141,9 @@ msgstr "カプセル化されたパケットの DF (Don't Fragment) フラグを msgid "Enable this mount" msgstr "マウント設定を有効にする" +msgid "Enable this network" +msgstr "このネットワークを有効化" + msgid "Enable this swap" msgstr "スワップ設定を有効にする" @@ -1104,6 +1160,8 @@ msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" msgstr "" +"同一のモビリティ ドメイン（モビリティ グループ）に属するアクセスポイント間の" +"高速ローミングを有効にします。" msgid "Enables the Spanning Tree Protocol on this bridge" msgstr "スパニングツリー プロトコルを有効にする" @@ -1120,6 +1178,12 @@ msgstr "エンドポイント ホスト" msgid "Endpoint Port" msgstr "エンドポイント ポート" +msgid "Enter custom value" +msgstr "カスタム値を入力" + +msgid "Enter custom values" +msgstr "カスタム値を入力" + msgid "Erasing..." msgstr "消去中..." @@ -1180,6 +1244,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "%d 秒以内の適用を確認できませんでした。ロールバック中です..." + msgid "File" msgstr "ファイル" @@ -1198,6 +1265,9 @@ msgstr "プライベートフィルター" msgid "Filter useless" msgstr "" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1253,6 +1323,9 @@ msgstr "更新中..." msgid "Force" msgstr "強制" +msgid "Force 40MHz mode" +msgstr "強制 40MHz モード" + msgid "Force CCMP (AES)" msgstr "CCMP (AES) を使用" @@ -1304,10 +1377,10 @@ msgstr "ディスクの空き容量" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" "WireGuard インターフェースとピアについての詳細情報: wireguard.io" +"wireguard.com\">wireguard.com" msgid "GHz" msgstr "GHz" @@ -1318,6 +1391,9 @@ msgstr "GPRSのみ" msgid "Gateway" msgstr "ゲートウェイ" +msgid "Gateway address is invalid" +msgstr "無効なゲートウェイ アドレスです" + msgid "Gateway ports" msgstr "ゲートウェイ ポート" @@ -1378,9 +1454,6 @@ msgstr "再起動" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "ハートビート" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1392,9 +1465,6 @@ msgid "" "authentication." msgstr "SSH公開鍵認証で使用するSSH公開鍵を1行づつペーストしてください。" -msgid "Hermes 802.11b Wireless Controller" -msgstr "Hermes 802.11b 無線LANコントローラ" - msgid "Hide ESSID" msgstr "ESSIDの隠匿" @@ -1411,6 +1481,9 @@ msgid "Host-IP or Network" msgstr "" "ホストIP または ネットワーク" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "ホスト名" @@ -1432,14 +1505,20 @@ msgstr "IPアドレス" msgid "IP address" msgstr "IPアドレス" +msgid "IP address in invalid" +msgstr "無効な IP アドレスです" + +msgid "IP address is missing" +msgstr "IP アドレスがありません" + msgid "IPv4" msgstr "IPv4" msgid "IPv4 Firewall" msgstr "IPv4 ファイアウォール" -msgid "IPv4 WAN Status" -msgstr "IPv4 WAN ステータス" +msgid "IPv4 Upstream" +msgstr "IPv4 アップストリーム" msgid "IPv4 address" msgstr "IPv4 アドレス" @@ -1489,15 +1568,12 @@ msgstr "IPv6 設定" msgid "IPv6 ULA-Prefix" msgstr "IPv6 ULA-プレフィクス" -msgid "IPv6 WAN Status" -msgstr "IPv6 WAN ステータス" +msgid "IPv6 Upstream" +msgstr "IPv6 アップストリーム" msgid "IPv6 address" msgstr "IPv6 アドレス" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1606,6 +1682,9 @@ msgstr "受信:" msgid "Info" msgstr "情報" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "起動スクリプト" @@ -1644,21 +1723,12 @@ msgstr "インターフェース一覧" msgid "Interface is reconnecting..." msgstr "インターフェース再接続中..." -msgid "Interface is shutting down..." -msgstr "インターフェース終了中..." - msgid "Interface name" msgstr "インターフェース名" msgid "Interface not present or not connected yet." msgstr "インターフェースが存在しないか、接続していません" -msgid "Interface reconnected" -msgstr "インターフェースの再接続" - -msgid "Interface shut down" -msgstr "インターフェースの終了" - msgid "Interfaces" msgstr "インターフェース" @@ -1853,6 +1923,9 @@ msgstr "システム平均負荷" msgid "Loading" msgstr "ロード中" +msgid "Local IP address is invalid" +msgstr "無効なローカル IP アドレスです" + msgid "Local IP address to assign" msgstr "割り当てるローカル IPアドレス" @@ -1922,6 +1995,9 @@ msgid "Lowest leased address as offset from the network address." msgstr "" "ネットワークアドレスをオフセットとして、最小のアドレスを設定してください" +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "MAC-アドレス" @@ -1937,6 +2013,9 @@ msgstr "MAC-リスト" msgid "MAP / LW4over6" msgstr "MAP / LW4over6" +msgid "MAP rule is invalid" +msgstr "無効な MAP ルールです" + msgid "MB/s" msgstr "MB/s" @@ -2008,7 +2087,7 @@ msgid "Missing protocol extension for proto %q" msgstr "プロトコル %qのプロトコル拡張が見つかりません" msgid "Mobility Domain" -msgstr "" +msgstr "モビリティ ドメイン" msgid "Mode" msgstr "モード" @@ -2019,6 +2098,9 @@ msgstr "モデル" msgid "Modem device" msgstr "モデム デバイス" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "モデム初期化タイムアウト" @@ -2063,10 +2145,10 @@ msgid "Mounted file systems" msgstr "マウント中のファイルシステム" msgid "Move down" -msgstr "下へ" +msgstr "下へ移動" msgid "Move up" -msgstr "上へ" +msgstr "上へ移動" msgid "Multicast address" msgstr "マルチキャスト アドレス" @@ -2092,9 +2174,6 @@ msgstr "NT ドメイン" msgid "NTP server candidates" msgstr "NTPサーバー候補" -msgid "NTP sync time-out" -msgstr "NTP 同期タイムアウト" - msgid "Name" msgstr "名前" @@ -2119,6 +2198,9 @@ msgstr "ネットワーク ユーティリティ" msgid "Network boot image" msgstr "ネットワークブート用イメージ" +msgid "Network device is not present" +msgstr "ネットワーク デバイスが存在しません" + msgid "Network without interfaces." msgstr "インターフェースの無いネットワークです。" @@ -2140,6 +2222,9 @@ msgstr "ファイルが見つかりませんでした" msgid "No information available" msgstr "情報がありません" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "ネガティブキャッシュを行なわない" @@ -2158,6 +2243,9 @@ msgstr "パスワードが設定されていません!" msgid "No rules in this chain" msgstr "チェイン内にルールがありません" +msgid "No scan results available yet..." +msgstr "利用可能なスキャン結果はまだありません..." + msgid "No zone assigned" msgstr "ゾーンが設定されていません" @@ -2220,6 +2308,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "消灯時間" @@ -2271,12 +2362,6 @@ msgstr "削除されるオプション" msgid "Optional" msgstr "オプション" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2297,6 +2382,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2381,6 +2469,9 @@ msgstr "PID" msgid "PIN" msgstr "PIN" +msgid "PIN code rejected" +msgstr "PIN コードが拒否されました" + msgid "PMK R1 Push" msgstr "" @@ -2468,6 +2559,9 @@ msgstr "ピーク:" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "ピアのアドレスがありません" + msgid "Peers" msgstr "ピア" @@ -2538,9 +2632,6 @@ msgstr "これらのインターフェースでの待ち受けを停止します msgid "Prevents client-to-client communication" msgstr "クライアント同士の通信を制限します" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "Prism2/2.5/3 802.11b 無線LANコントローラ" - msgid "Private Key" msgstr "秘密鍵" @@ -2589,6 +2680,13 @@ msgstr "" msgid "Quality" msgstr "クオリティ" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" +"アップストリームの利用可能な全 DNS " +"サーバを問い合わせます" + msgid "R0 Key Lifetime" msgstr "" @@ -2607,9 +2705,6 @@ msgstr "RX" msgid "RX Rate" msgstr "受信レート" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "RaLink 802.11%s 無線LANコントローラ" - msgid "Radius-Accounting-Port" msgstr "Radiusアカウントサーバー ポート番号" @@ -2628,6 +2723,9 @@ msgstr "Radius認証秘密鍵" msgid "Radius-Authentication-Server" msgstr "Radius認証サーバー" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" @@ -2636,16 +2734,16 @@ msgstr "" "として/etc/ethers をロードします" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" -"本当にこのインターフェースを削除しますか?一度削除すると、元に戻すことはできま" -"せん!\n" -"このインターフェースを経由して接続している場合、デバイスにアクセスできなくな" -"る場合があります。" +"本当にこのインターフェースを削除しますか？一度削除すると、元に戻すことはでき" +"ません！\n" +"もしこのインターフェースを経由して接続している場合、このデバイスにアクセスで" +"きなくなる場合があります" msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" "本当にこの無線ネットワークを削除しますか?一度削除すると、元に戻すことはできま" @@ -2656,22 +2754,6 @@ msgstr "" msgid "Really reset all changes?" msgstr "本当に全ての変更をリセットしますか?" -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" -"本当にネットワークを停止しますか?\n" -"このネットワークを経由して接続している場合、デバイスにアクセスできなくなる場" -"合があります。" - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" -"本当にインターフェース \"%s\" を停止しますか?\n" -"このインターフェースを経由して接続している場合、デバイスにアクセスできなくな" -"る場合があります。" - msgid "Really switch protocol?" msgstr "本当にプロトコルを切り替えますか?" @@ -2717,9 +2799,6 @@ msgstr "WireGuard インターフェースのIPアドレスです。（推奨） msgid "Reconnect this interface" msgstr "インターフェースの再接続" -msgid "Reconnecting interface" -msgstr "インターフェース再接続中" - msgid "References" msgstr "参照カウンタ" @@ -2759,9 +2838,6 @@ msgstr "IPv6-アドレスのリクエスト" msgid "Request IPv6-prefix of length" msgstr "リクエストするIPv6-プレフィクス長" -msgid "Require TLS" -msgstr "TLSが必要" - msgid "Required" msgstr "必須" @@ -2813,6 +2889,12 @@ msgstr "再起動" msgid "Restart Firewall" msgstr "ファイアウォールの再起動" +msgid "Restart radio interface" +msgstr "無線インターフェースの再起動" + +msgid "Restore" +msgstr "復元" + msgid "Restore backup" msgstr "バックアップから復元する" @@ -2822,6 +2904,15 @@ msgstr "パスワードを表示する/隠す" msgid "Revert" msgstr "元に戻す" +msgid "Revert changes" +msgstr "変更の取り消し" + +msgid "Revert request failed with status %h" +msgstr "取り消しのリクエストはステータス %h により失敗しました" + +msgid "Reverting configuration…" +msgstr "設定を元に戻しています..." + msgid "Root" msgstr "ルート" @@ -2837,9 +2928,6 @@ msgstr "" msgid "Route type" msgstr "ルート タイプ" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "ルーター アドバタイズメント-サービス" @@ -2865,14 +2953,6 @@ msgstr "ファイルシステムチェックを行う" msgid "SHA256" msgstr "SHA256" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "SNR" @@ -2900,12 +2980,12 @@ msgstr "保存" msgid "Save & Apply" msgstr "保存 & 適用" -msgid "Save & Apply" -msgstr "保存 & 適用" - msgid "Scan" msgstr "スキャン" +msgid "Scan request failed" +msgstr "スキャン要求が失敗しました" + msgid "Scheduled Tasks" msgstr "スケジュールタスク" @@ -2931,17 +3011,6 @@ msgstr "クライアントの分離" msgid "Server Settings" msgstr "サーバー設定" -msgid "Server password" -msgstr "サーバー パスワード" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "サーバー ユーザー名" - msgid "Service Name" msgstr "サービス名" @@ -2959,6 +3028,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "時刻同期設定" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "DHCPサーバーを設定" @@ -2968,15 +3043,15 @@ msgstr "" msgid "Short GI" msgstr "Short GI" +msgid "Short Preamble" +msgstr "Short Preamble" + msgid "Show current backup file list" msgstr "現在のバックアップファイルのリストを表示する" msgid "Shutdown this interface" msgstr "インターフェースを終了" -msgid "Shutdown this network" -msgstr "ネットワークを終了" - msgid "Signal" msgstr "信号強度" @@ -3031,15 +3106,9 @@ msgstr "" "ファームウェア更新は手動で行っていただく必要があります。wikiを参照して、この" "デバイスのインストール手順を参照してください。" -msgid "Sort" -msgstr "ソート" - msgid "Source" msgstr "送信元" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "デバイスが接続するディレクトリを設定します" @@ -3078,6 +3147,12 @@ msgstr "開始" msgid "Start priority" msgstr "優先順位" +msgid "Starting configuration apply…" +msgstr "設定の適用を開始しています..." + +msgid "Starting wireless scan..." +msgstr "無線LANのスキャンを開始しています..." + msgid "Startup" msgstr "スタートアップ" @@ -3141,6 +3216,8 @@ msgstr "スイッチ %q (%s)" msgid "" "Switch %q has an unknown topology - the VLAN settings might not be accurate." msgstr "" +"スイッチ %q は不明なトポロジを持っています - VLAN 設定は正確ではないかもしれ" +"ません。" msgid "Switch Port Mask" msgstr "スイッチポート マスク" @@ -3236,9 +3313,28 @@ msgstr "" "使用可能な文字は右記の通りです: A-Z, a-z, " "0-9, _" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "設定ファイルは以下のエラーにより読み込めませんでした:" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" +"未適用の変更を適用後、デバイスは %d 秒以内に完了できなかった可能性がありま" +"す。これは、安全上の理由によりロールバックされる設定に起因するものです。それ" +"でも設定の変更が正しいと思う場合は、チェックなしの変更の適用を行ってくださ" +"い。もしくは、再度適用を試行する前にこの警告を除去して設定内容の編集を行う" +"か、現在動作している設定状況を維持するために未適用の変更を取り消してくださ" +"い。" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3264,9 +3360,6 @@ msgstr "" "イズです。オリジナルファイルと比較し、整合性を確認してください。
\"続行" "\"ボタンをクリックすると、更新処理を開始します。" -msgid "The following changes have been committed" -msgstr "以下の変更が適用されました" - msgid "The following changes have been reverted" msgstr "以下の変更が取り消されました" @@ -3331,11 +3424,6 @@ msgstr "" "わる可能性があるため、再接続時にあなたのコンピュータのIPアドレスを変更しなけ" "ればならない場合があります。" -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3347,8 +3435,8 @@ msgstr "" msgid "There are no active leases." msgstr "リース中のIPアドレスはありません。" -msgid "There are no pending changes to apply!" -msgstr "適用が未完了の変更はありません！" +msgid "There are no changes to apply." +msgstr "適用する変更はありません。" msgid "There are no pending changes to revert!" msgstr "復元が未完了の変更はありません！" @@ -3457,10 +3545,12 @@ msgstr "タイムゾーン" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" "設定を復元するには、作成しておいたバックアップ アーカイブをアップロードしてく" -"ださい。" +"ださい。設定のリセットを行う場合、\"設定リセット\"をクリックしてください。(た" +"だし、squashfsをお使いの場合のみ使用可能です)" msgid "Tone" msgstr "" @@ -3504,15 +3594,6 @@ msgstr "トンネルインターフェース" msgid "Tunnel Link" msgstr "トンネルリンク" -msgid "Tunnel broker protocol" -msgstr "トンネルブローカー プロトコル" - -msgid "Tunnel setup server" -msgstr "トンネルセットアップ サーバー" - -msgid "Tunnel type" -msgstr "トンネルタイプ" - msgid "Tx-Power" msgstr "送信電力" @@ -3537,9 +3618,27 @@ msgstr "USB ポート" msgid "UUID" msgstr "UUID" +msgid "Unable to determine device name" +msgstr "デバイス名を確定できません" + +msgid "Unable to determine external IP address" +msgstr "外部 IP アドレスを確定できません" + +msgid "Unable to determine upstream interface" +msgstr "アップストリーム インターフェースを確定できません" + msgid "Unable to dispatch" msgstr "ディスパッチできません" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "AFTR ホスト名を解決できません" + +msgid "Unable to resolve peer host name" +msgstr "ピアのホスト名を解決できません" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3549,6 +3648,9 @@ msgstr "不明" msgid "Unknown Error, password not changed!" msgstr "不明なエラーです。パスワードは変更されていません！" +msgid "Unknown error (%s)" +msgstr "不明なエラー (%s)" + msgid "Unmanaged" msgstr "Unmanaged" @@ -3558,9 +3660,18 @@ msgstr "アンマウント" msgid "Unsaved Changes" msgstr "保存されていない変更" +msgid "Unsupported MAP type" +msgstr "非対応の MAP タイプです" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "サポートされていないプロトコルタイプ" +msgid "Up" +msgstr "上へ" + msgid "Update lists" msgstr "リストの更新" @@ -3693,18 +3804,15 @@ msgstr "ベンダー" msgid "Vendor Class to send when requesting DHCP" msgstr "DHCPリクエスト送信時のベンダークラスを設定" -msgid "Verbose" -msgstr "詳細" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "確認" msgid "Version" msgstr "バージョン" +msgid "Virtual dynamic interface" +msgstr "仮想ダイナミックインターフェース" + msgid "WDS" msgstr "WDS" @@ -3731,16 +3839,15 @@ msgstr "" "hostapd (アクセスポイント及びアドホック) がインストールされている必要がありま" "す。" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "変更を適用中です..." msgid "Waiting for command to complete..." msgstr "コマンド実行中です..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "設定を適用中です... %d 秒" + msgid "Waiting for device..." msgstr "デバイスを起動中です..." @@ -3755,12 +3862,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "帯域幅" @@ -3782,8 +3883,11 @@ msgstr "無線LANデバイス一覧" msgid "Wireless Security" msgstr "無線LANセキュリティ" -msgid "Wireless is disabled or not associated" -msgstr "無線LAN機能が無効になっているか、アソシエーションされていません" +msgid "Wireless is disabled" +msgstr "無線LAN機能は無効になっています" + +msgid "Wireless is not associated" +msgstr "無線LAN機能がアソシエーションされていません" msgid "Wireless is restarting..." msgstr "無線LAN機能再起動中..." @@ -3794,12 +3898,6 @@ msgstr "無線LAN機能は無効になっています" msgid "Wireless network is enabled" msgstr "無線LAN機能は有効になっています" -msgid "Wireless restarted" -msgstr "無線LAN機能の再起動" - -msgid "Wireless shut down" -msgstr "無線LAN機能停止" - msgid "Write received DNS requests to syslog" msgstr "受信したDNSリクエストをsyslogへ記録します" @@ -3841,6 +3939,9 @@ msgstr "baseT" msgid "bridged" msgstr "ブリッジ" +msgid "create" +msgstr "作成" + msgid "create:" msgstr "作成:" @@ -3870,7 +3971,7 @@ msgstr "" "録するファイル" msgid "forward" -msgstr "" +msgstr "転送" msgid "full-duplex" msgstr "全二重" @@ -3878,9 +3979,6 @@ msgstr "全二重" msgid "half-duplex" msgstr "半二重" -msgid "help" -msgstr "ヘルプ" - msgid "hidden" msgstr "(不明)" @@ -3905,12 +4003,12 @@ msgstr "kbit/s" msgid "local DNS file" msgstr "ローカル DNSファイル" -msgid "minimum 1280, maximum 1480" -msgstr "最小値 1280、最大値 1480" - msgid "minutes" msgstr "分" +msgid "mixed WPA/WPA2" +msgstr "mixed WPA/WPA2" + msgid "no" msgstr "いいえ" @@ -3932,6 +4030,9 @@ msgstr "オン" msgid "open" msgstr "オープン" +msgid "output" +msgstr "" + msgid "overlay" msgstr "オーバーレイ" @@ -3982,3 +4083,52 @@ msgstr "はい" msgid "« Back" msgstr "« 戻る" + +#~ msgid "Activate this network" +#~ msgstr "このネットワークを有効にする" + +#~ msgid "Hermes 802.11b Wireless Controller" +#~ msgstr "Hermes 802.11b 無線LANコントローラ" + +#~ msgid "Interface is shutting down..." +#~ msgstr "インターフェース終了中..." + +#~ msgid "Interface reconnected" +#~ msgstr "インターフェースの再接続" + +#~ msgid "Interface shut down" +#~ msgstr "インターフェースの終了" + +#~ msgid "Prism2/2.5/3 802.11b Wireless Controller" +#~ msgstr "Prism2/2.5/3 802.11b 無線LANコントローラ" + +#~ msgid "RaLink 802.11%s Wireless Controller" +#~ msgstr "RaLink 802.11%s 無線LANコントローラ" + +#~ msgid "" +#~ "Really shut down network? You might lose access to this device if you are " +#~ "connected via this interface" +#~ msgstr "" +#~ "本当にネットワークを停止しますか？\n" +#~ "このネットワークを経由して接続している場合、デバイスにアクセスできなくなる" +#~ "場合があります" + +#~ msgid "" +#~ "Really shutdown interface \"%s\"? You might lose access to this device if " +#~ "you are connected via this interface." +#~ msgstr "" +#~ "本当にインターフェース \"%s\" を停止しますか?\n" +#~ "このインターフェースを経由して接続している場合、デバイスにアクセスできなく" +#~ "なる場合があります。" + +#~ msgid "Reconnecting interface" +#~ msgstr "インターフェース再接続中" + +#~ msgid "Shutdown this network" +#~ msgstr "ネットワークを終了" + +#~ msgid "Wireless restarted" +#~ msgstr "無線LAN機能の再起動" + +#~ msgid "Wireless shut down" +#~ msgstr "無線LAN機能停止" diff --git a/luci-base/po/ko/base.po b/luci-base/po/ko/base.po index e4f77c78f..2d53437db 100644 --- a/luci-base/po/ko/base.po +++ b/luci-base/po/ko/base.po @@ -49,6 +49,9 @@ msgstr "" msgid "-- match by uuid --" msgstr "" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "1 분 부하:" @@ -151,9 +154,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "최대 동시 처리 query 수" -msgid "%s - %s" -msgstr "" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -168,9 +168,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -204,9 +201,6 @@ msgstr "" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "" @@ -216,9 +210,6 @@ msgstr "" msgid "Actions" msgstr "관리 도구" -msgid "Activate this network" -msgstr "이 네트워를 활성화합니다" - msgid "Active IPv4-Routes" msgstr "" "Active IPv4-Route 경로" @@ -272,6 +263,15 @@ msgstr "" msgid "Alert" msgstr "" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -283,6 +283,9 @@ msgstr "" msgid "Allow SSH password authentication" msgstr "SSH 암호 인증을 허용합니다" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "" @@ -311,12 +314,12 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -394,10 +397,13 @@ msgstr "" msgid "Any zone" msgstr "" -msgid "Apply" -msgstr "적용" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" msgstr "" msgid "" @@ -414,6 +420,9 @@ msgstr "" msgid "Associated Stations" msgstr "연결된 station 들" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -489,12 +498,12 @@ msgstr "" msgid "Back to scan results" msgstr "" +msgid "Backup" +msgstr "백업" + msgid "Backup / Flash Firmware" msgstr "Firmware 백업 / Flash" -msgid "Backup / Restore" -msgstr "백업 / 복구" - msgid "Backup file list" msgstr "" @@ -504,7 +513,7 @@ msgstr "" msgid "Band" msgstr "" -msgid "Behind NAT" +msgid "Beacon Interval" msgstr "" msgid "" @@ -565,6 +574,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "CPU 사용량 (%)" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "" @@ -580,12 +592,20 @@ msgstr "변경 사항" msgid "Changes applied." msgstr "" +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "장비 접근을 위한 관리자 암호를 변경합니다" msgid "Channel" msgstr "" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "" @@ -624,12 +644,10 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" "현재 설정 파일에 대한 tar 아카이브 다운로드를 원한다면 \"아카이브 생성\" 버튼" -"을 클릭하세요. Firmware 의 초기 설정 reset 을 원한다면 \"Reset 하기\" 를 클" -"릭하세요. (squashfs 이미지들만 가능)." +"을 클릭하세요." msgid "Client" msgstr "" @@ -664,12 +682,18 @@ msgstr "" msgid "Configuration" msgstr "설정" -msgid "Configuration applied." +msgid "Configuration failed" msgstr "" msgid "Configuration files will be kept." msgstr "" +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "다시 확인" @@ -682,12 +706,18 @@ msgstr "연결 시간" msgid "Connection Limit" msgstr "" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "연결" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "" @@ -743,9 +773,6 @@ msgstr "" "원한다면 장치에 부착된 LED 들의 " "행동을 마음대로 변경할 수 있습니다." -msgid "DHCP Leases" -msgstr "DHCP 임대 정보" - msgid "DHCP Server" msgstr "DHCP 서버" @@ -758,9 +785,6 @@ msgstr "DHCP client" msgid "DHCP-Options" msgstr "DHCP-옵션들" -msgid "DHCPv6 Leases" -msgstr "DHCPv6 임대 정보" - msgid "DHCPv6 client" msgstr "" @@ -800,6 +824,9 @@ msgstr "" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "" @@ -818,9 +845,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "기본 상태" @@ -842,6 +866,9 @@ msgstr "삭제" msgid "Delete this network" msgstr "이 네트워크를 삭제합니다" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "설명" @@ -860,7 +887,10 @@ msgstr "장치 설정" msgid "Device is rebooting..." msgstr "" -msgid "Device unreachable" +msgid "Device unreachable!" +msgstr "" + +msgid "Device unreachable! Still waiting for device..." msgstr "" msgid "Diagnostics" @@ -888,15 +918,27 @@ msgstr "" msgid "Disable Encryption" msgstr "" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "" msgid "Disabled (default)" msgstr "" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "" @@ -945,6 +987,9 @@ msgid "" "DNS-Name" msgstr "" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "패키지 다운로드 후 설치" @@ -1059,6 +1104,9 @@ msgstr "" msgid "Enable this mount" msgstr "" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "" @@ -1091,6 +1139,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "" @@ -1149,6 +1203,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "" @@ -1167,6 +1224,9 @@ msgstr "" msgid "Filter useless" msgstr "" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1220,6 +1280,9 @@ msgstr "" msgid "Force" msgstr "강제하기" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "" @@ -1270,7 +1333,7 @@ msgstr "여유 공간" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1282,6 +1345,9 @@ msgstr "" msgid "Gateway" msgstr "" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "" @@ -1342,9 +1408,6 @@ msgstr "" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1358,9 +1421,6 @@ msgstr "" "아래에 SSH public-key 인증을 위한 공개 SSH-Key 들 (한 줄당 한개) 를 입력할 " "수 있습니다." -msgid "Hermes 802.11b Wireless Controller" -msgstr "" - msgid "Hide ESSID" msgstr "ESSID 숨기기" @@ -1376,6 +1436,9 @@ msgstr "" msgid "Host-IP or Network" msgstr "Host-IP 혹은 Network" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "호스트이름" @@ -1397,14 +1460,20 @@ msgstr "" msgid "IP address" msgstr "IP 주소" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "" msgid "IPv4 Firewall" msgstr "IPv4 방화벽" -msgid "IPv4 WAN Status" -msgstr "IPv4 WAN 상태" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "IPv4 주소" @@ -1454,13 +1523,10 @@ msgstr "IPv6 설정" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "IPv6 WAN 상태" - -msgid "IPv6 address" +msgid "IPv6 Upstream" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" +msgid "IPv6 address" msgstr "" msgid "IPv6 assignment hint" @@ -1563,6 +1629,9 @@ msgstr "" msgid "Info" msgstr "" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "" @@ -1599,21 +1668,12 @@ msgstr "인터페이스 개요" msgid "Interface is reconnecting..." msgstr "" -msgid "Interface is shutting down..." -msgstr "" - msgid "Interface name" msgstr "인터페이스 이름" msgid "Interface not present or not connected yet." msgstr "" -msgid "Interface reconnected" -msgstr "" - -msgid "Interface shut down" -msgstr "" - msgid "Interfaces" msgstr "인터페이스" @@ -1801,6 +1861,9 @@ msgstr "부하 평균" msgid "Loading" msgstr "" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1865,6 +1928,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "임대되는 주소의 최소 시작점. (네트워크 주소로 부터의 offset)" +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "MAC-주소" @@ -1880,6 +1946,9 @@ msgstr "" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "" @@ -1959,6 +2028,9 @@ msgstr "모델" msgid "Modem device" msgstr "" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "" @@ -2030,9 +2102,6 @@ msgstr "" msgid "NTP server candidates" msgstr "NTP 서버 목록" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "이름" @@ -2057,6 +2126,9 @@ msgstr "네트워크 유틸리티" msgid "Network boot image" msgstr "네트워크 boot 이미지" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "" @@ -2078,6 +2150,9 @@ msgstr "" msgid "No information available" msgstr "이용 가능한 정보가 없습니다" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "" @@ -2096,6 +2171,9 @@ msgstr "암호 설정을 해주세요!" msgid "No rules in this chain" msgstr "" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "" @@ -2156,6 +2234,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2207,12 +2288,6 @@ msgstr "삭제된 option" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2233,6 +2308,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2313,6 +2391,9 @@ msgstr "" msgid "PIN" msgstr "" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2400,6 +2481,9 @@ msgstr "최고치:" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2468,9 +2552,6 @@ msgstr "" msgid "Prevents client-to-client communication" msgstr "" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "" - msgid "Private Key" msgstr "" @@ -2519,6 +2600,11 @@ msgstr "" msgid "Quality" msgstr "" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2537,9 +2623,6 @@ msgstr "" msgid "RX Rate" msgstr "" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "" - msgid "Radius-Accounting-Port" msgstr "" @@ -2558,6 +2641,9 @@ msgstr "" msgid "Radius-Authentication-Server" msgstr "" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" @@ -2566,30 +2652,18 @@ msgstr "" "Configuration Protocol\">DHCP-서버를 설정합니다" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" msgid "Really reset all changes?" msgstr "" -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" -"정말로 네트워크를 shutdown 하시겠습니까?\\n이 인터페이스를 통해 연결하였다면 " -"접속이 끊어질 수 있습니다." - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" - msgid "Really switch protocol?" msgstr "정말 프로토콜 변경을 원하세요?" @@ -2635,9 +2709,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "이 인터페이스를 재연결합니다" -msgid "Reconnecting interface" -msgstr "인터페이스 재연결중입니다" - msgid "References" msgstr "" @@ -2677,9 +2748,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2729,6 +2797,12 @@ msgstr "재시작" msgid "Restart Firewall" msgstr "방화벽 재시작" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "복구" + msgid "Restore backup" msgstr "백업 복구" @@ -2738,6 +2812,15 @@ msgstr "암호 보이기/숨기기" msgid "Revert" msgstr "변경 취소" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2753,9 +2836,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2781,14 +2861,6 @@ msgstr "" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2816,12 +2888,12 @@ msgstr "저장" msgid "Save & Apply" msgstr "저장 & 적용" -msgid "Save & Apply" -msgstr "저장 & 적용" - msgid "Scan" msgstr "Scan 하기" +msgid "Scan request failed" +msgstr "" + msgid "Scheduled Tasks" msgstr "작업 관리" @@ -2845,17 +2917,6 @@ msgstr "" msgid "Server Settings" msgstr "서버 설정" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "" @@ -2873,6 +2934,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "" @@ -2882,15 +2949,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "현재 백업 파일 목록 보기" msgid "Shutdown this interface" msgstr "이 인터페이스를 정지합니다" -msgid "Shutdown this network" -msgstr "이 네트워크를 shutdown 합니다" - msgid "Signal" msgstr "신호" @@ -2942,15 +3009,9 @@ msgid "" "instructions." msgstr "" -msgid "Sort" -msgstr "순서" - msgid "Source" msgstr "" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -2989,6 +3050,12 @@ msgstr "시작" msgid "Start priority" msgstr "시작 우선순위" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "시작 프로그램" @@ -3143,9 +3210,22 @@ msgid "" "code> and _" msgstr "" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3163,9 +3243,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "다음의 변경 사항들이 취소되었습니다" @@ -3223,11 +3300,6 @@ msgid "" "settings." msgstr "" -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3236,7 +3308,7 @@ msgstr "" msgid "There are no active leases." msgstr "" -msgid "There are no pending changes to apply!" +msgid "There are no changes to apply." msgstr "" msgid "There are no pending changes to revert!" @@ -3334,10 +3406,12 @@ msgstr "시간대" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" "설정 파일을 복구하고자 한다면 이전에 백업하신 아카이브 파일을 여기로 업로드" -"할 수 있습니다." +"할 수 있습니다. Firmware 의 초기 설정 reset 을 원한다면 \"Reset 하기\" 를 클" +"릭하세요. (squashfs 이미지들만 가능)." msgid "Tone" msgstr "" @@ -3381,15 +3455,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3414,9 +3479,27 @@ msgstr "" msgid "UUID" msgstr "" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3426,6 +3509,9 @@ msgstr "알수없음" msgid "Unknown Error, password not changed!" msgstr "" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "" @@ -3435,9 +3521,18 @@ msgstr "" msgid "Unsaved Changes" msgstr "적용 안된 변경 사항" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "" +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "" @@ -3570,18 +3665,15 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "DHCP 요청시 전송할 Vendor Class" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" msgid "Version" msgstr "버전" +msgid "Virtual dynamic interface" +msgstr "" + msgid "WDS" msgstr "WDS" @@ -3605,16 +3697,15 @@ msgid "" "and ad-hoc mode) to be installed." msgstr "" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "변경 사항이 적용되기를 기다리는 중입니다..." msgid "Waiting for command to complete..." msgstr "실행한 명령이 끝나기를 기다리는 중입니다..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3629,12 +3720,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3656,8 +3741,11 @@ msgstr "무선랜 개요" msgid "Wireless Security" msgstr "무선랜 보안" -msgid "Wireless is disabled or not associated" -msgstr "무선이 비활성화되어 있거나 연결되어 있지 않습니다" +msgid "Wireless is disabled" +msgstr "무선이 비활성화되어" + +msgid "Wireless is not associated" +msgstr "무선이 연결되어 있지 않습니다" msgid "Wireless is restarting..." msgstr "무선랜이 재시작중입니다..." @@ -3668,12 +3756,6 @@ msgstr "무선 네트워크가 꺼져 있음" msgid "Wireless network is enabled" msgstr "무선 네트워크가 켜져 있음" -msgid "Wireless restarted" -msgstr "무선랜이 재시작되었습니다" - -msgid "Wireless shut down" -msgstr "무선랜이 shutdown 되었습니다" - msgid "Write received DNS requests to syslog" msgstr "받은 DNS 요청 내용을 systlog 에 기록합니다" @@ -3712,6 +3794,9 @@ msgstr "" msgid "bridged" msgstr "" +msgid "create" +msgstr "" + msgid "create:" msgstr "" @@ -3749,9 +3834,6 @@ msgstr "" msgid "half-duplex" msgstr "" -msgid "help" -msgstr "" - msgid "hidden" msgstr "" @@ -3776,10 +3858,10 @@ msgstr "" msgid "local DNS file" msgstr "local DNS 파일" -msgid "minimum 1280, maximum 1480" +msgid "minutes" msgstr "" -msgid "minutes" +msgid "mixed WPA/WPA2" msgstr "" msgid "no" @@ -3803,6 +3885,9 @@ msgstr "" msgid "open" msgstr "" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" @@ -3854,5 +3939,48 @@ msgstr "" msgid "« Back" msgstr "" +#~ msgid "Activate this network" +#~ msgstr "이 네트워를 활성화합니다" + +#~ msgid "Reconnecting interface" +#~ msgstr "인터페이스 재연결중입니다" + +#~ msgid "Shutdown this network" +#~ msgstr "이 네트워크를 shutdown 합니다" + +#~ msgid "Wireless restarted" +#~ msgstr "무선랜이 재시작되었습니다" + +#~ msgid "Wireless shut down" +#~ msgstr "무선랜이 shutdown 되었습니다" + +#~ msgid "DHCP Leases" +#~ msgstr "DHCP 임대 정보" + +#~ msgid "DHCPv6 Leases" +#~ msgstr "DHCPv6 임대 정보" + +#~ msgid "" +#~ "Really shut down network? You might lose access to this device if you are " +#~ "connected via this interface." +#~ msgstr "" +#~ "정말로 네트워크를 shutdown 하시겠습니까?\\n이 인터페이스를 통해 연결하였다" +#~ "면 접속이 끊어질 수 있습니다." + +#~ msgid "Sort" +#~ msgstr "순서" + +#~ msgid "IPv4 WAN Status" +#~ msgstr "IPv4 WAN 상태" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "IPv6 WAN 상태" + +#~ msgid "Apply" +#~ msgstr "적용" + +#~ msgid "Save & Apply" +#~ msgstr "저장 & 적용" + #~ msgid "Leasetime" #~ msgstr "임대 시간" diff --git a/luci-base/po/ms/base.po b/luci-base/po/ms/base.po index d5c889580..891db2e41 100644 --- a/luci-base/po/ms/base.po +++ b/luci-base/po/ms/base.po @@ -49,6 +49,9 @@ msgstr "" msgid "-- match by uuid --" msgstr "" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "" @@ -148,9 +151,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "" -msgid "%s - %s" -msgstr "" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -165,9 +165,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -201,9 +198,6 @@ msgstr "" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "" @@ -213,9 +207,6 @@ msgstr "Pusat akses" msgid "Actions" msgstr "Aksi" -msgid "Activate this network" -msgstr "" - msgid "Active IPv4-Routes" msgstr "Aktive IPv4-Routen" @@ -267,6 +258,15 @@ msgstr "" msgid "Alert" msgstr "" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -278,6 +278,9 @@ msgstr "" msgid "Allow SSH password authentication" msgstr "Membenarkan pengesahan kata laluan SSH" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "Izinkan semua kecualian yang disenaraikan" @@ -306,12 +309,12 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -389,11 +392,14 @@ msgstr "" msgid "Any zone" msgstr "" -msgid "Apply" -msgstr "Melaksanakan" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" -msgstr "Melaksanakan perubahan" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -409,6 +415,9 @@ msgstr "" msgid "Associated Stations" msgstr "Associated Stesen" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -484,12 +493,12 @@ msgstr "Kembali ke ikhtisar" msgid "Back to scan results" msgstr "Kembali ke keputusan scan" +msgid "Backup" +msgstr "Sandaran" + msgid "Backup / Flash Firmware" msgstr "" -msgid "Backup / Restore" -msgstr "Sandaran / Mengembalikan" - msgid "Backup file list" msgstr "" @@ -499,7 +508,7 @@ msgstr "" msgid "Band" msgstr "" -msgid "Behind NAT" +msgid "Beacon Interval" msgstr "" msgid "" @@ -555,6 +564,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "Penggunaan CPU (%)" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "Batal" @@ -570,12 +582,20 @@ msgstr "Laman" msgid "Changes applied." msgstr "Laman diterapkan." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "" msgid "Channel" msgstr "Saluran" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "" @@ -608,8 +628,7 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" #, fuzzy @@ -646,12 +665,18 @@ msgstr "" msgid "Configuration" msgstr "Konfigurasi" -msgid "Configuration applied." +msgid "Configuration failed" msgstr "" msgid "Configuration files will be kept." msgstr "" +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Pengesahan" @@ -664,12 +689,18 @@ msgstr "" msgid "Connection Limit" msgstr "Sambungan Batas" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "" @@ -721,9 +752,6 @@ msgid "" "\">LEDs if possible." msgstr "Mengkustomisasi perilaku peranti LED jika mungkin." -msgid "DHCP Leases" -msgstr "" - msgid "DHCP Server" msgstr "" @@ -736,9 +764,6 @@ msgstr "" msgid "DHCP-Options" msgstr "DHCP-Pilihan" -msgid "DHCPv6 Leases" -msgstr "" - msgid "DHCPv6 client" msgstr "" @@ -778,6 +803,9 @@ msgstr "" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "" @@ -796,9 +824,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "" @@ -817,6 +842,9 @@ msgstr "Padam" msgid "Delete this network" msgstr "" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "Keterangan" @@ -835,7 +863,10 @@ msgstr "" msgid "Device is rebooting..." msgstr "" -msgid "Device unreachable" +msgid "Device unreachable!" +msgstr "" + +msgid "Device unreachable! Still waiting for device..." msgstr "" msgid "Diagnostics" @@ -861,15 +892,27 @@ msgstr "" msgid "Disable Encryption" msgstr "" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "" msgid "Disabled (default)" msgstr "" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "" @@ -920,6 +963,9 @@ msgid "" "DNS-Name" msgstr "Jangan hantar permintaan DNS tanpa nama DNS" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "Turun dan memasang pakej" @@ -1031,6 +1077,9 @@ msgstr "" msgid "Enable this mount" msgstr "" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "" @@ -1063,6 +1112,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "" @@ -1121,6 +1176,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "" @@ -1139,6 +1197,9 @@ msgstr "Penapis swasta" msgid "Filter useless" msgstr "Penapis tak berguna" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1192,6 +1253,9 @@ msgstr "" msgid "Force" msgstr "Paksa" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "" @@ -1242,7 +1306,7 @@ msgstr "" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1254,6 +1318,9 @@ msgstr "" msgid "Gateway" msgstr "" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "" @@ -1314,9 +1381,6 @@ msgstr "Menutup" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1329,9 +1393,6 @@ msgid "" "authentication." msgstr "" -msgid "Hermes 802.11b Wireless Controller" -msgstr "" - msgid "Hide ESSID" msgstr "Menyembunyikan ESSID" @@ -1347,6 +1408,9 @@ msgstr "" msgid "Host-IP or Network" msgstr "IP host atau rangkaian" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "Nama Host" @@ -1368,13 +1432,19 @@ msgstr "" msgid "IP address" msgstr "Alamat IP" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "" msgid "IPv4 Firewall" msgstr "" -msgid "IPv4 WAN Status" +msgid "IPv4 Upstream" msgstr "" msgid "IPv4 address" @@ -1425,15 +1495,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" +msgid "IPv6 Upstream" msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1539,6 +1606,9 @@ msgstr "" msgid "Info" msgstr "" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "" @@ -1575,21 +1645,12 @@ msgstr "" msgid "Interface is reconnecting..." msgstr "" -msgid "Interface is shutting down..." -msgstr "" - msgid "Interface name" msgstr "" msgid "Interface not present or not connected yet." msgstr "" -msgid "Interface reconnected" -msgstr "" - -msgid "Interface shut down" -msgstr "" - msgid "Interfaces" msgstr "Interface" @@ -1779,6 +1840,9 @@ msgstr "" msgid "Loading" msgstr "" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1843,6 +1907,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "" +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "" @@ -1858,6 +1925,9 @@ msgstr "Senarai MAC" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "" @@ -1937,6 +2007,9 @@ msgstr "" msgid "Modem device" msgstr "Alat modem" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "" @@ -2010,9 +2083,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nama" @@ -2037,6 +2107,9 @@ msgstr "" msgid "Network boot image" msgstr "" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "" @@ -2058,6 +2131,9 @@ msgstr "" msgid "No information available" msgstr "" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "" @@ -2076,6 +2152,9 @@ msgstr "" msgid "No rules in this chain" msgstr "Tidak ada peraturan dalam rantai ini" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "" @@ -2136,6 +2215,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2186,12 +2268,6 @@ msgstr "" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2212,6 +2288,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2290,6 +2369,9 @@ msgstr "PID" msgid "PIN" msgstr "" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2377,6 +2459,9 @@ msgstr "" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2445,9 +2530,6 @@ msgstr "" msgid "Prevents client-to-client communication" msgstr "Mencegah komunikasi sesama Pelanggan" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "" - msgid "Private Key" msgstr "" @@ -2496,6 +2578,11 @@ msgstr "" msgid "Quality" msgstr "" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2515,9 +2602,6 @@ msgstr "RX" msgid "RX Rate" msgstr "" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "" - msgid "Radius-Accounting-Port" msgstr "" @@ -2536,34 +2620,27 @@ msgstr "" msgid "Radius-Authentication-Server" msgstr "" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" msgstr "Baca /etc/ethers untuk mengkonfigurasikan DHCP-Server" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" msgid "Really reset all changes?" msgstr "" -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" - msgid "Really switch protocol?" msgstr "" @@ -2609,9 +2686,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "" -msgid "Reconnecting interface" -msgstr "" - msgid "References" msgstr "Rujukan" @@ -2651,9 +2725,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2703,6 +2774,12 @@ msgstr "" msgid "Restart Firewall" msgstr "Restart Firewall" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "Mengembalikan" + msgid "Restore backup" msgstr "Kembalikan sandaran" @@ -2712,6 +2789,15 @@ msgstr "" msgid "Revert" msgstr "Kembali" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2727,9 +2813,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2755,14 +2838,6 @@ msgstr "" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2790,12 +2865,12 @@ msgstr "Simpan" msgid "Save & Apply" msgstr "Simpan & Melaksanakan" -msgid "Save & Apply" -msgstr "" - msgid "Scan" msgstr "Scan" +msgid "Scan request failed" +msgstr "" + msgid "Scheduled Tasks" msgstr "Tugas Jadual" @@ -2819,17 +2894,6 @@ msgstr "Pisahkan Pelanggan" msgid "Server Settings" msgstr "" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "" @@ -2847,6 +2911,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "" @@ -2856,15 +2926,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "" msgid "Shutdown this interface" msgstr "" -msgid "Shutdown this network" -msgstr "" - msgid "Signal" msgstr "Isyarat" @@ -2916,15 +2986,9 @@ msgid "" "instructions." msgstr "" -msgid "Sort" -msgstr "" - msgid "Source" msgstr "Sumber" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -2963,6 +3027,12 @@ msgstr "Mula" msgid "Start priority" msgstr "" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "" @@ -3112,9 +3182,22 @@ msgstr "" "Karakter yang diizinkan adalah: A-Z, a-z, " "0-9 dan _" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3136,9 +3219,6 @@ msgstr "" "integriti data.
Klik butang terus di bawah untuk memulakan prosedur " "flash." -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "Laman berikut telah kembali" @@ -3196,11 +3276,6 @@ msgstr "" "anda perlu mengemas kini alamat komputer anda untuk mencapai peranti lagi, " "bergantung pada tetapan anda." -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3211,7 +3286,7 @@ msgstr "" msgid "There are no active leases." msgstr "" -msgid "There are no pending changes to apply!" +msgid "There are no changes to apply." msgstr "" msgid "There are no pending changes to revert!" @@ -3307,7 +3382,8 @@ msgstr "Zon masa" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" msgid "Tone" @@ -3352,15 +3428,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3385,9 +3452,27 @@ msgstr "" msgid "UUID" msgstr "" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3397,6 +3482,9 @@ msgstr "" msgid "Unknown Error, password not changed!" msgstr "" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "" @@ -3406,9 +3494,18 @@ msgstr "" msgid "Unsaved Changes" msgstr "Perubahan yang belum disimpan" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "" +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "" @@ -3533,18 +3630,15 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" msgid "Version" msgstr "Versi" +msgid "Virtual dynamic interface" +msgstr "" + msgid "WDS" msgstr "WDS" @@ -3570,16 +3664,15 @@ msgstr "" "WPA-Enkripsi memerlukan pemohan wpa (untuk mod pelanggan) atau hostapd " "(untuk AP dan mod ad-hoc) yang akan dipasangkan." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3594,12 +3687,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3621,7 +3708,10 @@ msgstr "Gambaran keseluruhan Wayarles" msgid "Wireless Security" msgstr "Keselamatan WLAN" -msgid "Wireless is disabled or not associated" +msgid "Wireless is disabled" +msgstr "" + +msgid "Wireless is not associated" msgstr "" msgid "Wireless is restarting..." @@ -3633,12 +3723,6 @@ msgstr "" msgid "Wireless network is enabled" msgstr "" -msgid "Wireless restarted" -msgstr "" - -msgid "Wireless shut down" -msgstr "" - msgid "Write received DNS requests to syslog" msgstr "" @@ -3673,6 +3757,9 @@ msgstr "" msgid "bridged" msgstr "" +msgid "create" +msgstr "" + msgid "create:" msgstr "" @@ -3708,9 +3795,6 @@ msgstr "" msgid "half-duplex" msgstr "" -msgid "help" -msgstr "Membantu" - msgid "hidden" msgstr "" @@ -3735,10 +3819,10 @@ msgstr "" msgid "local DNS file" msgstr "Fail DNS tempatan" -msgid "minimum 1280, maximum 1480" +msgid "minutes" msgstr "" -msgid "minutes" +msgid "mixed WPA/WPA2" msgstr "" msgid "no" @@ -3762,6 +3846,9 @@ msgstr "" msgid "open" msgstr "" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" @@ -3813,6 +3900,15 @@ msgstr "" msgid "« Back" msgstr "« Kembali" +#~ msgid "help" +#~ msgstr "Membantu" + +#~ msgid "Apply" +#~ msgstr "Melaksanakan" + +#~ msgid "Applying changes" +#~ msgstr "Melaksanakan perubahan" + #~ msgid "Action" #~ msgstr "Aksi" diff --git a/luci-base/po/no/base.po b/luci-base/po/no/base.po index 1805d8e99..d5c65659e 100644 --- a/luci-base/po/no/base.po +++ b/luci-base/po/no/base.po @@ -44,6 +44,9 @@ msgstr "" msgid "-- match by uuid --" msgstr "" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "1 minutts belastning:" @@ -150,9 +153,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "Maks. samtidige spørringer" -msgid "%s - %s" -msgstr "%s - %s" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -167,9 +167,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -210,9 +207,6 @@ msgstr "ATM enhetsnummer" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Tilgangskonsentrator" @@ -222,9 +216,6 @@ msgstr "Aksesspunkt" msgid "Actions" msgstr "Handlinger" -msgid "Activate this network" -msgstr "Aktiver dette nettverket" - msgid "Active IPv4-Routes" msgstr "Aktive IPv4-Ruter" @@ -276,6 +267,15 @@ msgstr "" msgid "Alert" msgstr "Varsle" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -287,6 +287,9 @@ msgstr "" msgid "Allow SSH password authentication" msgstr "Tillat SSH passord godkjenning" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "Tillat alle unntatt oppførte" @@ -315,12 +318,12 @@ msgstr "Tillat oppstrøms svar i 127.0.0.0/8 nettet, f.eks for RBL tjenester" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -398,11 +401,14 @@ msgstr "Antennekonfigurasjon" msgid "Any zone" msgstr "Alle soner" -msgid "Apply" -msgstr "Bruk" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" -msgstr "Utfører endringer" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -418,6 +424,9 @@ msgstr "" msgid "Associated Stations" msgstr "Tilkoblede Klienter" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -493,12 +502,12 @@ msgstr "Tilbake til oversikt" msgid "Back to scan results" msgstr "Tilbake til skanne resultat" +msgid "Backup" +msgstr "Sikkerhetskopi" + msgid "Backup / Flash Firmware" msgstr "Sikkerhetskopiering/Firmware oppgradering" -msgid "Backup / Restore" -msgstr "Sikkerhetskopi/Gjenoppretting" - msgid "Backup file list" msgstr "Sikkerhetskopier filliste" @@ -508,7 +517,7 @@ msgstr "Ugyldig adresse oppgitt!" msgid "Band" msgstr "" -msgid "Behind NAT" +msgid "Beacon Interval" msgstr "" msgid "" @@ -567,6 +576,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "CPU forbruk (%)" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "Avbryt" @@ -582,12 +594,20 @@ msgstr "Endringer" msgid "Changes applied." msgstr "Endringer utført." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Endrer administrator passordet for tilgang til enheten" msgid "Channel" msgstr "Kanal" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Kontroller" @@ -626,12 +646,10 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" "Klikk \"Opprett arkiv\" for å laste ned et tar arkiv av de gjeldende " -"konfigurasjons filer. For å nullstille firmwaren til opprinnelig tilstand, " -"klikker du på \"Utfør nullstilling\" (kun mulig på squashfs firmwarer)." +"konfigurasjons filer." msgid "Client" msgstr "Klient" @@ -668,12 +686,18 @@ msgstr "" msgid "Configuration" msgstr "Konfigurasjon" -msgid "Configuration applied." -msgstr "Konfigurasjons endring utført." +msgid "Configuration failed" +msgstr "" msgid "Configuration files will be kept." msgstr "Konfigurasjonsfiler vil bli bevart." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Bekreftelse" @@ -686,12 +710,18 @@ msgstr "Tilkoblet" msgid "Connection Limit" msgstr "Tilkoblingsgrense (antall)" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "Tilkoblinger" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Land" @@ -745,9 +775,6 @@ msgstr "" "Tilpasser oppførselen til enhetens LEDs om mulig." -msgid "DHCP Leases" -msgstr "DHCP Leier" - msgid "DHCP Server" msgstr "DHCP Server" @@ -760,9 +787,6 @@ msgstr "DHCP klient" msgid "DHCP-Options" msgstr "DHCP-Alternativer" -msgid "DHCPv6 Leases" -msgstr "DHCPv6 Leier" - msgid "DHCPv6 client" msgstr "" @@ -802,6 +826,9 @@ msgstr "" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "DUID" @@ -820,9 +847,6 @@ msgstr "Standard gateway" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Standard tilstand" @@ -843,6 +867,9 @@ msgstr "Fjern" msgid "Delete this network" msgstr "Fjern dette nettverket" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "Beskrivelse" @@ -861,7 +888,10 @@ msgstr "Enhet Konfigurasjon" msgid "Device is rebooting..." msgstr "" -msgid "Device unreachable" +msgid "Device unreachable!" +msgstr "" + +msgid "Device unreachable! Still waiting for device..." msgstr "" msgid "Diagnostics" @@ -889,15 +919,27 @@ msgstr "Deaktiver DNS oppsett" msgid "Disable Encryption" msgstr "" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "Deaktivert" msgid "Disabled (default)" msgstr "" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "Forkast oppstrøms RFC1918 svar" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Viser bare pakker som inneholder" @@ -951,6 +993,9 @@ msgstr "" "Ikke videresend DNS-Forespørsler " "uten DNS-Navn" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "Last ned og installer pakken" @@ -1066,6 +1111,9 @@ msgstr "" msgid "Enable this mount" msgstr "Aktiver dette monteringspunktet" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "Aktiver denne swapenhet" @@ -1098,6 +1146,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "Sletter..." @@ -1157,6 +1211,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Fil" @@ -1175,6 +1232,9 @@ msgstr "Filtrer private" msgid "Filter useless" msgstr "Filtrer ubrukelige" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1228,6 +1288,9 @@ msgstr "Flasher..." msgid "Force" msgstr "Bruk" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "Bruk CCMP (AES)" @@ -1279,7 +1342,7 @@ msgstr "Ledig plass" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1291,6 +1354,9 @@ msgstr "Kun GPRS" msgid "Gateway" msgstr "Gateway" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "Gateway porter" @@ -1351,9 +1417,6 @@ msgstr "Slå av" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1367,9 +1430,6 @@ msgid "" msgstr "" "Her kan du lime inn felles SSH-nøkler(en per linje), for SSH godkjenning." -msgid "Hermes 802.11b Wireless Controller" -msgstr "Hermes 802.11b Trådløs Kontroller" - msgid "Hide ESSID" msgstr "Skjul ESSID" @@ -1386,6 +1446,9 @@ msgid "Host-IP or Network" msgstr "" "Verts-IP eller Nettverk" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "Vertsnavn" @@ -1407,14 +1470,20 @@ msgstr "" msgid "IP address" msgstr "IP adresse" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "IPv4" msgid "IPv4 Firewall" msgstr "IPv4 Brannmur" -msgid "IPv4 WAN Status" -msgstr "IPv4 WAN Status" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "IPv4 adresse" @@ -1464,15 +1533,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "IPv6 WAN Status" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "IPv6 adresse" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1577,6 +1643,9 @@ msgstr "Innkommende:" msgid "Info" msgstr "Informasjon" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "Oppstartskript" @@ -1613,21 +1682,12 @@ msgstr "Grensesnitt Oversikt" msgid "Interface is reconnecting..." msgstr "Grensesnittet kobler til igjen..." -msgid "Interface is shutting down..." -msgstr "Grensesnittet slår seg av..." - msgid "Interface name" msgstr "" msgid "Interface not present or not connected yet." msgstr "Grensesnittet er ikke tilgjengelig eller er ikke tilknyttet." -msgid "Interface reconnected" -msgstr "Grensesnittet er koblet til igjen" - -msgid "Interface shut down" -msgstr "Grensesnittet er slått av" - msgid "Interfaces" msgstr "Grensesnitt" @@ -1819,6 +1879,9 @@ msgstr "Belastning Gjennomsnitt" msgid "Loading" msgstr "Laster" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1888,6 +1951,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "Laveste leide adresse, forskjøvet fra nettverks adressen." +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "MAC-Adresse" @@ -1903,6 +1969,9 @@ msgstr "MAC-Liste" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -1982,6 +2051,9 @@ msgstr "" msgid "Modem device" msgstr "Modem" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "Modem initiering tidsavbrudd" @@ -2055,9 +2127,6 @@ msgstr "" msgid "NTP server candidates" msgstr "NTP server kandidater" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Navn" @@ -2082,6 +2151,9 @@ msgstr "Nettverks Verktøy" msgid "Network boot image" msgstr "Nettverks boot image" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "Nettverk uten grensesnitt." @@ -2103,6 +2175,9 @@ msgstr "Ingen filer funnet" msgid "No information available" msgstr "Ingen informasjon tilgjengelig" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "Ingen negative cache" @@ -2121,6 +2196,9 @@ msgstr "Ruteren er ikke passordbeskyttet!" msgid "No rules in this chain" msgstr "Ingen regler i denne tabellen" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "Ingen sone tilknyttet" @@ -2181,6 +2259,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Forsinkelse ved tilstand Av" @@ -2232,12 +2313,6 @@ msgstr "Innstilling fjernet" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2258,6 +2333,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2338,6 +2416,9 @@ msgstr "PID" msgid "PIN" msgstr "PIN" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2425,6 +2506,9 @@ msgstr "Maksimalt:" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2495,9 +2579,6 @@ msgstr "" msgid "Prevents client-to-client communication" msgstr "Hindrer klient-til-klient kommunikasjon" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "Prism2/2.5/3 802.11b Trådløs Kontroller" - msgid "Private Key" msgstr "" @@ -2546,6 +2627,11 @@ msgstr "" msgid "Quality" msgstr "Kvalitet" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2564,9 +2650,6 @@ msgstr "RX" msgid "RX Rate" msgstr "RX Rate" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "RaLink 802.11%s Trådløs Kontroller" - msgid "Radius-Accounting-Port" msgstr "Radius-Accounting-Port" @@ -2585,6 +2668,9 @@ msgstr "Radius-Authentication-Secret" msgid "Radius-Authentication-Server" msgstr "Radius-Authentication-Server" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" @@ -2593,15 +2679,12 @@ msgstr "" "Configuration Protocol\">DHCP-Server" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" -"Fjerne dette grensesnittet? Slettingen kan ikke omgjøres!\n" -"Du kan miste kontakten med ruteren om du er tilkoblet via dette " -"grensesnittet." msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" "Fjerne dette trådløse nettverket? Slettingen kan ikke omgjøres!\n" @@ -2610,23 +2693,6 @@ msgstr "" msgid "Really reset all changes?" msgstr "Vil du nullstille alle endringer?" -#, fuzzy -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" -"Slå av dette nettverket ?\n" -"Du kan miste kontakten med ruteren om du er tilkoblet via dette " -"grensesnittet." - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" -"Slå av dette grensesnittet \"%s\" ?\n" -"Du kan miste kontakten med ruteren om du er tilkoblet via dette " -"grensesnittet." - msgid "Really switch protocol?" msgstr "Vil du endre protokoll?" @@ -2672,9 +2738,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "Koble til igjen" -msgid "Reconnecting interface" -msgstr "Kobler til igjen" - msgid "References" msgstr "Referanser" @@ -2714,9 +2777,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2766,6 +2826,12 @@ msgstr "Omstart" msgid "Restart Firewall" msgstr "Omstart Brannmur" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "Gjenoppretting" + msgid "Restore backup" msgstr "Gjenopprett sikkerhetskopi" @@ -2775,6 +2841,15 @@ msgstr "Vis/Skjul passord" msgid "Revert" msgstr "Tilbakestill" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Rot" @@ -2790,9 +2865,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2818,14 +2890,6 @@ msgstr "Kjør filsystem sjekk" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2853,12 +2917,12 @@ msgstr "Lagre" msgid "Save & Apply" msgstr "Lagre & Aktiver" -msgid "Save & Apply" -msgstr "Lagre & Aktiver" - msgid "Scan" msgstr "Skann" +msgid "Scan request failed" +msgstr "" + msgid "Scheduled Tasks" msgstr "Planlagte Oppgaver" @@ -2884,17 +2948,6 @@ msgstr "Separerte Klienter" msgid "Server Settings" msgstr "Server Innstillinger" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Tjeneste navn" @@ -2913,6 +2966,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "Oppsett tidssynkronisering" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "Oppsett DHCP server" @@ -2922,15 +2981,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "Vis gjeldende liste med sikkerhetskopifiler" msgid "Shutdown this interface" msgstr "Slå av dette grensesnittet" -msgid "Shutdown this network" -msgstr "Slå av dette nettverket" - msgid "Signal" msgstr "Signal" @@ -2985,15 +3044,9 @@ msgstr "" "flashes manuelt. Viser til wiki for installering av firmare på forskjellige " "enheter." -msgid "Sort" -msgstr "Sortering" - msgid "Source" msgstr "Kilde" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "Hvor lagrings enheten blir tilsluttet filsystemet (f.eks. /mnt/sda1)" @@ -3033,6 +3086,12 @@ msgstr "Start" msgid "Start priority" msgstr "Start prioritet" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "Oppstart" @@ -3194,9 +3253,22 @@ msgstr "" "Gyldige tegn er: A-Z, a-z, 0-9 og " "_" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3222,9 +3294,6 @@ msgstr "" "sammenlign dem med den opprinnelige filen for å sikre dataintegriteten.
Klikk \"Fortsett\" nedenfor for å starte flash prosedyren." -msgid "The following changes have been committed" -msgstr "Følgende endringer er foretatt" - msgid "The following changes have been reverted" msgstr "Følgende endringer er forkastet" @@ -3292,11 +3361,6 @@ msgstr "" "du prøver å koble til igjen. Det kan være nødvendig å fornye ip-adressen til " "datamaskinen din for å nå enheten på nytt. (avhengig av innstillingene dine)" -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3307,8 +3371,8 @@ msgstr "" msgid "There are no active leases." msgstr "Det er ingen aktive leieavtaler." -msgid "There are no pending changes to apply!" -msgstr "Det finnes ingen endringer som kan utføres!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Det finnes ingen endriger å reversere!" @@ -3412,10 +3476,13 @@ msgstr "Tidssone" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" "For å gjenopprette konfigurasjonsfiler, kan du her laste opp et backup arkiv " -"som ble opprettet tidligere." +"som ble opprettet tidligere. For å nullstille firmwaren til opprinnelig " +"tilstand, klikker du på \"Utfør nullstilling\" (kun mulig på squashfs " +"firmwarer)." msgid "Tone" msgstr "" @@ -3459,15 +3526,6 @@ msgstr "Tunnel grensesnitt" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Tx-Styrke" @@ -3492,9 +3550,27 @@ msgstr "" msgid "UUID" msgstr "UUID" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "Kan ikke sende" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3504,6 +3580,9 @@ msgstr "Ukjent" msgid "Unknown Error, password not changed!" msgstr "Ukjent feil, passordet ble ikke endret!" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "Uhåndtert" @@ -3513,9 +3592,18 @@ msgstr "" msgid "Unsaved Changes" msgstr "Ulagrede Endringer" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "Protokoll type er ikke støttet." +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "Oppdater lister" @@ -3647,18 +3735,15 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "Leverandør klasse som sendes ved DHCP spørring" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Bekreft" msgid "Version" msgstr "Versjon" +msgid "Virtual dynamic interface" +msgstr "" + msgid "WDS" msgstr "WDS" @@ -3684,16 +3769,15 @@ msgstr "" "WPA-Kryptering krever at wpa_supplicant (for klient-modus) eller hostapd " "(for AP og ad-hoc-modus) er installert." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "Venter på at endringer utføres..." msgid "Waiting for command to complete..." msgstr "Venter på at kommando fullføres..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3708,12 +3792,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3735,8 +3813,11 @@ msgstr "Trådløs Oversikt" msgid "Wireless Security" msgstr "Trådløs Sikkerhet" -msgid "Wireless is disabled or not associated" -msgstr "Trådløs er deaktiver eller ikke tilknyttet" +msgid "Wireless is disabled" +msgstr "Trådløs er deaktiver" + +msgid "Wireless is not associated" +msgstr "Trådløs er ikke tilknyttet" msgid "Wireless is restarting..." msgstr "Trådløst starter på nytt..." @@ -3747,12 +3828,6 @@ msgstr "Trådløst nettverk er deaktivert" msgid "Wireless network is enabled" msgstr "Trådløst nettverk er aktivert" -msgid "Wireless restarted" -msgstr "Trådløst startet på nytt" - -msgid "Wireless shut down" -msgstr "Trådløst er slått av" - msgid "Write received DNS requests to syslog" msgstr "Skriv mottatte DNS forespørsler til syslog" @@ -3793,6 +3868,9 @@ msgstr "baseT" msgid "bridged" msgstr "brokoblet" +msgid "create" +msgstr "" + msgid "create:" msgstr "opprett:" @@ -3830,9 +3908,6 @@ msgstr "full-dupleks" msgid "half-duplex" msgstr "halv-dupleks" -msgid "help" -msgstr "Hjelp" - msgid "hidden" msgstr "skjult" @@ -3857,10 +3932,10 @@ msgstr "kbit/s" msgid "local DNS file" msgstr "lokal DNS-fil" -msgid "minimum 1280, maximum 1480" +msgid "minutes" msgstr "" -msgid "minutes" +msgid "mixed WPA/WPA2" msgstr "" msgid "no" @@ -3884,6 +3959,9 @@ msgstr "på" msgid "open" msgstr "åpen" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" @@ -3935,6 +4013,103 @@ msgstr "ja" msgid "« Back" msgstr "« Tilbake" +#~ msgid "%s - %s" +#~ msgstr "%s - %s" + +#~ msgid "Activate this network" +#~ msgstr "Aktiver dette nettverket" + +#~ msgid "Hermes 802.11b Wireless Controller" +#~ msgstr "Hermes 802.11b Trådløs Kontroller" + +#~ msgid "Interface is shutting down..." +#~ msgstr "Grensesnittet slår seg av..." + +#~ msgid "Interface reconnected" +#~ msgstr "Grensesnittet er koblet til igjen" + +#~ msgid "Interface shut down" +#~ msgstr "Grensesnittet er slått av" + +#~ msgid "Prism2/2.5/3 802.11b Wireless Controller" +#~ msgstr "Prism2/2.5/3 802.11b Trådløs Kontroller" + +#~ msgid "RaLink 802.11%s Wireless Controller" +#~ msgstr "RaLink 802.11%s Trådløs Kontroller" + +#~ msgid "" +#~ "Really shutdown interface \"%s\"? You might lose access to this device if " +#~ "you are connected via this interface." +#~ msgstr "" +#~ "Slå av dette grensesnittet \"%s\" ?\n" +#~ "Du kan miste kontakten med ruteren om du er tilkoblet via dette " +#~ "grensesnittet." + +#~ msgid "Reconnecting interface" +#~ msgstr "Kobler til igjen" + +#~ msgid "Shutdown this network" +#~ msgstr "Slå av dette nettverket" + +#~ msgid "Wireless restarted" +#~ msgstr "Trådløst startet på nytt" + +#~ msgid "Wireless shut down" +#~ msgstr "Trådløst er slått av" + +#~ msgid "DHCP Leases" +#~ msgstr "DHCP Leier" + +#~ msgid "DHCPv6 Leases" +#~ msgstr "DHCPv6 Leier" + +#~ msgid "" +#~ "Really delete this interface? The deletion cannot be undone! You might " +#~ "lose access to this device if you are connected via this interface." +#~ msgstr "" +#~ "Fjerne dette grensesnittet? Slettingen kan ikke omgjøres!\n" +#~ "Du kan miste kontakten med ruteren om du er tilkoblet via dette " +#~ "grensesnittet." + +#, fuzzy +#~ msgid "" +#~ "Really shut down network? You might lose access to this device if you are " +#~ "connected via this interface." +#~ msgstr "" +#~ "Slå av dette nettverket ?\n" +#~ "Du kan miste kontakten med ruteren om du er tilkoblet via dette " +#~ "grensesnittet." + +#~ msgid "Sort" +#~ msgstr "Sortering" + +#~ msgid "help" +#~ msgstr "Hjelp" + +#~ msgid "IPv4 WAN Status" +#~ msgstr "IPv4 WAN Status" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "IPv6 WAN Status" + +#~ msgid "Apply" +#~ msgstr "Bruk" + +#~ msgid "Applying changes" +#~ msgstr "Utfører endringer" + +#~ msgid "Configuration applied." +#~ msgstr "Konfigurasjons endring utført." + +#~ msgid "Save & Apply" +#~ msgstr "Lagre & Aktiver" + +#~ msgid "The following changes have been committed" +#~ msgstr "Følgende endringer er foretatt" + +#~ msgid "There are no pending changes to apply!" +#~ msgstr "Det finnes ingen endringer som kan utføres!" + #~ msgid "Action" #~ msgstr "Handling" diff --git a/luci-base/po/pl/base.po b/luci-base/po/pl/base.po index 5e2fbaeee..cef8ea952 100644 --- a/luci-base/po/pl/base.po +++ b/luci-base/po/pl/base.po @@ -3,8 +3,8 @@ msgstr "" "Project-Id-Version: LuCI\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-04-20 09:40+0200\n" -"PO-Revision-Date: 2014-04-23 19:15+0200\n" -"Last-Translator: goodgod261 \n" +"PO-Revision-Date: 2018-07-21 18:35+0200\n" +"Last-Translator: Rixerx \n" "Language-Team: Polish\n" "Language: pl\n" "MIME-Version: 1.0\n" @@ -18,7 +18,7 @@ msgid "%.1f dB" msgstr "" msgid "%s is untagged in multiple VLANs!" -msgstr "" +msgstr "%s jest nieotagowany w wielu grupach VLAN!" msgid "(%d minute window, %d second interval)" msgstr "(okno %d minut, interwał %d sekund)" @@ -42,12 +42,15 @@ msgid "-- custom --" msgstr "-- własne --" msgid "-- match by device --" -msgstr "" +msgstr "-- dopasuj według urządzenia --" msgid "-- match by label --" -msgstr "" +msgstr "-- dopasuj po etykiecie --" msgid "-- match by uuid --" +msgstr "-- dopasuj po uuid --" + +msgid "-- please select --" msgstr "" msgid "1 Minute Load:" @@ -60,13 +63,13 @@ msgid "4-character hexadecimal ID" msgstr "" msgid "464XLAT (CLAT)" -msgstr "" +msgstr "464XLAT (CLAT)" msgid "5 Minute Load:" msgstr "Obciążenie 5 min.:" msgid "6-octet identifier as a hex string - no colons" -msgstr "" +msgstr "Identyfikator 6-oktetowy jako ciąg szesnastkowy - bez dwukropków" msgid "802.11r Fast Transition" msgstr "" @@ -81,10 +84,10 @@ msgid "802.11w Management Frame Protection" msgstr "" msgid "802.11w maximum timeout" -msgstr "" +msgstr "802.11w maksymalny czas oczekiwania" msgid "802.11w retry timeout" -msgstr "" +msgstr "802.11w interwał ponawiania prób" msgid "BSSID" msgstr "BSSID" @@ -124,7 +127,7 @@ msgid "IPv6-Gateway" msgstr "Brama IPv6" msgid "IPv6-Suffix (hex)" -msgstr "" +msgstr "Sufiks IPv6(hex)" msgid "LED Configuration" msgstr "Konfiguracja diod LED" @@ -155,13 +158,12 @@ msgstr "" msgid "Max. concurrent queries" msgstr "Maks. zapytań równoczesnych" -msgid "%s - %s" -msgstr "%s - %s" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." msgstr "" +"
Uwaga: musisz ręcznie zrestartować usługę cron, jeśli plik crontab był " +"pusty przed edycją." msgid "A43C + J43 + A43" msgstr "" @@ -170,10 +172,7 @@ msgid "A43C + J43 + A43 + V43" msgstr "" msgid "ADSL" -msgstr "" - -msgid "AICCU (SIXXS)" -msgstr "" +msgstr "ADSL" msgid "ANSI T1.413" msgstr "" @@ -188,7 +187,7 @@ msgid "ATM (Asynchronous Transfer Mode)" msgstr "" msgid "ATM Bridges" -msgstr "Mostki ATM" +msgstr "Mosty ATM" # Nie wiem czy to powinno się tłumaczyć wg. mnie lepiej zostawić po angielsku msgid "ATM Virtual Channel Identifier (VCI)" @@ -198,15 +197,14 @@ msgstr "Identyfikator kanału wirtualnego ATM (VCI)" msgid "ATM Virtual Path Identifier (VPI)" msgstr "Identyfikator ścieżki wirtualnej ATM (VPI)" -# Jak zwykle zakręciłem...niech ktoś poprawi msgid "" "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual " "Linux network interfaces which can be used in conjunction with DHCP or PPP " "to dial into the provider network." msgstr "" -"Mostki ATM maskują za-kapsułkowane ramki Ethernet w połączeniach AAL5 jako " -"wirtualne interfejsy w Linuksie. Interfejsy takie mogą być użyte w " -"połączeniu z protokołami DHCP lub PPP do wdzwaniania się do sieci provider`a" +"Mosty ATM eksponują enkapsulowaną sieć Ethernet w połączeniach AAL5 jako " +"wirtualne interfejsy sieciowe systemu Linux, które mogą być używane w " +"połączeniu z protokołem DHCP lub PPP w celu polączenia się z siecią dostawcy." msgid "ATM device number" msgstr "Numer urządzenia ATM" @@ -214,9 +212,6 @@ msgstr "Numer urządzenia ATM" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - # co to takiego? msgid "Access Concentrator" msgstr "Koncentrator dostępowy ATM" @@ -227,9 +222,6 @@ msgstr "Punkt dostępowy" msgid "Actions" msgstr "Akcje" -msgid "Activate this network" -msgstr "Aktywuj tą sieć" - msgid "Active IPv4-Routes" msgstr "" "Aktywne trasy routingu IPv4SSH password authentication" msgstr "Pozwól na logowanie SSH" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "Pozwól aby tryb AP rozłączał stacje STA w oparciu o niski stan ACK" + msgid "Allow all except listed" msgstr "Pozwól wszystkim oprócz wymienionych" msgid "Allow legacy 802.11b rates" -msgstr "" +msgstr "Zezwalaj na starsze wersje 802.11b" msgid "Allow listed only" msgstr "Pozwól tylko wymienionym" @@ -311,15 +316,13 @@ msgstr "Pozwól tylko sobie (localhost)" msgid "Allow remote hosts to connect to local SSH forwarded ports" msgstr "" -"Pozwól zdalnym komputerom na połączenia SSH do lokalnych przekierowanych " -"portów" +"Zezwalaj zdalnym hostom na łączenie się z lokalnie przekazywanymi portami SSH" msgid "Allow root logins with password" msgstr "Zezwól na logowanie roota przy pomocy hasła" -# Brak spacji... msgid "Allow the root user to login with password" -msgstr "Pozwól użytkownikowi root na logowanie przy pomocy hasła" +msgstr "Pozwól użytkownikowi root na logowanie się przy pomocy hasła" msgid "" "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services" @@ -327,15 +330,17 @@ msgstr "" "Pozwól na ruch wychodzący (odpowiedzi) z podsieci 127.0.0.0/8, np. usługi RBL" msgid "Allowed IPs" -msgstr "" - -msgid "" -"Also see Tunneling Comparison on SIXXS" -msgstr "" +msgstr "Dozwolone adresy IP" msgid "Always announce default router" +msgstr "Zawsze rozgłaszaj domyślny router" + +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" +"Zawsze używaj kanału 40 MHz, nawet jeśli kanał dodatkowy nachodzi na inny. " +"Używanie tej opcji nie jest zgodne z IEEE 802.11n-2009!" msgid "Annex" msgstr "" @@ -384,12 +389,14 @@ msgstr "" msgid "Announce as default router even if no public prefix is available." msgstr "" +"Rozgłaszaj jako domyślny router nawet jeśli publiczny prefiks nie jest " +"dostępny." msgid "Announced DNS domains" -msgstr "" +msgstr "Rozgłaszaj domeny DNS" msgid "Announced DNS servers" -msgstr "" +msgstr "Rozgłaszaj serwery DNS" msgid "Anonymous Identity" msgstr "" @@ -412,15 +419,20 @@ msgstr "Ustawienia anteny" msgid "Any zone" msgstr "Dowolna strefa" -msgid "Apply" -msgstr "Zatwierdź" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" -msgstr "Wprowadzam zmiany" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" +msgstr "Architektura" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" +"Przypisz część danej długości każdego publicznego prefiksu IPv6 do tego " +"interfejsu" msgid "Assign interfaces..." msgstr "Przypisz interfejsy..." @@ -428,10 +440,15 @@ msgstr "Przypisz interfejsy..." msgid "" "Assign prefix parts using this hexadecimal subprefix ID for this interface." msgstr "" +"Przypisz cześć prefiksu za pomocą szesnastkowego ID subprefiksu dla tego " +"interfejsu" msgid "Associated Stations" msgstr "Połączone stacje" +msgid "Associations" +msgstr "Połączeni" + msgid "Auth Group" msgstr "" @@ -441,7 +458,6 @@ msgstr "Uwierzytelnianie" msgid "Authentication Type" msgstr "" -# Nawet M$ tego nie tłumaczy;) msgid "Authoritative" msgstr "Autorytatywny" @@ -508,15 +524,14 @@ msgstr "Wróć do przeglądu" msgid "Back to scan results" msgstr "Wróć do wyników skanowania" -msgid "Backup / Flash Firmware" -msgstr "Kopia zapasowa/aktualizacja firmware" +msgid "Backup" +msgstr "Kopia zapasowa" -# NIe ma powodu skracać tekstu, zmieści się w polu. -msgid "Backup / Restore" -msgstr "Kopia zapasowa/Przywróć" +msgid "Backup / Flash Firmware" +msgstr "Kopia zapasowa / aktualizacja firmware" msgid "Backup file list" -msgstr "Kopia zapas. listy plików" +msgstr "Kopia zapasowa listy plików" msgid "Bad address specified!" msgstr "Wprowadzono zły adres" @@ -524,8 +539,8 @@ msgstr "Wprowadzono zły adres" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" +msgid "Beacon Interval" +msgstr "Interwał Beaconu" msgid "" "Below is the determined list of files to backup. It consists of changed " @@ -541,12 +556,13 @@ msgstr "" msgid "Bind only to specific interfaces rather than wildcard address." msgstr "" +"Powiąż tylko ze specyficznymi interfejsami, a nie z adresami wieloznacznymi." msgid "Bind the tunnel to this interface (optional)." msgstr "" msgid "Bitrate" -msgstr "Przepływność" +msgstr "Szybkość transmisji" msgid "Bogus NX Domain Override" msgstr "Podrób statystyki NXDOMAIN" @@ -560,7 +576,6 @@ msgstr "Interfejs mostu" msgid "Bridge unit number" msgstr "Numer Mostu (urządzenia)" -# Podejrzewam że chodzi o interfejs? mam rację? msgid "Bring up on boot" msgstr "Podnieś przy stracie" @@ -584,6 +599,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "Użycie CPU (%)" +msgid "Call failed" +msgstr "Połączenie nieudane" + msgid "Cancel" msgstr "Anuluj" @@ -599,12 +617,20 @@ msgstr "Zmiany" msgid "Changes applied." msgstr "Zmiany zostały zastosowane." +msgid "Changes have been reverted." +msgstr "Zmiany zostały cofnięte." + msgid "Changes the administrator password for accessing the device" msgstr "Zmienia hasło administratora" msgid "Channel" msgstr "Kanał" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Sprawdź" @@ -624,8 +650,8 @@ msgid "" "interface to it." msgstr "" "Wybierz strefę firewalla którą chcesz przypisać do tego interfejsu. Wybierz " -"unspecified aby usunąć interfejs z przypisanej strefy lub wybierz " -"pole create aby zdefiniować nową strefę i przypisać ją do " +"nieokreślone aby usunąć interfejs z przypisanej strefy lub wybierz " +"pole utwórz aby zdefiniować nową strefę i przypisać ją do " "interfejsu." msgid "" @@ -641,15 +667,12 @@ msgstr "Szyfr" msgid "Cisco UDP encapsulation" msgstr "" -# Przyciski nazywają sie "Twórz archiwum" i "Wykonaj reset" a nie Przywróć Ustawienia msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" -"Wciśnij \"Twórz archiwum\" aby pobrać archiwum tar zawierające bieżące pliki " -"konfiguracyjne. Aby przywrócić ustawienia domyślne wciśnij \"Wykonaj reset" -"\" (możliwe tylko w przypadku obrazu squashfs)." +"Kliknij \"Twórz archiwum\" aby pobrać archiwum tar zawierające bieżące pliki " +"konfiguracyjne." msgid "Client" msgstr "Klient" @@ -682,16 +705,27 @@ msgid "" "workaround might cause interoperability issues and reduced robustness of key " "negotiation especially in environments with heavy traffic load." msgstr "" +"Komplikuje atak ponownej instalacji klucza po stronie klienta, wyłączając " +"retransmisję ramek klucza EAPOL, które są używane do instalowania kluczy. To " +"obejście może powodować problemy z interoperacyjnością i zmniejszoną " +"odporność kluczowych negocjacji, szczególnie w środowiskach o dużym " +"natężeniu ruchu." msgid "Configuration" msgstr "Konfiguracja" -msgid "Configuration applied." -msgstr "Konfiguracja została zastosowana." +msgid "Configuration failed" +msgstr "Konfiguracja nieudana" msgid "Configuration files will be kept." msgstr "Pliki konfiguracyjne zostaną zachowane." +msgid "Configuration has been applied." +msgstr "Konfiguracja została zastosowana." + +msgid "Configuration has been rolled back!" +msgstr "Konfiguracja została wycofana!" + msgid "Confirmation" msgstr "Potwierdzenie" @@ -704,12 +738,18 @@ msgstr "Połączony" msgid "Connection Limit" msgstr "Limit połączeń" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" +msgid "Connection attempt failed" +msgstr "Próba połączenia nieudana" msgid "Connections" msgstr "Połączenia" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Kraj" @@ -739,7 +779,7 @@ msgid "Cron Log Level" msgstr "Poziom logowania Cron`a" msgid "Custom Interface" -msgstr "Interfejs Niestandardowy" +msgstr "Interfejs niestandardowy" msgid "Custom delegated IPv6-prefix" msgstr "" @@ -756,8 +796,9 @@ msgid "" "Custom files (certificates, scripts) may remain on the system. To prevent " "this, perform a factory-reset first." msgstr "" +"Własne pliki (certyfikaty, skrypty) mogą pozostać w systemie. Aby zapobiec " +"temu, wykonaj najpierw reset do ustawień fabrycznych" -# Spacji zabrało i napisy się skleiły msgid "" "Customizes the behaviour of the device LEDs if possible." @@ -765,9 +806,6 @@ msgstr "" "Dostosuj zachowanie diod LED " "urządzenia jeśli jest to możliwe." -msgid "DHCP Leases" -msgstr "Dzierżawy DHCP" - msgid "DHCP Server" msgstr "Serwer DHCP" @@ -780,17 +818,14 @@ msgstr "Klient DHCP" msgid "DHCP-Options" msgstr "Opcje DHCP" -msgid "DHCPv6 Leases" -msgstr "Dzierżawy DHCPv6" - msgid "DHCPv6 client" -msgstr "" +msgstr "Klient DHCPv6" msgid "DHCPv6-Mode" -msgstr "" +msgstr "Tryb DHCPv6" msgid "DHCPv6-Service" -msgstr "" +msgstr "Serwis DHCPv6" msgid "DNS" msgstr "DNS" @@ -805,7 +840,7 @@ msgid "DNSSEC" msgstr "" msgid "DNSSEC check unsigned" -msgstr "" +msgstr "Sprawdzanie DNSSEC bez podpisu" msgid "DPD Idle Timeout" msgstr "" @@ -814,14 +849,17 @@ msgid "DS-Lite AFTR address" msgstr "" msgid "DSL" -msgstr "" +msgstr "DSL" msgid "DSL Status" -msgstr "" +msgstr "Status DSL" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "Interwał DTIM" + msgid "DUID" msgstr "DUID" @@ -840,9 +878,6 @@ msgstr "Brama domyślna" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Stan domyślny" @@ -863,10 +898,12 @@ msgstr "Usuń" msgid "Delete this network" msgstr "Usuń tą sieć" +msgid "Delivery Traffic Indication Message Interval" +msgstr "Interwał komunikatu o wskazaniu dostawy ruchu" + msgid "Description" msgstr "Opis" -# Ktoś tłumaczył bez zobaczenia tego w gui. Dotyczy zmiany motywu ten opis. msgid "Design" msgstr "Motyw" @@ -880,9 +917,12 @@ msgid "Device Configuration" msgstr "Konfiguracja urządzenia" msgid "Device is rebooting..." +msgstr "Urządzenie jest uruchamiane ponownie ..." + +msgid "Device unreachable!" msgstr "" -msgid "Device unreachable" +msgid "Device unreachable! Still waiting for device..." msgstr "" msgid "Diagnostics" @@ -905,20 +945,32 @@ msgstr "" "tym interfejsie." msgid "Disable DNS setup" -msgstr "Wyłącz konfigurowanie DNS" +msgstr "Wyłącz konfigurację DNS" msgid "Disable Encryption" -msgstr "" +msgstr "Wyłącz szyfrowanie" + +msgid "Disable this network" +msgstr "Wyłącz tą sieć" msgid "Disabled" msgstr "Wyłączony" msgid "Disabled (default)" -msgstr "" +msgstr "Wyłączone (domyślnie)" + +msgid "Disassociate On Low Acknowledgement" +msgstr "Rozłączaj przy niskim stanie ramek ACK" msgid "Discard upstream RFC1918 responses" msgstr "Odrzuć wychodzące odpowiedzi RFC1918" +msgid "Disconnection attempt failed" +msgstr "Próba rozłączenia nie powiodła się" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Pokazuję tylko paczki zawierające" @@ -935,15 +987,14 @@ msgstr "" msgid "Diversity" msgstr "Wielorakość" -# Nie wiem czy nie zamotałem ja rozumiem;) msgid "" "Dnsmasq is a combined DHCP-Server and DNS-" "Forwarder for NAT " "firewalls" msgstr "" -"Dnsmasq jest to serwer DHCP połączony z serwerem DNSDHCP połączonym z serwerem DNS. Jest to serwer przekazujący (Fowarder) dla firewalli NAT" @@ -974,6 +1025,9 @@ msgstr "" "Nie przekazuj zapytań DNS bez " "nazwy DNS'a" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "Pobierz i zainstaluj pakiet" @@ -997,7 +1051,6 @@ msgstr "" msgid "Dual-Stack Lite (RFC6333)" msgstr "" -# "n" brakowało... msgid "Dynamic DHCP" msgstr "" "DHCP dynamiczne" @@ -1032,7 +1085,6 @@ msgstr "Edytuj ten interfejs" msgid "Edit this network" msgstr "Edytuj tą sieć" -# dosłownie nagły wypadek msgid "Emergency" msgstr "Zagrożenie" @@ -1043,6 +1095,8 @@ msgid "" "Enable IGMP " "snooping" msgstr "" +"Włącz nasłuchiwanie IGMP" msgid "Enable STP" msgstr "Włącz STP" @@ -1051,7 +1105,7 @@ msgid "Enable HE.net dynamic endpoint update" msgstr "Włącz dynamiczną aktualizację punktu końcowego sieci HE.net" msgid "Enable IPv6 negotiation" -msgstr "" +msgstr "Włącz negocjację IPv6" msgid "Enable IPv6 negotiation on the PPP link" msgstr "Włącz negocjację IPv6 na łączu PPP" @@ -1072,10 +1126,10 @@ msgid "Enable VLAN functionality" msgstr "Włącz funkcjonalność VLAN" msgid "Enable WPS pushbutton, requires WPA(2)-PSK" -msgstr "" +msgstr "Włącz przycisk WPS, wymaga WPA(2)-PSK" msgid "Enable key reinstallation (KRACK) countermeasures" -msgstr "" +msgstr "Włącz środki zaradcze dotyczące ponownej instalacji kluczy (KRACK)" msgid "Enable learning and aging" msgstr "Włącz uczenie się i starzenie" @@ -1092,6 +1146,9 @@ msgstr "" msgid "Enable this mount" msgstr "Włącz ten punkt montowania" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "Włącz ten swap" @@ -1102,21 +1159,22 @@ msgid "Enabled" msgstr "Włączony" msgid "Enables IGMP snooping on this bridge" -msgstr "" +msgstr "Włącz nasłuchiwanie IGMP na tym moście" msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" msgstr "" +"Aktywuje szybki roaming pomiędzy punktami dostępowymi, które należą do tej " +"samej domeny" msgid "Enables the Spanning Tree Protocol on this bridge" msgstr "" "Włącz protokół STP na tym " "moście" -# a może sposób kapsułkowania byłby lepszy? msgid "Encapsulation mode" -msgstr "Sposób Enkapsulacji" +msgstr "Sposób enkapsulacji" msgid "Encryption" msgstr "Szyfrowanie" @@ -1127,6 +1185,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "Usuwanie..." @@ -1143,7 +1207,7 @@ msgid "Ethernet Switch" msgstr "Switch Ethernet" msgid "Exclude interfaces" -msgstr "" +msgstr "Wyklucz interfejsy" msgid "Expand hosts" msgstr "Rozwiń hosty" @@ -1167,13 +1231,13 @@ msgid "External R1 Key Holder List" msgstr "" msgid "External system log server" -msgstr "Zewnętrzny serwer dla loga systemowego" +msgstr "Zewnętrzny serwer dla logów systemowych" msgid "External system log server port" -msgstr "Port zewnętrznego serwera dla loga systemowego" +msgstr "Port zewnętrznego serwera dla logów systemowych" msgid "External system log server protocol" -msgstr "" +msgstr "Protokół zewnętrznego serwera dla logów systemowych" msgid "Extra SSH command options" msgstr "" @@ -1187,6 +1251,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "Nie udało się zatwierdzić w ciągu %ds, czekam na wycofanie…" + msgid "File" msgstr "Plik" @@ -1205,6 +1272,9 @@ msgstr "Filtruj prywatne" msgid "Filter useless" msgstr "Filtruj bezużyteczne" +msgid "Finalizing failed" +msgstr "Finalizacja nie powiodła się" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1225,7 +1295,6 @@ msgstr "Firewall" msgid "Firewall Mark" msgstr "" -# Nie ma potrzeby pisania z dużej litery msgid "Firewall Settings" msgstr "Ustawienia firewalla" @@ -1259,6 +1328,9 @@ msgstr "Flashowanie..." msgid "Force" msgstr "Wymuś" +msgid "Force 40MHz mode" +msgstr "Wymuś tryb 40MHz" + msgid "Force CCMP (AES)" msgstr "Wymuś CCMP (AES)" @@ -1273,7 +1345,7 @@ msgid "Force TKIP and CCMP (AES)" msgstr "Wymuś TKIP i CCMP (AES)" msgid "Force link" -msgstr "" +msgstr "Wymuś połączenie" msgid "Force use of NAT-T" msgstr "" @@ -1310,7 +1382,7 @@ msgstr "Wolna przestrzeń" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1322,6 +1394,9 @@ msgstr "Tylko GPRS" msgid "Gateway" msgstr "Brama" +msgid "Gateway address is invalid" +msgstr "Adres bramy jest nieprawidłowy" + msgid "Gateway ports" msgstr "Porty bramy" @@ -1335,10 +1410,10 @@ msgid "General options for opkg" msgstr "" msgid "Generate Config" -msgstr "" +msgstr "Wygeneruj konfigurację" msgid "Generate PMK locally" -msgstr "" +msgstr "Wygeneruj PMK lokalnie" msgid "Generate archive" msgstr "Twórz archiwum" @@ -1355,7 +1430,7 @@ msgid "Global Settings" msgstr "" msgid "Global network options" -msgstr "" +msgstr "Globalne opcje sieciowe" msgid "Go to password configuration..." msgstr "Przejdź do konfiguracji hasła..." @@ -1367,7 +1442,7 @@ msgid "Group Password" msgstr "" msgid "Guest" -msgstr "" +msgstr "Gość" msgid "HE.net password" msgstr "Hasło HE.net" @@ -1384,9 +1459,6 @@ msgstr "Rozłącz" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1402,9 +1474,6 @@ msgstr "" "Tutaj wklej swoje klucze publiczne SSH (po jednym w linii), dla " "uwierzytelniania SSH" -msgid "Hermes 802.11b Wireless Controller" -msgstr "Kontroler bezprzewodowy Hermes 802.11b" - msgid "Hide ESSID" msgstr "" "Ukryj ESSIDIP or Network" msgstr "IP lub sieć Hosta" +msgid "Host-Uniq tag content" +msgstr "Zawartość znacznika Host-Uniq" + msgid "Hostname" msgstr "Nazwa hosta" msgid "Hostname to send when requesting DHCP" -msgstr "Nazwa hosta do wysłania podczas negocjacji DHCP" +msgstr "Nazwa hosta wysyłana podczas negocjacji DHCP" msgid "Hostnames" msgstr "Nazwy hostów" @@ -1443,14 +1515,20 @@ msgstr "" msgid "IP address" msgstr "Adres IP" +msgid "IP address in invalid" +msgstr "Nieprawidłowy adres IP" + +msgid "IP address is missing" +msgstr "Brakuje adresu IP" + msgid "IPv4" msgstr "IPv4" msgid "IPv4 Firewall" msgstr "Firewall IPv4" -msgid "IPv4 WAN Status" -msgstr "Status IPv4 WAN" +msgid "IPv4 Upstream" +msgstr "Źródłowy IPv4" msgid "IPv4 address" msgstr "Adres IPv4" @@ -1492,28 +1570,25 @@ msgid "IPv6 Firewall" msgstr "Firewall IPv6" msgid "IPv6 Neighbours" -msgstr "" +msgstr "Sąsiedztwo IPv6" msgid "IPv6 Settings" -msgstr "" +msgstr "Ustawienia IPv6" msgid "IPv6 ULA-Prefix" -msgstr "" +msgstr "IPv6 Prefiks-ULA" -msgid "IPv6 WAN Status" -msgstr "Status WAN IPv6" +msgid "IPv6 Upstream" +msgstr "Źródłowy IPv6" msgid "IPv6 address" msgstr "Adres IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" -msgstr "" +msgstr "Wskazówka przypisania IPv6" msgid "IPv6 assignment length" -msgstr "" +msgstr "Długość przydziału IPv6" msgid "IPv6 gateway" msgstr "Brama IPv6" @@ -1531,7 +1606,7 @@ msgid "IPv6 routed prefix" msgstr "" msgid "IPv6 suffix" -msgstr "" +msgstr "Sufiks IPv6" msgid "IPv6-Address" msgstr "Adres IPv6" @@ -1619,6 +1694,9 @@ msgstr "Przychodzący:" msgid "Info" msgstr "Info" +msgid "Initialization failure" +msgstr "Błąd inicjalizacji" + msgid "Initscript" msgstr "Skrypt startowy" @@ -1630,6 +1708,7 @@ msgstr "Instaluj" msgid "Install iputils-traceroute6 for IPv6 traceroute" msgstr "" +"Zainstaluj iputils-traceroute6 w celu skorzystania z traceroute dla iPv6" msgid "Install package %q" msgstr "Instaluj pakiet %q" @@ -1649,35 +1728,24 @@ msgstr "" msgid "Interface Configuration" msgstr "Konfiguracja Interfejsu" -# Tam jest lista interfejsów.... msgid "Interface Overview" msgstr "Przegląd Interfejsów" msgid "Interface is reconnecting..." msgstr "Ponowne łączenie interfejsu..." -msgid "Interface is shutting down..." -msgstr "Interfejs jest wyłączany..." - msgid "Interface name" -msgstr "" +msgstr "Nazwa interfejsu" msgid "Interface not present or not connected yet." msgstr "Interfejs nie istnieje lub nie jest jeszcze podłączony." -msgid "Interface reconnected" -msgstr "Połączono ponownie interfejs" - -msgid "Interface shut down" -msgstr "Wyłączono interfejs" - msgid "Interfaces" msgstr "Interfejsy" msgid "Internal" msgstr "" -# Nadużycie tagu abbr uważam za uzasadnione. msgid "Internal Server Error" msgstr "Wewnętrzny błąd serwera" @@ -1694,7 +1762,7 @@ msgid "Invalid username and/or password! Please try again." msgstr "Niewłaściwy login i/lub hasło! Spróbuj ponownie." msgid "Isolate Clients" -msgstr "" +msgstr "Izoluj klientów" #, fuzzy msgid "" @@ -1711,10 +1779,10 @@ msgid "Join Network" msgstr "Połącz z siecią" msgid "Join Network: Wireless Scan" -msgstr "Przyłącz do sieci: Skanuj sieci WiFi" +msgstr "Przyłącz do sieci: Skanuj sieci Wi-Fi" msgid "Joining Network: %q" -msgstr "" +msgstr "Przyłączanie do sieci: %q" msgid "Keep settings" msgstr "Zachowaj ustawienia" @@ -1759,13 +1827,13 @@ msgid "Language and Style" msgstr "Wygląd i język" msgid "Latency" -msgstr "" +msgstr "Opoźnienie" msgid "Leaf" msgstr "" msgid "Lease time" -msgstr "" +msgstr "Czas dzierżawy" msgid "Lease validity time" msgstr "Czas ważności dzierżawy" @@ -1790,9 +1858,10 @@ msgstr "Limit" msgid "Limit DNS service to subnets interfaces on which we are serving DNS." msgstr "" +"Ogranicz usługi DNS do podsieci interfejsów, na których obsługujemy DNS." msgid "Limit listening to these interfaces, and loopback." -msgstr "" +msgstr "Ogranicz nasłuchiwanie do tych interfesjów, oraz loopbacku." msgid "Line Attenuation (LATN)" msgstr "" @@ -1842,10 +1911,10 @@ msgid "List of hosts that supply bogus NX domain results" msgstr "Lista hostów które dostarczają zafałszowane wyniki NX domain" msgid "Listen Interfaces" -msgstr "" +msgstr "Nasłuchuj interfejs" msgid "Listen Port" -msgstr "" +msgstr "Nasłuchuj port" msgid "Listen only on the given interface or, if unspecified, on all" msgstr "" @@ -1863,8 +1932,11 @@ msgstr "Średnie obciążenie" msgid "Loading" msgstr "Ładowanie" +msgid "Local IP address is invalid" +msgstr "Lokalny adres IP jest nieprawidłowy" + msgid "Local IP address to assign" -msgstr "" +msgstr "Lokalny adres IP do przypisania" msgid "Local IPv4 address" msgstr "Lokalny adres IPv4" @@ -1873,7 +1945,7 @@ msgid "Local IPv6 address" msgstr "Lokalny adres IPv6" msgid "Local Service Only" -msgstr "" +msgstr "Tylko serwis lokalny" msgid "Local Startup" msgstr "Lokalny autostart" @@ -1894,7 +1966,7 @@ msgstr "" msgid "Local domain suffix appended to DHCP names and hosts file entries" msgstr "" -"Przyrostek (suffiks) domeny przyłączany do nazw DHCP i wpisów w pliku hosts" +"Przyrostek (sufiks) domeny przyłączany do nazw DHCP i wpisów w pliku hosts" msgid "Local server" msgstr "Serwer lokalny" @@ -1933,6 +2005,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "Najniższy wydzierżawiony adres jako offset dla adresu sieci." +msgid "MAC" +msgstr "MAC" + msgid "MAC-Address" msgstr "Adres MAC" @@ -1948,11 +2023,14 @@ msgstr "Lista MAC" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "Reguła MAP jest nieprawidłowa" + msgid "MB/s" msgstr "MB/s" msgid "MD5" -msgstr "" +msgstr "MD5" msgid "MHz" msgstr "MHz" @@ -1964,6 +2042,8 @@ msgid "" "Make sure to clone the root filesystem using something like the commands " "below:" msgstr "" +"Upewnij się, że klonujesz główny system plików, używając czegoś podobnego do " +"poleceń poniżej:" msgid "Manual" msgstr "" @@ -2022,11 +2102,14 @@ msgid "Mode" msgstr "Tryb" msgid "Model" -msgstr "" +msgstr "Model" msgid "Modem device" msgstr "Modem" +msgid "Modem information query failed" +msgstr "Zapytanie dotyczące modemu nie powiodło się" + msgid "Modem init timeout" msgstr "Limit czasu inicjacji modemu" @@ -2089,10 +2172,10 @@ msgid "NAT64 Prefix" msgstr "" msgid "NCM" -msgstr "" +msgstr "NCM" msgid "NDP-Proxy" -msgstr "" +msgstr "Proxy NDP" msgid "NT Domain" msgstr "" @@ -2100,9 +2183,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Lista serwerów NTP" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nazwa" @@ -2127,6 +2207,9 @@ msgstr "Narzędzia sieciowe" msgid "Network boot image" msgstr "Sieciowy obraz startowy" +msgid "Network device is not present" +msgstr "Urządzenie sieciowe nie jest obecne" + msgid "Network without interfaces." msgstr "Sieć bez interfejsów" @@ -2148,6 +2231,9 @@ msgstr "Nie znaleziono plików" msgid "No information available" msgstr "Brak dostępnych informacji" +msgid "No matching prefix delegation" +msgstr "Brak zgodnej delegacji prefiksu" + msgid "No negative cache" msgstr "Brak odwrotnego cache`a" @@ -2166,6 +2252,9 @@ msgstr "Nie ustawiono hasła!" msgid "No rules in this chain" msgstr "Brak zasad w tym łańcuchu" +msgid "No scan results available yet..." +msgstr "Brak wyników skanowania..." + msgid "No zone assigned" msgstr "Brak przypisanej strefy" @@ -2173,7 +2262,7 @@ msgid "Noise" msgstr "Szum" msgid "Noise Margin (SNR)" -msgstr "" +msgstr "Margines szumów (SNR)" msgid "Noise:" msgstr "Szum:" @@ -2182,7 +2271,7 @@ msgid "Non Pre-emtive CRC errors (CRC_P)" msgstr "" msgid "Non-wildcard" -msgstr "" +msgstr "Bez symboli wieloznacznych" msgid "None" msgstr "Brak" @@ -2200,7 +2289,7 @@ msgid "Not connected" msgstr "Nie podłączony" msgid "Note: Configuration files will be erased." -msgstr "UWAGA: Pliki konfiguracyjne zostaną usunięte." +msgstr "Uwaga: Pliki konfiguracyjne zostaną usunięte." msgid "Note: interface name length" msgstr "" @@ -2213,6 +2302,8 @@ msgstr "Nslookup" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +"Liczba buforowanych wpisów DNS (max wynosi 10000, 0 oznacza brak pamięci " +"podręcznej)" msgid "OK" msgstr "OK" @@ -2226,6 +2317,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Zwłoka wyłączenia" @@ -2265,7 +2359,7 @@ msgid "OpenConnect (CISCO AnyConnect)" msgstr "" msgid "Operating frequency" -msgstr "" +msgstr "Częstotliwość" msgid "Option changed" msgstr "Wartość zmieniona" @@ -2274,13 +2368,7 @@ msgid "Option removed" msgstr "Usunięto wartość" msgid "Optional" -msgstr "" - -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" +msgstr "Opcjonalny" msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " @@ -2293,6 +2381,10 @@ msgid "" "server, use the suffix (like '::1') to form the IPv6 address ('a:b:c:d::1') " "for the interface." msgstr "" +"Opcjonalne. Dopuszczalne wartości: 'eui64', 'random', stałe wartości takie " +"jak '::1' lub '::1:2'. Kiedy prefiks IPv6 (taki jak 'a:b:c:d::') jest " +"odbierany z serwera delegującego, użyj sufiksa (takiego jak '::1') aby " +"utworzyć adres IPv6 ('a:b:c:d::1') dla tego interfejsu." msgid "" "Optional. Base64-encoded preshared key. Adds in an additional layer of " @@ -2302,6 +2394,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "Opcjonalny. Opis peera." + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2343,13 +2438,13 @@ msgid "Override MTU" msgstr "Nadpisz MTU" msgid "Override TOS" -msgstr "" +msgstr "Nadpisz TOS" msgid "Override TTL" -msgstr "" +msgstr "Nadpisz TTL" msgid "Override default interface name" -msgstr "" +msgstr "Nadpisz domyślną nazwę interfejsu" msgid "Override the gateway in DHCP responses" msgstr "Nadpisz adres bramy w odpowiedziach DHCP" @@ -2382,8 +2477,11 @@ msgstr "PID" msgid "PIN" msgstr "PIN" +msgid "PIN code rejected" +msgstr "Kod PIN został odrzucony" + msgid "PMK R1 Push" -msgstr "" +msgstr "PMK R1 Push" msgid "PPP" msgstr "PPP" @@ -2398,7 +2496,7 @@ msgid "PPPoE" msgstr "PPPoE" msgid "PPPoSSH" -msgstr "" +msgstr "PPPoSSH" msgid "PPtP" msgstr "PPtP" @@ -2431,13 +2529,13 @@ msgid "Password" msgstr "Hasło" msgid "Password authentication" -msgstr "Identyfikacja hasłem" +msgstr "Uwierzytelnianie hasłem" msgid "Password of Private Key" msgstr "Hasło lub klucz prywatny" msgid "Password of inner Private Key" -msgstr "" +msgstr "Wewnętrzne hasło klucza prywatnego" msgid "Password successfully changed!" msgstr "Pomyślnie zmieniono hasło!" @@ -2449,19 +2547,19 @@ msgid "Path to CA-Certificate" msgstr "Ścieżka do certyfikatu CA" msgid "Path to Client-Certificate" -msgstr "Ścieżka do certyfikatu Klienta" +msgstr "Ścieżka do certyfikatu klienta" msgid "Path to Private Key" msgstr "Ścieżka do Klucza Prywatnego" msgid "Path to inner CA-Certificate" -msgstr "" +msgstr "Ścieżka do wewnętrznego certyfikatu CA" msgid "Path to inner Client-Certificate" -msgstr "" +msgstr "Ścieżka do wewnętrznego certyfikatu Klienta" msgid "Path to inner Private Key" -msgstr "" +msgstr "Ścieżka do wewnętrznego klucza prywatnego " msgid "Peak:" msgstr "Szczyt:" @@ -2469,6 +2567,9 @@ msgstr "Szczyt:" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "Brakuje adresu Peera" + msgid "Peers" msgstr "" @@ -2509,7 +2610,7 @@ msgid "Port status:" msgstr "Status portu:" msgid "Power Management Mode" -msgstr "" +msgstr "Tryb zarządzania energią" msgid "Pre-emtive CRC errors (CRCP_P)" msgstr "" @@ -2534,16 +2635,13 @@ msgstr "" "wpisz 0 aby zignorować błędy" msgid "Prevent listening on these interfaces." -msgstr "" +msgstr "Zapobiegaj nasłuchiwaniu na tych interfejsach." msgid "Prevents client-to-client communication" -msgstr "Zapobiegaj komunikacji klientów pomiędzy sobą" - -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "Kontroler bezprzewodowy Prism2/2.5/3 802.11b" +msgstr "Zapobiega komunikacji między klientem a klientem" msgid "Private Key" -msgstr "" +msgstr "Klucz prywatny" msgid "Proceed" msgstr "Wykonaj" @@ -2552,7 +2650,7 @@ msgid "Processes" msgstr "Procesy" msgid "Profile" -msgstr "" +msgstr "Profil" msgid "Prot." msgstr "Prot." @@ -2569,7 +2667,6 @@ msgstr "Protokół nowego interfejsu" msgid "Protocol support is not installed" msgstr "Wsparcie dla protokołu nie jest zainstalowane" -# Opcja dotyczy włączenia serwera czasu, więc "podaj" nie jest właściwym tłumaczeniem w tym miejscu - obsy msgid "Provide NTP server" msgstr "Włącz serwer NTP" @@ -2580,17 +2677,23 @@ msgid "Pseudo Ad-Hoc (ahdemo)" msgstr "Pseudo Ad-Hoc (ahdemo)" msgid "Public Key" -msgstr "" +msgstr "Klucz publiczny" msgid "Public prefix routed to this device for distribution to clients." msgstr "" msgid "QMI Cellular" -msgstr "" +msgstr "Komórkowy QMI" msgid "Quality" msgstr "Jakość" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" +"Zapytaj o wszystkie dostępne serwery DNS " + msgid "R0 Key Lifetime" msgstr "" @@ -2609,9 +2712,6 @@ msgstr "RX" msgid "RX Rate" msgstr "Szybkość RX" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "Kontroler bezprzewodowy RaLink 802.11%s" - msgid "Radius-Accounting-Port" msgstr "Port Radius-Accounting" @@ -2630,6 +2730,11 @@ msgstr "Sekret Radius-Authentication" msgid "Radius-Authentication-Server" msgstr "Serwer Radius-Authentication" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" +"Surowe bajty kodowane szesnastkowo. Pozostaw puste, chyba że wymaga tego " +"dostawca internetowy" + msgid "" "Read /etc/ethers to configure the DHCP-Server" @@ -2638,15 +2743,12 @@ msgstr "" "\"Dynamic Host Configuration Protocol\">DHCP" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" -"Naprawdę usunąć ten interfejs? Usunięcie nie może zostać cofnięte!\n" -"Możesz stracić dostęp do tego urządzenia, jeśli jesteś połączony przez ten " -"interfejs!" msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" "Naprawdę usunąć tę sieć bezprzewodową? Usunięcie nie może zostać cofnięte!\n" @@ -2656,23 +2758,6 @@ msgstr "" msgid "Really reset all changes?" msgstr "Naprawdę usunąć wszelkie zmiany?" -#, fuzzy -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" -"Naprawdę wyłączyć tę sieć?\n" -"Możesz stracić dostęp do tego urządzenia jeśli jesteś połączony przez ten " -"interfejs!" - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" -"Naprawdę wyłączyć interfejs \"%s\"?\n" -"Możesz stracić dostęp do tego urządzenia jeśli jesteś połączony przez ten " -"interfejs!" - msgid "Really switch protocol?" msgstr "Naprawdę zmienić protokół?" @@ -2689,10 +2774,10 @@ msgid "Realtime Traffic" msgstr "Ruch w czasie rzeczywistym" msgid "Realtime Wireless" -msgstr "WiFi w czasie rzeczywistym" +msgstr "Wi-Fi w czasie rzeczywistym" msgid "Reassociation Deadline" -msgstr "" +msgstr "Termin reasocjacji" msgid "Rebind protection" msgstr "Przypisz ochronę" @@ -2718,9 +2803,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "Połącz ponownie ten interfejs" -msgid "Reconnecting interface" -msgstr "Łączę ponownie interfejs" - msgid "References" msgstr "Referencje" @@ -2740,7 +2822,7 @@ msgid "Remote IPv4 address" msgstr "Zdalny adres IPv4" msgid "Remote IPv4 address or FQDN" -msgstr "" +msgstr "Zdalny adres IPv4 lub FQDN" msgid "Remove" msgstr "Usuń" @@ -2755,16 +2837,13 @@ msgid "Replace wireless configuration" msgstr "Zamień konfigurację WiFi" msgid "Request IPv6-address" -msgstr "" +msgstr "Zażądaj adresu IPv6" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" -msgstr "" +msgstr "Wymagany" msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3" msgstr "Wymagany dla niektórych dostawców internetu, np. Charter z DOCSIS 3" @@ -2790,6 +2869,8 @@ msgid "" "Requires upstream supports DNSSEC; verify unsigned domain responses really " "come from unsigned domains" msgstr "" +"Wymagane jest wsparcie dla DNSSEC; sprawdzanie, czy niepodpisane odpowiedzi " +"w domenie rzeczywiście pochodzą z domen bez znaku" msgid "Reset" msgstr "Resetuj" @@ -2812,6 +2893,12 @@ msgstr "Uruchom ponownie" msgid "Restart Firewall" msgstr "Uruchom ponownie firewalla" +msgid "Restart radio interface" +msgstr "Uruchom ponownie interfejs radiowy" + +msgid "Restore" +msgstr "Przywróć" + msgid "Restore backup" msgstr "Przywróć kopię zapasową" @@ -2821,6 +2908,15 @@ msgstr "Odsłoń/Ukryj hasło" msgid "Revert" msgstr "Przywróć" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Root" @@ -2836,11 +2932,8 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" -msgstr "" +msgstr "Serwis rozgłoszeniowy routera" msgid "Router Password" msgstr "Hasło routera" @@ -2865,25 +2958,17 @@ msgstr "Sprawdź czy system plików nie zawiera błędów" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" -msgstr "" +msgstr "SNR" msgid "SSH Access" msgstr "Dostęp SSH" msgid "SSH server address" -msgstr "" +msgstr "Adres serwera SSH" msgid "SSH server port" -msgstr "" +msgstr "Port serwera SSH" msgid "SSH username" msgstr "" @@ -2900,15 +2985,14 @@ msgstr "Zapisz" msgid "Save & Apply" msgstr "Zapisz i zastosuj" -msgid "Save & Apply" -msgstr "Zapisz i zastosuj" - msgid "Scan" msgstr "Skanuj" -# Raczej nie stosuje się kilku dużych liter w tym samym +msgid "Scan request failed" +msgstr "Próba skanowania nie powiodła się" + msgid "Scheduled Tasks" -msgstr "Zaplanowane zadania" +msgstr "Zaplanowane Zadania" msgid "Section added" msgstr "Dodano sekcję" @@ -2932,17 +3016,6 @@ msgstr "Rozdziel klientów" msgid "Server Settings" msgstr "Ustawienia serwera" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Nazwa serwisu" @@ -2956,11 +3029,19 @@ msgid "" "Set interface properties regardless of the link carrier (If set, carrier " "sense events do not invoke hotplug handlers)." msgstr "" +"Ustaw właściwości interfejsu, niezależnie od operatora łącza (nie wpływa na " +"programy operatora które ustanawiają połączenie)." #, fuzzy msgid "Set up Time Synchronization" msgstr "Ustawienia synchronizacji czasu" +msgid "Setting PLMN failed" +msgstr "Ustawienie PLMN nie powiodło się" + +msgid "Setting operation mode failed" +msgstr "Ustawienie trybu nie powiodło się" + msgid "Setup DHCP Server" msgstr "Ustawienia serwera DHCP" @@ -2970,15 +3051,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "Krótki Wstęp" + msgid "Show current backup file list" msgstr "Pokaż aktualną listę plików do backupu" msgid "Shutdown this interface" msgstr "Wyłącz ten interfejs" -msgid "Shutdown this network" -msgstr "Wyłącz tą sieć" - msgid "Signal" msgstr "Sygnał" @@ -2995,7 +3076,7 @@ msgid "Size (.ipk)" msgstr "" msgid "Size of DNS query cache" -msgstr "" +msgstr "Rozmiar pamięci podręcznej zapytań DNS" msgid "Skip" msgstr "Pomiń" @@ -3013,7 +3094,7 @@ msgid "Software" msgstr "Oprogramowanie" msgid "Software VLAN" -msgstr "" +msgstr "VLAN programowy" msgid "Some fields are invalid, cannot save values!" msgstr "Wartości pewnych pól są niewłaściwe, nie mogę ich zachować!" @@ -3033,15 +3114,9 @@ msgstr "" "być wgrany ręcznie. Sprawdź stronę wiki, aby uzyskać instrukcję dla danego " "urządzenia." -msgid "Sort" -msgstr "Posortuj" - msgid "Source" msgstr "Źródło" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "Podaje katalog do którego jest podłączone urządzenie" @@ -3083,6 +3158,12 @@ msgstr "Uruchomienie" msgid "Start priority" msgstr "Priorytet uruchomienia" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "Rozpoczynanie skanowania..." + msgid "Startup" msgstr "Autostart" @@ -3124,10 +3205,10 @@ msgid "Submit" msgstr "Wyślij" msgid "Suppress logging" -msgstr "" +msgstr "Pomiń rejestrowanie" msgid "Suppress logging of the routine operation of these protocols" -msgstr "" +msgstr "Pomiń rejestrowanie rutynowych operacji dla tych protokołów" msgid "Swap" msgstr "" @@ -3246,9 +3327,22 @@ msgstr "" "Dozwolone znaki to: A-Z, a-z, 0-9 " "oraz _" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "Archiwum kopii zapasowej nie wygląda na prawidłowe." + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3276,9 +3370,6 @@ msgstr "" "upewnić się, że został przesłany poprawnie.
Wciśnij \"Wykonaj\" aby " "kontynuować aktualizację." -msgid "The following changes have been committed" -msgstr "Następujące zmiany zostały zatwierdzone" - msgid "The following changes have been reverted" msgstr "Następujące zmiany zostały odrzucone" @@ -3286,7 +3377,7 @@ msgid "The following rules are currently active on this system." msgstr "Następujące zasady są obecnie aktywne w tym systemie." msgid "The given network name is not unique" -msgstr "Podana sieć NIE jest unikalna" +msgstr "Podana sieć nie jest unikalna" #, fuzzy msgid "" @@ -3348,11 +3439,6 @@ msgstr "" "ustawień może być konieczne odnowienie adresu Twojego komputera, aby dostać " "się do urządzenia." -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3363,8 +3449,8 @@ msgstr "" msgid "There are no active leases." msgstr "Brak aktywnych dzierżaw." -msgid "There are no pending changes to apply!" -msgstr "Brak oczekujących zmian do zastosowania!" +msgid "There are no changes to apply." +msgstr "Nie ma żadnych zmian do zastosowania." msgid "There are no pending changes to revert!" msgstr "Brak oczekujących zmian do przywrócenia!" @@ -3394,6 +3480,9 @@ msgid "" "'server=1.2.3.4' fordomain-specific or full upstream DNS servers." msgstr "" +"Ten plik może zawierać linie takie jak 'server=/domain/1.2.3.4' lub " +"'server=1.2.3.4' dla specyficznych dla domeny lub pełnych serwerów DNS" msgid "" "This is a list of shell glob patterns for matching files and directories to " @@ -3472,10 +3561,11 @@ msgstr "Strefa czasowa" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" -"Aby przywrócić pliki konfiguracyjne, można tutaj wczytać wcześniej utworzone " -"archiwum kopii zapasowej." +"Aby przywrócić pliki konfiguracyjne, możesz tutaj przesłać wcześniej " +"utworzoną kopię zapasową." msgid "Tone" msgstr "" @@ -3508,7 +3598,7 @@ msgid "Trigger" msgstr "Trigger" msgid "Trigger Mode" -msgstr "Tryb Trigger" +msgstr "Rodzaj Triggeru" msgid "Tunnel ID" msgstr "Numer identyfikacyjny tunelu" @@ -3519,15 +3609,6 @@ msgstr "Interfejs tunelu" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Moc nadawania" @@ -3547,14 +3628,32 @@ msgid "USB Device" msgstr "Urządzenie USB" msgid "USB Ports" -msgstr "" +msgstr "Porty USB" msgid "UUID" msgstr "UUID" +msgid "Unable to determine device name" +msgstr "Nie można ustalić nazwy urządzenia" + +msgid "Unable to determine external IP address" +msgstr "Nie można ustalić zewnętrznego adresu IP" + +msgid "Unable to determine upstream interface" +msgstr "Nie można określić interfejsu źródłowego" + msgid "Unable to dispatch" msgstr "Nie można wysłać" +msgid "Unable to obtain client ID" +msgstr "Nie można uzyskać ID klienta" + +msgid "Unable to resolve AFTR host name" +msgstr "Nie można rozpoznać nazwy AFTR hosta" + +msgid "Unable to resolve peer host name" +msgstr "Nie można rozpoznać nazwy peera" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3562,20 +3661,32 @@ msgid "Unknown" msgstr "Nieznany" msgid "Unknown Error, password not changed!" -msgstr "Nieznany błąd, hasło nie zostało zmienione" +msgstr "Nieznany błąd, hasło nie zostało zmienione!" + +msgid "Unknown error (%s)" +msgstr "Nieznany błąd (%s)" msgid "Unmanaged" msgstr "Niezarządzalny" msgid "Unmount" -msgstr "" +msgstr "Odmontuj" msgid "Unsaved Changes" msgstr "Niezapisane zmiany" +msgid "Unsupported MAP type" +msgstr "Nieobsługiwany typ MAP" + +msgid "Unsupported modem" +msgstr "Nieobsługiwany modem" + msgid "Unsupported protocol type." msgstr "Nieobsługiwany typ protokołu." +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "Aktualizuj listy" @@ -3584,9 +3695,10 @@ msgid "" "Check \"Keep settings\" to retain the current configuration (requires a " "compatible firmware image)." msgstr "" -"Prześlij zgodny z funkcją sysupgrade obraz tutaj, aby zastąpić aktualnie " -"działające firmware. Zaznacz opcję \"Zachowaj ustawienia\", aby zachować " -"bieżącą konfigurację (wymaga zgodnego obrazu firmware)." +"Prześlij tutaj obraz zgodny z funkcją sysupgrade, aby zastąpić aktualnie " +"działające opragramowanie. Zaznacz opcję \"Zachowaj ustawienia\", aby " +"zachować bieżącą konfigurację (wymagany obraz zgodny z bieżącym " +"opragramowaniem)." msgid "Upload archive..." msgstr "Załaduj archiwum..." @@ -3619,16 +3731,16 @@ msgid "Use as external overlay (/overlay)" msgstr "" msgid "Use as root filesystem (/)" -msgstr "" +msgstr "Użyj jako systemu plików root (/)" msgid "Use broadcast flag" msgstr "Użyj flagi rozgłaszania" msgid "Use builtin IPv6-management" -msgstr "" +msgstr "Skorzystaj z wbudowanego zarządzania protokołem IPv6" msgid "Use custom DNS servers" -msgstr "Użyj własnych serwerów DNS" +msgstr "Użyj własne serwery DNS" msgid "Use default gateway" msgstr "Użyj domyślnej bramy" @@ -3664,10 +3776,10 @@ msgid "" msgstr "" msgid "User certificate (PEM encoded)" -msgstr "" +msgstr "Certyfikat użytkownika (kodowany PEM)" msgid "User key (PEM encoded)" -msgstr "" +msgstr "Klucz użytkownika (kodowany PEM)" msgid "Username" msgstr "Nazwa użytkownika" @@ -3676,7 +3788,7 @@ msgid "VC-Mux" msgstr "VC-Mux" msgid "VDSL" -msgstr "" +msgstr "VDSL" msgid "VLANs on %q" msgstr "Sieci VLAN na %q" @@ -3694,7 +3806,7 @@ msgid "VPN Server" msgstr "Serwer VPN" msgid "VPN Server port" -msgstr "" +msgstr "Port serwera VPN" msgid "VPN Server's certificate SHA1 hash" msgstr "" @@ -3703,23 +3815,20 @@ msgid "VPNC (CISCO 3000 (and others) VPN)" msgstr "" msgid "Vendor" -msgstr "" +msgstr "Producent" msgid "Vendor Class to send when requesting DHCP" msgstr "Klasa producenta do wysłania podczas żądania DHCP" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Zweryfikuj" msgid "Version" msgstr "Wersja" +msgid "Virtual dynamic interface" +msgstr "Wirtualny interfejs dynamiczny" + msgid "WDS" msgstr "WDS" @@ -3742,42 +3851,36 @@ msgid "" "WPA-Encryption requires wpa_supplicant (for client mode) or hostapd (for AP " "and ad-hoc mode) to be installed." msgstr "" -"Kodowanie WPA wymaga zainstalowanych modułów wpa_supplicant (na tryb " -"klienta) lub hostapd (dla trybów AP lub ad-hoc)" +"Kodowanie WPA wymaga zainstalowanych modułów wpa_supplicant (tryb klienta) " +"lub hostapd (tryb AP lub ad-hoc)" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - -# obsy: Brzmi to lepiej niż "czekanie na wprowadzanie zmian. msgid "Waiting for changes to be applied..." msgstr "Trwa wprowadzenie zmian..." msgid "Waiting for command to complete..." msgstr "Trwa wykonanie polecenia..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "Oczekiwanie na zastosowanie konfiguracji… %ds" + msgid "Waiting for device..." -msgstr "" +msgstr "Oczekiwanie na urządzenie..." msgid "Warning" msgstr "Ostrzeżenie" msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" +"Ostrzeżenie: Istnieją niezapisane zmiany, które zostaną utracone po ponownym " +"uruchomieniu urządzenia!" msgid "" "When using a PSK, the PMK can be generated locally without inter AP " "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" -msgstr "" +msgstr "Szerokość" msgid "WireGuard VPN" msgstr "" @@ -3797,8 +3900,11 @@ msgstr "Przegląd sieci bezprzewodowych" msgid "Wireless Security" msgstr "Zabezpieczenia sieci bezprzewodowych" -msgid "Wireless is disabled or not associated" -msgstr "Sieć bezprzewodowa jest wyłączona lub niepołączona" +msgid "Wireless is disabled" +msgstr "Sieć bezprzewodowa jest wyłączona" + +msgid "Wireless is not associated" +msgstr "Sieć bezprzewodowa jest niepołączona" msgid "Wireless is restarting..." msgstr "Restart sieci bezprzewodowej..." @@ -3809,17 +3915,11 @@ msgstr "Sieć bezprzewodowa jest wyłączona" msgid "Wireless network is enabled" msgstr "Sieć bezprzewodowa jest włączona" -msgid "Wireless restarted" -msgstr "Zrestartowano sieć bezprzewodową" - -msgid "Wireless shut down" -msgstr "Wyłączanie sieci bezprzewodowej" - msgid "Write received DNS requests to syslog" msgstr "Zapisz otrzymane żądania DNS do syslog'a" msgid "Write system log to file" -msgstr "" +msgstr "Zapisz log systemowy do pliku" msgid "" "You can enable or disable installed init scripts here. Changes will applied " @@ -3828,7 +3928,7 @@ msgid "" msgstr "" "Tutaj można włączyć lub wyłączyć zainstalowane skrypty. Zmiany zostaną " "zastosowane po ponownym uruchomieniu urządzenia.
Ostrzeżenie: " -"Jeśli wyłączysz podstawowe skrypty typu \"networks\", urządzenie może stać " +"Jeśli wyłączysz podstawowe skrypty typu \"network\", urządzenie może stać " "się nieosiągalne!" msgid "" @@ -3842,6 +3942,9 @@ msgid "" "upgrade it to at least version 7 or use another browser like Firefox, Opera " "or Safari." msgstr "" +"Twój Internet Explorer jest za stary, aby poprawnie wyświetlić tę stronę " +"zaktualizuj go do wersji co najmniej 7 lub użyj innej przeglądarki, takiej " +"jak Firefox, Opera czy Safari." msgid "any" msgstr "dowolny" @@ -3853,13 +3956,16 @@ msgid "baseT" msgstr "baseT" msgid "bridged" -msgstr "bridged" +msgstr "zmostkowany" + +msgid "create" +msgstr "" msgid "create:" msgstr "utwórz:" msgid "creates a bridge over specified interface(s)" -msgstr "utwórz bridge na określonych interfejsach" +msgstr "utwórz most na określonych interfejsach" msgid "dB" msgstr "dB" @@ -3871,7 +3977,7 @@ msgid "disable" msgstr "wyłącz" msgid "disabled" -msgstr "" +msgstr "wyłączony" msgid "expired" msgstr "wygasły" @@ -3892,14 +3998,11 @@ msgstr "pełny-duplex" msgid "half-duplex" msgstr "pół-duplex" -msgid "help" -msgstr "pomoc" - msgid "hidden" msgstr "ukryty" msgid "hybrid mode" -msgstr "" +msgstr "tryb hybrydowy" msgid "if target is a network" msgstr "jeżeli celem jest sieć" @@ -3919,11 +4022,11 @@ msgstr "kbit/s" msgid "local DNS file" msgstr "lokalny plik DNS" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" -msgstr "" +msgstr "minuty" + +msgid "mixed WPA/WPA2" +msgstr "mieszany WPA/WPA2" msgid "no" msgstr "nie" @@ -3936,7 +4039,7 @@ msgid "none" msgstr "żaden" msgid "not present" -msgstr "" +msgstr "nieobecny" msgid "off" msgstr "wyłączone" @@ -3947,11 +4050,14 @@ msgstr "włączone" msgid "open" msgstr "otwarte" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" msgid "random" -msgstr "" +msgstr "losowy" msgid "relay mode" msgstr "" @@ -3960,7 +4066,7 @@ msgid "routed" msgstr "routowane" msgid "server mode" -msgstr "" +msgstr "tryb serwera" msgid "stateful-only" msgstr "" @@ -3972,10 +4078,10 @@ msgid "stateless + stateful" msgstr "" msgid "tagged" -msgstr "tagowane" +msgstr "otagowane" msgid "time units (TUs / 1.024 ms) [1000-65535]" -msgstr "" +msgstr "jednostki czasu (TUs / 1.024 ms) [1000-65535]" msgid "unknown" msgstr "nieznane" @@ -3990,7 +4096,7 @@ msgid "unspecified -or- create:" msgstr "nieokreślone -lub- utwórz:" msgid "untagged" -msgstr "nietagowane" +msgstr "nieotagowane" msgid "yes" msgstr "tak" @@ -3998,101 +4104,81 @@ msgstr "tak" msgid "« Back" msgstr "« Wróć" -#~ msgid "Action" -#~ msgstr "Akcja" +#~ msgid "%s - %s" +#~ msgstr "%s - %s" -#~ msgid "Buttons" -#~ msgstr "Przyciski" +#~ msgid "Activate this network" +#~ msgstr "Aktywuj tą sieć" -#~ msgid "Handler" -#~ msgstr "Uchwyt" +#~ msgid "Hermes 802.11b Wireless Controller" +#~ msgstr "Kontroler bezprzewodowy Hermes 802.11b" -#~ msgid "Maximum hold time" -#~ msgstr "Maksymalny czas podtrzymania" +#~ msgid "Interface is shutting down..." +#~ msgstr "Interfejs jest wyłączany..." -#~ msgid "Minimum hold time" -#~ msgstr "Minimalny czas podtrzymania" +#~ msgid "Interface reconnected" +#~ msgstr "Połączono ponownie interfejs" -#~ msgid "Path to executable which handles the button event" +#~ msgid "Interface shut down" +#~ msgstr "Wyłączono interfejs" + +#~ msgid "Prism2/2.5/3 802.11b Wireless Controller" +#~ msgstr "Kontroler bezprzewodowy Prism2/2.5/3 802.11b" + +#~ msgid "RaLink 802.11%s Wireless Controller" +#~ msgstr "Kontroler bezprzewodowy RaLink 802.11%s" + +#~ msgid "" +#~ "Really shutdown interface \"%s\"? You might lose access to this device if " +#~ "you are connected via this interface." #~ msgstr "" -#~ "Ścieżka do pliku wykonywalnego, który obsługuje zdarzenie dla danego " -#~ "przycisku" +#~ "Naprawdę wyłączyć interfejs \"%s\"?\n" +#~ "Możesz stracić dostęp do tego urządzenia jeśli jesteś połączony przez ten " +#~ "interfejs!" -#~ msgid "Specifies the button state to handle" -#~ msgstr "Określa zachowanie w zależności od stanu przycisku" +#~ msgid "Reconnecting interface" +#~ msgstr "Łączę ponownie interfejs" -#~ msgid "This page allows the configuration of custom button actions" +#~ msgid "Shutdown this network" +#~ msgstr "Wyłącz tą sieć" + +#~ msgid "Wireless restarted" +#~ msgstr "Zrestartowano sieć bezprzewodową" + +#~ msgid "Wireless shut down" +#~ msgstr "Wyłączanie sieci bezprzewodowej" + +#~ msgid "DHCP Leases" +#~ msgstr "Dzierżawy DHCP" + +#~ msgid "DHCPv6 Leases" +#~ msgstr "Dzierżawy DHCPv6" + +#~ msgid "" +#~ "Really delete this interface? The deletion cannot be undone! You might " +#~ "lose access to this device if you are connected via this interface." #~ msgstr "" -#~ "Poniższa strona umożliwia konfigurację działania niestandardowych " -#~ "przycisków" +#~ "Naprawdę usunąć ten interfejs? Usunięcie nie może zostać cofnięte!\n" +#~ "Możesz stracić dostęp do tego urządzenia, jeśli jesteś połączony przez " +#~ "ten interfejs!" -#~ msgid "Leasetime" -#~ msgstr "Czas dzierżawy" - -# Wydaje mi się że brakuje litery R... -#~ msgid "AR Support" -#~ msgstr "Wsparcie dla ARP" - -#~ msgid "Atheros 802.11%s Wireless Controller" -#~ msgstr "Bezprzewodowy kontroler Atheros 802.11%s" - -#~ msgid "Background Scan" -#~ msgstr "Skanowanie w tle" - -#~ msgid "Compression" -#~ msgstr "Kompresja" - -#~ msgid "Disable HW-Beacon timer" -#~ msgstr "Wyłącz zegar HW-Beacon" - -#~ msgid "Do not send probe responses" -#~ msgstr "Nie wysyłaj ramek probe response" - -#~ msgid "Fast Frames" -#~ msgstr "Szybkie ramki (Fast Frames)" - -#~ msgid "Maximum Rate" -#~ msgstr "Maksymalna Szybkość" - -#~ msgid "Minimum Rate" -#~ msgstr "Minimalna Szybkość" - -#~ msgid "Multicast Rate" -#~ msgstr "Szybkość Multicast`u" - -#~ msgid "Outdoor Channels" -#~ msgstr "Kanały zewnętrzne" - -#~ msgid "Regulatory Domain" -#~ msgstr "Domena regulacji" - -#~ msgid "Separate WDS" -#~ msgstr "Rozdziel WDS" - -#~ msgid "Static WDS" -#~ msgstr "Statyczny WDS" - -#~ msgid "Turbo Mode" -#~ msgstr "Tryb Turbo" - -#~ msgid "XR Support" -#~ msgstr "Wsparcie XR" - -#~ msgid "An additional network will be created if you leave this unchecked." +#, fuzzy +#~ msgid "" +#~ "Really shut down network? You might lose access to this device if you are " +#~ "connected via this interface." #~ msgstr "" -#~ "Zostanie utworzona dodatkowa sieć jeśli zostawisz tą opcję niezaznaczoną." +#~ "Naprawdę wyłączyć tę sieć?\n" +#~ "Możesz stracić dostęp do tego urządzenia jeśli jesteś połączony przez ten " +#~ "interfejs!" -#~ msgid "Join Network: Settings" -#~ msgstr "Przyłącz do sieci: Ustawienia" +#~ msgid "Sort" +#~ msgstr "Posortuj" -#~ msgid "CPU" -#~ msgstr "CPU" +#~ msgid "help" +#~ msgstr "pomoc" -#~ msgid "Port %d" -#~ msgstr "Port %d" +#~ msgid "IPv4 WAN Status" +#~ msgstr "Status IPv4 WAN" -#~ msgid "Port %d is untagged in multiple VLANs!" -#~ msgstr "Port %d jest nietagowany w wielu VLAN`ach!" - -#~ msgid "VLAN Interface" -#~ msgstr "Interfejs VLAN" +#~ msgid "IPv6 WAN Status" +#~ msgstr "Status WAN IPv6" diff --git a/luci-base/po/pt-br/base.po b/luci-base/po/pt-br/base.po index a51d11d2a..63a8b2f34 100644 --- a/luci-base/po/pt-br/base.po +++ b/luci-base/po/pt-br/base.po @@ -51,6 +51,9 @@ msgstr "" "-- casar por UUID --" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "Carga 1 Minuto:" @@ -166,9 +169,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "Número máximo de consultas concorrentes" -msgid "%s - %s" -msgstr "%s - %s" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -185,11 +185,6 @@ msgstr "" "ADSL" -msgid "AICCU (SIXXS)" -msgstr "" -"AICCU (SIXXS)" - msgid "ANSI T1.413" msgstr "ANSI T1.413" @@ -232,9 +227,6 @@ msgstr "Número do dispositivo ATM" msgid "ATU-C System Vendor ID" msgstr "Identificador de" -msgid "AYIYA" -msgstr "AYIYA" - msgid "Access Concentrator" msgstr "Concentrador de Acesso" @@ -244,9 +236,6 @@ msgstr "Ponto de Acceso (AP)" msgid "Actions" msgstr "Ações" -msgid "Activate this network" -msgstr "Ativar esta rede" - msgid "Active IPv4-Routes" msgstr "" "Rotas IPv4 ativas" @@ -302,6 +291,15 @@ msgstr "" msgid "Alert" msgstr "Alerta" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -316,6 +314,9 @@ msgid "Allow SSH password authentication" msgstr "" "Permitir autenticação SSH por senha" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "Permitir todos, exceto os listados" @@ -348,16 +349,14 @@ msgstr "" msgid "Allowed IPs" msgstr "Endereços IP autorizados" -msgid "" -"Also see Tunneling Comparison on SIXXS" -msgstr "" -"Veja também a Comparação de Tunelamentos em SIXXS" - msgid "Always announce default router" msgstr "Sempre anuncie o roteador padrão" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" +msgstr "" + msgid "Annex" msgstr "Anexo" @@ -434,11 +433,14 @@ msgstr "configuração de antena" msgid "Any zone" msgstr "Qualquer zona" -msgid "Apply" -msgstr "Aplicar" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" -msgstr "Aplicar as alterações" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -458,6 +460,9 @@ msgstr "" msgid "Associated Stations" msgstr "Estações associadas" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "Grupo de Autenticação" @@ -537,12 +542,12 @@ msgstr "Voltar para visão geral" msgid "Back to scan results" msgstr "Voltar para os resultados da busca" +msgid "Backup" +msgstr "Cópia de Segurança" + msgid "Backup / Flash Firmware" msgstr "Cópia de Segurança / Gravar Firmware" -msgid "Backup / Restore" -msgstr "Cópia de Segurança / Restauração" - msgid "Backup file list" msgstr "Lista de arquivos para a cópia de segurança" @@ -552,8 +557,8 @@ msgstr "Endereço especificado está incorreto!" msgid "Band" msgstr "Banda" -msgid "Behind NAT" -msgstr "Atrás da NAT" +msgid "Beacon Interval" +msgstr "" msgid "" "Below is the determined list of files to backup. It consists of changed " @@ -616,6 +621,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "Uso da CPU (%)" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "Cancelar" @@ -631,12 +639,20 @@ msgstr "Alterações" msgid "Changes applied." msgstr "Alterações aplicadas." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Muda a senha do administrador para acessar este dispositivo" msgid "Channel" msgstr "Canal" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Verificar" @@ -676,12 +692,10 @@ msgstr "Encapsulamento UDP da Cisco" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" "Clique em \"Gerar arquivo\" para baixar um arquivo tar com os arquivos de " -"configuração atuais. Para retornar o roteador para o seu estado inicial, " -"clique em \"Zerar configuração\" (somente possível para imagens squashfs)." +"configuração atuais." msgid "Client" msgstr "Cliente" @@ -719,12 +733,18 @@ msgstr "" msgid "Configuration" msgstr "Configuração" -msgid "Configuration applied." -msgstr "Configuração aplicada." +msgid "Configuration failed" +msgstr "" msgid "Configuration files will be kept." msgstr "Os arquivos de configuração serão mantidos." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Confirmação" @@ -737,12 +757,18 @@ msgstr "Conectado" msgid "Connection Limit" msgstr "Limite de conexão" -msgid "Connection to server fails when TLS cannot be used" -msgstr "A conexão para este servidor falhará quando o TLS não puder ser usado" +msgid "Connection attempt failed" +msgstr "" msgid "Connections" msgstr "Conexões" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "País" @@ -798,9 +824,6 @@ msgstr "" "Se possível, personaliza o comportamento dos LEDs." -msgid "DHCP Leases" -msgstr "Alocações do DHCP" - msgid "DHCP Server" msgstr "Servidor DHCP" @@ -813,9 +836,6 @@ msgstr "Cliente DHCP" msgid "DHCP-Options" msgstr "Opções de DHCP" -msgid "DHCPv6 Leases" -msgstr "Alocações DHCPv6" - msgid "DHCPv6 client" msgstr "Cliente DHCPv6" @@ -855,6 +875,9 @@ msgstr "Estado da DSL" msgid "DSL line mode" msgstr "Modo de linha DSL" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "DUID" @@ -873,9 +896,6 @@ msgstr "Roteador Padrão" msgid "Default is stateless + stateful" msgstr "O padrão é sem estado + com estado" -msgid "Default route" -msgstr "Rota padrão" - msgid "Default state" msgstr "Estado padrão" @@ -897,6 +917,9 @@ msgstr "Apagar" msgid "Delete this network" msgstr "Apagar esta rede" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "Descrição" @@ -915,9 +938,12 @@ msgstr "Configuração do Dispositivo" msgid "Device is rebooting..." msgstr "O dispositivo está reiniciando..." -msgid "Device unreachable" +msgid "Device unreachable!" msgstr "Dispositivo não alcançável" +msgid "Device unreachable! Still waiting for device..." +msgstr "" + msgid "Diagnostics" msgstr "Diagnóstico" @@ -943,16 +969,28 @@ msgstr "Desabilita a configuração do DNS" msgid "Disable Encryption" msgstr "Desabilitar Cifragem" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "Desabilitado" msgid "Disabled (default)" msgstr "Desabilitado (padrão)" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "" "Descartar respostas de servidores externos para redes privadas (RFC1918)" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Mostre somente os pacotes contendo" @@ -1009,6 +1047,9 @@ msgstr "" "abbr> sem o nome completo do DNS" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "Baixe e instale o pacote" @@ -1128,6 +1169,9 @@ msgstr "Habilita o campo DF (Não Fragmentar) dos pacotes encapsulados." msgid "Enable this mount" msgstr "Ativar esta montagem" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "Ativar este espaço de troca (swap)" @@ -1162,6 +1206,12 @@ msgstr "Equipamento do ponto final" msgid "Endpoint Port" msgstr "Porta do ponto final" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "Apagando..." @@ -1222,6 +1272,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Arquivo" @@ -1240,6 +1293,9 @@ msgstr "Filtrar endereços privados" msgid "Filter useless" msgstr "Filtrar consultas inúteis" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1296,6 +1352,9 @@ msgstr "Gravando na flash..." msgid "Force" msgstr "Forçar" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "Forçar CCMP (AES)" @@ -1348,10 +1407,10 @@ msgstr "Espaço livre" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" "Mais informações sobre interfaces e parceiros WireGuard em wireguard.io." +"wireguard.com\">wireguard.com." msgid "GHz" msgstr "GHz" @@ -1362,6 +1421,9 @@ msgstr "Somente GPRS" msgid "Gateway" msgstr "Roteador" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "Acesso remoto a portas encaminhadas" @@ -1426,9 +1488,6 @@ msgstr "" "Erros de Código de Erro de Cabeçalho (HEC)" -msgid "Heartbeat" -msgstr "Pulso de vida" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1443,9 +1502,6 @@ msgstr "" "Aqui você pode colar as chaves públicas do SSH (uma por linha) para a " "autenticação por chaves do SSH." -msgid "Hermes 802.11b Wireless Controller" -msgstr "Hermes 802.11b Wireless Controlador" - msgid "Hide ESSID" msgstr "" "Ocultar IP do Equipamento " "ou Rede" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "Nome do equipamento" @@ -1488,14 +1547,20 @@ msgstr "Endereços IP" msgid "IP address" msgstr "Endereço IP" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "IPv4" msgid "IPv4 Firewall" msgstr "Firewall para IPv4" -msgid "IPv4 WAN Status" -msgstr "Estado IPv4 da WAN" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "Endereço IPv4" @@ -1547,15 +1612,12 @@ msgstr "" "Prefixo ULA " "IPv6" -msgid "IPv6 WAN Status" -msgstr "Estado IPv6 da WAN" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "Endereço IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "Endereços IPv6 delegados para o ponta local do túnel (opcional)" - msgid "IPv6 assignment hint" msgstr "Sugestão de atribuição IPv6" @@ -1670,6 +1732,9 @@ msgstr "Entrando:" msgid "Info" msgstr "Informação" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "Script de iniciação" @@ -1706,21 +1771,12 @@ msgstr "Visão Geral da Interface" msgid "Interface is reconnecting..." msgstr "A interface está reconectando..." -msgid "Interface is shutting down..." -msgstr "A interface está desligando..." - msgid "Interface name" msgstr "Nome da Interface" msgid "Interface not present or not connected yet." msgstr "A interface não está presente ou não está conectada ainda." -msgid "Interface reconnected" -msgstr "Interface reconectada" - -msgid "Interface shut down" -msgstr "Interface desligada" - msgid "Interfaces" msgstr "Interfaces" @@ -1931,6 +1987,9 @@ msgstr "Carga Média" msgid "Loading" msgstr "Carregando" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "Endereço IP local para atribuir" @@ -2004,6 +2063,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "O endereço mais baixo concedido como deslocamento do endereço da rede." +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "Endereço MAC" @@ -2019,6 +2081,9 @@ msgstr "Lista de MAC" msgid "MAP / LW4over6" msgstr "MAP / LW4over6" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -2106,6 +2171,9 @@ msgstr "Modelo" msgid "Modem device" msgstr "Dispositivo do Modem" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "Estouro de tempo da iniciação do modem" @@ -2179,9 +2247,6 @@ msgstr "Domínio NT" msgid "NTP server candidates" msgstr "Candidatos a servidor NTP" -msgid "NTP sync time-out" -msgstr "Tempo limite da sincronia do NTP" - msgid "Name" msgstr "Nome" @@ -2206,6 +2271,9 @@ msgstr "Utilitários de Rede" msgid "Network boot image" msgstr "Imagem de boot pela rede" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "Rede sem interfaces." @@ -2227,6 +2295,9 @@ msgstr "Nenhum arquivo encontrado" msgid "No information available" msgstr "Nenhuma informação disponível" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "Nenhum cache negativo" @@ -2245,6 +2316,9 @@ msgstr "Nenhuma senha definida!" msgid "No rules in this chain" msgstr "Sem regras nesta cadeia" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "Nenhuma zona definida" @@ -2307,6 +2381,9 @@ msgstr "Senha Ofuscada do Grupo" msgid "Obfuscated Password" msgstr "Senha Ofuscada" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Atraso no estado de desligado" @@ -2359,13 +2436,6 @@ msgstr "Opção removida" msgid "Optional" msgstr "Opcional" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" -"Opcional, especifique para sobrescrever o servidor padrão (tic.sixxs.net)" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "Opcional, para usar quando a conta SIXXS tem mais de um túnel" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2388,6 +2458,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "Opcional. Cria rotas para endereços IP Autorizados para este parceiro." +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2476,6 +2549,9 @@ msgstr "PID" msgid "PIN" msgstr "PIN" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "PMK R1 Push" @@ -2563,6 +2639,9 @@ msgstr "Pico:" msgid "Peer IP address to assign" msgstr "Endereço IP do parceiro para atribuir" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "Parceiros" @@ -2634,9 +2713,6 @@ msgstr "Evite escutar nestas Interfaces." msgid "Prevents client-to-client communication" msgstr "Impede a comunicação de cliente para cliente" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "Prism2/2.5/3 802.11b Wireless Controlador" - msgid "Private Key" msgstr "Chave Privada" @@ -2687,6 +2763,11 @@ msgstr "Celular QMI" msgid "Quality" msgstr "Qualidade" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "Validade da Chave R0" @@ -2705,9 +2786,6 @@ msgstr "RX" msgid "RX Rate" msgstr "Taxa de RX" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "RaLink 802.11%s Wireless Controlador" - msgid "Radius-Accounting-Port" msgstr "Porta de contabilidade do RADIUS" @@ -2726,6 +2804,9 @@ msgstr "Segredo da autenticação do RADIUS" msgid "Radius-Authentication-Server" msgstr "Servidor da autenticação do RADIUS" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" @@ -2734,15 +2815,12 @@ msgstr "" "\"Protocolo de Configuração Dinâmica de Hosts\">DHCP" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" -"Realmente excluir esta interface? A exclusão não pode ser desfeita!\n" -" Você poderá perder o acesso a este dispositivo se você estiver conectado " -"através desta interface." msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" "Realmente excluir esta interface Wireless? A exclusão não pode ser " @@ -2753,22 +2831,6 @@ msgstr "" msgid "Really reset all changes?" msgstr "Realmente limpar todas as mudanças?" -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" -"Realmente desligar esta rede\"%s\" ?\n" -"Você poderá perder o acesso a este dispositivo se você estiver conectado " -"através desta interface." - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" -"Realmente desligar esta interface\"%s\" ?\n" -"Você poderá perder o acesso a este dispositivo se você estiver conectado " -"através desta interface." - msgid "Really switch protocol?" msgstr "Realmente trocar o protocolo?" @@ -2814,9 +2876,6 @@ msgstr "Recomendado. Endereços IP da interface do WireGuard." msgid "Reconnect this interface" msgstr "Reconectar esta interface" -msgid "Reconnecting interface" -msgstr "Reconectando interface" - msgid "References" msgstr "Referências" @@ -2856,9 +2915,6 @@ msgstr "Solicita endereço IPv6" msgid "Request IPv6-prefix of length" msgstr "Solicita prefixo IPv6 de tamanho" -msgid "Require TLS" -msgstr "Requer TLS" - msgid "Required" msgstr "Necessário" @@ -2914,6 +2970,12 @@ msgstr "Reiniciar" msgid "Restart Firewall" msgstr "Reiniciar o firewall" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "Restauração" + msgid "Restore backup" msgstr "Restaurar cópia de segurança" @@ -2923,6 +2985,15 @@ msgstr "Relevar/esconder senha" msgid "Revert" msgstr "Reverter" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Raiz" @@ -2938,9 +3009,6 @@ msgstr "Roteie Andereços IP Autorizados" msgid "Route type" msgstr "Tipo de rota" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "Prefixo roteável IPv6 para interfaces internas" - msgid "Router Advertisement-Service" msgstr "Serviço de Anúncio de Roteador" @@ -2967,16 +3035,6 @@ msgstr "Execute a verificação do sistema de arquivos " msgid "SHA256" msgstr "SHA256" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" -"O SIXXS suporta somente TIC. Use o 6in4 para túneis estáticos usando o " -"protocolo IP 41 (RFC4213)" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "Identificador do SIXXS[/Identificador do Túnel]" - msgid "SNR" msgstr "SNR" @@ -3004,12 +3062,12 @@ msgstr "Salvar" msgid "Save & Apply" msgstr "Salvar & Aplicar" -msgid "Save & Apply" -msgstr "Save & Aplicar" - msgid "Scan" msgstr "Procurar" +msgid "Scan request failed" +msgstr "" + msgid "Scheduled Tasks" msgstr "Tarefas Agendadas" @@ -3035,19 +3093,6 @@ msgstr "Isolar Clientes" msgid "Server Settings" msgstr "Configurações do Servidor" -msgid "Server password" -msgstr "Senha do servidor" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" -"Senha do servidor. Informe a senha para este túnel quando o nome do usuário " -"contiver o identificador do túnel" - -msgid "Server username" -msgstr "Usuário do servidor" - msgid "Service Name" msgstr "Nome do Serviço" @@ -3065,6 +3110,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "Configurar a Sincronização do Horário" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "Configurar Servidor DHCP" @@ -3076,15 +3127,15 @@ msgstr "" msgid "Short GI" msgstr "Intervalo de guarda curto" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "Mostra a lista atual de arquivos para a cópia de segurança" msgid "Shutdown this interface" msgstr "Desligar esta interface" -msgid "Shutdown this network" -msgstr "Desligar esta rede" - msgid "Signal" msgstr "Sinal" @@ -3139,15 +3190,9 @@ msgstr "" "firmware deve ser gravada manualmente. Por favor, consulte a wiki para " "instruções específicas da instalação deste dispositivo." -msgid "Sort" -msgstr "Ordenar" - msgid "Source" msgstr "Origem" -msgid "Source routing" -msgstr "Roteamento pela origem" - msgid "Specifies the directory the device is attached to" msgstr "Especifica o diretório que o dispositivo está conectado" @@ -3194,6 +3239,12 @@ msgstr "Iniciar" msgid "Start priority" msgstr "Prioridade de iniciação" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "Iniciação" @@ -3359,10 +3410,23 @@ msgstr "" "Os caracteres permitidos são: A-Z, a-z, 0-9 e _" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" "O arquivo de configuração não pode ser carregado devido ao seguinte erro:" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3389,9 +3453,6 @@ msgstr "" "garantir a integridade dos dados.
Clique em \"Proceder\" para iniciar " "o procedimetno de gravação." -msgid "The following changes have been committed" -msgstr "As seguintes mudanças foram aplicadas" - msgid "The following changes have been reverted" msgstr "As seguintes alterações foram revertidas" @@ -3460,13 +3521,6 @@ msgstr "" "da sua configuração, pode ser necessário renovar o endereço do seu " "computador para poder conectar novamente ao roteador." -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" -"O final do túnel está atrás de um NAT. Por padrão será desabilitado e " -"somente se aplica a AYIYA" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3477,8 +3531,8 @@ msgstr "" msgid "There are no active leases." msgstr "Não existem alocações ativas." -msgid "There are no pending changes to apply!" -msgstr "Não existem modificações pendentes para aplicar!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Não existem modificações pendentes para reverter!" @@ -3591,10 +3645,12 @@ msgstr "Fuso Horário" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" "Para recuperar os arquivos de configuração, você pode enviar aqui uma cópia " -"de segurança anterior." +"de segurança anterior. Para retornar o roteador para o seu estado inicial, " +"clique em \"Zerar configuração\" (somente possível para imagens squashfs)." msgid "Tone" msgstr "Tom" @@ -3638,15 +3694,6 @@ msgstr "Interface de Tunelamento" msgid "Tunnel Link" msgstr "Enlace do túnel" -msgid "Tunnel broker protocol" -msgstr "Protocolo do agente do túnel" - -msgid "Tunnel setup server" -msgstr "Servidor de configuração do túnel" - -msgid "Tunnel type" -msgstr "Tipo de túnel" - msgid "Tx-Power" msgstr "Potência de transmissão" @@ -3671,9 +3718,27 @@ msgstr "Portas USB" msgid "UUID" msgstr "UUID" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "Não é possível a expedição" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" "Segundos de indisponibilidade (UASDNS file" msgstr "" "Arquivo local de DNS" -msgid "minimum 1280, maximum 1480" -msgstr "mínimo 1280, máximo 1480" - msgid "minutes" msgstr "minutos" +msgid "mixed WPA/WPA2" +msgstr "" + # Is this yes/no or no like in no one? msgid "no" msgstr "não" @@ -4078,6 +4140,9 @@ msgstr "ligado" msgid "open" msgstr "aberto" +msgid "output" +msgstr "" + msgid "overlay" msgstr "sobreposição" @@ -4129,116 +4194,80 @@ msgstr "sim" msgid "« Back" msgstr "« Voltar" -#~ msgid "Action" -#~ msgstr "Ação" +#~ msgid "%s - %s" +#~ msgstr "%s - %s" -#~ msgid "Buttons" -#~ msgstr "Botões" +#~ msgid "Activate this network" +#~ msgstr "Ativar esta rede" -# Não sei que contexto isto está sendo usado -#~ msgid "Handler" -#~ msgstr "Responsável" +#~ msgid "Hermes 802.11b Wireless Controller" +#~ msgstr "Hermes 802.11b Wireless Controlador" -# Desconheço o uso -#~ msgid "Maximum hold time" -#~ msgstr "Tempo máximo de espera" +#~ msgid "Interface is shutting down..." +#~ msgstr "A interface está desligando..." -#~ msgid "Minimum hold time" -#~ msgstr "Tempo mínimo de espera" +#~ msgid "Interface reconnected" +#~ msgstr "Interface reconectada" -#~ msgid "Path to executable which handles the button event" -#~ msgstr "Caminho para o executável que trata o evento do botão" +#~ msgid "Interface shut down" +#~ msgstr "Interface desligada" -#~ msgid "Specifies the button state to handle" -#~ msgstr "Especifica o estado do botão para ser tratado" +#~ msgid "Prism2/2.5/3 802.11b Wireless Controller" +#~ msgstr "Prism2/2.5/3 802.11b Wireless Controlador" -#~ msgid "This page allows the configuration of custom button actions" +#~ msgid "RaLink 802.11%s Wireless Controller" +#~ msgstr "RaLink 802.11%s Wireless Controlador" + +#~ msgid "" +#~ "Really shutdown interface \"%s\"? You might lose access to this device if " +#~ "you are connected via this interface." #~ msgstr "" -#~ "Esta página permite a configuração de ações personalizadas para os botões" +#~ "Realmente desligar esta interface\"%s\" ?\n" +#~ "Você poderá perder o acesso a este dispositivo se você estiver conectado " +#~ "através desta interface." -#~ msgid "Leasetime" -#~ msgstr "Tempo de atribuição do DHCP" +#~ msgid "Reconnecting interface" +#~ msgstr "Reconectando interface" -#~ msgid "Optional." -#~ msgstr "Opcional." +#~ msgid "Shutdown this network" +#~ msgstr "Desligar esta rede" -#~ msgid "navigation Navigation" -#~ msgstr "navegação Navegação" +#~ msgid "Wireless restarted" +#~ msgstr "A rede sem fio reiniciou" -#~ msgid "skiplink1 Skip to navigation" -#~ msgstr "skiplink1 Pular para a navegação" +#~ msgid "Wireless shut down" +#~ msgstr "Rede sem fio desligada" -#~ msgid "skiplink2 Skip to content" -#~ msgstr "skiplink2 Pular para o conteúdo" +#~ msgid "DHCP Leases" +#~ msgstr "Alocações do DHCP" -#~ msgid "AuthGroup" -#~ msgstr "Grupo de Autenticação" +#~ msgid "DHCPv6 Leases" +#~ msgstr "Alocações DHCPv6" -#~ msgid "automatic" -#~ msgstr "automático" +#~ msgid "" +#~ "Really delete this interface? The deletion cannot be undone! You might " +#~ "lose access to this device if you are connected via this interface." +#~ msgstr "" +#~ "Realmente excluir esta interface? A exclusão não pode ser desfeita!\n" +#~ " Você poderá perder o acesso a este dispositivo se você estiver conectado " +#~ "através desta interface." -#~ msgid "AR Support" -#~ msgstr "Suporte AR" +#~ msgid "" +#~ "Really shut down network? You might lose access to this device if you are " +#~ "connected via this interface." +#~ msgstr "" +#~ "Realmente desligar esta rede\"%s\" ?\n" +#~ "Você poderá perder o acesso a este dispositivo se você estiver conectado " +#~ "através desta interface." -#~ msgid "Atheros 802.11%s Wireless Controller" -#~ msgstr "Controlador Wireless Atheros 802.11%s" +#~ msgid "Sort" +#~ msgstr "Ordenar" -#~ msgid "Background Scan" -#~ msgstr "Busca em Segundo Plano" +#~ msgid "help" +#~ msgstr "ajuda" -#~ msgid "Compression" -#~ msgstr "Compressão" +#~ msgid "IPv4 WAN Status" +#~ msgstr "Estado IPv4 da WAN" -#~ msgid "Disable HW-Beacon timer" -#~ msgstr "Desativar temporizador de Beacon de Hardware" - -#~ msgid "Do not send probe responses" -#~ msgstr "Não enviar respostas de exames" - -#~ msgid "Fast Frames" -#~ msgstr "Quadros Rápidos" - -#~ msgid "Maximum Rate" -#~ msgstr "Taxa Máxima" - -#~ msgid "Minimum Rate" -#~ msgstr "Taxa Mínima" - -#~ msgid "Multicast Rate" -#~ msgstr "Taxa de Multicast" - -#~ msgid "Outdoor Channels" -#~ msgstr "Canais para externo" - -#~ msgid "Regulatory Domain" -#~ msgstr "Domínio Regulatório" - -#~ msgid "Separate WDS" -#~ msgstr "Separar WDS" - -#~ msgid "Static WDS" -#~ msgstr "WDS Estático" - -#~ msgid "Turbo Mode" -#~ msgstr "Modo Turbo" - -#~ msgid "XR Support" -#~ msgstr "Suporte a XR" - -#~ msgid "An additional network will be created if you leave this unchecked." -#~ msgstr "Uma rede adicional será criada se você deixar isto desmarcado." - -#~ msgid "Join Network: Settings" -#~ msgstr "Conectar à Rede: Configurações" - -#~ msgid "CPU" -#~ msgstr "CPU" - -#~ msgid "Port %d" -#~ msgstr "Porta %d" - -#~ msgid "Port %d is untagged in multiple VLANs!" -#~ msgstr "Porta %d está sem etiqueta para mútliplas VLANs!" - -#~ msgid "VLAN Interface" -#~ msgstr "Interface VLAN" +#~ msgid "IPv6 WAN Status" +#~ msgstr "Estado IPv6 da WAN" diff --git a/luci-base/po/pt/base.po b/luci-base/po/pt/base.po index 843a4cac8..d548b7c8d 100644 --- a/luci-base/po/pt/base.po +++ b/luci-base/po/pt/base.po @@ -49,6 +49,9 @@ msgstr "" msgid "-- match by uuid --" msgstr "" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "Carga de 1 Minuto:" @@ -160,9 +163,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "Max. consultas concorrentes" -msgid "%s - %s" -msgstr "%s - %s" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -177,9 +177,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -216,9 +213,6 @@ msgstr "Número de Dispositivo ATM" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Concentrador de Acesso" @@ -228,9 +222,6 @@ msgstr "Access Point (AP)" msgid "Actions" msgstr "Acções" -msgid "Activate this network" -msgstr "Ativar esta rede" - msgid "Active IPv4-Routes" msgstr "" "Rotas-IPv4 ativas" @@ -286,6 +277,15 @@ msgstr "" msgid "Alert" msgstr "Alerta" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -298,6 +298,9 @@ msgid "Allow SSH password authentication" msgstr "" "Permitir autenticação SSH por senha" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "Permitir todos, excepto os listados" @@ -328,12 +331,12 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -411,11 +414,14 @@ msgstr "Configuração das Antenas" msgid "Any zone" msgstr "Qualquer zona" -msgid "Apply" -msgstr "Aplicar" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" -msgstr "A aplicar as alterações" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -431,6 +437,9 @@ msgstr "" msgid "Associated Stations" msgstr "Estações Associadas" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -506,12 +515,12 @@ msgstr "Voltar à vista global" msgid "Back to scan results" msgstr "Voltar aos resultados do scan" +msgid "Backup" +msgstr "Backup" + msgid "Backup / Flash Firmware" msgstr "Backup / Flashar Firmware" -msgid "Backup / Restore" -msgstr "Backup / Restauração" - msgid "Backup file list" msgstr "Lista de ficheiros para backup" @@ -521,7 +530,7 @@ msgstr "Endereço mal especificado!" msgid "Band" msgstr "" -msgid "Behind NAT" +msgid "Beacon Interval" msgstr "" msgid "" @@ -580,6 +589,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "Uso da CPU (%)" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "Cancelar" @@ -595,12 +607,20 @@ msgstr "Alterações" msgid "Changes applied." msgstr "Alterações aplicadas." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Altera a password de administrador para acesso ao dispositivo" msgid "Channel" msgstr "Canal" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Verificar" @@ -639,12 +659,10 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" "Clique em \"Gerar arquivo\" para descarregar o ficheiro tar com os actuais " -"ficheiros de configuração. Para voltar as definições originais do firmware, " -"clique \" Fazer reset\" (só possível com imagens squashfs)" +"ficheiros de configuração." msgid "Client" msgstr "Cliente" @@ -681,12 +699,18 @@ msgstr "" msgid "Configuration" msgstr "Configuração" -msgid "Configuration applied." -msgstr "Configuração aplicada." +msgid "Configuration failed" +msgstr "" msgid "Configuration files will be kept." msgstr "Os ficheiros de configuração serão mantidos." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Confirmação" @@ -699,12 +723,18 @@ msgstr "Ligado" msgid "Connection Limit" msgstr "Limite de Ligações" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "Ligações" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "País" @@ -758,9 +788,6 @@ msgstr "" "Customiza o comportamento dos LEDs, se possível." -msgid "DHCP Leases" -msgstr "Concessões DHCP" - msgid "DHCP Server" msgstr "Servidor DHCP" @@ -773,9 +800,6 @@ msgstr "Cliente DHCP" msgid "DHCP-Options" msgstr "Opções DHCP" -msgid "DHCPv6 Leases" -msgstr "Concessões DHCPv6" - msgid "DHCPv6 client" msgstr "" @@ -815,6 +839,9 @@ msgstr "" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "DUID" @@ -833,9 +860,6 @@ msgstr "Gateway predefinido" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Estado predefinido" @@ -857,6 +881,9 @@ msgstr "Apagar" msgid "Delete this network" msgstr "Apagar esta rede" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "Descrição" @@ -875,7 +902,10 @@ msgstr "Configuração do Dispositivo" msgid "Device is rebooting..." msgstr "" -msgid "Device unreachable" +msgid "Device unreachable!" +msgstr "" + +msgid "Device unreachable! Still waiting for device..." msgstr "" msgid "Diagnostics" @@ -903,15 +933,27 @@ msgstr "Desativar configuração de DNS" msgid "Disable Encryption" msgstr "" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "Desativado" msgid "Disabled (default)" msgstr "" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "Descartar respostas RFC1918 a montante" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "Mostrar somente pacotes contendo" @@ -966,6 +1008,9 @@ msgstr "" "Não encaminhar consultas DNS sem o nome do DNS" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "Descarregar e instalar pacote" @@ -1082,6 +1127,9 @@ msgstr "" msgid "Enable this mount" msgstr "Ativar este mount" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "Ativar esta swap" @@ -1114,6 +1162,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "A apagar..." @@ -1175,6 +1229,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Ficheiro" @@ -1193,6 +1250,9 @@ msgstr "Filtrar endereços privados" msgid "Filter useless" msgstr "Filtro inútil" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1246,6 +1306,9 @@ msgstr "A programar...." msgid "Force" msgstr "Forçar" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "Forçar CCMP (AES)" @@ -1296,7 +1359,7 @@ msgstr "Espaço livre" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1308,6 +1371,9 @@ msgstr "Só GPRS" msgid "Gateway" msgstr "Gateway" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "Portas de gateway" @@ -1369,9 +1435,6 @@ msgstr "Suspender" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1386,9 +1449,6 @@ msgstr "" "Aqui pode colar as chaves SSH (uma por linha) para a autenticação SSH por " "chave pública." -msgid "Hermes 802.11b Wireless Controller" -msgstr "Controlador Wireless Hermes 802.11b" - msgid "Hide ESSID" msgstr "" "Ocultar IP or Network" msgstr "" "IP do host ou rede" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "Hostname" @@ -1428,14 +1491,20 @@ msgstr "" msgid "IP address" msgstr "Endereço IP" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "IPv4" msgid "IPv4 Firewall" msgstr "Firewall IPv4" -msgid "IPv4 WAN Status" -msgstr "Estado WAN IPv4" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "Endereço IPv4" @@ -1485,15 +1554,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "Estado WAN IPv6" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "Endereço IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1600,6 +1666,9 @@ msgstr "Entrada:" msgid "Info" msgstr "Info" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "Script de inicialização" @@ -1636,21 +1705,12 @@ msgstr "Visão Geral da Interface" msgid "Interface is reconnecting..." msgstr "A interface está a religar..." -msgid "Interface is shutting down..." -msgstr "A interface está a desligar..." - msgid "Interface name" msgstr "" msgid "Interface not present or not connected yet." msgstr "Interface não presente ou ainda não ligada." -msgid "Interface reconnected" -msgstr "Interface religada" - -msgid "Interface shut down" -msgstr "Desligar interface" - msgid "Interfaces" msgstr "Interfaces" @@ -1843,6 +1903,9 @@ msgstr "Carga Média" msgid "Loading" msgstr "A carregar" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1912,6 +1975,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "" +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "Endereço-MAC" @@ -1927,6 +1993,9 @@ msgstr "Lista-MAC" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -2006,6 +2075,9 @@ msgstr "" msgid "Modem device" msgstr "Dispositivo do modem" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "" @@ -2079,9 +2151,6 @@ msgstr "" msgid "NTP server candidates" msgstr "Candidatos a servidor NTP" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nome" @@ -2106,6 +2175,9 @@ msgstr "Ferramentas de Rede" msgid "Network boot image" msgstr "Imagem de arranque via rede" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "Rede sem interfaces." @@ -2127,6 +2199,9 @@ msgstr "Não foram encontrados ficheiros" msgid "No information available" msgstr "Sem informação disponível" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "Sem cache negativa" @@ -2145,6 +2220,9 @@ msgstr "Sem password definida!" msgid "No rules in this chain" msgstr "Sem regras nesta cadeia" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "Sem zona atribuída" @@ -2205,6 +2283,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "Atraso do Off-State" @@ -2256,12 +2337,6 @@ msgstr "Opção removida" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2282,6 +2357,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2360,6 +2438,9 @@ msgstr "PID" msgid "PIN" msgstr "PIN" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2447,6 +2528,9 @@ msgstr "Pico:" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2515,9 +2599,6 @@ msgstr "" msgid "Prevents client-to-client communication" msgstr "Impede a comunicação cliente-a-cliente" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "Controlador Wireless Prism2/2.5/3 802.11b" - msgid "Private Key" msgstr "" @@ -2566,6 +2647,11 @@ msgstr "" msgid "Quality" msgstr "Qualidade" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2584,9 +2670,6 @@ msgstr "RX" msgid "RX Rate" msgstr "Taxa RX" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "Controlador Wireless RaLink 802.11%s" - msgid "Radius-Accounting-Port" msgstr "Porta-Conta-Radius" @@ -2605,6 +2688,9 @@ msgstr "Segredo-Autenticação-Radius" msgid "Radius-Authentication-Server" msgstr "Servidor-Autenticação-Radius" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" @@ -2613,15 +2699,12 @@ msgstr "" "\"Protocolo de Configuração Dinâmica de Hosts\">DHCP" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" -"Deseja mesmo apagar esta interface? A eliminação não poder desfeita!\n" -"Pode perde a ligação ao dispositivo, caso esta ligado através desta " -"interface." msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" "Deseja mesmo apagar esta rede? A eliminação não poder desfeita!\n" @@ -2630,22 +2713,6 @@ msgstr "" msgid "Really reset all changes?" msgstr "Deseja mesmo limpar todas as alterações?" -#, fuzzy -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" -"Deseja mesmo desligar esta rede?\n" -"Pode perder o acesso ao dispositivo se estiver ligado através desta rede." - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" -"Deseja mesmo desligar a interface \"%s\" ?\n" -"Pode perder o acesso ao dispositivo se estiver ligado através desta " -"interface." - msgid "Really switch protocol?" msgstr "Deseja mesmo trocar o protocolo?" @@ -2691,9 +2758,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "Reconetar esta interface" -msgid "Reconnecting interface" -msgstr "A reconectar interface" - msgid "References" msgstr "Referências" @@ -2733,9 +2797,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2785,6 +2846,12 @@ msgstr "Reiniciar" msgid "Restart Firewall" msgstr "Reiniciar Firewall" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "Restauração" + msgid "Restore backup" msgstr "Restaurar backup" @@ -2794,6 +2861,15 @@ msgstr "Revelar/esconder password" msgid "Revert" msgstr "Reverter" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2809,9 +2885,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2838,14 +2911,6 @@ msgstr "Correr uma verificação do sistema de ficheiros" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2873,12 +2938,12 @@ msgstr "Salvar" msgid "Save & Apply" msgstr "Salvar & Aplicar" -msgid "Save & Apply" -msgstr "Salvar & Aplicar" - msgid "Scan" msgstr "Procurar" +msgid "Scan request failed" +msgstr "" + msgid "Scheduled Tasks" msgstr "Tarefas Agendadas" @@ -2902,17 +2967,6 @@ msgstr "Isolar Clientes" msgid "Server Settings" msgstr "" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Nome do Serviço" @@ -2931,6 +2985,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "Configurar Sincronização Horária" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "Configurar Servidor DHCP" @@ -2940,15 +3000,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "Mostrar lista ficheiros para backup" msgid "Shutdown this interface" msgstr "Desligar esta interface" -msgid "Shutdown this network" -msgstr "Desligar esta rede" - msgid "Signal" msgstr "Sinal" @@ -3000,15 +3060,9 @@ msgid "" "instructions." msgstr "" -msgid "Sort" -msgstr "Ordenar" - msgid "Source" msgstr "Origem" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -3047,6 +3101,12 @@ msgstr "Iniciar" msgid "Start priority" msgstr "Prioridade de inicialização" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "" @@ -3199,9 +3259,22 @@ msgstr "" "Os caracteres permitidos são: A-Z, a-z, 0-9 e _" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3227,9 +3300,6 @@ msgstr "" "compare com o ficheiro original para assegurar a integração de dados.
" "Click em \"Proceder\" para iniciar o procedimento." -msgid "The following changes have been committed" -msgstr "As seguintes alterações foram escritas" - msgid "The following changes have been reverted" msgstr "Foram recuperadas as seguintes alterações " @@ -3299,11 +3369,6 @@ msgstr "" "da sua configuração, ode ser necessário renovar o endereço do seu computador " "para poder ligar novamente ao router." -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3314,8 +3379,8 @@ msgstr "" msgid "There are no active leases." msgstr "Não há concessões ativas." -msgid "There are no pending changes to apply!" -msgstr "Não há alterações pendentes para aplicar!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Não há alterações pendentes para reverter!" @@ -3413,10 +3478,12 @@ msgstr "Fuso Horário" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" "Para restaurar os ficheiros de configuração, pode carregar aqui um ficheiro " -"de backup gerado anteriormente." +"de backup gerado anteriormente. Para voltar as definições originais do " +"firmware, clique \" Fazer reset\" (só possível com imagens squashfs)." msgid "Tone" msgstr "" @@ -3460,15 +3527,6 @@ msgstr "Interface de Túnel" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Potência de Tx" @@ -3493,9 +3551,27 @@ msgstr "" msgid "UUID" msgstr "UUID" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3505,6 +3581,9 @@ msgstr "Desconhecido" msgid "Unknown Error, password not changed!" msgstr "Erro Desconhecido, a password não foi alterada!" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "Não gerido" @@ -3514,9 +3593,18 @@ msgstr "" msgid "Unsaved Changes" msgstr "Alterações não Guardadas" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "Tipo de protocolo não suportado." +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "Actualizar listas" @@ -3641,18 +3729,15 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Verificar" msgid "Version" msgstr "Versão" +msgid "Virtual dynamic interface" +msgstr "" + msgid "WDS" msgstr "WDS" @@ -3678,16 +3763,15 @@ msgstr "" "A encriptação-WPA necessita do wpa_supplicant (para modo cliente) ou do " "hostapd (para modo AP ou ah-hoc) esteja instalado." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "A aguardar que as mudanças sejam aplicadas..." msgid "Waiting for command to complete..." msgstr "A aguardar que o comando termine..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3702,12 +3786,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3729,8 +3807,11 @@ msgstr "Vista Global Wireless" msgid "Wireless Security" msgstr "Segurança Wireless" -msgid "Wireless is disabled or not associated" -msgstr "Wireless desativada ou não associada" +msgid "Wireless is disabled" +msgstr "Wireless desativada" + +msgid "Wireless is not associated" +msgstr "Wireless não associada" msgid "Wireless is restarting..." msgstr "A Wireless está a reiniciar..." @@ -3741,12 +3822,6 @@ msgstr "Wireless está desativado." msgid "Wireless network is enabled" msgstr "A rede wireless está ativada" -msgid "Wireless restarted" -msgstr "Rede wireless reiniciada" - -msgid "Wireless shut down" -msgstr "Desligar wireless" - msgid "Write received DNS requests to syslog" msgstr "Escrever os pedidos de DNS para o syslog" @@ -3788,6 +3863,9 @@ msgstr "baseT" msgid "bridged" msgstr "" +msgid "create" +msgstr "" + msgid "create:" msgstr "criar:" @@ -3825,9 +3903,6 @@ msgstr "full-duplex" msgid "half-duplex" msgstr "half-duplex" -msgid "help" -msgstr "ajuda" - msgid "hidden" msgstr "escondido" @@ -3853,10 +3928,10 @@ msgid "local DNS file" msgstr "" "Ficheiro local de DNS" -msgid "minimum 1280, maximum 1480" +msgid "minutes" msgstr "" -msgid "minutes" +msgid "mixed WPA/WPA2" msgstr "" msgid "no" @@ -3880,6 +3955,9 @@ msgstr "ligado" msgid "open" msgstr "abrir" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" @@ -3931,6 +4009,102 @@ msgstr "sim" msgid "« Back" msgstr "« Voltar" +#~ msgid "%s - %s" +#~ msgstr "%s - %s" + +#~ msgid "Activate this network" +#~ msgstr "Ativar esta rede" + +#~ msgid "Hermes 802.11b Wireless Controller" +#~ msgstr "Controlador Wireless Hermes 802.11b" + +#~ msgid "Interface is shutting down..." +#~ msgstr "A interface está a desligar..." + +#~ msgid "Interface reconnected" +#~ msgstr "Interface religada" + +#~ msgid "Interface shut down" +#~ msgstr "Desligar interface" + +#~ msgid "Prism2/2.5/3 802.11b Wireless Controller" +#~ msgstr "Controlador Wireless Prism2/2.5/3 802.11b" + +#~ msgid "RaLink 802.11%s Wireless Controller" +#~ msgstr "Controlador Wireless RaLink 802.11%s" + +#~ msgid "" +#~ "Really shutdown interface \"%s\"? You might lose access to this device if " +#~ "you are connected via this interface." +#~ msgstr "" +#~ "Deseja mesmo desligar a interface \"%s\" ?\n" +#~ "Pode perder o acesso ao dispositivo se estiver ligado através desta " +#~ "interface." + +#~ msgid "Reconnecting interface" +#~ msgstr "A reconectar interface" + +#~ msgid "Shutdown this network" +#~ msgstr "Desligar esta rede" + +#~ msgid "Wireless restarted" +#~ msgstr "Rede wireless reiniciada" + +#~ msgid "Wireless shut down" +#~ msgstr "Desligar wireless" + +#~ msgid "DHCP Leases" +#~ msgstr "Concessões DHCP" + +#~ msgid "DHCPv6 Leases" +#~ msgstr "Concessões DHCPv6" + +#~ msgid "" +#~ "Really delete this interface? The deletion cannot be undone! You might " +#~ "lose access to this device if you are connected via this interface." +#~ msgstr "" +#~ "Deseja mesmo apagar esta interface? A eliminação não poder desfeita!\n" +#~ "Pode perde a ligação ao dispositivo, caso esta ligado através desta " +#~ "interface." + +#, fuzzy +#~ msgid "" +#~ "Really shut down network? You might lose access to this device if you are " +#~ "connected via this interface." +#~ msgstr "" +#~ "Deseja mesmo desligar esta rede?\n" +#~ "Pode perder o acesso ao dispositivo se estiver ligado através desta rede." + +#~ msgid "Sort" +#~ msgstr "Ordenar" + +#~ msgid "help" +#~ msgstr "ajuda" + +#~ msgid "IPv4 WAN Status" +#~ msgstr "Estado WAN IPv4" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "Estado WAN IPv6" + +#~ msgid "Apply" +#~ msgstr "Aplicar" + +#~ msgid "Applying changes" +#~ msgstr "A aplicar as alterações" + +#~ msgid "Configuration applied." +#~ msgstr "Configuração aplicada." + +#~ msgid "Save & Apply" +#~ msgstr "Salvar & Aplicar" + +#~ msgid "The following changes have been committed" +#~ msgstr "As seguintes alterações foram escritas" + +#~ msgid "There are no pending changes to apply!" +#~ msgstr "Não há alterações pendentes para aplicar!" + #~ msgid "Action" #~ msgstr "Acção" diff --git a/luci-base/po/ro/base.po b/luci-base/po/ro/base.po index 748bfdbc5..a28235bbd 100644 --- a/luci-base/po/ro/base.po +++ b/luci-base/po/ro/base.po @@ -48,6 +48,9 @@ msgstr "" msgid "-- match by uuid --" msgstr "" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "Incarcarea in ultimul minut" @@ -151,9 +154,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "Max. interogari simultane" -msgid "%s - %s" -msgstr "%s - %s" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -168,9 +168,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -207,9 +204,6 @@ msgstr "ATM numar echipament" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Concentrator de Access " @@ -219,9 +213,6 @@ msgstr "Punct de Acces" msgid "Actions" msgstr "Actiune" -msgid "Activate this network" -msgstr "Activeaza aceasta retea" - msgid "Active IPv4-Routes" msgstr "Rute active IPv4" @@ -273,6 +264,15 @@ msgstr "" msgid "Alert" msgstr "Alerta" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -285,6 +285,9 @@ msgid "Allow SSH password authentication" msgstr "" "Permite autentificarea prin parola a SSH " +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "Permite toate cu exceptia celor listate" @@ -314,12 +317,12 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -397,11 +400,14 @@ msgstr "Configurarea Antenei" msgid "Any zone" msgstr "Orice Zona" -msgid "Apply" -msgstr "Aplica" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" -msgstr "Se aplica modificarile" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -417,6 +423,9 @@ msgstr "" msgid "Associated Stations" msgstr "Statiile asociate" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -492,12 +501,12 @@ msgstr "Inapoi la vedere generala" msgid "Back to scan results" msgstr "Inapoi la rezultatele scanarii" +msgid "Backup" +msgstr "Salveaza" + msgid "Backup / Flash Firmware" msgstr "Salveaza / Scrie Firmware" -msgid "Backup / Restore" -msgstr "Salveaza / Restaureaza" - msgid "Backup file list" msgstr "Salveaza lista fisiere" @@ -507,7 +516,7 @@ msgstr "Adresa specificata gresit !" msgid "Band" msgstr "" -msgid "Behind NAT" +msgid "Beacon Interval" msgstr "" msgid "" @@ -563,6 +572,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "Utilizarea procesorului (%)" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "Anuleaza" @@ -578,12 +590,20 @@ msgstr "Modificari" msgid "Changes applied." msgstr "Modificari aplicate." +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Schimba parola administratorului pentru accesarea dispozitivului" msgid "Channel" msgstr "Canal" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Verificare" @@ -619,8 +639,7 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" msgid "Client" @@ -656,12 +675,18 @@ msgstr "" msgid "Configuration" msgstr "Configurare" -msgid "Configuration applied." -msgstr "Configurarea aplicata." +msgid "Configuration failed" +msgstr "" msgid "Configuration files will be kept." msgstr "Fisierele de configurare vor fi pastrate." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Confirmare" @@ -674,12 +699,18 @@ msgstr "Conectat" msgid "Connection Limit" msgstr "Limita de conexiune" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "Conexiuni" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Tara" @@ -731,9 +762,6 @@ msgid "" "\">LEDs if possible." msgstr "" -msgid "DHCP Leases" -msgstr "Conexiuni DHCP" - msgid "DHCP Server" msgstr "Server DHCP" @@ -746,9 +774,6 @@ msgstr "" msgid "DHCP-Options" msgstr "Optiuni DHCP" -msgid "DHCPv6 Leases" -msgstr "" - msgid "DHCPv6 client" msgstr "" @@ -788,6 +813,9 @@ msgstr "" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "" @@ -806,9 +834,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Stare implicita" @@ -827,6 +852,9 @@ msgstr "Sterge" msgid "Delete this network" msgstr "Sterge aceasta retea" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "Descriere" @@ -845,7 +873,10 @@ msgstr "Configurarea dispozitivului" msgid "Device is rebooting..." msgstr "" -msgid "Device unreachable" +msgid "Device unreachable!" +msgstr "" + +msgid "Device unreachable! Still waiting for device..." msgstr "" msgid "Diagnostics" @@ -873,15 +904,27 @@ msgstr "Dezactiveaza configuratia DNS" msgid "Disable Encryption" msgstr "" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "Dezactivat" msgid "Disabled (default)" msgstr "" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "" @@ -927,6 +970,9 @@ msgid "" "DNS-Name" msgstr "" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "Descarca si instaleaza pachetul" @@ -1037,6 +1083,9 @@ msgstr "" msgid "Enable this mount" msgstr "" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "" @@ -1069,6 +1118,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "Stergere..." @@ -1127,6 +1182,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Fisier" @@ -1145,6 +1203,9 @@ msgstr "Filtreaza privatele" msgid "Filter useless" msgstr "Filtreaza nefolositele" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1198,6 +1259,9 @@ msgstr "" msgid "Force" msgstr "Forteaza" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "Forteaza CCMP (AES)" @@ -1249,7 +1313,7 @@ msgstr "Spatiu liber" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1261,6 +1325,9 @@ msgstr "Doar GPRS" msgid "Gateway" msgstr "Gateway" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "Porturile gateway" @@ -1321,9 +1388,6 @@ msgstr "" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1336,9 +1400,6 @@ msgid "" "authentication." msgstr "" -msgid "Hermes 802.11b Wireless Controller" -msgstr "" - msgid "Hide ESSID" msgstr "Ascunde ESSID" @@ -1354,6 +1415,9 @@ msgstr "" msgid "Host-IP or Network" msgstr "" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "Numele de host" @@ -1375,14 +1439,20 @@ msgstr "" msgid "IP address" msgstr "Adresa IP" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "IPv4" msgid "IPv4 Firewall" msgstr "Firewall IPv4" -msgid "IPv4 WAN Status" -msgstr "Statusul IPv4 pe WAN" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "Adresa IPv4" @@ -1432,15 +1502,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "Statusul IPv6 pe WAN" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "Adresa IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1541,6 +1608,9 @@ msgstr "Intrare:" msgid "Info" msgstr "Informatii" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "Script de initializare" @@ -1577,21 +1647,12 @@ msgstr "Prezentare interfata" msgid "Interface is reconnecting..." msgstr "Interfata se reconecteaza.." -msgid "Interface is shutting down..." -msgstr "Interfata se opreste.." - msgid "Interface name" msgstr "" msgid "Interface not present or not connected yet." msgstr "Interfata nu e prezenta sau nu este conectata inca." -msgid "Interface reconnected" -msgstr "Interfata reconectata" - -msgid "Interface shut down" -msgstr "Interfata oprita" - msgid "Interfaces" msgstr "Interfete" @@ -1780,6 +1841,9 @@ msgstr "Incarcarea medie" msgid "Loading" msgstr "Incarcare" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1844,6 +1908,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "" +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "" @@ -1859,6 +1926,9 @@ msgstr "" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "" @@ -1938,6 +2008,9 @@ msgstr "" msgid "Modem device" msgstr "" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "" @@ -2009,9 +2082,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Nume" @@ -2036,6 +2106,9 @@ msgstr "Utilitare de retea" msgid "Network boot image" msgstr "" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "" @@ -2057,6 +2130,9 @@ msgstr "Nici un fisier gasit" msgid "No information available" msgstr "Nici o informatie disponibila" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "" @@ -2075,6 +2151,9 @@ msgstr "Nici o parola setata !" msgid "No rules in this chain" msgstr "" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "" @@ -2135,6 +2214,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2180,12 +2262,6 @@ msgstr "Optiunea eliminata" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2206,6 +2282,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2284,6 +2363,9 @@ msgstr "PID" msgid "PIN" msgstr "" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2371,6 +2453,9 @@ msgstr "Maxim:" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2439,9 +2524,6 @@ msgstr "" msgid "Prevents client-to-client communication" msgstr "" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "" - msgid "Private Key" msgstr "" @@ -2490,6 +2572,11 @@ msgstr "" msgid "Quality" msgstr "Calitate" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2508,9 +2595,6 @@ msgstr "RX" msgid "RX Rate" msgstr "" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "" - msgid "Radius-Accounting-Port" msgstr "" @@ -2529,6 +2613,9 @@ msgstr "" msgid "Radius-Authentication-Server" msgstr "" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" @@ -2537,28 +2624,18 @@ msgstr "" "DHCP-" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" msgid "Really reset all changes?" msgstr "" -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" - msgid "Really switch protocol?" msgstr "" @@ -2604,9 +2681,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "Reconecteaza aceasta interfata" -msgid "Reconnecting interface" -msgstr "Interfata se reconecteaza chiar acum" - msgid "References" msgstr "Referinte" @@ -2646,9 +2720,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2698,6 +2769,12 @@ msgstr "Restart" msgid "Restart Firewall" msgstr "Restarteaza firewallul" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "Restaureaza" + msgid "Restore backup" msgstr "Reface backup-ul" @@ -2707,6 +2784,15 @@ msgstr "Arata / ascunde parola" msgid "Revert" msgstr "" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2722,9 +2808,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2748,14 +2831,6 @@ msgstr "" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2783,12 +2858,12 @@ msgstr "Salveaza" msgid "Save & Apply" msgstr "Salveaza si aplica" -msgid "Save & Apply" -msgstr "Salveaza & Aplica" - msgid "Scan" msgstr "Scan" +msgid "Scan request failed" +msgstr "" + msgid "Scheduled Tasks" msgstr "Operatiuni programate" @@ -2812,17 +2887,6 @@ msgstr "" msgid "Server Settings" msgstr "Setarile serverului" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "Nume serviciu" @@ -2841,6 +2905,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "Configurare sincronizare timp" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "Seteaza serverul DHCP" @@ -2850,15 +2920,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "" msgid "Shutdown this interface" msgstr "Opreste aceasta interfata" -msgid "Shutdown this network" -msgstr "Opreste aceasta retea" - msgid "Signal" msgstr "Semnal" @@ -2910,15 +2980,9 @@ msgid "" "instructions." msgstr "" -msgid "Sort" -msgstr "" - msgid "Source" msgstr "Sursa" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -2957,6 +3021,12 @@ msgstr "Start" msgid "Start priority" msgstr "" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "Pornire" @@ -3103,9 +3173,22 @@ msgid "" "code> and _" msgstr "" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3123,9 +3206,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "" @@ -3178,11 +3258,6 @@ msgid "" "settings." msgstr "" -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3191,8 +3266,8 @@ msgstr "" msgid "There are no active leases." msgstr "" -msgid "There are no pending changes to apply!" -msgstr "Nu exista modificari in asteptare de aplicat !" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Nu exista modificari in asteptare de anulat !" @@ -3283,7 +3358,8 @@ msgstr "Fusul orar" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" msgid "Tone" @@ -3328,15 +3404,6 @@ msgstr "Interfata de tunel" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Puterea TX" @@ -3361,9 +3428,27 @@ msgstr "" msgid "UUID" msgstr "UUID" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3373,6 +3458,9 @@ msgstr "Necunoscut" msgid "Unknown Error, password not changed!" msgstr "Eroare necunoscuta, parola neschimbata !" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "Neadministrate" @@ -3382,9 +3470,18 @@ msgstr "" msgid "Unsaved Changes" msgstr "Modificari nesalvate" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "Tipul de protocol neacceptat." +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "" @@ -3509,18 +3606,15 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" msgid "Version" msgstr "Versiune" +msgid "Virtual dynamic interface" +msgstr "" + msgid "WDS" msgstr "WDS" @@ -3546,16 +3640,15 @@ msgstr "" "Criptarea WPA necesita wpa_supplicant (pentru modul client) sau hostapd " "(pentru modul AP sau ad-hoc) instalate." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3570,12 +3663,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3597,8 +3684,11 @@ msgstr "Sumarul wireless" msgid "Wireless Security" msgstr "Securitate wireless" -msgid "Wireless is disabled or not associated" -msgstr "Wireless-ul este dezactivat sau ne-asociat" +msgid "Wireless is disabled" +msgstr "Wireless-ul este dezactivat" + +msgid "Wireless is not associated" +msgstr "Wireless-ul este ne-asociat" msgid "Wireless is restarting..." msgstr "Wireless-ul se restarteaza.." @@ -3609,12 +3699,6 @@ msgstr "Reteaua wireless este dezactivata" msgid "Wireless network is enabled" msgstr "Reteaua wireless este activata" -msgid "Wireless restarted" -msgstr "Wireless-ul restartat" - -msgid "Wireless shut down" -msgstr "Wireless-ul oprit" - msgid "Write received DNS requests to syslog" msgstr "Scrie cererile DNS primite in syslog" @@ -3649,6 +3733,9 @@ msgstr "" msgid "bridged" msgstr "" +msgid "create" +msgstr "" + msgid "create:" msgstr "" @@ -3684,9 +3771,6 @@ msgstr "" msgid "half-duplex" msgstr "" -msgid "help" -msgstr "ajutor" - msgid "hidden" msgstr "ascuns" @@ -3711,10 +3795,10 @@ msgstr "" msgid "local DNS file" msgstr "" -msgid "minimum 1280, maximum 1480" +msgid "minutes" msgstr "" -msgid "minutes" +msgid "mixed WPA/WPA2" msgstr "" msgid "no" @@ -3738,6 +3822,9 @@ msgstr "" msgid "open" msgstr "" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" @@ -3789,6 +3876,60 @@ msgstr "da" msgid "« Back" msgstr "« Inapoi" +#~ msgid "%s - %s" +#~ msgstr "%s - %s" + +#~ msgid "Activate this network" +#~ msgstr "Activeaza aceasta retea" + +#~ msgid "Interface is shutting down..." +#~ msgstr "Interfata se opreste.." + +#~ msgid "Interface reconnected" +#~ msgstr "Interfata reconectata" + +#~ msgid "Interface shut down" +#~ msgstr "Interfata oprita" + +#~ msgid "Reconnecting interface" +#~ msgstr "Interfata se reconecteaza chiar acum" + +#~ msgid "Shutdown this network" +#~ msgstr "Opreste aceasta retea" + +#~ msgid "Wireless restarted" +#~ msgstr "Wireless-ul restartat" + +#~ msgid "Wireless shut down" +#~ msgstr "Wireless-ul oprit" + +#~ msgid "DHCP Leases" +#~ msgstr "Conexiuni DHCP" + +#~ msgid "help" +#~ msgstr "ajutor" + +#~ msgid "IPv4 WAN Status" +#~ msgstr "Statusul IPv4 pe WAN" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "Statusul IPv6 pe WAN" + +#~ msgid "Apply" +#~ msgstr "Aplica" + +#~ msgid "Applying changes" +#~ msgstr "Se aplica modificarile" + +#~ msgid "Configuration applied." +#~ msgstr "Configurarea aplicata." + +#~ msgid "Save & Apply" +#~ msgstr "Salveaza & Aplica" + +#~ msgid "There are no pending changes to apply!" +#~ msgstr "Nu exista modificari in asteptare de aplicat !" + #~ msgid "Action" #~ msgstr "Actiune" diff --git a/luci-base/po/ru/base.po b/luci-base/po/ru/base.po index 35a697620..8d542e601 100644 --- a/luci-base/po/ru/base.po +++ b/luci-base/po/ru/base.po @@ -3,12 +3,12 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Project-Id-Version: LuCI: base\n" "POT-Creation-Date: 2010-05-09 01:01+0300\n" -"PO-Revision-Date: 2018-01-24 15:00+0300\n" +"PO-Revision-Date: 2018-07-21 08:10+0300\n" "Language-Team: http://cyber-place.ru\n" "MIME-Version: 1.0\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.8.7.1\n" -"Last-Translator: Vladimir aka sunny \n" +"Last-Translator: Anton Kikin \n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "Language: ru\n" @@ -16,10 +16,10 @@ msgstr "" "интерфейс, все проверялось в графическом режиме, совместим с другими apps\n" msgid "%.1f dB" -msgstr "%.1f dB" +msgstr "%.1f дБ" msgid "%s is untagged in multiple VLANs!" -msgstr "%s is untagged in multiple VLANs!" +msgstr "%s не тегирован в множестве VLAN!" msgid "(%d minute window, %d second interval)" msgstr "(%d минутное окно, %d секундный интервал)" @@ -51,6 +51,9 @@ msgstr "-- проверка по метке --" msgid "-- match by uuid --" msgstr "-- проверка по uuid --" +msgid "-- please select --" +msgstr "-- сделайте выбор --" + msgid "1 Minute Load:" msgstr "Загрузка за 1 минуту:" @@ -58,7 +61,7 @@ msgid "15 Minute Load:" msgstr "Загрузка за 15 минут:" msgid "4-character hexadecimal ID" -msgstr "4-х значное шестнадцатеричное ID" +msgstr "4-х значный шестнадцатеричный ID" msgid "464XLAT (CLAT)" msgstr "464XLAT (CLAT)" @@ -67,7 +70,7 @@ msgid "5 Minute Load:" msgstr "Загрузка за 5 минут:" msgid "6-octet identifier as a hex string - no colons" -msgstr "6-октетный идентификатор в виде шестнадцатеричной строки-без двоеточий" +msgstr "6-октетный идентификатор в виде шестнадцатеричной строки без двоеточий" msgid "802.11r Fast Transition" msgstr "802.11r Быстрый Роуминг" @@ -107,34 +110,34 @@ msgid "ESSID" msgstr "ESSID" msgid "IPv4-Address" -msgstr "IPv4-Адрес" +msgstr "IPv4-адрес" msgid "IPv4-Gateway" -msgstr "IPv4-Шлюз" +msgstr "IPv4-шлюз" msgid "IPv4-Netmask" -msgstr "IPv4-Маска сети" +msgstr "IPv4-маска сети" msgid "" "IPv6-Address or Network " "(CIDR)" msgstr "" -"IPv6-Адрес или Сеть (CIDR)" +"IPv6-адрес или сеть (CIDR)" msgid "IPv6-Gateway" -msgstr "IPv6-Шлюз" +msgstr "IPv6-шлюз" msgid "IPv6-Suffix (hex)" -msgstr "IPv6-Суффикс (hex)" +msgstr "IPv6-суффикс (hex)" msgid "LED Configuration" msgstr "Настройка LED индикации" msgid "LED Name" -msgstr "LED Имя" +msgstr "Имя LED" msgid "MAC-Address" -msgstr "MAC-Адрес" +msgstr "MAC-адрес" msgid "DUID" msgstr "DUID" @@ -143,7 +146,7 @@ msgid "" "Max. DHCP leases" msgstr "" -"Макс. кол-во аренд
Макс. кол-во аренд DHCP аренды" msgid "" @@ -155,11 +158,7 @@ msgstr "" msgid "Max. concurrent queries" msgstr "" -"Макс. кол-во
одновременных
запросов" - -msgid "%s - %s" -msgstr "%s - %s" +"Макс. кол-во одновременных запросов" msgid "" "
Note: you need to manually restart the cron service if the crontab file " @@ -177,9 +176,6 @@ msgstr "A43C + J43 + A43 + V43" msgid "ADSL" msgstr "ADSL" -msgid "AICCU (SIXXS)" -msgstr "AICCU (SIXXS)" - msgid "ANSI T1.413" msgstr "ANSI T1.413" @@ -190,16 +186,16 @@ msgid "ARP retry threshold" msgstr "Порог повтора ARP" msgid "ATM (Asynchronous Transfer Mode)" -msgstr "ATM (Режим Асинхронной Передачи)" +msgstr "ATM (режим асинхронной передачи)" msgid "ATM Bridges" -msgstr "ATM Мосты" +msgstr "ATM мосты" msgid "ATM Virtual Channel Identifier (VCI)" -msgstr "ATM Идентификатор Виртуального Канала (VCI)" +msgstr "ATM идентификатор виртуального канала (VCI)" msgid "ATM Virtual Path Identifier (VPI)" -msgstr "ATM Идентификатор Виртуального Пути(VPI)" +msgstr "ATM идентификатор виртуального пути (VPI)" msgid "" "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual " @@ -214,10 +210,7 @@ msgid "ATM device number" msgstr "ATM номер устройства" msgid "ATU-C System Vendor ID" -msgstr "ATU-C System Vendor ID" - -msgid "AYIYA" -msgstr "AYIYA" +msgstr "ATU-C идентификатор производителя" msgid "Access Concentrator" msgstr "Концентратор доступа" @@ -228,14 +221,11 @@ msgstr "Точка доступа" msgid "Actions" msgstr "Действия" -msgid "Activate this network" -msgstr "Активировать эту сеть" - msgid "Active IPv4-Routes" -msgstr "Active IPv4-Маршруты" +msgstr "Active IPv4-маршруты" msgid "Active IPv6-Routes" -msgstr "Active IPv6-Маршруты" +msgstr "Active IPv6-маршруты" msgid "Active Connections" msgstr "Активные соединения" @@ -260,10 +250,10 @@ msgid "Add new interface..." msgstr "Добавить новый интерфейс" msgid "Additional Hosts files" -msgstr "Дополнительный
hosts файл" +msgstr "Дополнительный hosts файл" msgid "Additional servers file" -msgstr "Дополнительные
файлы серверов" +msgstr "Дополнительные файлы серверов" msgid "Address" msgstr "Адрес" @@ -278,11 +268,20 @@ msgid "Advanced Settings" msgstr "Дополнительные настройки" msgid "Aggregate Transmit Power(ACTATP)" -msgstr "Aggregate Transmit Power(ACTATP)" +msgstr "Aggregate Transmit Power (ACTATP)" msgid "Alert" msgstr "Тревога" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -290,18 +289,21 @@ msgstr "" "Выделять IP адреса последовательно, начинать с меньшего доступного адреса." msgid "Allocate IP sequentially" -msgstr "IP последовательно" +msgstr "Выделять IP-адреса последовательно" msgid "Allow SSH password authentication" msgstr "" "Разрешить SSH аутентификацию с помощью " "пароля." +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "Разрешить все, кроме перечисленных" msgid "Allow legacy 802.11b rates" -msgstr "Разрешить использование
стандарта 802.11b" +msgstr "Разрешить использование стандарта 802.11b" msgid "Allow listed only" msgstr "Разрешить только перечисленные" @@ -330,15 +332,13 @@ msgstr "" msgid "Allowed IPs" msgstr "Разрешенные IP-адреса" -msgid "" -"Also see Tunneling Comparison on SIXXS" -msgstr "" -"Также смотрите Tunneling Comparison on SIXXS" - msgid "Always announce default router" -msgstr "Объявлять всегда, как дефолтный маршрутизатор" +msgstr "Объявлять всегда, как маршрутизатор по умолчанию" + +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" +msgstr "" msgid "Annex" msgstr "Annex" @@ -417,11 +417,14 @@ msgstr "Настройка антенн" msgid "Any zone" msgstr "Любая зона" -msgid "Apply" -msgstr "Принять" +msgid "Apply request failed with status %h" +msgstr "Ошибка %h запроса на применение" -msgid "Applying changes" -msgstr "Применение изменений" +msgid "Apply unchecked" +msgstr "Применить без проверки" + +msgid "Architecture" +msgstr "Архитектура" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -441,6 +444,9 @@ msgstr "" msgid "Associated Stations" msgstr "Подключенные клиенты" +msgid "Associations" +msgstr "Ассоциации" + msgid "Auth Group" msgstr "Группа аутентификации" @@ -484,7 +490,7 @@ msgid "Automount Filesystem" msgstr "Hotplug раздела" msgid "Automount Swap" -msgstr "Hotplug swap-а" +msgstr "Hotplug swap раздела" msgid "Available" msgstr "Доступно" @@ -511,23 +517,23 @@ msgid "Back" msgstr "Назад" msgid "Back to Overview" -msgstr "Назад в меню" +msgstr "Назад к обзору" msgid "Back to configuration" -msgstr "Назад к настройке" +msgstr "Назад к настройкам" msgid "Back to overview" -msgstr "назад в меню" +msgstr "Назад к обзору" msgid "Back to scan results" msgstr "Назад к результатам поиска" +msgid "Backup" +msgstr "Резервное копирование" + msgid "Backup / Flash Firmware" msgstr "Резервное копирование / Перепрошивка" -msgid "Backup / Restore" -msgstr "Резервное копирование / Восстановление" - msgid "Backup file list" msgstr "Список файлов для резервного копирования" @@ -537,8 +543,8 @@ msgstr "Указан неправильный адрес!" msgid "Band" msgstr "Диапазон" -msgid "Behind NAT" -msgstr "За NAT-ом" +msgid "Beacon Interval" +msgstr "" msgid "" "Below is the determined list of files to backup. It consists of changed " @@ -601,6 +607,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "Загрузка ЦП (%)" +msgid "Call failed" +msgstr "Ошибка вызова" + msgid "Cancel" msgstr "Отменить" @@ -616,17 +625,27 @@ msgstr "Изменения" msgid "Changes applied." msgstr "Изменения приняты." +msgid "Changes have been reverted." +msgstr "Изменения были возвращены назад." + msgid "Changes the administrator password for accessing the device" msgstr "Изменить пароль администратора для доступа к устройству." msgid "Channel" msgstr "Канал" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" +"Канал %d не доступен в регуляторном домене %s и был автоматически изменен на " +"%d." + msgid "Check" msgstr "Проверить" msgid "Check filesystems before mount" -msgstr "Проверка" +msgstr "Проверка файловых систем перед монтированием" msgid "Check this option to delete the existing networks from this radio." msgstr "" @@ -642,7 +661,7 @@ msgid "" "fill out the create field to define a new zone and attach the " "interface to it." msgstr "" -"Укажите зону, которую вы хотите прикрепить к этому интерфейсу.
Выберите " +"Укажите зону, которую вы хотите прикрепить к этому интерфейсу. Выберите " "'не определено', чтобы удалить этот интерфейс из зоны, или " "заполните поле 'создать', чтобы определить новую зону и прикрепить " "к ней этот интерфейс." @@ -659,17 +678,14 @@ msgid "Cipher" msgstr "Алгоритм шифрования" msgid "Cisco UDP encapsulation" -msgstr "формирование пакетов данных Cisco UDP " +msgstr "Формирование пакетов данных Cisco UDP " msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" "Нажмите 'Создать архив', чтобы загрузить tar-архив текущих config файлов " -"прошивки устройства, таким образом вы сохраните его настройки. Для сброса " -"настроек прошивки к исходному состоянию нажмите 'Выполнить сброс' (возможно " -"только для squashfs-образов)." +"прошивки устройства, таким образом вы сохраните его настройки." msgid "Client" msgstr "Клиент" @@ -710,12 +726,18 @@ msgstr "" msgid "Configuration" msgstr "Настройка config файла" -msgid "Configuration applied." -msgstr "Изменение настроек config файлов." +msgid "Configuration failed" +msgstr "Ошибка конфигурации" msgid "Configuration files will be kept." msgstr "Config файлы будут сохранены." +msgid "Configuration has been applied." +msgstr "Конфигурация применена" + +msgid "Configuration has been rolled back!" +msgstr "Конфигурация возвращена назад!" + msgid "Confirmation" msgstr "Подтверждение пароля" @@ -728,12 +750,21 @@ msgstr "Подключен" msgid "Connection Limit" msgstr "Ограничение соединений" -msgid "Connection to server fails when TLS cannot be used" -msgstr "Связь с сервером прерывается, когда TLS не может быть использован" +msgid "Connection attempt failed" +msgstr "Ошибка попытки соединения" msgid "Connections" msgstr "Соединения" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" +"Не удалось восстановить доступ к устройству после применения конфигурации. " +"Возможно вам придется подключиться заново, если вы изменили сетевые " +"настройки, такие как IP-адрес или параметры доступа к беспроводной сети." + msgid "Country" msgstr "Страна" @@ -747,7 +778,7 @@ msgid "Cover the following interfaces" msgstr "Включить следующие интерфейсы" msgid "Create / Assign firewall-zone" -msgstr "Создать / назначить
зону сетевого экрана" +msgstr "Создать / назначить зону сетевого экрана" msgid "Create Interface" msgstr "Создать интерфейс" @@ -771,7 +802,7 @@ msgid "" "Custom feed definitions, e.g. private feeds. This file can be preserved in a " "sysupgrade." msgstr "" -"Custom-ные feed-ы - это пользовательские feed-ы. Этот файл может быть " +"Custom-ные feed-ы — это пользовательские feed-ы. Этот файл может быть " "сохранен при перепрошивке sysupgrade-совместимым образом." msgid "Custom feeds" @@ -781,16 +812,15 @@ msgid "" "Custom files (certificates, scripts) may remain on the system. To prevent " "this, perform a factory-reset first." msgstr "" +"Пользовательские файлы (сертификаты, скрипты) могут остаться в системе. " +"Чтобы этого не произошло, выполните сначала сброс к заводским настройкам." msgid "" "Customizes the behaviour of the device LEDs if possible." msgstr "" "Настройка поведения светодиодной индикации LEDs устройства, если это возможно." - -msgid "DHCP Leases" -msgstr "Аренды DHCP" +"abbr> устройства, если это возможно." msgid "DHCP Server" msgstr "DHCP-сервер" @@ -802,25 +832,22 @@ msgid "DHCP client" msgstr "DHCP-клиент" msgid "DHCP-Options" -msgstr "DHCP-Настройки" - -msgid "DHCPv6 Leases" -msgstr "Аренды DHCPv6" +msgstr "DHCP настройки" msgid "DHCPv6 client" msgstr "DHCPv6 клиент" msgid "DHCPv6-Mode" -msgstr "DHCPv6-Режим" +msgstr "DHCPv6 режим" msgid "DHCPv6-Service" -msgstr "DHCPv6-Сервис" +msgstr "DHCPv6 сервис" msgid "DNS" msgstr "DNS" msgid "DNS forwardings" -msgstr "Перенаправление
запросов DNS" +msgstr "Перенаправление запросов DNS" msgid "DNS-Label / FQDN" msgstr "DNS-Label / FQDN" @@ -846,6 +873,9 @@ msgstr "Состояние DSL" msgid "DSL line mode" msgstr "DSL линейный режим" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "DUID" @@ -862,10 +892,7 @@ msgid "Default gateway" msgstr "Шлюз по умолчанию" msgid "Default is stateless + stateful" -msgstr "Значение по умолчанию - 'stateless + stateful'." - -msgid "Default route" -msgstr "Маршрут по умолчанию" +msgstr "Значение по умолчанию — 'stateless + stateful'." msgid "Default state" msgstr "Начальное состояние" @@ -888,6 +915,9 @@ msgstr "Удалить" msgid "Delete this network" msgstr "Удалить эту сеть" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "Описание" @@ -906,9 +936,12 @@ msgstr "Настройка устройства" msgid "Device is rebooting..." msgstr "Перезагрузка..." -msgid "Device unreachable" +msgid "Device unreachable!" msgstr "Устройство недоступно" +msgid "Device unreachable! Still waiting for device..." +msgstr "Устройство недоступно! Ожидание устройства..." + msgid "Diagnostics" msgstr "Диагностика" @@ -934,15 +967,27 @@ msgstr "Отключить DNS настройки" msgid "Disable Encryption" msgstr "Отключить шифрование" +msgid "Disable this network" +msgstr "Отключить данную сеть" + msgid "Disabled" msgstr "Отключено" msgid "Disabled (default)" msgstr "Отключено (по умолчанию)" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "Отбрасывать ответы внешней сети RFC1918." +msgid "Disconnection attempt failed" +msgstr "Ошибка попытки отключения" + +msgid "Dismiss" +msgstr "Отклонить" + msgid "Displaying only packages containing" msgstr "Показываются только пакеты, содержащие" @@ -996,6 +1041,9 @@ msgstr "" "Не перенаправлять DNS-запросы " "без DNS-имени." +msgid "Down" +msgstr "Вниз" + msgid "Download and install package" msgstr "Загрузить и установить пакет" @@ -1006,13 +1054,13 @@ msgid "Downstream SNR offset" msgstr "SNR offset внутренней сети" msgid "Dropbear Instance" -msgstr "Исключение Dropbear" +msgstr "Экземпляр Dropbear" msgid "" "Dropbear offers SSH network shell access " "and an integrated SCP server" msgstr "" -"Dropbear - это SSH-сервер со встроенным " +"Dropbear — это SSH-сервер со встроенным " "SCP." msgid "Dual-Stack Lite (RFC6333)" @@ -1064,6 +1112,8 @@ msgid "" "Enable IGMP " "snooping" msgstr "" +"Включить IGMP " +"snooping" msgid "Enable STP" msgstr "Включить STP" @@ -1096,7 +1146,7 @@ msgid "Enable WPS pushbutton, requires WPA(2)-PSK" msgstr "Включить WPS при нажатии на кнопку, в режиме WPA(2)-PSK" msgid "Enable key reinstallation (KRACK) countermeasures" -msgstr "Включить защиту
от атаки KRACK" +msgstr "Включить защиту от атаки KRACK" msgid "Enable learning and aging" msgstr "Включить изучение и устаревание (learning/aging)" @@ -1111,7 +1161,10 @@ msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets." msgstr "Включите флаг DF (не Фрагментировать) инкапсулирующих пакетов." msgid "Enable this mount" -msgstr "Включить эту
точку монтирования" +msgstr "Включить эту точку монтирования" + +msgid "Enable this network" +msgstr "Включить данную сеть" msgid "Enable this swap" msgstr "Включить этот раздел подкачки" @@ -1123,7 +1176,7 @@ msgid "Enabled" msgstr "Включено" msgid "Enables IGMP snooping on this bridge" -msgstr "" +msgstr "Включает IGMP snooping на данном мосту" msgid "" "Enables fast roaming among access points that belong to the same Mobility " @@ -1147,6 +1200,12 @@ msgstr "Конечная точка Хоста" msgid "Endpoint Port" msgstr "Конечная точка Порта" +msgid "Enter custom value" +msgstr "Введите пользовательское значение" + +msgid "Enter custom values" +msgstr "Введите пользовательские значения" + msgid "Erasing..." msgstr "Стирание..." @@ -1187,13 +1246,13 @@ msgid "External R1 Key Holder List" msgstr "Внешний R0 Key Holder List" msgid "External system log server" -msgstr "Внешний сервер
системного журнала" +msgstr "Внешний сервер системного журнала" msgid "External system log server port" msgstr "Порт внешнего сервера системного журнала" msgid "External system log server protocol" -msgstr "Внешний протокол
лог-сервера" +msgstr "Внешний протокол лог-сервера" msgid "Extra SSH command options" msgstr "Дополнительные опции команды SSH" @@ -1207,6 +1266,10 @@ msgstr "FT над the Air" msgid "FT protocol" msgstr "FT протокол" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" +"Не удалось подтвердить применение в течении %d сек., ожидание отката..." + msgid "File" msgstr "Файл" @@ -1225,6 +1288,9 @@ msgstr "Фильтровать частные" msgid "Filter useless" msgstr "Фильтровать бесполезные" +msgid "Finalizing failed" +msgstr "Ошибка финализации" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1281,6 +1347,9 @@ msgstr "Прошивка..." msgid "Force" msgstr "Назначить" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "Назначить CCMP (AES)" @@ -1331,10 +1400,10 @@ msgstr "Свободное место" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" "Дополнительная информация о интерфейсах и партнерах WireGuard приведена в wireguard.io." +"href=\"http://wireguard.com\">wireguard.com." msgid "GHz" msgstr "ГГц" @@ -1345,6 +1414,9 @@ msgstr "Только GPRS" msgid "Gateway" msgstr "Шлюз" +msgid "Gateway address is invalid" +msgstr "Неверный адрес шлюза" + msgid "Gateway ports" msgstr "Порты шлюза" @@ -1403,10 +1475,7 @@ msgid "Hang Up" msgstr "Перезапустить" msgid "Header Error Code Errors (HEC)" -msgstr "Ошибки кода ошибки заголовка (HEC)" - -msgid "Heartbeat" -msgstr "Heartbeat" +msgstr "Ошибки контроля ошибок заголовка (HEC)" msgid "" "Here you can configure the basic aspects of your device like its hostname or " @@ -1422,9 +1491,6 @@ msgstr "" "Здесь вы можете добавить открытые SSH ключи (один ключ на строку) для SSH " "аутентификации." -msgid "Hermes 802.11b Wireless Controller" -msgstr "Беспроводной 802.11b контроллер Hermes" - msgid "Hide ESSID" msgstr "Скрыть ESSID" @@ -1440,6 +1506,9 @@ msgstr "Время ожидания хоста" msgid "Host-IP or Network" msgstr "IP-адрес или сеть" +msgid "Host-Uniq tag content" +msgstr "Содержимое Host-Uniq тега" + msgid "Hostname" msgstr "Имя хоста" @@ -1456,19 +1525,25 @@ msgid "IKE DH Group" msgstr "IKE DH Group" msgid "IP Addresses" -msgstr "IP-Адреса" +msgstr "IP-адреса" msgid "IP address" msgstr "IP-адрес" +msgid "IP address in invalid" +msgstr "Неверный IP-адрес" + +msgid "IP address is missing" +msgstr "IP-адрес не указан" + msgid "IPv4" msgstr "IPv4" msgid "IPv4 Firewall" msgstr "Межсетевой экран IPv4" -msgid "IPv4 WAN Status" -msgstr "Состояние IPv4 WAN" +msgid "IPv4 Upstream" +msgstr "Основной IPv4" msgid "IPv4 address" msgstr "IPv4-адрес" @@ -1480,7 +1555,7 @@ msgid "IPv4 assignment length" msgstr "IPv4 assignment length" msgid "IPv4 broadcast" -msgstr "Широковещательный
IPv4-адрес" +msgstr "Широковещательный IPv4-адрес" msgid "IPv4 gateway" msgstr "IPv4-адрес шлюза" @@ -1518,16 +1593,12 @@ msgstr "IPv6 Настройки" msgid "IPv6 ULA-Prefix" msgstr "IPv6 ULA-Prefix" -msgid "IPv6 WAN Status" -msgstr "Состояние IPv6 WAN" +msgid "IPv6 Upstream" +msgstr "Основной IPv6" msgid "IPv6 address" msgstr "IPv6-адрес" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" -"IPv6-адрес, делегированный локальной конечной точке туннеля (необязательно)." - msgid "IPv6 assignment hint" msgstr "IPv6 подсказка присвоения" @@ -1571,23 +1642,23 @@ msgid "Identity" msgstr "Идентификация EAP" msgid "If checked, 1DES is enabled" -msgstr "Если выбрано, что 1DES включено" +msgstr "Если выбрано, то 1DES включено" msgid "If checked, encryption is disabled" -msgstr "Если проверено, что шифрование выключено" +msgstr "Если выбрано, то шифрование выключено" msgid "" "If specified, mount the device by its UUID instead of a fixed device node" msgstr "" -"Если выбрано монтировать устройство используя его UUID, вместо " -"фиксированного файла устройства." +"Если выбрано, монтировать устройство используя его UUID, а не фиксированный " +"файл устройства." msgid "" "If specified, mount the device by the partition label instead of a fixed " "device node" msgstr "" -"Если выбрано монтировать устройство используя название его раздела, вместо " -"фиксированного файла устройства." +"Если выбрано, монтировать устройство используя название его раздела, а не " +"фиксированный файл устройства." msgid "If unchecked, no default route is configured" msgstr "Если не выбрано, то маршрут по умолчанию не настраивается." @@ -1604,19 +1675,19 @@ msgid "" msgstr "" "Если физической памяти не достаточно, то неиспользуемые данные могут быть " "временно перемещены в раздел подкачки, что в свою очередь приведет к " -"увеличению объёму свободной RAM." -"
Однако, перемещение в файл - это достаточно долгий процесс, так как " +"увеличению объёму свободной RAM. " +"Однако, перемещение в файл — это достаточно долгий процесс, так как " "устройство, на котором располагается раздел подкачки, работает гораздо " "медленнее, чем RAM." msgid "Ignore /etc/hosts" -msgstr "Игнорировать
/etc/hosts" +msgstr "Игнорировать /etc/hosts" msgid "Ignore interface" msgstr "Игнорировать интерфейс" msgid "Ignore resolve file" -msgstr "Игнорировать
файл resolv" +msgstr "Игнорировать файл resolv" msgid "Image" msgstr "Образ" @@ -1641,6 +1712,9 @@ msgstr "Входящий:" msgid "Info" msgstr "Информация" +msgid "Initialization failure" +msgstr "Ошибка инициализации" + msgid "Initscript" msgstr "Скрипт инициализации" @@ -1677,21 +1751,12 @@ msgstr "Список интерфейсов" msgid "Interface is reconnecting..." msgstr "Интерфейс переподключается..." -msgid "Interface is shutting down..." -msgstr "Интерфейс отключается..." - msgid "Interface name" msgstr "Имя интерфейса" msgid "Interface not present or not connected yet." msgstr "Интерфейс не существует или пока не подключен." -msgid "Interface reconnected" -msgstr "Интерфейс переподключен" - -msgid "Interface shut down" -msgstr "Интерфейс отключен" - msgid "Interfaces" msgstr "Интерфейсы" @@ -1726,7 +1791,7 @@ msgstr "" "не помещается в чип флэш-памяти, проверьте ваш файл прошивки!" msgid "JavaScript required!" -msgstr "Требуется Java скрипт!" +msgstr "Требуется JavaScript!" msgid "Join Network" msgstr "Подключение к сети" @@ -1895,8 +1960,11 @@ msgstr "Средняя загрузка" msgid "Loading" msgstr "Загрузка" +msgid "Local IP address is invalid" +msgstr "Неверный локальный IP-адрес" + msgid "Local IP address to assign" -msgstr "Присвоение локального IP адреса" +msgstr "Присвоение локального IP-адреса" msgid "Local IPv4 address" msgstr "Локальный IPv4-адрес" @@ -1921,8 +1989,8 @@ msgid "" "and are resolved from DHCP or hosts files only" msgstr "" "Согласно требованиям, имена соответствующие этому домену, никогда не " -"передаются.
И разрешаются только из файла DHCP(/etc/config/dhcp) или " -"файла хостов (/etc/hosts)." +"передаются. И разрешаются только из файла DHCP (/etc/config/dhcp) или файла " +"хостов (/etc/hosts)." msgid "Local domain suffix appended to DHCP names and hosts file entries" msgstr "" @@ -1966,6 +2034,9 @@ msgstr "Потеря сигнала в секундах (LOSS)" msgid "Lowest leased address as offset from the network address." msgstr "Минимальный адрес аренды." +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "MAC-адрес" @@ -1981,6 +2052,9 @@ msgstr "Список MAC" msgid "MAP / LW4over6" msgstr "MAP / LW4over6" +msgid "MAP rule is invalid" +msgstr "Неверное MAP правило" + msgid "MB/s" msgstr "МБ/с" @@ -1997,8 +2071,8 @@ msgid "" "Make sure to clone the root filesystem using something like the commands " "below:" msgstr "" -"Прежде чем перенести корень на внешний носитель, используйте команды " -"приведенные ниже:" +"Прежде чем перенести корневую файловую систему на внешний носитель, " +"используйте команды приведенные ниже:" msgid "Manual" msgstr "Вручную" @@ -2064,6 +2138,9 @@ msgstr "Модель" msgid "Modem device" msgstr "Модем" +msgid "Modem information query failed" +msgstr "Ошибка запроса информации о модеме" + msgid "Modem init timeout" msgstr "Время ожидания инициализации модема" @@ -2080,10 +2157,10 @@ msgid "Mount Points" msgstr "Монтирование разделов" msgid "Mount Points - Mount Entry" -msgstr "Точки монтирования - Настройка разделов" +msgstr "Точки монтирования — Настройка разделов" msgid "Mount Points - Swap Entry" -msgstr "Точки монтирования - Настройка Swap" +msgstr "Точки монтирования — Настройка Swap" msgid "" "Mount Points define at which point a memory device will be attached to the " @@ -2137,9 +2214,6 @@ msgstr "NT домен" msgid "NTP server candidates" msgstr "Список NTP-серверов" -msgid "NTP sync time-out" -msgstr "NTP синхронизация времени ожидания" - msgid "Name" msgstr "Имя" @@ -2164,6 +2238,9 @@ msgstr "Сетевые утилиты" msgid "Network boot image" msgstr "Образ системы для сетевой загрузки" +msgid "Network device is not present" +msgstr "Нет сетевого устройства" + msgid "Network without interfaces." msgstr "Сеть без интерфейсов." @@ -2174,7 +2251,7 @@ msgid "No DHCP Server configured for this interface" msgstr "DHCP-сервер не настроен для этого интерфейса" msgid "No NAT-T" -msgstr "не NAT-T" +msgstr "Без NAT-T" msgid "No chains in this table" msgstr "Нет цепочек в этой таблице" @@ -2185,8 +2262,11 @@ msgstr "Файлы не найдены" msgid "No information available" msgstr "Нет доступной информации" +msgid "No matching prefix delegation" +msgstr "Отсутствует соответствующая делегация префикса" + msgid "No negative cache" -msgstr "Отключить кэш
отрицательных ответов" +msgstr "Отключить кэш отрицательных ответов" msgid "No network configured on this device" msgstr "Не настроена сеть на устройстве" @@ -2203,6 +2283,9 @@ msgstr "Пароль не установлен!" msgid "No rules in this chain" msgstr "Нет правил в данной цепочке" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "Зона не присвоена" @@ -2237,7 +2320,7 @@ msgid "Not connected" msgstr "Не подключено" msgid "Note: Configuration files will be erased." -msgstr "Примечание: config файлы будут удалены." +msgstr "Внимание: config файлы будут удалены." msgid "Note: interface name length" msgstr "Внимание: длина имени интерфейса" @@ -2250,6 +2333,8 @@ msgstr "DNS-запрос" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" msgstr "" +"Количество кэшированных DNS записей (максимум — 10000, 0 — отключить " +"кэширование)" msgid "OK" msgstr "OK" @@ -2263,6 +2348,9 @@ msgstr "Obfuscated Group Password" msgid "Obfuscated Password" msgstr "Obfuscated Password" +msgid "Obtain IPv6-Address" +msgstr "Получение IPv6-адреса" + msgid "Off-State Delay" msgstr "Задержка выключенного состояния" @@ -2274,9 +2362,9 @@ msgid "" "INTERFACE.VLANNR (e.g.: " "eth0.1)." msgstr "" -"На этой странице вы можете настроить сетевые интерфейсы.
Вы можете " +"На этой странице вы можете настроить сетевые интерфейсы. Вы можете " "объединить несколько интерфейсов в мост, выбрав опцию 'Объединить в мост' и " -"введя список интерфейсов, разделенных пробелами.
Вы также можете " +"введя список интерфейсов, разделенных пробелами. Вы также можете " "использовать VLAN-" "обозначения вида ИНТЕРФЕЙС.НОМЕРVLAN (напр.: eth0.1)." @@ -2314,16 +2402,6 @@ msgstr "Опция удалена" msgid "Optional" msgstr "Необязательно" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" -"Необязательно. Укажите, чтобы переопределить дефолтный сервер (tic.sixxs." -"net)." - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" -"Необязательно. Используется, когда учетная запись SIXXS имеет более одного " -"туннеля." - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2338,9 +2416,9 @@ msgid "" "for the interface." msgstr "" "Необязательно. Допустимые значения: 'eui64', 'random', фиксированное " -"значение например '::1' или '::1:2'.
Когда IPv6 префикс такой как - ('a:" -"b:c:d::'), используйте суффикс на вроде ('::1') для этого IPv6 адреса ('a:b:" -"c:d::1') для этого интерфейса." +"значение например '::1' или '::1:2'. Когда IPv6 префикс такой как — ('a:b:c:" +"d::'), используйте суффикс на вроде ('::1') для этого IPv6 адреса ('a:b:c:" +"d::1') для этого интерфейса." msgid "" "Optional. Base64-encoded preshared key. Adds in an additional layer of " @@ -2353,6 +2431,9 @@ msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" "Необязательно. Создавать маршруты для разрешенных IP адресов для этого узла." +msgid "Optional. Description of peer." +msgstr "Необязательно. Описание узла." + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2421,7 +2502,7 @@ msgid "Override the table used for internal routes" msgstr "Назначить таблицу внутренних маршрутов" msgid "Overview" -msgstr "Главное меню" +msgstr "Обзор" msgid "Owner" msgstr "Пользователь" @@ -2438,6 +2519,9 @@ msgstr "PID" msgid "PIN" msgstr "PIN" +msgid "PIN code rejected" +msgstr "PIN код отвергнут" + msgid "PMK R1 Push" msgstr "PMK R1 Push" @@ -2525,6 +2609,9 @@ msgstr "Пиковая:" msgid "Peer IP address to assign" msgstr "Запрос IP адреса назначения" +msgid "Peer address is missing" +msgstr "Отсутствует адрес пира" + msgid "Peers" msgstr "Пиры" @@ -2550,7 +2637,7 @@ msgid "Ping" msgstr "Пинг-запрос" msgid "Pkts." -msgstr "Пакетов." +msgstr "Пакетов" msgid "Please enter your username and password." msgstr "Введите логин и пароль." @@ -2595,9 +2682,6 @@ msgstr "Запретить прослушивание этих интерфей msgid "Prevents client-to-client communication" msgstr "Не позволяет клиентам обмениваться друг с другом информацией." -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "Беспроводной 802.11b контроллер Prism2/2.5/3" - msgid "Private Key" msgstr "Приватный ключ" @@ -2648,6 +2732,11 @@ msgstr "QMI сотовый" msgid "Quality" msgstr "Качество" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "R0 Key время жизни" @@ -2666,9 +2755,6 @@ msgstr "Получение (RX)" msgid "RX Rate" msgstr "Скорость получения" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "Беспроводной 802.11%s контроллер RaLink" - msgid "Radius-Accounting-Port" msgstr "Порт Radius-Accounting" @@ -2687,6 +2773,11 @@ msgstr "Секрет Radius-Authentication" msgid "Radius-Authentication-Server" msgstr "Сервер Radius-Authentication" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" +"Строка в шестнадцатеричном коде. Оставьте пустой, если ваш провайдер не " +"требует этого" + msgid "" "Read /etc/ethers to configure the DHCP-Server" @@ -2695,15 +2786,15 @@ msgstr "" "динамической настройки узла\">DHCP-сервера." msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" -"Действительно удалить этот интерфейс? Удаление не может быть отменено!\\nВы " -"можете потерять доступ к этому устройству, если вы подключены через этот " +"Действительно удалить этот интерфейс? Удаление не может быть отменено! Вы " +"можете потерять доступ к этому устройству, если вы подключены через данный " "интерфейс." msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" "Действительно удалить эту беспроводную сеть? Удаление не может быть отменено!" @@ -2713,20 +2804,6 @@ msgstr "" msgid "Really reset all changes?" msgstr "Действительно сбросить все изменения?" -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" -"Действительно отключить сеть? Вы можете потерять доступ к этому устройству, " -"если вы подключены через этот интерфейс." - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" -"Действительно отключить интерфейс \"%s\" ?\\nВы можете потерять доступ к " -"этому устройству, если вы подключены через этот интерфейс." - msgid "Really switch protocol?" msgstr "Вы действительно хотите изменить протокол?" @@ -2773,9 +2850,6 @@ msgstr "Рекомендуемый. IP адреса интерфейса WireGua msgid "Reconnect this interface" msgstr "Переподключить этот интерфейс" -msgid "Reconnecting interface" -msgstr "Интерфейс переподключается" - msgid "References" msgstr "Ссылки" @@ -2815,9 +2889,6 @@ msgstr "Запрос IPv6 адреса" msgid "Request IPv6-prefix of length" msgstr "Запрос IPv6 префикс длины" -msgid "Require TLS" -msgstr "Требовать TLS" - msgid "Required" msgstr "Требовать" @@ -2852,7 +2923,7 @@ msgid "" "come from unsigned domains" msgstr "" "Требуется поддержка внешней сетью DNSSEC; убедитесь, что ответы " -"неподписанного домена - действительно поступают от неподписанных доменов." +"неподписанного домена — действительно поступают от неподписанных доменов." msgid "Reset" msgstr "Сбросить" @@ -2875,6 +2946,12 @@ msgstr "Перезапустить" msgid "Restart Firewall" msgstr "Перезапустить межсетевой экран" +msgid "Restart radio interface" +msgstr "Перезапустить радио-интерфейс" + +msgid "Restore" +msgstr "Восстановление" + msgid "Restore backup" msgstr "Восстановить резервную копию" @@ -2884,6 +2961,15 @@ msgstr "Показать/скрыть пароль" msgid "Revert" msgstr "Вернуть" +msgid "Revert changes" +msgstr "Вернуть изменения" + +msgid "Revert request failed with status %h" +msgstr "Ошибка %h отмены конфигурации" + +msgid "Reverting configuration…" +msgstr "Отмена конфигурации..." + msgid "Root" msgstr "Корень" @@ -2899,11 +2985,8 @@ msgstr "Маршрут разрешенный для IP адресов" msgid "Route type" msgstr "Тип маршрута" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "Префикс маршрутизации IPv6 для интерфейсов внутренней сети" - msgid "Router Advertisement-Service" -msgstr "Доступные
режимы работы" +msgstr "Доступные режимы работы" msgid "Router Password" msgstr "Пароль маршрутизатора" @@ -2927,16 +3010,6 @@ msgstr "Проверить" msgid "SHA256" msgstr "SHA256" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" -"SIXXS поддерживает только TIC, для статических туннелей с использованием IP-" -"протокола 41 (RFC4213) используется вместо 6in4." - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "SIXXS-управление[/Туннель-ID]" - msgid "SNR" msgstr "SNR" @@ -2964,12 +3037,12 @@ msgstr "Сохранить" msgid "Save & Apply" msgstr "Сохранить и применить" -msgid "Save & Apply" -msgstr "Сохранить и применить" - msgid "Scan" msgstr "Поиск" +msgid "Scan request failed" +msgstr "" + msgid "Scheduled Tasks" msgstr "Запланированные задания" @@ -2995,19 +3068,6 @@ msgstr "Разделять клиентов" msgid "Server Settings" msgstr "Настройки сервера" -msgid "Server password" -msgstr "Пароль доступа к серверу" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" -"Пароль сервера. Введите пароль из тоннеля, когда имя пользователя содержит " -"ID туннеля." - -msgid "Server username" -msgstr "Логин доступа к серверу" - msgid "Service Name" msgstr "Имя службы" @@ -3026,6 +3086,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "Настройка синхронизации времени" +msgid "Setting PLMN failed" +msgstr "Ошибка установки PLMN" + +msgid "Setting operation mode failed" +msgstr "Ошибка установки режима работы" + msgid "Setup DHCP Server" msgstr "Настроить сервер DHCP" @@ -3035,15 +3101,15 @@ msgstr "Секунды с большим числом ошибок (SES)." msgid "Short GI" msgstr "Short GI" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" -msgstr "Показать текущий список
файлов резервной копии" +msgstr "Показать текущий список файлов резервной копии" msgid "Shutdown this interface" msgstr "Выключить этот интерфейс" -msgid "Shutdown this network" -msgstr "Выключить эту сеть" - msgid "Signal" msgstr "Сигнал" @@ -3060,7 +3126,7 @@ msgid "Size (.ipk)" msgstr "Размер (.ipk)" msgid "Size of DNS query cache" -msgstr "" +msgstr "Размер кэша DNS запроса" msgid "Skip" msgstr "Пропустить" @@ -3098,15 +3164,9 @@ msgstr "" "должна быть установлена вручную. Обратитесь к wiki для получения конкретных " "инструкций для вашего устройства." -msgid "Sort" -msgstr "Сортировка" - msgid "Source" msgstr "Источник" -msgid "Source routing" -msgstr "маршрутизация от источника" - msgid "Specifies the directory the device is attached to" msgstr "Папка, к которой монтируется раздел устройства." @@ -3152,6 +3212,12 @@ msgstr "Старт" msgid "Start priority" msgstr "Приоритет" +msgid "Starting configuration apply…" +msgstr "Применение конфигурации..." + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "Загрузка" @@ -3176,7 +3242,7 @@ msgid "" "configurations where only hosts with a corresponding lease are served." msgstr "" "Постоянная аренда используется для присвоения фиксированных IP-адресов и " -"имён DHCP-клиентам.
Постоянная аренда также необходима для статических " +"имён DHCP-клиентам. Постоянная аренда также необходима для статических " "интерфейсов, в которых обслуживаются только клиенты с присвоенными адресами." msgid "Status" @@ -3215,7 +3281,7 @@ msgstr "Коммутатор %q (%s)" msgid "" "Switch %q has an unknown topology - the VLAN settings might not be accurate." msgstr "" -"Коммутатор %q имеет неизвестную топологию-настройки VLAN не могут быть " +"Коммутатор %q имеет неизвестную топологию — настройки VLAN не могут быть " "точными." msgid "Switch Port Mask" @@ -3282,9 +3348,8 @@ msgstr "" "Вкладка меню 'Настройка устройства' содержит физические настройки " "радиооборудования, такие как канал, мощность передачи или выбор антенны, " "которые совместно используются всеми настроенными беспроводными сетями (если " -"радиооборудование поддерживает несколько SSID).
Параметры сети, такие " -"как шифрование или режим работы, смотрите на вкладке 'Настройка сети'." +"радиооборудование поддерживает несколько SSID). Параметры сети, такие как " +"шифрование или режим работы, смотрите на вкладке 'Настройка сети'." msgid "" "The libiwinfo-lua package is not installed. You must install this " @@ -3316,9 +3381,28 @@ msgstr "" "Допустимые символы: A-Z, a-z, 0-9 и " "_" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "Архив резервной копии не является правильным gzip файлом." + msgid "The configuration file could not be loaded due to the following error:" msgstr "Не удалось загрузить config файл из-за следующей ошибки:" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" +"Устройство недоступно в течение %d секунд после применения изменений. Это " +"привело к откату конфигурации из соображений безопасности. Если вы считаете, " +"что конфигурация верна, выполните настройку без проверки. Кроме того, вы " +"можете отклонить это предупреждение и отредактировать изменения перед " +"попыткой применить конфигурацию снова или отктить все изменения чтобы " +"сохранить рабочее состояние конфигурации." + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3343,9 +3427,6 @@ msgstr "" "удостовериться в целостности данных.
Нажмите 'Продолжить', чтобы " "начать процедуру обновления прошивки." -msgid "The following changes have been committed" -msgstr "Ваши настройки были применены." - msgid "The following changes have been reverted" msgstr "Ваши настройки были отвергнуты." @@ -3384,11 +3465,11 @@ msgid "" msgstr "" "Сетевые порты этого устройства могут быть объединены в несколько VLANов, в которых компьютеры могут " -"связываться напрямую между собой.
VLANы часто используются для разделения нескольких сетевых " -"сегментов.
Обычно по умолчанию используется один порт для подключения к " +"связываться напрямую между собой. VLANы часто используются для разделения нескольких сетевых " +"сегментов. Обычно по умолчанию используется один порт для подключения к " "внешней сети, например к Интернету и другие порты предназначенные для " -"внутренней - локальной сети." +"внутренней — локальной сети." msgid "The selected protocol needs a device assigned" msgstr "Для выбранного протокола необходимо задать устройство" @@ -3412,13 +3493,6 @@ msgstr "" "потребуется обновить адрес компьютера, чтобы снова подключится к устройству, " "в зависимости от настроек." -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" -"Конечная точка туннеля находится за NAT, по умолчанию отключена и " -"применяется только к AYIYA." - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3429,8 +3503,8 @@ msgstr "" msgid "There are no active leases." msgstr "Нет активных арендованных адресов." -msgid "There are no pending changes to apply!" -msgstr "Нет изменений, которые можно применить!" +msgid "There are no changes to apply." +msgstr "Нет изменений для применения." msgid "There are no pending changes to revert!" msgstr "Нет изменений, которые можно отменить!" @@ -3470,8 +3544,8 @@ msgid "" "configurations are automatically preserved." msgstr "" "Настройка данного config файла, позволит пользователю создать резервную " -"копию своих настроек.
Копируются config файлы из папки /etc/config и " -"некоторые другие.
При перепрошивке устройства sysupgrade-совместимым " +"копию своих настроек. Копируются config файлы из папки /etc/config и " +"некоторые другие. При перепрошивке устройства sysupgrade-совместимым " "образом, вы сможете воспользоваться резервной копией своих настроек." msgid "" @@ -3512,8 +3586,8 @@ msgstr "" msgid "This is the system crontab in which scheduled tasks can be defined." msgstr "" -"На странице содержимое /etc/crontabs/root - файла (задания crontab), здесь " -"вы можете запланировать ваши задания. " +"Содержимое файла /etc/crontabs/root (задания crontab). Здесь вы можете " +"запланировать ваши задания." msgid "" "This is usually the address of the nearest PoP operated by the tunnel broker" @@ -3542,10 +3616,13 @@ msgstr "Часовой пояс" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" "Чтобы восстановить config файлы, ваши настройки прошивки устройства, вы " -"можете загрузить ранее созданный вами архив здесь." +"можете загрузить ранее созданный вами архив здесь. Для сброса настроек " +"прошивки к исходному состоянию нажмите 'Выполнить сброс' (возможно только " +"для squashfs-образов)." msgid "Tone" msgstr "Тон" @@ -3589,15 +3666,6 @@ msgstr "Интерфейс туннеля" msgid "Tunnel Link" msgstr "Ссылка на туннель" -msgid "Tunnel broker protocol" -msgstr "Протокол посредника туннеля" - -msgid "Tunnel setup server" -msgstr "Сервер настройки туннеля" - -msgid "Tunnel type" -msgstr "Тип туннеля" - msgid "Tx-Power" msgstr "Мощность передатчика" @@ -3622,9 +3690,27 @@ msgstr "USB порты" msgid "UUID" msgstr "UUID" +msgid "Unable to determine device name" +msgstr "Невозможно определить имя устройства" + +msgid "Unable to determine external IP address" +msgstr "Невозможно определить внешний IP-адрес" + +msgid "Unable to determine upstream interface" +msgstr "Невозможно определить основной интерфейс" + msgid "Unable to dispatch" msgstr "Невозможно обработать запрос для" +msgid "Unable to obtain client ID" +msgstr "Невозможно получить идентификатор клиента" + +msgid "Unable to resolve AFTR host name" +msgstr "Не удалось разрешить AFTR имя хоста" + +msgid "Unable to resolve peer host name" +msgstr "Не удалось разрешить имя хоста пира" + msgid "Unavailable Seconds (UAS)" msgstr "Секунды неготовности (UAS)" @@ -3634,6 +3720,9 @@ msgstr "Неизвестно" msgid "Unknown Error, password not changed!" msgstr "Неизвестная ошибка, пароль не был изменен!" +msgid "Unknown error (%s)" +msgstr "Неизвестная ошибка (%s)" + msgid "Unmanaged" msgstr "Неуправляемый" @@ -3643,9 +3732,18 @@ msgstr "Отмонтировать" msgid "Unsaved Changes" msgstr "Непринятые изменения" +msgid "Unsupported MAP type" +msgstr "Неподдерживаемый тип MAP" + +msgid "Unsupported modem" +msgstr "Неподдерживаемый модем" + msgid "Unsupported protocol type." msgstr "Неподдерживаемый тип протокола." +msgid "Up" +msgstr "Вверх" + msgid "Update lists" msgstr "Обновить списки" @@ -3656,7 +3754,7 @@ msgid "" msgstr "" "Загрузите sysupgrade-совместимый образ, чтобы заменить текущую прошивку " "устройства. Поставьте галочку 'Сохранить настройки', чтобы сохранить текущие " -"config файлы - ваши настройки устройства (требуется совместимый образ " +"config файлы — ваши настройки устройства (требуется совместимый образ " "прошивки)." msgid "Upload archive..." @@ -3669,7 +3767,7 @@ msgid "Uptime" msgstr "Время работы" msgid "Use /etc/ethers" -msgstr "Использовать
/etc/ethers" +msgstr "Использовать /etc/ethers" msgid "Use DHCP gateway" msgstr "Использовать шлюз DHCP" @@ -3696,7 +3794,7 @@ msgid "Use broadcast flag" msgstr "Использовать широковещательный флаг" msgid "Use builtin IPv6-management" -msgstr "Использовать встроенный
IPv6-менеджмент" +msgstr "Использовать встроенный IPv6-менеджмент" msgid "Use custom DNS servers" msgstr "Использовать собственные DNS сервера" @@ -3705,7 +3803,7 @@ msgid "Use default gateway" msgstr "Использовать шлюз по умолчанию" msgid "Use gateway metric" -msgstr "Использовать
метрику шлюза" +msgstr "Использовать метрику шлюза" msgid "Use routing table" msgstr "Использовать таблицу маршрутизации" @@ -3718,10 +3816,10 @@ msgid "" "standard host-specific lease time, e.g. 12h, 3d or infinite." msgstr "" "Нажмите кнопку 'Добавить', чтобы добавить новую запись аренды. " -"'MAC-Адрес' идентифицирует хост, 'IPv4-Адрес' указывает " +"'MAC-адрес' идентифицирует хост, 'IPv4-адрес' указывает " "фиксированный адрес, а 'Имя хоста' присваивается в качестве " -"символьного имени для запрашивающего хоста.
Необязательно 'Время " -"аренды адреса' может быть использовано для того, чтобы установить " +"символьного имени для запрашивающего хоста. Необязательно 'Время аренды " +"адреса' может быть использовано для того, чтобы установить " "индивидуальное время аренды, например 12h, 3d или бесконечное." msgid "Used" @@ -3783,18 +3881,15 @@ msgid "Vendor Class to send when requesting DHCP" msgstr "" "Класс производителя (Vendor class), который отправлять при DHCP-запросах" -msgid "Verbose" -msgstr "Verbose" - -msgid "Verbose logging by aiccu daemon" -msgstr "Verbose ведение журнала демоном aiccu" - msgid "Verify" msgstr "Проверить" msgid "Version" msgstr "Версия" +msgid "Virtual dynamic interface" +msgstr "Виртуальный динамический винтерфейс" + msgid "WDS" msgstr "WDS" @@ -3820,18 +3915,15 @@ msgstr "" "Необходимо установить wpa_supplicant (режим клиента) или hostapd (режим " "точки доступа или ad-hoc) для поддержки шифрования WPA." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" -"Задать время ожидания синхронизации NTP, установка значения - '0', отключает " -"ожидание (необязательно)." - msgid "Waiting for changes to be applied..." msgstr "Ожидание применения изменений..." msgid "Waiting for command to complete..." msgstr "Ожидание завершения выполнения команды..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "Ожидание применения конфигурации... %d сек." + msgid "Waiting for device..." msgstr "Ожидание подключения устройства..." @@ -3840,7 +3932,7 @@ msgstr "Внимание" msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" -"Внимание: Есть не сохраненные изменения, которые будут потеряны при " +"Предупреждение: Есть не сохраненные изменения, которые будут потеряны при " "перезагрузке!" msgid "" @@ -3848,12 +3940,6 @@ msgid "" "communications" msgstr "При использовании PSK, PMK может быть создан локально, без AP в связи." -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "Создание маршрута по умолчанию IPv6 через туннель." - -msgid "Whether to route only packets from delegated prefixes" -msgstr "Маршрутизация только пакетов из делегированных префиксов." - msgid "Width" msgstr "Ширина" @@ -3875,8 +3961,11 @@ msgstr "Список беспроводных сетей" msgid "Wireless Security" msgstr "Безопасность беспроводной сети" -msgid "Wireless is disabled or not associated" -msgstr "Беспроводная сеть отключена или не связана " +msgid "Wireless is disabled" +msgstr "Беспроводная сеть отключена" + +msgid "Wireless is not associated" +msgstr "Беспроводная сеть не связана" msgid "Wireless is restarting..." msgstr "Беспроводная сеть перезапускается..." @@ -3885,13 +3974,7 @@ msgid "Wireless network is disabled" msgstr "Беспроводная сеть отключена" msgid "Wireless network is enabled" -msgstr "Беспроводная
сеть включена" - -msgid "Wireless restarted" -msgstr "Беспроводная сеть перезапущена" - -msgid "Wireless shut down" -msgstr "Выключение беспроводной сети" +msgstr "Беспроводная сеть включена" msgid "Write received DNS requests to syslog" msgstr "Записывать полученные DNS-запросы в системный журнал." @@ -3905,9 +3988,9 @@ msgid "" "scripts like \"network\", your device might become inaccessible!" msgstr "" "Здесь вы можете включить или выключить установленные скрипты инициализации. " -"Изменения вступят в силу после перезагрузки устройства.
Внимание: если вы выключите один из основных скриптов инициализации " -"(например 'network'), ваше устройство может оказаться недоступным!" +"Изменения вступят в силу после перезагрузки устройства. Внимание: " +"если вы выключите один из основных скриптов инициализации (например " +"'network'), ваше устройство может оказаться недоступным!" msgid "" "You must enable JavaScript in your browser or LuCI will not work properly." @@ -3936,6 +4019,9 @@ msgstr "baseT" msgid "bridged" msgstr "соед. мостом" +msgid "create" +msgstr "создать" + msgid "create:" msgstr "создать:" @@ -3943,10 +4029,10 @@ msgid "creates a bridge over specified interface(s)" msgstr "Создаёт мост для выбранных сетевых интерфейсов." msgid "dB" -msgstr "dB" +msgstr "дБ" msgid "dBm" -msgstr "dBm" +msgstr "дБм" msgid "disable" msgstr "отключить" @@ -3973,9 +4059,6 @@ msgstr "полный дуплекс" msgid "half-duplex" msgstr "полудуплекс" -msgid "help" -msgstr "помощь" - msgid "hidden" msgstr "скрытый" @@ -3989,23 +4072,23 @@ msgid "input" msgstr "ввод" msgid "kB" -msgstr "kB" +msgstr "кБ" msgid "kB/s" -msgstr "kB/s" +msgstr "кБ/с" msgid "kbit/s" -msgstr "kbit/s" +msgstr "кбит/с" msgid "local DNS file" msgstr "Локальный DNS-файл." -msgid "minimum 1280, maximum 1480" -msgstr "минимум 1280, максимум 1480" - msgid "minutes" msgstr "минут(ы)" +msgid "mixed WPA/WPA2" +msgstr "" + msgid "no" msgstr "нет" @@ -4027,6 +4110,9 @@ msgstr "включено" msgid "open" msgstr "открыть" +msgid "output" +msgstr "вывод" + msgid "overlay" msgstr "overlay" @@ -4077,3 +4163,79 @@ msgstr "да" msgid "« Back" msgstr "« Назад" + +#~ msgid "%s - %s" +#~ msgstr "%s - %s" + +#~ msgid "Activate this network" +#~ msgstr "Активировать эту сеть" + +#~ msgid "Hermes 802.11b Wireless Controller" +#~ msgstr "Беспроводной 802.11b контроллер Hermes" + +#~ msgid "Interface is shutting down..." +#~ msgstr "Интерфейс отключается..." + +#~ msgid "Interface reconnected" +#~ msgstr "Интерфейс переподключен" + +#~ msgid "Interface shut down" +#~ msgstr "Интерфейс отключен" + +#~ msgid "Prism2/2.5/3 802.11b Wireless Controller" +#~ msgstr "Беспроводной 802.11b контроллер Prism2/2.5/3" + +#~ msgid "RaLink 802.11%s Wireless Controller" +#~ msgstr "Беспроводной 802.11%s контроллер RaLink" + +#~ msgid "" +#~ "Really shutdown interface \"%s\"? You might lose access to this device if " +#~ "you are connected via this interface." +#~ msgstr "" +#~ "Действительно отключить интерфейс \"%s\"? Вы можете потерять доступ к " +#~ "этому устройству, если вы подключены через этот интерфейс." + +#~ msgid "Reconnecting interface" +#~ msgstr "Интерфейс переподключается" + +#~ msgid "Shutdown this network" +#~ msgstr "Выключить эту сеть" + +#~ msgid "Wireless restarted" +#~ msgstr "Беспроводная сеть перезапущена" + +#~ msgid "Wireless shut down" +#~ msgstr "Выключение беспроводной сети" + +#~ msgid "DHCP Leases" +#~ msgstr "Аренды DHCP" + +#~ msgid "DHCPv6 Leases" +#~ msgstr "Аренды DHCPv6" + +#~ msgid "" +#~ "Really delete this interface? The deletion cannot be undone! You might " +#~ "lose access to this device if you are connected via this interface." +#~ msgstr "" +#~ "Действительно удалить этот интерфейс? Удаление не может быть отменено!" +#~ "\\nВы можете потерять доступ к этому устройству, если вы подключены через " +#~ "этот интерфейс." + +#~ msgid "" +#~ "Really shut down network? You might lose access to this device if you are " +#~ "connected via this interface." +#~ msgstr "" +#~ "Действительно отключить сеть? Вы можете потерять доступ к этому " +#~ "устройству, если вы подключены через этот интерфейс." + +#~ msgid "Sort" +#~ msgstr "Сортировка" + +#~ msgid "help" +#~ msgstr "помощь" + +#~ msgid "IPv4 WAN Status" +#~ msgstr "Состояние IPv4 WAN" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "Состояние IPv6 WAN" diff --git a/luci-base/po/sk/base.po b/luci-base/po/sk/base.po index acc57792b..7cf9f6feb 100644 --- a/luci-base/po/sk/base.po +++ b/luci-base/po/sk/base.po @@ -44,6 +44,9 @@ msgstr "" msgid "-- match by uuid --" msgstr "" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "" @@ -142,9 +145,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "" -msgid "%s - %s" -msgstr "" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -159,9 +159,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -195,9 +192,6 @@ msgstr "" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "" @@ -207,9 +201,6 @@ msgstr "" msgid "Actions" msgstr "" -msgid "Activate this network" -msgstr "" - msgid "Active IPv4-Routes" msgstr "" @@ -261,6 +252,15 @@ msgstr "" msgid "Alert" msgstr "" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -272,6 +272,9 @@ msgstr "" msgid "Allow SSH password authentication" msgstr "" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "" @@ -300,12 +303,12 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -383,10 +386,13 @@ msgstr "" msgid "Any zone" msgstr "" -msgid "Apply" +msgid "Apply request failed with status %h" msgstr "" -msgid "Applying changes" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" msgstr "" msgid "" @@ -403,6 +409,9 @@ msgstr "" msgid "Associated Stations" msgstr "" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -478,10 +487,10 @@ msgstr "" msgid "Back to scan results" msgstr "" -msgid "Backup / Flash Firmware" +msgid "Backup" msgstr "" -msgid "Backup / Restore" +msgid "Backup / Flash Firmware" msgstr "" msgid "Backup file list" @@ -493,7 +502,7 @@ msgstr "" msgid "Band" msgstr "" -msgid "Behind NAT" +msgid "Beacon Interval" msgstr "" msgid "" @@ -549,6 +558,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "" @@ -564,12 +576,20 @@ msgstr "" msgid "Changes applied." msgstr "" +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "" msgid "Channel" msgstr "" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "" @@ -602,8 +622,7 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" msgid "Client" @@ -639,12 +658,18 @@ msgstr "" msgid "Configuration" msgstr "" -msgid "Configuration applied." +msgid "Configuration failed" msgstr "" msgid "Configuration files will be kept." msgstr "" +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "" @@ -657,12 +682,18 @@ msgstr "" msgid "Connection Limit" msgstr "" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "" @@ -714,9 +745,6 @@ msgid "" "\">LEDs if possible." msgstr "" -msgid "DHCP Leases" -msgstr "" - msgid "DHCP Server" msgstr "" @@ -729,9 +757,6 @@ msgstr "" msgid "DHCP-Options" msgstr "" -msgid "DHCPv6 Leases" -msgstr "" - msgid "DHCPv6 client" msgstr "" @@ -771,6 +796,9 @@ msgstr "" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "" @@ -789,9 +817,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "" @@ -810,6 +835,9 @@ msgstr "" msgid "Delete this network" msgstr "" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "" @@ -828,7 +856,10 @@ msgstr "" msgid "Device is rebooting..." msgstr "" -msgid "Device unreachable" +msgid "Device unreachable!" +msgstr "" + +msgid "Device unreachable! Still waiting for device..." msgstr "" msgid "Diagnostics" @@ -854,15 +885,27 @@ msgstr "" msgid "Disable Encryption" msgstr "" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "" msgid "Disabled (default)" msgstr "" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "" @@ -908,6 +951,9 @@ msgid "" "DNS-Name" msgstr "" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "" @@ -1018,6 +1064,9 @@ msgstr "" msgid "Enable this mount" msgstr "" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "" @@ -1050,6 +1099,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "" @@ -1108,6 +1163,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "" @@ -1126,6 +1184,9 @@ msgstr "" msgid "Filter useless" msgstr "" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1179,6 +1240,9 @@ msgstr "" msgid "Force" msgstr "" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "" @@ -1229,7 +1293,7 @@ msgstr "" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1241,6 +1305,9 @@ msgstr "" msgid "Gateway" msgstr "" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "" @@ -1301,9 +1368,6 @@ msgstr "" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1314,9 +1378,6 @@ msgid "" "authentication." msgstr "" -msgid "Hermes 802.11b Wireless Controller" -msgstr "" - msgid "Hide ESSID" msgstr "" @@ -1332,6 +1393,9 @@ msgstr "" msgid "Host-IP or Network" msgstr "" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "" @@ -1353,13 +1417,19 @@ msgstr "" msgid "IP address" msgstr "" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "" msgid "IPv4 Firewall" msgstr "" -msgid "IPv4 WAN Status" +msgid "IPv4 Upstream" msgstr "" msgid "IPv4 address" @@ -1410,15 +1480,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" +msgid "IPv6 Upstream" msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1519,6 +1586,9 @@ msgstr "" msgid "Info" msgstr "" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "" @@ -1555,21 +1625,12 @@ msgstr "" msgid "Interface is reconnecting..." msgstr "" -msgid "Interface is shutting down..." -msgstr "" - msgid "Interface name" msgstr "" msgid "Interface not present or not connected yet." msgstr "" -msgid "Interface reconnected" -msgstr "" - -msgid "Interface shut down" -msgstr "" - msgid "Interfaces" msgstr "" @@ -1755,6 +1816,9 @@ msgstr "" msgid "Loading" msgstr "" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1819,6 +1883,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "" +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "" @@ -1834,6 +1901,9 @@ msgstr "" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "" @@ -1913,6 +1983,9 @@ msgstr "" msgid "Modem device" msgstr "" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "" @@ -1984,9 +2057,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "" @@ -2011,6 +2081,9 @@ msgstr "" msgid "Network boot image" msgstr "" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "" @@ -2032,6 +2105,9 @@ msgstr "" msgid "No information available" msgstr "" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "" @@ -2050,6 +2126,9 @@ msgstr "" msgid "No rules in this chain" msgstr "" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "" @@ -2110,6 +2189,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2155,12 +2237,6 @@ msgstr "" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2181,6 +2257,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2259,6 +2338,9 @@ msgstr "" msgid "PIN" msgstr "" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2346,6 +2428,9 @@ msgstr "" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2414,9 +2499,6 @@ msgstr "" msgid "Prevents client-to-client communication" msgstr "" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "" - msgid "Private Key" msgstr "" @@ -2465,6 +2547,11 @@ msgstr "" msgid "Quality" msgstr "" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2483,9 +2570,6 @@ msgstr "" msgid "RX Rate" msgstr "" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "" - msgid "Radius-Accounting-Port" msgstr "" @@ -2504,34 +2588,27 @@ msgstr "" msgid "Radius-Authentication-Server" msgstr "" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" msgstr "" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" msgid "Really reset all changes?" msgstr "" -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" - msgid "Really switch protocol?" msgstr "" @@ -2577,9 +2654,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "" -msgid "Reconnecting interface" -msgstr "" - msgid "References" msgstr "" @@ -2619,9 +2693,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2671,6 +2742,12 @@ msgstr "" msgid "Restart Firewall" msgstr "" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "" + msgid "Restore backup" msgstr "" @@ -2680,6 +2757,15 @@ msgstr "" msgid "Revert" msgstr "" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2695,9 +2781,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2721,14 +2804,6 @@ msgstr "" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2756,10 +2831,10 @@ msgstr "" msgid "Save & Apply" msgstr "" -msgid "Save & Apply" +msgid "Scan" msgstr "" -msgid "Scan" +msgid "Scan request failed" msgstr "" msgid "Scheduled Tasks" @@ -2785,17 +2860,6 @@ msgstr "" msgid "Server Settings" msgstr "" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "" @@ -2813,6 +2877,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "" @@ -2822,15 +2892,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "" msgid "Shutdown this interface" msgstr "" -msgid "Shutdown this network" -msgstr "" - msgid "Signal" msgstr "" @@ -2882,15 +2952,9 @@ msgid "" "instructions." msgstr "" -msgid "Sort" -msgstr "" - msgid "Source" msgstr "" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -2929,6 +2993,12 @@ msgstr "" msgid "Start priority" msgstr "" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "" @@ -3075,9 +3145,22 @@ msgid "" "code> and _" msgstr "" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3095,9 +3178,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "" @@ -3150,11 +3230,6 @@ msgid "" "settings." msgstr "" -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3163,7 +3238,7 @@ msgstr "" msgid "There are no active leases." msgstr "" -msgid "There are no pending changes to apply!" +msgid "There are no changes to apply." msgstr "" msgid "There are no pending changes to revert!" @@ -3253,7 +3328,8 @@ msgstr "" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" msgid "Tone" @@ -3298,15 +3374,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3331,9 +3398,27 @@ msgstr "" msgid "UUID" msgstr "" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3343,6 +3428,9 @@ msgstr "" msgid "Unknown Error, password not changed!" msgstr "" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "" @@ -3352,9 +3440,18 @@ msgstr "" msgid "Unsaved Changes" msgstr "" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "" +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "" @@ -3479,18 +3576,15 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" msgid "Version" msgstr "" +msgid "Virtual dynamic interface" +msgstr "" + msgid "WDS" msgstr "" @@ -3514,16 +3608,15 @@ msgid "" "and ad-hoc mode) to be installed." msgstr "" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3538,12 +3631,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3565,7 +3652,10 @@ msgstr "" msgid "Wireless Security" msgstr "" -msgid "Wireless is disabled or not associated" +msgid "Wireless is disabled" +msgstr "" + +msgid "Wireless is not associated" msgstr "" msgid "Wireless is restarting..." @@ -3577,12 +3667,6 @@ msgstr "" msgid "Wireless network is enabled" msgstr "" -msgid "Wireless restarted" -msgstr "" - -msgid "Wireless shut down" -msgstr "" - msgid "Write received DNS requests to syslog" msgstr "" @@ -3617,6 +3701,9 @@ msgstr "" msgid "bridged" msgstr "" +msgid "create" +msgstr "" + msgid "create:" msgstr "" @@ -3652,9 +3739,6 @@ msgstr "" msgid "half-duplex" msgstr "" -msgid "help" -msgstr "" - msgid "hidden" msgstr "" @@ -3679,10 +3763,10 @@ msgstr "" msgid "local DNS file" msgstr "" -msgid "minimum 1280, maximum 1480" +msgid "minutes" msgstr "" -msgid "minutes" +msgid "mixed WPA/WPA2" msgstr "" msgid "no" @@ -3706,6 +3790,9 @@ msgstr "" msgid "open" msgstr "" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" diff --git a/luci-base/po/sv/base.po b/luci-base/po/sv/base.po index 632ea6f74..76b582590 100644 --- a/luci-base/po/sv/base.po +++ b/luci-base/po/sv/base.po @@ -47,6 +47,9 @@ msgstr "-- matcha enligt märke --" msgid "-- match by uuid --" msgstr "-- matcha enligt uuid --" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "Belastning senaste minuten:" @@ -148,9 +151,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "" -msgid "%s - %s" -msgstr "%s - %s" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -167,9 +167,6 @@ msgstr "A43C + J43 + A43 + V43" msgid "ADSL" msgstr "ADSL" -msgid "AICCU (SIXXS)" -msgstr "AICCU (SIXXS)" - msgid "ANSI T1.413" msgstr "ANSI T1.413" @@ -203,9 +200,6 @@ msgstr "" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "AYIYA" - msgid "Access Concentrator" msgstr "" @@ -215,9 +209,6 @@ msgstr "Accesspunkt" msgid "Actions" msgstr "Åtgärder" -msgid "Activate this network" -msgstr "Aktivera det här nätverket" - msgid "Active IPv4-Routes" msgstr "Aktiva IPv4-rutter" @@ -269,6 +260,15 @@ msgstr "" msgid "Alert" msgstr "Varning" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -281,6 +281,9 @@ msgstr "Allokera IP sekventiellt" msgid "Allow SSH password authentication" msgstr "Tillåt SSH lösenordsautentisering" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "Tillåt alla utom listade" @@ -311,12 +314,12 @@ msgstr "" msgid "Allowed IPs" msgstr "Tillåtna IP-adresser" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -394,11 +397,14 @@ msgstr "Konfiguration av antenn" msgid "Any zone" msgstr "Någon zon" -msgid "Apply" -msgstr "Verkställ" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" -msgstr "Verkställer ändringar" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -414,6 +420,9 @@ msgstr "" msgid "Associated Stations" msgstr "Associerade stationer" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "Autentiseringsgrupp" @@ -489,12 +498,12 @@ msgstr "Backa till överblick" msgid "Back to scan results" msgstr "Backa till skanningsresultat" +msgid "Backup" +msgstr "Säkerhetskopiera" + msgid "Backup / Flash Firmware" msgstr "Säkerhetskopiera / Flasha inre mjukvara" -msgid "Backup / Restore" -msgstr "Säkerhetskopiera / Återställ" - msgid "Backup file list" msgstr "Säkerhetskopiera fillista" @@ -504,8 +513,8 @@ msgstr "Fel adress angiven!" msgid "Band" msgstr "Band" -msgid "Behind NAT" -msgstr "Bakom NAT" +msgid "Beacon Interval" +msgstr "" msgid "" "Below is the determined list of files to backup. It consists of changed " @@ -561,6 +570,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "CPU-användning (%)" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "Avbryt" @@ -576,12 +588,20 @@ msgstr "Ändringar" msgid "Changes applied." msgstr "Tillämpade ändringar" +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "Ändrar administratörens lösenord för att få tillgång till enheten" msgid "Channel" msgstr "Kanal" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "Kontrollera" @@ -616,8 +636,7 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" msgid "Client" @@ -653,12 +672,18 @@ msgstr "" msgid "Configuration" msgstr "Konfiguration" -msgid "Configuration applied." -msgstr "Konfigurationen tillämpades" +msgid "Configuration failed" +msgstr "" msgid "Configuration files will be kept." msgstr "Konfigurationsfiler kommer att behållas." +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Bekräftelse" @@ -671,12 +696,18 @@ msgstr "Ansluten" msgid "Connection Limit" msgstr "Anslutningsgräns" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "Anslutningar" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "Land" @@ -728,9 +759,6 @@ msgid "" "\">LEDs if possible." msgstr "" -msgid "DHCP Leases" -msgstr "DHCP-kontrakt" - msgid "DHCP Server" msgstr "DHCP-server" @@ -743,9 +771,6 @@ msgstr "DHCP-klient" msgid "DHCP-Options" msgstr "DHCP-alternativ" -msgid "DHCPv6 Leases" -msgstr "DHCPv6-kontrakt" - msgid "DHCPv6 client" msgstr "DHCPv6-klient" @@ -785,6 +810,9 @@ msgstr "DSL-status" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "" @@ -803,9 +831,6 @@ msgstr "Standard gateway" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "Standardrutt" - msgid "Default state" msgstr "" @@ -824,6 +849,9 @@ msgstr "Radera" msgid "Delete this network" msgstr "Ta bort det här nätverket" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "Beskrivning" @@ -842,9 +870,12 @@ msgstr "Enhetskonfiguration" msgid "Device is rebooting..." msgstr "Enheten startar om..." -msgid "Device unreachable" +msgid "Device unreachable!" msgstr "Enheten kan inte nås" +msgid "Device unreachable! Still waiting for device..." +msgstr "" + msgid "Diagnostics" msgstr "" @@ -870,15 +901,27 @@ msgstr "" msgid "Disable Encryption" msgstr "Inaktivera kryptering" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "Inaktiverad" msgid "Disabled (default)" msgstr "Inaktiverad (standard)" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "" @@ -928,6 +971,9 @@ msgstr "" "Vidarebefordra inte DNS-" "förfrågningar utan DNS-namn" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "Ladda ner och installera paket" @@ -1038,6 +1084,9 @@ msgstr "" msgid "Enable this mount" msgstr "Aktivera den här monteringen" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "Aktivera den här swap" @@ -1070,6 +1119,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "Raderar..." @@ -1128,6 +1183,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "Fil" @@ -1146,6 +1204,9 @@ msgstr "Filtrera privata" msgid "Filter useless" msgstr "Filtrera icke-användbara" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1199,6 +1260,9 @@ msgstr "Skriver..." msgid "Force" msgstr "Tvinga" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "Tvinga CCMP (AES)" @@ -1249,7 +1313,7 @@ msgstr "Fritt utrymme" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1261,6 +1325,9 @@ msgstr "Endast GPRS" msgid "Gateway" msgstr "Gateway" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "Gateway-portar" @@ -1321,9 +1388,6 @@ msgstr "Lägg på" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "Hjärtslag" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1334,9 +1398,6 @@ msgid "" "authentication." msgstr "" -msgid "Hermes 802.11b Wireless Controller" -msgstr "" - msgid "Hide ESSID" msgstr "Göm ESSID" @@ -1352,6 +1413,9 @@ msgstr "" msgid "Host-IP or Network" msgstr "Host-IP eller Nätverk" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "Värdnamn" @@ -1373,13 +1437,19 @@ msgstr "IP-adresser" msgid "IP address" msgstr "IP-adress" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "IPv4" msgid "IPv4 Firewall" msgstr "IPv4-brandvägg" -msgid "IPv4 WAN Status" +msgid "IPv4 Upstream" msgstr "" msgid "IPv4 address" @@ -1430,15 +1500,12 @@ msgstr "IPv6-inställningar" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" +msgid "IPv6 Upstream" msgstr "" msgid "IPv6 address" msgstr "IPv6-adress" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1539,6 +1606,9 @@ msgstr "Ankommande" msgid "Info" msgstr "Info" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "Initskript" @@ -1575,21 +1645,12 @@ msgstr "Överblick av gränssnitt" msgid "Interface is reconnecting..." msgstr "Gränssnittet återansluter..." -msgid "Interface is shutting down..." -msgstr "Gränssnittet stänger ner..." - msgid "Interface name" msgstr "Gränssnittets namn" msgid "Interface not present or not connected yet." msgstr "Gränssnittet är inte närvarande eller är inte anslutet än." -msgid "Interface reconnected" -msgstr "Gränssnittet återanslöt" - -msgid "Interface shut down" -msgstr "Gränssnittet stängdes ner" - msgid "Interfaces" msgstr "Gränssnitten" @@ -1776,6 +1837,9 @@ msgstr "Snitt-belastning" msgid "Loading" msgstr "Laddar" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1840,6 +1904,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "" +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "MAC-adress" @@ -1855,6 +1922,9 @@ msgstr "MAC-lista" msgid "MAP / LW4over6" msgstr "MAP / LW4över6" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -1934,6 +2004,9 @@ msgstr "Modell" msgid "Modem device" msgstr "Modem-enhet" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "" @@ -2005,9 +2078,6 @@ msgstr "NT-domän" msgid "NTP server candidates" msgstr "NTP-serverkandidater" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Namn" @@ -2032,6 +2102,9 @@ msgstr "Nätverksverktyg" msgid "Network boot image" msgstr "Uppstartsbild för nätverket" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "Nätverk utan gränssnitt" @@ -2053,6 +2126,9 @@ msgstr "Inga filer hittades" msgid "No information available" msgstr "Ingen information tillgänglig" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "Ingen negativ cache" @@ -2071,6 +2147,9 @@ msgstr "Inget lösenord inställt!" msgid "No rules in this chain" msgstr "Inga regler i den här kedjan" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "" @@ -2131,6 +2210,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2176,12 +2258,6 @@ msgstr "Alternativet togs bort" msgid "Optional" msgstr "Valfri" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2202,6 +2278,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2280,6 +2359,9 @@ msgstr "PID" msgid "PIN" msgstr "PIN-kod" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2367,6 +2449,9 @@ msgstr "" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2435,9 +2520,6 @@ msgstr "Förhindra lyssning på dessa gränssnitt." msgid "Prevents client-to-client communication" msgstr "Förhindrar kommunikation klient-till-klient" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "" - msgid "Private Key" msgstr "Privat nyckel" @@ -2486,6 +2568,11 @@ msgstr "QMI-telefoni" msgid "Quality" msgstr "Kvalité" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2504,9 +2591,6 @@ msgstr "RT" msgid "RX Rate" msgstr "RX-hastighet" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "" - msgid "Radius-Accounting-Port" msgstr "" @@ -2525,6 +2609,9 @@ msgstr "" msgid "Radius-Authentication-Server" msgstr "" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" @@ -2533,28 +2620,18 @@ msgstr "" "Configuration Protocol\">DHCP-servern" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" msgid "Really reset all changes?" msgstr "Verkligen återställa alla ändringar?" -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" - msgid "Really switch protocol?" msgstr "Verkligen byta protokoll?" @@ -2600,9 +2677,6 @@ msgstr "Rekommenderad. WireGuard-gränssnittets IP-adress" msgid "Reconnect this interface" msgstr "Återanslut det här gränssnittet" -msgid "Reconnecting interface" -msgstr "Återansluter gränssnittet" - msgid "References" msgstr "Referens" @@ -2642,9 +2716,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "Kräv TLS" - msgid "Required" msgstr "Krävs!" @@ -2694,6 +2765,12 @@ msgstr "Starta om" msgid "Restart Firewall" msgstr "Starta om brandvägg" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "Återställ" + msgid "Restore backup" msgstr "Återställ säkerhetskopian" @@ -2703,6 +2780,15 @@ msgstr "Visa/göm lösenord" msgid "Revert" msgstr "Återgå" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "Root" @@ -2718,9 +2804,6 @@ msgstr "" msgid "Route type" msgstr "Typ av rutt" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2744,14 +2827,6 @@ msgstr "Kör filsystemskontrollen" msgid "SHA256" msgstr "SHA256" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "SNR" @@ -2779,12 +2854,12 @@ msgstr "Spara" msgid "Save & Apply" msgstr "Spara och Verkställ" -msgid "Save & Apply" -msgstr "Spara & Verkställ" - msgid "Scan" msgstr "Skanna" +msgid "Scan request failed" +msgstr "" + msgid "Scheduled Tasks" msgstr "Schemalagda uppgifter" @@ -2808,17 +2883,6 @@ msgstr "Separera klienter" msgid "Server Settings" msgstr "Inställningar för server" -msgid "Server password" -msgstr "Lösenordet för servern" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "Användarnamnet för servern" - msgid "Service Name" msgstr "Namn på tjänst" @@ -2836,6 +2900,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "Ställ in Tidssynkronisering" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "Ställ in DHCP-server" @@ -2845,15 +2915,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "" msgid "Shutdown this interface" msgstr "Stäng ner det här gränssnittet" -msgid "Shutdown this network" -msgstr "Stäng ner det här nätverket" - msgid "Signal" msgstr "Signal" @@ -2905,15 +2975,9 @@ msgid "" "instructions." msgstr "" -msgid "Sort" -msgstr "Sortera" - msgid "Source" msgstr "Källa" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -2952,6 +3016,12 @@ msgstr "" msgid "Start priority" msgstr "" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "" @@ -3098,9 +3168,22 @@ msgid "" "code> and _" msgstr "" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3118,9 +3201,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "Följande ändringar har skickats in" - msgid "The following changes have been reverted" msgstr "" @@ -3173,11 +3253,6 @@ msgid "" "settings." msgstr "" -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3186,8 +3261,8 @@ msgstr "" msgid "There are no active leases." msgstr "Det finns inga aktiva kontrakt." -msgid "There are no pending changes to apply!" -msgstr "Det finns inga pendlande ändringar att verkställa!" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "Det finns inga pendlande ändringar att återkalla" @@ -3278,7 +3353,8 @@ msgstr "Tidszon" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" "För att återställa konfigurationsfiler så kan du ladda upp ett tidigare " "genererat säkerhetskopierings arkiv här." @@ -3325,15 +3401,6 @@ msgstr "Tunnelgränssnitt" msgid "Tunnel Link" msgstr "Tunnel-länk" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "Tunnel-typ" - msgid "Tx-Power" msgstr "" @@ -3358,9 +3425,27 @@ msgstr "USB-portar" msgid "UUID" msgstr "UUID" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "Det går inte att skicka" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "Otillgängliga Sekunder (UAS)" @@ -3370,6 +3455,9 @@ msgstr "Okänd" msgid "Unknown Error, password not changed!" msgstr "Okänt fel, lösenordet ändrades inte!" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "" @@ -3379,9 +3467,18 @@ msgstr "Avmontera" msgid "Unsaved Changes" msgstr "Osparade ändringar" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "Protokolltypen stöds inte." +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "Uppdatera listor" @@ -3506,18 +3603,15 @@ msgstr "Tillverkare" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "Utförlig" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Verkställ" msgid "Version" msgstr "Version" +msgid "Virtual dynamic interface" +msgstr "" + msgid "WDS" msgstr "WDS" @@ -3541,16 +3635,15 @@ msgid "" "and ad-hoc mode) to be installed." msgstr "" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "Väntar på att ändringarna ska tillämpas..." msgid "Waiting for command to complete..." msgstr "Väntar på att kommandot ska avsluta..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "Väntar på enheten..." @@ -3566,12 +3659,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "Bredd" @@ -3593,8 +3680,11 @@ msgstr "Trådlös överblick" msgid "Wireless Security" msgstr "Trådlös säkerhet" -msgid "Wireless is disabled or not associated" -msgstr "Trådlöst är avstängt eller inte associerat" +msgid "Wireless is disabled" +msgstr "Trådlöst är avstängt" + +msgid "Wireless is not associated" +msgstr "Trådlöst är inte associerat" msgid "Wireless is restarting..." msgstr "Trådlöst startar om..." @@ -3605,12 +3695,6 @@ msgstr "Trådlöst nätverk är avstängt" msgid "Wireless network is enabled" msgstr "Trådlöst nätverk är aktiverat" -msgid "Wireless restarted" -msgstr "Trådlöst startade om" - -msgid "Wireless shut down" -msgstr "Trådlöst stängde ner" - msgid "Write received DNS requests to syslog" msgstr "Skriv mottagna DNS-förfrågningar till syslogg" @@ -3650,6 +3734,9 @@ msgstr "" msgid "bridged" msgstr "bryggad" +msgid "create" +msgstr "" + msgid "create:" msgstr "skapa:" @@ -3685,9 +3772,6 @@ msgstr "full-duplex" msgid "half-duplex" msgstr "halv-duplex" -msgid "help" -msgstr "hjälp" - msgid "hidden" msgstr "gömd" @@ -3712,12 +3796,12 @@ msgstr "kbit/s" msgid "local DNS file" msgstr "lokal DNS-fil" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" msgstr "minuter" +msgid "mixed WPA/WPA2" +msgstr "" + msgid "no" msgstr "nej" @@ -3739,6 +3823,9 @@ msgstr "på" msgid "open" msgstr "öppen" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" @@ -3790,8 +3877,41 @@ msgstr "ja" msgid "« Back" msgstr "« Bakåt" -#~ msgid "Action" -#~ msgstr "Åtgärd" +#~ msgid "%s - %s" +#~ msgstr "%s - %s" -#~ msgid "Buttons" -#~ msgstr "Knappar" +#~ msgid "Activate this network" +#~ msgstr "Aktivera det här nätverket" + +#~ msgid "Interface is shutting down..." +#~ msgstr "Gränssnittet stänger ner..." + +#~ msgid "Interface reconnected" +#~ msgstr "Gränssnittet återanslöt" + +#~ msgid "Interface shut down" +#~ msgstr "Gränssnittet stängdes ner" + +#~ msgid "Reconnecting interface" +#~ msgstr "Återansluter gränssnittet" + +#~ msgid "Shutdown this network" +#~ msgstr "Stäng ner det här nätverket" + +#~ msgid "Wireless restarted" +#~ msgstr "Trådlöst startade om" + +#~ msgid "Wireless shut down" +#~ msgstr "Trådlöst stängde ner" + +#~ msgid "DHCP Leases" +#~ msgstr "DHCP-kontrakt" + +#~ msgid "DHCPv6 Leases" +#~ msgstr "DHCPv6-kontrakt" + +#~ msgid "Sort" +#~ msgstr "Sortera" + +#~ msgid "help" +#~ msgstr "hjälp" diff --git a/luci-base/po/templates/base.pot b/luci-base/po/templates/base.pot index ddf2e56fa..2dacedfe7 100644 --- a/luci-base/po/templates/base.pot +++ b/luci-base/po/templates/base.pot @@ -37,6 +37,9 @@ msgstr "" msgid "-- match by uuid --" msgstr "" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "" @@ -135,9 +138,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "" -msgid "%s - %s" -msgstr "" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -152,9 +152,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -188,9 +185,6 @@ msgstr "" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "" @@ -200,9 +194,6 @@ msgstr "" msgid "Actions" msgstr "" -msgid "Activate this network" -msgstr "" - msgid "Active IPv4-Routes" msgstr "" @@ -254,6 +245,15 @@ msgstr "" msgid "Alert" msgstr "" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -265,6 +265,9 @@ msgstr "" msgid "Allow SSH password authentication" msgstr "" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "" @@ -293,12 +296,12 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -376,10 +379,13 @@ msgstr "" msgid "Any zone" msgstr "" -msgid "Apply" +msgid "Apply request failed with status %h" msgstr "" -msgid "Applying changes" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" msgstr "" msgid "" @@ -396,6 +402,9 @@ msgstr "" msgid "Associated Stations" msgstr "" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -471,10 +480,10 @@ msgstr "" msgid "Back to scan results" msgstr "" -msgid "Backup / Flash Firmware" +msgid "Backup" msgstr "" -msgid "Backup / Restore" +msgid "Backup / Flash Firmware" msgstr "" msgid "Backup file list" @@ -486,7 +495,7 @@ msgstr "" msgid "Band" msgstr "" -msgid "Behind NAT" +msgid "Beacon Interval" msgstr "" msgid "" @@ -542,6 +551,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "" @@ -557,12 +569,20 @@ msgstr "" msgid "Changes applied." msgstr "" +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "" msgid "Channel" msgstr "" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "" @@ -595,8 +615,7 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" msgid "Client" @@ -632,12 +651,18 @@ msgstr "" msgid "Configuration" msgstr "" -msgid "Configuration applied." +msgid "Configuration failed" msgstr "" msgid "Configuration files will be kept." msgstr "" +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "" @@ -650,12 +675,18 @@ msgstr "" msgid "Connection Limit" msgstr "" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "" @@ -707,9 +738,6 @@ msgid "" "\">LEDs if possible." msgstr "" -msgid "DHCP Leases" -msgstr "" - msgid "DHCP Server" msgstr "" @@ -722,9 +750,6 @@ msgstr "" msgid "DHCP-Options" msgstr "" -msgid "DHCPv6 Leases" -msgstr "" - msgid "DHCPv6 client" msgstr "" @@ -764,6 +789,9 @@ msgstr "" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "" @@ -782,9 +810,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "" @@ -803,6 +828,9 @@ msgstr "" msgid "Delete this network" msgstr "" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "" @@ -821,7 +849,10 @@ msgstr "" msgid "Device is rebooting..." msgstr "" -msgid "Device unreachable" +msgid "Device unreachable!" +msgstr "" + +msgid "Device unreachable! Still waiting for device..." msgstr "" msgid "Diagnostics" @@ -847,15 +878,27 @@ msgstr "" msgid "Disable Encryption" msgstr "" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "" msgid "Disabled (default)" msgstr "" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "" @@ -901,6 +944,9 @@ msgid "" "DNS-Name" msgstr "" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "" @@ -1011,6 +1057,9 @@ msgstr "" msgid "Enable this mount" msgstr "" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "" @@ -1043,6 +1092,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "" @@ -1101,6 +1156,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "" @@ -1119,6 +1177,9 @@ msgstr "" msgid "Filter useless" msgstr "" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1172,6 +1233,9 @@ msgstr "" msgid "Force" msgstr "" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "" @@ -1222,7 +1286,7 @@ msgstr "" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1234,6 +1298,9 @@ msgstr "" msgid "Gateway" msgstr "" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "" @@ -1294,9 +1361,6 @@ msgstr "" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1307,9 +1371,6 @@ msgid "" "authentication." msgstr "" -msgid "Hermes 802.11b Wireless Controller" -msgstr "" - msgid "Hide ESSID" msgstr "" @@ -1325,6 +1386,9 @@ msgstr "" msgid "Host-IP or Network" msgstr "" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "" @@ -1346,13 +1410,19 @@ msgstr "" msgid "IP address" msgstr "" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "" msgid "IPv4 Firewall" msgstr "" -msgid "IPv4 WAN Status" +msgid "IPv4 Upstream" msgstr "" msgid "IPv4 address" @@ -1403,15 +1473,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" +msgid "IPv6 Upstream" msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1512,6 +1579,9 @@ msgstr "" msgid "Info" msgstr "" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "" @@ -1548,21 +1618,12 @@ msgstr "" msgid "Interface is reconnecting..." msgstr "" -msgid "Interface is shutting down..." -msgstr "" - msgid "Interface name" msgstr "" msgid "Interface not present or not connected yet." msgstr "" -msgid "Interface reconnected" -msgstr "" - -msgid "Interface shut down" -msgstr "" - msgid "Interfaces" msgstr "" @@ -1748,6 +1809,9 @@ msgstr "" msgid "Loading" msgstr "" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1812,6 +1876,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "" +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "" @@ -1827,6 +1894,9 @@ msgstr "" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "" @@ -1906,6 +1976,9 @@ msgstr "" msgid "Modem device" msgstr "" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "" @@ -1977,9 +2050,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "" @@ -2004,6 +2074,9 @@ msgstr "" msgid "Network boot image" msgstr "" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "" @@ -2025,6 +2098,9 @@ msgstr "" msgid "No information available" msgstr "" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "" @@ -2043,6 +2119,9 @@ msgstr "" msgid "No rules in this chain" msgstr "" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "" @@ -2103,6 +2182,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2148,12 +2230,6 @@ msgstr "" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2174,6 +2250,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2252,6 +2331,9 @@ msgstr "" msgid "PIN" msgstr "" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2339,6 +2421,9 @@ msgstr "" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2407,9 +2492,6 @@ msgstr "" msgid "Prevents client-to-client communication" msgstr "" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "" - msgid "Private Key" msgstr "" @@ -2458,6 +2540,11 @@ msgstr "" msgid "Quality" msgstr "" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2476,9 +2563,6 @@ msgstr "" msgid "RX Rate" msgstr "" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "" - msgid "Radius-Accounting-Port" msgstr "" @@ -2497,34 +2581,27 @@ msgstr "" msgid "Radius-Authentication-Server" msgstr "" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" msgstr "" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" msgid "Really reset all changes?" msgstr "" -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" - msgid "Really switch protocol?" msgstr "" @@ -2570,9 +2647,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "" -msgid "Reconnecting interface" -msgstr "" - msgid "References" msgstr "" @@ -2612,9 +2686,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2664,6 +2735,12 @@ msgstr "" msgid "Restart Firewall" msgstr "" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "" + msgid "Restore backup" msgstr "" @@ -2673,6 +2750,15 @@ msgstr "" msgid "Revert" msgstr "" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2688,9 +2774,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2714,14 +2797,6 @@ msgstr "" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2749,10 +2824,10 @@ msgstr "" msgid "Save & Apply" msgstr "" -msgid "Save & Apply" +msgid "Scan" msgstr "" -msgid "Scan" +msgid "Scan request failed" msgstr "" msgid "Scheduled Tasks" @@ -2778,17 +2853,6 @@ msgstr "" msgid "Server Settings" msgstr "" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "" @@ -2806,6 +2870,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "" @@ -2815,15 +2885,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "" msgid "Shutdown this interface" msgstr "" -msgid "Shutdown this network" -msgstr "" - msgid "Signal" msgstr "" @@ -2875,15 +2945,9 @@ msgid "" "instructions." msgstr "" -msgid "Sort" -msgstr "" - msgid "Source" msgstr "" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -2922,6 +2986,12 @@ msgstr "" msgid "Start priority" msgstr "" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "" @@ -3068,9 +3138,22 @@ msgid "" "code> and _" msgstr "" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3088,9 +3171,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "" @@ -3143,11 +3223,6 @@ msgid "" "settings." msgstr "" -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3156,7 +3231,7 @@ msgstr "" msgid "There are no active leases." msgstr "" -msgid "There are no pending changes to apply!" +msgid "There are no changes to apply." msgstr "" msgid "There are no pending changes to revert!" @@ -3246,7 +3321,8 @@ msgstr "" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" msgid "Tone" @@ -3291,15 +3367,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3324,9 +3391,27 @@ msgstr "" msgid "UUID" msgstr "" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3336,6 +3421,9 @@ msgstr "" msgid "Unknown Error, password not changed!" msgstr "" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "" @@ -3345,9 +3433,18 @@ msgstr "" msgid "Unsaved Changes" msgstr "" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "" +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "" @@ -3472,18 +3569,15 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" msgid "Version" msgstr "" +msgid "Virtual dynamic interface" +msgstr "" + msgid "WDS" msgstr "" @@ -3507,16 +3601,15 @@ msgid "" "and ad-hoc mode) to be installed." msgstr "" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3531,12 +3624,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3558,7 +3645,10 @@ msgstr "" msgid "Wireless Security" msgstr "" -msgid "Wireless is disabled or not associated" +msgid "Wireless is disabled" +msgstr "" + +msgid "Wireless is not associated" msgstr "" msgid "Wireless is restarting..." @@ -3570,12 +3660,6 @@ msgstr "" msgid "Wireless network is enabled" msgstr "" -msgid "Wireless restarted" -msgstr "" - -msgid "Wireless shut down" -msgstr "" - msgid "Write received DNS requests to syslog" msgstr "" @@ -3610,6 +3694,9 @@ msgstr "" msgid "bridged" msgstr "" +msgid "create" +msgstr "" + msgid "create:" msgstr "" @@ -3645,9 +3732,6 @@ msgstr "" msgid "half-duplex" msgstr "" -msgid "help" -msgstr "" - msgid "hidden" msgstr "" @@ -3672,10 +3756,10 @@ msgstr "" msgid "local DNS file" msgstr "" -msgid "minimum 1280, maximum 1480" +msgid "minutes" msgstr "" -msgid "minutes" +msgid "mixed WPA/WPA2" msgstr "" msgid "no" @@ -3699,6 +3783,9 @@ msgstr "" msgid "open" msgstr "" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" diff --git a/luci-base/po/tr/base.po b/luci-base/po/tr/base.po index 953d1e966..41f5b6675 100644 --- a/luci-base/po/tr/base.po +++ b/luci-base/po/tr/base.po @@ -39,12 +39,15 @@ msgid "-- custom --" msgstr "-- özel --" msgid "-- match by device --" -msgstr "" +msgstr "-- cihaza göre eşleştir --" msgid "-- match by label --" -msgstr "" +msgstr "-- etikete göre eşleştir --" msgid "-- match by uuid --" +msgstr "-- uuid'e göre eşleştir --" + +msgid "-- please select --" msgstr "" msgid "1 Minute Load:" @@ -54,7 +57,7 @@ msgid "15 Minute Load:" msgstr "15 Dakikalık Yük:" msgid "4-character hexadecimal ID" -msgstr "" +msgstr "4 karakterli HEX ID" msgid "464XLAT (CLAT)" msgstr "" @@ -151,9 +154,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "Maks. eşzamanlı sorgu" -msgid "%s - %s" -msgstr "" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -168,9 +168,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -204,9 +201,6 @@ msgstr "" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "" @@ -216,9 +210,6 @@ msgstr "Erişim Noktası" msgid "Actions" msgstr "Eylemler" -msgid "Activate this network" -msgstr "Bu ağı etkinleştir" - msgid "Active IPv4-Routes" msgstr "" "Aktif IPv4-Yönlendiriciler" @@ -272,6 +263,15 @@ msgstr "" msgid "Alert" msgstr "Uyarı" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -285,6 +285,9 @@ msgid "Allow SSH password authentication" msgstr "" "SSH parola kimlik doğrulamasına izin ver" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "Listelenenlerin haricindekilere izin ver" @@ -313,12 +316,12 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -396,11 +399,14 @@ msgstr "Anten Yapılandırması" msgid "Any zone" msgstr "" -msgid "Apply" -msgstr "Uygula" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" -msgstr "Değişiklikleri uygula" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -416,6 +422,9 @@ msgstr "" msgid "Associated Stations" msgstr "" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -435,7 +444,7 @@ msgid "Auto Refresh" msgstr "Otomatik Yenileme" msgid "Automatic" -msgstr "" +msgstr "Otomatik" msgid "Automatic Homenet (HNCP)" msgstr "" @@ -474,7 +483,7 @@ msgid "BR / DMR / AFTR" msgstr "" msgid "BSSID" -msgstr "" +msgstr "BSSID" msgid "Back" msgstr "Geri" @@ -491,12 +500,12 @@ msgstr "Genel Bakışa dön" msgid "Back to scan results" msgstr "Tarama sonuçlarına dön" +msgid "Backup" +msgstr "Yedekleme" + msgid "Backup / Flash Firmware" msgstr "" -msgid "Backup / Restore" -msgstr "Yedekleme / Geri Yükleme" - msgid "Backup file list" msgstr "" @@ -506,7 +515,7 @@ msgstr "" msgid "Band" msgstr "" -msgid "Behind NAT" +msgid "Beacon Interval" msgstr "" msgid "" @@ -560,27 +569,38 @@ msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" msgid "CPU usage (%)" +msgstr "CPU kullanımı (%)" + +msgid "Call failed" msgstr "" msgid "Cancel" -msgstr "" +msgstr "Vazgeç" msgid "Category" -msgstr "" +msgstr "Kategori" msgid "Chain" -msgstr "" +msgstr "Zincir" msgid "Changes" -msgstr "" +msgstr "Değişiklikler" msgid "Changes applied." msgstr "" +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "" msgid "Channel" +msgstr "Kanal" + +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." msgstr "" msgid "Check" @@ -615,8 +635,7 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" msgid "Client" @@ -652,12 +671,18 @@ msgstr "" msgid "Configuration" msgstr "" -msgid "Configuration applied." +msgid "Configuration failed" msgstr "" msgid "Configuration files will be kept." msgstr "" +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "" @@ -670,12 +695,18 @@ msgstr "" msgid "Connection Limit" msgstr "" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "" @@ -727,9 +758,6 @@ msgid "" "\">LEDs if possible." msgstr "" -msgid "DHCP Leases" -msgstr "" - msgid "DHCP Server" msgstr "" @@ -742,9 +770,6 @@ msgstr "" msgid "DHCP-Options" msgstr "" -msgid "DHCPv6 Leases" -msgstr "" - msgid "DHCPv6 client" msgstr "" @@ -784,6 +809,9 @@ msgstr "" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "" @@ -802,9 +830,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "" @@ -823,6 +848,9 @@ msgstr "" msgid "Delete this network" msgstr "" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "" @@ -841,7 +869,10 @@ msgstr "" msgid "Device is rebooting..." msgstr "" -msgid "Device unreachable" +msgid "Device unreachable!" +msgstr "" + +msgid "Device unreachable! Still waiting for device..." msgstr "" msgid "Diagnostics" @@ -867,15 +898,27 @@ msgstr "" msgid "Disable Encryption" msgstr "" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "" msgid "Disabled (default)" msgstr "" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "" @@ -921,6 +964,9 @@ msgid "" "DNS-Name" msgstr "" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "" @@ -1031,6 +1077,9 @@ msgstr "" msgid "Enable this mount" msgstr "" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "" @@ -1063,6 +1112,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "" @@ -1121,6 +1176,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "" @@ -1139,6 +1197,9 @@ msgstr "" msgid "Filter useless" msgstr "" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1192,6 +1253,9 @@ msgstr "" msgid "Force" msgstr "" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "" @@ -1242,7 +1306,7 @@ msgstr "" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1254,6 +1318,9 @@ msgstr "" msgid "Gateway" msgstr "" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "" @@ -1314,9 +1381,6 @@ msgstr "" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1327,9 +1391,6 @@ msgid "" "authentication." msgstr "" -msgid "Hermes 802.11b Wireless Controller" -msgstr "" - msgid "Hide ESSID" msgstr "" @@ -1345,6 +1406,9 @@ msgstr "" msgid "Host-IP or Network" msgstr "" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "" @@ -1366,13 +1430,19 @@ msgstr "" msgid "IP address" msgstr "" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "" msgid "IPv4 Firewall" msgstr "" -msgid "IPv4 WAN Status" +msgid "IPv4 Upstream" msgstr "" msgid "IPv4 address" @@ -1423,15 +1493,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" +msgid "IPv6 Upstream" msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1532,6 +1599,9 @@ msgstr "" msgid "Info" msgstr "" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "" @@ -1568,21 +1638,12 @@ msgstr "" msgid "Interface is reconnecting..." msgstr "" -msgid "Interface is shutting down..." -msgstr "" - msgid "Interface name" msgstr "" msgid "Interface not present or not connected yet." msgstr "" -msgid "Interface reconnected" -msgstr "" - -msgid "Interface shut down" -msgstr "" - msgid "Interfaces" msgstr "" @@ -1768,6 +1829,9 @@ msgstr "" msgid "Loading" msgstr "" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1821,10 +1885,10 @@ msgid "Logging" msgstr "" msgid "Login" -msgstr "" +msgstr "Oturum Aç" msgid "Logout" -msgstr "" +msgstr "Oturumu Kapat" msgid "Loss of Signal Seconds (LOSS)" msgstr "" @@ -1832,6 +1896,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "" +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "" @@ -1847,6 +1914,9 @@ msgstr "" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "" @@ -1926,6 +1996,9 @@ msgstr "" msgid "Modem device" msgstr "" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "" @@ -1997,9 +2070,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "" @@ -2024,6 +2094,9 @@ msgstr "" msgid "Network boot image" msgstr "" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "" @@ -2045,6 +2118,9 @@ msgstr "" msgid "No information available" msgstr "" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "" @@ -2063,6 +2139,9 @@ msgstr "" msgid "No rules in this chain" msgstr "" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "" @@ -2123,6 +2202,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2168,12 +2250,6 @@ msgstr "" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2194,6 +2270,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2272,6 +2351,9 @@ msgstr "" msgid "PIN" msgstr "" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2359,6 +2441,9 @@ msgstr "" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2427,9 +2512,6 @@ msgstr "" msgid "Prevents client-to-client communication" msgstr "" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "" - msgid "Private Key" msgstr "" @@ -2478,6 +2560,11 @@ msgstr "" msgid "Quality" msgstr "" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2496,9 +2583,6 @@ msgstr "" msgid "RX Rate" msgstr "" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "" - msgid "Radius-Accounting-Port" msgstr "" @@ -2517,34 +2601,27 @@ msgstr "" msgid "Radius-Authentication-Server" msgstr "" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" msgstr "" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" msgid "Really reset all changes?" msgstr "" -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" - msgid "Really switch protocol?" msgstr "" @@ -2590,9 +2667,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "" -msgid "Reconnecting interface" -msgstr "" - msgid "References" msgstr "" @@ -2632,9 +2706,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2664,13 +2735,13 @@ msgid "" msgstr "" msgid "Reset" -msgstr "" +msgstr "Sıfırla" msgid "Reset Counters" -msgstr "" +msgstr "Sayaçları Sıfırla" msgid "Reset to defaults" -msgstr "" +msgstr "Varsayılanlara dön" msgid "Resolv and Hosts Files" msgstr "" @@ -2679,22 +2750,37 @@ msgid "Resolve file" msgstr "" msgid "Restart" -msgstr "" +msgstr "Tekrar başlat" msgid "Restart Firewall" msgstr "" -msgid "Restore backup" +msgid "Restart radio interface" msgstr "" +msgid "Restore" +msgstr "Geri Yükleme" + +msgid "Restore backup" +msgstr "Yedeklemeyi geri yükle" + msgid "Reveal/hide password" msgstr "" msgid "Revert" +msgstr "Dönmek" + +msgid "Revert changes" +msgstr "Değişiklikleri geri al" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" msgstr "" msgid "Root" -msgstr "" +msgstr "Kök" msgid "Root directory for files served via TFTP" msgstr "" @@ -2708,17 +2794,14 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" msgid "Router Password" -msgstr "" +msgstr "Yönlendirici Parolası" msgid "Routes" -msgstr "" +msgstr "Yönlendirmeler" msgid "" "Routes specify over which interface and gateway a certain host or network " @@ -2726,63 +2809,55 @@ msgid "" msgstr "" msgid "Run a filesystem check before mounting the device" -msgstr "" +msgstr "Cihazı bağlamadan önce bir dosya sistemi kontrolü yapın" msgid "Run filesystem check" -msgstr "" +msgstr "Dosya sistemi kontrolünü çalıştır" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" -msgstr "" +msgstr "SNR" msgid "SSH Access" -msgstr "" +msgstr "SSH Erişimi" msgid "SSH server address" -msgstr "" +msgstr "SSH sunucu adresi" msgid "SSH server port" -msgstr "" +msgstr "SSH sunucu portu" msgid "SSH username" -msgstr "" +msgstr "SSH kullanıcı adı" msgid "SSH-Keys" msgstr "" msgid "SSID" -msgstr "" +msgstr "SSID" msgid "Save" -msgstr "" +msgstr "Kaydet" msgid "Save & Apply" -msgstr "" - -msgid "Save & Apply" -msgstr "" +msgstr "Kaydet & Uygula" msgid "Scan" +msgstr "Tara" + +msgid "Scan request failed" msgstr "" msgid "Scheduled Tasks" -msgstr "" +msgstr "Zamanlanmış Görevler" msgid "Section added" -msgstr "" +msgstr "Bölüm eklendi" msgid "Section removed" -msgstr "" +msgstr "Bölüm kaldırıldı" msgid "See \"mount\" manpage for details" msgstr "" @@ -2798,17 +2873,6 @@ msgstr "" msgid "Server Settings" msgstr "" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "" @@ -2816,7 +2880,7 @@ msgid "Service Type" msgstr "" msgid "Services" -msgstr "" +msgstr "Servisler" msgid "" "Set interface properties regardless of the link carrier (If set, carrier " @@ -2826,6 +2890,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "" @@ -2835,35 +2905,35 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "" msgid "Shutdown this interface" msgstr "" -msgid "Shutdown this network" -msgstr "" - msgid "Signal" -msgstr "" +msgstr "Sinyal" msgid "Signal Attenuation (SATN)" -msgstr "" +msgstr "Sinyal Zayıflama (SATN)" msgid "Signal:" -msgstr "" +msgstr "Sinyal:" msgid "Size" -msgstr "" +msgstr "Boyut" msgid "Size (.ipk)" -msgstr "" +msgstr "Boyut (.ipk)" msgid "Size of DNS query cache" msgstr "" msgid "Skip" -msgstr "" +msgstr "Atla" msgid "Skip to content" msgstr "" @@ -2875,7 +2945,7 @@ msgid "Slot time" msgstr "" msgid "Software" -msgstr "" +msgstr "Yazılım" msgid "Software VLAN" msgstr "" @@ -2895,15 +2965,9 @@ msgid "" "instructions." msgstr "" -msgid "Sort" -msgstr "" - msgid "Source" msgstr "" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -2937,11 +3001,17 @@ msgid "Specify the secret encryption key here." msgstr "" msgid "Start" -msgstr "" +msgstr "Başlat" msgid "Start priority" msgstr "" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "" @@ -2967,16 +3037,16 @@ msgid "" msgstr "" msgid "Status" -msgstr "" +msgstr "Durum" msgid "Stop" -msgstr "" +msgstr "Durdur" msgid "Strict order" msgstr "" msgid "Submit" -msgstr "" +msgstr "Gönder" msgid "Suppress logging" msgstr "" @@ -3019,7 +3089,7 @@ msgid "Synchronizing..." msgstr "" msgid "System" -msgstr "" +msgstr "Sistem" msgid "System Log" msgstr "" @@ -3088,9 +3158,22 @@ msgid "" "code> and _" msgstr "" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3108,9 +3191,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "" @@ -3163,11 +3243,6 @@ msgid "" "settings." msgstr "" -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3176,7 +3251,7 @@ msgstr "" msgid "There are no active leases." msgstr "" -msgid "There are no pending changes to apply!" +msgid "There are no changes to apply." msgstr "" msgid "There are no pending changes to revert!" @@ -3266,7 +3341,8 @@ msgstr "" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" msgid "Tone" @@ -3311,15 +3387,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3344,9 +3411,27 @@ msgstr "" msgid "UUID" msgstr "" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3356,6 +3441,9 @@ msgstr "" msgid "Unknown Error, password not changed!" msgstr "" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "" @@ -3365,9 +3453,18 @@ msgstr "" msgid "Unsaved Changes" msgstr "" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "" +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "" @@ -3381,10 +3478,10 @@ msgid "Upload archive..." msgstr "" msgid "Uploaded File" -msgstr "" +msgstr "Yüklenen Dosya" msgid "Uptime" -msgstr "" +msgstr "Açılma süresi" msgid "Use /etc/ethers" msgstr "" @@ -3417,16 +3514,16 @@ msgid "Use builtin IPv6-management" msgstr "" msgid "Use custom DNS servers" -msgstr "" +msgstr "Özel DNS sunucularını kullan" msgid "Use default gateway" -msgstr "" +msgstr "Varsayılan ağ geçidini kullan" msgid "Use gateway metric" -msgstr "" +msgstr "Ağ geçidi metriğini kullan" msgid "Use routing table" -msgstr "" +msgstr "Yönlendirme tablosunu kullan" msgid "" "Use the Add Button to add a new lease entry. The MAC-AddressDNS file" msgstr "yerel DNS dosyası" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" +msgstr "dakika" + +msgid "mixed WPA/WPA2" msgstr "" msgid "no" msgstr "hayır" msgid "no link" -msgstr "" +msgstr "bağlantı yok" msgid "none" msgstr "hiçbiri" msgid "not present" -msgstr "" +msgstr "mevcut değil" msgid "off" msgstr "kapalı" @@ -3719,31 +3803,34 @@ msgid "on" msgstr "açık" msgid "open" +msgstr "açık" + +msgid "output" msgstr "" msgid "overlay" -msgstr "" +msgstr "bindirilmiş" msgid "random" -msgstr "" +msgstr "rastgele" msgid "relay mode" -msgstr "" +msgstr "anahtarlama modu" msgid "routed" msgstr "yönlendirildi" msgid "server mode" -msgstr "" +msgstr "sunucu modu" msgid "stateful-only" msgstr "" msgid "stateless" -msgstr "" +msgstr "durumsuz" msgid "stateless + stateful" -msgstr "" +msgstr "durumsuz + durumlu" msgid "tagged" msgstr "etiketlendi" @@ -3752,7 +3839,7 @@ msgid "time units (TUs / 1.024 ms) [1000-65535]" msgstr "" msgid "unknown" -msgstr "" +msgstr "bilinmeyen" msgid "unlimited" msgstr "sınırsız" @@ -3772,6 +3859,21 @@ msgstr "evet" msgid "« Back" msgstr "« Geri" +#~ msgid "Activate this network" +#~ msgstr "Bu ağı etkinleştir" + +#~ msgid "Sort" +#~ msgstr "Sıralama" + +#~ msgid "help" +#~ msgstr "yardım" + +#~ msgid "Apply" +#~ msgstr "Uygula" + +#~ msgid "Applying changes" +#~ msgstr "Değişiklikleri uygula" + #~ msgid "Action" #~ msgstr "Eylem" diff --git a/luci-base/po/uk/base.po b/luci-base/po/uk/base.po index 8ead61607..845f9adde 100644 --- a/luci-base/po/uk/base.po +++ b/luci-base/po/uk/base.po @@ -1,28 +1,27 @@ msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 2013-12-05 19:07+0200\n" -"Last-Translator: Dmitri <4glitch@gmail.com>\n" +"Project-Id-Version: \n" +"PO-Revision-Date: 2018-07-20 11:30+0300\n" +"Last-Translator: Yurii \n" "Language-Team: none\n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.6\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" msgid "%.1f dB" -msgstr "" +msgstr "%.1f дБ" msgid "%s is untagged in multiple VLANs!" -msgstr "" +msgstr "%s є непозначеним у декількох VLAN!" msgid "(%d minute window, %d second interval)" -msgstr "(%d-хвилинне вікно, %d-секундний інтервал)" +msgstr "(вікно - %d хв, інтервал - %d с)" msgid "(%s available)" -msgstr "(%s доступно)" +msgstr "(доступно %s)" msgid "(empty)" msgstr "(пусто)" @@ -34,19 +33,22 @@ msgid "-- Additional Field --" msgstr "-- Додаткові поля --" msgid "-- Please choose --" -msgstr "-- Виберіть --" +msgstr "-- Оберіть --" msgid "-- custom --" msgstr "-- нетипово --" msgid "-- match by device --" -msgstr "" +msgstr "-- відповідно пристрою --" msgid "-- match by label --" -msgstr "" +msgstr "-- відповідно мітці --" msgid "-- match by uuid --" -msgstr "" +msgstr "-- відповідно UUID --" + +msgid "-- please select --" +msgstr "-- виберіть --" msgid "1 Minute Load:" msgstr "Навантаження за 1 хвилину:" @@ -55,34 +57,35 @@ msgid "15 Minute Load:" msgstr "Навантаження за 15 хвилин:" msgid "4-character hexadecimal ID" -msgstr "" +msgstr "4-симв. шістнадцятковий ID" msgid "464XLAT (CLAT)" -msgstr "" +msgstr "464XLAT (CLAT)" msgid "5 Minute Load:" msgstr "Навантаження за 5 хвилин:" msgid "6-octet identifier as a hex string - no colons" msgstr "" +"6-октетний ідентифікатор у вигляді шістнадцяткового рядка – без двокрапок" msgid "802.11r Fast Transition" -msgstr "" +msgstr "Швидкий перехід 802.11r" msgid "802.11w Association SA Query maximum timeout" -msgstr "" +msgstr "Максимальний тайм-аут запиту асоціації 802.11w" msgid "802.11w Association SA Query retry timeout" -msgstr "" +msgstr "Тайм-аут повторювання запиту асоціації 802.11w" msgid "802.11w Management Frame Protection" -msgstr "" +msgstr "Захист кадрів управління 802.11w" msgid "802.11w maximum timeout" -msgstr "" +msgstr "Максимальний тайм-аут 802.11w" msgid "802.11w retry timeout" -msgstr "" +msgstr "Тайм-аут повторювання 802.11w" msgid "BSSID" msgstr "" @@ -104,7 +107,7 @@ msgid "" "order of the resolvfile" msgstr "" "DNS-" -"сервери будуть опитані у порядку, визначеному файлом resolvfile" +"сервери буде опитано в порядку, визначеному файлом resolvfile" msgid "ESSID" msgstr "" @@ -131,11 +134,11 @@ msgid "IPv6-Gateway" msgstr "IPv6-шлюз" msgid "IPv6-Suffix (hex)" -msgstr "" +msgstr "IPv6-суфікс (hex)" msgid "LED Configuration" msgstr "" -"Настроювання LED" +"Налаштування LED" msgid "LED Name" msgstr "Назва LED" @@ -146,33 +149,32 @@ msgstr "" "abbr>-адреса" msgid "DUID" -msgstr "" +msgstr "DUID" msgid "" "Max. DHCP leases" msgstr "" -"Max. оренд Макс. оренд DHCP" msgid "" "Max. EDNS0 packet size" msgstr "" -"Max. розмір пакета EDNS0" +"Макс. розмір пакета EDNS0" msgid "Max. concurrent queries" -msgstr "Max. одночасних запитів" - -msgid "%s - %s" -msgstr "%s - %s" +msgstr "Макс. одночасних запитів" msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." msgstr "" +"
Примітка: якщо перед редагуванням, файл crontab був порожній, вам " +"потрібно вручну перезапустити служби cron." msgid "A43C + J43 + A43" msgstr "" @@ -183,9 +185,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -194,10 +193,12 @@ msgstr "" "APN" msgid "ARP retry threshold" -msgstr "Поріг повтору ARP" +msgstr "Поріг повторювання ARP" msgid "ATM (Asynchronous Transfer Mode)" msgstr "" +"ATM" msgid "ATM Bridges" msgstr "ATM-мости" @@ -217,7 +218,7 @@ msgid "" "Linux network interfaces which can be used in conjunction with DHCP or PPP " "to dial into the provider network." msgstr "" -"ATM-мости виставляють інкапсульований Ethernet у з'єднаннях AAL5 як " +"ATM-мости виставляють інкапсульований Ethernet у з’єднаннях AAL5 як " "віртуальні мережеві інтерфейси Linux, котрі можуть використовуватися в " "поєднанні з DHCP або PPP для підключення до мережі провайдера." @@ -227,9 +228,6 @@ msgstr "Номер ATM-пристрою" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "Концентратор доступу" @@ -239,14 +237,11 @@ msgstr "Точка доступу" msgid "Actions" msgstr "Дії" -msgid "Activate this network" -msgstr "Активувати цю мережу" - msgid "Active IPv4-Routes" msgstr "IPv4-маршрути" msgid "Active IPv6-Routes" -msgstr "IPv6-маршрути" +msgstr "IPv6-маршрути" msgid "Active Connections" msgstr "Активні підключення" @@ -273,7 +268,7 @@ msgid "Additional Hosts files" msgstr "Додаткові файли hosts" msgid "Additional servers file" -msgstr "" +msgstr "Додаткові файли servers" msgid "Address" msgstr "Адреса" @@ -288,29 +283,44 @@ msgid "Advanced Settings" msgstr "Додаткові параметри" msgid "Aggregate Transmit Power(ACTATP)" -msgstr "" +msgstr "Сумарна потужність передавання" msgid "Alert" msgstr "Тривога" +msgid "Alias Interface" +msgstr "Інтерфейс псевдоніма" + +msgid "Alias of \"%s\"" +msgstr "Псевдонім \"%s\"" + +msgid "All Servers" +msgstr "Усі сервери" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" -msgstr "" +msgstr "Виділяти IP-адреси послідовно, починаючи з найнижчої доступної адреси" msgid "Allocate IP sequentially" -msgstr "" +msgstr "Виділяти IP послідовно" msgid "Allow SSH password authentication" msgstr "" "Дозволити SSH-" "перевірку пароля" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" +"Дозволити режиму AP відключення абонентів на підставі низького рівня ACK" + msgid "Allow all except listed" msgstr "Дозволити всі, крім зазначених" msgid "Allow legacy 802.11b rates" -msgstr "" +msgstr "Дозволити застарілі швидкості 802.11b" msgid "Allow listed only" msgstr "Дозволити тільки зазначені" @@ -320,7 +330,8 @@ msgstr "Дозволити локальний вузол" msgid "Allow remote hosts to connect to local SSH forwarded ports" msgstr "" -"Дозволити віддаленим вузлам підключення до локальних SSH-спрямованих портів" +"Дозволити віддаленим вузлам підключення до локальних переспрямованих портів " +"SSH" msgid "Allow root logins with password" msgstr "Дозволити root-вхід із паролем" @@ -331,19 +342,22 @@ msgstr "Дозволити користувачеві root вхід у msgid "" "Allow upstream responses in the 127.0.0.0/8 range, e.g. for RBL services" msgstr "" -"Дозволити відповіді від клієнта на сервер у діапазоні 127.0.0.0/8, " +"Дозволити висхідні відповіді від клієнта на сервер у діапазоні 127.0.0.0/8, " "наприклад, для RBL-послуг" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" -msgstr "" - msgid "Always announce default router" +msgstr "Завжди оголошувати типовим маршрутизатором" + +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" +"Завжди використовувати канали 40 МГц, навіть якщо вторинний канал " +"перекривається. Використання цієї опції не відповідає стандарту IEEE " +"802.11n-2009!" msgid "Annex" msgstr "" @@ -392,21 +406,23 @@ msgstr "" msgid "Announce as default router even if no public prefix is available." msgstr "" +"Оголошувати типовим маршрутизатором, навіть якщо немає доступного публічного " +"префікса." msgid "Announced DNS domains" -msgstr "" +msgstr "Оголошено DNS-домени" msgid "Announced DNS servers" -msgstr "" +msgstr "Оголошено DNS-сервери" msgid "Anonymous Identity" -msgstr "" +msgstr "Анонімне посвідчення" msgid "Anonymous Mount" -msgstr "" +msgstr "Анонімне монтування" msgid "Anonymous Swap" -msgstr "" +msgstr "Анонімний своп" msgid "Antenna 1" msgstr "Антена 1" @@ -420,15 +436,20 @@ msgstr "Конфигурація антени" msgid "Any zone" msgstr "Будь-яка зона" -msgid "Apply" -msgstr "Застосувати" +msgid "Apply request failed with status %h" +msgstr "Сталася помилка запиту на застосування зі статусом %h" -msgid "Applying changes" -msgstr "Застосування змін" +msgid "Apply unchecked" +msgstr "Застосування не позначено" + +msgid "Architecture" +msgstr "Архітектура" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" msgstr "" +"Призначати частину заданої довжини до кожного публічного IPv6-префікса цього " +"інтерфейсу" msgid "Assign interfaces..." msgstr "Призначення інтерфейсів..." @@ -436,18 +457,23 @@ msgstr "Призначення інтерфейсів..." msgid "" "Assign prefix parts using this hexadecimal subprefix ID for this interface." msgstr "" +"Призначати для цього інтерфейсу частину префікса, використовуючи цей " +"шістнадцятковий ID субпрефікса." msgid "Associated Stations" -msgstr "Приєднані станції" +msgstr "Приєднано станції" + +msgid "Associations" +msgstr "З’єднань" msgid "Auth Group" -msgstr "" +msgstr "Група автентифікації" msgid "Authentication" msgstr "Автентифікація" msgid "Authentication Type" -msgstr "" +msgstr "Тип автентифікації" msgid "Authoritative" msgstr "Надійний" @@ -459,25 +485,26 @@ msgid "Auto Refresh" msgstr "Автоматичне оновлення" msgid "Automatic" -msgstr "" +msgstr "Автоматично" msgid "Automatic Homenet (HNCP)" -msgstr "" +msgstr "Автоматично Homenet (HNCP)" msgid "Automatically check filesystem for errors before mounting" msgstr "" +"Автоматично перевіряти файлову систему на наявність помилок перед монтуванням" msgid "Automatically mount filesystems on hotplug" -msgstr "" +msgstr "Автоматично монтувати файлові системи при оперативниму підключенні" msgid "Automatically mount swap on hotplug" -msgstr "" +msgstr "Автоматично монтувати своп при оперативниму підключенні" msgid "Automount Filesystem" -msgstr "" +msgstr "Автомонтування ФС" msgid "Automount Swap" -msgstr "" +msgstr "Автомонтування своп" msgid "Available" msgstr "Доступно" @@ -515,23 +542,23 @@ msgstr "Повернутися до переліку" msgid "Back to scan results" msgstr "Повернутися до результатів сканування" -msgid "Backup / Flash Firmware" -msgstr "Резервне копіювання / Оновлення прошивки" +msgid "Backup" +msgstr "Резервне копіювання" -msgid "Backup / Restore" -msgstr "Резервне копіювання/відновлення" +msgid "Backup / Flash Firmware" +msgstr "Резервне копіювання / Прошивка мікропрограми" msgid "Backup file list" msgstr "Список файлів резервних копій" msgid "Bad address specified!" -msgstr "Вказана неправильна адреса!" +msgstr "Вказано неправильну адресу!" msgid "Band" msgstr "" -msgid "Behind NAT" -msgstr "" +msgid "Beacon Interval" +msgstr "Інтервал маяка" msgid "" "Below is the determined list of files to backup. It consists of changed " @@ -543,16 +570,16 @@ msgstr "" "базових файлів, та файлів за користувацькими шаблонами резервного копіювання." msgid "Bind interface" -msgstr "" +msgstr "Прив’язка інтерфейсу" msgid "Bind only to specific interfaces rather than wildcard address." -msgstr "" +msgstr "Прив’язка тільки до певних інтерфейсів, а не шаблонної адреси." msgid "Bind the tunnel to this interface (optional)." -msgstr "" +msgstr "Прив’язка тунелю до цього інтерфейсу (за бажання)." msgid "Bitrate" -msgstr "Швидкість передачі даних" +msgstr "Швидкість передавання даних" msgid "Bogus NX Domain Override" msgstr "Відкидати підробки NX-домену" @@ -561,7 +588,7 @@ msgid "Bridge" msgstr "Міст" msgid "Bridge interfaces" -msgstr "Об'єднати інтерфейси в міст" +msgstr "Об’єднати інтерфейси в міст" msgid "Bridge unit number" msgstr "Номер моста" @@ -582,18 +609,24 @@ msgid "" "Build/distribution specific feed definitions. This file will NOT be " "preserved in any sysupgrade." msgstr "" +"Специфічні для збірки/поширення визначення каналів. Цей файл НЕ БУДЕ " +"збережено при будь-якому оновленні системи." msgid "CA certificate; if empty it will be saved after the first connection." msgstr "" +"Сертифікат CA; якщо порожньо, його буде збережено після першого підключення." msgid "CPU usage (%)" msgstr "Завантаження ЦП, %" +msgid "Call failed" +msgstr "Не вдалося здійснити виклик" + msgid "Cancel" msgstr "Скасувати" msgid "Category" -msgstr "" +msgstr "Категорія" msgid "Chain" msgstr "Ланцюжок" @@ -604,20 +637,30 @@ msgstr "Зміни" msgid "Changes applied." msgstr "Зміни застосовано." +msgid "Changes have been reverted." +msgstr "Зміни було скасовано." + msgid "Changes the administrator password for accessing the device" msgstr "Зміна пароля адміністратора для доступу до пристрою" msgid "Channel" msgstr "Канал" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" +"Канал %d не доступний у %s регуляторному домені й був автоматично " +"скоригований на %d." + msgid "Check" msgstr "Перевірити" msgid "Check filesystems before mount" -msgstr "" +msgstr "Перевірити файлову систему перед монтуванням" msgid "Check this option to delete the existing networks from this radio." -msgstr "" +msgstr "Позначте цей параметр, щоб видалити існуючі мережі з цього радіо." msgid "Checksum" msgstr "Контрольна сума" @@ -644,16 +687,14 @@ msgid "Cipher" msgstr "Шифр" msgid "Cisco UDP encapsulation" -msgstr "" +msgstr "Інкапсуляція UDP Cisco" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" "Натисніть кнопку \"Створити архів\", щоб завантажити tar-архів поточних " -"файлів конфігурації. Для відновлення прошивки до її початкового стану, " -"натисніть кнопку \"Відновити\" (можливе тільки з образами SquashFS)." +"файлів конфігурації." msgid "Client" msgstr "Клієнт" @@ -665,8 +706,8 @@ msgid "" "Close inactive connection after the given amount of seconds, use 0 to " "persist connection" msgstr "" -"Закривати неактивні з'єднання після певного інтервалу часу (секунди). Для " -"утримання неактивних з'єднань використовуйте 0" +"Закривати неактивні з’єднання після певного інтервалу часу (секунди). Для " +"утримання неактивних з’єднань використовуйте 0" msgid "Close list..." msgstr "Згорнути список..." @@ -686,15 +727,25 @@ msgid "" "workaround might cause interoperability issues and reduced robustness of key " "negotiation especially in environments with heavy traffic load." msgstr "" +"Ускладнює атаки перевстановлення ключа на стороні клієнта, відключаючи " +"ретрансляцію кадрів EAPOL-Key, що використовуються для встановлення ключів. " +"Може викликати проблеми сумісності та зниження стійкості узгодження ключа, " +"особливо в середовищах з великою завантаженістю трафіку." msgid "Configuration" msgstr "Конфігурація" -msgid "Configuration applied." -msgstr "Конфігурація застосована." +msgid "Configuration failed" +msgstr "Помилка налаштування" msgid "Configuration files will be kept." -msgstr "Конфігураційні файли будуть збережені." +msgstr "Конфігураційні файли буде збережено." + +msgid "Configuration has been applied." +msgstr "Конфігурацію застосовано." + +msgid "Configuration has been rolled back!" +msgstr "Конфігурацію було відкочено!" msgid "Confirmation" msgstr "Підтвердження" @@ -703,17 +754,27 @@ msgid "Connect" msgstr "Підключити" msgid "Connected" -msgstr "Підключений" +msgstr "Підключено" msgid "Connection Limit" msgstr "Гранична кількість підключень" -msgid "Connection to server fails when TLS cannot be used" -msgstr "" +msgid "Connection attempt failed" +msgstr "Невдала спроба підключення" msgid "Connections" msgstr "Підключення" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" +"Після застосування змін конфігурації не вдалося відновити доступ до " +"пристрою. Вам, можливо, знадобитися повторне підключення, якщо ви змінили " +"налаштування мережі, такі як IP-адреса або облікові дані безпеки бездротової " +"мережі." + msgid "Country" msgstr "Країна" @@ -745,31 +806,32 @@ msgid "Custom Interface" msgstr "Інтерфейс користувача" msgid "Custom delegated IPv6-prefix" -msgstr "" +msgstr "Користувацький делегований префікс IPv6" msgid "" "Custom feed definitions, e.g. private feeds. This file can be preserved in a " "sysupgrade." msgstr "" +"Користувацькі визначення каналів, наприклад, приватних. Цей файл може бути " +"збережено при оновленні системи." msgid "Custom feeds" -msgstr "" +msgstr "Користувацькі канали" msgid "" "Custom files (certificates, scripts) may remain on the system. To prevent " "this, perform a factory-reset first." msgstr "" +"Користувацькі файли (сертифікати, скрипти) можуть залишитися в системі. Щоб " +"запобігти цьому, спочатку виконайте скидання до заводських налаштувань." msgid "" "Customizes the behaviour of the device LEDs if possible." msgstr "" -"Настроювання поведінки LED, якщо це можливо." -msgid "DHCP Leases" -msgstr "Оренди DHCP" - msgid "DHCP Server" msgstr "Сервер DHCP" @@ -782,53 +844,55 @@ msgstr "Клієнт DHCP" msgid "DHCP-Options" msgstr "Параметри DHCP" -msgid "DHCPv6 Leases" -msgstr "Оренди DHCPv6" - msgid "DHCPv6 client" -msgstr "" +msgstr "Клієнт DHCPv6" msgid "DHCPv6-Mode" -msgstr "" +msgstr "Режим DHCPv6" msgid "DHCPv6-Service" -msgstr "" +msgstr "Служба DHCPv6" msgid "DNS" msgstr "DNS" msgid "DNS forwardings" -msgstr "Спрямовування DNS-запитів" +msgstr "Переспрямовування
запитів DNS" msgid "DNS-Label / FQDN" -msgstr "" +msgstr "DNS-мітка / FQDN" msgid "DNSSEC" msgstr "" msgid "DNSSEC check unsigned" -msgstr "" +msgstr "Перевірка непідписаного DNSSEC" msgid "DPD Idle Timeout" -msgstr "" +msgstr "Тайм-аут простою DPD" msgid "DS-Lite AFTR address" -msgstr "" +msgstr "AFTR-адреса DS-Lite" msgid "DSL" -msgstr "" +msgstr "DSL" msgid "DSL Status" -msgstr "" +msgstr "Стан DSL" msgid "DSL line mode" +msgstr "Режим лінії DSL" + +msgid "DTIM Interval" msgstr "" +"Інтервал DTIM" msgid "DUID" msgstr "DUID" msgid "Data Rate" -msgstr "" +msgstr "Швидк. передавання" msgid "Debug" msgstr "Зневаджування" @@ -842,9 +906,6 @@ msgstr "Типовий шлюз" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "Типовий стан" @@ -866,6 +927,9 @@ msgstr "Видалити" msgid "Delete this network" msgstr "Видалити цю мережу" +msgid "Delivery Traffic Indication Message Interval" +msgstr "Інтервал повідомлень індикації доправлення трафіку" + msgid "Description" msgstr "Опис" @@ -882,16 +946,19 @@ msgid "Device Configuration" msgstr "Конфігурація пристрою" msgid "Device is rebooting..." -msgstr "" +msgstr "Пристрій перезавантажується..." -msgid "Device unreachable" -msgstr "" +msgid "Device unreachable!" +msgstr "Пристрій недосяжний!" + +msgid "Device unreachable! Still waiting for device..." +msgstr "Пристрій недосяжний! Досі чекаємо на пристрій..." msgid "Diagnostics" msgstr "Діагностика" msgid "Dial number" -msgstr "" +msgstr "Набір номера" msgid "Directory" msgstr "Каталог" @@ -907,22 +974,34 @@ msgstr "" "динамічної конфігурації вузла\">DHCP для цього інтерфейсу." msgid "Disable DNS setup" -msgstr "Вимкнути настроювання DNS" +msgstr "Вимкнути налаштування DNS" msgid "Disable Encryption" -msgstr "" +msgstr "Вимкнути шифрування" + +msgid "Disable this network" +msgstr "Вимкнути цю мережу" msgid "Disabled" msgstr "Вимкнено" msgid "Disabled (default)" -msgstr "" +msgstr "Вимкнено (типово)" + +msgid "Disassociate On Low Acknowledgement" +msgstr "Роз'єднувати за низького підтвердження" msgid "Discard upstream RFC1918 responses" -msgstr "Відкидати RFC1918-відповіді від клієнта на сервер" +msgstr "Відкидати висхідні RFC1918-відповіді" + +msgid "Disconnection attempt failed" +msgstr "Спроба від’єднання не вдалася" + +msgid "Dismiss" +msgstr "Відхилити" msgid "Displaying only packages containing" -msgstr "Показані тільки непорожні пакети" +msgstr "Відображення лише непорожніх пакетів" msgid "Distance Optimization" msgstr "Оптимізація за відстанню" @@ -931,7 +1010,7 @@ msgid "Distance to farthest network member in meters." msgstr "Відстань до найвіддаленішого вузла мережі в метрах." msgid "Distribution feeds" -msgstr "" +msgstr "Канали поширення" msgid "Diversity" msgstr "Різновидність" @@ -944,20 +1023,22 @@ msgid "" msgstr "" "Dnsmasq являє собою комбінований DHCP-сервер і " -"DNS-" -"транспортер для брандмауерів NAT" +"DNS-проксі " +"для брандмауерів NAT" msgid "Do not cache negative replies, e.g. for not existing domains" msgstr "Не кешувати негативні відповіді, наприклад, за неіснуючих доменів" msgid "Do not forward requests that cannot be answered by public name servers" msgstr "" -"Не спрямовувати запити, які не можуть бути оброблені публічними серверами " +"Не переспрямовувати запити, які не може бути оброблено відкритими серверами " "імен" msgid "Do not forward reverse lookups for local networks" -msgstr "Не спрямовувати зворотний перегляд для локальних мереж" +msgstr "" +"Не переспрямовувати зворотні DNS-запити для локальних мереж" msgid "Domain required" msgstr "Потрібен домен" @@ -966,16 +1047,19 @@ msgid "Domain whitelist" msgstr "\"Білий список\" доменів" msgid "Don't Fragment" -msgstr "" +msgstr "Не фрагментувати" msgid "" "Don't forward DNS-Requests without " "DNS-Name" msgstr "" -"Не пересилати DNS-запити без DNS-імені" +msgid "Down" +msgstr "Вниз" + msgid "Download and install package" msgstr "Завантажити та інсталювати пакети" @@ -983,7 +1067,7 @@ msgid "Download backup" msgstr "Завантажити резервну копію" msgid "Downstream SNR offset" -msgstr "" +msgstr "Низхідний зсув SNR" msgid "Dropbear Instance" msgstr "Реалізація Dropbear" @@ -1014,7 +1098,7 @@ msgstr "" "обслуговуватися тільки клієнти, які мають статичні оренди." msgid "EA-bits length" -msgstr "" +msgstr "Довжина EA-бітів" msgid "EAP-Method" msgstr "EAP-Метод" @@ -1026,6 +1110,8 @@ msgid "" "Edit the raw configuration data above to fix any error and hit \"Save\" to " "reload the page." msgstr "" +"Щоб виправити якусь помилку, відредагуйте вихідні дані конфігурації вище і " +"натисніть \"Зберегти\", щоб перезавантажити сторінку." msgid "Edit this interface" msgstr "Редагувати цей інтерфейс" @@ -1043,6 +1129,8 @@ msgid "" "Enable IGMP " "snooping" msgstr "" +"Увімкнути відстеження IGMP" msgid "Enable STP" msgstr "Увімкнути STP" @@ -1051,19 +1139,19 @@ msgid "Enable HE.net dynamic endpoint update" msgstr "Увімкнути динамічне оновлення кінцевої точки HE.net" msgid "Enable IPv6 negotiation" -msgstr "" +msgstr "Увімкнути узгодження IPv6" msgid "Enable IPv6 negotiation on the PPP link" -msgstr "Увімкнути узгодження IPv6 для PPP-з'єднань" +msgstr "Увімкнути узгодження IPv6 для PPP-з’єднань" msgid "Enable Jumbo Frame passthrough" msgstr "Пропускати Jumbo-фрейми" msgid "Enable NTP client" -msgstr "Увімкнути NTP-клієнт" +msgstr "Увімкнути клієнта NTP" msgid "Enable Single DES" -msgstr "" +msgstr "Увімкнути Single DES" msgid "Enable TFTP server" msgstr "Увімкнути TFTP-сервер" @@ -1072,28 +1160,31 @@ msgid "Enable VLAN functionality" msgstr "Увімкнути підтримку VLAN" msgid "Enable WPS pushbutton, requires WPA(2)-PSK" -msgstr "" +msgstr "Увімкнути кнопку WPS, потребує WPA(2)-PSK" msgid "Enable key reinstallation (KRACK) countermeasures" -msgstr "" +msgstr "Увімкнути протидію
перевстановленню ключів (KRACK)" msgid "Enable learning and aging" msgstr "Увімкнути learning та aging" msgid "Enable mirroring of incoming packets" -msgstr "" +msgstr "Увімкнути віддзеркалення вхідних пакетів" msgid "Enable mirroring of outgoing packets" -msgstr "" +msgstr "Увімкнути віддзеркалення вихідних пакетів" msgid "Enable the DF (Don't Fragment) flag of the encapsulating packets." -msgstr "" +msgstr "Увімкнути прапорець DF (Don't Fragment) для інкапсульованих пакетів." msgid "Enable this mount" msgstr "Увімкнути це монтування" +msgid "Enable this network" +msgstr "Увімкнути цю мережу" + msgid "Enable this swap" -msgstr "Увімкнути це довантаження" +msgstr "Увімкнути цей своп" msgid "Enable/Disable" msgstr "Увімкнено/Вимкнено" @@ -1102,16 +1193,18 @@ msgid "Enabled" msgstr "Увімкнено" msgid "Enables IGMP snooping on this bridge" -msgstr "" +msgstr "Вмикає відстеження IGMP на цьому мосту" msgid "" "Enables fast roaming among access points that belong to the same Mobility " "Domain" msgstr "" +"Вмикає швидкий роумінг між точками доступу, що належать до одного і того ж " +"домену мобільності" msgid "Enables the Spanning Tree Protocol on this bridge" msgstr "" -"Увімкнути STP на цьому мосту" +"Вмикає STP на цьому мосту" msgid "Encapsulation mode" msgstr "Режим інкапсуляції" @@ -1120,10 +1213,16 @@ msgid "Encryption" msgstr "Шифрування" msgid "Endpoint Host" -msgstr "" +msgstr "Хост кінцевої точки" msgid "Endpoint Port" -msgstr "" +msgstr "Порт кінцевої точки" + +msgid "Enter custom value" +msgstr "Введіть власне значення" + +msgid "Enter custom values" +msgstr "Введіть власні значення" msgid "Erasing..." msgstr "Видалення..." @@ -1132,22 +1231,22 @@ msgid "Error" msgstr "Помилка" msgid "Errored seconds (ES)" -msgstr "" +msgstr "Секунд з помилками (ES)" msgid "Ethernet Adapter" -msgstr "Адаптер Ethernet" +msgstr "Ethernet-адаптер" msgid "Ethernet Switch" msgstr "Ethernet-комутатор" msgid "Exclude interfaces" -msgstr "" +msgstr "Виключити інтерфейси" msgid "Expand hosts" msgstr "Розширення вузлів" msgid "Expires" -msgstr "Дійсний ще" +msgstr "Збігає за" #, fuzzy msgid "" @@ -1155,13 +1254,13 @@ msgid "" msgstr "Термін оренди адрес, мінімум 2 хвилини (2m)." msgid "External" -msgstr "" +msgstr "Зовнішнє" msgid "External R0 Key Holder List" -msgstr "" +msgstr "Зовнішній список власників ключів R0" msgid "External R1 Key Holder List" -msgstr "" +msgstr "Зовнішній список власників ключів R1" msgid "External system log server" msgstr "Зовнішній сервер системного журналу" @@ -1170,25 +1269,28 @@ msgid "External system log server port" msgstr "Порт зовнішнього сервера системного журналу" msgid "External system log server protocol" -msgstr "" +msgstr "Протокол зовнішнього сервера системного журналу" msgid "Extra SSH command options" -msgstr "" +msgstr "Додаткові параметри команд SSH" msgid "FT over DS" -msgstr "" +msgstr "FT через DS" msgid "FT over the Air" -msgstr "" +msgstr "FT через повітря" msgid "FT protocol" -msgstr "" +msgstr "Протокол FT" + +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "Не вдалося підтвердити застосування на протязі %d с, очікуємо відкату…" msgid "File" msgstr "Файл" msgid "Filename of the boot image advertised to clients" -msgstr "І'мя завантажувального образу, що оголошується клієнтам" +msgstr "І’мя завантажувального образу, що оголошується клієнтам" msgid "Filesystem" msgstr "Файлова система" @@ -1202,10 +1304,15 @@ msgstr "Фільтрувати приватні" msgid "Filter useless" msgstr "Фільтрувати непридатні" +msgid "Finalizing failed" +msgstr "Завершення не вдалося" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" msgstr "" +"Знайти всі файлові системи та свопи, які наразі підключено і замінити " +"конфігурацію типовою на підставі того, що було виявлено" msgid "Find and join network" msgstr "Знайти мережу й приєднатися" @@ -1220,41 +1327,44 @@ msgid "Firewall" msgstr "Брандмауер" msgid "Firewall Mark" -msgstr "" +msgstr "Позначка брандмауера" msgid "Firewall Settings" -msgstr "Настройки брандмауера" +msgstr "Налаштування брандмауера" msgid "Firewall Status" -msgstr "Статус брандмауера" +msgstr "Стан брандмауера" msgid "Firmware File" -msgstr "" +msgstr "Файл мікропрограми" msgid "Firmware Version" -msgstr "Версія прошивки" +msgstr "Версія мікропрограми" msgid "Fixed source port for outbound DNS queries" msgstr "Фіксований порт для вихідних DNS-запитів" msgid "Flash Firmware" -msgstr "Заливаємо прошивку" +msgstr "Прошиваємо мікропрограму" msgid "Flash image..." -msgstr "Відвантажити образ..." +msgstr "Прошити образ..." msgid "Flash new firmware image" -msgstr "Залити новий образ прошивки" +msgstr "Прошити новий образ мікропрограми" msgid "Flash operations" -msgstr "Операції заливання" +msgstr "Операції прошивання" msgid "Flashing..." -msgstr "Заливаємо..." +msgstr "Прошиваємо..." msgid "Force" msgstr "Примусово" +msgid "Force 40MHz mode" +msgstr "Примусово застосовувати режим '40MHz'" + msgid "Force CCMP (AES)" msgstr "Примусово CCMP (AES)" @@ -1268,28 +1378,28 @@ msgid "Force TKIP and CCMP (AES)" msgstr "Примусово TKIP та CCMP (AES)" msgid "Force link" -msgstr "" +msgstr "Примусове з’єднання" msgid "Force use of NAT-T" -msgstr "" +msgstr "Примусово використовувати NAT-T" msgid "Form token mismatch" -msgstr "" +msgstr "Неузгодженість маркера форми" msgid "Forward DHCP traffic" -msgstr "Спрямовувати DHCP-трафік" +msgstr "Переспрямовувати DHCP-трафік" msgid "Forward Error Correction Seconds (FECS)" -msgstr "" +msgstr "Секунди прямого коригування помилок (FECS)" msgid "Forward broadcast traffic" -msgstr "Спрямовувати широкомовний трафік" +msgstr "Переспрямовувати широкомовний трафік" msgid "Forward mesh peer traffic" -msgstr "" +msgstr "Переспрямовувати одноранговий трафік" msgid "Forwarding mode" -msgstr "Режим спрямовування" +msgstr "Режим переспрямовування" msgid "Fragmentation Threshold" msgstr "Поріг фрагментації" @@ -1305,8 +1415,10 @@ msgstr "Вільне місце" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" +"Більш детальна інформація про інтерфейси та вузли WireGuard на wireguard.com." msgid "GHz" msgstr "ГГц" @@ -1317,23 +1429,26 @@ msgstr "Тільки GPRS" msgid "Gateway" msgstr "Шлюз" +msgid "Gateway address is invalid" +msgstr "Неприпустима адреса шлюзу" + msgid "Gateway ports" msgstr "Порти шлюзу" msgid "General Settings" -msgstr "Загальні настройки" +msgstr "Загальні параметри" msgid "General Setup" -msgstr "Загальні настройки" +msgstr "Загальні налаштування" msgid "General options for opkg" -msgstr "" +msgstr "Загальні параметри OPKG" msgid "Generate Config" -msgstr "" +msgstr "Cтворити конфігурацію" msgid "Generate PMK locally" -msgstr "" +msgstr "Генерувати PMK локально" msgid "Generate archive" msgstr "Cтворити архів" @@ -1345,10 +1460,10 @@ msgid "Given password confirmation did not match, password not changed!" msgstr "Оскільки пароль і підтвердження не співпадають, то пароль не змінено!" msgid "Global Settings" -msgstr "" +msgstr "Загальні параметри" msgid "Global network options" -msgstr "" +msgstr "Глобальні параметри мережі" msgid "Go to password configuration..." msgstr "Перейти до конфігурації пароля..." @@ -1357,19 +1472,19 @@ msgid "Go to relevant configuration page" msgstr "Перейти до відповідної сторінки конфігурації" msgid "Group Password" -msgstr "" +msgstr "Пароль групи" msgid "Guest" -msgstr "" +msgstr "Гість" msgid "HE.net password" msgstr "Пароль HE.net" msgid "HE.net username" -msgstr "" +msgstr "Ім’я користувача HE.net" msgid "HT mode (802.11n)" -msgstr "" +msgstr "Режим HT (802.11n)" msgid "Hang Up" msgstr "Призупинити" @@ -1377,14 +1492,11 @@ msgstr "Призупинити" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." msgstr "" -"Тут ви можете настроїти основні параметри вигляду вашого пристрою, такі як " +"Тут ви можете налаштувати основні параметри вигляду вашого пристрою, такі як " "назва (ім’я) вузла або часовий пояс." msgid "" @@ -1394,16 +1506,13 @@ msgstr "" "Тут ви можете вставити відкриті SSH-ключі (по одному на рядок) для SSH з " "відкритим ключем автентифікації." -msgid "Hermes 802.11b Wireless Controller" -msgstr "Бездротовий 802.11b контролер Hermes" - msgid "Hide ESSID" msgstr "" "Приховати ESSID" msgid "Host" -msgstr "" +msgstr "Вузол" msgid "Host entries" msgstr "Записи вузлів" @@ -1414,35 +1523,44 @@ msgstr "Тайм-аут вузла" msgid "Host-IP or Network" msgstr "IP вузла або мережа" +msgid "Host-Uniq tag content" +msgstr "Зміст тегу Host-Uniq" + msgid "Hostname" -msgstr "Назва (ім'я) вузла" +msgstr "Назва (ім’я) вузла" msgid "Hostname to send when requesting DHCP" -msgstr "Ім'я вузла для надсилання при запиті DHCP" +msgstr "Ім’я вузла для надсилання при запиті DHCP" msgid "Hostnames" msgstr "Імена вузлів" msgid "Hybrid" -msgstr "" +msgstr "Гібрид" msgid "IKE DH Group" -msgstr "" +msgstr "Група IKE DH" msgid "IP Addresses" -msgstr "" +msgstr "IP-адреси" msgid "IP address" msgstr "IP-адреса" +msgid "IP address in invalid" +msgstr "Неприпустима IP-адреса" + +msgid "IP address is missing" +msgstr "Відсутня IP-адреса" + msgid "IPv4" msgstr "IPv4" msgid "IPv4 Firewall" msgstr "Брандмауер IPv4" -msgid "IPv4 WAN Status" -msgstr "Статус IPv4 WAN" +msgid "IPv4 Upstream" +msgstr "Висхідне з’єднання IPv4" msgid "IPv4 address" msgstr "Адреса IPv4" @@ -1451,7 +1569,7 @@ msgid "IPv4 and IPv6" msgstr "IPv4 та IPv6" msgid "IPv4 assignment length" -msgstr "" +msgstr "Довжина присвоювання IPv4" msgid "IPv4 broadcast" msgstr "Широкомовний IPv4" @@ -1466,7 +1584,7 @@ msgid "IPv4 only" msgstr "Тільки IPv4" msgid "IPv4 prefix" -msgstr "" +msgstr "Префікс IPv4" msgid "IPv4 prefix length" msgstr "Довжина префікса IPv4" @@ -1475,7 +1593,7 @@ msgid "IPv4-Address" msgstr "IPv4-адреса" msgid "IPv4-in-IPv4 (RFC2003)" -msgstr "" +msgstr "IPv4 у IPv4 (RFC2003)" msgid "IPv6" msgstr "IPv6" @@ -1484,28 +1602,27 @@ msgid "IPv6 Firewall" msgstr "Брандмауер IPv6" msgid "IPv6 Neighbours" -msgstr "" +msgstr "Сусіди IPv6" msgid "IPv6 Settings" -msgstr "" +msgstr "Налаштування IPv6" msgid "IPv6 ULA-Prefix" msgstr "" +"ULA-" +"префікс IPv6" -msgid "IPv6 WAN Status" -msgstr "Статус IPv6 WAN" +msgid "IPv6 Upstream" +msgstr "Висхідне з’єднання IPv6" msgid "IPv6 address" msgstr "Адреса IPv6" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" -msgstr "" +msgstr "Натяк призначення IPv6" msgid "IPv6 assignment length" -msgstr "" +msgstr "Довжина призначення IPv6" msgid "IPv6 gateway" msgstr "Шлюз IPv6" @@ -1520,10 +1637,10 @@ msgid "IPv6 prefix length" msgstr "Довжина префікса IPv6" msgid "IPv6 routed prefix" -msgstr "" +msgstr "Надісланий префікс IPv6" msgid "IPv6 suffix" -msgstr "" +msgstr "Суфікс IPv6" msgid "IPv6-Address" msgstr "IPv6-адреса" @@ -1541,13 +1658,13 @@ msgid "IPv6-over-IPv4 (6to4)" msgstr "IPv6 через IPv4 (6to4)" msgid "Identity" -msgstr "Ідентичність" +msgstr "Посвідчення" msgid "If checked, 1DES is enabled" -msgstr "" +msgstr "Якщо позначено, 1DES увімкнено" msgid "If checked, encryption is disabled" -msgstr "" +msgstr "Якщо позначено, шифрування вимкнено" msgid "" "If specified, mount the device by its UUID instead of a fixed device node" @@ -1559,11 +1676,11 @@ msgid "" "If specified, mount the device by the partition label instead of a fixed " "device node" msgstr "" -"Якщо обрано, монтувати пристрій за назвою його розділу замість фіксованого " +"Якщо обрано, монтувати пристрій за міткою його розділу замість фіксованого " "вузла пристрою" msgid "If unchecked, no default route is configured" -msgstr "Якщо не позначено, типовий маршрут не настроєно" +msgstr "Якщо не позначено, типовий маршрут не налаштовано" msgid "If unchecked, the advertised DNS server addresses are ignored" msgstr "Якщо не позначено, оголошувані адреси DNS-серверів ігноруються" @@ -1575,15 +1692,15 @@ msgid "" "slow process as the swap-device cannot be accessed with the high datarates " "of the RAM." msgstr "" -"Якщо фізичної пам'яті недостатньо, невикористовувані дані можуть тимчасово " +"Якщо фізичної пам’яті недостатньо, невикористовувані дані можуть тимчасово " "витіснятися на своп-пристрій, у результаті чого збільшується кількість " -"корисної оперативної пам'яті (RAMRAM). Майте на увазі, що свопінг даних є дуже повільним процесом, оскільки " "своп-пристрої не можуть бути доступні з такою високою швидкістю, як RAM." msgid "Ignore /etc/hosts" -msgstr "" +msgstr "Ігнорувати/etc/hosts" msgid "Ignore interface" msgstr "Ігнорувати интерфейс" @@ -1601,6 +1718,9 @@ msgid "" "In order to prevent unauthorized access to the system, your request has been " "blocked. Click \"Continue »\" below to return to the previous page." msgstr "" +"Щоб запобігти несанкціонованому доступу до системи, ваш запит було " +"заблоковано. Натисніть \"Продовжити »\" нижче, щоб повернутися до " +"попередньої сторінки." msgid "Inactivity timeout" msgstr "Тайм-аут бездіяльності" @@ -1611,6 +1731,9 @@ msgstr "Вхідний:" msgid "Info" msgstr "Інформація" +msgid "Initialization failure" +msgstr "Помилка ініціалізації" + msgid "Initscript" msgstr "Скрипт ініціалізації" @@ -1621,7 +1744,7 @@ msgid "Install" msgstr "Інсталювати" msgid "Install iputils-traceroute6 for IPv6 traceroute" -msgstr "" +msgstr "Інсталюйте iputils-traceroute6 для трасування IPv6" msgid "Install package %q" msgstr "Інсталяція пакета %q" @@ -1630,13 +1753,13 @@ msgid "Install protocol extensions..." msgstr "Інсталяція розширень протоколу..." msgid "Installed packages" -msgstr "Інстальовані пакети" +msgstr "Інстальовано пакети" msgid "Interface" msgstr "Інтерфейс" msgid "Interface %q device auto-migrated from %q to %q." -msgstr "" +msgstr "Пристрій інтерфейсу %q автоматичного мігрував із %q на %q." msgid "Interface Configuration" msgstr "Конфігурація інтерфейсу" @@ -1647,26 +1770,17 @@ msgstr "Огляд інтерфейсів" msgid "Interface is reconnecting..." msgstr "Перепідключення інтерфейсу..." -msgid "Interface is shutting down..." -msgstr "Інтерфейс завершує роботу..." - msgid "Interface name" -msgstr "" +msgstr "Ім’я інтерфейсу" msgid "Interface not present or not connected yet." -msgstr "Інтерфейс відсутній або ще не підключений." - -msgid "Interface reconnected" -msgstr "Інтерфейс перепідключено" - -msgid "Interface shut down" -msgstr "Інтерфейс завершив роботу" +msgstr "Інтерфейс відсутній або його ще не підключено." msgid "Interfaces" msgstr "Інтерфейси" msgid "Internal" -msgstr "" +msgstr "Внутрішній" msgid "Internal Server Error" msgstr "Внутрішня помилка сервера" @@ -1676,23 +1790,24 @@ msgstr "Неприпустимо" msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed." msgstr "" -"Задано невірний VLAN ID! Доступні тільки ідентифікатори в межах між %d і %d." +"Задано неприпустимий VLAN ID! Доступні тільки ідентифікатори в межах між %d " +"і %d." msgid "Invalid VLAN ID given! Only unique IDs are allowed" -msgstr "Задано невірний VLAN ID! Доступні тільки унікальні ідентифікатори." +msgstr "" +"Задано неприпустимий VLAN ID! Доступні тільки унікальні ідентифікатори." msgid "Invalid username and/or password! Please try again." msgstr "Неприпустиме ім’я користувача та/або пароль! Спробуйте ще раз." msgid "Isolate Clients" -msgstr "" +msgstr "Ізолювати клієнтів" -#, fuzzy msgid "" "It appears that you are trying to flash an image that does not fit into the " "flash memory, please verify the image file!" msgstr "" -"Схоже, що ви намагаєтеся залити образ, який не вміщається у флеш-пам'ять! " +"Схоже, що ви намагаєтеся прошити образ, який не вміщається до флеш-пам’яті! " "Перевірте файл образу!" msgid "JavaScript required!" @@ -1705,10 +1820,10 @@ msgid "Join Network: Wireless Scan" msgstr "Підключення до мережі: Сканування бездротових мереж" msgid "Joining Network: %q" -msgstr "" +msgstr "Приєднання до мережі: %q" msgid "Keep settings" -msgstr "Зберегти настройки" +msgstr "Зберегти налаштування" msgid "Kernel Log" msgstr "Журнал ядра" @@ -1750,13 +1865,13 @@ msgid "Language and Style" msgstr "Мова та стиль" msgid "Latency" -msgstr "" +msgstr "Затримка" msgid "Leaf" -msgstr "" +msgstr "Лист" msgid "Lease time" -msgstr "" +msgstr "Час оренди" msgid "Lease validity time" msgstr "Час чинності оренди" @@ -1781,31 +1896,33 @@ msgstr "Межа" msgid "Limit DNS service to subnets interfaces on which we are serving DNS." msgstr "" +"Обмежувати службу DNS інтерфейсами підмереж, на яких ми обслуговуємо DNS." msgid "Limit listening to these interfaces, and loopback." msgstr "" +"Обмежитися прослуховуванням цих інтерфейсів і повернутися до початку циклу." msgid "Line Attenuation (LATN)" -msgstr "" +msgstr "Затухання лінії" msgid "Line Mode" -msgstr "" +msgstr "Режим лінії" msgid "Line State" -msgstr "" +msgstr "Стан лінії" msgid "Line Uptime" -msgstr "" +msgstr "Час безперервної роботи лінії" msgid "Link On" -msgstr "Зв'язок встановлено" +msgstr "Зв’язок встановлено" msgid "" "List of DNS servers to forward " "requests to" msgstr "" -"Список DNS-серверів, до яких " -"пересилати запити" +"Список DNS-серверів для " +"переспрямовування запитів" msgid "" "List of R0KHs in the same Mobility Domain.
Format: MAC-address,NAS-" @@ -1814,6 +1931,13 @@ msgid "" "from the R0KH that the STA used during the Initial Mobility Domain " "Association." msgstr "" +"Список власників ключів R0 у тому ж домені мобільності.
Формат: MAC-" +"адреса,NAS-ідентифікатор,128-бітний ключ у вигляді шістнадцяткового рядка. " +"
Цей список використовується для відображення R0KH-ID (NAS-ідентифікатор) на " +"MAC-адреси призначення при запиті ключа PMK-R1 від R0KH, як станції, що була використана під час початкової " +"асоціації домену мобільності." msgid "" "List of R1KHs in the same Mobility Domain.
Format: MAC-address,R1KH-ID " @@ -1822,21 +1946,30 @@ msgid "" "R0KH. This is also the list of authorized R1KHs in the MD that can request " "PMK-R1 keys." msgstr "" +"Список власників ключів R1 у тому ж домені мобільності.
Формат: MAC-" +"адреса,R1KH-ID у " +"формі 6 октетів з двокрапками,128-бітний ключ у вигляді шістнадцяткового " +"рядка.
Цей список використовується для відображення R1KH-ID на MAC-адреси призначення " +"при передаванні ключа PMK-R1 від R0KH. Це також список авторизованих R1KH у формі MD, які можуть запитувати ключі PMK-R1." msgid "List of SSH key files for auth" -msgstr "" +msgstr "Список файлів SSH-ключів для авторизації" msgid "List of domains to allow RFC1918 responses for" -msgstr "Список доменів, для яких дозволені RFC1918-відповіді" +msgstr "Список доменів, для яких дозволено RFC1918-відповіді" msgid "List of hosts that supply bogus NX domain results" msgstr "Список доменів, які підтримують результати підробки NX-доменів" msgid "Listen Interfaces" -msgstr "" +msgstr "Інтерфейси прослуховування" msgid "Listen Port" -msgstr "" +msgstr "Порти прослуховування" msgid "Listen only on the given interface or, if unspecified, on all" msgstr "" @@ -1855,8 +1988,11 @@ msgstr "Середнє навантаження" msgid "Loading" msgstr "Завантаження" +msgid "Local IP address is invalid" +msgstr "Неприпустима локальна ІР-адреса" + msgid "Local IP address to assign" -msgstr "" +msgstr "Локальна IP-адреса для призначення" msgid "Local IPv4 address" msgstr "Локальна адреса IPv4" @@ -1865,7 +2001,7 @@ msgid "Local IPv6 address" msgstr "Локальна адреса IPv6" msgid "Local Service Only" -msgstr "" +msgstr "Тільки локальна служба" msgid "Local Startup" msgstr "Локальний запуск" @@ -1876,13 +2012,13 @@ msgstr "Місцевий час" msgid "Local domain" msgstr "Локальний домен" -#, fuzzy msgid "" "Local domain specification. Names matching this domain are never forwarded " "and are resolved from DHCP or hosts files only" msgstr "" -"Специфікація локальних доменів. Імена, зіставлені цьому домену, ніколи не " -"спрямовуються і виділяються тільки через DHCP або файли hosts" +"Специфікація локального домену. Імена, які зіставлено цьому домену, ніколи " +"не пересилаються і вирізняються тільки з файлу DHCP (/etc/config/dhcp) або " +"файлу hosts (/etc/hosts)" msgid "Local domain suffix appended to DHCP names and hosts file entries" msgstr "" @@ -1896,14 +2032,14 @@ msgid "" "Localise hostname depending on the requesting subnet if multiple IPs are " "available" msgstr "" -"Локалізувати ім'я хоста залежно від запитуючої підмережі, якщо доступні " +"Локалізувати ім’я хоста залежно від запитуючої підмережі, якщо доступно " "кілька IP-адрес" msgid "Localise queries" msgstr "Локалізувати запити" msgid "Locked to channel %s used by: %s" -msgstr "" +msgstr "Заблоковано до каналу %s, який використовує: %s" msgid "Log output level" msgstr "Рівень виведення інформаціі до журналу" @@ -1924,7 +2060,10 @@ msgid "Loss of Signal Seconds (LOSS)" msgstr "" msgid "Lowest leased address as offset from the network address." -msgstr "Найнижча орендована адреса" +msgstr "Найнижча орендована адреса." + +msgid "MAC" +msgstr "MAC" msgid "MAC-Address" msgstr "MAC-адреса" @@ -1941,6 +2080,9 @@ msgstr "MAC-список" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "Неприпустиме правило MAP" + msgid "MB/s" msgstr "MБ/с" @@ -1957,12 +2099,14 @@ msgid "" "Make sure to clone the root filesystem using something like the commands " "below:" msgstr "" +"Переконайтеся, що ви клонуєте кореневу файлову систему, використовуючи такі " +"команди:" msgid "Manual" -msgstr "" +msgstr "Вручну" msgid "Max. Attainable Data Rate (ATTNDR)" -msgstr "" +msgstr "Макс. досяжна швидкість передачі даних (ATTNDR)" msgid "Maximum allowed number of active DHCP leases" msgstr "Максимально допустима кількість активних оренд DHCP" @@ -1980,6 +2124,8 @@ msgid "" "Maximum length of the name is 15 characters including the automatic protocol/" "bridge prefix (br-, 6in4-, pppoe- etc.)" msgstr "" +"Максимальна довжина імені становить 15 символів, включаючи префікс " +"автоматичного протоколу/мосту (br-, 6in4-, pppoe та ін.)" msgid "Maximum number of leased addresses." msgstr "Максимальна кількість орендованих адрес." @@ -1988,43 +2134,46 @@ msgid "Mbit/s" msgstr "Мбіт/с" msgid "Memory" -msgstr "Пам'ять" +msgstr "Пам’ять" msgid "Memory usage (%)" -msgstr "Використання пам'яті, %" +msgstr "Використання пам’яті, %" msgid "Mesh Id" -msgstr "" +msgstr "Mesh Id" msgid "Metric" msgstr "Метрика" msgid "Mirror monitor port" -msgstr "" +msgstr "Дзеркало порту диспетчера" msgid "Mirror source port" -msgstr "" +msgstr "Дзеркало вихідного порту" msgid "Missing protocol extension for proto %q" msgstr "Відсутні розширення для протоколу %q" msgid "Mobility Domain" -msgstr "" +msgstr "Домен мобільності" msgid "Mode" msgstr "Режим" msgid "Model" -msgstr "" +msgstr "Модель" msgid "Modem device" msgstr "Модем" +msgid "Modem information query failed" +msgstr "Помилка запиту інформації про модем" + msgid "Modem init timeout" msgstr "Тайм-аут ініціалізації модему" msgid "Monitor" -msgstr "Монітор" +msgstr "Диспетчер" msgid "Mount Entry" msgstr "Вхід монтування" @@ -2036,20 +2185,20 @@ msgid "Mount Points" msgstr "Точки монтування" msgid "Mount Points - Mount Entry" -msgstr "Точки монтування - Записи монтування" +msgstr "Точки монтування – Записи монтування" msgid "Mount Points - Swap Entry" -msgstr "Точки монтування - Вхід довантаження" +msgstr "Точки монтування – Вхід свопу" msgid "" "Mount Points define at which point a memory device will be attached to the " "filesystem" msgstr "" -"Точки монтування визначають, до якої точки пристрою пам'яті буде прикріплена " -"файлова система" +"Точки монтування визначають, до якої точки пристрою пам’яті буде прикріплено " +"файлову систему" msgid "Mount filesystems not specifically configured" -msgstr "" +msgstr "Монтувати не конкретно налаштовані файлові системи" msgid "Mount options" msgstr "Опції монтування" @@ -2058,10 +2207,10 @@ msgid "Mount point" msgstr "Точка монтування" msgid "Mount swap not specifically configured" -msgstr "" +msgstr "Монтувати не конкретно налаштований своп" msgid "Mounted file systems" -msgstr "Змонтовані файлові системи" +msgstr "Змонтовано файлові системи" msgid "Move down" msgstr "Вниз" @@ -2076,34 +2225,31 @@ msgid "NAS ID" msgstr "Ідентифікатор NAS" msgid "NAT-T Mode" -msgstr "" +msgstr "Режим NAT-T" msgid "NAT64 Prefix" -msgstr "" +msgstr "Префікс NAT64" msgid "NCM" -msgstr "" +msgstr "NCM" msgid "NDP-Proxy" -msgstr "" +msgstr "NDP-проксі" msgid "NT Domain" -msgstr "" +msgstr "Домен NT" msgid "NTP server candidates" msgstr "Кандидати для синхронізації NTP-сервера" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" -msgstr "Ім'я" +msgstr "Ім’я" msgid "Name of the new interface" -msgstr "Ім'я нового інтерфейсу" +msgstr "Ім’я нового інтерфейсу" msgid "Name of the new network" -msgstr "Назва (ім'я) нової мережі" +msgstr "Назва (ім’я) нової мережі" msgid "Navigation" msgstr "Навігація" @@ -2120,6 +2266,9 @@ msgstr "Мережеві утиліти" msgid "Network boot image" msgstr "Образ для мережевого завантаження" +msgid "Network device is not present" +msgstr "Мережевий пристрій відсутній" + msgid "Network without interfaces." msgstr "Мережа без інтерфейсів." @@ -2127,13 +2276,13 @@ msgid "Next »" msgstr "Наступний »" msgid "No DHCP Server configured for this interface" -msgstr "Немає DHCP-сервера, настроєного для цього інтерфейсу" +msgstr "Немає DHCP-сервера, налаштованого для цього інтерфейсу" msgid "No NAT-T" -msgstr "" +msgstr "Немає NAT-T" msgid "No chains in this table" -msgstr "У цій таблиці нема ланцюжків" +msgstr "У цій таблиці немає ланцюжків" msgid "No files found" msgstr "Файли не знайдено" @@ -2141,14 +2290,17 @@ msgstr "Файли не знайдено" msgid "No information available" msgstr "Інформація відсутня" +msgid "No matching prefix delegation" +msgstr "Делегування відповідних префіксів відсутнє" + msgid "No negative cache" msgstr "Ніяких негативних кешувань" msgid "No network configured on this device" -msgstr "На цьому пристрої нема настроєної мережі" +msgstr "На цьому пристрої немає налаштованої мережі" msgid "No network name specified" -msgstr "Ім'я мережі не визначене" +msgstr "Ім’я мережі не визначено" msgid "No package lists available" msgstr "Немає доступних списків пакетів" @@ -2159,23 +2311,26 @@ msgstr "Пароль не встановлено!" msgid "No rules in this chain" msgstr "У цьму ланцюжку нема правил" +msgid "No scan results available yet..." +msgstr "Результати сканування наразі недоступні" + msgid "No zone assigned" -msgstr "Зона не призначена" +msgstr "Зону не призначено" msgid "Noise" msgstr "Шум" msgid "Noise Margin (SNR)" -msgstr "" +msgstr "Співвідношення сигнал/шум" msgid "Noise:" msgstr "Шум:" msgid "Non Pre-emtive CRC errors (CRC_P)" -msgstr "" +msgstr "Не запобіжні помилки CRC (CRC_P)" msgid "Non-wildcard" -msgstr "" +msgstr "Без шаблону заміни" msgid "None" msgstr "Жоден" @@ -2187,16 +2342,16 @@ msgid "Not Found" msgstr "Не знайдено" msgid "Not associated" -msgstr "Не пов'язаний" +msgstr "Не пов’язаний" msgid "Not connected" msgstr "Не підключено" msgid "Note: Configuration files will be erased." -msgstr "Примітка: конфігураційні файли будуть видалені." +msgstr "Примітка: конфігураційні файли буде видалено." msgid "Note: interface name length" -msgstr "" +msgstr "Примітка: довжина імені інтерфейсу" msgid "Notice" msgstr "Попередження" @@ -2205,7 +2360,7 @@ msgid "Nslookup" msgstr "DNS-запит" msgid "Number of cached DNS entries (max is 10000, 0 is no caching)" -msgstr "" +msgstr "Кількість кешованих записів DNS (макс. - 10000, 0 - без кешування)" msgid "OK" msgstr "OK" @@ -2214,10 +2369,13 @@ msgid "OPKG-Configuration" msgstr "Конфігурація OPKG" msgid "Obfuscated Group Password" -msgstr "" +msgstr "Обфусований груповий пароль" msgid "Obfuscated Password" -msgstr "" +msgstr "Обфусований пароль" + +msgid "Obtain IPv6-Address" +msgstr "Отримати IPv6-адресу" msgid "Off-State Delay" msgstr "Затримка Off-State" @@ -2230,27 +2388,27 @@ msgid "" "INTERFACE.VLANNR (e.g.: " "eth0.1)." msgstr "" -"На цій сторінці ви можете настроїти мережеві інтерфейси. Ви можете " -"об'єднатиати кілька інтерфейсів мостом, відзначивши поле \"Об'єднати " -"інтерфейси в міст\" та ввівши імена кількох мережевих інтерфейсів, розділені " -"пробілами. Також ви можете використовувати VLAN-позначення " +"На цій сторінці ви можете налаштувати мережеві інтерфейси. Ви можете " +"об’єднати кілька інтерфейсів мостом, відзначивши поле \"Об’єднати інтерфейси " +"в міст\" та ввівши імена кількох мережевих інтерфейсів, розділені пробілами. " +"Також ви можете використовувати VLAN-позначення " "ІНТЕРФЕЙС.НОМЕР_VLAN (наприклад, eth0.1)." msgid "On-State Delay" msgstr "Затримка On-State" msgid "One of hostname or mac address must be specified!" -msgstr "Має бути вказане одне з двох - ім'я вузла або МАС-адреса!" +msgstr "Має бути зазначено одне з двох – ім’я вузла або МАС-адреса!" msgid "One or more fields contain invalid values!" msgstr "Одне або декілька полів містять неприпустимі значення!" msgid "One or more invalid/required values on tab" -msgstr "" +msgstr "Одне або декілька неприпустимих/обов’язкових значень на вкладці" msgid "One or more required fields have no value!" -msgstr "Одне або декілька обов'язкових полів не мають значень!" +msgstr "Одне або декілька обов’язкових полів не мають значень!" msgid "Open list..." msgstr "Відкрити список..." @@ -2259,7 +2417,7 @@ msgid "OpenConnect (CISCO AnyConnect)" msgstr "" msgid "Operating frequency" -msgstr "" +msgstr "Робоча частота" msgid "Option changed" msgstr "Опція змінена" @@ -2270,16 +2428,12 @@ msgstr "Опція видалена" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." msgstr "" +"Необов’язково. 32-бітна мітка для вихідних зашифрованих пакетів. Введіть " +"значення в шістнадцятковому форматі, починаючи з 0x." msgid "" "Optional. Allowed values: 'eui64', 'random', fixed value like '::1' or " @@ -2287,33 +2441,49 @@ msgid "" "server, use the suffix (like '::1') to form the IPv6 address ('a:b:c:d::1') " "for the interface." msgstr "" +"Необов’язково. Припустимі значення: 'eui64', 'random' чи фіксоване значення, " +"наприклад '::1' або '::1:2'. Якщо префікс IPv6 (наприклад, 'a:b:c:d::') " +"отримано від сервера делегування, для формування IPv6-адреси інтерфейсу " +"(наприклад, 'a:b:c:d::1') використовуйте суфікс ('::1')." msgid "" "Optional. Base64-encoded preshared key. Adds in an additional layer of " "symmetric-key cryptography for post-quantum resistance." msgstr "" +"Необов’язково. Заздалегідь установлений Base64-кодований спільний ключ. " +"Додавання додатково рівня шифрування із симетричним ключем для пост-" +"квантової стійкості." msgid "Optional. Create routes for Allowed IPs for this peer." -msgstr "" +msgstr "Необов’язково. Створити для цього вузла маршрути для дозволених IP." + +msgid "Optional. Description of peer." +msgstr "Необов’язково. Опис вузла." msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." -msgstr "" +msgstr "Необов’язково. Хост вузла. Імена буде виділено до підняття інтерфейсу." msgid "Optional. Maximum Transmission Unit of tunnel interface." msgstr "" +"Необов’язково. Максимальний блок передаваних даних тунельного інтерфейсу." msgid "Optional. Port of peer." -msgstr "" +msgstr "Необов’язково. Порт вузла." msgid "" "Optional. Seconds between keep alive messages. Default is 0 (disabled). " "Recommended value if this device is behind a NAT is 25." msgstr "" +"Необов’язково. Час (сек.) між перевірками активності повідомлень. Типове " +"значення - 0 (вимкнено). Рекомендоване значення для цього пристрою за NAT - " +"25." msgid "Optional. UDP port used for outgoing and incoming packets." msgstr "" +"Необов’язково. UDP-порт, який використовується для вихідних та вхідних " +"пакетів." msgid "Options" msgstr "Опції" @@ -2328,7 +2498,7 @@ msgid "Outbound:" msgstr "Вихідний:" msgid "Output Interface" -msgstr "" +msgstr "Вихідний інтерфейс" msgid "Override MAC address" msgstr "Перевизначити MAC-адресу" @@ -2337,13 +2507,13 @@ msgid "Override MTU" msgstr "Перевизначити MTU" msgid "Override TOS" -msgstr "" +msgstr "Перевизначити TOS" msgid "Override TTL" -msgstr "" +msgstr "Перевизначити TTL" msgid "Override default interface name" -msgstr "" +msgstr "Перевизначення типового імені інтерфейсу" msgid "Override the gateway in DHCP responses" msgstr "Перевизначення шлюзу у відповідях DHCP" @@ -2369,7 +2539,7 @@ msgid "PAP/CHAP password" msgstr "Пароль PAP/CHAP" msgid "PAP/CHAP username" -msgstr "Ім'я користувача PAP/CHAP" +msgstr "Ім’я користувача PAP/CHAP" msgid "PID" msgstr "PID" @@ -2379,8 +2549,11 @@ msgstr "" ">PIN" +msgid "PIN code rejected" +msgstr "PIN-код відхилено" + msgid "PMK R1 Push" -msgstr "" +msgstr "Проштовхуваня PMK R1" msgid "PPP" msgstr "PPP" @@ -2395,7 +2568,7 @@ msgid "PPPoE" msgstr "PPPoE" msgid "PPPoSSH" -msgstr "" +msgstr "PPPoSSH" msgid "PPtP" msgstr "PPtP" @@ -2434,13 +2607,13 @@ msgid "Password of Private Key" msgstr "Пароль закритого ключа" msgid "Password of inner Private Key" -msgstr "" +msgstr "Пароль внутрішнього закритого ключа" msgid "Password successfully changed!" msgstr "Пароль успішно змінено!" msgid "Password2" -msgstr "" +msgstr "Пароль2" msgid "Path to CA-Certificate" msgstr "Шлях до центру сертифікції" @@ -2452,25 +2625,28 @@ msgid "Path to Private Key" msgstr "Шлях до закритого ключа" msgid "Path to inner CA-Certificate" -msgstr "" +msgstr "Шлях до внутрішнього CA-сертифікату" msgid "Path to inner Client-Certificate" -msgstr "" +msgstr "Шлях до внутрішнього сертифікату клієнта" msgid "Path to inner Private Key" -msgstr "" +msgstr "Шлях до внутрішнього закритого ключа" msgid "Peak:" msgstr "Пік:" msgid "Peer IP address to assign" -msgstr "" +msgstr "Запит IP-адреси призначення" + +msgid "Peer address is missing" +msgstr "Відсутня адреса вузла" msgid "Peers" -msgstr "" +msgstr "Вузли" msgid "Perfect Forward Secrecy" -msgstr "" +msgstr "Perfect Forward Secrecy" msgid "Perform reboot" msgstr "Виконати перезавантаження" @@ -2479,7 +2655,7 @@ msgid "Perform reset" msgstr "Відновити" msgid "Persistent Keep Alive" -msgstr "" +msgstr "Завжди тримати ввімкненим" msgid "Phy Rate:" msgstr "Фізична швидкість:" @@ -2494,7 +2670,7 @@ msgid "Pkts." msgstr "пакетів" msgid "Please enter your username and password." -msgstr "Введіть ім'я користувача і пароль" +msgstr "Введіть ім’я користувача і пароль." msgid "Policy" msgstr "Політика" @@ -2503,25 +2679,25 @@ msgid "Port" msgstr "Порт" msgid "Port status:" -msgstr "Статус порту:" +msgstr "Стан порту:" msgid "Power Management Mode" -msgstr "" +msgstr "Режим керування живленням" msgid "Pre-emtive CRC errors (CRCP_P)" -msgstr "" +msgstr "Попереджувати помилки CRC (CRCP_P)" msgid "Prefer LTE" -msgstr "" +msgstr "Переважно LTE" msgid "Prefer UMTS" -msgstr "" +msgstr "Переважно UMTS" msgid "Prefix Delegated" -msgstr "" +msgstr "Делеговано префікс" msgid "Preshared Key" -msgstr "" +msgstr "Заздалегідь установлений спільний ключ" msgid "" "Presume peer to be dead after given amount of LCP echo failures, use 0 to " @@ -2531,16 +2707,13 @@ msgstr "" "пакета LCP, використовуйте 0, щоб ігнорувати невдачі" msgid "Prevent listening on these interfaces." -msgstr "" +msgstr "Перешкоджати прослуховуванню цих інтерфейсів." msgid "Prevents client-to-client communication" -msgstr "Запобігає зв'язкам клієнт-клієнт" - -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "Бездротовий 802.11b контролер Prism2/2.5/3" +msgstr "Перешкоджати спілкуванню клієнт-клієнт" msgid "Private Key" -msgstr "" +msgstr "Приватний ключ" msgid "Proceed" msgstr "Продовжити" @@ -2549,7 +2722,7 @@ msgid "Processes" msgstr "Процеси" msgid "Profile" -msgstr "" +msgstr "Профіль" msgid "Prot." msgstr "Прот." @@ -2567,34 +2740,41 @@ msgid "Protocol support is not installed" msgstr "Підтримка протоколу не інстальована" msgid "Provide NTP server" -msgstr "Забезпечувати NTP-сервер" +msgstr "Забезпечувати сервер NTP" msgid "Provide new network" -msgstr "Постачити нову мережу" +msgstr "Укажіть нову мережу" msgid "Pseudo Ad-Hoc (ahdemo)" msgstr "Псевдо Ad-Hoc (ahdemo)" msgid "Public Key" -msgstr "" +msgstr "Відкритий ключ" msgid "Public prefix routed to this device for distribution to clients." -msgstr "" +msgstr "Публічний префікс надісланий на цей пристрій для поширення клієнтам." msgid "QMI Cellular" -msgstr "" +msgstr "Стільниковий QMI" msgid "Quality" msgstr "Якість" -msgid "R0 Key Lifetime" +msgid "" +"Query all available upstream DNS " +"servers" msgstr "" +"Запит усіх наявних висхідних DNS-серверів" + +msgid "R0 Key Lifetime" +msgstr "Тривалість життя ключа R0" msgid "R1 Key Holder" -msgstr "" +msgstr "Власник ключа R1" msgid "RFC3947 NAT-T mode" -msgstr "" +msgstr "Режим RFC3947 NAT-T" msgid "RTS/CTS Threshold" msgstr "Поріг RTS/CTS" @@ -2605,9 +2785,6 @@ msgstr "Одержано" msgid "RX Rate" msgstr "Швидкість приймання" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "Бездротовий 802.11%s контролер RaLink" - msgid "Radius-Accounting-Port" msgstr "Порт Radius-Accounting" @@ -2626,50 +2803,37 @@ msgstr "Секрет Radius-Authentication" msgid "Radius-Authentication-Server" msgstr "Сервер Radius-Authentication" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" +"Сирі шістнадцяткові байти. Залиште порожнім, якщо ваш інтернет-провайдер не " +"вимагає цього." + msgid "" "Read /etc/ethers to configure the DHCP-Server" msgstr "" -"Читати /etc/ethers для настроювання /etc/ethers для налаштування DHCP-сервера" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" -"Дійсно видалити цей інтерфейс? Скасувати видалення неможливо!\n" -"Ви можете втратити доступ до цього пристрою, якщо ви підключені через цей " -"інтерфейс." +"Дійсно видалити цей інтерфейс? Скасувати видалення неможливо! Ви можете " +"втратити доступ до цього пристрою, якщо вас підключено через цей інтерфейс." msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" -"Дійсно видалити цю бездротову мережу? Скасувати видалення неможливо!\n" -"Ви можете втратити доступ до цього пристрою, якщо ви підключені через цю " +"Дійсно видалити цю бездротову мережу? Скасувати видалення неможливо! Ви " +"можете втратити доступ до цього пристрою, якщо вас підключено через цю " "мережу." msgid "Really reset all changes?" msgstr "Дійсно скинути всі зміни?" -#, fuzzy -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" -"Дійсно вимкнути мережу?\n" -"Ви можете втратити доступ до цього пристрою, якщо ви підключені через цю " -"мережу." - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" -"Дійсно вимкнути інтерфейс \"%s\"?\n" -"Ви можете втратити доступ до цього пристрою, якщо ви підключені через цей " -"інтерфейс." - msgid "Really switch protocol?" msgstr "Дійсно змінити протокол?" @@ -2689,10 +2853,10 @@ msgid "Realtime Wireless" msgstr "Бездротові мережі у реальному часі" msgid "Reassociation Deadline" -msgstr "" +msgstr "Кінцевий термін реассоціації" msgid "Rebind protection" -msgstr "Захист від переприв'язки" +msgstr "Захист від переприв’язки" msgid "Reboot" msgstr "Перезавантаження" @@ -2704,20 +2868,17 @@ msgid "Reboots the operating system of your device" msgstr "Перезавантажити операційну систему вашого пристрою" msgid "Receive" -msgstr "Прийом" +msgstr "Приймання" msgid "Receiver Antenna" msgstr "Антена приймача" msgid "Recommended. IP addresses of the WireGuard interface." -msgstr "" +msgstr "Рекомендовано. IP-адреси інтерфейсу WireGuard." msgid "Reconnect this interface" msgstr "Перепідключити цей інтерфейс" -msgid "Reconnecting interface" -msgstr "Перепідключення інтерфейсу" - msgid "References" msgstr "Посилання" @@ -2737,7 +2898,7 @@ msgid "Remote IPv4 address" msgstr "Віддалена адреса IPv4" msgid "Remote IPv4 address or FQDN" -msgstr "" +msgstr "Віддалена адреса IPv4 або FQDN" msgid "Remove" msgstr "Видалити" @@ -2752,25 +2913,22 @@ msgid "Replace wireless configuration" msgstr "Замінити конфігурацію бездротової мережі" msgid "Request IPv6-address" -msgstr "" +msgstr "Запит IPv6-адреси" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" -msgstr "" +msgstr "Потрібно" msgid "Required for certain ISPs, e.g. Charter with DOCSIS 3" msgstr "Потрібно для деяких провайдерів, наприклад, Charter із DOCSIS 3" msgid "Required. Base64-encoded private key for this interface." -msgstr "" +msgstr "Потрібно. Base64-закодований закритий ключ для цього інтерфейсу." msgid "Required. Base64-encoded public key of peer." -msgstr "" +msgstr "Потрібно. Base64-закодований відкритий ключ вузла." msgid "" "Required. IP addresses and prefixes that this peer is allowed to use inside " @@ -2782,6 +2940,8 @@ msgid "" "Requires the 'full' version of wpad/hostapd and support from the wifi driver " "
(as of Feb 2017: ath9k and ath10k, in LEDE also mwlwifi and mt76)" msgstr "" +"Потребує \"повної\" версії wpad/hostapd та підтримки драйвером WiFi
(станом на лютий 2017 року: ath9k та ath10k, у LEDE також mwlwifi та mt76)" msgid "" "Requires upstream supports DNSSEC; verify unsigned domain responses really " @@ -2809,6 +2969,12 @@ msgstr "Перезавантажити" msgid "Restart Firewall" msgstr "Перезавантажити брандмауер" +msgid "Restart radio interface" +msgstr "Перезавантажити радіоінтерфейс" + +msgid "Restore" +msgstr "Відновити" + msgid "Restore backup" msgstr "Відновити з резервної копії" @@ -2816,8 +2982,17 @@ msgid "Reveal/hide password" msgstr "Показати/приховати пароль" msgid "Revert" +msgstr "Скасувати" + +msgid "Revert changes" msgstr "Скасувати зміни" +msgid "Revert request failed with status %h" +msgstr "Помилка запиту на скасування зі статусом %h" + +msgid "Reverting configuration…" +msgstr "Відкат конфігурації…" + msgid "Root" msgstr "Корінь" @@ -2825,19 +3000,16 @@ msgid "Root directory for files served via TFTP" msgstr "Кореневий каталог для файлів TFTP" msgid "Root preparation" -msgstr "" +msgstr "Підготовка Root" msgid "Route Allowed IPs" -msgstr "" +msgstr "Маршрутизація дозволених IP-адрес" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" -msgstr "" +msgstr "Служба оголошень маршрутизатора" msgid "Router Password" msgstr "Пароль маршрутизатора" @@ -2861,14 +3033,6 @@ msgstr "Виконати перевірку файлової системи" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2876,13 +3040,13 @@ msgid "SSH Access" msgstr "SSH-доступ" msgid "SSH server address" -msgstr "" +msgstr "Адреса сервера SSH" msgid "SSH server port" -msgstr "" +msgstr "Порт сервера SSH" msgid "SSH username" -msgstr "" +msgstr "Ім’я користувача SSH" msgid "SSH-Keys" msgstr "SSH-ключі" @@ -2896,23 +3060,23 @@ msgstr "Зберегти" msgid "Save & Apply" msgstr "Зберегти і застосувати" -msgid "Save & Apply" -msgstr "Зберегти і застосувати" - msgid "Scan" msgstr "Сканувати" +msgid "Scan request failed" +msgstr "Помилка запиту на сканування" + msgid "Scheduled Tasks" msgstr "Заплановані завдання" msgid "Section added" -msgstr "Секція додана" +msgstr "Секцію додано" msgid "Section removed" -msgstr "Секція видалена" +msgstr "Секцію видалено" msgid "See \"mount\" manpage for details" -msgstr "Подробиці див. на сторінці керівництва \"mount\"" +msgstr "Подробиці дивись на сторінці керівництва \"mount\"." msgid "" "Send LCP echo requests at the given interval in seconds, only effective in " @@ -2927,19 +3091,8 @@ msgstr "Розділяти клієнтів" msgid "Server Settings" msgstr "Настройки сервера" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" -msgstr "Назва (ім'я) сервісу" +msgstr "Назва (ім’я) сервісу" msgid "Service Type" msgstr "Тип сервісу" @@ -2951,19 +3104,29 @@ msgid "" "Set interface properties regardless of the link carrier (If set, carrier " "sense events do not invoke hotplug handlers)." msgstr "" +"Властивості інтерфейсу встановлюються незалежно від каналу зв’язку (якщо " +"позначено, обробник автовизначення не викликається при змінах)." -#, fuzzy msgid "Set up Time Synchronization" -msgstr "Настройки синхронізації часу" +msgstr "Налаштування синхронізації часу" + +msgid "Setting PLMN failed" +msgstr "Не вдалося налаштувати PLMN" + +msgid "Setting operation mode failed" +msgstr "Не вдалося налаштувати режим роботи" msgid "Setup DHCP Server" -msgstr "Настройки DHCP-сервера" +msgstr "Налаштування DHCP-сервера" msgid "Severely Errored Seconds (SES)" msgstr "" msgid "Short GI" -msgstr "" +msgstr "Short GI" + +msgid "Short Preamble" +msgstr "Коротка преамбула" msgid "Show current backup file list" msgstr "Показати поточний список файлів резервного копіювання" @@ -2971,14 +3134,11 @@ msgstr "Показати поточний список файлів резерв msgid "Shutdown this interface" msgstr "Вимкнути цей інтерфейс" -msgid "Shutdown this network" -msgstr "Вимкнути цю мережу" - msgid "Signal" msgstr "Сигнал" msgid "Signal Attenuation (SATN)" -msgstr "" +msgstr "Затухання сигналу (SATN)" msgid "Signal:" msgstr "Сигнал:" @@ -2987,10 +3147,10 @@ msgid "Size" msgstr "Розмір" msgid "Size (.ipk)" -msgstr "" +msgstr "Розмір (.ipk)" msgid "Size of DNS query cache" -msgstr "" +msgstr "Розмір кешу запитів DNS" msgid "Skip" msgstr "Пропустити" @@ -3008,13 +3168,13 @@ msgid "Software" msgstr "Програмне забезпечення" msgid "Software VLAN" -msgstr "" +msgstr "Програмово реалізований VLAN" msgid "Some fields are invalid, cannot save values!" msgstr "Деякі поля є неприпустимими, неможливо зберегти значення!" msgid "Sorry, the object you requested was not found." -msgstr "На жаль, об'єкт, який ви просили, не знайдено." +msgstr "На жаль, об’єкт, який ви просили, не знайдено." msgid "Sorry, the server encountered an unexpected error." msgstr "На жаль, на сервері сталася неочікувана помилка." @@ -3024,19 +3184,13 @@ msgid "" "flashed manually. Please refer to the wiki for device specific install " "instructions." msgstr "" -"На жаль, автоматичне оновлення системи не підтримується. Новий образ " -"прошивки повинен бути залитий вручну. Зверніться до Wiki за інструкцією з " -"інсталяції для конкретного пристрою." - -msgid "Sort" -msgstr "Сортування" +"На жаль, оновлення системи не підтримується. Новий образ мікропрограми слід " +"прошити вручну. Зверніться до Wiki за інструкцією з інсталяції для " +"конкретного пристрою." msgid "Source" msgstr "Джерело" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "Визначає каталог, до якого приєднаний пристрій" @@ -3079,6 +3233,12 @@ msgstr "Запустити" msgid "Start priority" msgstr "Стартовий пріоритет" +msgid "Starting configuration apply…" +msgstr "Застосовується стартова конфігурація…" + +msgid "Starting wireless scan..." +msgstr "Розпочато сканування бездротових мереж..." + msgid "Startup" msgstr "Запуск" @@ -3095,7 +3255,7 @@ msgid "Static Routes" msgstr "Статичні маршрути" msgid "Static address" -msgstr "Статичні адреси" +msgstr "Статична адреса" msgid "" "Static leases are used to assign fixed IP addresses and symbolic hostnames " @@ -3108,7 +3268,7 @@ msgstr "" "орендою." msgid "Status" -msgstr "Статус" +msgstr "Стан" msgid "Stop" msgstr "Зупинити" @@ -3120,16 +3280,16 @@ msgid "Submit" msgstr "Надіслати" msgid "Suppress logging" -msgstr "" +msgstr "Блокувати журналювання" msgid "Suppress logging of the routine operation of these protocols" -msgstr "" +msgstr "Блокувати ведення журналу звичайної роботи цих протоколів" msgid "Swap" -msgstr "" +msgstr "Своп" msgid "Swap Entry" -msgstr "Вхід довантаження" +msgstr "Вхід своп" msgid "Switch" msgstr "Комутатор" @@ -3143,12 +3303,14 @@ msgstr "Комутатор %q (%s)" msgid "" "Switch %q has an unknown topology - the VLAN settings might not be accurate." msgstr "" +"Комутатор %q має невідому топологію – параметри VLAN можуть бути " +"неправильними." msgid "Switch Port Mask" -msgstr "" +msgstr "Маска портів комутатора" msgid "Switch VLAN" -msgstr "" +msgstr "VLAN комутатора" msgid "Switch protocol" msgstr "Протокол комутатора" @@ -3175,7 +3337,7 @@ msgid "TCP:" msgstr "TCP:" msgid "TFTP Settings" -msgstr "Настройки TFTP" +msgstr "Налаштування TFTP" msgid "TFTP server root" msgstr "Корінь TFTP-сервера" @@ -3190,10 +3352,10 @@ msgid "Table" msgstr "Таблиця" msgid "Target" -msgstr "Мета" +msgstr "Ціль" msgid "Target network" -msgstr "" +msgstr "Цільова мережа" msgid "Terminate" msgstr "Завершити" @@ -3206,11 +3368,11 @@ msgid "" "multi-SSID capable). Per network settings like encryption or operation mode " "are grouped in the Interface Configuration." msgstr "" -"Розділ Конфігурація пристрою охоплює фізичні параметри радіо-" -"апаратних засобів, такі, як канал, потужність передавача або вибір антени, " -"які є спільними для всіх визначених бездротових мереж (якщо радіо-апаратні " -"засоби здатні підтримувати кілька SSID). Параметри окремих мереж, такі, як " -"шифрування або режим роботи, згруповані в розділі Конфігурація " +"Розділ Конфігурація пристрою охоплює фізичні параметри апаратних " +"радіо-засобів, такі, як канал, потужність передавача або вибір антени, які є " +"спільними для всіх визначених бездротових мереж (якщо апаратні радіо-засоби " +"здатні підтримувати кілька SSID). Параметри окремих мереж, такі, як " +"шифрування або режим роботи, згруповано в розділі Конфігурація " "інтерфейсу." msgid "" @@ -3218,7 +3380,7 @@ msgid "" "component for working wireless configuration!" msgstr "" "Пакет libiwinfo-lua не інстальований. Щоб мати можливість " -"настроювати безпровідні мережі, слід інсталювати цей компонент!" +"налаштувати безпровідні мережі, слід інсталювати цей компонент!" msgid "" "The HE.net endpoint update configuration changed, you must now use the plain " @@ -3232,29 +3394,49 @@ msgstr "" msgid "" "The IPv6 prefix assigned to the provider, usually ends with ::" msgstr "" -"Призначений провайдеру IPv6-префікс, зазвичай закінчується на ::" +"Призначений провайдером IPv6-префікс, зазвичай закінчується на ::" msgid "" "The allowed characters are: A-Z, a-z, 0-9 and _" msgstr "" -"Дозволені символи: A-Z, a-z, 0-9 та " +"Дозволено символи: A-Z, a-z, 0-9 та " "_" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "Архів резервної копії не є правильним файлом gzip." + msgid "The configuration file could not be loaded due to the following error:" +msgstr "Файл конфігурації не вдалося завантажити через таку помилку:" + +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." msgstr "" +"Пристрій недосяжний протягом %d секунд після застосування очікуючих змін, що " +"призвело до відкочування конфигурації з міркувань безпеки. Проте, якщо ви " +"впевнені, що зміни конфігурації є правильними, застосуйте неперевірену " +"конфігурацію. Крім того, ви можете відхилити це попередження та " +"відредагувати зміни, перш ніж намагатись застосувати їх знову, або ж " +"скасувати всі очікуючі зміни, щоб зберегти поточну робочу конфігурацію." msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" -msgstr "Файл пристрою пам'яті або розділу (наприклад, /dev/sda1)" +msgstr "Файл пристрою пам’яті або розділу (наприклад, /dev/sda1)" msgid "" "The filesystem that was used to format the memory (e.g. ext3)" msgstr "" -"Файлова система, яка використовуватиметься для форматування пам'яті " +"Файлова система, яка використовуватиметься для форматування пам’яті " "(наприклад, ext3)" @@ -3263,29 +3445,26 @@ msgid "" "compare them with the original file to ensure data integrity.
Click " "\"Proceed\" below to start the flash procedure." msgstr "" -"Образ завантажено. Нижче наведено контрольну суму і розмір файлу. Порівняйте " -"їх з вихідним файлом для забезпечення цілісності даних.
Натисніть " -"\"Продовжити\", щоб розпочати процедуру оновлення прошивки." - -msgid "The following changes have been committed" -msgstr "Нижче наведені зміни були застосовані" +"Образ завантажено. Нижче наведено контрольну суму та розмір файлу. " +"Порівняйте їх з вихідним файлом, шоб переконатися в цілісності даних.
" +"Натисніть \"Продовжити\", щоб розпочати процедуру прошивання." msgid "The following changes have been reverted" -msgstr "Нижче наведені зміни були скасовані" +msgstr "Наведені нижче зміни було скасовано" msgid "The following rules are currently active on this system." -msgstr "У даний час у цій системі активні такі правила." +msgstr "Наразі в цій системі активні такі правила." msgid "The given network name is not unique" -msgstr "Задане мережеве ім'я не є унікальним" +msgstr "Задане мережеве ім’я не є унікальним" #, fuzzy msgid "" "The hardware is not multi-SSID capable and the existing configuration will " "be replaced if you proceed." msgstr "" -"Обладнання не підтримує мульти-SSID і, якщо ви продовжите, існуюча " -"конфігурація буде замінена." +"Обладнання не підтримує мульти-SSID і, якщо ви продовжите, існуючу " +"конфігурацію буде замінено." msgid "" "The length of the IPv4 prefix in bits, the remainder is used in the IPv6 " @@ -3306,12 +3485,12 @@ msgid "" "segments. Often there is by default one Uplink port for a connection to the " "next greater network like the internet and other ports for a local network." msgstr "" -"Мережеві порти вашого пристрою можуть бути об'єднані у декілька VLAN, у яких комп'ютери можуть напряму спілкуватися один з одним. " -"VLAN, у яких комп’ютери можуть напряму спілкуватися один з одним. " +"VLAN часто використовуються для розділення мережі на окремі " -"сегменти. Зазвичай один виcхідний порт використовується для з'єднання з " +"сегменти. Зазвичай один виcхідний порт використовується для з’єднання з " "більшою мережею, такою наприклад, як Інтернет, а інші порти — для локальної " "мережі." @@ -3340,11 +3519,6 @@ msgstr "" "з'єднатися. Залежно від ваших настройок, можливо, вам треба буде оновити " "адресу вашого комп'ютера, щоб знову отримати доступ до пристрою." -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3355,11 +3529,11 @@ msgstr "" msgid "There are no active leases." msgstr "Активних оренд немає." -msgid "There are no pending changes to apply!" -msgstr "Немає жодних змін до застосування!" +msgid "There are no changes to apply." +msgstr "Немає жодних змін до застосування." msgid "There are no pending changes to revert!" -msgstr "Немає жодних змін до скасування!" +msgstr "Немає жодних очікуючих змін до скасування!" msgid "There are no pending changes!" msgstr "Немає жодних очікуючих змін!" @@ -3386,6 +3560,9 @@ msgid "" "'server=1.2.3.4' fordomain-specific or full upstream DNS servers." msgstr "" +"Цей файл може містити такі рядки, як 'server=/domain/1.2.3.4' або " +"'server=1.2.3.4' для домен-орієнтованих або повних висхідних DNS-серверів." msgid "" "This is a list of shell glob patterns for matching files and directories to " @@ -3400,6 +3577,8 @@ msgid "" "This is either the \"Update Key\" configured for the tunnel or the account " "password if no update key has been configured" msgstr "" +"Це або \"Update Key\", сконфігурований для тунелю, або пароль облікового " +"запису, якщо ключ оновлення не налаштовано" msgid "" "This is the content of /etc/rc.local. Insert your own commands here (in " @@ -3412,8 +3591,8 @@ msgid "" "This is the local endpoint address assigned by the tunnel broker, it usually " "ends with ...:2/64" msgstr "" -"Це локальна адреса кінцевої точки, присвоєна тунельним брокером, зазвичай " -"закінчується на ...:2/64" +"Це локальна адреса кінцевої точки, яку присвоєно тунельним брокером, вона " +"зазвичай закінчується на …:2/64" msgid "" "This is the only DHCPDHCP у локальній мережі" msgid "This is the plain username for logging into the account" -msgstr "" +msgstr "Це звичайне ім’я користувача для входу до облікового запису" msgid "" "This is the prefix routed to you by the tunnel broker for use by clients" msgstr "" +"Це префікс, що надсилається до вас тунельним брокером для використання " +"клієнтами" msgid "This is the system crontab in which scheduled tasks can be defined." msgstr "" @@ -3437,18 +3618,16 @@ msgstr "" msgid "" "This is usually the address of the nearest PoP operated by the tunnel broker" msgstr "" -"Зазвичай, це адреса найближчої точки присутності, що управляється тунелним " +"Зазвичай, це адреса найближчої точки присутності, що управляється тунельним " "брокером" msgid "" "This list gives an overview over currently running system processes and " "their status." -msgstr "" -"У цьому списку наведені працюючі на даний момент системні процеси та їх " -"статус." +msgstr "У цьому списку наведено працюючі наразі системні процеси та їх стан." msgid "This page gives an overview over currently active network connections." -msgstr "Ця сторінка надає огляд поточних активних мережних підключень." +msgstr "Ця сторінка надає огляд поточних активних мережевих підключень." msgid "This section contains no values yet" msgstr "Ця секція поки що не містить значень" @@ -3457,20 +3636,22 @@ msgid "Time Synchronization" msgstr "Синхронізація часу" msgid "Time Synchronization is not configured yet." -msgstr "Синхронізація часу не настроєна." +msgstr "Синхронізацію часу не налаштовано." msgid "Timezone" msgstr "Часовий пояс" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" "Щоб відновити файли конфігурації, ви можете відвантажити раніше створений " -"архів резервної копії." +"архів резервної копії. Для відновлення мікропрограми до її початкового стану " +"натисніть кнопку \"Відновити\" (можливо тільки з образами SquashFS)." msgid "Tone" -msgstr "" +msgstr "Тоновий" msgid "Total Available" msgstr "Усього доступно" @@ -3488,7 +3669,7 @@ msgid "Transmission Rate" msgstr "Швидкість передавання" msgid "Transmit" -msgstr "Передача" +msgstr "Передавання" msgid "Transmit Power" msgstr "Потужність передавача" @@ -3511,15 +3692,6 @@ msgstr "Інтерфейс тунелю" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "Потужність передавача" @@ -3539,46 +3711,76 @@ msgid "USB Device" msgstr "USB-пристрій" msgid "USB Ports" -msgstr "" +msgstr "USB-порт" msgid "UUID" msgstr "UUID" +msgid "Unable to determine device name" +msgstr "Не вдається визначити ім’я пристрою" + +msgid "Unable to determine external IP address" +msgstr "Не вдається визначити зовнішню ІР-адресу" + +msgid "Unable to determine upstream interface" +msgstr "Не вдається визначити висхідний інтерфейс" + msgid "Unable to dispatch" -msgstr "Не вдалося опрацювати запит" +msgstr "Не вдається опрацювати запит" + +msgid "Unable to obtain client ID" +msgstr "Не вдається отримати ідентифікатор клієнта" + +msgid "Unable to resolve AFTR host name" +msgstr "Не вдається розрізнити ім’я хоста AFTR" + +msgid "Unable to resolve peer host name" +msgstr "Не вдається розрізнити ім’я хоста вузла" msgid "Unavailable Seconds (UAS)" -msgstr "" +msgstr "Недоступні секунди (UAS)" msgid "Unknown" msgstr "Невідомо" msgid "Unknown Error, password not changed!" -msgstr "Невідома помилка, пароль не змінився!" +msgstr "Невідома помилка, пароль не змінено!" + +msgid "Unknown error (%s)" +msgstr "Невідома помилка (%s)" msgid "Unmanaged" msgstr "Некерований" msgid "Unmount" -msgstr "" +msgstr "Демонтувати" msgid "Unsaved Changes" msgstr "Незбережені зміни" +msgid "Unsupported MAP type" +msgstr "Непідтримуваний тип MAP" + +msgid "Unsupported modem" +msgstr "Непідтримуваний модем" + msgid "Unsupported protocol type." msgstr "Непідтримуваний тип протоколу." +msgid "Up" +msgstr "Вгору" + msgid "Update lists" -msgstr "Оновити списки..." +msgstr "Оновити списки" msgid "" "Upload a sysupgrade-compatible image here to replace the running firmware. " "Check \"Keep settings\" to retain the current configuration (requires a " "compatible firmware image)." msgstr "" -"Відвантажити sysupgrade-сумісний образ, щоб замінити поточну прошивку. Для " -"збереження поточної конфігурації встановіть прапорець \"Зберегти настройки" -"\" (потрібен сумісний образ прошивки)." +"Відвантажити sysupgrade-сумісний образ, щоб замінити поточну мікропрограму. " +"Для збереження поточної конфігурації встановіть прапорець \"Зберегти " +"налаштування\" (потрібен сумісний образ мікропрограми)." msgid "Upload archive..." msgstr "Відвантажити архів..." @@ -3608,16 +3810,16 @@ msgid "Use TTL on tunnel interface" msgstr "Використовувати на тунельному інтерфейсі TTL" msgid "Use as external overlay (/overlay)" -msgstr "" +msgstr "Використовувати як зовнішній оверлей (/overlay)" msgid "Use as root filesystem (/)" -msgstr "" +msgstr "Використовувати як кореневу файлову систему (/)" msgid "Use broadcast flag" msgstr "Використовувати прапорець широкомовності" msgid "Use builtin IPv6-management" -msgstr "" +msgstr "Використовувати вбудоване керування IPv6" msgid "Use custom DNS servers" msgstr "Використовувати особливі DNS-сервери" @@ -3640,8 +3842,8 @@ msgid "" msgstr "" "Використовуйте кнопку Додати, щоб додати новий запис оренди. " "MAC-адреса ідентифікує вузол, IPv4-адреса визначає " -"фіксовану адресу, яка буде використовуватися, а Назва (ім'я) вузла " -"призначає символічне ім'я вузла." +"фіксовану адресу, яка буде використовуватися, а Назва (ім’я) вузла " +"призначає символічне ім’я вузла." msgid "Used" msgstr "Використано" @@ -3653,21 +3855,24 @@ msgid "" "Used for two different purposes: RADIUS NAS ID and 802.11r R0KH-ID. Not " "needed with normal WPA(2)-PSK." msgstr "" +"Використовується для двох різних цілей: RADIUS NAS ID і 802.11r R0KH-ID. Не потрібно за " +"звичайного WPA(2)-PSK." msgid "User certificate (PEM encoded)" -msgstr "" +msgstr "Сертифікат користувача (PEM-кодований)" msgid "User key (PEM encoded)" -msgstr "" +msgstr "Ключ користувача (PEM-кодований)" msgid "Username" -msgstr "Ім'я користувача" +msgstr "Ім’я користувача" msgid "VC-Mux" msgstr "VC-Mux" msgid "VDSL" -msgstr "" +msgstr "VDSL" msgid "VLANs on %q" msgstr "VLAN на %q" @@ -3676,41 +3881,38 @@ msgid "VLANs on %q (%s)" msgstr "VLAN на %q (%s)" msgid "VPN Local address" -msgstr "" +msgstr "Локальна адреса VPN" msgid "VPN Local port" -msgstr "" +msgstr "Локальний порт VPN" msgid "VPN Server" msgstr "VPN-сервер" msgid "VPN Server port" -msgstr "" +msgstr "Порт VPN-сервера" msgid "VPN Server's certificate SHA1 hash" -msgstr "" +msgstr "SHA1-геш сертифіката VPN-сервера" msgid "VPNC (CISCO 3000 (and others) VPN)" -msgstr "" +msgstr "VPNC (CISCO 3000 (та інш.) VPN)" msgid "Vendor" -msgstr "" +msgstr "Постачальник" msgid "Vendor Class to send when requesting DHCP" msgstr "Клас постачальника для відправки при запиті DHCP" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "Перевірте" msgid "Version" msgstr "Версія" +msgid "Virtual dynamic interface" +msgstr "Віртуальний динамічний інтерфейс" + msgid "WDS" msgstr "WDS" @@ -3724,7 +3926,7 @@ msgid "WEP passphrase" msgstr "Парольна фраза WEP" msgid "WMM Mode" -msgstr "Режим WMM" +msgstr "Режим WMM" msgid "WPA passphrase" msgstr "Парольна фраза WPA" @@ -3736,41 +3938,35 @@ msgstr "" "WPA-шифрування потребує інсталяції wpa_supplicant (для режиму " "клієнта) або hostapd (для Точки доступу та режиму ad-hoc)." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "Очікуємо, доки зміни наберуть чинності..." msgid "Waiting for command to complete..." msgstr "Очікуємо завершення виконання команди..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "Чекаємо на застосування конфігурації… %d c" + msgid "Waiting for device..." -msgstr "" +msgstr "Очікуємо пристрій..." msgid "Warning" msgstr "Застереження" msgid "Warning: There are unsaved changes that will get lost on reboot!" msgstr "" +"Застереження: Є незбережені зміни, які буде втрачено при перезавантаженні!" msgid "" "When using a PSK, the PMK can be generated locally without inter AP " "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" -msgstr "" +msgstr "Ширина" msgid "WireGuard VPN" -msgstr "" +msgstr "WireGuard VPN" msgid "Wireless" msgstr "Бездротові мережі" @@ -3787,29 +3983,26 @@ msgstr "Огляд бездротових мереж" msgid "Wireless Security" msgstr "Безпека бездротової мережі" -msgid "Wireless is disabled or not associated" -msgstr "Бездротову мережу вимкнено або не пов'язано" +msgid "Wireless is disabled" +msgstr "Бездротову мережу вимкнено" + +msgid "Wireless is not associated" +msgstr "Бездротову мережу не пов’язано" msgid "Wireless is restarting..." msgstr "Бездротова мережа перезапускається..." msgid "Wireless network is disabled" -msgstr "Бездротова мережа вимкнена" +msgstr "Бездротову мережу вимкнено" msgid "Wireless network is enabled" -msgstr "Бездротова мережа ввімкнена" - -msgid "Wireless restarted" -msgstr "Бездротова мережа перезапущена" - -msgid "Wireless shut down" -msgstr "Бездротова мережа припинила роботу" +msgstr "Бездротову мережу ввімкнено" msgid "Write received DNS requests to syslog" msgstr "Записувати отримані DNS-запити до системного журналу" msgid "Write system log to file" -msgstr "" +msgstr "Записувати cистемний журнал до файлу" msgid "" "You can enable or disable installed init scripts here. Changes will applied " @@ -3824,14 +4017,17 @@ msgstr "" msgid "" "You must enable JavaScript in your browser or LuCI will not work properly." msgstr "" -"Ви повинні увімкнути JavaScript у вашому браузері, або LuCI не буде " -"працювати належним чином." +"Вам слід увімкнути JavaScript у вашому браузері, або LuCI не буде працювати " +"належним чином." msgid "" "Your Internet Explorer is too old to display this page correctly. Please " "upgrade it to at least version 7 or use another browser like Firefox, Opera " "or Safari." msgstr "" +"Ваш Internet Explorer занадто старий, щоб правильно відобразити цю сторінку. " +"Поновіть його, принаймні, до версії 7 або скористайтесь іншим браузером, " +"таким як Firefox, Opera або Safari." msgid "any" msgstr "будь-який" @@ -3843,13 +4039,16 @@ msgid "baseT" msgstr "baseT" msgid "bridged" -msgstr "зв'язано" +msgstr "зв’язано" + +msgid "create" +msgstr "створити" msgid "create:" msgstr "створити:" msgid "creates a bridge over specified interface(s)" -msgstr "Створити міст через вказаний інтерфейс(и)" +msgstr "Створює міст через зазначені інтерфейси" msgid "dB" msgstr "дБ" @@ -3861,7 +4060,7 @@ msgid "disable" msgstr "вимкнено" msgid "disabled" -msgstr "" +msgstr "вимкнено" msgid "expired" msgstr "минув" @@ -3874,7 +4073,7 @@ msgstr "" "Protocol — протокол динамічної конфігурації вузла\">DHCP-оренди" msgid "forward" -msgstr "переслати" +msgstr "переспрямувати" msgid "full-duplex" msgstr "повний дуплекс" @@ -3882,17 +4081,14 @@ msgstr "повний дуплекс" msgid "half-duplex" msgstr "напівдуплекс" -msgid "help" -msgstr "довідка" - msgid "hidden" msgstr "прихований" msgid "hybrid mode" -msgstr "" +msgstr "гібридний режим" msgid "if target is a network" -msgstr "якщо мета — мережа" +msgstr "якщо ціль — мережа" msgid "input" msgstr "вхід" @@ -3911,23 +4107,23 @@ msgstr "" "Локальний DNS-файл" -msgid "minimum 1280, maximum 1480" -msgstr "" - msgid "minutes" -msgstr "" +msgstr "хв." + +msgid "mixed WPA/WPA2" +msgstr "змішаний WPA/WPA2" msgid "no" msgstr "ні" msgid "no link" -msgstr "нема з'єднання" +msgstr "нема з’єднання" msgid "none" msgstr "нема нічого" msgid "not present" -msgstr "" +msgstr "не присутній" msgid "off" msgstr "вимкнено" @@ -3938,35 +4134,38 @@ msgstr "увімкнено" msgid "open" msgstr "відкрита" +msgid "output" +msgstr "вихід" + msgid "overlay" -msgstr "" +msgstr "оверлей" msgid "random" -msgstr "" +msgstr "випадковий" msgid "relay mode" -msgstr "" +msgstr "режим реле" msgid "routed" msgstr "спрямовано" msgid "server mode" -msgstr "" +msgstr "режим сервера" msgid "stateful-only" -msgstr "" +msgstr "тільки ЗІ збереженням стану" msgid "stateless" -msgstr "" +msgstr "БЕЗ збереження стану" msgid "stateless + stateful" -msgstr "" +msgstr "БЕЗ та ЗІ збереженням стану" msgid "tagged" -msgstr "з позначкою" +msgstr "позначено" msgid "time units (TUs / 1.024 ms) [1000-65535]" -msgstr "" +msgstr "одиниці часу (TUs / 1.024 ms) [1000-65535]" msgid "unknown" msgstr "невідомий" @@ -3978,106 +4177,13 @@ msgid "unspecified" msgstr "не визначено" msgid "unspecified -or- create:" -msgstr "не визначено -або- створити" +msgstr "не визначено -або- створити:" msgid "untagged" -msgstr "без позначки" +msgstr "не позначено" msgid "yes" msgstr "так" msgid "« Back" msgstr "« Назад" - -#~ msgid "Action" -#~ msgstr "Дія" - -#~ msgid "Buttons" -#~ msgstr "Кнопки" - -#~ msgid "Handler" -#~ msgstr "Обробник" - -#~ msgid "Maximum hold time" -#~ msgstr "Максимальний час утримування" - -#~ msgid "Minimum hold time" -#~ msgstr "Мінімальний час утримування" - -#~ msgid "Path to executable which handles the button event" -#~ msgstr "Шлях до програми, яка обробляє натискання кнопки" - -#~ msgid "Specifies the button state to handle" -#~ msgstr "Визначає стан кнопки для обробки" - -#~ msgid "This page allows the configuration of custom button actions" -#~ msgstr "Ця сторінка дозволяє настроїти нетипові дії кнопки" - -#~ msgid "Leasetime" -#~ msgstr "Час оренди" - -#~ msgid "AR Support" -#~ msgstr "Підтримка AR" - -#~ msgid "Atheros 802.11%s Wireless Controller" -#~ msgstr "Бездротовий 802.11%s контролер Atheros" - -#~ msgid "Background Scan" -#~ msgstr "Сканування у фоновому режимі" - -#~ msgid "Compression" -#~ msgstr "Стиснення" - -#~ msgid "Disable HW-Beacon timer" -#~ msgstr "Вимкнути таймер HW-Beacon" - -#~ msgid "Do not send probe responses" -#~ msgstr "Не надсилати відповіді на зондування" - -#~ msgid "Fast Frames" -#~ msgstr "Швидкі фрейми" - -#~ msgid "Maximum Rate" -#~ msgstr "Максимальна швидкість" - -#~ msgid "Minimum Rate" -#~ msgstr "Мінімальна швидкість" - -#~ msgid "Multicast Rate" -#~ msgstr "Швидкість багатоадресного потоку" - -#~ msgid "Outdoor Channels" -#~ msgstr "Зовнішні канали" - -#~ msgid "Regulatory Domain" -#~ msgstr "Регулятивний домен" - -#~ msgid "Separate WDS" -#~ msgstr "Розділяти WDS" - -#~ msgid "Static WDS" -#~ msgstr "Статичний WDS" - -#~ msgid "Turbo Mode" -#~ msgstr "Режим Turbo" - -#~ msgid "XR Support" -#~ msgstr "Підтримка XR" - -#~ msgid "An additional network will be created if you leave this unchecked." -#~ msgstr "Якщо ви залишите це невибраним, буде створена додаткова мережа." - -#~ msgid "Join Network: Settings" -#~ msgstr "Підключення до мережі: Настройки" - -#~ msgid "CPU" -#~ msgstr "ЦП" - -#~ msgid "Port %d" -#~ msgstr "Порт %d" - -#~ msgid "Port %d is untagged in multiple VLANs!" -#~ msgstr "Порт %d нетегований у кількох VLAN-ах!" - -#~ msgid "VLAN Interface" -#~ msgstr "VLAN-інтерфейс" diff --git a/luci-base/po/vi/base.po b/luci-base/po/vi/base.po index 888fc92bf..6451853bb 100644 --- a/luci-base/po/vi/base.po +++ b/luci-base/po/vi/base.po @@ -49,6 +49,9 @@ msgstr "" msgid "-- match by uuid --" msgstr "" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "" @@ -149,9 +152,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "" -msgid "%s - %s" -msgstr "" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -166,9 +166,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -202,9 +199,6 @@ msgstr "" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "" @@ -214,9 +208,6 @@ msgstr "Điểm truy cập" msgid "Actions" msgstr "Hành động" -msgid "Activate this network" -msgstr "" - msgid "Active IPv4-Routes" msgstr "Active IPv4-Routes" @@ -268,6 +259,15 @@ msgstr "" msgid "Alert" msgstr "" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -279,6 +279,9 @@ msgstr "" msgid "Allow SSH password authentication" msgstr "Cho phép SSH xác thực mật mã" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "Cho phép tất cả trừ danh sách liệt kê" @@ -307,12 +310,12 @@ msgstr "" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -390,11 +393,14 @@ msgstr "" msgid "Any zone" msgstr "" -msgid "Apply" -msgstr "Áp dụng" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" -msgstr "Tiến hành thay đổi" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -410,6 +416,9 @@ msgstr "" msgid "Associated Stations" msgstr "" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -485,11 +494,11 @@ msgstr "" msgid "Back to scan results" msgstr "" -msgid "Backup / Flash Firmware" +msgid "Backup" msgstr "" -msgid "Backup / Restore" -msgstr "Backup/ Restore" +msgid "Backup / Flash Firmware" +msgstr "" msgid "Backup file list" msgstr "" @@ -500,7 +509,7 @@ msgstr "" msgid "Band" msgstr "" -msgid "Behind NAT" +msgid "Beacon Interval" msgstr "" msgid "" @@ -556,6 +565,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "CPU usage (%)" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "Bỏ qua" @@ -571,12 +583,20 @@ msgstr "Thay đổi" msgid "Changes applied." msgstr "Thay đổi đã áp dụng" +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "" msgid "Channel" msgstr "Kênh" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "" @@ -609,8 +629,7 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." +"configuration files." msgstr "" msgid "Client" @@ -646,12 +665,18 @@ msgstr "" msgid "Configuration" msgstr "Cấu hình" -msgid "Configuration applied." +msgid "Configuration failed" msgstr "" msgid "Configuration files will be kept." msgstr "" +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "Xác nhận" @@ -664,12 +689,18 @@ msgstr "" msgid "Connection Limit" msgstr "Giới hạn kết nối" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "" @@ -723,9 +754,6 @@ msgstr "" "Tùy chỉnh chế độ của thiết bị LEDs nếu có thể." -msgid "DHCP Leases" -msgstr "" - msgid "DHCP Server" msgstr "" @@ -738,9 +766,6 @@ msgstr "" msgid "DHCP-Options" msgstr "Tùy chọn DHCP" -msgid "DHCPv6 Leases" -msgstr "" - msgid "DHCPv6 client" msgstr "" @@ -780,6 +805,9 @@ msgstr "" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "" @@ -798,9 +826,6 @@ msgstr "" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "" @@ -819,6 +844,9 @@ msgstr "Xóa" msgid "Delete this network" msgstr "" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "Mô tả" @@ -837,7 +865,10 @@ msgstr "" msgid "Device is rebooting..." msgstr "" -msgid "Device unreachable" +msgid "Device unreachable!" +msgstr "" + +msgid "Device unreachable! Still waiting for device..." msgstr "" msgid "Diagnostics" @@ -863,15 +894,27 @@ msgstr "" msgid "Disable Encryption" msgstr "" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "" msgid "Disabled (default)" msgstr "" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "" @@ -923,6 +966,9 @@ msgstr "" "Don&#39;t chuyển tiếp DNS-Yêu " "cầu không cần DNS-Tên" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "Tải và cài đặt gói" @@ -1036,6 +1082,9 @@ msgstr "" msgid "Enable this mount" msgstr "" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "" @@ -1068,6 +1117,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "" @@ -1126,6 +1181,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "" @@ -1144,6 +1202,9 @@ msgstr "Filter private" msgid "Filter useless" msgstr "Lọc không hữu dụng" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1197,6 +1258,9 @@ msgstr "" msgid "Force" msgstr "Force" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "" @@ -1247,7 +1311,7 @@ msgstr "" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1259,6 +1323,9 @@ msgstr "" msgid "Gateway" msgstr "" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "" @@ -1319,9 +1386,6 @@ msgstr "Hang Up" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1334,9 +1398,6 @@ msgid "" "authentication." msgstr "" -msgid "Hermes 802.11b Wireless Controller" -msgstr "" - msgid "Hide ESSID" msgstr "Giấu ESSID" @@ -1352,6 +1413,9 @@ msgstr "" msgid "Host-IP or Network" msgstr "Host-IP or Network" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "Tên host" @@ -1373,13 +1437,19 @@ msgstr "" msgid "IP address" msgstr "Địa chỉ IP" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "" msgid "IPv4 Firewall" msgstr "" -msgid "IPv4 WAN Status" +msgid "IPv4 Upstream" msgstr "" msgid "IPv4 address" @@ -1430,15 +1500,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" +msgid "IPv6 Upstream" msgstr "" msgid "IPv6 address" msgstr "" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1544,6 +1611,9 @@ msgstr "" msgid "Info" msgstr "" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "Initscript" @@ -1580,21 +1650,12 @@ msgstr "" msgid "Interface is reconnecting..." msgstr "" -msgid "Interface is shutting down..." -msgstr "" - msgid "Interface name" msgstr "" msgid "Interface not present or not connected yet." msgstr "" -msgid "Interface reconnected" -msgstr "" - -msgid "Interface shut down" -msgstr "" - msgid "Interfaces" msgstr "Giao diện " @@ -1783,6 +1844,9 @@ msgstr "" msgid "Loading" msgstr "" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1847,6 +1911,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "" +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "" @@ -1862,6 +1929,9 @@ msgstr "Danh sách MAC" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "" @@ -1941,6 +2011,9 @@ msgstr "" msgid "Modem device" msgstr "Thiết bị modem" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "" @@ -2014,9 +2087,6 @@ msgstr "" msgid "NTP server candidates" msgstr "" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "Tên" @@ -2041,6 +2111,9 @@ msgstr "" msgid "Network boot image" msgstr "" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "" @@ -2062,6 +2135,9 @@ msgstr "" msgid "No information available" msgstr "" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "" @@ -2080,6 +2156,9 @@ msgstr "" msgid "No rules in this chain" msgstr "Không có quy luật trong chuỗi này" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "" @@ -2140,6 +2219,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "" @@ -2191,12 +2273,6 @@ msgstr "" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2217,6 +2293,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2295,6 +2374,9 @@ msgstr "PID" msgid "PIN" msgstr "" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2382,6 +2464,9 @@ msgstr "" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2450,9 +2535,6 @@ msgstr "" msgid "Prevents client-to-client communication" msgstr "Ngăn chặn giao tiếp giữa client-và-client" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "" - msgid "Private Key" msgstr "" @@ -2501,6 +2583,11 @@ msgstr "" msgid "Quality" msgstr "" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2519,9 +2606,6 @@ msgstr "RX" msgid "RX Rate" msgstr "" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "" - msgid "Radius-Accounting-Port" msgstr "" @@ -2540,6 +2624,9 @@ msgstr "" msgid "Radius-Authentication-Server" msgstr "" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" @@ -2548,28 +2635,18 @@ msgstr "" "Configuration Protocol\">DHCP-Server" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" msgid "Really reset all changes?" msgstr "" -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" - msgid "Really switch protocol?" msgstr "" @@ -2615,9 +2692,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "" -msgid "Reconnecting interface" -msgstr "" - msgid "References" msgstr "Tham chiếu" @@ -2657,9 +2731,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2709,6 +2780,12 @@ msgstr "" msgid "Restart Firewall" msgstr "Khởi động lại Firewall" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "" + msgid "Restore backup" msgstr "Phục hồi backup" @@ -2718,6 +2795,15 @@ msgstr "" msgid "Revert" msgstr "Revert" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "" @@ -2733,9 +2819,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2761,14 +2844,6 @@ msgstr "" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2796,12 +2871,12 @@ msgstr "Lưu" msgid "Save & Apply" msgstr "Lưu & áp dụng " -msgid "Save & Apply" -msgstr "" - msgid "Scan" msgstr "Scan" +msgid "Scan request failed" +msgstr "" + msgid "Scheduled Tasks" msgstr "Scheduled Tasks" @@ -2825,17 +2900,6 @@ msgstr "Cô lập đối tượng" msgid "Server Settings" msgstr "" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "" @@ -2853,6 +2917,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "" @@ -2862,15 +2932,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "" msgid "Shutdown this interface" msgstr "" -msgid "Shutdown this network" -msgstr "" - msgid "Signal" msgstr "" @@ -2922,15 +2992,9 @@ msgid "" "instructions." msgstr "" -msgid "Sort" -msgstr "" - msgid "Source" msgstr "Nguồn" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "" @@ -2969,6 +3033,12 @@ msgstr "Bắt đầu " msgid "Start priority" msgstr "Bắt đầu ưu tiên" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "" @@ -3115,9 +3185,22 @@ msgid "" "code> and _" msgstr "" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3139,9 +3222,6 @@ msgid "" "\"Proceed\" below to start the flash procedure." msgstr "" -msgid "The following changes have been committed" -msgstr "" - msgid "The following changes have been reverted" msgstr "Những thay đối sau đây đã được để trở về tình trạng cũ. " @@ -3198,11 +3278,6 @@ msgstr "" "một vài phút cho tới khi kết nối lại. Có thể cần phải làm mới địa chỉ của " "máy tính để tiếp cận thiết bị một lần nữa, phụ thuộc vào cài đặt của bạn. " -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3213,7 +3288,7 @@ msgstr "" msgid "There are no active leases." msgstr "" -msgid "There are no pending changes to apply!" +msgid "There are no changes to apply." msgstr "" msgid "There are no pending changes to revert!" @@ -3308,7 +3383,8 @@ msgstr "Múi giờ " msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." msgstr "" msgid "Tone" @@ -3353,15 +3429,6 @@ msgstr "" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "" @@ -3386,9 +3453,27 @@ msgstr "" msgid "UUID" msgstr "" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3398,6 +3483,9 @@ msgstr "" msgid "Unknown Error, password not changed!" msgstr "" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "" @@ -3407,9 +3495,18 @@ msgstr "" msgid "Unsaved Changes" msgstr "Thay đổi không lưu" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "" +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "" @@ -3534,18 +3631,15 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "" msgid "Version" msgstr "Phiên bản" +msgid "Virtual dynamic interface" +msgstr "" + msgid "WDS" msgstr "WDS" @@ -3569,16 +3663,15 @@ msgid "" "and ad-hoc mode) to be installed." msgstr "" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "" msgid "Waiting for command to complete..." msgstr "" +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3593,12 +3686,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3620,7 +3707,10 @@ msgstr "" msgid "Wireless Security" msgstr "" -msgid "Wireless is disabled or not associated" +msgid "Wireless is disabled" +msgstr "" + +msgid "Wireless is not associated" msgstr "" msgid "Wireless is restarting..." @@ -3632,12 +3722,6 @@ msgstr "" msgid "Wireless network is enabled" msgstr "" -msgid "Wireless restarted" -msgstr "" - -msgid "Wireless shut down" -msgstr "" - msgid "Write received DNS requests to syslog" msgstr "" @@ -3676,6 +3760,9 @@ msgstr "" msgid "bridged" msgstr "" +msgid "create" +msgstr "" + msgid "create:" msgstr "" @@ -3713,9 +3800,6 @@ msgstr "" msgid "half-duplex" msgstr "" -msgid "help" -msgstr "" - msgid "hidden" msgstr "" @@ -3740,10 +3824,10 @@ msgstr "" msgid "local DNS file" msgstr "Tập tin DNS địa phương" -msgid "minimum 1280, maximum 1480" +msgid "minutes" msgstr "" -msgid "minutes" +msgid "mixed WPA/WPA2" msgstr "" msgid "no" @@ -3767,6 +3851,9 @@ msgstr "" msgid "open" msgstr "" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" @@ -3818,6 +3905,15 @@ msgstr "" msgid "« Back" msgstr "" +#~ msgid "Backup / Restore" +#~ msgstr "Backup/ Restore" + +#~ msgid "Apply" +#~ msgstr "Áp dụng" + +#~ msgid "Applying changes" +#~ msgstr "Tiến hành thay đổi" + #~ msgid "Action" #~ msgstr "Action" diff --git a/luci-base/po/zh-cn/base.po b/luci-base/po/zh-cn/base.po index df6ce8b74..888ceca93 100644 --- a/luci-base/po/zh-cn/base.po +++ b/luci-base/po/zh-cn/base.po @@ -4,7 +4,7 @@ msgstr "" "Last-Translator: Hsing-Wang Liao \n" msgid "%.1f dB" -msgstr "" +msgstr "%.1f dB" msgid "%s is untagged in multiple VLANs!" msgstr "%s 在多个 VLAN 中均未标记！" @@ -39,6 +39,9 @@ msgstr "-- 根据标签匹配 --" msgid "-- match by uuid --" msgstr "-- 根据 UUID 匹配 --" +msgid "-- please select --" +msgstr "-- 请选择 --" + msgid "1 Minute Load:" msgstr "1 分钟负载：" @@ -144,9 +147,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "最大并发查询数" -msgid "%s - %s" -msgstr "%s - %s" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -162,9 +162,6 @@ msgstr "A43C + J43 + A43 + V43" msgid "ADSL" msgstr "ADSL" -msgid "AICCU (SIXXS)" -msgstr "AICCU (SIXXS)" - msgid "ANSI T1.413" msgstr "ANSI T1.413" @@ -200,9 +197,6 @@ msgstr "ATM 设备号码" msgid "ATU-C System Vendor ID" msgstr "ATU-C 系统供应商 ID" -msgid "AYIYA" -msgstr "AYIYA" - msgid "Access Concentrator" msgstr "接入集中器" @@ -212,9 +206,6 @@ msgstr "接入点 AP" msgid "Actions" msgstr "动作" -msgid "Activate this network" -msgstr "激活此网络" - msgid "Active IPv4-Routes" msgstr "活动的 IPv4 路由" @@ -266,6 +257,15 @@ msgstr "总发射功率（ACTATP）" msgid "Alert" msgstr "警戒" +msgid "Alias Interface" +msgstr "接口别名" + +msgid "Alias of \"%s\"" +msgstr "\"%s\" 的别名" + +msgid "All Servers" +msgstr "所有服务器" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -277,6 +277,9 @@ msgstr "顺序分配 IP" msgid "Allow SSH password authentication" msgstr "允许 SSH 密码验证" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "允许 AP 模式时在 low ACK 的情况下断开无线终端" + msgid "Allow all except listed" msgstr "仅允许列表外" @@ -305,16 +308,15 @@ msgstr "允许 127.0.0.0/8 回环范围内的上行响应，例如：RBL 服务" msgid "Allowed IPs" msgstr "允许的 IP" -msgid "" -"Also see Tunneling Comparison on SIXXS" -msgstr "" -"也请查看 SIXXS 上的隧道对比" - msgid "Always announce default router" msgstr "总是通告默认路由" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" +msgstr "" +"即使辅助信道重叠，也始终使用 40MHz 信道。使用此选项不符合IEEE 802.11n-2009！" + msgid "Annex" msgstr "Annex" @@ -390,11 +392,14 @@ msgstr "天线配置" msgid "Any zone" msgstr "任意区域" -msgid "Apply" -msgstr "应用" +msgid "Apply request failed with status %h" +msgstr "应用请求失败，状态 %h" -msgid "Applying changes" -msgstr "正在应用更改" +msgid "Apply unchecked" +msgstr "强制应用" + +msgid "Architecture" +msgstr "架构" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -410,6 +415,9 @@ msgstr "将此十六进制子 ID 前缀分配给此接口" msgid "Associated Stations" msgstr "已连接站点" +msgid "Associations" +msgstr "关联数" + msgid "Auth Group" msgstr "认证组" @@ -485,12 +493,12 @@ msgstr "返回至概况" msgid "Back to scan results" msgstr "返回至扫描结果" +msgid "Backup" +msgstr "备份" + msgid "Backup / Flash Firmware" msgstr "备份/升级" -msgid "Backup / Restore" -msgstr "备份/恢复" - msgid "Backup file list" msgstr "文件备份列表" @@ -500,8 +508,8 @@ msgstr "指定了错误的地址！" msgid "Band" msgstr "频宽" -msgid "Behind NAT" -msgstr "在 NAT 网络内" +msgid "Beacon Interval" +msgstr "Beacon 间隔" msgid "" "Below is the determined list of files to backup. It consists of changed " @@ -558,6 +566,9 @@ msgstr "CA 证书，如果留空，则证书将在第一次连接后被保存。 msgid "CPU usage (%)" msgstr "CPU 使用率（%）" +msgid "Call failed" +msgstr "调用失败" + msgid "Cancel" msgstr "取消" @@ -568,17 +579,25 @@ msgid "Chain" msgstr "链" msgid "Changes" -msgstr "修改数" +msgstr "更改数" msgid "Changes applied." -msgstr "更改已应用" +msgstr "更改已应用。" + +msgid "Changes have been reverted." +msgstr "更改已恢复。" msgid "Changes the administrator password for accessing the device" -msgstr "修改访问设备的管理员密码" +msgstr "更改访问设备的管理员密码" msgid "Channel" msgstr "信道" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "信道 %d 在 %s 监管区域内不可用并已自动调整到 %d。" + msgid "Check" msgstr "检查" @@ -613,11 +632,8 @@ msgstr "Cisco UDP 封装" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." -msgstr "" -"点击“生成备份”下载当前配置文件的 tar 存档。要将固件恢复到初始状态，请单击“执" -"行重置”（仅 squashfs 格式的固件有效）。" +"configuration files." +msgstr "点击“生成备份”下载当前配置文件的 tar 存档。" msgid "Client" msgstr "客户端 Client" @@ -655,12 +671,18 @@ msgstr "" msgid "Configuration" msgstr "配置" -msgid "Configuration applied." -msgstr "配置已应用。" +msgid "Configuration failed" +msgstr "配置失败" msgid "Configuration files will be kept." msgstr "配置文件将被保留。" +msgid "Configuration has been applied." +msgstr "配置已应用。" + +msgid "Configuration has been rolled back!" +msgstr "配置已回滚！" + msgid "Confirmation" msgstr "确认密码" @@ -673,12 +695,20 @@ msgstr "已连接" msgid "Connection Limit" msgstr "连接数限制" -msgid "Connection to server fails when TLS cannot be used" -msgstr "当 TLS 不可用时，与服务器连接失败" +msgid "Connection attempt failed" +msgstr "尝试连接失败" msgid "Connections" msgstr "连接" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" +"应用配置更改后，无法重新获得对设备的访问权限。如果您更改了网络相关设置如 IP " +"地址或无线安全证书，则可能需要重新连接。" + msgid "Country" msgstr "国家" @@ -731,9 +761,6 @@ msgid "" "\">LEDs if possible." msgstr "自定义此设备的 LED 行为。" -msgid "DHCP Leases" -msgstr "DHCP 分配" - msgid "DHCP Server" msgstr "DHCP 服务器" @@ -746,9 +773,6 @@ msgstr "DHCP 客户端" msgid "DHCP-Options" msgstr "DHCP 选项" -msgid "DHCPv6 Leases" -msgstr "DHCPv6 分配" - msgid "DHCPv6 client" msgstr "DHCPv6 客户端" @@ -788,6 +812,9 @@ msgstr "DSL 状态" msgid "DSL line mode" msgstr "DSL 线路模式" +msgid "DTIM Interval" +msgstr "DTIM 间隔" + msgid "DUID" msgstr "DUID" @@ -806,9 +833,6 @@ msgstr "默认网关" msgid "Default is stateless + stateful" msgstr "默认是无状态的 + 有状态的" -msgid "Default route" -msgstr "默认路由" - msgid "Default state" msgstr "默认状态" @@ -829,6 +853,9 @@ msgstr "删除" msgid "Delete this network" msgstr "删除此网络" +msgid "Delivery Traffic Indication Message Interval" +msgstr "发送流量指示消息间隔" + msgid "Description" msgstr "描述" @@ -847,9 +874,12 @@ msgstr "设备配置" msgid "Device is rebooting..." msgstr "设备正在重启..." -msgid "Device unreachable" +msgid "Device unreachable!" msgstr "无法连接到设备" +msgid "Device unreachable! Still waiting for device..." +msgstr "无法连接到设备！仍旧等待设备..." + msgid "Diagnostics" msgstr "网络诊断" @@ -875,15 +905,27 @@ msgstr "停用 DNS 设定" msgid "Disable Encryption" msgstr "禁用加密" +msgid "Disable this network" +msgstr "禁用此网络" + msgid "Disabled" -msgstr "禁用" +msgstr "已禁用" msgid "Disabled (default)" -msgstr "禁用（默认）" +msgstr "已禁用（默认）" + +msgid "Disassociate On Low Acknowledgement" +msgstr "在 Low Acknowledgement 时断开连接" msgid "Discard upstream RFC1918 responses" msgstr "丢弃 RFC1918 上行响应数据" +msgid "Disconnection attempt failed" +msgstr "尝试断开连接失败" + +msgid "Dismiss" +msgstr "解除" + msgid "Displaying only packages containing" msgstr "只显示有内容的软件包" @@ -933,6 +975,9 @@ msgid "" msgstr "" "不转发没有 DNS 名称的解析请求" +msgid "Down" +msgstr "向下" + msgid "Download and install package" msgstr "下载并安装软件包" @@ -974,7 +1019,7 @@ msgid "EAP-Method" msgstr "EAP 类型" msgid "Edit" -msgstr "修改" +msgstr "编辑" msgid "" "Edit the raw configuration data above to fix any error and hit \"Save\" to " @@ -982,10 +1027,10 @@ msgid "" msgstr "编辑上方的原始配置数据来修复错误，点击“保存”按钮以重新载入此页面。" msgid "Edit this interface" -msgstr "修改此接口" +msgstr "编辑此接口" msgid "Edit this network" -msgstr "修改此网络" +msgstr "编辑此网络" msgid "Emergency" msgstr "紧急" @@ -997,6 +1042,7 @@ msgid "" "Enable IGMP " "snooping" msgstr "" +"启用 IGMP 窥探" msgid "Enable STP" msgstr "开启 STP" @@ -1046,6 +1092,9 @@ msgstr "启用后报文的 DF（禁止分片）标志。" msgid "Enable this mount" msgstr "启用此挂载点" +msgid "Enable this network" +msgstr "启用此网络" + msgid "Enable this swap" msgstr "启用此 swap 分区" @@ -1053,10 +1102,10 @@ msgid "Enable/Disable" msgstr "启用/禁用" msgid "Enabled" -msgstr "启用" +msgstr "已启用" msgid "Enables IGMP snooping on this bridge" -msgstr "" +msgstr "在此桥接上启用 IGMP 窥探" msgid "" "Enables fast roaming among access points that belong to the same Mobility " @@ -1078,6 +1127,12 @@ msgstr "端点主机" msgid "Endpoint Port" msgstr "端点端口" +msgid "Enter custom value" +msgstr "输入自定义值" + +msgid "Enter custom values" +msgstr "输入自定义值" + msgid "Erasing..." msgstr "擦除中..." @@ -1128,14 +1183,17 @@ msgid "Extra SSH command options" msgstr "额外的 SSH 命令选项" msgid "FT over DS" -msgstr "" +msgstr "FT over DS" msgid "FT over the Air" -msgstr "" +msgstr "FT over the Air" msgid "FT protocol" msgstr "FT 协议" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "在 %d 秒内确认应用失败，等待回滚..." + msgid "File" msgstr "文件" @@ -1154,6 +1212,9 @@ msgstr "过滤本地包" msgid "Filter useless" msgstr "过滤无用包" +msgid "Finalizing failed" +msgstr "最终确认失败" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1207,6 +1268,9 @@ msgstr "刷写中..." msgid "Force" msgstr "强制" +msgid "Force 40MHz mode" +msgstr "强制 40MHz 模式" + msgid "Force CCMP (AES)" msgstr "强制 CCMP（AES）" @@ -1257,10 +1321,10 @@ msgstr "空闲空间" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" -"有关 WireGuard 接口和 Peer 的更多信息：wireguard.io。" +"有关 WireGuard 接口和 Peer 的更多信息：wireguard.com。" msgid "GHz" msgstr "GHz" @@ -1271,6 +1335,9 @@ msgstr "仅 GPRS" msgid "Gateway" msgstr "网关" +msgid "Gateway address is invalid" +msgstr "网关地址无效" + msgid "Gateway ports" msgstr "网关端口" @@ -1331,22 +1398,16 @@ msgstr "挂起" msgid "Header Error Code Errors (HEC)" msgstr "请求头错误代码错误（HEC）" -msgid "Heartbeat" -msgstr "心跳" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." -msgstr "配置路由器的部分基础信息。" +msgstr "此处配置设备的基础信息，如主机名称或时区。" msgid "" "Here you can paste public SSH-Keys (one per line) for SSH public-key " "authentication." msgstr "请在此处粘贴 SSH 公钥，每行一个，用于 SSH 公钥认证。" -msgid "Hermes 802.11b Wireless Controller" -msgstr "Hermes 802.11b 无线控制器" - msgid "Hide ESSID" msgstr "隐藏 ESSID" @@ -1362,6 +1423,9 @@ msgstr "主机到期超时" msgid "Host-IP or Network" msgstr "主机 IP 或网络" +msgid "Host-Uniq tag content" +msgstr "Host-Uniq 标签内容" + msgid "Hostname" msgstr "主机名" @@ -1383,14 +1447,20 @@ msgstr "IP 地址" msgid "IP address" msgstr "IP 地址" +msgid "IP address in invalid" +msgstr "IP 地址无效" + +msgid "IP address is missing" +msgstr "IP 地址缺失" + msgid "IPv4" msgstr "IPv4" msgid "IPv4 Firewall" msgstr "IPv4 防火墙" -msgid "IPv4 WAN Status" -msgstr "IPv4 WAN 状态" +msgid "IPv4 Upstream" +msgstr "IPv4 上游" msgid "IPv4 address" msgstr "IPv4 地址" @@ -1440,15 +1510,12 @@ msgstr "IPv6 设置" msgid "IPv6 ULA-Prefix" msgstr "IPv6 ULA 前缀" -msgid "IPv6 WAN Status" -msgstr "IPv6 WAN 状态" +msgid "IPv6 Upstream" +msgstr "IPv6 上游" msgid "IPv6 address" msgstr "IPv6 地址" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "绑定到隧道本端的 IPv6 地址（可选）" - msgid "IPv6 assignment hint" msgstr "IPv6 分配提示" @@ -1492,10 +1559,10 @@ msgid "Identity" msgstr "鉴权" msgid "If checked, 1DES is enabled" -msgstr "选中以启用 1DES" +msgstr "如果选中，则启用1DES。" msgid "If checked, encryption is disabled" -msgstr "选中以禁用加密" +msgstr "如果选中，则禁用加密" msgid "" "If specified, mount the device by its UUID instead of a fixed device node" @@ -1555,6 +1622,9 @@ msgstr "入站：" msgid "Info" msgstr "信息" +msgid "Initialization failure" +msgstr "初始化失败" + msgid "Initscript" msgstr "启动脚本" @@ -1591,21 +1661,12 @@ msgstr "接口总览" msgid "Interface is reconnecting..." msgstr "正在重新连接接口..." -msgid "Interface is shutting down..." -msgstr "正在关闭接口..." - msgid "Interface name" msgstr "接口名称" msgid "Interface not present or not connected yet." msgstr "接口不存在或未连接。" -msgid "Interface reconnected" -msgstr "接口已重新连接" - -msgid "Interface shut down" -msgstr "接口已关闭" - msgid "Interfaces" msgstr "接口" @@ -1799,6 +1860,9 @@ msgstr "平均负载" msgid "Loading" msgstr "加载中" +msgid "Local IP address is invalid" +msgstr "本地 IP 地址无效" + msgid "Local IP address to assign" msgstr "要分配的本地 IP 地址" @@ -1863,6 +1927,9 @@ msgstr "信号丢失秒数（LOSS）" msgid "Lowest leased address as offset from the network address." msgstr "网络地址的起始分配基址。" +msgid "MAC" +msgstr "MAC" + msgid "MAC-Address" msgstr "MAC 地址" @@ -1878,6 +1945,9 @@ msgstr "MAC 列表" msgid "MAP / LW4over6" msgstr "MAP / LW4over6" +msgid "MAP rule is invalid" +msgstr "MAP 规则无效" + msgid "MB/s" msgstr "MB/s" @@ -1959,6 +2029,9 @@ msgstr "主机型号" msgid "Modem device" msgstr "调制解调器节点" +msgid "Modem information query failed" +msgstr "调制解调器信息查询失败" + msgid "Modem init timeout" msgstr "调制解调器初始化超时" @@ -2030,9 +2103,6 @@ msgstr "NT 域" msgid "NTP server candidates" msgstr "候选 NTP 服务器" -msgid "NTP sync time-out" -msgstr "NTP 同步超时" - msgid "Name" msgstr "名称" @@ -2057,6 +2127,9 @@ msgstr "网络工具" msgid "Network boot image" msgstr "网络启动镜像" +msgid "Network device is not present" +msgstr "网络设备不存在" + msgid "Network without interfaces." msgstr "无接口的网络。" @@ -2078,6 +2151,9 @@ msgstr "未找到文件" msgid "No information available" msgstr "无可用信息" +msgid "No matching prefix delegation" +msgstr "无匹配的前缀委托" + msgid "No negative cache" msgstr "禁用无效信息缓存" @@ -2096,6 +2172,9 @@ msgstr "未设置密码！" msgid "No rules in this chain" msgstr "本链没有规则" +msgid "No scan results available yet..." +msgstr "还没有可用的扫描结果..." + msgid "No zone assigned" msgstr "未指定区域" @@ -2156,6 +2235,9 @@ msgstr "混淆组密码" msgid "Obfuscated Password" msgstr "混淆密码" +msgid "Obtain IPv6-Address" +msgstr "获取 IPv6 地址" + msgid "Off-State Delay" msgstr "关闭时间" @@ -2197,20 +2279,14 @@ msgid "Operating frequency" msgstr "工作频率" msgid "Option changed" -msgstr "修改的选项" +msgstr "选项已更改" msgid "Option removed" -msgstr "移除的选项" +msgstr "选项已移除" msgid "Optional" msgstr "可选" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "可选，设置这个选项会覆盖默认服务器（tic.sixxs.net）" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "可选，如果您的 SIXXS 账号拥有一个以上的隧道请设置此项" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2235,6 +2311,9 @@ msgstr "可选，Base64 编码的预共享密钥。" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "可选，为此 Peer 创建允许 IP 的路由。" +msgid "Optional. Description of peer." +msgstr "可选，Peer 的描述。" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2315,6 +2394,9 @@ msgstr "PID" msgid "PIN" msgstr "PIN" +msgid "PIN code rejected" +msgstr "PIN 码被拒绝" + msgid "PMK R1 Push" msgstr "R1 推送 PMK" @@ -2373,7 +2455,7 @@ msgid "Password of inner Private Key" msgstr "内部私钥的密码" msgid "Password successfully changed!" -msgstr "密码修改成功！" +msgstr "密码更改成功！" msgid "Password2" msgstr "密码 2" @@ -2402,6 +2484,9 @@ msgstr "峰值：" msgid "Peer IP address to assign" msgstr "要分配的 Peer IP 地址" +msgid "Peer address is missing" +msgstr "Peer 地址缺失" + msgid "Peers" msgstr "Peers" @@ -2470,9 +2555,6 @@ msgstr "不监听这些接口。" msgid "Prevents client-to-client communication" msgstr "禁止客户端间通信" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "Prism2/2.5/3 802.11b 无线控制器" - msgid "Private Key" msgstr "私钥" @@ -2521,6 +2603,11 @@ msgstr "QMI 蜂窝" msgid "Quality" msgstr "质量" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "查询所有可用的上游 DNS 服务器" + msgid "R0 Key Lifetime" msgstr "R0 密钥生存期" @@ -2539,9 +2626,6 @@ msgstr "接收" msgid "RX Rate" msgstr "接收速率" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "RaLink 802.11%s 无线控制器" - msgid "Radius-Accounting-Port" msgstr "Radius 计费端口" @@ -2560,6 +2644,9 @@ msgstr "Radius 认证密钥" msgid "Radius-Authentication-Server" msgstr "Radius 认证服务器" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "原始 16 进制编码的字节。除非您的 ISP 要求，否则请留空" + msgid "" "Read /etc/ethers to configure the DHCP-Server" @@ -2568,35 +2655,21 @@ msgstr "" "Configuration Protocol\">DHCP 服务器" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" -"确定要删除此接口？删除操作无法撤销！\\n删除此接口，可能导致无法再访问路由器！" +"确定要删除此接口？删除操作无法撤消！若您删除此接口，可能导致无法再访问此设备" msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" -"确定要删除此无线网络？删除操作无法撤销！\\n删除此无线网络，可能导致无法再访问" -"路由器！" +"确定要删除此无线网络？删除操作无法撤销！若您删除此无线网络，可能导致无法再访问" +"此设备。" msgid "Really reset all changes?" msgstr "确定要放弃所有更改？" -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" -"确定要关闭此网络？\\n如果您正在使用此接口连接路由器，关闭此网络可能导致连接断" -"开！" - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" -"确定要关闭接口 \"%s\"？\\n如果您正在使用此接口连接路由器，关闭此网络可能导致" -"连接断开！" - msgid "Really switch protocol?" msgstr "确定要切换协议？" @@ -2642,9 +2715,6 @@ msgstr "推荐，Wire Guard 接口的 IP 地址。" msgid "Reconnect this interface" msgstr "重连此接口" -msgid "Reconnecting interface" -msgstr "重连接口中..." - msgid "References" msgstr "引用" @@ -2684,9 +2754,6 @@ msgstr "请求 IPv6 地址" msgid "Request IPv6-prefix of length" msgstr "请求指定长度的 IPv6 前缀" -msgid "Require TLS" -msgstr "必须使用 TLS" - msgid "Required" msgstr "必须" @@ -2740,6 +2807,12 @@ msgstr "重启" msgid "Restart Firewall" msgstr "重启防火墙" +msgid "Restart radio interface" +msgstr "重启无线接口" + +msgid "Restore" +msgstr "恢复" + msgid "Restore backup" msgstr "恢复配置" @@ -2747,7 +2820,16 @@ msgid "Reveal/hide password" msgstr "显示/隐藏 密码" msgid "Revert" -msgstr "放弃" +msgstr "恢复" + +msgid "Revert changes" +msgstr "恢复更改" + +msgid "Revert request failed with status %h" +msgstr "恢复请求失败，状态 %h" + +msgid "Reverting configuration…" +msgstr "正在恢复配置..." msgid "Root" msgstr "Root" @@ -2764,9 +2846,6 @@ msgstr "路由允许的 IP" msgid "Route type" msgstr "路由类型" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "下行接口的路由 IPv6 前缀" - msgid "Router Advertisement-Service" msgstr "路由通告服务" @@ -2790,14 +2869,6 @@ msgstr "文件系统检查" msgid "SHA256" msgstr "SHA256" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "SIXXS 仅支持 TIC，对于使用 IP 协议 41（RFC4213）的静态隧道，使用 6in4" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "SIXXS-handle[/Tunnel-ID]" - msgid "SNR" msgstr "SNR" @@ -2823,14 +2894,14 @@ msgid "Save" msgstr "保存" msgid "Save & Apply" -msgstr "保存&应用" - -msgid "Save & Apply" -msgstr "保存&应用" +msgstr "保存并应用" msgid "Scan" msgstr "扫描" +msgid "Scan request failed" +msgstr "扫描请求失败" + msgid "Scheduled Tasks" msgstr "计划任务" @@ -2854,17 +2925,6 @@ msgstr "隔离客户端" msgid "Server Settings" msgstr "服务器设置" -msgid "Server password" -msgstr "服务器密码" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "服务器密码，如果用户名包含隧道 ID 则在此填写隧道自己的密码" - -msgid "Server username" -msgstr "服务器用户名" - msgid "Service Name" msgstr "服务名" @@ -2884,6 +2944,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "设置时间同步" +msgid "Setting PLMN failed" +msgstr "设置 PLMN 失败" + +msgid "Setting operation mode failed" +msgstr "设置操作模式失败" + msgid "Setup DHCP Server" msgstr "配置 DHCP 服务器" @@ -2893,15 +2959,15 @@ msgstr "严重误码秒（SES）" msgid "Short GI" msgstr "Short GI" +msgid "Short Preamble" +msgstr "Short Preamble" + msgid "Show current backup file list" msgstr "显示当前备份文件列表" msgid "Shutdown this interface" msgstr "关闭此接口" -msgid "Shutdown this network" -msgstr "关闭此网络" - msgid "Signal" msgstr "信号" @@ -2955,15 +3021,9 @@ msgstr "" "抱歉，您的设备暂不支持 sysupgrade 升级，需手动更新固件。请参考 Wiki 中关于此" "设备的固件更新说明。" -msgid "Sort" -msgstr "排序" - msgid "Source" msgstr "源地址" -msgid "Source routing" -msgstr "源路由" - msgid "Specifies the directory the device is attached to" msgstr "指定设备的挂载目录" @@ -3002,6 +3062,12 @@ msgstr "开始" msgid "Start priority" msgstr "启动优先级" +msgid "Starting configuration apply…" +msgstr "开始应用配置..." + +msgid "Starting wireless scan..." +msgstr "正在启动无线扫描..." + msgid "Startup" msgstr "启动项" @@ -3155,9 +3221,25 @@ msgstr "" "合法字符：A-Z, a-z, 0-9 和 _" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "备份存档似乎不是有效的 gzip 文件。" + msgid "The configuration file could not be loaded due to the following error:" msgstr "由于以下错误，配置文件无法被加载：" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" +"在应用挂起的更改后 %d 秒内无法连接到此设备，出于安全原因导致配置回滚。如果您认" +"为配置的更改是正确的，请执行强制应用。或者您可以在再次尝试应用之前解除" +"此警告并编辑配置，或者恢复所有挂起的更改以保持当前正在工作的配置状态。" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3179,11 +3261,8 @@ msgstr "" "固件已上传，请注意核对文件大小和校验值！
点击下面的“继续”开始刷写，刷新" "过程中切勿断电！" -msgid "The following changes have been committed" -msgstr "以下更改已提交" - msgid "The following changes have been reverted" -msgstr "以下更改已放弃" +msgstr "以下更改已恢复" msgid "The following rules are currently active on this system." msgstr "以下规则当前在系统中处于活动状态。" @@ -3240,11 +3319,6 @@ msgstr "" "正在刷新系统...
切勿关闭电源! DO NOT POWER OFF THE DEVICE!
等待数分" "钟后即可尝试重新连接到路由。您可能需要更改计算机的 IP 地址以重新连接。" -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "隧道端点在 NAT 之后，默认为禁用，仅适用于 AYIYA" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3253,14 +3327,14 @@ msgstr "不支持所上传的映像文件格式，请选择适合当前平台的 msgid "There are no active leases." msgstr "没有已分配的租约。" -msgid "There are no pending changes to apply!" -msgstr "没有待生效的更改！" +msgid "There are no changes to apply." +msgstr "没有待应用的更改。" msgid "There are no pending changes to revert!" -msgstr "没有可放弃的更改！" +msgstr "没有挂起的更改可恢复！" msgid "There are no pending changes!" -msgstr "没有待生效的更改！" +msgstr "没有挂起的更改！" msgid "" "There is no device assigned yet, please attach a network device in the " @@ -3288,7 +3362,7 @@ msgid "" "include during sysupgrade. Modified files in /etc/config/ and certain other " "configurations are automatically preserved." msgstr "" -"系统升级时要保存的配置文件和目录的清单。目录 /etc/config/ 内修改过的文件以及" +"系统升级时要保存的配置文件和目录的清单。目录 /etc/config/ 内更改过的文件以及" "部分其他配置会被自动保存。" msgid "" @@ -3349,8 +3423,11 @@ msgstr "时区" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." -msgstr "上传备份存档以恢复配置。" +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." +msgstr "" +"上传备份存档以恢复配置。要将固件恢复到初始状态，请单击“执行重置”（仅 " +"squashfs 格式的固件有效）。" msgid "Tone" msgstr "Tone" @@ -3394,15 +3471,6 @@ msgstr "隧道接口" msgid "Tunnel Link" msgstr "隧道链接" -msgid "Tunnel broker protocol" -msgstr "隧道协议" - -msgid "Tunnel setup server" -msgstr "隧道配置服务器" - -msgid "Tunnel type" -msgstr "隧道类型" - msgid "Tx-Power" msgstr "传输功率" @@ -3427,9 +3495,27 @@ msgstr "USB 接口" msgid "UUID" msgstr "UUID" +msgid "Unable to determine device name" +msgstr "无法确认设备名称" + +msgid "Unable to determine external IP address" +msgstr "无法确认外部 IP 地址" + +msgid "Unable to determine upstream interface" +msgstr "无法确认上游接口" + msgid "Unable to dispatch" msgstr "无法调度" +msgid "Unable to obtain client ID" +msgstr "无法获取客户端 ID" + +msgid "Unable to resolve AFTR host name" +msgstr "无法解析 AFTR 主机名" + +msgid "Unable to resolve peer host name" +msgstr "无法解析 Pear 主机名" + msgid "Unavailable Seconds (UAS)" msgstr "不可用秒数（UAS）" @@ -3439,6 +3525,9 @@ msgstr "未知" msgid "Unknown Error, password not changed!" msgstr "未知错误，密码未更改！" +msgid "Unknown error (%s)" +msgstr "未知错误（%s）" + msgid "Unmanaged" msgstr "不配置协议" @@ -3448,9 +3537,18 @@ msgstr "卸载分区" msgid "Unsaved Changes" msgstr "未保存的配置" +msgid "Unsupported MAP type" +msgstr "不支持的 MAP 类型" + +msgid "Unsupported modem" +msgstr "不支持的调制解调器" + msgid "Unsupported protocol type." msgstr "不支持的协议类型" +msgid "Up" +msgstr "向上" + msgid "Update lists" msgstr "刷新列表" @@ -3582,18 +3680,15 @@ msgstr "Vendor" msgid "Vendor Class to send when requesting DHCP" msgstr "请求 DHCP 时发送的 Vendor Class 选项" -msgid "Verbose" -msgstr "详细" - -msgid "Verbose logging by aiccu daemon" -msgstr "Aiccu 守护程序详细日志" - msgid "Verify" msgstr "验证" msgid "Version" msgstr "版本" +msgid "Virtual dynamic interface" +msgstr "虚拟动态接口" + msgid "WDS" msgstr "WDS" @@ -3619,16 +3714,15 @@ msgstr "" "WPA 加密需要安装 wpa_supplicant（客户端模式）或安装 hostapd（接入点 AP、点对" "点 Ad-Hoc 模式）。" -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "NTP 同步前的等待时间，设置为 0 表示不等待（可选）" - msgid "Waiting for changes to be applied..." msgstr "正在应用更改..." msgid "Waiting for command to complete..." msgstr "等待命令执行完成..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "等待应用配置... %d 秒" + msgid "Waiting for device..." msgstr "等待设备..." @@ -3643,12 +3737,6 @@ msgid "" "communications" msgstr "当使用 PSK 时，PMK 可以在没有 AP 间通信的情况下在本地生成" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "是否添加一条通向隧道的 IPv6 默认路由" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "是否仅路由来自分发前缀的数据包" - msgid "Width" msgstr "频宽" @@ -3670,23 +3758,20 @@ msgstr "无线概况" msgid "Wireless Security" msgstr "无线安全" -msgid "Wireless is disabled or not associated" -msgstr "无线未开启或未关联" +msgid "Wireless is disabled" +msgstr "无线未开启" + +msgid "Wireless is not associated" +msgstr "无线未未关联" msgid "Wireless is restarting..." msgstr "无线重启中..." msgid "Wireless network is disabled" -msgstr "无线已禁用" +msgstr "无线网络已禁用" msgid "Wireless network is enabled" -msgstr "无线网络开关" - -msgid "Wireless restarted" -msgstr "无线已重启" - -msgid "Wireless shut down" -msgstr "无线已关闭" +msgstr "无线网络已启用" msgid "Write received DNS requests to syslog" msgstr "将收到的 DNS 请求写入系统日志" @@ -3726,6 +3811,9 @@ msgstr "baseT" msgid "bridged" msgstr "桥接的" +msgid "create" +msgstr "创建" + msgid "create:" msgstr "创建：" @@ -3763,9 +3851,6 @@ msgstr "全双工" msgid "half-duplex" msgstr "半双工" -msgid "help" -msgstr "帮助" - msgid "hidden" msgstr "隐藏" @@ -3790,12 +3875,12 @@ msgstr "kbit/s" msgid "local DNS file" msgstr "本地 DNS 解析文件" -msgid "minimum 1280, maximum 1480" -msgstr "最小值 1280，最大值 1480" - msgid "minutes" msgstr "分钟" +msgid "mixed WPA/WPA2" +msgstr "mixed WPA/WPA2" + msgid "no" msgstr "否" @@ -3817,11 +3902,14 @@ msgstr "开" msgid "open" msgstr "开放式" +msgid "output" +msgstr "输出" + msgid "overlay" msgstr "覆盖" msgid "random" -msgstr "" +msgstr "随机" msgid "relay mode" msgstr "中继模式" @@ -3868,119 +3956,80 @@ msgstr "是" msgid "« Back" msgstr "« 后退" -#~ msgid "Action" -#~ msgstr "动作" +#~ msgid "%s - %s" +#~ msgstr "%s - %s" -#~ msgid "Buttons" -#~ msgstr "按键" +#~ msgid "Activate this network" +#~ msgstr "激活此网络" -#~ msgid "Handler" -#~ msgstr "处理程序" +#~ msgid "Hermes 802.11b Wireless Controller" +#~ msgstr "Hermes 802.11b 无线控制器" -#~ msgid "Maximum hold time" -#~ msgstr "最大持续时间" +#~ msgid "Interface is shutting down..." +#~ msgstr "正在关闭接口..." -#~ msgid "Minimum hold time" -#~ msgstr "最低持续时间" +#~ msgid "Interface reconnected" +#~ msgstr "接口已重新连接" -#~ msgid "Path to executable which handles the button event" -#~ msgstr "处理按键动作的可执行文件路径" +#~ msgid "Interface shut down" +#~ msgstr "接口已关闭" -#~ msgid "Specifies the button state to handle" -#~ msgstr "指定要处理的按键状态" +#~ msgid "Prism2/2.5/3 802.11b Wireless Controller" +#~ msgstr "Prism2/2.5/3 802.11b 无线控制器" -#~ msgid "This page allows the configuration of custom button actions" -#~ msgstr "自定义按键动作。" +#~ msgid "RaLink 802.11%s Wireless Controller" +#~ msgstr "RaLink 802.11%s 无线控制器" -#~ msgid "Leasetime" -#~ msgstr "租用时间" +#~ msgid "" +#~ "Really shutdown interface \"%s\"? You might lose access to this device if " +#~ "you are connected via this interface." +#~ msgstr "" +#~ "确定要关闭接口 \"%s\"？\\n如果您正在使用此接口连接路由器，关闭此网络可能导" +#~ "致连接断开！" -#~ msgid "Optional." -#~ msgstr "可选。" +#~ msgid "Reconnecting interface" +#~ msgstr "重连接口中..." -#~ msgid "navigation Navigation" -#~ msgstr "导航" +#~ msgid "Shutdown this network" +#~ msgstr "关闭此网络" -#~ msgid "skiplink1 Skip to navigation" -#~ msgstr "skiplink1 跳转到导航" +#~ msgid "Wireless restarted" +#~ msgstr "无线已重启" -#~ msgid "skiplink2 Skip to content" -#~ msgstr "skiplink2 跳到内容" +#~ msgid "Wireless shut down" +#~ msgstr "无线已关闭" -#~ msgid "AuthGroup" -#~ msgstr "认证组" +#~ msgid "Device unreachableX" +#~ msgstr "无法连接到设备！" -#~ msgid "automatic" -#~ msgstr "自动" +#~ msgid "DHCP Leases" +#~ msgstr "DHCP 分配" -#~ msgid "AR Support" -#~ msgstr "AR 支持" +#~ msgid "DHCPv6 Leases" +#~ msgstr "DHCPv6 分配" -#~ msgid "Atheros 802.11%s Wireless Controller" -#~ msgstr "Qualcomm/Atheros 802.11%s 无线控制器" +#~ msgid "" +#~ "Really delete this interface? The deletion cannot be undone! You might " +#~ "lose access to this device if you are connected via this interface." +#~ msgstr "" +#~ "确定要删除此接口？删除操作无法撤销！\\n删除此接口，可能导致无法再访问路由" +#~ "器！" -#~ msgid "Background Scan" -#~ msgstr "后台搜索" +#~ msgid "" +#~ "Really shut down network? You might lose access to this device if you are " +#~ "connected via this interface." +#~ msgstr "" +#~ "确定要关闭此网络？\\n如果您正在使用此接口连接路由器，关闭此网络可能导致连" +#~ "接断开！" -#~ msgid "Compression" -#~ msgstr "压缩" +#~ msgid "Sort" +#~ msgstr "排序" -#~ msgid "Disable HW-Beacon timer" -#~ msgstr "停用 HW-Beacon 计时器" +#~ msgid "help" +#~ msgstr "帮助" -#~ msgid "Do not send probe responses" -#~ msgstr "不回送探测响应" +#~ msgid "IPv4 WAN Status" +#~ msgstr "IPv4 WAN 状态" -#~ msgid "Fast Frames" -#~ msgstr "快速帧" - -#~ msgid "Maximum Rate" -#~ msgstr "最高速率" - -#~ msgid "Minimum Rate" -#~ msgstr "最低速率" - -#~ msgid "Multicast Rate" -#~ msgstr "多播速率" - -#~ msgid "Outdoor Channels" -#~ msgstr "户外频道" - -#~ msgid "Regulatory Domain" -#~ msgstr "无线网络国家区域" - -#~ msgid "Separate WDS" -#~ msgstr "隔离 WDS" - -#~ msgid "Static WDS" -#~ msgstr "静态 WDS" - -#~ msgid "Turbo Mode" -#~ msgstr "Turbo 模式" - -#~ msgid "XR Support" -#~ msgstr "XR 支持" - -#~ msgid "Required. Public key of peer." -#~ msgstr "必须，Peer 的公钥。" - -#~ msgid "An additional network will be created if you leave this checked." -#~ msgstr "如果选中此复选框，则会创建一个附加网络。" - -#~ msgid "An additional network will be created if you leave this unchecked." -#~ msgstr "取消选中将会另外创建一个新网络，而不会覆盖当前网络设置" - -#~ msgid "Join Network: Settings" -#~ msgstr "加入网络：设置" - -#~ msgid "CPU" -#~ msgstr "CPU" - -#~ msgid "Port %d" -#~ msgstr "端口 %d" - -#~ msgid "Port %d is untagged in multiple VLANs!" -#~ msgstr "端口 %d 在多个 VLAN 中均未标记！" - -#~ msgid "VLAN Interface" -#~ msgstr "VLAN 接口" +#~ msgid "IPv6 WAN Status" +#~ msgstr "IPv6 WAN 状态" diff --git a/luci-base/po/zh-tw/base.po b/luci-base/po/zh-tw/base.po index edc5207bd..579d52656 100644 --- a/luci-base/po/zh-tw/base.po +++ b/luci-base/po/zh-tw/base.po @@ -47,6 +47,9 @@ msgstr "" msgid "-- match by uuid --" msgstr "" +msgid "-- please select --" +msgstr "" + msgid "1 Minute Load:" msgstr "1分鐘負載" @@ -150,9 +153,6 @@ msgstr "" msgid "Max. concurrent queries" msgstr "最大並發查詢數" -msgid "%s - %s" -msgstr "%s - %s" - msgid "" "
Note: you need to manually restart the cron service if the crontab file " "was empty before editing." @@ -167,9 +167,6 @@ msgstr "" msgid "ADSL" msgstr "" -msgid "AICCU (SIXXS)" -msgstr "" - msgid "ANSI T1.413" msgstr "" @@ -205,9 +202,6 @@ msgstr "ATM裝置號碼" msgid "ATU-C System Vendor ID" msgstr "" -msgid "AYIYA" -msgstr "" - msgid "Access Concentrator" msgstr "接入集線器" @@ -217,9 +211,6 @@ msgstr "存取點 (AP)" msgid "Actions" msgstr "動作" -msgid "Activate this network" -msgstr "啟用此網路" - msgid "Active IPv4-Routes" msgstr "啟用 IPv4-路由" @@ -271,6 +262,15 @@ msgstr "" msgid "Alert" msgstr "警示" +msgid "Alias Interface" +msgstr "" + +msgid "Alias of \"%s\"" +msgstr "" + +msgid "All Servers" +msgstr "" + msgid "" "Allocate IP addresses sequentially, starting from the lowest available " "address" @@ -282,6 +282,9 @@ msgstr "" msgid "Allow SSH password authentication" msgstr "允許 SSH 密碼驗證" +msgid "Allow AP mode to disconnect STAs based on low ACK condition" +msgstr "" + msgid "Allow all except listed" msgstr "僅允許列表外" @@ -310,12 +313,12 @@ msgstr "允許127.0.0.0/8範圍內的上游回應，例如：RBL服務" msgid "Allowed IPs" msgstr "" -msgid "" -"Also see Tunneling Comparison on SIXXS" +msgid "Always announce default router" msgstr "" -msgid "Always announce default router" +msgid "" +"Always use 40MHz channels even if the secondary channel overlaps. Using this " +"option does not comply with IEEE 802.11n-2009!" msgstr "" msgid "Annex" @@ -393,11 +396,14 @@ msgstr "天線設定" msgid "Any zone" msgstr "任意區域" -msgid "Apply" -msgstr "套用" +msgid "Apply request failed with status %h" +msgstr "" -msgid "Applying changes" -msgstr "正在套用變更" +msgid "Apply unchecked" +msgstr "" + +msgid "Architecture" +msgstr "" msgid "" "Assign a part of given length of every public IPv6-prefix to this interface" @@ -413,6 +419,9 @@ msgstr "" msgid "Associated Stations" msgstr "已連接站點" +msgid "Associations" +msgstr "" + msgid "Auth Group" msgstr "" @@ -488,12 +497,12 @@ msgstr "返回至總覽" msgid "Back to scan results" msgstr "返回至掃描結果" +msgid "Backup" +msgstr "備份" + msgid "Backup / Flash Firmware" msgstr "備份/升級韌體" -msgid "Backup / Restore" -msgstr "備份/還原" - msgid "Backup file list" msgstr "備份檔列表" @@ -503,7 +512,7 @@ msgstr "指定了錯誤的位置！" msgid "Band" msgstr "" -msgid "Behind NAT" +msgid "Beacon Interval" msgstr "" msgid "" @@ -561,6 +570,9 @@ msgstr "" msgid "CPU usage (%)" msgstr "CPU 使用率 (%)" +msgid "Call failed" +msgstr "" + msgid "Cancel" msgstr "取消" @@ -576,12 +588,20 @@ msgstr "待修改" msgid "Changes applied." msgstr "修改已套用" +msgid "Changes have been reverted." +msgstr "" + msgid "Changes the administrator password for accessing the device" msgstr "修改管理員密碼" msgid "Channel" msgstr "頻道" +msgid "" +"Channel %d is not available in the %s regulatory domain and has been auto-" +"adjusted to %d." +msgstr "" + msgid "Check" msgstr "檢查" @@ -618,11 +638,8 @@ msgstr "" msgid "" "Click \"Generate archive\" to download a tar archive of the current " -"configuration files. To reset the firmware to its initial state, click " -"\"Perform reset\" (only possible with squashfs images)." -msgstr "" -"按下\"壓縮檔製作\"就能下載目前設定檔的tar格式的壓縮. 要重置回復出廠值,按下" -"\"執行還原\"(可能只對squashfs影像檔有效)" +"configuration files." +msgstr "按下\"壓縮檔製作\"就能下載目前設定檔的tar格式的壓縮." msgid "Client" msgstr "用戶端" @@ -657,12 +674,18 @@ msgstr "" msgid "Configuration" msgstr "設定" -msgid "Configuration applied." -msgstr "啟用設定" +msgid "Configuration failed" +msgstr "" msgid "Configuration files will be kept." msgstr "設定檔將被存檔" +msgid "Configuration has been applied." +msgstr "" + +msgid "Configuration has been rolled back!" +msgstr "" + msgid "Confirmation" msgstr "再確認" @@ -675,12 +698,18 @@ msgstr "已連線" msgid "Connection Limit" msgstr "連線限制" -msgid "Connection to server fails when TLS cannot be used" +msgid "Connection attempt failed" msgstr "" msgid "Connections" msgstr "連線數" +msgid "" +"Could not regain access to the device after applying the configuration " +"changes. You might need to reconnect if you modified network related " +"settings such as the IP address or wireless security credentials." +msgstr "" + msgid "Country" msgstr "國別" @@ -734,9 +763,6 @@ msgstr "" "如果可以的話,自定這個設備的動作 LEDs ." -msgid "DHCP Leases" -msgstr "DHCP的釋放週期" - msgid "DHCP Server" msgstr "DHCP伺服器" @@ -749,9 +775,6 @@ msgstr "DHCP用戶端" msgid "DHCP-Options" msgstr "DHCP選項" -msgid "DHCPv6 Leases" -msgstr "DHCPv6版釋放時間週期" - msgid "DHCPv6 client" msgstr "" @@ -791,6 +814,9 @@ msgstr "" msgid "DSL line mode" msgstr "" +msgid "DTIM Interval" +msgstr "" + msgid "DUID" msgstr "DHCP獨立式別碼DUID " @@ -809,9 +835,6 @@ msgstr "預設匝道器" msgid "Default is stateless + stateful" msgstr "" -msgid "Default route" -msgstr "" - msgid "Default state" msgstr "預設狀態" @@ -832,6 +855,9 @@ msgstr "刪除" msgid "Delete this network" msgstr "刪除這個網路" +msgid "Delivery Traffic Indication Message Interval" +msgstr "" + msgid "Description" msgstr "描述" @@ -850,7 +876,10 @@ msgstr "設定設備" msgid "Device is rebooting..." msgstr "" -msgid "Device unreachable" +msgid "Device unreachable!" +msgstr "" + +msgid "Device unreachable! Still waiting for device..." msgstr "" msgid "Diagnostics" @@ -877,15 +906,27 @@ msgstr "關閉DNS設置" msgid "Disable Encryption" msgstr "" +msgid "Disable this network" +msgstr "" + msgid "Disabled" msgstr "關閉" msgid "Disabled (default)" msgstr "" +msgid "Disassociate On Low Acknowledgement" +msgstr "" + msgid "Discard upstream RFC1918 responses" msgstr "丟棄上游RFC1918 虛擬IP網路的回應" +msgid "Disconnection attempt failed" +msgstr "" + +msgid "Dismiss" +msgstr "" + msgid "Displaying only packages containing" msgstr "僅顯示內含的軟體" @@ -936,6 +977,9 @@ msgstr "" "若沒 DNS-名稱的話,不要轉發 DNS-請求" +msgid "Down" +msgstr "" + msgid "Download and install package" msgstr "下載並安裝軟體包" @@ -1048,6 +1092,9 @@ msgstr "" msgid "Enable this mount" msgstr "啟用掛載點" +msgid "Enable this network" +msgstr "" + msgid "Enable this swap" msgstr "啟用swap功能" @@ -1080,6 +1127,12 @@ msgstr "" msgid "Endpoint Port" msgstr "" +msgid "Enter custom value" +msgstr "" + +msgid "Enter custom values" +msgstr "" + msgid "Erasing..." msgstr "刪除中..." @@ -1139,6 +1192,9 @@ msgstr "" msgid "FT protocol" msgstr "" +msgid "Failed to confirm apply within %ds, waiting for rollback…" +msgstr "" + msgid "File" msgstr "檔案" @@ -1157,6 +1213,9 @@ msgstr "私人過濾器" msgid "Filter useless" msgstr "無用過濾器" +msgid "Finalizing failed" +msgstr "" + msgid "" "Find all currently attached filesystems and swap and replace configuration " "with defaults based on what was detected" @@ -1210,6 +1269,9 @@ msgstr "更新中..." msgid "Force" msgstr "強制" +msgid "Force 40MHz mode" +msgstr "" + msgid "Force CCMP (AES)" msgstr "強制CCMP (AES)加密" @@ -1260,7 +1322,7 @@ msgstr "剩餘空間" msgid "" "Further information about WireGuard interfaces and peers at wireguard.io." +"wireguard.com\">wireguard.com." msgstr "" msgid "GHz" @@ -1272,6 +1334,9 @@ msgstr "僅用GPRS" msgid "Gateway" msgstr "匝道器" +msgid "Gateway address is invalid" +msgstr "" + msgid "Gateway ports" msgstr "匝道器埠號" @@ -1332,9 +1397,6 @@ msgstr "斷線" msgid "Header Error Code Errors (HEC)" msgstr "" -msgid "Heartbeat" -msgstr "" - msgid "" "Here you can configure the basic aspects of your device like its hostname or " "the timezone." @@ -1345,9 +1407,6 @@ msgid "" "authentication." msgstr "在這裡貼上公用SSH-Keys (每行一個)以便驗證" -msgid "Hermes 802.11b Wireless Controller" -msgstr "Hermes 802.11b 無線網路控制器" - msgid "Hide ESSID" msgstr "隱藏 ESSID" @@ -1363,6 +1422,9 @@ msgstr "過期主機" msgid "Host-IP or Network" msgstr "主機-IP 或網路" +msgid "Host-Uniq tag content" +msgstr "" + msgid "Hostname" msgstr "主機名稱" @@ -1384,14 +1446,20 @@ msgstr "" msgid "IP address" msgstr "IP位址" +msgid "IP address in invalid" +msgstr "" + +msgid "IP address is missing" +msgstr "" + msgid "IPv4" msgstr "IPv4版" msgid "IPv4 Firewall" msgstr "IPv4防火牆" -msgid "IPv4 WAN Status" -msgstr "IPv4寬頻連線狀態" +msgid "IPv4 Upstream" +msgstr "" msgid "IPv4 address" msgstr "IPv4位址" @@ -1441,15 +1509,12 @@ msgstr "" msgid "IPv6 ULA-Prefix" msgstr "" -msgid "IPv6 WAN Status" -msgstr "IPv6寬頻連線狀態" +msgid "IPv6 Upstream" +msgstr "" msgid "IPv6 address" msgstr "IPv6位址" -msgid "IPv6 address delegated to the local tunnel endpoint (optional)" -msgstr "" - msgid "IPv6 assignment hint" msgstr "" @@ -1554,6 +1619,9 @@ msgstr "輸入" msgid "Info" msgstr "訊息" +msgid "Initialization failure" +msgstr "" + msgid "Initscript" msgstr "初始化腳本" @@ -1590,21 +1658,12 @@ msgstr "介面預覽" msgid "Interface is reconnecting..." msgstr "介面重連" -msgid "Interface is shutting down..." -msgstr "介面正在關閉中..." - msgid "Interface name" msgstr "" msgid "Interface not present or not connected yet." msgstr "介面尚未出線或者還沒連上" -msgid "Interface reconnected" -msgstr "介面已重連" - -msgid "Interface shut down" -msgstr "介面關閉" - msgid "Interfaces" msgstr "介面" @@ -1791,6 +1850,9 @@ msgstr "平均掛載" msgid "Loading" msgstr "掛載中" +msgid "Local IP address is invalid" +msgstr "" + msgid "Local IP address to assign" msgstr "" @@ -1856,6 +1918,9 @@ msgstr "" msgid "Lowest leased address as offset from the network address." msgstr "最低的釋放位址從這網路位址的偏移計算" +msgid "MAC" +msgstr "" + msgid "MAC-Address" msgstr "MAC-位址" @@ -1871,6 +1936,9 @@ msgstr "MAC-清單" msgid "MAP / LW4over6" msgstr "" +msgid "MAP rule is invalid" +msgstr "" + msgid "MB/s" msgstr "MB/s" @@ -1950,6 +2018,9 @@ msgstr "" msgid "Modem device" msgstr "數據機設備" +msgid "Modem information query failed" +msgstr "" + msgid "Modem init timeout" msgstr "數據機初始化終結時間" @@ -2021,9 +2092,6 @@ msgstr "" msgid "NTP server candidates" msgstr "NTP伺服器備選" -msgid "NTP sync time-out" -msgstr "" - msgid "Name" msgstr "名稱" @@ -2048,6 +2116,9 @@ msgstr "網路多項工具" msgid "Network boot image" msgstr "網路開機映像檔" +msgid "Network device is not present" +msgstr "" + msgid "Network without interfaces." msgstr "尚無任何介面的網路." @@ -2069,6 +2140,9 @@ msgstr "尚未發現任何檔案" msgid "No information available" msgstr "尚無可運用資訊" +msgid "No matching prefix delegation" +msgstr "" + msgid "No negative cache" msgstr "尚無拒絕的快取" @@ -2087,6 +2161,9 @@ msgstr "尚未設定密碼!" msgid "No rules in this chain" msgstr "尚無規則在這個鏈接上" +msgid "No scan results available yet..." +msgstr "" + msgid "No zone assigned" msgstr "尚未指定區碼" @@ -2147,6 +2224,9 @@ msgstr "" msgid "Obfuscated Password" msgstr "" +msgid "Obtain IPv6-Address" +msgstr "" + msgid "Off-State Delay" msgstr "關閉狀態延遲" @@ -2196,12 +2276,6 @@ msgstr "選項已移除" msgid "Optional" msgstr "" -msgid "Optional, specify to override default server (tic.sixxs.net)" -msgstr "" - -msgid "Optional, use when the SIXXS account has more than one tunnel" -msgstr "" - msgid "" "Optional. 32-bit mark for outgoing encrypted packets. Enter value in hex, " "starting with 0x." @@ -2222,6 +2296,9 @@ msgstr "" msgid "Optional. Create routes for Allowed IPs for this peer." msgstr "" +msgid "Optional. Description of peer." +msgstr "" + msgid "" "Optional. Host of peer. Names are resolved prior to bringing up the " "interface." @@ -2300,6 +2377,9 @@ msgstr "PID碼" msgid "PIN" msgstr "PIN碼" +msgid "PIN code rejected" +msgstr "" + msgid "PMK R1 Push" msgstr "" @@ -2387,6 +2467,9 @@ msgstr "峰值:" msgid "Peer IP address to assign" msgstr "" +msgid "Peer address is missing" +msgstr "" + msgid "Peers" msgstr "" @@ -2455,9 +2538,6 @@ msgstr "" msgid "Prevents client-to-client communication" msgstr "防止用戶端對用戶端的通訊" -msgid "Prism2/2.5/3 802.11b Wireless Controller" -msgstr "Prism2/2.5/3 802.11b 無線控制器" - msgid "Private Key" msgstr "" @@ -2506,6 +2586,11 @@ msgstr "" msgid "Quality" msgstr "品質" +msgid "" +"Query all available upstream DNS " +"servers" +msgstr "" + msgid "R0 Key Lifetime" msgstr "" @@ -2524,9 +2609,6 @@ msgstr "接收" msgid "RX Rate" msgstr "接收速率" -msgid "RaLink 802.11%s Wireless Controller" -msgstr "RaLink 802.11%s 無線控制器" - msgid "Radius-Accounting-Port" msgstr "Radius-驗証帳號-埠" @@ -2545,6 +2627,9 @@ msgstr "Radius-驗証-密碼" msgid "Radius-Authentication-Server" msgstr "Radius-驗証-伺服器" +msgid "Raw hex-encoded bytes. Leave empty unless your ISP require this" +msgstr "" + msgid "" "Read /etc/ethers to configure the DHCP-Server" @@ -2553,14 +2638,12 @@ msgstr "" "Configuration Protocol\">DHCP-伺服器" msgid "" -"Really delete this interface? The deletion cannot be undone!\\nYou might " -"lose access to this device if you are connected via this interface." +"Really delete this interface? The deletion cannot be undone! You might lose " +"access to this device if you are connected via this interface" msgstr "" -"真的要刪除這介面?無法復元刪除!\n" -"假如您要透過這個介面連線您可能會無法存取這個設備." msgid "" -"Really delete this wireless network? The deletion cannot be undone!\\nYou " +"Really delete this wireless network? The deletion cannot be undone! You " "might lose access to this device if you are connected via this network." msgstr "" "真的要刪除這個無線網路?無法復元的刪除!\n" @@ -2569,21 +2652,6 @@ msgstr "" msgid "Really reset all changes?" msgstr "確定要重置回復原廠?" -#, fuzzy -msgid "" -"Really shut down network?\\nYou might lose access to this device if you are " -"connected via this interface." -msgstr "" -"真的要刪除這個網路 ?\n" -"假如您是透過這個介面連線您可能會無法存取這個設備." - -msgid "" -"Really shutdown interface \"%s\" ?\\nYou might lose access to this device if " -"you are connected via this interface." -msgstr "" -"真的要關閉這個介面 \"%s\" ?!\n" -"假如您要透過這個介面連線您可能會無法存取這個設備." - msgid "Really switch protocol?" msgstr "確定要更換協定?" @@ -2629,9 +2697,6 @@ msgstr "" msgid "Reconnect this interface" msgstr "重新連接這個介面" -msgid "Reconnecting interface" -msgstr "重連這個介面中" - msgid "References" msgstr "引用" @@ -2671,9 +2736,6 @@ msgstr "" msgid "Request IPv6-prefix of length" msgstr "" -msgid "Require TLS" -msgstr "" - msgid "Required" msgstr "" @@ -2723,6 +2785,12 @@ msgstr "重啟" msgid "Restart Firewall" msgstr "重啟防火牆" +msgid "Restart radio interface" +msgstr "" + +msgid "Restore" +msgstr "還原" + msgid "Restore backup" msgstr "還原之前備份設定" @@ -2732,6 +2800,15 @@ msgstr "明示/隱藏 密碼" msgid "Revert" msgstr "回溯" +msgid "Revert changes" +msgstr "" + +msgid "Revert request failed with status %h" +msgstr "" + +msgid "Reverting configuration…" +msgstr "" + msgid "Root" msgstr "根" @@ -2747,9 +2824,6 @@ msgstr "" msgid "Route type" msgstr "" -msgid "Routed IPv6 prefix for downstream interfaces" -msgstr "" - msgid "Router Advertisement-Service" msgstr "" @@ -2773,14 +2847,6 @@ msgstr "執行系統檢查" msgid "SHA256" msgstr "" -msgid "" -"SIXXS supports TIC only, for static tunnels using IP protocol 41 (RFC4213) " -"use 6in4 instead" -msgstr "" - -msgid "SIXXS-handle[/Tunnel-ID]" -msgstr "" - msgid "SNR" msgstr "" @@ -2808,12 +2874,12 @@ msgstr "保存" msgid "Save & Apply" msgstr "保存並啟用" -msgid "Save & Apply" -msgstr "保存 & 啟用" - msgid "Scan" msgstr "掃描" +msgid "Scan request failed" +msgstr "" + msgid "Scheduled Tasks" msgstr "排程任務" @@ -2837,17 +2903,6 @@ msgstr "分隔用戶端" msgid "Server Settings" msgstr "伺服器設定值" -msgid "Server password" -msgstr "" - -msgid "" -"Server password, enter the specific password of the tunnel when the username " -"contains the tunnel ID" -msgstr "" - -msgid "Server username" -msgstr "" - msgid "Service Name" msgstr "服務名稱" @@ -2866,6 +2921,12 @@ msgstr "" msgid "Set up Time Synchronization" msgstr "安裝校時同步" +msgid "Setting PLMN failed" +msgstr "" + +msgid "Setting operation mode failed" +msgstr "" + msgid "Setup DHCP Server" msgstr "安裝DHCP伺服器" @@ -2875,15 +2936,15 @@ msgstr "" msgid "Short GI" msgstr "" +msgid "Short Preamble" +msgstr "" + msgid "Show current backup file list" msgstr "顯示現今的備份檔清單" msgid "Shutdown this interface" msgstr "關閉這個介面" -msgid "Shutdown this network" -msgstr "關閉這個網路" - msgid "Signal" msgstr "信號" @@ -2937,15 +2998,9 @@ msgstr "" "抱歉, 沒有sysupgrade支援出現, 新版韌體映像檔必須手動更新. 請回歸wiki找尋特定" "設備安裝指引." -msgid "Sort" -msgstr "分類" - msgid "Source" msgstr "來源" -msgid "Source routing" -msgstr "" - msgid "Specifies the directory the device is attached to" msgstr "指定這個設備被附掛到那個目錄" @@ -2984,6 +3039,12 @@ msgstr "啟用" msgid "Start priority" msgstr "啟用優先權順序" +msgid "Starting configuration apply…" +msgstr "" + +msgid "Starting wireless scan..." +msgstr "" + msgid "Startup" msgstr "啟動" @@ -3141,9 +3202,22 @@ msgstr "" "所允許的字元是: A-Z, a-z, 0-9 and " "_" +msgid "The backup archive does not appear to be a valid gzip file." +msgstr "" + msgid "The configuration file could not be loaded due to the following error:" msgstr "" +msgid "" +"The device could not be reached within %d seconds after applying the pending " +"changes, which caused the configuration to be rolled back for safety " +"reasons. If you believe that the configuration changes are correct " +"nonetheless, perform an unchecked configuration apply. Alternatively, you " +"can dismiss this warning and edit changes before attempting to apply again, " +"or revert all pending changes to keep the currently working configuration " +"state." +msgstr "" + msgid "" "The device file of the memory or partition (e.g." " /dev/sda1)" @@ -3167,9 +3241,6 @@ msgstr "" "要刷的映像檔已上傳.下面是這個校驗碼和檔案大小詳列, 用原始檔比對它門以確保資料" "完整性.
按下面的\"繼續\"便可以開啟更新流程." -msgid "The following changes have been committed" -msgstr "接下來的修改已經被承諾" - msgid "The following changes have been reverted" msgstr "接下來的修改已經被回復" @@ -3230,11 +3301,6 @@ msgstr "" "系統現正刷機中.
請勿關閉設備!
等待數分鐘直到您重新在連線. 可能需" "要更新您電腦的位址以便再連設備, 端看您的設定. " -msgid "" -"The tunnel end-point is behind NAT, defaults to disabled and only applies to " -"AYIYA" -msgstr "" - msgid "" "The uploaded image file does not contain a supported format. Make sure that " "you choose the generic image format for your platform." @@ -3244,8 +3310,8 @@ msgstr "" msgid "There are no active leases." msgstr "租賃尚未啟動." -msgid "There are no pending changes to apply!" -msgstr "尚無聽候的修改被採用" +msgid "There are no changes to apply." +msgstr "" msgid "There are no pending changes to revert!" msgstr "尚無聽候的修改被復元!" @@ -3340,8 +3406,11 @@ msgstr "時區" msgid "" "To restore configuration files, you can upload a previously generated backup " -"archive here." -msgstr "要復元設定檔, 可以上傳之前製作的備份壓縮檔放這." +"archive here. To reset the firmware to its initial state, click \"Perform " +"reset\" (only possible with squashfs images)." +msgstr "" +"要復元設定檔, 可以上傳之前製作的備份壓縮檔放這. 要重置回復出廠值,按下\"執行還" +"原\"(可能只對squashfs影像檔有效)" msgid "Tone" msgstr "" @@ -3385,15 +3454,6 @@ msgstr "通道介面" msgid "Tunnel Link" msgstr "" -msgid "Tunnel broker protocol" -msgstr "" - -msgid "Tunnel setup server" -msgstr "" - -msgid "Tunnel type" -msgstr "" - msgid "Tx-Power" msgstr "傳送-功率" @@ -3418,9 +3478,27 @@ msgstr "" msgid "UUID" msgstr "設備通用唯一識別碼UUID" +msgid "Unable to determine device name" +msgstr "" + +msgid "Unable to determine external IP address" +msgstr "" + +msgid "Unable to determine upstream interface" +msgstr "" + msgid "Unable to dispatch" msgstr "無法發送" +msgid "Unable to obtain client ID" +msgstr "" + +msgid "Unable to resolve AFTR host name" +msgstr "" + +msgid "Unable to resolve peer host name" +msgstr "" + msgid "Unavailable Seconds (UAS)" msgstr "" @@ -3430,6 +3508,9 @@ msgstr "未知" msgid "Unknown Error, password not changed!" msgstr "未知錯誤, 密碼尚未改變!" +msgid "Unknown error (%s)" +msgstr "" + msgid "Unmanaged" msgstr "非託管" @@ -3439,9 +3520,18 @@ msgstr "" msgid "Unsaved Changes" msgstr "尚未存檔的修改" +msgid "Unsupported MAP type" +msgstr "" + +msgid "Unsupported modem" +msgstr "" + msgid "Unsupported protocol type." msgstr "不支援的協定型態" +msgid "Up" +msgstr "" + msgid "Update lists" msgstr "上傳清單" @@ -3571,18 +3661,15 @@ msgstr "" msgid "Vendor Class to send when requesting DHCP" msgstr "當請求DHCP封包時要傳送的製造商類別碼" -msgid "Verbose" -msgstr "" - -msgid "Verbose logging by aiccu daemon" -msgstr "" - msgid "Verify" msgstr "確認" msgid "Version" msgstr "版本" +msgid "Virtual dynamic interface" +msgstr "" + msgid "WDS" msgstr "無線分散系統WDS" @@ -3608,16 +3695,15 @@ msgstr "" "WPA-加密需要 wpa_supplican(終端模式)或者hostapd熱點(對AP或者是 ad-hoc模式)已" "被安裝." -msgid "" -"Wait for NTP sync that many seconds, seting to 0 disables waiting (optional)" -msgstr "" - msgid "Waiting for changes to be applied..." msgstr "等待修改被啟用..." msgid "Waiting for command to complete..." msgstr "等待完整性指令..." +msgid "Waiting for configuration to get applied… %ds" +msgstr "" + msgid "Waiting for device..." msgstr "" @@ -3632,12 +3718,6 @@ msgid "" "communications" msgstr "" -msgid "Whether to create an IPv6 default route over the tunnel" -msgstr "" - -msgid "Whether to route only packets from delegated prefixes" -msgstr "" - msgid "Width" msgstr "" @@ -3659,8 +3739,11 @@ msgstr "無線預覽" msgid "Wireless Security" msgstr "無線安全" -msgid "Wireless is disabled or not associated" -msgstr "無線被關閉或者尚未關聯" +msgid "Wireless is disabled" +msgstr "無線被關閉" + +msgid "Wireless is not associated" +msgstr "無線未關聯" msgid "Wireless is restarting..." msgstr "無線重啟中..." @@ -3671,12 +3754,6 @@ msgstr "無線網路已經被關閉" msgid "Wireless network is enabled" msgstr "無線網路已啟用" -msgid "Wireless restarted" -msgstr "無線網路已重啟" - -msgid "Wireless shut down" -msgstr "無線網路關閉" - msgid "Write received DNS requests to syslog" msgstr "寫入已接收的DNS請求到系統日誌中" @@ -3713,6 +3790,9 @@ msgstr "baseT" msgid "bridged" msgstr "已橋接" +msgid "create" +msgstr "" + msgid "create:" msgstr "建立:" @@ -3750,9 +3830,6 @@ msgstr "全雙工" msgid "half-duplex" msgstr "半雙工" -msgid "help" -msgstr "幫助" - msgid "hidden" msgstr "隱藏" @@ -3777,10 +3854,10 @@ msgstr "kbit/s" msgid "local DNS file" msgstr "本地DNS 檔案" -msgid "minimum 1280, maximum 1480" +msgid "minutes" msgstr "" -msgid "minutes" +msgid "mixed WPA/WPA2" msgstr "" msgid "no" @@ -3804,6 +3881,9 @@ msgstr "開啟" msgid "open" msgstr "打開" +msgid "output" +msgstr "" + msgid "overlay" msgstr "" @@ -3855,6 +3935,100 @@ msgstr "是的" msgid "« Back" msgstr "« 倒退" +#~ msgid "%s - %s" +#~ msgstr "%s - %s" + +#~ msgid "Activate this network" +#~ msgstr "啟用此網路" + +#~ msgid "Hermes 802.11b Wireless Controller" +#~ msgstr "Hermes 802.11b 無線網路控制器" + +#~ msgid "Interface is shutting down..." +#~ msgstr "介面正在關閉中..." + +#~ msgid "Interface reconnected" +#~ msgstr "介面已重連" + +#~ msgid "Interface shut down" +#~ msgstr "介面關閉" + +#~ msgid "Prism2/2.5/3 802.11b Wireless Controller" +#~ msgstr "Prism2/2.5/3 802.11b 無線控制器" + +#~ msgid "RaLink 802.11%s Wireless Controller" +#~ msgstr "RaLink 802.11%s 無線控制器" + +#~ msgid "" +#~ "Really shutdown interface \"%s\"? You might lose access to this device if " +#~ "you are connected via this interface." +#~ msgstr "" +#~ "真的要關閉這個介面 \"%s\" ?!\n" +#~ "假如您要透過這個介面連線您可能會無法存取這個設備." + +#~ msgid "Reconnecting interface" +#~ msgstr "重連這個介面中" + +#~ msgid "Shutdown this network" +#~ msgstr "關閉這個網路" + +#~ msgid "Wireless restarted" +#~ msgstr "無線網路已重啟" + +#~ msgid "Wireless shut down" +#~ msgstr "無線網路關閉" + +#~ msgid "DHCP Leases" +#~ msgstr "DHCP的釋放週期" + +#~ msgid "DHCPv6 Leases" +#~ msgstr "DHCPv6版釋放時間週期" + +#~ msgid "" +#~ "Really delete this interface? The deletion cannot be undone! You might " +#~ "lose access to this device if you are connected via this interface." +#~ msgstr "" +#~ "真的要刪除這介面?無法復元刪除!\n" +#~ "假如您要透過這個介面連線您可能會無法存取這個設備." + +#, fuzzy +#~ msgid "" +#~ "Really shut down network? You might lose access to this device if you are " +#~ "connected via this interface." +#~ msgstr "" +#~ "真的要刪除這個網路 ?\n" +#~ "假如您是透過這個介面連線您可能會無法存取這個設備." + +#~ msgid "Sort" +#~ msgstr "分類" + +#~ msgid "help" +#~ msgstr "幫助" + +#~ msgid "IPv4 WAN Status" +#~ msgstr "IPv4寬頻連線狀態" + +#~ msgid "IPv6 WAN Status" +#~ msgstr "IPv6寬頻連線狀態" + +#~ msgid "Apply" +#~ msgstr "套用" + +#~ msgid "Applying changes" +#~ msgstr "正在套用變更" + +#~ msgid "Configuration applied." +#~ msgstr "啟用設定" + +#~ msgid "Save & Apply" +#~ msgstr "保存 & 啟用" + +#~ msgid "The following changes have been committed" +#~ msgstr "接下來的修改已經被承諾" + +#~ msgid "There are no pending changes to apply!" +#~ msgstr "尚無聽候的修改被採用" + #~ msgid "Action" #~ msgstr "動作" diff --git a/luci-base/root/etc/config/luci b/luci-base/root/etc/config/luci index baa3ac5d1..82c2230e5 100644 --- a/luci-base/root/etc/config/luci +++ b/luci-base/root/etc/config/luci @@ -22,3 +22,9 @@ config internal ccache option enable 1 config internal themes + +config internal apply + option rollback 30 + option holdoff 4 + option timeout 5 + option display 1.5 diff --git a/luci-base/root/etc/config/ucitrack b/luci-base/root/etc/config/ucitrack index 1d4d110f2..e63986630 100644 --- a/luci-base/root/etc/config/ucitrack +++ b/luci-base/root/etc/config/ucitrack @@ -29,7 +29,7 @@ config httpd option init httpd config fstab - option init fstab + option exec '/sbin/block mount' config qos option init qos diff --git a/luci-base/root/etc/init.d/ucitrack b/luci-base/root/etc/init.d/ucitrack new file mode 100755 index 000000000..27d34fa29 --- /dev/null +++ b/luci-base/root/etc/init.d/ucitrack @@ -0,0 +1,57 @@ +#!/bin/sh /etc/rc.common + +START=80 +USE_PROCD=1 + +register_init() { + local config="$1" + local init="$2" + shift; shift + + if [ -x "$init" ] && "$init" enabled && ! grep -sqE 'USE_PROCD=.' "$init"; then + logger -t "ucitrack" "Setting up /etc/config/$config reload trigger for non-procd $init" + procd_add_config_trigger "config.change" "$config" "$init" "$@" + fi +} + +register_trigger() { + local sid="$1" + local config init exec affects affected + + config_get config "$sid" TYPE + config_get init "$sid" init + config_get exec "$sid" exec + config_get affects "$sid" affects + + if [ -n "$init" ]; then + register_init "$config" "/etc/init.d/$init" "reload" + fi + + if [ -n "$exec" ]; then + case "$exec" in + /etc/init.d/*) + set -- $exec + register_init "$config" "$@" + ;; + *) + logger -t "ucitrack" "Setting up non-init /etc/config/$config reload handler: $exec" + procd_add_config_trigger "config.change" "$config" "$exec" + ;; + esac + fi + + for affected in $affects; do + logger -t "ucitrack" "Setting up /etc/config/$config reload dependency on /etc/config/$affected" + procd_add_config_trigger "config.change" "$affected" \ + ubus call service event \ + "$(printf '{"type":"config.change","data":{"package":"%s"}}' $config)" + done +} + +service_triggers() { + config_foreach register_trigger +} + +start_service() { + config_load ucitrack +} diff --git a/luci-mod-admin-full/Makefile b/luci-mod-admin-full/Makefile index f36a13194..d47136753 100644 --- a/luci-mod-admin-full/Makefile +++ b/luci-mod-admin-full/Makefile @@ -11,6 +11,7 @@ LUCI_TITLE:=LuCI Administration - full-featured for full control LUCI_DEPENDS:=+luci-base +luci-app-firewall PKG_BUILD_DEPENDS:=iwinfo +PKG_LICENSE:=Apache-2.0 include ../luci/luci.mk diff --git a/luci-mod-admin-full/htdocs/luci-static/resources/bandwidth.svg b/luci-mod-admin-full/htdocs/luci-static/resources/bandwidth.svg index 4f9148833..5a121b85c 100644 --- a/luci-mod-admin-full/htdocs/luci-static/resources/bandwidth.svg +++ b/luci-mod-admin-full/htdocs/luci-static/resources/bandwidth.svg @@ -2,15 +2,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/luci-mod-admin-full/htdocs/luci-static/resources/connections.svg b/luci-mod-admin-full/htdocs/luci-static/resources/connections.svg index 816f7e6a7..5794e7942 100644 --- a/luci-mod-admin-full/htdocs/luci-static/resources/connections.svg +++ b/luci-mod-admin-full/htdocs/luci-static/resources/connections.svg @@ -2,16 +2,16 @@ - - - - - - - - - + + + + + + + + + diff --git a/luci-mod-admin-full/htdocs/luci-static/resources/load.svg b/luci-mod-admin-full/htdocs/luci-static/resources/load.svg index d6817027a..716d37617 100644 --- a/luci-mod-admin-full/htdocs/luci-static/resources/load.svg +++ b/luci-mod-admin-full/htdocs/luci-static/resources/load.svg @@ -2,16 +2,16 @@ - - - - - - - - - + + + + + + + + + diff --git a/luci-mod-admin-full/htdocs/luci-static/resources/wifirate.svg b/luci-mod-admin-full/htdocs/luci-static/resources/wifirate.svg index d3e848b93..e75ea614c 100644 --- a/luci-mod-admin-full/htdocs/luci-static/resources/wifirate.svg +++ b/luci-mod-admin-full/htdocs/luci-static/resources/wifirate.svg @@ -2,14 +2,14 @@ + + - + - + - - - + diff --git a/luci-mod-admin-full/htdocs/luci-static/resources/wireless.svg b/luci-mod-admin-full/htdocs/luci-static/resources/wireless.svg index 99d9840f6..00cc2a12f 100644 --- a/luci-mod-admin-full/htdocs/luci-static/resources/wireless.svg +++ b/luci-mod-admin-full/htdocs/luci-static/resources/wireless.svg @@ -2,15 +2,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/luci-mod-admin-full/luasrc/controller/admin/network.lua b/luci-mod-admin-full/luasrc/controller/admin/network.lua index e881694be..aef67a364 100644 --- a/luci-mod-admin-full/luasrc/controller/admin/network.lua +++ b/luci-mod-admin-full/luasrc/controller/admin/network.lua @@ -1,5 +1,5 @@ -- Copyright 2008 Steven Barth --- Copyright 2011-2015 Jo-Philipp Wich +-- Copyright 2011-2018 Jo-Philipp Wich -- Licensed to the public under the Apache License 2.0. module("luci.controller.admin.network", package.seeall) @@ -43,25 +43,28 @@ function index() end) if has_wifi then + page = entry({"admin", "network", "wireless_assoclist"}, call("wifi_assoclist"), nil) + page.leaf = true + page = entry({"admin", "network", "wireless_join"}, post("wifi_join"), nil) page.leaf = true page = entry({"admin", "network", "wireless_add"}, post("wifi_add"), nil) page.leaf = true - page = entry({"admin", "network", "wireless_delete"}, post("wifi_delete"), nil) - page.leaf = true - page = entry({"admin", "network", "wireless_status"}, call("wifi_status"), nil) page.leaf = true page = entry({"admin", "network", "wireless_reconnect"}, post("wifi_reconnect"), nil) page.leaf = true - page = entry({"admin", "network", "wireless_shutdown"}, post("wifi_shutdown"), nil) + page = entry({"admin", "network", "wireless_scan_trigger"}, post("wifi_scan_trigger"), nil) page.leaf = true - page = entry({"admin", "network", "wireless"}, arcombine(template("admin_network/wifi_overview"), cbi("admin_network/wifi")), _("Wireless"), 15) + page = entry({"admin", "network", "wireless_scan_results"}, call("wifi_scan_results"), nil) + page.leaf = true + + page = entry({"admin", "network", "wireless"}, arcombine(cbi("admin_network/wifi_overview"), cbi("admin_network/wifi")), _("Wireless"), 15) page.leaf = true page.subindex = true @@ -82,10 +85,7 @@ function index() end - page = entry({"admin", "network", "iface_add"}, cbi("admin_network/iface_add"), nil) - page.leaf = true - - page = entry({"admin", "network", "iface_delete"}, post("iface_delete"), nil) + page = entry({"admin", "network", "iface_add"}, form("admin_network/iface_add"), nil) page.leaf = true page = entry({"admin", "network", "iface_status"}, call("iface_status"), nil) @@ -94,9 +94,6 @@ function index() page = entry({"admin", "network", "iface_reconnect"}, post("iface_reconnect"), nil) page.leaf = true - page = entry({"admin", "network", "iface_shutdown"}, post("iface_shutdown"), nil) - page.leaf = true - page = entry({"admin", "network", "network"}, arcombine(cbi("admin_network/network"), cbi("admin_network/ifaces")), _("Interfaces"), 10) page.leaf = true page.subindex = true @@ -153,9 +150,6 @@ function index() page = entry({"admin", "network", "diag_traceroute6"}, post("diag_traceroute6"), nil) page.leaf = true - page = entry({"admin", "network", "diag_iperf3"}, post("diag_iperf3"), nil) - page.leaf = true - page = entry({"admin", "network", "diag_speedtest"}, post("diag_speedtest"), nil) page.leaf = true @@ -210,29 +204,6 @@ function wifi_add() end end -function wifi_delete(network) - local ntm = require "luci.model.network".init() - local wnet = ntm:get_wifinet(network) - if wnet then - local dev = wnet:get_device() - local nets = wnet:get_networks() - if dev then - ntm:del_wifinet(network) - ntm:commit("wireless") - local _, net - for _, net in ipairs(nets) do - if net:is_empty() then - ntm:del_network(net:name()) - ntm:commit("network") - end - end - luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>/dev/null") - end - end - - luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless")) -end - function iface_status(ifaces) local netm = require "luci.model.network".init() local rv = { } @@ -244,6 +215,7 @@ function iface_status(ifaces) if device then local data = { id = iface, + desc = net:get_i18n(), proto = net:proto(), uptime = net:uptime(), gwaddr = net:gwaddr(), @@ -251,11 +223,15 @@ function iface_status(ifaces) ip6addrs = net:ip6addrs(), dnsaddrs = net:dnsaddrs(), ip6prefix = net:ip6prefix(), + errors = net:errors(), name = device:shortname(), type = device:type(), + typename = device:get_type_i18n(), ifname = device:name(), macaddr = device:mac(), - is_up = device:is_up(), + is_up = net:is_up() and device:is_up(), + is_alias = net:is_alias(), + is_dynamic = net:is_dynamic(), rx_bytes = device:rx_bytes(), tx_bytes = device:tx_bytes(), rx_packets = device:rx_packets(), @@ -268,6 +244,7 @@ function iface_status(ifaces) data.subdevices[#data.subdevices+1] = { name = device:shortname(), type = device:type(), + typename = device:get_type_i18n(), ifname = device:name(), macaddr = device:mac(), is_up = device:is_up(), @@ -301,7 +278,8 @@ function iface_reconnect(iface) local netmd = require "luci.model.network".init() local net = netmd:get_network(iface) if net then - luci.sys.call("env -i /sbin/ifup %q >/dev/null 2>/dev/null" % iface) + luci.sys.call("env -i /sbin/ifup %s >/dev/null 2>/dev/null" + % luci.util.shellquote(iface)) luci.http.status(200, "Reconnected") return end @@ -309,39 +287,15 @@ function iface_reconnect(iface) luci.http.status(404, "No such interface") end -function iface_shutdown(iface) - local netmd = require "luci.model.network".init() - local net = netmd:get_network(iface) - if net then - luci.sys.call("env -i /sbin/ifdown %q >/dev/null 2>/dev/null" % iface) - luci.http.status(200, "Shutdown") - return - end - - luci.http.status(404, "No such interface") -end - -function iface_delete(iface) - local netmd = require "luci.model.network".init() - local net = netmd:del_network(iface) - if net then - luci.sys.call("env -i /sbin/ifdown %q >/dev/null 2>/dev/null" % iface) - luci.http.redirect(luci.dispatcher.build_url("admin/network/network")) - netmd:commit("network") - netmd:commit("wireless") - return - end - - luci.http.status(404, "No such interface") -end - function wifi_status(devs) local s = require "luci.tools.status" local rv = { } - local dev - for dev in devs:gmatch("[%w%.%-]+") do - rv[#rv+1] = s.wifi_network(dev) + if type(devs) == "string" then + local dev + for dev in devs:gmatch("[%w%.%-]+") do + rv[#rv+1] = s.wifi_network(dev) + end end if #rv > 0 then @@ -353,30 +307,93 @@ function wifi_status(devs) luci.http.status(404, "No such device") end -local function wifi_reconnect_shutdown(shutdown, wnet) - local netmd = require "luci.model.network".init() - local net = netmd:get_wifinet(wnet) - local dev = net:get_device() - if dev and net then - dev:set("disabled", nil) - net:set("disabled", shutdown and 1 or nil) - netmd:commit("wireless") +function wifi_reconnect(radio) + local rc = luci.sys.call("env -i /sbin/wifi up %s" % luci.util.shellquote(radio)) - luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>/dev/null") - luci.http.status(200, shutdown and "Shutdown" or "Reconnected") + if rc == 0 then + luci.http.status(200, "Reconnected") + else + luci.http.status(500, "Error") + end +end +function wifi_assoclist() + local s = require "luci.tools.status" + + luci.http.prepare_content("application/json") + luci.http.write_json(s.wifi_assoclist()) +end + + +local function _wifi_get_scan_results(cache_key) + local results = luci.util.ubus("session", "get", { + ubus_rpc_session = luci.model.uci:get_session_id(), + keys = { cache_key } + }) + + if type(results) == "table" and + type(results.values) == "table" and + type(results.values[cache_key]) == "table" + then + return results.values[cache_key] + end + + return { } +end + +function wifi_scan_trigger(radio, update) + local iw = radio and luci.sys.wifi.getiwinfo(radio) + + if not iw then + luci.http.status(404, "No such radio device") return end - luci.http.status(404, "No such radio") + luci.http.status(200, "Scan scheduled") + + if nixio.fork() == 0 then + io.stderr:close() + io.stdout:close() + + local _, bss + local data, bssids = { }, { } + local cache_key = "scan_%s" % radio + + luci.util.ubus("session", "set", { + ubus_rpc_session = luci.model.uci:get_session_id(), + values = { [cache_key] = nil } + }) + + for _, bss in ipairs(iw.scanlist or { }) do + data[_] = bss + bssids[bss.bssid] = bss + end + + if update then + for _, bss in ipairs(_wifi_get_scan_results(cache_key)) do + if not bssids[bss.bssid] then + bss.stale = true + data[#data + 1] = bss + end + end + end + + luci.util.ubus("session", "set", { + ubus_rpc_session = luci.model.uci:get_session_id(), + values = { [cache_key] = data } + }) + end end -function wifi_reconnect(wnet) - wifi_reconnect_shutdown(false, wnet) -end +function wifi_scan_results(radio) + local results = radio and _wifi_get_scan_results("scan_%s" % radio) -function wifi_shutdown(wnet) - wifi_reconnect_shutdown(true, wnet) + if results and #results > 0 then + luci.http.prepare_content("application/json") + luci.http.write_json(results) + else + luci.http.status(404, "No wireless scan results") + end end function lease_status() @@ -420,27 +437,23 @@ function diag_command(cmd, addr) end function diag_ping(addr) - diag_command("ping -c 5 -W 1 %q 2>&1", addr) + diag_command("ping -c 5 -W 1 %s 2>&1", addr) end function diag_traceroute(addr) - diag_command("traceroute -q 1 -w 1 -n %q 2>&1", addr) + diag_command("traceroute -q 1 -w 1 -n %s 2>&1", addr) end function diag_nslookup(addr) - diag_command("nslookup %q 2>&1", addr) + diag_command("nslookup %s 2>&1", addr) end function diag_ping6(addr) - diag_command("ping6 -c 5 %q 2>&1", addr) + diag_command("ping6 -c 5 %s 2>&1", addr) end function diag_traceroute6(addr) - diag_command("traceroute6 -q 1 -w 2 -n %q 2>&1", addr) -end - -function diag_iperf3(addr) - diag_command("iperf3 -c %q 2>&1", addr) + diag_command("traceroute6 -q 1 -w 2 -n %s 2>&1", addr) end function diag_getip(addr) diff --git a/luci-mod-admin-full/luasrc/controller/admin/status.lua b/luci-mod-admin-full/luasrc/controller/admin/status.lua index 22e1b7e17..ff95f3d91 100644 --- a/luci-mod-admin-full/luasrc/controller/admin/status.lua +++ b/luci-mod-admin-full/luasrc/controller/admin/status.lua @@ -14,7 +14,7 @@ function index() entry({"admin", "status", "routes"}, template("admin_status/routes"), _("Routes"), 3) entry({"admin", "status", "syslog"}, call("action_syslog"), _("System Log"), 4) entry({"admin", "status", "dmesg"}, call("action_dmesg"), _("Kernel Log"), 5) - entry({"admin", "status", "processes"}, cbi("admin_status/processes"), _("Processes"), 6) + entry({"admin", "status", "processes"}, form("admin_status/processes"), _("Processes"), 6) entry({"admin", "status", "realtime"}, alias("admin", "status", "realtime", "load"), _("Realtime Graphs"), 7) @@ -62,7 +62,9 @@ end function action_bandwidth(iface) luci.http.prepare_content("application/json") - local bwc = io.popen("luci-bwc -i %q 2>/dev/null" % iface) + local bwc = io.popen("luci-bwc -i %s 2>/dev/null" + % luci.util.shellquote(iface)) + if bwc then luci.http.write("[") @@ -80,7 +82,9 @@ end function action_wireless(iface) luci.http.prepare_content("application/json") - local bwc = io.popen("luci-bwc -r %q 2>/dev/null" % iface) + local bwc = io.popen("luci-bwc -r %s 2>/dev/null" + % luci.util.shellquote(iface)) + if bwc then luci.http.write("[") @@ -118,12 +122,12 @@ function action_connections() luci.http.prepare_content("application/json") - luci.http.write("{ connections: ") + luci.http.write('{ "connections": ') luci.http.write_json(sys.net.conntrack()) local bwc = io.popen("luci-bwc -c 2>/dev/null") if bwc then - luci.http.write(", statistics: [") + luci.http.write(', "statistics": [') while true do local ln = bwc:read("*l") diff --git a/luci-mod-admin-full/luasrc/controller/admin/system.lua b/luci-mod-admin-full/luasrc/controller/admin/system.lua index 5478afa3e..153615b58 100644 --- a/luci-mod-admin-full/luasrc/controller/admin/system.lua +++ b/luci-mod-admin-full/luasrc/controller/admin/system.lua @@ -27,7 +27,8 @@ function index() entry({"admin", "system", "fstab", "swap"}, cbi("admin_system/fstab/swap"), nil).leaf = true end - if fs.access("/sys/class/leds") then + local nodes, number = fs.glob("/sys/class/leds/*") + if number > 0 then entry({"admin", "system", "leds"}, cbi("admin_system/leds"), _("LED Configuration"), 60) end @@ -73,7 +74,7 @@ function action_packages() local out, err -- Display - local display = luci.http.formvalue("display") or "installed" + local display = luci.http.formvalue("display") or "available" -- Letter local letter = string.byte(luci.http.formvalue("letter") or "A", 1) @@ -195,7 +196,7 @@ local function supports_sysupgrade() end local function supports_reset() - return (os.execute([[grep -sqE '"rootfs_data"|"ubi"' /proc/mtd]]) == 0) + return (os.execute([[grep -sq "^overlayfs:/overlay / overlay " /proc/mounts]]) == 0) end local function storage_size() @@ -340,9 +341,17 @@ function action_restore() local upload = http.formvalue("archive") if upload and #upload > 0 then - luci.template.render("admin_system/applyreboot") - os.execute("tar -C / -xzf %q >/dev/null 2>&1" % archive_tmp) - luci.sys.reboot() + if os.execute("gunzip -t %q >/dev/null 2>&1" % archive_tmp) == 0 then + luci.template.render("admin_system/applyreboot") + os.execute("tar -C / -xzf %q >/dev/null 2>&1" % archive_tmp) + luci.sys.reboot() + else + luci.template.render("admin_system/flashops", { + reset_avail = supports_reset(), + upgrade_avail = supports_sysupgrade(), + backup_invalid = true + }) + end return end diff --git a/luci-mod-admin-full/luasrc/controller/admin/uci.lua b/luci-mod-admin-full/luasrc/controller/admin/uci.lua index 9c33d9c18..1d955dd98 100644 --- a/luci-mod-admin-full/luasrc/controller/admin/uci.lua +++ b/luci-mod-admin-full/luasrc/controller/admin/uci.lua @@ -5,60 +5,105 @@ module("luci.controller.admin.uci", package.seeall) function index() - local redir = luci.http.formvalue("redir", true) or - luci.dispatcher.build_url(unpack(luci.dispatcher.context.request)) + local redir = luci.http.formvalue("redir", true) + or table.concat(luci.dispatcher.context.request, "/") entry({"admin", "uci"}, nil, _("Configuration")) - entry({"admin", "uci", "changes"}, call("action_changes"), _("Changes"), 40).query = {redir=redir} + entry({"admin", "uci", "changes"}, post_on({ trigger_apply = true }, "action_changes"), _("Changes"), 40).query = {redir=redir} entry({"admin", "uci", "revert"}, post("action_revert"), _("Revert"), 30).query = {redir=redir} - entry({"admin", "uci", "apply"}, post("action_apply"), _("Apply"), 20).query = {redir=redir} - entry({"admin", "uci", "saveapply"}, post("action_apply"), _("Save & Apply"), 10).query = {redir=redir} + + local node + local authen = function(checkpass, allowed_users) + return "root", luci.http.formvalue("sid") + end + + node = entry({"admin", "uci", "apply_rollback"}, post("action_apply_rollback"), nil) + node.cors = true + node.sysauth_authenticator = authen + + node = entry({"admin", "uci", "apply_unchecked"}, post("action_apply_unchecked"), nil) + node.cors = true + node.sysauth_authenticator = authen + + node = entry({"admin", "uci", "confirm"}, call("action_confirm"), nil) + node.cors = true + node.sysauth = false end + function action_changes() - local uci = luci.model.uci.cursor() + local uci = require "luci.model.uci" local changes = uci:changes() luci.template.render("admin_uci/changes", { - changes = next(changes) and changes + changes = next(changes) and changes, + timeout = timeout, + trigger_apply = luci.http.formvalue("trigger_apply") and true or false }) end -function action_apply() - local path = luci.dispatcher.context.path - local uci = luci.model.uci.cursor() - local changes = uci:changes() - local reload = {} - - -- Collect files to be applied and commit changes - for r, tbl in pairs(changes) do - table.insert(reload, r) - if path[#path] ~= "apply" then - uci:load(r) - uci:commit(r) - uci:unload(r) - end - end - - luci.template.render("admin_uci/apply", { - changes = next(changes) and changes, - configs = reload - }) -end - - function action_revert() - local uci = luci.model.uci.cursor() + local uci = require "luci.model.uci" local changes = uci:changes() -- Collect files to be reverted + local r, tbl for r, tbl in pairs(changes) do - uci:load(r) uci:revert(r) - uci:unload(r) end luci.template.render("admin_uci/revert", { - changes = next(changes) and changes + changes = next(changes) and changes, + trigger_revert = true }) end + + +local function ubus_state_to_http(errstr) + local map = { + ["Invalid command"] = 400, + ["Invalid argument"] = 400, + ["Method not found"] = 404, + ["Entry not found"] = 404, + ["No data"] = 204, + ["Permission denied"] = 403, + ["Timeout"] = 504, + ["Not supported"] = 500, + ["Unknown error"] = 500, + ["Connection failed"] = 503 + } + + local code = map[errstr] or 200 + local msg = errstr or "OK" + + luci.http.status(code, msg) + + if code ~= 204 then + luci.http.prepare_content("text/plain") + luci.http.write(msg) + end +end + +function action_apply_rollback() + local uci = require "luci.model.uci" + local token, errstr = uci:apply(true) + if token then + luci.http.prepare_content("application/json") + luci.http.write_json({ token = token }) + else + ubus_state_to_http(errstr) + end +end + +function action_apply_unchecked() + local uci = require "luci.model.uci" + local _, errstr = uci:apply(false) + ubus_state_to_http(errstr) +end + +function action_confirm() + local uci = require "luci.model.uci" + local token = luci.http.formvalue("token") + local _, errstr = uci:confirm(token) + ubus_state_to_http(errstr) +end diff --git a/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua b/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua index 1ec1d47e0..934806ba0 100644 --- a/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua +++ b/luci-mod-admin-full/luasrc/model/cbi/admin_network/dhcp.lua @@ -115,13 +115,16 @@ s:taboption("advanced", Flag, "nonegcache", s:taboption("advanced", Value, "serversfile", translate("Additional servers file"), translate("This file may contain lines like 'server=/domain/1.2.3.4' or 'server=1.2.3.4' for".. - "domain-specific or full upstream DNS servers.")) + "domain-specific or full upstream DNS servers.")) s:taboption("advanced", Flag, "strictorder", translate("Strict order"), translate("DNS servers will be queried in the " .. "order of the resolvfile")).optional = true +s:taboption("advanced", Flag, "allservers", + translate("All Servers"), + translate("Query all available upstream DNS servers")).optional = true bn = s:taboption("advanced", DynamicList, "bogusnxdomain", translate("Bogus NX Domain Override"), translate("List of hosts that supply bogus NX domain results")) @@ -212,6 +215,12 @@ cq.optional = true cq.datatype = "uinteger" cq.placeholder = 150 +cs = s:taboption("advanced", Value, "cachesize", + translate("Size of DNS query cache"), + translate("Number of cached DNS entries (max is 10000, 0 is no caching)")) +cs.optional = true +cs.datatype = "range(0,10000)" +cs.placeholder = 150 s:taboption("tftp", Flag, "enable_tftp", translate("Enable TFTP server")).optional = true @@ -264,7 +273,7 @@ s = m:section(TypedSection, "host", translate("Static Leases"), "DHCP clients. They are also required for non-dynamic interface configurations where " .. "only hosts with a corresponding lease are served.") .. "
" .. translate("Use the Add Button to add a new lease entry. The MAC-Address " .. - "indentifies the host, the IPv4-Address specifies the fixed address to " .. + "identifies the host, the IPv4-Address specifies the fixed address to " .. "use, and the Hostname is assigned as a symbolic name to the requesting host. " .. "The optional Lease time can be used to set non-standard host-specific " .. "lease time, e.g. 12h, 3d or infinite.")) @@ -274,7 +283,7 @@ s.anonymous = true s.template = "cbi/tblsection" name = s:option(Value, "name", translate("Hostname")) -name.datatype = "hostname" +name.datatype = "hostname('strict')" name.rmempty = true function name.write(self, section, value) @@ -291,6 +300,11 @@ mac = s:option(Value, "mac", translate("MAC mac.datatype = "list(macaddr)" mac.rmempty = true +function mac.cfgvalue(self, section) + local val = Value.cfgvalue(self, section) + return ipc.checkmac(val) or val +end + ip = s:option(Value, "ip", translate("IPv4-Address")) ip.datatype = "or(ip4addr,'ignore')" @@ -298,7 +312,7 @@ gw = s:option(Value, "gw", translate("Gateway")) gw.datatype = "or(ip4addr,'ignore')" time = s:option(Value, "leasetime", translate("Lease time")) -time.rmempty = true +time.rmempty = true duid = s:option(Value, "duid", translate("DUID")) duid.datatype = "and(rangelength(20,36),hexstring)" diff --git a/luci-mod-admin-full/luasrc/model/cbi/admin_network/iface_add.lua b/luci-mod-admin-full/luasrc/model/cbi/admin_network/iface_add.lua index 4730368f9..8593b52c7 100644 --- a/luci-mod-admin-full/luasrc/model/cbi/admin_network/iface_add.lua +++ b/luci-mod-admin-full/luasrc/model/cbi/admin_network/iface_add.lua @@ -10,6 +10,10 @@ m = SimpleForm("network", translate("Create Interface")) m.redirect = luci.dispatcher.build_url("admin/network/network") m.reset = false +function m.on_cancel() + luci.http.redirect(luci.dispatcher.build_url("admin/network/network")) +end + newnet = m:field(Value, "_netname", translate("Name of the new interface"), translate("The allowed characters are: A-Z, a-z, " .. "0-9 and _" diff --git a/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua index 1a685fbe0..4f267f695 100644 --- a/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua +++ b/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua @@ -296,6 +296,11 @@ if not net:is_virtual() then translate("Enables the Spanning Tree Protocol on this bridge")) stp:depends("type", "bridge") stp.rmempty = true + + igmp = s:taboption("physical", Flag, "igmp_snooping", translate("Enable IGMP snooping"), + translate("Enables IGMP snooping on this bridge")) + igmp:depends("type", "bridge") + igmp.rmempty = true -- macsource = s:taboption("physical", DynamicList, "vlanmacs", translate("Add MACs address to enable source mode")) -- macsource:depends("type", "macvlan") -- macsource.rmempty = true @@ -310,6 +315,7 @@ if not net:is_floating() then ifname_single.template = "cbi/network_ifacelist" ifname_single.widget = "radio" ifname_single.nobridges = true + ifname_single.noaliases = false ifname_single.rmempty = false ifname_single.network = arg[1] ifname_single:depends("type", "") @@ -320,12 +326,18 @@ if not net:is_floating() then end function ifname_single.write(self, s, val) - local i + local _, i local new_ifs = { } local old_ifs = { } - for _, i in ipairs(net:get_interfaces() or { net:get_interface() }) do - old_ifs[#old_ifs+1] = i:name() + local alias = net:is_alias() + + if alias then + old_ifs[1] = '@' .. alias + else + for _, i in ipairs(net:get_interfaces() or { net:get_interface() }) do + old_ifs[#old_ifs+1] = i:name() + end end for i in ut.imatch(val) do @@ -360,6 +372,7 @@ if not net:is_virtual() then ifname_multi = s:taboption("physical", Value, "ifname_multi", translate("Interface")) ifname_multi.template = "cbi/network_ifacelist" ifname_multi.nobridges = true + ifname_multi.noaliases = true ifname_multi.rmempty = false ifname_multi.network = arg[1] ifname_multi.widget = "checkbox" @@ -376,7 +389,6 @@ if has_firewall then fwzone.template = "cbi/firewall_zonelist" fwzone.network = arg[1] - fwzone.rmempty = false function fwzone.cfgvalue(self, section) self.iface = section @@ -385,22 +397,16 @@ if has_firewall then end function fwzone.write(self, section, value) - local zone = fw:get_zone(value) - - if not zone and value == '-' then - value = m:formvalue(self:cbid(section) .. ".newzone") - if value and #value > 0 then - zone = fw:add_zone(value) - else - fw:del_network(section) - end - end - + local zone = fw:get_zone(value) or fw:add_zone(value) if zone then fw:del_network(section) zone:add_network(section) end end + + function fwzone.remove(self, section) + fw:del_network(section) + end end diff --git a/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua b/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua index 739be0510..96cde2513 100644 --- a/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua +++ b/luci-mod-admin-full/luasrc/model/cbi/admin_network/network.lua @@ -3,12 +3,147 @@ -- Licensed to the public under the Apache License 2.0. local fs = require "nixio.fs" +local tpl = require "luci.template" +local ntm = require "luci.model.network".init() +local fwm = require "luci.model.firewall".init() local json = require "luci.jsonc" local sys = require "luci.sys" m = Map("network", translate("Interfaces")) +m:chain("wireless") +m:chain("firewall") +m:chain("dhcp") m.pageaction = false -m:section(SimpleSection).template = "admin_network/iface_overview" + + +local tpl_networks = tpl.Template(nil, [[ +
+
+ <% + for i, net in ipairs(netlist) do + local z = net[3] + local c = z and z:get_color() or "#EEEEEE" + local t = z and translate("Part of zone %q" % z:name()) or translate("No zone assigned") + local disabled = (net[4]:get("auto") == "0") + local dynamic = net[4]:is_dynamic() + %> +
+
+
+
+ <%=net[1]:upper()%> +
+
+
+ ? +
+
+
+
+ <%:Collecting data...%> +
+
+
+ /> + + <% if disabled then %> + + /> + <% else %> + + /> + <% end %> + + '" title="<%:Edit this interface%>" value="<%:Edit%>" id="<%=net[1]%>-ifc-edit"<%=ifattr(dynamic, "disabled", "disabled")%> /> + + + /> +
+
+
+ <% end %> +
+
+
+ '" /> +
+]]) + +local _, net +local ifaces, netlist = { }, { } + +for _, net in ipairs(ntm:get_networks()) do + if net:name() ~= "loopback" then + local zn = net:zonename() + local z = zn and fwm:get_zone(zn) or fwm:get_zone_by_network(net:name()) + + local w = 1 + if net:is_alias() then + w = 2 + elseif net:is_dynamic() then + w = 3 + end + + ifaces[#ifaces+1] = net:name() + netlist[#netlist+1] = { + net:name(), z and z:name() or "-", z, net, w + } + end +end + +table.sort(netlist, + function(a, b) + if a[2] ~= b[2] then + return a[2] < b[2] + elseif a[5] ~= b[5] then + return a[5] < b[5] + else + return a[1] < b[1] + end + end) + +s = m:section(TypedSection, "interface", translate("Interface Overview")) + +function s.sections(self) + local _, net, sl = nil, nil, { } + + for _, net in ipairs(netlist) do + sl[#sl+1] = net[1] + end + + return sl +end + +function s.render(self) + tpl_networks:render({ + netlist = netlist + }) +end + +o = s:option(Value, "__disable__") + +function o.cfgvalue(self, sid) + return (m:get(sid, "auto") == "0") and "1" or "0" +end + +function o.write(self, sid, value) + if value ~= "1" then + m:set(sid, "auto", "") + else + m:set(sid, "auto", "0") + end +end + +o.remove = o.write + +o = s:option(Value, "__delete__") + +function o.write(self, sid, value) + ntm:del_network(sid) +end + + +m:section(SimpleSection).template = "admin_network/iface_overview_status" if fs.access("/etc/init.d/dsl_control") then local ok, boarddata = pcall(json.parse, fs.readfile("/etc/board.json")) @@ -130,8 +265,8 @@ if fs.access("/proc/sys/net/mptcp") then mtcp:value("enable", translate("enable")) mtcp:value("disable", translate("disable")) local mtcpck = s:option(ListValue, "mptcp_checksum", translate("Multipath TCP checksum")) - mtcpck:value("enable", translate("enable")) - mtcpck:value("disable", translate("disable")) + mtcpck:value(1, translate("enable")) + mtcpck:value(0, translate("disable")) local mtcppm = s:option(ListValue, "mptcp_path_manager", translate("Multipath TCP path-manager")) mtcppm:value("default", translate("default")) mtcppm:value("fullmesh", translate("fullmesh")) diff --git a/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua b/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua index 89a73a5ca..3e46628d3 100644 --- a/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua +++ b/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua @@ -5,6 +5,7 @@ m = Map("network", translate("Switch"), translate("The network ports on this device can be combined to several VLANs in which computers can communicate directly with each other. VLANs are often used to separate different network segments. Often there is by default one Uplink port for a connection to the next greater network like the internet and other ports for a local network.")) local fs = require "nixio.fs" +local ut = require "luci.util" local nw = require "luci.model.network" local switches = { } @@ -74,7 +75,7 @@ m.uci:foreach("network", "switch", end -- Parse some common switch properties from swconfig help output. - local swc = io.popen("swconfig dev %q help 2>/dev/null" % switch_name) + local swc = io.popen("swconfig dev %s help 2>/dev/null" % ut.shellquote(switch_name)) if swc then local is_port_attr = false @@ -259,7 +260,7 @@ m.uci:foreach("network", "switch", end - local vid = s:option(Value, has_vlan4k or "vlan", "VLAN ID", "
" % switch_name) + local vid = s:option(Value, has_vlan4k or "vlan", "VLAN ID") local mx_vid = has_vlan4k and 4094 or (num_vlans - 1) vid.rmempty = false @@ -332,7 +333,7 @@ m.uci:foreach("network", "switch", local _, pt for _, pt in ipairs(topo.ports) do - local po = s:option(ListValue, tostring(pt.num), pt.label, '
' %{ switch_name, pt.num }) + local po = s:option(ListValue, tostring(pt.num), pt.label) po:value("", translate("off")) diff --git a/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua b/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua index c0bb38030..743efaa1e 100644 --- a/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua +++ b/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi.lua @@ -7,6 +7,17 @@ local ut = require "luci.util" local nt = require "luci.sys".net local fs = require "nixio.fs" +local acct_port, acct_secret, acct_server, anonymous_identity, ant1, ant2, + auth, auth_port, auth_secret, auth_server, bssid, cacert, cacert2, + cc, ch, cipher, clientcert, clientcert2, ea, eaptype, en, encr, + ft_protocol, ft_psk_generate_local, hidden, htmode, identity, + ieee80211r, ieee80211w, ifname, isolate, key_retries, + legacyrates, max_timeout, meshfwd, meshid, ml, mobility_domain, mode, + mp, nasid, network, password, pmk_r1_push, privkey, privkey2, privkeypwd, + privkeypwd2, r0_key_lifetime, r0kh, r1_key_holder, r1kh, + reassociation_deadline, retry_timeout, ssid, st, tp, wepkey, wepslot, + wmm, wpakey, wps, disassoc_low_ack, short_preamble, beacon_int, dtim_period + arg[1] = arg[1] or "" m = Map("wireless", "", @@ -19,16 +30,6 @@ m:chain("network") m:chain("firewall") m.redirect = luci.dispatcher.build_url("admin/network/wireless") -local ifsection - -function m.on_commit(map) - local wnet = nw:get_wifinet(arg[1]) - if ifsection and wnet then - ifsection.section = wnet.sid - m.title = luci.util.pcdata(wnet:get_i18n()) - end -end - nw.init(m.uci) local wnet = nw:get_wifinet(arg[1]) @@ -40,38 +41,6 @@ if not wnet or not wdev then return end --- wireless toggle was requested, commit and reload page -function m.parse(map) - local new_cc = m:formvalue("cbid.wireless.%s.country" % wdev:name()) - local old_cc = m:get(wdev:name(), "country") - - if m:formvalue("cbid.wireless.%s.__toggle" % wdev:name()) then - if wdev:get("disabled") == "1" or wnet:get("disabled") == "1" then - wnet:set("disabled", nil) - else - wnet:set("disabled", "1") - end - wdev:set("disabled", nil) - - nw:commit("wireless") - luci.sys.call("(env -i /bin/ubus call network reload) >/dev/null 2>/dev/null") - - luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless", arg[1])) - return - end - - Map.parse(map) - - if m:get(wdev:name(), "type") == "mac80211" and new_cc and new_cc ~= old_cc then - luci.sys.call("iw reg set %q" % new_cc) - luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless", arg[1])) - return - end -end - -m.title = luci.util.pcdata(wnet:get_i18n()) - - local function txpower_list(iw) local list = iw.txpwrlist or { } local off = tonumber(iw.txpower_offset) or 0 @@ -112,6 +81,57 @@ local hw_modes = iw.hwmodelist or { } local tx_power_list = txpower_list(iw) local tx_power_cur = txpower_current(wdev:get("txpower"), tx_power_list) +-- wireless toggle was requested, commit and reload page +function m.parse(map) + local new_cc = m:formvalue("cbid.wireless.%s.country" % wdev:name()) + local old_cc = m:get(wdev:name(), "country") + + if m:formvalue("cbid.wireless.%s.__toggle" % wdev:name()) then + if wdev:get("disabled") == "1" or wnet:get("disabled") == "1" then + wnet:set("disabled", nil) + else + wnet:set("disabled", "1") + end + wdev:set("disabled", nil) + m.apply_needed = true + m.redirect = nil + end + + Map.parse(map) + + if m:get(wdev:name(), "type") == "mac80211" and new_cc and new_cc ~= old_cc then + luci.sys.call("iw reg set %s" % ut.shellquote(new_cc)) + + local old_ch = tonumber(m:formvalue("cbid.wireless.%s._mode_freq.channel" % wdev:name()) or "") + if old_ch then + local _, c, new_ch + for _, c in ipairs(iw.freqlist) do + if c.channel > old_ch or (old_ch <= 14 and c.channel > 14) then + break + end + new_ch = c.channel + end + if new_ch ~= old_ch then + wdev:set("channel", new_ch) + m.message = translatef("Channel %d is not available in the %s regulatory domain and has been auto-adjusted to %d.", + old_ch, new_cc, new_ch) + end + end + end + + if wdev:get("disabled") == "1" or wnet:get("disabled") == "1" then + en.title = translate("Wireless network is disabled") + en.inputtitle = translate("Enable") + en.inputstyle = "apply" + else + en.title = translate("Wireless network is enabled") + en.inputtitle = translate("Disable") + en.inputstyle = "reset" + end +end + +m.title = luci.util.pcdata(wnet:get_i18n()) + s = m:section(NamedSection, wdev:name(), "wifi-device", translate("Device Configuration")) s.addremove = false @@ -119,29 +139,12 @@ s:tab("general", translate("General Setup")) s:tab("macfilter", translate("MAC-Filter")) s:tab("advanced", translate("Advanced Settings")) ---[[ -back = s:option(DummyValue, "_overview", translate("Overview")) -back.value = "" -back.titleref = luci.dispatcher.build_url("admin", "network", "wireless") -]] - st = s:taboption("general", DummyValue, "__status", translate("Status")) st.template = "admin_network/wifi_status" st.ifname = arg[1] en = s:taboption("general", Button, "__toggle") -if wdev:get("disabled") == "1" or wnet:get("disabled") == "1" then - en.title = translate("Wireless network is disabled") - en.inputtitle = translate("Enable") - en.inputstyle = "apply" -else - en.title = translate("Wireless network is enabled") - en.inputtitle = translate("Disable") - en.inputstyle = "reset" -end - - local hwtype = wdev:get("type") -- NanoFoo @@ -170,9 +173,7 @@ if found_sta then found_sta.channel or "(auto)", table.concat(found_sta.names, ", ")) else ch = s:taboption("general", Value, "_mode_freq", '
'..translate("Operating frequency")) - ch.hwmodes = hw_modes - ch.htmodes = iw.htmodelist - ch.freqlist = iw.freqlist + ch.iwinfo = iw ch.template = "cbi/wireless_modefreq" function ch.cfgvalue(self, section) @@ -249,6 +250,14 @@ if hwtype == "mac80211" then s:taboption("advanced", Value, "frag", translate("Fragmentation Threshold")) s:taboption("advanced", Value, "rts", translate("RTS/CTS Threshold")) + + s:taboption("advanced", Flag, "noscan", translate("Force 40MHz mode"), + translate("Always use 40MHz channels even if the secondary channel overlaps. Using this option does not comply with IEEE 802.11n-2009!")).optional = true + + beacon_int = s:taboption("advanced", Value, "beacon_int", translate("Beacon Interval")) + beacon_int.optional = true + beacon_int.placeholder = 100 + beacon_int.datatype = "range(15,65535)" end @@ -341,7 +350,6 @@ end ----------------------- Interface ----------------------- s = m:section(NamedSection, wnet.sid, "wifi-iface", translate("Interface Configuration")) -ifsection = s s.addremove = false s.anonymous = true s.defaults.device = wdev:name() @@ -390,22 +398,16 @@ network.novirtual = true function network.write(self, section, value) local i = nw:get_interface(section) if i then - if value == '-' then - value = m:formvalue(self:cbid(section) .. ".newnet") - if value and #value > 0 then - local n = nw:add_network(value, {proto="none"}) - if n then n:add_interface(i) end - else - local n = i:get_network() - if n then n:del_interface(i) end - end - else - local v - for _, v in ipairs(i:get_networks()) do - v:del_interface(i) - end - for v in ut.imatch(value) do - local n = nw:get_network(v) + local _, net, old, new = nil, nil, {}, {} + + for _, net in ipairs(i:get_networks()) do + old[net:name()] = true + end + + for net in ut.imatch(value) do + new[net] = true + if not old[net] then + local n = nw:get_network(net) or nw:add_network(net, { proto = "none" }) if n then if not n:is_empty() then n:set("type", "bridge") @@ -414,6 +416,15 @@ function network.write(self, section, value) end end end + + for net, _ in pairs(old) do + if not new[net] then + local n = nw:get_network(net) + if n then + n:del_interface(i) + end + end + end end end @@ -488,6 +499,18 @@ if hwtype == "mac80211" then ifname = s:taboption("advanced", Value, "ifname", translate("Interface name"), translate("Override default interface name")) ifname.optional = true + + short_preamble = s:taboption("advanced", Flag, "short_preamble", translate("Short Preamble")) + short_preamble.default = short_preamble.enabled + + dtim_period = s:taboption("advanced", Value, "dtim_period", translate("DTIM Interval"), translate("Delivery Traffic Indication Message Interval")) + dtim_period.optional = true + dtim_period.placeholder = 2 + dtim_period.datatype = "range(1,255)" + + disassoc_low_ack = s:taboption("advanced", Flag, "disassoc_low_ack", translate("Disassociate On Low Acknowledgement"), + translate("Allow AP mode to disconnect STAs based on low ACK condition")) + disassoc_low_ack.default = disassoc_low_ack.enabled end @@ -1049,7 +1072,7 @@ if hwtype == "mac80211" then retry_timeout.rmempty = true end - local key_retries = s:taboption("encryption", Flag, "wpa_disable_eapol_key_retries", + key_retries = s:taboption("encryption", Flag, "wpa_disable_eapol_key_retries", translate("Enable key reinstallation (KRACK) countermeasures"), translate("Complicates key reinstallation attacks on the client side by disabling retransmission of EAPOL-Key frames that are used to install keys. This workaround might cause interoperability issues and reduced robustness of key negotiation especially in environments with heavy traffic load.")) diff --git a/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua b/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua index 8277deb2f..e8a305882 100644 --- a/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua +++ b/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_add.lua @@ -94,14 +94,9 @@ function newnet.parse(self, section) local net, zone if has_firewall then - local zval = fwzone:formvalue(section) - zone = fw:get_zone(zval) - - if not zone and zval == '-' then - zval = m:formvalue(fwzone:cbid(section) .. ".newzone") - if zval and #zval > 0 then - zone = fw:add_zone(zval) - end + local value = fwzone:formvalue(section) + if value and #value > 0 then + zone = fw:get_zone(value) or fw:add_zone(value) end end diff --git a/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua b/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua new file mode 100644 index 000000000..ad20f0918 --- /dev/null +++ b/luci-mod-admin-full/luasrc/model/cbi/admin_network/wifi_overview.lua @@ -0,0 +1,223 @@ +-- Copyright 2018 Jo-Philipp Wich +-- Licensed to the public under the Apache License 2.0. + +local fs = require "nixio.fs" +local utl = require "luci.util" +local tpl = require "luci.template" +local ntm = require "luci.model.network" + +local has_iwinfo = pcall(require, "iwinfo") + +function guess_wifi_hw(dev) + local bands = "" + local ifname = dev:name() + local name, idx = ifname:match("^([a-z]+)(%d+)") + idx = tonumber(idx) + + if has_iwinfo then + local bl = dev.iwinfo.hwmodelist + if bl and next(bl) then + if bl.a then bands = bands .. "a" end + if bl.b then bands = bands .. "b" end + if bl.g then bands = bands .. "g" end + if bl.n then bands = bands .. "n" end + if bl.ac then bands = bands .. "ac" end + end + + local hw = dev.iwinfo.hardware_name + if hw then + return "%s 802.11%s" %{ hw, bands } + end + end + + -- wl.o + if name == "wl" then + local name = translatef("Broadcom 802.11%s Wireless Controller", bands) + local nm = 0 + + local fd = nixio.open("/proc/bus/pci/devices", "r") + if fd then + local ln + for ln in fd:linesource() do + if ln:match("wl$") then + if nm == idx then + local version = ln:match("^%S+%s+%S%S%S%S([0-9a-f]+)") + name = translatef( + "Broadcom BCM%04x 802.11 Wireless Controller", + tonumber(version, 16) + ) + + break + else + nm = nm + 1 + end + end + end + fd:close() + end + + return name + + -- dunno yet + else + return translatef("Generic 802.11%s Wireless Controller", bands) + end +end + +local tpl_radio = tpl.Template(nil, [[ +
+
+ +
+
+ <%=dev:name()%> +
+
+ <%=hw%>
+ +
+
+
+ + + +
+
+
+ + + + <% if #wnets > 0 then %> + <% for i, net in ipairs(wnets) do local disabled = (dev:get("disabled") == "1" or net:get("disabled") == "1") %> +
+
+ .png" /> 0% +
+
"> + <%= disabled and translate("Wireless is disabled") or translate("Collecting data...") %> +
+
+
+ <% if disabled then %> + + + <% else %> + + + <% end %> + + + + + +
+
+
+ <% end %> + <% else %> +
+
+ <%:No network configured on this device%> +
+
+ <% end %> + +
+
+]]) + + +m = Map("wireless", translate("Wireless Overview")) +m:chain("network") +m.pageaction = false + +if not has_iwinfo then + s = m:section(NamedSection, "__warning__") + + function s.render(self) + tpl.render_string([[ +
+

<%:Package libiwinfo required!%>

+

<%_The libiwinfo-lua package is not installed. You must install this component for working wireless configuration!%>

+
+ ]]) + end +end + +local _, dev, net +for _, dev in ipairs(ntm:get_wifidevs()) do + s = m:section(TypedSection) + s.wnets = dev:get_wifinets() + + function s.render(self, sid) + tpl_radio:render({ + hw = guess_wifi_hw(dev), + dev = dev, + wnets = self.wnets + }) + end + + function s.cfgsections(self) + local _, net, sl = nil, nil, { } + for _, net in ipairs(self.wnets) do + sl[#sl+1] = net:name() + self.wnets[net:name()] = net + end + return sl + end + + o = s:option(Value, "__disable__") + + function o.cfgvalue(self, sid) + local wnet = self.section.wnets[sid] + local wdev = wnet:get_device() + + return ((wnet and wnet:get("disabled") == "1") or + (wdev and wdev:get("disabled") == "1")) and "1" or "0" + end + + function o.write(self, sid, value) + local wnet = self.section.wnets[sid] + local wdev = wnet:get_device() + + if value ~= "1" then + wnet:set("disabled", nil) + wdev:set("disabled", nil) + else + wnet:set("disabled", "1") + end + end + + o.remove = o.write + + + o = s:option(Value, "__delete__") + + function o.write(self, sid, value) + local wnet = self.section.wnets[sid] + local nets = wnet:get_networks() + + ntm:del_wifinet(wnet:id()) + + local _, net + for _, net in ipairs(nets) do + if net:is_empty() then + ntm:del_network(net:name()) + end + end + end +end + +s = m:section(NamedSection, "__script__") +s.template = "admin_network/wifi_overview_status" + +s = m:section(NamedSection, "__assoclist__") + +function s.render(self, sid) + tpl.render_string([[ +

<%:Associated Stations%>

+ <%+admin_network/wifi_assoclist%> + ]]) +end + +return m diff --git a/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua b/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua index 493a735bd..6c1c1235c 100644 --- a/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua +++ b/luci-mod-admin-full/luasrc/model/cbi/admin_system/admin.lua @@ -104,16 +104,17 @@ end keys = s2:option(TextValue, "_data", "") keys.wrap = "off" keys.rows = 3 -keys.rmempty = false function keys.cfgvalue() return fs.readfile("/etc/dropbear/authorized_keys") or "" end function keys.write(self, section, value) - if value then - fs.writefile("/etc/dropbear/authorized_keys", value:gsub("\r\n", "\n")) - end + return fs.writefile("/etc/dropbear/authorized_keys", value:gsub("\r\n", "\n")) +end + +function keys.remove(self, section, value) + return fs.writefile("/etc/dropbear/authorized_keys", "") end end diff --git a/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm b/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm index 9596578bb..4ab206e81 100644 --- a/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm +++ b/luci-mod-admin-full/luasrc/view/admin_network/diagnostics.htm @@ -8,20 +8,17 @@ <% local fs = require "nixio.fs" local has_ping6 = fs.access("/bin/ping6") or fs.access("/usr/bin/ping6") -local has_traceroute6 = fs.access("/usr/bin/traceroute6") +local has_traceroute6 = fs.access("/bin/traceroute6") or fs.access("/usr/bin/traceroute6") local has_speedtest = fs.access("/usr/sbin/speedtestc") -local has_iperf3 = fs.access("/usr/bin/iperf3") local has_curl = fs.access("/usr/bin/curl") local has_netstat = fs.access("/bin/netstat") local dns_host = luci.config.diag and luci.config.diag.dns or "dev.openwrt.org" local ping_host = luci.config.diag and luci.config.diag.ping or "dev.openwrt.org" local route_host = luci.config.diag and luci.config.diag.route or "dev.openwrt.org" -local iperf3_host = luci.config.diag and luci.config.diag.iperf3 or "ping-ams1.online.net" local getip_host = luci.config.diag and luci.config.diag.getip or "ifconfig.co" %> - - - - - -
-
- <%:Interface Overview%> - - - - - - - - <% - for i, net in ipairs(netlist) do - local z = net[3] - local c = z and z:get_color() or "#EEEEEE" - local t = z and translate("Part of zone %q" % z:name()) or translate("No zone assigned") - %> - - - - - - <% end %> -
<%:Network%><%:Status%><%:Actions%>
-
-
- <%=net[1]:upper()%> -
-
-
- ? -
-
- 		- <%:Collecting data...%> - - - - '" title="<%:Edit this interface%>" value="<%:Edit%>" id="<%=net[1]%>-ifc-edit" /> - -
- - '" /> -
-
diff --git a/luci-mod-admin-full/luasrc/view/admin_network/iface_overview_status.htm b/luci-mod-admin-full/luasrc/view/admin_network/iface_overview_status.htm new file mode 100644 index 000000000..7427154a0 --- /dev/null +++ b/luci-mod-admin-full/luasrc/view/admin_network/iface_overview_status.htm @@ -0,0 +1,183 @@ +<%# + Copyright 2010-2018 Jo-Philipp Wich + Licensed to the public under the Apache License 2.0. +-%> + + diff --git a/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm b/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm index b15dd13f3..34be35dd2 100644 --- a/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm +++ b/luci-mod-admin-full/luasrc/view/admin_network/iface_status.htm @@ -6,29 +6,18 @@ { if (ifc && (ifc = ifc[0])) { - var html = ''; + var s = document.getElementById('<%=self.option%>-ifc-status'), + img = s.querySelector('img'), + info = s.querySelector('span'), + html = '<%:Device%>: %h
'.format(ifc.ifname); - var s = document.getElementById('<%=self.option%>-ifc-signal'); - if (s) - s.innerHTML = String.format( - '' + - '
%s', - ifc.type, ifc.is_up ? '' : '_disabled', - ifc.name - ); - - var d = document.getElementById('<%=self.option%>-ifc-description'); - if (d && ifc.ifname) + if (ifc.ifname) { if (ifc.is_up) - { html += String.format('<%:Uptime%>: %t
', ifc.uptime); - } if (ifc.macaddr) - { - html += String.format('<%:MAC-Address%>: %s
', ifc.macaddr); - } + html += String.format('<%:MAC%>: %s
', ifc.macaddr); html += String.format( '<%:RX%>: %.2mB (%d <%:Pkts.%>)
' + @@ -38,50 +27,40 @@ ); if (ifc.ipaddrs && ifc.ipaddrs.length) - { for (var i = 0; i < ifc.ipaddrs.length; i++) html += String.format( '<%:IPv4%>: %s
', ifc.ipaddrs[i] ); - } if (ifc.ip6addrs && ifc.ip6addrs.length) - { for (var i = 0; i < ifc.ip6addrs.length; i++) html += String.format( '<%:IPv6%>: %s
', ifc.ip6addrs[i] ); - } - - if (ifc.ip6prefix) - { - html += String.format('<%:IPv6-PD%>: %s
', ifc.ip6prefix); - } - d.innerHTML = html; + if (ifc.ip6prefix) + html += String.format('<%:IPv6-PD%>: %s
', ifc.ip6prefix); + + info.innerHTML = html; } - else if (d) + else { - d.innerHTML = '<%:Interface not present or not connected yet.%>'; + info.innerHTML = '<%:Interface not present or not connected yet.%>'; } + + img.src = '<%=resource%>/icons/%s%s.png'.format(ifc.type, ifc.is_up ? '' : '_disabled'); } } ); //]]> - - - - - - -
-
- ? - 		- <%:Collecting data...%> -
+ + + + <%:Collecting data...%> + + <%+cbi/valuefooter%> diff --git a/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm b/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm index 28a37dcd9..8fbbdc947 100644 --- a/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm +++ b/luci-mod-admin-full/luasrc/view/admin_network/lease_status.htm @@ -1,29 +1,13 @@ -
- <%:Active DHCP Leases%> - - - - - - - - - - -
<%:Hostname%><%:IPv4-Address%><%:MAC-Address%><%:Leasetime remaining%>

<%:Collecting data...%>
-
+
+

<%:Active DHCP Leases%>

+
+
+
<%:Hostname%>
+
<%:IPv4-Address%>
+
<%:MAC-Address%>
+
<%:Leasetime remaining%>
+
+
+
<%:Collecting data...%>
+
+
+
- + diff --git a/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm b/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm index 96fbffdb0..68f0bbc9d 100644 --- a/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm +++ b/luci-mod-admin-full/luasrc/view/admin_network/switch_status.htm @@ -1,21 +1,39 @@ + +
+
+
<%:Network%>
+
<%:MAC-Address%>
+
<%:Host%>
+
<%:Signal%> / <%:Noise%>
+
<%:RX Rate%> / <%:TX Rate%>
+
+
+
<%:Collecting data...%>
+
+
diff --git a/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm b/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm index 3533c6fa4..987123642 100644 --- a/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm +++ b/luci-mod-admin-full/luasrc/view/admin_network/wifi_join.htm @@ -8,56 +8,6 @@ local sys = require "luci.sys" local utl = require "luci.util" - function guess_wifi_signal(info) - local scale = (100 / (info.quality_max or 100) * (info.quality or 0)) - local icon - - if not info.bssid or info.bssid == "00:00:00:00:00:00" then - icon = resource .. "/icons/signal-none.png" - elseif scale < 15 then - icon = resource .. "/icons/signal-0.png" - elseif scale < 35 then - icon = resource .. "/icons/signal-0-25.png" - elseif scale < 55 then - icon = resource .. "/icons/signal-25-50.png" - elseif scale < 75 then - icon = resource .. "/icons/signal-50-75.png" - else - icon = resource .. "/icons/signal-75-100.png" - end - - return icon - end - - function percent_wifi_signal(info) - local qc = info.quality or 0 - local qm = info.quality_max or 0 - - if info.bssid and qc > 0 and qm > 0 then - return math.floor((100 / qm) * qc) - else - return 0 - end - end - - function format_wifi_encryption(info) - if info.wep == true then - return "WEP" - elseif info.wpa > 0 then - return translatef("%s - %s", - table.concat(info.pair_ciphers, ", "), - table.concat(info.group_ciphers, ", "), - (info.wpa == 3) and translate("mixed WPA/WPA2") - or (info.wpa == 2 and "WPA2" or "WPA"), - table.concat(info.auth_suites, ", ") - ) - elseif info.enabled then - return "%s" % translate("unknown") - else - return "%s" % translate("open") - end - end - local dev = luci.http.formvalue("device") local iw = luci.sys.wifi.getiwinfo(dev) @@ -65,84 +15,209 @@ luci.http.redirect(luci.dispatcher.build_url("admin/network/wireless")) return end - - - function scanlist(times) - local i, k, v - local l = { } - local s = { } - - for i = 1, times do - for k, v in ipairs(iw.scanlist or { }) do - if not s[v.bssid] then - l[#l+1] = v - s[v.bssid] = true - end - end - end - - return l - end -%> <%+header%> + +

<%:Join Network: Wireless Scan%>

-
- - - <% for i, net in ipairs(scanlist(3)) do net.encryption = net.encryption or { } %> - - - - - - <% end %> - -
- -
- <%=percent_wifi_signal(net)%>% - - 		- <%=net.ssid and utl.pcdata(net.ssid) or "%s" % translate("hidden")%>
- Channel: <%=net.channel%> | - Mode: <%=net.mode%> | - BSSID: <%=net.bssid%> | - Encryption: <%=format_wifi_encryption(net.encryption)%> - 		- - - - - - - - - <% if net.encryption.wpa then %> - - <% for _, v in ipairs(net.encryption.auth_suites) do %> - <% end; for _, v in ipairs(net.encryption.group_ciphers) do %> - <% end; for _, v in ipairs(net.encryption.pair_ciphers) do %> - <% end; end %> +
+
+
+
<%:Signal%>
+
<%:SSID%>
+
<%:Channel%>
+
<%:Mode%>
+
<%:BSSID%>
+
<%:Encryption%>
+
 
+
- " /> - - - -
-
+
+
+ + <%:Collecting data...%> +
+
+
+
" method="get"> - +
- +
diff --git a/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm b/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm deleted file mode 100644 index 4465095ff..000000000 --- a/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview.htm +++ /dev/null @@ -1,466 +0,0 @@ -<%# - Copyright 2008-2009 Steven Barth - Copyright 2008-2015 Jo-Philipp Wich - Licensed to the public under the Apache License 2.0. --%> - -<%- - - local ip = require "luci.ip" - local fs = require "nixio.fs" - local utl = require "luci.util" - local uci = require "luci.model.uci".cursor() - local ntm = require "luci.model.network" - - local has_iwinfo = pcall(require, "iwinfo") - - ntm.init(uci) - - function guess_wifi_hw(dev) - local bands = "" - local ifname = dev:name() - local name, idx = ifname:match("^([a-z]+)(%d+)") - idx = tonumber(idx) - - if has_iwinfo then - local bl = dev.iwinfo.hwmodelist - if bl and next(bl) then - if bl.a then bands = bands .. "a" end - if bl.b then bands = bands .. "b" end - if bl.g then bands = bands .. "g" end - if bl.n then bands = bands .. "n" end - if bl.ac then bands = bands .. "ac" end - end - - local hw = dev.iwinfo.hardware_name - if hw then - return "%s 802.11%s" %{ hw, bands } - end - end - - -- wl.o - if name == "wl" then - local name = translatef("Broadcom 802.11%s Wireless Controller", bands) - local nm = 0 - - local fd = nixio.open("/proc/bus/pci/devices", "r") - if fd then - local ln - for ln in fd:linesource() do - if ln:match("wl$") then - if nm == idx then - local version = ln:match("^%S+%s+%S%S%S%S([0-9a-f]+)") - name = translatef( - "Broadcom BCM%04x 802.11 Wireless Controller", - tonumber(version, 16) - ) - - break - else - nm = nm + 1 - end - end - end - fd:close() - end - - return name - - -- ralink - elseif name == "ra" then - return translatef("RaLink 802.11%s Wireless Controller", bands) - - -- hermes - elseif name == "eth" then - return translate("Hermes 802.11b Wireless Controller") - - -- hostap - elseif name == "wlan" and fs.stat("/proc/net/hostap/" .. ifname, "type") == "dir" then - return translate("Prism2/2.5/3 802.11b Wireless Controller") - - -- dunno yet - else - return translatef("Generic 802.11%s Wireless Controller", bands) - end - end - - local devices = ntm:get_wifidevs() - local netlist = { } - local netdevs = { } - - local dev - for _, dev in ipairs(devices) do - local net - for _, net in ipairs(dev:get_wifinets()) do - netlist[#netlist+1] = net:id() - netdevs[net:id()] = dev:name() - end - end --%> - -<%+header%> - -<% if not has_iwinfo then %> -
- <%:Package libiwinfo required!%>
- <%_The libiwinfo-lua package is not installed. You must install this component for working wireless configuration!%> -
-<% end %> - - - - -

<%:Wireless Overview%>

- - - -
- - <% for _, dev in ipairs(devices) do local nets = dev:get_wifinets() %> - -
- - - - - - - - - - - <% if #nets > 0 then %> - <% for i, net in ipairs(nets) do %> - - - - - - - <% end %> - <% else %> - - - - - <% end %> - -
- <%=guess_wifi_hw(dev)%> (<%=dev:name()%>)
- - 		-
- - - -
-
- - - -
-
- 0% - - <%:Collecting data...%> - - - - -
- <%:No network configured on this device%> -
-
- - <% end %> - - -

<%:Associated Stations%>

- -
- - - - - - - - - - - - -
<%:SSID%><%:MAC-Address%><%:Host%><%:Signal%> / <%:Noise%><%:RX Rate%> / <%:TX Rate%>
- <%:Collecting data...%> -
-
-
- -<%+footer%> diff --git a/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm b/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm new file mode 100644 index 000000000..9730bc2c9 --- /dev/null +++ b/luci-mod-admin-full/luasrc/view/admin_network/wifi_overview_status.htm @@ -0,0 +1,127 @@ +<%# + Copyright 2008-2009 Steven Barth + Copyright 2008-2018 Jo-Philipp Wich + Licensed to the public under the Apache License 2.0. +-%> + + diff --git a/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm b/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm index 04687f38e..bfad3d080 100644 --- a/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm +++ b/luci-mod-admin-full/luasrc/view/admin_network/wifi_status.htm @@ -8,7 +8,7 @@ { var is_assoc = (iw.bssid && iw.bssid != '00:00:00:00:00:00' && iw.channel && !iw.disabled); var p = iw.quality; - var q = is_assoc ? p : -1; + var q = iw.disabled ? -1 : p; var icon; if (q < 0) @@ -24,21 +24,22 @@ else icon = "<%=resource%>/icons/signal-75-100.png"; - var s = document.getElementById('<%=self.option%>-iw-signal'); - if (s) - s.innerHTML = String.format( - '
' + - '%d%%', icon, iw.signal, iw.noise, p - ); + var s = document.getElementById('<%=self.option%>-iw-status'), + small = s.querySelector('small'), + info = s.querySelector('span'); - var d = document.getElementById('<%=self.option%>-iw-description'); - if (d && is_assoc) - d.innerHTML = String.format( + small.innerHTML = info.innerHTML = String.format( + ' 
%d%% ', + icon, iw.signal, iw.noise, p + ); + + if (is_assoc) + info.innerHTML = String.format( '<%:Mode%>: %s | ' + '<%:SSID%>: %h
' + - '<%:BSSID%>: %s | ' + + '<%:BSSID%>: %s
' + '<%:Encryption%>: %s
' + - '<%:Channel%>: %d (%.3f <%:GHz%>) | ' + + '<%:Channel%>: %d (%.3f <%:GHz%>)
' + '<%:Tx-Power%>: %d <%:dBm%>
' + '<%:Signal%>: %d <%:dBm%> | ' + '<%:Noise%>: %d <%:dBm%>
' + @@ -50,29 +51,27 @@ iw.txpower, iw.signal, iw.noise, iw.bitrate ? iw.bitrate : 0, iw.country ); - else if (d) - d.innerHTML = String.format( + else + info.innerHTML = String.format( '<%:SSID%>: %h | ' + '<%:Mode%>: %s
' + - '<%:Wireless is disabled or not associated%>', - iw.ssid || '?', iw.mode + '%s', + iw.ssid || '?', iw.mode, + iw.disabled ? '<%:Wireless is disabled%>' + : '<%:Wireless is not associated%>' ); } } ); //]]> - - - - - - -
-
- 0% - 		- <%:Collecting data...%> -
+ + +   + + + <%:Collecting data...%> + + <%+cbi/valuefooter%> diff --git a/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm b/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm index 33bbee784..3bb55f905 100644 --- a/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm +++ b/luci-mod-admin-full/luasrc/view/admin_status/bandwidth.htm @@ -19,7 +19,6 @@ <%+header%> - - - - - <%+footer%> diff --git a/luci-mod-admin-full/luasrc/view/admin_uci/apply.htm b/luci-mod-admin-full/luasrc/view/admin_uci/apply.htm deleted file mode 100644 index 370027e51..000000000 --- a/luci-mod-admin-full/luasrc/view/admin_uci/apply.htm +++ /dev/null @@ -1,23 +0,0 @@ -<%# - Copyright 2008 Steven Barth - Copyright 2008 Jo-Philipp Wich - Licensed to the public under the Apache License 2.0. --%> - -<%+header%> - -

<%:Configuration%> / <%:Apply%>

- -<% if changes then %> - <%+cbi/apply_xhr%> - <%+admin_uci/changelog%> - - <%- cbi_apply_xhr('uci-apply', configs) -%> - -

<%:The following changes have been committed%>:

- <%- uci_changelog(changes) -%> -<% else %> -

<%:There are no pending changes to apply!%>

-<% end %> - -<%+footer%> diff --git a/luci-mod-admin-full/luasrc/view/admin_uci/changelog.htm b/luci-mod-admin-full/luasrc/view/admin_uci/changelog.htm index 4ed4f0a10..e05ccdece 100644 --- a/luci-mod-admin-full/luasrc/view/admin_uci/changelog.htm +++ b/luci-mod-admin-full/luasrc/view/admin_uci/changelog.htm @@ -4,7 +4,7 @@ -%> <% export("uci_changelog", function(changes) -%> -
+
<%:Legend:%>
  <%:Section added%>
@@ -32,9 +32,11 @@ ret[#ret+1] = "
%s.%s.%s+=%s" %{ r, s, o, util.pcdata(v[i]) } end - else + elseif v ~= "" then ret[#ret+1] = "
%s.%s.%s=%s" %{ r, s, o, util.pcdata(v) } + else + ret[#ret+1] = "
%s.%s.%s" %{ r, s, o } end end end @@ -57,7 +59,7 @@ ret[#ret+1] = "%s.%s.%s+=%s
" %{ r, s, o, util.pcdata(v[i]) } end - + else ret[#ret+1] = "%s.%s.%s=%s
" %{ r, s, o, util.pcdata(v) } @@ -75,5 +77,5 @@ write(table.concat(ret)) %>
-
+ <%- end) %> diff --git a/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm b/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm index c3373604f..43bd7c23f 100644 --- a/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm +++ b/luci-mod-admin-full/luasrc/view/admin_uci/changes.htm @@ -1,46 +1,45 @@ <%# Copyright 2008 Steven Barth - Copyright 2008-2015 Jo-Philipp Wich + Copyright 2008-2018 Jo-Philipp Wich Licensed to the public under the Apache License 2.0. -%> <%+header%> +<%- + local node, redir_url = luci.dispatcher.lookup(luci.http.formvalue("redir")) + export("redirect", redir_url or url("admin/uci/changes")) + + include("admin_uci/changelog") +-%> +

<%:Configuration%> / <%:Changes%>

<% if changes then %> - <%+admin_uci/changelog%> <%- uci_changelog(changes) -%> <% else %>

<%:There are no pending changes!%>

<% end %> + +
- <% local r = luci.http.formvalue("redir"); if r and #r > 0 then %> -
-
- -
-
+ <% if redir_url then %> +
+ +
<% end %> -
-
- - " /> - -
-
- - " /> - -
-
- - " /> - -
-
+
"> + + " /> + +
+
"> + + " /> + +
<%+footer%> diff --git a/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm b/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm index 5da7281a8..d8fd3de01 100644 --- a/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm +++ b/luci-mod-admin-full/luasrc/view/admin_uci/revert.htm @@ -1,27 +1,33 @@ <%# Copyright 2008 Steven Barth - Copyright 2008 Jo-Philipp Wich + Copyright 2008-2018 Jo-Philipp Wich Licensed to the public under the Apache License 2.0. -%> <%+header%> +<%- + local node, redir_url = luci.dispatcher.lookup(luci.http.formvalue("redir")) + export("redirect", redir_url or url("admin/uci/changes")) + + include("admin_uci/changelog") +-%> +

<%:Configuration%> / <%:Revert%>

<% if changes then %> - <%+cbi/apply_xhr%> - <%+admin_uci/changelog%> -

<%:The following changes have been reverted%>:

<%- uci_changelog(changes) -%> <% else %>

<%:There are no pending changes to revert!%>

<% end %> -
-
"> - -
-
+<% if redir_url then %> +
+
+ +
+
+<% end %> <%+footer%> diff --git a/luci-mod-admin-full/luasrc/view/cbi/wireless_modefreq.htm b/luci-mod-admin-full/luasrc/view/cbi/wireless_modefreq.htm index 2fb64b3c4..ebb02e489 100644 --- a/luci-mod-admin-full/luasrc/view/cbi/wireless_modefreq.htm +++ b/luci-mod-admin-full/luasrc/view/cbi/wireless_modefreq.htm @@ -1,9 +1,9 @@ <%+cbi/valueheader%> - - - -
-
-
- OMR OpenMPTCProuter -
    - <%- - local function submenu(prefix, node) - local childs = disp.node_childs(node) - if #childs > 0 then - %> -
      - <%- - for i, r in ipairs(childs) do - local nnode = node.nodes[r] - local href = controller .. prefix .. r .. - (nnode.query and http.build_querystring(nnode.query) or "") - %> -
    • <%=pcdata(striptags(translate(nnode.title)))%>
      • - <%- - end - %> -
    - <%- - end - end - - childs = disp.node_childs(cattree) + local function render_submenu(prefix, node) + local childs = disp.node_childs(node) if #childs > 0 then + write('
      ') + + for i, r in ipairs(childs) do + local nnode = node.nodes[r] + write('
    • %s
      • ' %{ + nodeurl(prefix, r, nnode.query), + pcdata(striptags(translate(nnode.title))) + }) + end + + write('
    ') + end + end + + local function render_topmenu() + local childs = disp.node_childs(cattree) + if #childs > 0 then + write('
      ') + for i, r in ipairs(childs) do local nnode = cattree.nodes[r] - local href = controller .. "/" .. category .. "/" .. r .. - (nnode.query and http.build_querystring(k.query) or "") - local grandchildren = disp.node_childs(nnode) - - if #grandchildren > 0 then - %> -
    • - <%=pcdata(striptags(translate(nnode.title)))%> - <%- submenu("/" .. category .. "/" .. r .. "/", nnode) %> -
      • - <% else %> -
    • - <%=pcdata(striptags(translate(nnode.title)))%> -
      • - <% - end - end - end - %> -
    + local grandchildren = disp.node_childs(nnode) - <% - -- calculate the number of unsaved changes + if #grandchildren > 0 then + write('
  • %s' % pcdata(striptags(translate(nnode.title)))) + render_submenu(category .. "/" .. r, nnode) + write('
    • ') + else + write('
  • %s
    • ' %{ + nodeurl(category, r, nnode.query), + pcdata(striptags(translate(nnode.title))) + }) + end + end + + write('
') + end + end + + local function render_changes() + -- calculate the number of unsaved changes if tree.nodes[category] and tree.nodes[category].ucidata then local ucichanges = 0 @@ -175,30 +143,68 @@ end end end - %> -
- <% if ucichanges > 0 then %> - <%:Unsaved Changes%>: <%=ucichanges%> - <% end %> - -
- <% end %> -
-
-
-<%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%> -
-
-

<%:No password set!%>

- <%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%>
- "><%:Go to password configuration...%> -
-
-<%- end -%> + if ucichanges > 0 then + write('%s: %d' %{ + url(category, 'uci/changes'), + http.urlencode(http.formvalue('redir') or table.concat(disp.context.request, "/")), + translate('Unsaved Changes'), + ucichanges + }) + end + end + end +-%> + + + + + <%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI + + + + + <% if node and node.css then %> + + <% end -%> + <% if css then %> + + <% end -%> + + + -
-<% if category then subtree("/" .. category .. "/", cattree) end %> + +
+
+
+ OMR OpenMPTCProuter + <% render_topmenu() %> +
+ <% render_changes() %> + +
+
+
+
+ +
+ <%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%> +
+

<%:No password set!%>

+

<%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%>

+
"><%:Go to password configuration...%>
+
+ <%- end -%> + + + + <% if category then render_tabmenu(category, cattree) end %> diff --git a/mlvpn/Makefile b/mlvpn/Makefile new file mode 100644 index 000000000..b61c83b9d --- /dev/null +++ b/mlvpn/Makefile @@ -0,0 +1,61 @@ +# +# Copyright (C) 2017 Zhong Jianxin +# Copyright (C) 2018 Ycarus (Yannick Chabanois) +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk + +PKG_NAME:=mlvpn +#PKG_VERSION:=6f13423b +PKG_VERSION:=54ba2d8 +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=git +#PKG_SOURCE_URL:=https://github.com/zehome/MLVPN.git +#PKG_SOURCE_VERSION:=6f13423b8108f46edb9f230deee20e3741abe64c +#PKG_SOURCE_DATE:=2017-09-01 +PKG_SOURCE_URL:=https://github.com/markfoodyburton/MLVPN.git +PKG_SOURCE_VERSION:=54ba2d837a20bcb59cf2e690354d132152cdf79f +PKG_SOURCE_DATE:=2018-07-01 + +PKG_LICENSE:=BSD-2-Clause +PKG_MAINTAINER:=Ycarus (Yannick Chabanois) + +PKG_INSTALL:=1 +PKG_FIXUP:=autoreconf +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/mlvpn + TITLE:=Multi-Link Virtual Public Network + SECTION:=net + CATEGORY:=Network + URL:=https://zehome.github.io/MLVPN/ + SUBMENU:=VPN + MENU:=1 + DEPENDS:=+kmod-tun +libev +libpcap +libsodium +endef + +define Package/mlvpn/description + Multi-Link Virtual Public Network + Bond your internet links to increase bandwidth (unlimited). + Secure your internet connection by actively monitoring your links and removing the faulty ones, without loosing your TCP connections. + Secure your internet connection to the aggregation server using strong cryptography. + Scriptable automation and monitoring. +endef + +define Package/mlvpn/conffiles +/etc/config/mlvpn +endef + +define Package/mlvpn/install + $(INSTALL_DIR) $(1) + $(CP) ./files/* $(1)/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/mlvpn $(1)/usr/sbin/ +endef + +$(eval $(call BuildPackage,mlvpn)) diff --git a/mlvpn/files/etc/config/mlvpn b/mlvpn/files/etc/config/mlvpn new file mode 100644 index 000000000..0f94c7894 --- /dev/null +++ b/mlvpn/files/etc/config/mlvpn @@ -0,0 +1,10 @@ +config mlvpn 'general' + option enable '0' + option password '' + option timeout '30' + option reorder_buffer_size '64' + option loss_tolerence '50' + option mode 'client' + option host '128.128.128.128' + option firstport '65201' + option interface_name 'mlvpn0' diff --git a/mlvpn/files/etc/init.d/mlvpn b/mlvpn/files/etc/init.d/mlvpn new file mode 100755 index 000000000..f85e5baa6 --- /dev/null +++ b/mlvpn/files/etc/init.d/mlvpn @@ -0,0 +1,81 @@ +#!/bin/sh /etc/rc.common + +START=88 +USE_PROCD=1 + +validate_section() { + uci_validate_section mlvpn mlvpn ${1} \ + 'enable:bool:0' \ + 'timeout:uinteger:30' \ + 'mode:string:client' \ + 'password:string' \ + 'reorder_buffer_size:uinteger:64' \ + 'loss_tolerence:uinteger:30' \ + 'interface_name:string:mlvpn0' \ + 'host:host' \ + 'firstport:port' +} + +interface_multipath_settings() { + local mode port + local config="$1" + id=$(($id+1)) + config_get mode "$config" multipath "off" + [ "$mode" = "off" ] && return 1 + config_get ifname "$config" ifname + [ -z "$ifname" ] && ifname=$(ifstatus "$config" | jsonfilter -q -e '@["l3_device"]') + [ -z "$ifname" ] && return 1 + count=$(($count+1)) + port=$((firstport+count)) + cat >> /tmp/etc/${interface_name}.conf <<-EOF + + [${id}] + bindhost = "${ifname}" + bindport = "${port}" + remotehost = "${host}" + remoteport = "${port}" + EOF +} + +start_service() { + local enable timeout mode password reorder_buffer_size interface_name host firstport loss_tolerence + validate_section "general" || { + _err "validation failed" + return 1 + } + + [ "${enable}" = "1" ] || return 1 + + if [ "$(uci -q get network.omrvpn)" != "" ]; then + uci -q set network.omrvpn.ifname=${interface_name} + uci -q commit + fi + + cat > /tmp/etc/${interface_name}.conf <<-EOF + [general] + tuntap = "tun" + mode = "${mode}" + interface_name = "${interface_name}" + timeout = ${timeout} + reorder_buffer = yes + reorder_buffer_size = ${reorder_buffer_size} + loss_tolerence = ${loss_tolerence} + password = "${password}" + EOF + + local count=0 id=0 + config_load network + config_foreach interface_multipath_settings interface + + chmod 0600 "/tmp/etc/${interface_name}.conf" + procd_open_instance + procd_set_param command /usr/sbin/mlvpn --config "/tmp/etc/${interface_name}.conf" --user nobody + procd_set_param file "/tmp/etc/${interface_name}.conf" + procd_set_param reload_signal SIGHUP + procd_set_param respawn + procd_close_instance +} + +service_triggers() { + procd_add_reload_trigger mlvpn network +} \ No newline at end of file diff --git a/mlvpn/files/etc/uci-defaults/4100-mlvpn b/mlvpn/files/etc/uci-defaults/4100-mlvpn new file mode 100644 index 000000000..eed3d5dd5 --- /dev/null +++ b/mlvpn/files/etc/uci-defaults/4100-mlvpn @@ -0,0 +1,30 @@ +#!/bin/sh + +uci -q batch <<-EOF >/dev/null + delete ucitrack.@mlvpn[-1] + add ucitrack mlvpn + set ucitrack.@mlvpn[-1].init=mlvpn + commit ucitrack +EOF + +if [ "$(uci -q get network.omrvpn)" = "" ] && [ "$(uci -q get network.mlvpn)" = "" ]; then + uci -q batch <<-EOF >/dev/null + delete network.mlvpn=interface + set network.mlvpn=interface + set network.mlvpn.ifname=mlvpn0 + set network.mlvpn.proto=dhcp + set network.mlvpn.ip4table=vpn + set network.mlvpn.multipath=off + set network.mlvpn.leasetime=12h + set network.mlvpn.mtu=1440 + commit network + EOF +fi + +if [ "$(uci get firewall.zone_vpn.network | grep omrvpn)" = "" ] && [ "$(uci get firewall.zone_vpn.network | grep mlvpn)" = "" ]; then + uci -q batch <<-EOF >/dev/null + add_list firewall.zone_vpn.network='mlvpn' + EOF +fi +rm -f /tmp/luci-indexcache +exit 0 diff --git a/mlvpn/patches/010-musl-fix.patch b/mlvpn/patches/010-musl-fix.patch new file mode 100644 index 000000000..851d3dfca --- /dev/null +++ b/mlvpn/patches/010-musl-fix.patch @@ -0,0 +1,11 @@ +--- a/src/privsep.c ++++ b/src/privsep.c +@@ -778,7 +778,7 @@ sig_got_chld(int sig) + pid_t pid; + + do { +- pid = waitpid(WAIT_ANY, NULL, WNOHANG); ++ pid = waitpid(-1, NULL, WNOHANG); + if (pid == child_pid && cur_state < STATE_QUIT) + cur_state = STATE_QUIT; + } while (pid > 0 || (pid == -1 && errno == EINTR)); diff --git a/mlvpn/patches/020-config-bindaddr.patch b/mlvpn/patches/020-config-bindaddr.patch new file mode 100644 index 000000000..e012d49a0 --- /dev/null +++ b/mlvpn/patches/020-config-bindaddr.patch @@ -0,0 +1,16 @@ +--- a/src/config.c 2018-07-01 19:02:09.192210482 +0200 ++++ b/src/config.c 2018-07-01 19:03:13.263404635 +0200 +@@ -302,9 +302,11 @@ + config, lastSection, "remoteport", &dstport, NULL, + "No remote port specified.\n", 1); + } +- +- bindaddr=ip_from_if(bindaddr); + ++ if (bindaddr) ++ { ++ bindaddr=ip_from_if(bindaddr); ++ } + + _conf_set_uint_from_conf( + config, lastSection, "bandwidth_upload", &bwlimit, 0, diff --git a/mptcp/Makefile b/mptcp/Makefile index 1dea4a9e8..93c31727a 100644 --- a/mptcp/Makefile +++ b/mptcp/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mptcp -PKG_VERSION:=4.0 -PKG_RELEASE:=2 +PKG_VERSION:=6.0 +PKG_RELEASE:=1 PKG_MAINTAINER:=Ycarus (Yannick Chabanois) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) diff --git a/mptcp/files/etc/init.d/mptcp b/mptcp/files/etc/init.d/mptcp index 6b7ad39bd..c69c5d317 100755 --- a/mptcp/files/etc/init.d/mptcp +++ b/mptcp/files/etc/init.d/mptcp @@ -1,11 +1,11 @@ #!/bin/sh /etc/rc.common -START=18 +START=90 USE_PROCD=1 global_multipath_settings() { - local multipath mptcp_path_manager mptcp_schdeduler congestion mptcp_checksum mptcp_syn_retries + local multipath mptcp_path_manager mptcp_schdeduler congestion mptcp_checksum mptcp_syn_retries mptcp_fullmesh_num_subflows mptcp_fullmesh_create_on_err mptcp_ndiffports_num_subflows local multipath_status=0 config_load network config_get multipath globals multipath @@ -14,6 +14,10 @@ global_multipath_settings() { config_get congestion globals congestion config_get mptcp_checksum globals mptcp_checksum config_get mptcp_syn_retries globals mptcp_syn_retries + config_get mptcp_fullmesh_num_subflows globals mptcp_fullmesh_num_subflows + config_get mptcp_fullmesh_create_on_err globals mptcp_fullmesh_create_on_err + config_get mptcp_ndiffports_num_subflows globals mptcp_ndiffports_num_subflows + [ "$multipath" = "enable" ] && multipath_status=1 # Global MPTCP configuration @@ -23,14 +27,28 @@ global_multipath_settings() { [ -z "$congestion" ] || sysctl -qw net.ipv4.tcp_congestion_control="$congestion" [ -z "$mptcp_checksum" ] || sysctl -qw net.mptcp.mptcp_checksum="$mptcp_checksum" [ -z "$mptcp_syn_retries" ] || sysctl -qw net.mptcp.mptcp_syn_retries="$mptcp_syn_retries" + [ -z "$mptcp_fullmesh_num_subflows" ] || sysctl -qw /sys/module/mptcp_fullmesh/parameters/num_subflows="$mptcp_fullmesh_num_subflows" + [ -z "$mptcp_fullmesh_create_on_err" ] || sysctl -qw /sys/module/mptcp_fullmesh/parameters/create_on_err="$mptcp_fullmesh_create_on_err" + [ -z "$mptcp_ndiffports_num_subflows" ] || sysctl -qw /sys/module/mptcp_ndiffports/parameters/num_subflows="$mptcp_ndiffports_num_subflows" } interface_multipath_settings() { - local mode iface + local mode iface proto local config="$1" local intf="$2" + local enabled + config_get enabled "$config" auto "1" config_get iface "$config" ifname + [ -z "$iface" ] && iface=$(ifstatus "$config" | jsonfilter -q -e '@["l3_device"]') + + # Force scaling freq for RPI if USB is connected + [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep raspberry)" ] && [ -n "$(echo $iface | grep usb)" ] && { + uci -q set openmptcprouter.settings.scaling_min_freq=$(uci -q get openmptcprouter.settings.scaling_max_freq) + } + + [ "$enabled" = "0" ] && return 0 + count=$(($count+1)) id=$count [ -n "$intf" ] && [ "$iface" != "$intf" ] && return 0 @@ -63,20 +81,24 @@ interface_multipath_settings() { ipaddr=$(ip -4 addr show dev $iface | grep inet | awk '{print $2}' | cut -d/ -f1 | tr -d "\n") gateway=$(ip -4 r list dev $iface | grep -v default | awk '/proto static/ {print $1}' | tr -d "\n") [ -z "$gateway" ] && gateway=$(uci -q get "network.$config.gateway") - [ -z "$gateway" ] && gateway=$(ubus call network.interface.$config status | jsonfilter -e '@.route[0].nexthop' | tr -d "\n") - [ -z "$gateway" ] && gateway=$(ubus call network.interface.$config status | jsonfilter -e '@.inactive.route[0].nexthop' | tr -d "\n") + [ -z "$gateway" ] && gateway=$(ubus call network.interface.$config status | jsonfilter -q -e '@.route[0].nexthop' | tr -d "\n") + [ -z "$gateway" ] && gateway=$(ubus call network.interface.$config status | jsonfilter -q -e '@.inactive.route[0].nexthop' | tr -d "\n") + [ -z "$gateway" ] && gateway=$(ubus call network.interface.${config}_4 status 2>/dev/null | jsonfilter -q -e '@.inactive.route[0].nexthop' | tr -d "\n") netmask=$(ip -4 addr show dev $iface | grep inet | awk '{print $2}' | cut -d/ -f2 | tr -d "\n") network=`ipcalc.sh $ipaddr $netmask | sed -n '/NETWORK=/{;s/.*=//;s/ .*//;p;}'` fi ip rule del table $id > /dev/null 2>&1 ip route flush $id > /dev/null 2>&1 [ -n "$gateway" ] || return 1 + [ -n "$network" ] || return 1 ip rule add from $ipaddr table $id ip route replace $network/$netmask dev $iface scope link table $id ip route replace default via $gateway dev $iface table $id ip route flush $id config_get mode "$config" multipath "off" + local enabled + config_get enabled "$config" auto "1" [ "$mode" = "master" ] && { ip route replace default via $gateway dev $iface } @@ -85,7 +107,7 @@ interface_multipath_settings() { load_interfaces() { config_get ifname "$1" ifname config_get multipath "$1" multipath "off" - [ "$multipath" != "off" ] && interface=" ${ifname} ${interfaces}" + [ "$multipath" != "off" ] && interfaces=" ${ifname} ${interfaces}" } start_service() { diff --git a/mptcp/files/etc/uci-defaults/mptcp-defaults b/mptcp/files/etc/uci-defaults/mptcp-defaults index fdac46c93..cad508851 100755 --- a/mptcp/files/etc/uci-defaults/mptcp-defaults +++ b/mptcp/files/etc/uci-defaults/mptcp-defaults @@ -1,17 +1,62 @@ #!/bin/sh -uci -q batch <<-EOF - set network.globals.multipath='enable' - set network.globals.mptcp_path_manager='fullmesh' - set network.globals.mptcp_scheduler='default' - set network.globals.congestion='olia' - set network.globals.mptcp_checksum=1 - set network.globals.mptcp_syn_retries=4 - commit network -EOF +if [ "$(uci -q show network.globals | grep mptcp_path_manager)" = "" ]; then + uci -q batch <<-EOF + set network.globals.multipath='enable' + set network.globals.mptcp_path_manager='fullmesh' + set network.globals.mptcp_scheduler='default' + set network.globals.congestion='bbr' + set network.globals.mptcp_checksum=0 + set network.globals.mptcp_syn_retries=5 + commit network + EOF +fi +if [ "$(uci -q get network.globals.congestion)" != "bbr" ]; then + uci -q batch <<-EOF + set network.globals.congestion=bbr + commit network + EOF +fi +if [ "$(uci -q get network.globals.mptcp_syn_retries)" != "5" ]; then + uci -q batch <<-EOF + set network.globals.mptcp_syn_retries=5 + commit network + EOF +fi +if [ "$(uci -q get network.globals.mptcp_checksum)" != "0" ]; then + uci -q batch <<-EOF + set network.globals.mptcp_checksum=0 + commit network + EOF +fi +if [ "$(uci -q get network.globals.mptcp_checksum)" = "enable" ]; then + uci -q batch <<-EOF + set network.globals.mptcp_checksum=1 + EOF +fi +if [ "$(uci -q get network.globals.mptcp_checksum)" = "disable" ]; then + uci -q batch <<-EOF + set network.globals.mptcp_checksum=0 + EOF +fi + +if [ "$(uci -q show network.globals | grep mptcp_fullmesh)" = "" ]; then + uci -q batch <<-EOF + set network.globals.mptcp_fullmesh_num_subflows=1 + set network.globals.mptcp_fullmesh_create_on_err=1 + set network.globals.mptcp_ndiffports_num_subflows=1 + commit network + EOF +fi uci -q batch <<-EOF delete ucitrack.@mptcp[-1] add ucitrack mptcp set ucitrack.@mptcp[-1].init=mptcp - add_list ucitrack.@network[-1].affects=mptcp commit ucitrack -EOF \ No newline at end of file +EOF +if [ "$(uci -q get ucitrack.@network[-1].affects | grep mptcp)" = "" ]; then + uci -q batch <<-EOF + add_list ucitrack.@network[-1].affects=mptcp + commit ucitrack + EOF +fi +exit 0 \ No newline at end of file diff --git a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking index 4c5092794..f5aaaa31f 100755 --- a/mptcp/files/usr/share/omr/post-tracking.d/post-tracking +++ b/mptcp/files/usr/share/omr/post-tracking.d/post-tracking @@ -5,42 +5,94 @@ set_route() { local multipath_config interface_gw interface_if INTERFACE=$1 PREVINTERFACE=$2 - multipath_config=$(uci -q get "network.$INTERFACE.multipath" || echo "off") - interface_if=$(uci -q get "network.$INTERFACE.ifname") + multipath_config=$(uci -q get network.$INTERFACE.multipath || echo "off") + interface_if=$(uci -q get network.$INTERFACE.ifname) + [ -z "$interface_if" ] && interface_if=$(ifstatus "$INTERFACE" | jsonfilter -q -e '@["l3_device"]') + [ -z "$interface_if" ] && interface_if=$(ifstatus "${INTERFACE}_4" 2>/dev/null | jsonfilter -q -e '@["l3_device"]') multipath_current_config=$(multipath $interface_if | grep deactivated) if [ "$multipath_config" != "off" ] && [ "$SETROUTE" != true ] && [ "$INTERFACE" != "$PREVINTERFACE" ] && [ "$multipath_current_config" = "" ]; then #if [ "$multipath_config" != "off" ] && [ "$SETROUTE" != true ]; then #if [ "$multipath_config" != "off" ] && [ "$INTERFACE" != "$PREVINTERFACE" ] && [ "$SETROUTE" != true ]; then - interface_gw=$(uci -q get "network.$INTERFACE.gateway") - if [ -z $interface_gw ]; then - $interface_gw=$(ubus call network.interface.$INTERFACE status | jsonfilter -e '@.route[0].nexthop' | tr -d "\n") + interface_gw="$(uci -q get network.$INTERFACE.gateway)" + if [ -z "$interface_gw" ]; then + interface_gw=$(ubus call network.interface.$INTERFACE status | jsonfilter -q -e '@.route[0].nexthop' | tr -d "\n") fi - if [ -z $interface_gw ]; then - $interface_gw=$(ubus call network.interface.$INTERFACE status | jsonfilter -e '@.inactive.route[0].nexthop' | tr -d "\n") + if [ -z "$interface_gw" ]; then + interface_gw=$(ubus call network.interface.$INTERFACE status | jsonfilter -q -e '@.inactive.route[0].nexthop' | tr -d "\n") + fi + if [ -z "$interface_gw" ]; then + interface_gw=$(ubus call network.interface.${INTERFACE}_4 status | jsonfilter -q -e '@.inactive.route[0].nexthop' | tr -d "\n") fi if [ "$interface_gw" != "" ]; then - _log "Replace default route by $interface_gw dev $interface_if" + _log "$PREVINTERFACE down. Replace default route by $interface_gw dev $interface_if" ip route replace default scope global nexthop via $interface_gw dev $interface_if && SETROUTE=true - ip route replace default via $interface_gw dev $interface_if table 991337 + if [ "$(uci -q get omr-bypass.defaults.ifname)" = "" ]; then + ip route replace default via $interface_gw dev $interface_if table 991337 + fi fi fi } set_ss_route() { - local server_ip + local server_ip upstreams nginxip + local metric=$2 config_get server_ip $1 server - if [ "$server_ip" != "" ] && [ "$OMR_TRACKER_DEVICE_GATEWAY" != "" ] && [ "$(ip route show dev $OMR_TRACKER_DEVICE | grep $server_ip | grep $OMR_TRACKER_DEVICE_GATEWAY)" = "" ]; then - _log "Set server $server_ip route via $OMR_TRACKER_DEVICE" - ip route replace $server_ip via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE + if [ "$server_ip" = "127.0.0.1" ]; then + upstreams=$(uci -q get nginx-ha.ShadowSocks.upstreams | sed -e "s/' '/%/" -e 's/ /_/g' -e "s/'//g" -e 's/%/ /') + for up in $upstreams; do + _log "up: $up - metric: $metric" + nginxip=$(echo $up | cut -d: -f1) + if [ "$nginxip" != "" ] && [ "$OMR_TRACKER_DEVICE_GATEWAY" != "" ] && [ "$(ip route show dev $OMR_TRACKER_DEVICE metric $metric | grep $nginxip | grep $OMR_TRACKER_DEVICE_GATEWAY)" = "" ]; then + _log "Set server $nginxip route via $OMR_TRACKER_DEVICE" + ip route replace $nginxip via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE metric $metric + fi + done + else + if [ "$metric" != "off" ] && [ "$server_ip" != "" ] && [ "$OMR_TRACKER_DEVICE_GATEWAY" != "" ] && [ "$(ip route show dev $OMR_TRACKER_DEVICE metric $metric | grep $server_ip | grep $OMR_TRACKER_DEVICE_GATEWAY)" = "" ]; then + _log "Set server $server_ip route via $OMR_TRACKER_DEVICE metric $metric" + ip route replace $server_ip via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE metric $metric + fi fi } del_ss_route() { - local server_ip + local server_ip upstreams nginxip + local metric=$2 config_get server_ip $1 server - if [ "$server_ip" != "" ] && [ "$(ip route show dev $OMR_TRACKER_DEVICE | grep $server_ip)" != "" ]; then - _log "Remove server $server_ip route via $OMR_TRACKER_DEVICE" - ip route delete $server_ip dev $OMR_TRACKER_DEVICE + if [ "$server_ip" = "127.0.0.1" ]; then + upstreams=$(uci -q get nginx-ha.ShadowSocks.upstreams | sed -e "s/' '/%/" -e 's/ /_/g' -e "s/'//g" -e 's/%/ /') + for up in $upstreams; do + _log "down : $up" + nginxip=$(echo $up | cut -d: -f1) + if [ "$metric" = "all" ]; then + if [ "$nginxip" != "" ] && [ "$(ip route show | grep $nginxip)" != "" ]; then + _log "Remove all server $nginxip route" + ip route delete $nginxip + fi + else + if [ "$nginxip" != "" ] && [ "$(ip route show dev $OMR_TRACKER_DEVICE metric $metric | grep $nginxip)" != "" ]; then + _log "Remove server $nginxip route via $OMR_TRACKER_DEVICE" + ip route delete $nginxip dev $OMR_TRACKER_DEVICE metric $metric + fi + fi + done + else + if [ "$metric" = "all" ]; then + if [ "$server_ip" != "" ] && [ "$(ip route show | grep $server_ip)" != "" ]; then + _log "Remove all server $server_ip route" + ip route delete $server_ip + fi + elif [ "$metric" = "off" ]; then + if [ "$server_ip" != "" ] && [ "$(ip route show dev $OMR_TRACKER_DEVICE | grep $server_ip)" != "" ]; then + _log "Remove all server $server_ip route via $OMR_TRACKER_DEVICE" + ip route delete $server_ip dev $OMR_TRACKER_DEVICE + fi + else + if [ "$server_ip" != "" ] && [ "$(ip route show dev $OMR_TRACKER_DEVICE metric $metric | grep $server_ip)" != "" ]; then + _log "Remove server $server_ip route via $OMR_TRACKER_DEVICE" + ip route delete $server_ip dev $OMR_TRACKER_DEVICE metric $metric + fi + fi fi } @@ -64,22 +116,46 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ]; then if [ -d "/sys/class/net/$OMR_TRACKER_DEVICE" ]; then [ "$multipath_status" = "off" ] || { _log "$OMR_TRACKER_DEVICE switched off" - multipath "$OMR_TRACKER_DEVICE" off + if [ "$(sysctl -n net.mptcp.mptcp_enabled | tr -d '\n')" = "1" ]; then + multipath "$OMR_TRACKER_DEVICE" off + fi + glorytun-udp path $OMR_TRACKER_DEVICE_IP dev tun0 down > /dev/null 2>&1 config_load shadowsocks-libev - config_foreach del_ss_route server + if [ -n "$OMR_TRACKER_DEVICE_IP" ]; then + local metric=$(ip rule show | grep "$OMR_TRACKER_DEVICE_IP" | awk '{print $5}') + config_foreach del_ss_route server $metric + else + config_foreach del_ss_route server none + fi } fi if [ "$default_gw" = "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$default_gw" = "" ]; then config_load network config_foreach set_route interface $OMR_TRACKER_INTERFACE fi + if [ "$OMR_TRACKER_INTERFACE" = "glorytun" ] || [ "$OMR_TRACKER_INTERFACE" = "omrvpn" ]; then + _log "$OMR_TRACKER_INTERFACE down" + config_load shadowsocks-libev + #config_foreach del_ss_route server all + if [ "$(uci -q show shadowsocks-libev.ss_rules.redir_udp)" = "" ] && [ "$(uci -q show shadowsocks-libev.hi2.mode)" = "tcp_and_udp" ]; then + _log "Tunnel down use ShadowSocks for UDP" + uci -q set shadowsocks-libev.ss_rules.redir_udp='hi2' + /etc/init.d/shadowsocks-libev rules_down + /etc/init.d/shadowsocks-libev rules_up + fi + fi exit 0 fi -if [ "$OMR_TRACKER_INTERFACE" = "glorytun" ]; then +if [ "$OMR_TRACKER_INTERFACE" = "glorytun" ] || [ "$OMR_TRACKER_INTERFACE" = "omrvpn" ]; then if [ "$default_gw" != "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$default_gw" = "" ]; then _log "Tunnel up : Replace default route by $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE" ip route replace default scope global nexthop via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE + if [ "$(uci -q show shadowsocks-libev.ss_rules.redir_udp)" = "hi2" ]; then + uci -q delete shadowsocks-libev.ss_rules.redir_udp + /etc/init.d/shadowsocks-libev rules_down + /etc/init.d/shadowsocks-libev rules_up + fi fi exit 0 fi @@ -87,19 +163,37 @@ fi multipath_config=$(uci -q get "network.$OMR_TRACKER_INTERFACE.multipath" || echo "off") if [ "$multipath_config" = "master" ]; then if [ "$default_gw" != "$OMR_TRACKER_DEVICE_GATEWAY" ] || [ "$default_gw" = "" ]; then - if [ "$(ip route show default | grep -v metric | awk '/default/ {print $5}' | grep tun)" = "" ]; then - _log "Master up : Replace default route by $current_interface_gw dev $OMR_TRACKER_DEVICE" + omrvpn_intf=$(uci -q get "network.omrvpn.ifname" || echo "tun") + if [ "$(ip route show default | grep -v metric | awk '/default/ {print $5}' | grep $omrvpn_intf)" = "" ]; then + _log "Master up : Replace default route by $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE" ip route replace default scope global nexthop via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE else config_load shadowsocks-libev - config_foreach set_ss_route server + config_foreach set_ss_route server 1 + fi + if [ "$(uci -q get omr-bypass.defaults.ifname)" = "" ]; then + ip route replace default via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE table 991337 fi - ip route replace default via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE table 991337 fi multipath_config="on" +else + if [ -n "$OMR_TRACKER_DEVICE_IP" ]; then + local metric=$(ip rule show | grep "$OMR_TRACKER_DEVICE_IP" | awk '{print $5}') + [ -n "$metric" ] && { + config_load shadowsocks-libev + config_foreach set_ss_route server $metric + } + fi +fi +if [ "$(uci -q get omr-bypass.defaults.ifname)" = "$OMR_TRACKER_DEVICE" ] && [ "$(ip route show table 991337 | grep $OMR_TRACKER_DEVICE_GATEWAY)" = "" ]; then + ip route replace default via $OMR_TRACKER_DEVICE_GATEWAY dev $OMR_TRACKER_DEVICE table 991337 fi -[ "$multipath_config" = "master" ] && [ "$multipath_status" = "on" ] && exit 0 -[ "$multipath_status" = "$multipath_config" ] && exit 0 -_log "Multipath $OMR_TRACKER_DEVICE switched to $multipath_config" -multipath "$OMR_TRACKER_DEVICE" "$multipath_config" + +[ "$multipath_config" = "on" ] && glorytun-udp path $OMR_TRACKER_DEVICE_IP dev tun0 up > /dev/null 2>&1 +[ "$multipath_config" = "backup" ] && glorytun-udp path $OMR_TRACKER_DEVICE_IP dev tun0 backup > /dev/null 2>&1 +[ "$multipath_status" = "$multipath_config" ] && exit 0 +if [ "$(sysctl -n net.mptcp.mptcp_enabled | tr -d '\n')" = "1" ]; then + _log "Multipath $OMR_TRACKER_DEVICE switched to $multipath_config" + multipath "$OMR_TRACKER_DEVICE" "$multipath_config" +fi diff --git a/ndisc6/Makefile b/ndisc6/Makefile new file mode 100644 index 000000000..16ef8889b --- /dev/null +++ b/ndisc6/Makefile @@ -0,0 +1,99 @@ +# +# Copyright (C) 2006-2012 OpenWrt.org +# Copyright (C) 2018 Ycarus (Yannick Chabanois) +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=ndisc6 +PKG_VERSION:=1.0.3 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://www.remlab.net/files/ndisc6 +PKG_HASH:=0f41d6caf5f2edc1a12924956ae8b1d372e3b426bd7b11eed7d38bc974eec821 + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/ndisc + SECTION:=ipv6 + CATEGORY:=IPv6 + SUBMENU:=IPv6 discovery tools + TITLE:=IPv6 discovery tools + URL:=http://www.remlab.net/ndisc6/ + DEPENDS:=+libpthread +librt +endef + +define Package/ndisc/description +IPv6 discovery tools +endef + +define Package/ndisc6 + $(call Package/ndisc) + TITLE:=An ICMPv6 neighbour discovery tool +endef + +define Package/ndisc6/description +An ICMPv6 neighbour discovery tools +endef + +define Package/rdisc6 + $(call Package/ndisc) + TITLE:=An ICMPv6 router discovery tool +endef + +define Package/rdisc6/description +An ICMPv6 router discovery tool +endef + +define Package/traceroute6 + $(call Package/ndisc) + TITLE:=An IPv6-based traceroute implementation +endef + +define Package/traceroute6/description +An IPv6-based traceroute implementation +endef + +define Package/rdnssd + $(call Package/ndisc) + TITLE:=DNS server discovery daemon +endef + +define Package/rdnssd/description +A recursive DNS server discovery daemon gathering +information through stateless IPv6 autoconfiguration (RFC5006) +endef + +TARGET_CFLAGS += -std=c99 + +define Package/ndisc6/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ndisc6 $(1)/usr/bin/ +endef + +define Package/rdisc6/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rdisc6 $(1)/usr/bin/ +endef + +define Package/traceroute6/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{rl,tcp}traceroute6 $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tracert6 $(1)/usr/bin/ +endef + +define Package/rdnssd/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/rdnssd $(1)/usr/sbin/ +endef + +$(eval $(call BuildPackage,ndisc6)) +$(eval $(call BuildPackage,rdisc6)) +$(eval $(call BuildPackage,traceroute6)) +$(eval $(call BuildPackage,rdnssd)) diff --git a/ndpi-netfilter2/Makefile b/ndpi-netfilter2/Makefile new file mode 100644 index 000000000..fa18bafd6 --- /dev/null +++ b/ndpi-netfilter2/Makefile @@ -0,0 +1,75 @@ +# +# Based on package from https://github.com/openwrt-develop/ndpi-netfilter/ +# Copyright (C) 2018 Ycarus (Yannick Chabanois) +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk + +PKG_NAME:=ndpi-netfilter2 +PKG_VERSION:=5bcfd49 +PKG_RELEASE:=1 +PKG_REV:=5bcfd49 + +PKG_SOURCE_PROTO:=git +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_URL:=https://github.com/vel21ripn/nDPI.git +PKG_SOURCE_VERSION:=$(PKG_REV) + +PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) + +include $(INCLUDE_DIR)/package.mk + +define Package/iptables-mod-ndpi + SUBMENU:=Firewall + SECTION:=net + CATEGORY:=Network + TITLE:=ndpi successor of OpenDPI + URL:=http://www.ntop.org/products/ndpi/ + DEPENDS:=+iptables +iptables-mod-conntrack-extra +kmod-ipt-ndpi + MAINTAINER:=Thomas Heil +endef + +define Package/iptables-mod-ndpi/description + nDPI is a ntop-maintained superset of the popular OpenDPI library +endef + +CONFIGURE_CMD=./autogen.sh +CONFIGURE_ARGS += --with-pic +MAKE_PATH := ndpi-netfilter + +MAKE_FLAGS += \ + KERNEL_DIR="$(LINUX_DIR)" \ + MODULES_DIR="$(TARGET_MODULES_DIR)" \ + ARCH="$(LINUX_KARCH)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + NDPI_PATH=$(PKG_BUILD_DIR)/ndpi-netfilter + +define Build/Compile + (cd $(PKG_BUILD_DIR)/src/lib &&\ + gcc -I../../src/include/ -I../../src/lib/third_party/include/ ndpi_network_list_compile.c -o ndpi_network_list_compile &&\ + ./ndpi_network_list_compile -o ndpi_network_list.c.inc ndpi_network_list_std.yaml ndpi_network_list_tor.yaml) + $(MAKE) $(MAKE_FLAGS) -C $(PKG_BUILD_DIR)/ndpi-netfilter +endef + +define Package/iptables-mod-ndpi/install + $(INSTALL_DIR) $(1)/usr/lib/iptables + $(INSTALL_BIN) $(PKG_BUILD_DIR)/ndpi-netfilter/ipt/libxt_ndpi.so $(1)/usr/lib/iptables +endef + +define KernelPackage/ipt-ndpi + SUBMENU:=Netfilter Extensions + TITLE:= nDPI net netfilter module + DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +kmod-ipt-compat-xtables + KCONFIG:=CONFIG_NF_CONNTRACK_LABELS=y \ + CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y + FILES:= $(PKG_BUILD_DIR)/ndpi-netfilter/src/xt_ndpi.ko + AUTOLOAD:=$(call AutoProbe,xt_ndpi) +endef + +$(eval $(call BuildPackage,iptables-mod-ndpi)) +$(eval $(call KernelPackage,ipt-ndpi)) diff --git a/nginx/Config.in b/nginx/Config.in index 4cec04026..c2c9882c2 100644 --- a/nginx/Config.in +++ b/nginx/Config.in @@ -201,5 +201,46 @@ config NGINX_HTTP_SECURE_LINK bool prompt "Enable HTTP secure link module" default n + +config NGINX_HTTP_SUB + bool + prompt "Enable HTTP sub module" + default n + +config NGINX_HEADERS_MORE + bool + prompt "Enable Headers_more module" + help + Set and clear input and output headers...more than "add"! + default y + +config NGINX_HTTP_BROTLI + bool + prompt "Enable Brotli compression module" + help + Add support for brotli compression module. + default n + +config NGINX_STREAM + bool + prompt "Enable stream support" + help + Add support for stream module. + default y + +config NGINX_RTMP_MODULE + bool + prompt "Enable RTMP module" + depends on NGINX_SSL + help + Add support for NGINX-based Media Streaming Server module. + default n + +config NGINX_TS_MODULE + bool + prompt "Enable TS module" + help + Add support for MPEG-TS Live Module module. + default n endmenu diff --git a/nginx/Config_ssl.in b/nginx/Config_ssl.in new file mode 100644 index 000000000..90d8098d2 --- /dev/null +++ b/nginx/Config_ssl.in @@ -0,0 +1,238 @@ +# +# Copyright (C) 2010-2016 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +menu "Configuration" + depends on PACKAGE_nginx-ssl + +config NGINX_DAV + bool + prompt "Enable WebDAV module" + help + Enable the HTTP and WebDAV methods PUT, DELETE, MKCOL, COPY and MOVE. + default n + +config NGINX_FLV + bool + prompt "Enable FLV module" + help + Provides the ability to seek within FLV (Flash) files using time-based offsets. + default n + +config NGINX_STUB_STATUS + bool + prompt "Enable stub status module" + help + Enable the stub status module which gives some status from the server. + default n + +config NGINX_HTTP_CHARSET + bool + prompt "Enable HTTP charset module" + default y + +config NGINX_HTTP_GZIP + bool + prompt "Enable HTTP gzip module" + default y + +config NGINX_HTTP_SSI + bool + prompt "Enable HTTP ssi module" + default y + +config NGINX_HTTP_USERID + bool + prompt "Enable HTTP userid module" + default y + +config NGINX_HTTP_ACCESS + bool + prompt "Enable HTTP access module" + default y + +config NGINX_HTTP_AUTH_BASIC + bool + prompt "Enable HTTP auth basic" + default y + +config NGINX_HTTP_AUTH_REQUEST + bool + prompt "Enable HTTP auth request module" + default n + +config NGINX_HTTP_AUTOINDEX + bool + prompt "Enable HTTP autoindex module" + default y + +config NGINX_HTTP_GEO + bool + prompt "Enable HTTP geo module" + default y + +config NGINX_HTTP_MAP + bool + prompt "Enable HTTP map module" + default y + +config NGINX_HTTP_SPLIT_CLIENTS + bool + prompt "Enable HTTP split clients" + default y + +config NGINX_HTTP_REFERER + bool + prompt "Enable HTTP referer module" + default y + +config NGINX_HTTP_REWRITE + bool + prompt "Enable HTTP rewrite module" + select NGINX_PCRE + default y + +config NGINX_HTTP_PROXY + bool + prompt "Enable HTTP proxy module" + default y + +config NGINX_HTTP_FASTCGI + bool + prompt "Enable HTTP fastcgi module" + default y + +config NGINX_HTTP_UWSGI + bool + prompt "Enable HTTP uwsgi module" + default y + +config NGINX_HTTP_SCGI + bool + prompt "Enable HTTP scgi module" + default y + +config NGINX_HTTP_MEMCACHED + bool + prompt "Enable HTTP memcached module" + default y + +config NGINX_HTTP_LIMIT_CONN + bool + prompt "Enable HTTP limit conn" + default y + +config NGINX_HTTP_LIMIT_REQ + bool + prompt "Enable HTTP limit req" + default y + +config NGINX_HTTP_EMPTY_GIF + bool + prompt "Enable HTTP empty gif" + default y + +config NGINX_HTTP_BROWSER + bool + prompt "Enable HTTP browser module" + default y + +config NGINX_HTTP_UPSTREAM_HASH + bool + prompt "Enable HTTP hash module" + default y + +config NGINX_HTTP_UPSTREAM_IP_HASH + bool + prompt "Enable HTTP IP hash module" + default y + +config NGINX_HTTP_UPSTREAM_LEAST_CONN + bool + prompt "Enable HTTP least conn module" + default y + +config NGINX_HTTP_UPSTREAM_KEEPALIVE + bool + prompt "Enable HTTP keepalive module" + default y + +config NGINX_HTTP_CACHE + bool + prompt "Enable HTTP cache" + default y + +config NGINX_HTTP_V2 + bool + prompt "Enable HTTP_V2 module" + default n + +config NGINX_PCRE + bool + prompt "Enable PCRE library usage" + default y + +config NGINX_NAXSI + bool + prompt "Enable NAXSI module" + default y + +config NGINX_LUA + bool + prompt "Enable Lua module" + default n + +config NGINX_HTTP_REAL_IP + bool + prompt "Enable HTTP real ip module" + default n + +config NGINX_HTTP_SECURE_LINK + bool + prompt "Enable HTTP secure link module" + default n + +config NGINX_HTTP_SUB + bool + prompt "Enable HTTP sub module" + default n + +config NGINX_HEADERS_MORE + bool + prompt "Enable Headers_more module" + help + Set and clear input and output headers...more than "add"! + default y + +config NGINX_HTTP_BROTLI + bool + prompt "Enable Brotli compression module" + help + Add support for brotli compression module. + default n + +config NGINX_STREAM + bool + prompt "Enable stream module" + help + Add support for stream module. + default n + +config NGINX_RTMP_MODULE + bool + prompt "Enable RTMP module" + help + Add support for NGINX-based Media Streaming Server module. + default n + +config NGINX_TS_MODULE + bool + prompt "Enable TS module" + help + Add support for MPEG-TS Live Module module. + default n + +endmenu diff --git a/nginx/Makefile b/nginx/Makefile index 9c7206c89..763e41222 100644 --- a/nginx/Makefile +++ b/nginx/Makefile @@ -8,17 +8,20 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nginx -PKG_VERSION:=1.12.2 -PKG_RELEASE:=1 +PKG_VERSION:=1.15.1 +PKG_RELEASE:=5 PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://nginx.org/download/ -PKG_HASH:=305f379da1d5fb5aefa79e45c829852ca6983c7cd2a79328f8e084a324cf0416 -PKG_MAINTAINER:=Thomas Heil +PKG_HASH:=c7206858d7f832b8ef73a45c9b8f8e436bcb1ee88db2bc85b8e438ecec9d5460 + +PKG_MAINTAINER:=Thomas Heil \ + Ansuel Smith PKG_LICENSE:=2-clause BSD-like license -PKG_BUILD_DIR:=$(BUILD_DIR)/nginx-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_FIXUP:=autoreconf PKG_BUILD_PARALLEL:=1 PKG_INSTALL:=1 @@ -60,162 +63,276 @@ PKG_CONFIG_DEPENDS := \ CONFIG_NGINX_NAXSI \ CONFIG_NGINX_LUA \ CONFIG_NGINX_HTTP_REAL_IP \ - CONFIG_NGINX_HTTP_SECURE_LINK + CONFIG_NGINX_HTTP_SECURE_LINK \ + CONFIG_NGINX_HTTP_BROTLI \ + CONFIG_NGINX_STREAM \ + CONFIG_NGINX_HEADERS_MORE \ + CONFIG_NGINX_RTMP_MODULE \ + CONFIG_NGINX_TS_MODULE \ include $(INCLUDE_DIR)/package.mk -define Package/nginx +define Package/nginx/default SECTION:=net CATEGORY:=Network SUBMENU:=Web Servers/Proxies TITLE:=Nginx web server URL:=http://nginx.org/ - DEPENDS:=+NGINX_PCRE:libpcre +(NGINX_SSL||NGINX_HTTP_CACHE||NGINX_HTTP_AUTH_BASIC):libopenssl +NGINX_HTTP_GZIP:zlib +NGINX_LUA:liblua +libpthread - MENU:=1 + DEPENDS:=+NGINX_PCRE:libpcre +(NGINX_SSL||NGINX_HTTP_CACHE||NGINX_HTTP_AUTH_BASIC):libopenssl \ + +NGINX_HTTP_GZIP:zlib +NGINX_LUA:liblua +libpthread endef define Package/nginx/description - nginx is an HTTP and reverse proxy server, as well as a mail proxy server, - written by Igor Sysoev. + nginx is an HTTP and reverse proxy server, as well as a mail proxy server, \ + written by Igor Sysoev. (Some module require SSL module enable to show up in \ + config menu) endef +define Package/nginx + $(Package/nginx/default) + VARIANT:=no-ssl +endef + +define Package/nginx-ssl + $(Package/nginx/default) + TITLE += with SSL support + DEPENDS +=+libopenssl + VARIANT:=ssl + PROVIDES:=nginx +endef + +Package/nginx-ssl/description = $(Package/nginx/description) \ + This varian is compiled with SSL support enabled. To enable additional module \ + select them in the nginx default configuration menu. + +define Package/nginx-all-module + $(Package/nginx/default) + TITLE += with ALL module selected + DEPENDS:=+libpcre +libopenssl +zlib +liblua +libpthread + VARIANT:=all-module + PROVIDES:=nginx +endef + +Package/nginx-all-module/description = $(Package/nginx/description) \ + This varian is compiled with ALL module selected. + define Package/nginx/config source "$(SOURCE)/Config.in" endef +define Package/nginx-ssl/config + source "$(SOURCE)/Config_ssl.in" +endef + config_files=nginx.conf mime.types define Package/nginx/conffiles /etc/nginx/ endef +Package/nginx-ssl/conffiles = $(Package/nginx/conffiles) +Package/nginx-all-module/conffiles = $(Package/nginx/conffiles) + + ADDITIONAL_MODULES:= -ifeq ($(CONFIG_NGINX_NAXSI),y) - ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-naxsi/naxsi_src -endif -ifeq ($(CONFIG_NGINX_LUA),y) - ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/lua-nginx -endif -ifeq ($(CONFIG_IPV6),y) - ADDITIONAL_MODULES += --with-ipv6 -endif -ifeq ($(CONFIG_NGINX_STUB_STATUS),y) - ADDITIONAL_MODULES += --with-http_stub_status_module -endif -ifeq ($(CONFIG_NGINX_FLV),y) - ADDITIONAL_MODULES += --with-http_flv_module -endif -ifeq ($(CONFIG_NGINX_SSL),y) - ADDITIONAL_MODULES += --with-http_ssl_module -endif -ifeq ($(CONFIG_NGINX_DAV),y) - ADDITIONAL_MODULES += --with-http_dav_module -endif -ifneq ($(CONFIG_NGINX_HTTP_CACHE),y) - ADDITIONAL_MODULES += --without-http-cache -endif -ifneq ($(CONFIG_NGINX_PCRE),y) - ADDITIONAL_MODULES += --without-pcre -endif -ifneq ($(CONFIG_NGINX_HTTP_CHARSET),y) - ADDITIONAL_MODULES += --without-http_charset_module + +ifneq ($(BUILD_VARIANT),all-module) + ifneq ($(CONFIG_NGINX_HTTP_CACHE),y) + ADDITIONAL_MODULES += --without-http-cache + endif + ifneq ($(CONFIG_NGINX_PCRE),y) + ADDITIONAL_MODULES += --without-pcre + endif + ifneq ($(CONFIG_NGINX_HTTP_CHARSET),y) + ADDITIONAL_MODULES += --without-http_charset_module + else + config_files += koi-utf koi-win win-utf + endif + ifneq ($(CONFIG_NGINX_HTTP_GZIP),y) + ADDITIONAL_MODULES += --without-http_gzip_module + endif + ifneq ($(CONFIG_NGINX_HTTP_SSI),y) + ADDITIONAL_MODULES += --without-http_ssi_module + endif + ifneq ($(CONFIG_NGINX_HTTP_USERID),y) + ADDITIONAL_MODULES += --without-http_userid_module + endif + ifneq ($(CONFIG_NGINX_HTTP_ACCESS),y) + ADDITIONAL_MODULES += --without-http_access_module + endif + ifneq ($(CONFIG_NGINX_HTTP_AUTH_BASIC),y) + ADDITIONAL_MODULES += --without-http_auth_basic_module + endif + ifneq ($(CONFIG_NGINX_HTTP_AUTOINDEX),y) + ADDITIONAL_MODULES += --without-http_autoindex_module + endif + ifneq ($(CONFIG_NGINX_HTTP_GEO),y) + ADDITIONAL_MODULES += --without-http_geo_module + endif + ifneq ($(CONFIG_NGINX_HTTP_MAP),y) + ADDITIONAL_MODULES += --without-http_map_module + endif + ifneq ($(CONFIG_NGINX_HTTP_SPLIT_CLIENTS),y) + ADDITIONAL_MODULES += --without-http_split_clients_module + endif + ifneq ($(CONFIG_NGINX_HTTP_REFERER),y) + ADDITIONAL_MODULES += --without-http_referer_module + endif + ifneq ($(CONFIG_NGINX_HTTP_REWRITE),y) + ADDITIONAL_MODULES += --without-http_rewrite_module + endif + ifneq ($(CONFIG_NGINX_HTTP_PROXY),y) + ADDITIONAL_MODULES += --without-http_proxy_module + endif + ifneq ($(CONFIG_NGINX_HTTP_FASTCGI),y) + ADDITIONAL_MODULES += --without-http_fastcgi_module + else + config_files += fastcgi_params + endif + ifneq ($(CONFIG_NGINX_HTTP_UWSGI),y) + ADDITIONAL_MODULES += --without-http_uwsgi_module + endif + ifneq ($(CONFIG_NGINX_HTTP_SCGI),y) + ADDITIONAL_MODULES += --without-http_scgi_module + endif + ifneq ($(CONFIG_NGINX_HTTP_MEMCACHED),y) + ADDITIONAL_MODULES += --without-http_memcached_module + endif + ifneq ($(CONFIG_NGINX_HTTP_LIMIT_CONN),y) + ADDITIONAL_MODULES += --without-http_limit_conn_module + endif + ifneq ($(CONFIG_NGINX_HTTP_LIMIT_REQ),y) + ADDITIONAL_MODULES += --without-http_limit_req_module + endif + ifneq ($(CONFIG_NGINX_HTTP_EMPTY_GIF),y) + ADDITIONAL_MODULES += --without-http_empty_gif_module + endif + ifneq ($(CONFIG_NGINX_HTTP_BROWSER),y) + ADDITIONAL_MODULES += --without-http_browser_module + endif + ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_HASH),y) + ADDITIONAL_MODULES += --without-http_upstream_hash_module + endif + ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_IP_HASH),y) + ADDITIONAL_MODULES += --without-http_upstream_ip_hash_module + endif + ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_LEAST_CONN),y) + ADDITIONAL_MODULES += --without-http_upstream_least_conn_module + endif + ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_KEEPALIVE),y) + ADDITIONAL_MODULES += --without-http_upstream_keepalive_module + endif + + ifeq ($(BUILD_VARIANT),ssl) + ifneq ($(CONFIG_NGINX_SSL),y) + ADDITIONAL_MODULES += --with-http_ssl_module + endif + endif + + ifeq ($(CONFIG_NGINX_SSL),y) + ADDITIONAL_MODULES += --with-http_ssl_module + endif + ifeq ($(CONFIG_NGINX_NAXSI),y) + ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-naxsi/naxsi_src + endif + ifeq ($(CONFIG_NGINX_LUA),y) + ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/lua-nginx + endif + ifeq ($(CONFIG_IPV6),y) + ADDITIONAL_MODULES += --with-ipv6 + endif + ifeq ($(CONFIG_NGINX_STUB_STATUS),y) + ADDITIONAL_MODULES += --with-http_stub_status_module + endif + ifeq ($(CONFIG_NGINX_FLV),y) + ADDITIONAL_MODULES += --with-http_flv_module + endif + ifeq ($(CONFIG_NGINX_DAV),y) + ADDITIONAL_MODULES += --with-http_dav_module + endif + ifeq ($(CONFIG_NGINX_HTTP_AUTH_REQUEST),y) + ADDITIONAL_MODULES += --with-http_auth_request_module + endif + ifeq ($(CONFIG_NGINX_HTTP_V2),y) + ADDITIONAL_MODULES += --with-http_v2_module + endif + ifeq ($(CONFIG_NGINX_HTTP_REAL_IP),y) + ADDITIONAL_MODULES += --with-http_realip_module + endif + ifeq ($(CONFIG_NGINX_HTTP_SECURE_LINK),y) + ADDITIONAL_MODULES += --with-http_secure_link_module + endif + ifeq ($(CONFIG_NGINX_HTTP_SUB),y) + ADDITIONAL_MODULES += --with-http_sub_module + endif + ifeq ($(CONFIG_NGINX_HEADERS_MORE),y) + ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-headers-more + endif + ifeq ($(CONFIG_NGINX_HTTP_BROTLI),y) + ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-brotli + endif + ifeq ($(CONFIG_NGINX_STREAM),y) + ADDITIONAL_MODULES += --with-stream + endif + ifeq ($(CONFIG_NGINX_RTMP_MODULE),y) + ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-rtmp + endif + ifeq ($(CONFIG_NGINX_TS_MODULE),y) + ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-ts + endif else - config_files += koi-utf koi-win win-utf -endif -ifneq ($(CONFIG_NGINX_HTTP_GZIP),y) - ADDITIONAL_MODULES += --without-http_gzip_module -endif -ifneq ($(CONFIG_NGINX_HTTP_SSI),y) - ADDITIONAL_MODULES += --without-http_ssi_module -endif -ifneq ($(CONFIG_NGINX_HTTP_USERID),y) - ADDITIONAL_MODULES += --without-http_userid_module -endif -ifneq ($(CONFIG_NGINX_HTTP_ACCESS),y) - ADDITIONAL_MODULES += --without-http_access_module -endif -ifneq ($(CONFIG_NGINX_HTTP_AUTH_BASIC),y) - ADDITIONAL_MODULES += --without-http_auth_basic_module -endif -ifeq ($(CONFIG_NGINX_HTTP_AUTH_REQUEST),y) - ADDITIONAL_MODULES += --with-http_auth_request_module -endif -ifneq ($(CONFIG_NGINX_HTTP_AUTOINDEX),y) - ADDITIONAL_MODULES += --without-http_autoindex_module -endif -ifneq ($(CONFIG_NGINX_HTTP_GEO),y) - ADDITIONAL_MODULES += --without-http_geo_module -endif -ifneq ($(CONFIG_NGINX_HTTP_MAP),y) - ADDITIONAL_MODULES += --without-http_map_module -endif -ifneq ($(CONFIG_NGINX_HTTP_SPLIT_CLIENTS),y) - ADDITIONAL_MODULES += --without-http_split_clients_module -endif -ifneq ($(CONFIG_NGINX_HTTP_REFERER),y) - ADDITIONAL_MODULES += --without-http_referer_module -endif -ifneq ($(CONFIG_NGINX_HTTP_REWRITE),y) - ADDITIONAL_MODULES += --without-http_rewrite_module -endif -ifneq ($(CONFIG_NGINX_HTTP_PROXY),y) - ADDITIONAL_MODULES += --without-http_proxy_module -endif -ifneq ($(CONFIG_NGINX_HTTP_FASTCGI),y) - ADDITIONAL_MODULES += --without-http_fastcgi_module -else - config_files += fastcgi_params -endif -ifneq ($(CONFIG_NGINX_HTTP_UWSGI),y) - ADDITIONAL_MODULES += --without-http_uwsgi_module -endif -ifneq ($(CONFIG_NGINX_HTTP_SCGI),y) - ADDITIONAL_MODULES += --without-http_scgi_module -endif -ifneq ($(CONFIG_NGINX_HTTP_MEMCACHED),y) - ADDITIONAL_MODULES += --without-http_memcached_module -endif -ifneq ($(CONFIG_NGINX_HTTP_LIMIT_CONN),y) - ADDITIONAL_MODULES += --without-http_limit_conn_module -endif -ifneq ($(CONFIG_NGINX_HTTP_LIMIT_REQ),y) - ADDITIONAL_MODULES += --without-http_limit_req_module -endif -ifneq ($(CONFIG_NGINX_HTTP_EMPTY_GIF),y) - ADDITIONAL_MODULES += --without-http_empty_gif_module -endif -ifneq ($(CONFIG_NGINX_HTTP_BROWSER),y) - ADDITIONAL_MODULES += --without-http_browser_module -endif -ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_HASH),y) - ADDITIONAL_MODULES += --without-http_upstream_hash_module -endif -ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_IP_HASH),y) - ADDITIONAL_MODULES += --without-http_upstream_ip_hash_module -endif -ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_LEAST_CONN),y) - ADDITIONAL_MODULES += --without-http_upstream_least_conn_module -endif -ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_KEEPALIVE),y) - ADDITIONAL_MODULES += --without-http_upstream_keepalive_module -endif -ifeq ($(CONFIG_NGINX_HTTP_V2),y) - ADDITIONAL_MODULES += --with-http_v2_module -endif -ifeq ($(CONFIG_NGINX_HTTP_REAL_IP),y) - ADDITIONAL_MODULES += --with-http_realip_module -endif -ifeq ($(CONFIG_NGINX_HTTP_SECURE_LINK),y) - ADDITIONAL_MODULES += --with-http_secure_link_module + CONFIG_NGINX_HEADERS_MORE:=y + CONFIG_NGINX_HTTP_BROTLI:=y + CONFIG_NGINX_RTMP_MODULE:=y + CONFIG_NGINX_TS_MODULE:=y + CONFIG_NGINX_NAXSI:=y + CONFIG_NGINX_LUA:=y + ADDITIONAL_MODULES += --with-http_ssl_module --add-module=$(PKG_BUILD_DIR)/nginx-naxsi/naxsi_src \ + --add-module=$(PKG_BUILD_DIR)/lua-nginx --with-ipv6 --with-http_stub_status_module --with-http_flv_module \ + --with-http_dav_module --with-stream --with-http_auth_request_module --with-http_v2_module --with-http_realip_module \ + --with-http_secure_link_module --with-http_sub_module --add-module=$(PKG_BUILD_DIR)/nginx-headers-more \ + --add-module=$(PKG_BUILD_DIR)/nginx-brotli --add-module=$(PKG_BUILD_DIR)/nginx-rtmp \ + --add-module=$(PKG_BUILD_DIR)/nginx-ts + config_files += koi-utf koi-win win-utf fastcgi_params endif +define Package/nginx-mod-luci/default + TITLE:=Nginx on LuCI + SECTION:=net + CATEGORY:=Network + SUBMENU:=Web Servers/Proxies + TITLE:=Support file for Nginx + URL:=http://nginx.org/ + DEPENDS:=+uwsgi-cgi +uwsgi-cgi-luci-support +endef + +define Package/nginx-mod-luci + $(Package/nginx-mod-luci/default) + DEPENDS += +nginx +endef + +define Package/nginx-mod-luci/description + Support file for LuCI in nginx. Include custom nginx configuration, autostart script for uwsgi. +endef + +define Package/nginx-mod-luci-ssl + $(Package/nginx-mod-luci/default) + TITLE += with HTTPS support + DEPENDS += +nginx-ssl +endef + +Package/nginx-mod-luci-ssl/description = $(define Package/nginx-mod-luci/description) \ + This also include redirect from http to https and cert autogeneration. + TARGET_CFLAGS += -fvisibility=hidden -ffunction-sections -fdata-sections -DNGX_LUA_NO_BY_LUA_BLOCK -DNGX_HAVE_GCC_ATOMIC TARGET_LDFLAGS += -Wl,--gc-sections -define Build/Configure - ( cd $(PKG_BUILD_DIR) ; \ - $(if $(CONFIG_NGINX_LUA),LUA_INC=$(STAGING_DIR)/usr/include LUA_LIB=$(STAGING_DIR)/usr/lib) \ - ./configure \ +ifeq ($(CONFIG_NGINX_LUA),y) + CONFIGURE_VARS += LUA_INC=$(STAGING_DIR)/usr/include \ + LUA_LIB=$(STAGING_DIR)/usr/lib +endif + +CONFIGURE_ARGS += \ --crossbuild=Linux::$(ARCH) \ --prefix=/usr \ --conf-path=/etc/nginx/nginx.conf \ @@ -230,8 +347,22 @@ define Build/Configure --with-cc="$(TARGET_CC)" \ --with-cc-opt="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \ --with-ld-opt="$(TARGET_LDFLAGS)" \ - --without-http_upstream_zone_module \ - ) + --without-http_upstream_zone_module + +define Package/nginx-mod-luci/install + $(INSTALL_DIR) $(1)/etc/nginx + $(INSTALL_BIN) ./files-luci-support/luci_uwsgi.conf $(1)/etc/nginx/luci_uwsgi.conf + $(INSTALL_BIN) ./files-luci-support/luci_nginx.conf $(1)/etc/nginx/luci_nginx.conf + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_BIN) ./files-luci-support/60_nginx-luci-support $(1)/etc/uci-defaults/60_nginx-luci-support +endef + +define Package/nginx-mod-luci-ssl/install + $(Package/nginx-mod-luci/install) + $(INSTALL_DIR) $(1)/etc/nginx + $(INSTALL_BIN) ./files-luci-support/luci_nginx_ssl.conf $(1)/etc/nginx/luci_nginx_ssl.conf + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_BIN) ./files-luci-support/70_nginx-luci-support-ssl $(1)/etc/uci-defaults/70_nginx-luci-support-ssl endef define Package/nginx/install @@ -250,37 +381,130 @@ endif $(if $(CONFIG_NGINX_NAXSI),$(chmod 0640 $(1)/etc/nginx/naxsi_core.rules)) endef +Package/nginx-ssl/install = $(Package/nginx/install) +Package/nginx-all-module/install = $(Package/nginx/install) + define Build/Prepare - $(call Build/Prepare/Default) - $(if $(CONFIG_NGINX_NAXSI),$(call Prepare/nginx-naxsi)) - $(if $(CONFIG_NGINX_LUA),$(call Prepare/lua-nginx)) + $(Build/Prepare/Default) + $(Prepare/nginx-naxsi) + $(Prepare/lua-nginx) + $(Prepare/nginx-brotli) + $(Prepare/nginx-headers-more) + $(Prepare/nginx-rtmp) + $(Prepare/nginx-ts) endef -define Download/nginx-naxsi - VERSION:=cf73f9c8664127252c2a4958d2e169516d3845a1 - SUBDIR:=nginx-naxsi - FILE:=nginx-naxsi-module-$(PKG_VERSION)-$$(VERSION).tar.gz - URL:=https://github.com/nbs-system/naxsi.git - PROTO:=git -endef -define Prepare/nginx-naxsi - $(eval $(call Download,nginx-naxsi)) +ifeq ($(CONFIG_NGINX_HEADERS_MORE),y) + define Download/nginx-headers-more + VERSION:=a9f7c7e86cc7441d04e2f11f01c2e3a9c4b0301d + SUBDIR:=nginx-headers-more + FILE:=headers-more-nginx-module-$(PKG_VERSION)-$$(VERSION).tar.gz + URL:=https://github.com/openresty/headers-more-nginx-module.git + MIRROR_HASH:=432609015719aaa7241e5166c7cda427acbe004f725887f78ef629d51bd9cb3f + PROTO:=git + endef + $(eval $(call Download,nginx-headers-more)) + + define Prepare/nginx-headers-more + $(eval $(Download/nginx-headers-more)) gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) -endef + endef +endif -define Download/lua-nginx - VERSION:=cdd2ae921f67bf396c743406493127be496e57ce - SUBDIR:=lua-nginx - FILE:=lua-nginx-module-$(PKG_VERSION)-$$(VERSION).tar.gz - URL:=https://github.com/openresty/lua-nginx-module.git - PROTO:=git -endef -define Prepare/lua-nginx - $(eval $(call Download,lua-nginx)) +ifeq ($(CONFIG_NGINX_HTTP_BROTLI),y) + define Download/nginx-brotli + VERSION:=e26248ee361c04e25f581b92b85d95681bdffb39 + SUBDIR:=nginx-brotli + FILE:=ngx-brotli-module-$(PKG_VERSION)-$$(VERSION).tar.gz + URL:=https://github.com/eustas/ngx_brotli.git + MIRROR_HASH:=76b891ba49f82f0cfbc9cba875646e26ee986b522373e0aa2698a9923a4adcdb + PROTO:=git + endef + $(eval $(call Download,nginx-brotli)) + + define Prepare/nginx-brotli + $(eval $(Download/nginx-brotli)) + gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) + endef +endif + + +ifeq ($(CONFIG_NGINX_RTMP_MODULE),y) + define Download/nginx-rtmp + VERSION:=791b6136f02bc9613daf178723ac09f4df5a3bbf + SUBDIR:=nginx-rtmp + FILE:=ngx-rtmp-module-$(PKG_VERSION)-$$(VERSION).tar.gz + URL:=https://github.com/arut/nginx-rtmp-module.git + MIRROR_HASH:=8db3f7b545ce98f47415e0436e12dfb55ae787afd3cd9515b5642c7b9dc0ef00 + PROTO:=git + endef + $(eval $(call Download,nginx-rtmp)) + + define Prepare/nginx-rtmp + $(eval $(call Download,nginx-rtmp)) + gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) + endef +endif + + +ifeq ($(CONFIG_NGINX_TS_MODULE),y) + define Download/nginx-ts + VERSION:=ef2f874d95cc75747eb625a292524a702aefb0fd + SUBDIR:=nginx-ts + FILE:=ngx-ts-module-$(PKG_VERSION)-$$(VERSION).tar.gz + URL:=https://github.com/arut/nginx-ts-module.git + MIRROR_HASH:=31ecc9968b928886b54884138eafe2fa747648bca5094d4c3132e8ae9509d1d3 + PROTO:=git + endef + $(eval $(call Download,nginx-ts)) + + define Prepare/nginx-ts + $(eval $(call Download,nginx-ts)) + gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) + endef +endif + + +ifeq ($(CONFIG_NGINX_NAXSI),y) + define Download/nginx-naxsi + VERSION:=951123ad456bdf5ac94e8d8819342fe3d49bc002 + SUBDIR:=nginx-naxsi + FILE:=nginx-naxsi-module-$(PKG_VERSION)-$$(VERSION).tar.gz + URL:=https://github.com/nbs-system/naxsi.git + MIRROR_HASH:=7ab791f2ff38096f48013141bbfe20ba213d5e04dcac08ca82e0cac07d5c30f0 + PROTO:=git + endef + $(eval $(call Download,nginx-naxsi)) + + define Prepare/nginx-naxsi + $(eval $(Download/nginx-naxsi)) + gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) + endef +endif + + +ifeq ($(CONFIG_NGINX_LUA),y) + define Download/lua-nginx + VERSION:=576a10d246daf81c0ce1b959c50ee807769c01a8 + SUBDIR:=lua-nginx + FILE:=lua-nginx-module-$(PKG_VERSION)-$$(VERSION).tar.gz + URL:=https://github.com/openresty/lua-nginx-module.git + MIRROR_HASH:=85ab2fc752d4e09f266209fdec507b30c57bb966c34bbff148cf3459ae5cac80 + PROTO:=git + endef + $(eval $(call Download,lua-nginx)) + + define Prepare/lua-nginx + $(eval $(Download/lua-nginx)) gzip -dc $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) $(call PatchDir,$(PKG_BUILD_DIR),./patches-lua-nginx) -endef + endef +endif $(eval $(call BuildPackage,nginx)) +$(eval $(call BuildPackage,nginx-ssl)) +$(eval $(call BuildPackage,nginx-all-module)) +$(eval $(call BuildPackage,nginx-mod-luci)) +$(eval $(call BuildPackage,nginx-mod-luci-ssl)) diff --git a/nginx/files-luci-support/60_nginx-luci-support b/nginx/files-luci-support/60_nginx-luci-support new file mode 100644 index 000000000..dd076d260 --- /dev/null +++ b/nginx/files-luci-support/60_nginx-luci-support @@ -0,0 +1,28 @@ +#!/bin/sh + +if [ -f "/etc/nginx/luci_nginx.conf" ] && [ -f "/etc/nginx/nginx.conf" ]; then + if [ ! "$(cat '/etc/nginx/nginx.conf' | grep 'luci_uwsgi.conf')" ]; then + mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf_old + mv /etc/nginx/luci_nginx.conf /etc/nginx/nginx.conf + core_number=$(grep -c ^processor /proc/cpuinfo) + sed -i "3s/.*/worker_processes "$core_number";/" /etc/nginx/nginx.conf + if [ -n "$(pgrep uhttpd)" ]; then + /etc/init.d/uhttpd stop + /etc/init.d/uhttpd disable + fi + if [ -n "$(pgrep nginx)" ]; then + /etc/init.d/nginx restart + else + /etc/init.d/nginx start + fi + if [ -n "$(pgrep uwsgi)" ]; then + /etc/init.d/uwsgi restart + else + /etc/init.d/uwsgi start + fi + else + rm /etc/nginx/luci_nginx.conf + fi +fi + +exit 0 diff --git a/nginx/files-luci-support/70_nginx-luci-support-ssl b/nginx/files-luci-support/70_nginx-luci-support-ssl new file mode 100644 index 000000000..76ce3a819 --- /dev/null +++ b/nginx/files-luci-support/70_nginx-luci-support-ssl @@ -0,0 +1,48 @@ +#!/bin/sh + + +if [ -f "/etc/nginx/luci_nginx_ssl.conf" ] && [ -f "/etc/nginx/nginx.conf" ]; then + if [ ! "$(cat '/etc/nginx/nginx.conf' | grep 'return 301 https://$host$request_uri;')" ]; then + if [ -f "/etc/nginx/nginx.conf_old" ]; then + rm /etc/nginx/nginx.conf + else + mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf_old + fi + mv /etc/nginx/luci_nginx_ssl.conf /etc/nginx/nginx.conf + core_number=$(grep -c ^processor /proc/cpuinfo) + sed -i "3s/.*/worker_processes "$core_number";/" /etc/nginx/nginx.conf + if [ -n "$(pgrep nginx)" ]; then + /etc/init.d/nginx restart + else + /etc/init.d/nginx start + fi + else + rm /etc/nginx/luci_nginx_ssl.conf + fi +fi + + +if [ ! -f "/etc/nginx/nginx.key" ]; then + + NGINX_KEY=/etc/nginx/nginx.key + NGINX_CER=/etc/nginx/nginx.cer + OPENSSL_BIN=/usr/bin/openssl + PX5G_BIN=/usr/sbin/px5g + + # Prefer px5g for certificate generation (existence evaluated last) + GENKEY_CMD="" + UNIQUEID=$(dd if=/dev/urandom bs=1 count=4 | hexdump -e '1/1 "%02x"') + [ -x "$OPENSSL_BIN" ] && GENKEY_CMD="$OPENSSL_BIN req -x509 -nodes" + [ -x "$PX5G_BIN" ] && GENKEY_CMD="$PX5G_BIN selfsigned" + [ -n "$GENKEY_CMD" ] && { + $GENKEY_CMD \ + -days 730 -newkey rsa:2048 -keyout "${NGINX_KEY}.new" -out "${NGINX_CER}.new" \ + -subj /C="ZZ"/ST="Somewhere"/L="Unknown"/O="OpenWrt""$UNIQUEID"/CN="OpenWrt" + sync + mv "${NGINX_KEY}.new" "${NGINX_KEY}" + mv "${NGINX_CER}.new" "${NGINX_CER}" + } +fi + + +exit 0 diff --git a/nginx/files-luci-support/luci_nginx.conf b/nginx/files-luci-support/luci_nginx.conf new file mode 100644 index 000000000..53d4ab6c7 --- /dev/null +++ b/nginx/files-luci-support/luci_nginx.conf @@ -0,0 +1,55 @@ + +user nobody nogroup; +worker_processes 1; + +#error_log logs/error.log; +#error_log logs/error.log notice; +#error_log logs/error.log info; + +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include mime.types; + default_type application/octet-stream; + + sendfile on; + keepalive_timeout 0; + + client_body_buffer_size 10K; + client_header_buffer_size 1k; + client_max_body_size 1G; + large_client_header_buffers 2 1k; + + gzip on; + gzip_http_version 1.1; + gzip_vary on; + gzip_comp_level 1; + gzip_proxied any; + + root /www; + + server { + listen 80 default_server; + listen [::]:80 default_server; + server_name localhost; + + location ~* .(jpg|jpeg|png|gif|ico|css|js)$ { + expires 365d; + } + + location / { + index index.html; + include luci_uwsgi.conf; + } + + location /luci-static { + + } + } +} \ No newline at end of file diff --git a/nginx/files-luci-support/luci_nginx_ssl.conf b/nginx/files-luci-support/luci_nginx_ssl.conf new file mode 100644 index 000000000..4647fecbf --- /dev/null +++ b/nginx/files-luci-support/luci_nginx_ssl.conf @@ -0,0 +1,70 @@ + +user root; +worker_processes 1; + +#error_log logs/error.log; +#error_log logs/error.log notice; +#error_log logs/error.log info; + +pid /var/run/nginx.pid; + + +events { + worker_connections 1024; +} + + +http { + include mime.types; + default_type application/octet-stream; + + sendfile on; + keepalive_timeout 0; + + client_body_buffer_size 10K; + client_header_buffer_size 1k; + client_max_body_size 1G; + large_client_header_buffers 2 1k; + + gzip on; + gzip_http_version 1.1; + gzip_vary on; + gzip_comp_level 1; + gzip_proxied any; + + root /www; + + server { + listen 80 default_server; + listen [::]:80 default_server; + server_name _; + return 301 https://$host$request_uri; + } + + server { + listen 443 ssl default_server; + listen [::]:443 ssl default_server; + server_name localhost; + + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_prefer_server_ciphers on; + ssl_ciphers "EECDH+ECDSA+AESGCM:EECDH+aRSA+AESGCM:EECDH+ECDSA+SHA384:EECDH+ECDSA+SHA256:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:DHE+AESGCM:DHE:!RSA!aNULL:!eNULL:!LOW:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!CAMELLIA:!SEED"; + ssl_session_tickets off; + + ssl_certificate /etc/nginx/nginx.cer; + ssl_certificate_key /etc/nginx/nginx.key; + + location ~* .(jpg|jpeg|png|gif|ico|css|js)$ { + expires 365d; + } + + location / { + index index.html; + include luci_uwsgi.conf; + } + + location /luci-static { + + } + } +} \ No newline at end of file diff --git a/nginx/files-luci-support/luci_uwsgi.conf b/nginx/files-luci-support/luci_uwsgi.conf new file mode 100644 index 000000000..eec66f4ad --- /dev/null +++ b/nginx/files-luci-support/luci_uwsgi.conf @@ -0,0 +1,14 @@ +uwsgi_param QUERY_STRING $query_string; +uwsgi_param REQUEST_METHOD $request_method; +uwsgi_param CONTENT_TYPE $content_type; +uwsgi_param CONTENT_LENGTH $content_length if_not_empty; +uwsgi_param REQUEST_URI $request_uri; +uwsgi_param PATH_INFO $document_uri; +uwsgi_param SERVER_PROTOCOL $server_protocol; +uwsgi_param REMOTE_ADDR $remote_addr; +uwsgi_param REMOTE_PORT $remote_port; +uwsgi_param SERVER_ADDR $server_addr; +uwsgi_param SERVER_PORT $server_port; +uwsgi_param SERVER_NAME $server_name; +uwsgi_modifier1 9; +uwsgi_pass unix:////var/run/uwsgi.sock; \ No newline at end of file diff --git a/nginx/patches-lua-nginx/100-no_by_lua_block.patch b/nginx/patches-lua-nginx/100-no_by_lua_block.patch index fef983fa7..968e12d58 100644 --- a/nginx/patches-lua-nginx/100-no_by_lua_block.patch +++ b/nginx/patches-lua-nginx/100-no_by_lua_block.patch @@ -1,6 +1,6 @@ --- a/lua-nginx/src/ngx_http_lua_module.c +++ b/lua-nginx/src/ngx_http_lua_module.c -@@ -157,14 +157,14 @@ static ngx_command_t ngx_http_lua_cmds[] +@@ -165,14 +165,14 @@ static ngx_command_t ngx_http_lua_cmds[] NGX_HTTP_LOC_CONF_OFFSET, offsetof(ngx_http_lua_loc_conf_t, log_socket_errors), NULL }, @@ -17,7 +17,7 @@ { ngx_string("init_by_lua"), NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1, ngx_http_lua_init_by_lua, -@@ -178,14 +178,14 @@ static ngx_command_t ngx_http_lua_cmds[] +@@ -186,14 +186,14 @@ static ngx_command_t ngx_http_lua_cmds[] NGX_HTTP_MAIN_CONF_OFFSET, 0, (void *) ngx_http_lua_init_by_file }, @@ -34,7 +34,7 @@ { ngx_string("init_worker_by_lua"), NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1, ngx_http_lua_init_worker_by_lua, -@@ -201,6 +201,7 @@ static ngx_command_t ngx_http_lua_cmds[] +@@ -209,6 +209,7 @@ static ngx_command_t ngx_http_lua_cmds[] (void *) ngx_http_lua_init_worker_by_file }, #if defined(NDK) && NDK @@ -42,7 +42,7 @@ /* set_by_lua $res { inline Lua code } [$arg1 [$arg2 [...]]] */ { ngx_string("set_by_lua_block"), NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF -@@ -209,7 +210,7 @@ static ngx_command_t ngx_http_lua_cmds[] +@@ -217,7 +218,7 @@ static ngx_command_t ngx_http_lua_cmds[] NGX_HTTP_LOC_CONF_OFFSET, 0, (void *) ngx_http_lua_filter_set_by_lua_inline }, @@ -51,7 +51,7 @@ /* set_by_lua $res [$arg1 [$arg2 [...]]] */ { ngx_string("set_by_lua"), NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF -@@ -237,7 +238,7 @@ static ngx_command_t ngx_http_lua_cmds[] +@@ -245,7 +246,7 @@ static ngx_command_t ngx_http_lua_cmds[] NGX_HTTP_LOC_CONF_OFFSET, 0, (void *) ngx_http_lua_rewrite_handler_inline }, @@ -60,7 +60,7 @@ /* rewrite_by_lua_block { } */ { ngx_string("rewrite_by_lua_block"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF -@@ -246,7 +247,7 @@ static ngx_command_t ngx_http_lua_cmds[] +@@ -254,7 +255,7 @@ static ngx_command_t ngx_http_lua_cmds[] NGX_HTTP_LOC_CONF_OFFSET, 0, (void *) ngx_http_lua_rewrite_handler_inline }, @@ -69,7 +69,7 @@ /* access_by_lua "" */ { ngx_string("access_by_lua"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF -@@ -255,7 +256,7 @@ static ngx_command_t ngx_http_lua_cmds[] +@@ -263,7 +264,7 @@ static ngx_command_t ngx_http_lua_cmds[] NGX_HTTP_LOC_CONF_OFFSET, 0, (void *) ngx_http_lua_access_handler_inline }, @@ -78,7 +78,7 @@ /* access_by_lua_block { } */ { ngx_string("access_by_lua_block"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF -@@ -264,7 +265,7 @@ static ngx_command_t ngx_http_lua_cmds[] +@@ -272,7 +273,7 @@ static ngx_command_t ngx_http_lua_cmds[] NGX_HTTP_LOC_CONF_OFFSET, 0, (void *) ngx_http_lua_access_handler_inline }, @@ -87,7 +87,7 @@ /* content_by_lua "" */ { ngx_string("content_by_lua"), NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1, -@@ -272,7 +273,7 @@ static ngx_command_t ngx_http_lua_cmds[] +@@ -280,7 +281,7 @@ static ngx_command_t ngx_http_lua_cmds[] NGX_HTTP_LOC_CONF_OFFSET, 0, (void *) ngx_http_lua_content_handler_inline }, @@ -96,7 +96,7 @@ /* content_by_lua_block { } */ { ngx_string("content_by_lua_block"), NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS, -@@ -280,7 +281,7 @@ static ngx_command_t ngx_http_lua_cmds[] +@@ -288,7 +289,7 @@ static ngx_command_t ngx_http_lua_cmds[] NGX_HTTP_LOC_CONF_OFFSET, 0, (void *) ngx_http_lua_content_handler_inline }, @@ -105,7 +105,7 @@ /* log_by_lua */ { ngx_string("log_by_lua"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF -@@ -289,7 +290,7 @@ static ngx_command_t ngx_http_lua_cmds[] +@@ -297,7 +298,7 @@ static ngx_command_t ngx_http_lua_cmds[] NGX_HTTP_LOC_CONF_OFFSET, 0, (void *) ngx_http_lua_log_handler_inline }, @@ -114,7 +114,7 @@ /* log_by_lua_block { } */ { ngx_string("log_by_lua_block"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF -@@ -298,7 +299,7 @@ static ngx_command_t ngx_http_lua_cmds[] +@@ -306,7 +307,7 @@ static ngx_command_t ngx_http_lua_cmds[] NGX_HTTP_LOC_CONF_OFFSET, 0, (void *) ngx_http_lua_log_handler_inline }, @@ -123,7 +123,7 @@ { ngx_string("rewrite_by_lua_file"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF |NGX_CONF_TAKE1, -@@ -353,7 +354,7 @@ static ngx_command_t ngx_http_lua_cmds[] +@@ -361,7 +362,7 @@ static ngx_command_t ngx_http_lua_cmds[] NGX_HTTP_LOC_CONF_OFFSET, 0, (void *) ngx_http_lua_header_filter_inline }, @@ -132,7 +132,7 @@ /* header_filter_by_lua_block { } */ { ngx_string("header_filter_by_lua_block"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF -@@ -362,7 +363,7 @@ static ngx_command_t ngx_http_lua_cmds[] +@@ -370,7 +371,7 @@ static ngx_command_t ngx_http_lua_cmds[] NGX_HTTP_LOC_CONF_OFFSET, 0, (void *) ngx_http_lua_header_filter_inline }, @@ -141,7 +141,7 @@ { ngx_string("header_filter_by_lua_file"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF |NGX_CONF_TAKE1, -@@ -378,7 +379,7 @@ static ngx_command_t ngx_http_lua_cmds[] +@@ -386,7 +387,7 @@ static ngx_command_t ngx_http_lua_cmds[] NGX_HTTP_LOC_CONF_OFFSET, 0, (void *) ngx_http_lua_body_filter_inline }, @@ -150,7 +150,7 @@ /* body_filter_by_lua_block { } */ { ngx_string("body_filter_by_lua_block"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF -@@ -387,7 +388,7 @@ static ngx_command_t ngx_http_lua_cmds[] +@@ -395,7 +396,7 @@ static ngx_command_t ngx_http_lua_cmds[] NGX_HTTP_LOC_CONF_OFFSET, 0, (void *) ngx_http_lua_body_filter_inline }, @@ -159,7 +159,7 @@ { ngx_string("body_filter_by_lua_file"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF |NGX_CONF_TAKE1, -@@ -395,14 +396,14 @@ static ngx_command_t ngx_http_lua_cmds[] +@@ -403,14 +404,14 @@ static ngx_command_t ngx_http_lua_cmds[] NGX_HTTP_LOC_CONF_OFFSET, 0, (void *) ngx_http_lua_body_filter_file }, @@ -176,7 +176,7 @@ { ngx_string("balancer_by_lua_file"), NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1, ngx_http_lua_balancer_by_lua, -@@ -509,14 +510,14 @@ static ngx_command_t ngx_http_lua_cmds[] +@@ -517,14 +518,14 @@ static ngx_command_t ngx_http_lua_cmds[] NGX_HTTP_LOC_CONF_OFFSET, offsetof(ngx_http_lua_loc_conf_t, ssl_ciphers), NULL }, diff --git a/nginx/patches/101-feature_test_fix.patch b/nginx/patches/101-feature_test_fix.patch index 2c692bc79..930e7da98 100644 --- a/nginx/patches/101-feature_test_fix.patch +++ b/nginx/patches/101-feature_test_fix.patch @@ -11,7 +11,7 @@ ngx_feature_libs= --- a/auto/cc/conf +++ b/auto/cc/conf -@@ -200,7 +200,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then +@@ -204,7 +204,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then else ngx_feature="C99 variadic macros" ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS" @@ -20,7 +20,7 @@ ngx_feature_incs="#include #define var(dummy, ...) sprintf(__VA_ARGS__)" ngx_feature_path= -@@ -214,7 +214,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then +@@ -218,7 +218,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then ngx_feature="gcc variadic macros" ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS" @@ -40,7 +40,7 @@ ngx_feature_incs="#include " ngx_feature_path= ngx_feature_libs= -@@ -93,7 +93,7 @@ ngx_feature_test="int fd; struct stat sb +@@ -110,7 +110,7 @@ ngx_feature_test="int fd; struct stat sb CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE" ngx_feature="sendfile()" ngx_feature_name="NGX_HAVE_SENDFILE" @@ -49,7 +49,7 @@ ngx_feature_incs="#include #include " ngx_feature_path= -@@ -114,7 +114,7 @@ fi +@@ -131,7 +131,7 @@ fi CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" ngx_feature="sendfile64()" ngx_feature_name="NGX_HAVE_SENDFILE64" @@ -58,7 +58,7 @@ ngx_feature_incs="#include #include " ngx_feature_path= -@@ -132,7 +132,7 @@ ngx_include="sys/prctl.h"; . auto/includ +@@ -149,7 +149,7 @@ ngx_include="sys/prctl.h"; . auto/includ ngx_feature="prctl(PR_SET_DUMPABLE)" ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE" @@ -69,7 +69,7 @@ ngx_feature_libs= --- a/auto/unix +++ b/auto/unix -@@ -735,7 +735,7 @@ ngx_feature_test="void *p; p = memalign( +@@ -840,7 +840,7 @@ ngx_feature_test="void *p; p = memalign( ngx_feature="mmap(MAP_ANON|MAP_SHARED)" ngx_feature_name="NGX_HAVE_MAP_ANON" @@ -78,7 +78,7 @@ ngx_feature_incs="#include " ngx_feature_path= ngx_feature_libs= -@@ -748,7 +748,7 @@ ngx_feature_test="void *p; +@@ -853,7 +853,7 @@ ngx_feature_test="void *p; ngx_feature='mmap("/dev/zero", MAP_SHARED)' ngx_feature_name="NGX_HAVE_MAP_DEVZERO" @@ -87,7 +87,7 @@ ngx_feature_incs="#include #include #include " -@@ -763,7 +763,7 @@ ngx_feature_test='void *p; int fd; +@@ -868,7 +868,7 @@ ngx_feature_test='void *p; int fd; ngx_feature="System V shared memory" ngx_feature_name="NGX_HAVE_SYSVSHM" @@ -96,7 +96,7 @@ ngx_feature_incs="#include #include " ngx_feature_path= -@@ -777,7 +777,7 @@ ngx_feature_test="int id; +@@ -882,7 +882,7 @@ ngx_feature_test="int id; ngx_feature="POSIX semaphores" ngx_feature_name="NGX_HAVE_POSIX_SEM" diff --git a/nginx/patches/102-sizeof_test_fix.patch b/nginx/patches/102-sizeof_test_fix.patch index 8a0e88200..7d2430eab 100644 --- a/nginx/patches/102-sizeof_test_fix.patch +++ b/nginx/patches/102-sizeof_test_fix.patch @@ -16,7 +16,7 @@ return 0; } -@@ -40,7 +45,7 @@ eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>& +@@ -40,7 +46,7 @@ eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>& if [ -x $NGX_AUTOTEST ]; then diff --git a/nginx/patches/201-ignore-invalid-options.patch b/nginx/patches/201-ignore-invalid-options.patch new file mode 100644 index 000000000..82180239d --- /dev/null +++ b/nginx/patches/201-ignore-invalid-options.patch @@ -0,0 +1,12 @@ +--- a/auto/options ++++ b/auto/options +@@ -391,8 +391,7 @@ + --test-build-solaris-sendfilev) NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;; + + *) +- echo "$0: error: invalid option \"$option\"" +- exit 1 ++ echo "$0: error: ignoring invalid option \"$option\"" + ;; + esac + done diff --git a/omr-6in4/Makefile b/omr-6in4/Makefile new file mode 100644 index 000000000..8d9a1b693 --- /dev/null +++ b/omr-6in4/Makefile @@ -0,0 +1,33 @@ +# +# Copyright (C) 2018 Ycarus (Yannick Chabanois) +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=omr-6in4 +PKG_VERSION:=0.4 +PKG_RELEASE:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/$(PKG_NAME) +SECTION:=OMR +CATEGORY:=OpenMPTCProuter +TITLE:=OpenMPTCProuter 6in4 +endef + +define Package/$(PKG_NAME)/description +OpenMPTCProuter 6in4 package +endef + +define Build/Compile +endef + +define Package/$(PKG_NAME)/install + $(CP) ./files/* $(1)/ +endef + +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/omr-6in4/files/bin/omr-6in4 b/omr-6in4/files/bin/omr-6in4 new file mode 100755 index 000000000..3fc23a819 --- /dev/null +++ b/omr-6in4/files/bin/omr-6in4 @@ -0,0 +1,32 @@ +#!/bin/sh +# Copyright (C) 2018 Ycarus (Yannick Chabanois) + +while true; do + if [ "$(uci -q get glorytun.vpn.enable)" = "1" ]; then + iface=$(uci -q get glorytun.vpn.dev) + elif [ "$(uci -q get mlvpn.general.enable)" = "1" ]; then + iface=$(uci -q get mlvpn.general.interface_name) + elif [ "$(uci -q get openvpn.omr.enabled)" = "1" ]; then + iface=$(uci -q get openvpn.omr.dev) + fi + addr=$(ubus call network.interface.omrvpn status | jsonfilter -q -e '@["ipv4-address"][0].address' | tr -d "\n") + [ -z "$addr" ] && [ -n "$iface" ] && addr=$(ip -4 addr show dev $iface | grep inet | awk '{print $2}' | cut -d/ -f1 | tr -d "\n") + peer=$(ubus call network.interface.omrvpn status | jsonfilter -q -e '@.route[0].nexthop' | tr -d "\n") + [ -z "$peer" ] && [ -n "$iface" ] && peer=$(ip -4 r list dev $iface | grep kernel | awk '/proto kernel/ {print $1}' | grep -v / | tr -d "\n") + [ -z "$addr" ] && exit 0 + [ -z "$peer" ] && exit 0 + if [ "$addr" != "$(uci -q get network.omr6in4.ipaddr)" ] || [ "$peer" != "$(uci -q get network.omr6in4.peeraddr)" ]; then + logger -t "omr6in4" "Set network for OMR 6in4 to local $addr peer $peer" + uci -q batch <<-EOF + set network.omr6in4.ipaddr=$addr + set network.omr6in4.peeraddr=$peer + EOF + uci -q commit network + if [ -n "$(ip tunnel | grep omr6in4)" ]; then + ip tunnel change "6in4-omr6in4" mode sit local ${addr} remote ${peer} + else + ifup omr6in4 + fi + fi + sleep 10 +done \ No newline at end of file diff --git a/omr-6in4/files/etc/init.d/omr-6in4 b/omr-6in4/files/etc/init.d/omr-6in4 new file mode 100755 index 000000000..1c20c524d --- /dev/null +++ b/omr-6in4/files/etc/init.d/omr-6in4 @@ -0,0 +1,32 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2018 Ycarus (Yannick Chabanois) +# shellcheck disable=SC2039 +# vim: set noexpandtab tabstop=4 shiftwidth=4 softtabstop=4 : + +# shellcheck disable=SC2034 +{ + START=99 + STOP=10 + USE_PROCD=1 +} + + +start_service() { + [ "$(sysctl -n net.ipv6.conf.all.disable_ipv6 | tr -d '\n')" = "1" ] && return + procd_open_instance + # shellcheck disable=SC2086 + procd_set_param command /bin/omr-6in4 + procd_set_param limits nofile="51200 51200" + procd_set_param respawn 0 10 0 + procd_set_param stderr 1 + procd_close_instance +} + +service_triggers() { + procd_add_interface_trigger "omrvpn" +} + +reload_service() { + stop + start +} diff --git a/omr-6in4/files/etc/uci-defaults/9010-omr-6in4 b/omr-6in4/files/etc/uci-defaults/9010-omr-6in4 new file mode 100755 index 000000000..d877d5e11 --- /dev/null +++ b/omr-6in4/files/etc/uci-defaults/9010-omr-6in4 @@ -0,0 +1,41 @@ +#!/bin/sh + +. /lib/functions.sh + +if [ "$(uci -q show network | grep omr6in4)" = "" ]; then + uci -q batch <<-EOF + set network.omr6in4=interface + set network.omr6in4.proto=6in4 + set network.omr6in4.ip4table=vpn + set network.omr6in4.multipath=off + set network.omr6in4.ipaddr=10.255.255.2 + set network.omr6in4.peeraddr=10.255.255.1 + set network.omr6in4.gateway=fe80::a00:1 + set network.omr6in4.ip6addr=fe80::a00:2 + commit network + EOF +fi + +if [ "$(uci -q get ucitrack.@network[-1].affects | grep omr6in4)" = "" ]; then + uci -q batch <<-EOF + add_list ucitrack.@network[-1].affects=omr6in4 + commit ucitrack + EOF +fi + + +if [ "$(uci -q get network.omr6in4.ip6addr)" = "" ]; then + uci -q batch <<-EOF + set network.omr6in4.ip6addr=fe80::a00:2 + commit network + EOF +fi + +if [ "$(uci -q get firewall.zone_vpn.network | grep omr6in4)" = "" ]; then + uci -q batch <<-EOF + add_list firewall.zone_vpn.network=omr6in4 + commit firewall + EOF +fi +rm -f /tmp/luci-indexcache +exit 0 diff --git a/omr-quota/files/bin/omr-quota b/omr-quota/files/bin/omr-quota index f112bc564..157ec330a 100755 --- a/omr-quota/files/bin/omr-quota +++ b/omr-quota/files/bin/omr-quota @@ -10,8 +10,8 @@ shift # main loop while true; do - rx=`vnstat -i $OMR_QUOTA_INTERFACE --json | jsonfilter -e '@.interfaces[0].traffic.months[-1].rx' | tr -d "\n"` - tx=`vnstat -i $OMR_QUOTA_INTERFACE --json | jsonfilter -e '@.interfaces[0].traffic.months[-1].tx' | tr -d "\n"` + rx=`vnstat -i $OMR_QUOTA_INTERFACE --json | jsonfilter -q -e '@.interfaces[0].traffic.months[-1].rx' | tr -d "\n"` + tx=`vnstat -i $OMR_QUOTA_INTERFACE --json | jsonfilter -q -e '@.interfaces[0].traffic.months[-1].tx' | tr -d "\n"` tt=$((rx + tx)) [ -n "$OMR_QUOTA_RX" ] && [ "$OMR_QUOTA_RX" -gt 0 ] && [ -n "$rx" ] && [ "$OMR_QUOTA_RX" -ge "$rx" ] && ifdown $OMR_QUOTA_INTERFACE \ || \ diff --git a/omr-quota/files/etc/init.d/omr-quota b/omr-quota/files/etc/init.d/omr-quota index 1b7cad1e2..4883fe645 100755 --- a/omr-quota/files/etc/init.d/omr-quota +++ b/omr-quota/files/etc/init.d/omr-quota @@ -21,7 +21,7 @@ _launch_quota() { interface=$1 [ -z "$txquota" ] && [ -z "$rxquota" ] && [ -z "$ttquota" ] && return - [ $enabled = 0 ] && return + [ "$enabled" = "0" ] && return [ "$(uci get vnstat.@vnstat[-1].interface | grep $interface)" = "" ] && { uci -q batch <<-EOF diff --git a/omr-quota/files/etc/uci-defaults/omr-quota b/omr-quota/files/etc/uci-defaults/omr-quota index 0f09b4695..b9ef06a1d 100755 --- a/omr-quota/files/etc/uci-defaults/omr-quota +++ b/omr-quota/files/etc/uci-defaults/omr-quota @@ -3,6 +3,11 @@ uci -q batch <<-EOF delete ucitrack.@omr-quota[-1] add ucitrack omr-quota set ucitrack.@omr-quota[-1].init="omr-quota" - add_list ucitrack.@network[-1].affects="omr-quota" commit ucitrack -EOF \ No newline at end of file +EOF +if [ "$(uci -q get ucitrack.@network[-1].affects | grep omr-quota)" = "" ]; then + uci -q batch <<-EOF + add_list ucitrack.@network[-1].affects="omr-quota" + commit ucitrack + EOF +fi diff --git a/omr-tracker/Makefile b/omr-tracker/Makefile index 09a97974f..edbe42d7f 100644 --- a/omr-tracker/Makefile +++ b/omr-tracker/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=omr-tracker -PKG_VERSION:=1.5 +PKG_VERSION:=1.6 PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk diff --git a/omr-tracker/files/bin/omr-tracker b/omr-tracker/files/bin/omr-tracker index acf6364b6..e7a6d4790 100755 --- a/omr-tracker/files/bin/omr-tracker +++ b/omr-tracker/files/bin/omr-tracker @@ -152,10 +152,13 @@ while true; do OMR_TRACKER_DEVICE_GATEWAY=$(uci -q get "network.$OMR_TRACKER_INTERFACE.gateway") fi if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then - OMR_TRACKER_DEVICE_GATEWAY=$(ubus call network.interface.$OMR_TRACKER_INTERFACE status | jsonfilter -e '@.route[0].nexthop' | tr -d "\n") + OMR_TRACKER_DEVICE_GATEWAY=$(ubus call network.interface.$OMR_TRACKER_INTERFACE status | jsonfilter -q -e '@.route[0].nexthop' | tr -d "\n") fi if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then - OMR_TRACKER_DEVICE_GATEWAY=$(ubus call network.interface.$OMR_TRACKER_INTERFACE status | jsonfilter -e '@.inactive.route[0].nexthop' | tr -d "\n") + OMR_TRACKER_DEVICE_GATEWAY=$(ubus call network.interface.$OMR_TRACKER_INTERFACE status | jsonfilter -q -e '@.inactive.route[0].nexthop' | tr -d "\n") + fi + if [ -z "$OMR_TRACKER_DEVICE_GATEWAY" ]; then + OMR_TRACKER_DEVICE_GATEWAY=$(ubus call network.interface.${OMR_TRACKER_INTERFACE}_4 status 2>/dev/null | jsonfilter -q -e '@.inactive.route[0].nexthop' | tr -d "\n") fi # execute specific tracker @@ -199,8 +202,9 @@ while true; do fi fi - [ "$OMR_TRACKER_HOSTS" = "$initial_hosts" ] || [ "$OMR_TRACKER_STATUS" = "OK" ] && _post_tracking + #[ "$OMR_TRACKER_HOSTS" = "$initial_hosts" ] || [ "$OMR_TRACKER_STATUS" = "OK" ] && _post_tracking #[ "$OMR_TRACKER_STATUS" = "ERROR" ] && _restart + _post_tracking _restart sleep "$OMR_TRACKER_INTERVAL" diff --git a/omr-tracker/files/bin/omr-tracker-ss b/omr-tracker/files/bin/omr-tracker-ss index c4cd5710a..fdbe0ab1d 100755 --- a/omr-tracker/files/bin/omr-tracker-ss +++ b/omr-tracker/files/bin/omr-tracker-ss @@ -19,20 +19,20 @@ nodns=0 last=0 while true; do - while [ "$last" -gt 0 ]; do - host=${hosts%% *} - if curl -s --socks5 "${proxy}" --max-time "${timeout}" "$host" &>/dev/null ; then - [ "${last}" -gt 0 ] && log "Shadowsocks is up (can contact ${host})" - /etc/init.d/shadowsocks-libev rules_up 2> /dev/null - last=0 - else - last=$((last + 1 )) - [ "${last}" -ge "${retry}" ] && { - log "Shadowsocks is down (can't contact ${host})" - /etc/init.d/shadowsocks-libev rules_down 2> /dev/null - last=0 - } - fi - done + host="${hosts%% *}" + [ "$host" = "$hosts" ] || { + hosts="${hosts#* } $host" + } + if curl -s --socks5 "${proxy}" --max-time "${timeout}" "$host" &>/dev/null ; then + [ "${last}" -ge "${retry}" ] && log "Shadowsocks is up (can contact ${host})" + /etc/init.d/shadowsocks-libev rules_up 2> /dev/null + last=0 + else + last=$((last + 1 )) + [ "${last}" -eq "${retry}" ] && { + log "Shadowsocks is down (can't contact ${host})" + /etc/init.d/shadowsocks-libev rules_down 2> /dev/null + } + fi sleep "${interval}" done diff --git a/omr-tracker/files/etc/config/omr-tracker b/omr-tracker/files/etc/config/omr-tracker index 68a10fc83..3b6decaee 100644 --- a/omr-tracker/files/etc/config/omr-tracker +++ b/omr-tracker/files/etc/config/omr-tracker @@ -8,9 +8,9 @@ config defaults 'defaults' list hosts '1.0.0.1' list hosts '80.67.169.12' list hosts '80.67.169.40' - option timeout '1' - option tries '4' - option interval '4' + option timeout '2' + option tries '5' + option interval '5' option type 'ping' option options '' @@ -22,6 +22,6 @@ config shadowsocks 'shadowsocks' list hosts '23.96.52.53' list hosts '104.40.211.35' list hosts '80.67.169.12' - option timeout '5' + option timeout '10' option tries '4' option interval '10' \ No newline at end of file diff --git a/omr-tracker/files/etc/init.d/omr-tracker b/omr-tracker/files/etc/init.d/omr-tracker index 984b17d80..80eb27e5c 100755 --- a/omr-tracker/files/etc/init.d/omr-tracker +++ b/omr-tracker/files/etc/init.d/omr-tracker @@ -33,7 +33,7 @@ _validate_section() { _launch_tracker() { case "$1" in - loopback|lan*|if0*|tun*) return;; + loopback|lan*|if0*) return;; esac local hosts timeout tries interval options type enabled @@ -42,11 +42,15 @@ _launch_tracker() { local ifname ip4table config_get ifname "$1" ifname + [ -z "$ifname" ] && ifname=$(ifstatus "$1" | jsonfilter -q -e '@["l3_device"]') + config_get multipath "$1" multipath + config_get ifenabled "$1" auto config_get gateway "$1" gateway - [ -z "$ifname" ] || [ -z "$multipath" ] || [ "$multipath" = "off" ] && [ "$1" != "glorytun" ] && return - [ $enabled = 0 ] && return + [ -z "$ifname" ] || [ -z "$multipath" ] || [ "$multipath" = "off" ] && [ "$1" != "glorytun" ] && [ "$1" != "omrvpn" ] && return + [ "${ifenabled}" = "0" ] && return + [ "${enabled}" = "0" ] && return procd_open_instance # shellcheck disable=SC2086 @@ -70,6 +74,7 @@ _initialize_shadowsocks_tracker() { config_get redir_tcp ss_rules redir_tcp config_get server $redir_tcp server config_get tracker_server "tracker" server + config_get ss_disabled $server disabled 0 [ "$server" = "$tracker_server" ] || { [ -z "$tracker_server" ] && { uci -q batch <<-EOF >/dev/null @@ -78,7 +83,7 @@ _initialize_shadowsocks_tracker() { set shadowsocks-libev.tracker.local_address="127.0.0.1" set shadowsocks-libev.tracker.local_port=1111 set shadowsocks-libev.tracker.mode=tcp_and_udp - set shadowsocks-libev.tracker.timeout=60 + set shadowsocks-libev.tracker.timeout=600 set shadowsocks-libev.tracker.fast_open=1 set shadowsocks-libev.tracker.reuse_port=1 set shadowsocks-libev.tracker.mptcp=1 @@ -103,8 +108,8 @@ _launch_shadowsocks_tracker() { local disabled config_get disabled "$1" disabled 0 - [ $enabled = 0 ] && return - [ $disabled = 1 ] && return + [ "$enabled" = "0" ] && return + [ "$disabled" = "1" ] && return procd_open_instance # shellcheck disable=SC2086 @@ -121,18 +126,21 @@ _launch_shadowsocks_tracker() { } start_service() { + local ss_disabled config_load shadowsocks-libev _initialize_shadowsocks_tracker config_load network config_foreach _launch_tracker interface - config_load shadowsocks-libev - config_foreach _launch_shadowsocks_tracker ss_local + if [ "$ss_disabled" != "1" ]; then + config_load shadowsocks-libev + config_foreach _launch_shadowsocks_tracker ss_local + fi } service_triggers() { - procd_add_reload_trigger omr-tracker network + procd_add_reload_trigger omr-tracker network shadowsocks-libev } reload_service() { diff --git a/omr-tracker/files/etc/uci-defaults/omr-tracker b/omr-tracker/files/etc/uci-defaults/omr-tracker index e8d5e9fd3..065fb6b53 100755 --- a/omr-tracker/files/etc/uci-defaults/omr-tracker +++ b/omr-tracker/files/etc/uci-defaults/omr-tracker @@ -3,6 +3,11 @@ uci -q batch <<-EOF delete ucitrack.@omr-tracker[-1] add ucitrack omr-tracker set ucitrack.@omr-tracker[-1].init="omr-tracker" - add_list ucitrack.@network[-1].affects="omr-tracker" commit ucitrack -EOF \ No newline at end of file +EOF +if [ "$(uci -q ucitrack.@network[-1].affects | grep omr-tracker)" = "" ]; then + uci -q batch <<-EOF + add_list ucitrack.@network[-1].affects="omr-tracker" + commit ucitrack + EOF +fi \ No newline at end of file diff --git a/omr-update/Makefile b/omr-update/Makefile new file mode 100644 index 000000000..a7f509da6 --- /dev/null +++ b/omr-update/Makefile @@ -0,0 +1,34 @@ +# +# Copyright (C) 2018 Ycarus (Yannick Chabanois) +# +# This is free software, licensed under the GNU General Public License v3. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=omr-update +PKG_VERSION:=0.1 +PKG_RELEASE:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/$(PKG_NAME) + SECTION:=OMR + CATEGORY:=OpenMPTCProuter + TITLE:=OpenMPTCProuter updater + PKGARCH:=all +endef + +define Package/$(PKG_NAME)/description + A module to update OpenMPTCProuter config +endef + +define Build/Compile +endef + +define Package/$(PKG_NAME)/install + $(CP) ./files/* $(1)/ +endef + +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/omr-update/files/etc/init.d/omr-update b/omr-update/files/etc/init.d/omr-update new file mode 100755 index 000000000..a4b0de7dc --- /dev/null +++ b/omr-update/files/etc/init.d/omr-update @@ -0,0 +1,34 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2006-2011 OpenWrt.org + +START=09 +STOP=98 + +boot() { + . /lib/functions/system.sh + + cd /etc/uci-defaults || return 0 + source /etc/os-release + + files="$(ls)" + [ -n "$files" ] && { + mkdir -p /usr/share/omr-update + if [ "$(grep rom /etc/mtab)" = "" ]; then + cp /etc/uci-defaults/* /usr/share/omr-update + fi + uci -q set openmptcprouter.settings.version=${VERSION} + return 0 + } + if [ "$(uci -q get openmptcprouter.settings.version)" != "${VERSION}" ]; then + cd /rom/etc/uci-defaults || cd /usr/share/omr-update || return 0 + files="$(ls)" + [ -z "$files" ] && return 0 + for file in $files; do + ( . "./$(basename $file)" ) + done + uci -q set openmptcprouter.settings.version=${VERSION} + uci commit + fi + # temporary hack until configd exists + /sbin/reload_config +} diff --git a/open-vm-tools/Makefile b/open-vm-tools/Makefile new file mode 100644 index 000000000..f8bded9a0 --- /dev/null +++ b/open-vm-tools/Makefile @@ -0,0 +1,72 @@ +# +# Copyright (C) 2015 Minho Ryang +# Initial ebuild come from https://github.com/minhoryang/open-vm-tools--openwrt +# Copyright (C) 2018 Ycarus (Yannick Chabanois) +# +# This is free software, licensed under the GNU General Public License v3 or later. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk + +PKG_NAME:=open-vm-tools +PKG_VERSION:=stable-10.3.0 +PKG_RELEASE:=1 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DEPENDS:=glib2 +PKG_SOURCE:=$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://github.com/vmware/open-vm-tools/archive/ +PKG_LICENSE:=LGPLv2.1 +PKG_LICENSE_FILE:=COPYING + +PKG_FIXUP:=autoreconf + +include $(INCLUDE_DIR)/package.mk + +define Package/$(PKG_NAME) + TITLE:=open-vm-tools + CATEGORY:=Languages + SECTION:=utils + CATEGORY:=Utilities + DEPENDS:=+glib2 +libdnet + URL:=https://github.com/vmware/open-vm-tools + MAINTAINER:= Minho Ryang +endef + # TODO: PKGARCH:=i386 x86_64 + # TODO: mmu + # TODO: depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC + # TODO: depends on BR2_ENABLE_LOCALE + # TODO: BR2_PACKAGE_OPENVMTOOLS_PROCPS + # TODO: BR2_PACKAGE_OPENVMTOOLS_PAM + +define Package/$(PKG_NAME)/description + Open Virtual Machine Tools for VMware guest OS + + http://open-vm-tools.sourceforge.net/ + + ICU locales, Xerces, and X11 tools are currently not supported. + + NOTE: Support for vmblock-fuse will be enabled in openvmtools if the + libfuse package is selected. +endef + +CONFIGURE_ARGS+= \ + --with-dnet \ + --without-icu \ + --without-x \ + --without-gtk2 \ + --without-gtkmm \ + --without-kernel-modules \ + --disable-deploypkg \ + --without-xerces \ + --without-ssl \ + --without-procps \ + --without-pam +# TODO: --without-ssl -procps -pam optionable + +CONFIGURE_VARS += \ + CUSTOM_DNET_CPPFLAGS=" " + +define Package/$(PKG_NAME)/install +endef + +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/openmptcprouter-full/Makefile b/openmptcprouter-full/Makefile index 9d8a1d96e..ec8043bf6 100644 --- a/openmptcprouter-full/Makefile +++ b/openmptcprouter-full/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openmptcprouter-full -PKG_VERSION:=0.4 +PKG_VERSION:=0.10 PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk @@ -23,26 +23,36 @@ MY_DEPENDS := \ uhttpd \ uhttpd-mod-ubus \ curl \ - iperf3 \ + iperf3-ssl luci-app-iperf \ arptables \ bind-dig \ - conntrack conntrackd \ - ebtables ebtables-utils \ - ip-full \ - iputils-traceroute6 \ + conntrack conntrackd ebtables ebtables-utils ip-full \ iptables-mod-iface iptables-mod-ipmark iptables-mod-hashlimit iptables-mod-condition iptables-mod-trace iptables-mod-conntrack-extra \ wireless-tools \ libiwinfo-lua \ ca-bundle ca-certificates libustream-openssl \ luci-mod-admin-full luci-app-firewall luci-app-glorytun luci-app-shadowsocks-libev luci-app-unbound luci-theme-openmptcprouter luci-base \ - luci-app-nginx-ha luci-app-omr-tracker luci-app-qos \ + luci-app-nginx-ha luci-app-omr-tracker \ + luci-app-sqm \ luci-app-vnstat omr-quota luci-app-omr-quota \ luci-app-mptcp luci-app-openmptcprouter luci-app-omr-bypass \ + omr-6in4 ip6tables-mod-nat luci-proto-ipv6 6to4 6in4 6rd iputils-traceroute6 \ speedtestc \ - ip6tables-mod-nat luci-proto-ipv6 6to4 6in4 6rd ethtool \ + iftop \ + tcpdump \ + ethtool \ + tracebox \ + luci-proto-3g \ + comgt-ncm luci-proto-ncm \ + luci-app-mlvpn mlvpn \ + omr-update \ + rng-tools \ + openvpn-openssl \ + kmod-rt2800-usb libimobiledevice \ + kmod-mt7601u \ kmod-rtl8xxxu kmod-rtl8192cu kmod-net-rtl8192su comgt kmod-usb-serial kmod-usb-serial-option kmod-usb-serial-wwan usb-modeswitch uqmi adb-enablemodem umbim kmod-mii kmod-usb-net kmod-usb-wdm kmod-usb-net-qmi-wwan kmod-usb-net-cdc-mbim -OMR_SUPPORTED_LANGS := ca zh_cn en fr de el he hu it ja ms no pl pt_br pt ro ru es sv uk vi +OMR_SUPPORTED_LANGS := ca zh-cn en fr de el he hu it ja ms no pl pt-br pt ro ru es sv uk vi define Package/$(PKG_NAME) SECTION:=OMR diff --git a/openmptcprouter/Makefile b/openmptcprouter/Makefile index e3790f50b..b109dd690 100644 --- a/openmptcprouter/Makefile +++ b/openmptcprouter/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openmptcprouter -PKG_VERSION:=0.70 +PKG_VERSION:=0.94 PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk diff --git a/openmptcprouter/files/bin/omr-test-speed b/openmptcprouter/files/bin/omr-test-speed index 87cc98544..d3e542680 100755 --- a/openmptcprouter/files/bin/omr-test-speed +++ b/openmptcprouter/files/bin/omr-test-speed @@ -1,7 +1,15 @@ #!/bin/sh # vim: set noexpandtab tabstop=4 shiftwidth=4 softtabstop=4 : +INTERFACE="$1" HOST="proof.ovh.net" trap : HUP INT TERM -curl http://$HOST/files/10Gio.dat >/dev/null || echo +if [ -z "$INTERFACE" ]; then + curl -4 http://$HOST/files/10Gio.dat >/dev/null || echo +else + hostip=$(dig +short A $HOST | tr -d "\n") + ipset add ss_rules_dst_bypass $hostip + curl -4 --interface $INTERFACE http://$HOST/files/10Gio.dat >/dev/null || echo + ipset del ss_rules_dst_bypass $hostip +fi diff --git a/openmptcprouter/files/bin/omr-test-speedv6 b/openmptcprouter/files/bin/omr-test-speedv6 new file mode 100755 index 000000000..43ca0141f --- /dev/null +++ b/openmptcprouter/files/bin/omr-test-speedv6 @@ -0,0 +1,15 @@ +#!/bin/sh +# vim: set noexpandtab tabstop=4 shiftwidth=4 softtabstop=4 : + +INTERFACE="$1" +HOST="proof.ovh.net" + +trap : HUP INT TERM +if [ -z "$INTERFACE" ]; then + curl -6 http://$HOST/files/10Gio.dat >/dev/null || echo +else + hostip=$(dig +short A $HOST | tr -d "\n") + ipset add ss_rules_dst_bypass $hostip + curl -6 --interface $INTERFACE http://$HOST/files/10Gio.dat >/dev/null || echo + ipset del ss_rules_dst_bypass $hostip +fi diff --git a/openmptcprouter/files/bin/omr-tracebox b/openmptcprouter/files/bin/omr-tracebox new file mode 100755 index 000000000..47e5e2866 --- /dev/null +++ b/openmptcprouter/files/bin/omr-tracebox @@ -0,0 +1,5 @@ +#!/bin/sh +multipathip=$(dig +short A amiusingmptcp.de | tr -d "\n") +ipset add ss_rules_dst_bypass $multipathip > /dev/null 2>&1 +tracebox -v -n -p IP/TCP/MSS/MPCAPABLE/WSCALE amiusingmptcp.de +ipset del ss_rules_dst_bypass $multipathip > /dev/null 2>&1 diff --git a/openmptcprouter/files/bin/omr-tracebox-json b/openmptcprouter/files/bin/omr-tracebox-json new file mode 100755 index 000000000..ee89cd4f8 --- /dev/null +++ b/openmptcprouter/files/bin/omr-tracebox-json @@ -0,0 +1,5 @@ +#!/bin/sh +multipathip=$(dig +short A amiusingmptcp.de | tr -d "\n") +ipset add ss_rules_dst_bypass $multipathip > /dev/null 2>&1 +tracebox -v -j -m 10 -n -p IP/TCP/MSS/MPCAPABLE/WSCALE amiusingmptcp.de +ipset del ss_rules_dst_bypass $multipathip > /dev/null 2>&1 diff --git a/openmptcprouter/files/etc/sysctl.d/default.conf b/openmptcprouter/files/etc/sysctl.d/default.conf index b3ff25ed2..8169c9b26 100644 --- a/openmptcprouter/files/etc/sysctl.d/default.conf +++ b/openmptcprouter/files/etc/sysctl.d/default.conf @@ -1,2 +1,2 @@ -net.ipv4.tcp_ecn=1 net.netfilter.nf_conntrack_helper=1 +net.ipv4.tcp_fack=1 diff --git a/openmptcprouter/files/etc/uci-defaults/1920-omr-network b/openmptcprouter/files/etc/uci-defaults/1920-omr-network index 3a4d4ddb6..ac9aeaa3f 100755 --- a/openmptcprouter/files/etc/uci-defaults/1920-omr-network +++ b/openmptcprouter/files/etc/uci-defaults/1920-omr-network @@ -49,16 +49,20 @@ _setup_wan_interface() { [ -n "$4" ] && uci -q set network.$1.type=$4 } -[ "$(uci -q get "network.lan.proto")" = static ] || \ - uci -q batch <<-EOF - set network.lan=interface - set network.lan.proto=static - set network.lan.ipaddr=192.168.100.1 - set network.lan.netmask=255.255.255.0 - set network.lan.ifname=eth0 - EOF +if [ "$(uci -q get network.lan.multipath)" != "" ]; then + exit 0 +fi -uci -q batch <> /etc/iproute2/rt_tables + echo "50 lan" >> /etc/iproute2/rt_tables fi uci -q set network.lan.ip4table='lan' @@ -92,8 +96,16 @@ uci -q set network.lan.ip4table='lan' #uci -q set "network.lan.ip6assign=64" # Create WAN interfaces -if [ "$(uci -q show network | grep wan)" = "" ]; then - if [ -d /sys/class/net/eth1 ]; then +if [ "$(uci -q show network | grep wan1)" = "" ]; then + if [ -d /sys/class/net/wan ]; then + uci -q batch <<-EOF + delete network.wan + EOF + _setup_wan_interface wan1 wan master macvlan + _setup_wan_interface wan2 wan on macvlan + _setup_macvlan wan1 + _setup_macvlan wan2 + elif [ -d /sys/class/net/eth1 ]; then if [ -d /sys/class/net/eth2 ]; then _setup_wan_interface wan1 eth1 master _setup_wan_interface wan2 eth2 on diff --git a/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks b/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks index f388fbd38..3ea9e6957 100755 --- a/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks +++ b/openmptcprouter/files/etc/uci-defaults/1930-omr-shadowsocks @@ -2,22 +2,42 @@ NBCPU=$(grep -c '^processor' /proc/cpuinfo | tr -d "\n") if [ "$NBCPU" -gt 2 ]; then - for c in $(seq 3 $NBCPU); do - uci -q batch <<-EOF >/dev/null - set shadowsocks-libev.hi$c=ss_redir - set shadowsocks-libev.hi$c.server=sss0 - set shadowsocks-libev.hi$c.local_address="0.0.0.0" - set shadowsocks-libev.hi$c.local_port=1100 - set shadowsocks-libev.hi$c.mode=tcp_and_udp - set shadowsocks-libev.hi$c.timeout=60 - set shadowsocks-libev.hi$c.fast_open=1 - set shadowsocks-libev.hi$c.reuse_port=1 - set shadowsocks-libev.hi$c.mptcp=1 - set shadowsocks-libev.hi$c.verbose=0 - commit shadowsocks-libev - EOF - rm -f /tmp/luci-indexcache - done + if [ "$(uci -q get shadowsocks-libev.hi3)" = "" ]; then + for c in $(seq 3 $NBCPU); do + uci -q batch <<-EOF >/dev/null + set shadowsocks-libev.hi$c=ss_redir + set shadowsocks-libev.hi$c.server=sss0 + set shadowsocks-libev.hi$c.local_address="0.0.0.0" + set shadowsocks-libev.hi$c.local_port=1100 + set shadowsocks-libev.hi$c.mode=tcp_and_udp + set shadowsocks-libev.hi$c.timeout=600 + set shadowsocks-libev.hi$c.fast_open=1 + set shadowsocks-libev.hi$c.reuse_port=1 + set shadowsocks-libev.hi$c.mptcp=1 + set shadowsocks-libev.hi$c.verbose=0 + commit shadowsocks-libev + EOF + done + fi fi +if [ "$(uci -q get shadowsocks-libev.hi.timeout)" != "600" ]; then + uci -q batch <<-EOF > /dev/null + set shadowsocks-libev.hi.timeout=600 + commit shadowsocks-libev + EOF + for c in $(seq 2 $NBCPU); do + uci -q batch <<-EOF > /dev/null + set shadowsocks-libev.hi$c.timeout=600 + commit shadowsocks-libev + EOF + done +fi +if [ "$(uci -q get shadowsocks-libev.sss0.method)" != "chacha20" ]; then + uci -q batch <<-EOF > /dev/null + set shadowsocks-libev.sss0.method=chacha20 + commit shadowsocks-libev + EOF +fi +rm -f /tmp/luci-indexcache exit 0 diff --git a/openmptcprouter/files/etc/uci-defaults/1940-omr-dns b/openmptcprouter/files/etc/uci-defaults/1940-omr-dns index 589824ec9..11545fc28 100755 --- a/openmptcprouter/files/etc/uci-defaults/1940-omr-dns +++ b/openmptcprouter/files/etc/uci-defaults/1940-omr-dns @@ -1,11 +1,22 @@ #!/bin/sh +if [ "$(uci -q get unbound.@unbound[0].listen_port | grep 5353)" = "" ]; then + uci -q batch <<-EOF >/dev/null + set unbound.@unbound[-1].listen_port=5353 + set unbound.@unbound[-1].protocol="ip4_only" + set unbound.@unbound[-1].enabled=1 + set unbound.@unbound[-1].recursion="aggressive" + commit unbound + EOF +fi +if [ "$(uci -q show dhcp | grep 127.0.0.1#5353)" = "" ]; then + uci -q batch <<-EOF >/dev/null + add_list dhcp.@dnsmasq[-1].server="127.0.0.1#5353" + commit dhcp + EOF +fi uci -q batch <<-EOF >/dev/null - set unbound.@unbound[-1].listen_port=5353 - set unbound.@unbound[-1].protocol="ip4_only" - set unbound.@unbound[-1].enabled=1 - commit unbound - add_list dhcp.@dnsmasq[-1].server="127.0.0.1#5353" + del dhcp.@dnsmasq[-1].interface commit dhcp EOF rm -f /tmp/luci-indexcache diff --git a/openmptcprouter/files/etc/uci-defaults/1960-omr-qos b/openmptcprouter/files/etc/uci-defaults/1960-omr-qos index a0ab45d65..a98fc705b 100755 --- a/openmptcprouter/files/etc/uci-defaults/1960-omr-qos +++ b/openmptcprouter/files/etc/uci-defaults/1960-omr-qos @@ -1,29 +1,31 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - delete qos.wan - set qos.wan1=interface - set qos.wan1.classgroup="Default" - set qos.wan1.enabled="0" - set qos.wan1.upload="256" - set qos.wan1.download="2048" - set qos.wan2=interface - set qos.wan2.classgroup="Default" - set qos.wan2.enabled="0" - set qos.wan2.upload="256" - set qos.wan2.download="2048" - delete qos.@classify[-1] - add qos classify - set qos.@classify[-1].target='Express' - set qos.@classify[-1].ports='5600' - set qos.@classify[-1].comments='SIP' - add qos classify - set qos.@classify[-1].target='Express' - set qos.@classify[-1].portrange='27000-27050' - set qos.@classify[1].proto='udp' - set qos.@classify[-1].comments='Steam' - commit qos -EOF +if [ "$(uci -q get qos.wan1)" = "" ]; then + uci -q batch <<-EOF >/dev/null + delete qos.wan + set qos.wan1=interface + set qos.wan1.classgroup="Default" + set qos.wan1.enabled="0" + set qos.wan1.upload="4000" + set qos.wan1.download="100000" + set qos.wan2=interface + set qos.wan2.classgroup="Default" + set qos.wan2.enabled="0" + set qos.wan2.upload="4000" + set qos.wan2.download="100000" + delete qos.@classify[-1] + add qos classify + set qos.@classify[-1].target='Express' + set qos.@classify[-1].ports='5600' + set qos.@classify[-1].comments='SIP' + add qos classify + set qos.@classify[-1].target='Express' + set qos.@classify[-1].portrange='27000-27050' + set qos.@classify[-1].proto='udp' + set qos.@classify[-1].comments='Steam' + commit qos + EOF +fi rm -f /tmp/luci-indexcache exit 0 diff --git a/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall b/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall index a581a7e8b..4267b2265 100755 --- a/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall +++ b/openmptcprouter/files/etc/uci-defaults/1980-omr-firewall @@ -1,16 +1,75 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - add firewall rule - set firewall.@rule[-1].enabled='1' - set firewall.@rule[-1].target='ACCEPT' - set firewall.@rule[-1].name='Allow-All-Ping' - set firewall.@rule[-1].proto='icmp' - set firewall.@rule[-1].dest='*' - set firewall.@rule[-1].src='*' - set firewall.@rule[-1].icmp_type='echo-request' - commit firewall -EOF +if [ "$(uci -q get firewall.@zone[2].name)" = "vpn" ]; then + uci -q batch <<-EOF >/dev/null + del firewall.@zone[2] + commit firewall + EOF +fi + +if [ "$(uci -q get firewall.zone_vpn)" = "" ]; then + uci -q batch <<-EOF >/dev/null + set firewall.zone_vpn=zone + set firewall.zone_vpn.name=vpn + set firewall.zone_vpn.network=glorytun + set firewall.zone_vpn.masq=1 + set firewall.zone_vpn.input=REJECT + set firewall.zone_vpn.forward=ACCEPT + set firewall.zone_vpn.output=ACCEPT + commit firewall + EOF +fi + +if [ "$(uci -q show firewall | grep Allow-All-Ping)" = "" ]; then + uci -q batch <<-EOF >/dev/null + add firewall rule + set firewall.@rule[-1].enabled='1' + set firewall.@rule[-1].target='ACCEPT' + set firewall.@rule[-1].name='Allow-All-Ping' + set firewall.@rule[-1].proto='icmp' + set firewall.@rule[-1].dest='*' + set firewall.@rule[-1].src='*' + set firewall.@rule[-1].icmp_type='echo-request' + commit firewall + EOF +fi +if [ "$(uci -q show firewall | grep Allow-VPN-ICMP)" = "" ]; then + uci -q batch <<-EOF >/dev/null + add firewall rule + set firewall.@rule[-1].enabled='1' + set firewall.@rule[-1].target='ACCEPT' + set firewall.@rule[-1].name='Allow-VPN-ICMP' + set firewall.@rule[-1].proto='icmp' + set firewall.@rule[-1].src='vpn' + commit firewall + EOF +fi +if [ "$(uci -q show firewall | grep Allow-Lan-to-Wan)" = "" ]; then + uci -q batch <<-EOF >/dev/null + add firewall rule + set firewall.@rule[-1].enabled='1' + set firewall.@rule[-1].target='ACCEPT' + set firewall.@rule[-1].name='Allow-Lan-to-Wan' + set firewall.@rule[-1].dest='wan' + set firewall.@rule[-1].src='lan' + commit firewall + EOF +fi + +if [ "$(uci -q show firewall | grep ICMPv6-Lan-to-OMR)" = "" ]; then + uci -q batch <<-EOF >/dev/null + add firewall rule + set firewall.@rule[-1].enabled='1' + set firewall.@rule[-1].target='ACCEPT' + set firewall.@rule[-1].name='ICMPv6-Lan-to-OMR' + set firewall.@rule[-1].src='lan' + set firewall.@rule[-1].family='ipv6' + set firewall.@rule[-1].proto='icmp' + set firewall.@rule[-1].limit='1000/sec' + set firewall.@rule[-1].icmp_type='echo-reply destination-unreachable echo-request router-advertisement router-solicitation time-exceeded' + commit firewall + EOF +fi rm -f /tmp/luci-indexcache exit 0 diff --git a/openmptcprouter/files/etc/uci-defaults/1990-omr-tracker b/openmptcprouter/files/etc/uci-defaults/1990-omr-tracker index 48d59d9cf..88c068d53 100755 --- a/openmptcprouter/files/etc/uci-defaults/1990-omr-tracker +++ b/openmptcprouter/files/etc/uci-defaults/1990-omr-tracker @@ -1,13 +1,26 @@ #!/bin/sh -uci -q batch <<-EOF >/dev/null - set omr-tracker.tun0=interface - set omr-tracker.tun0.type="none" - set omr-tracker.tun0.timeout=1 - set omr-tracker.tun0.tries=4 - set omr-tracker.tun0.interval=2 - commit omr-tracker -EOF +if [ "$(uci -q get omr-tracker.omrvpn)" = "" ]; then + uci -q batch <<-EOF >/dev/null + delete omr-tracker.glorytun + set omr-tracker.omrvpn=interface + set omr-tracker.omrvpn.type="none" + set omr-tracker.omrvpn.timeout=10 + set omr-tracker.omrvpn.tries=5 + set omr-tracker.omrvpn.interval=5 + set omr-tracker.omrvpn.enabled=1 + commit omr-tracker + EOF +fi + +if [ "$(uci -q get omr-tracker.omrvpn.enabled)" = "" ]; then + uci -q batch <<-EOF >/dev/null + set omr-tracker.omrvpn.enabled=1 + commit omr-tracker + EOF +fi + + rm -f /tmp/luci-indexcache exit 0 diff --git a/openmptcprouter/files/etc/uci-defaults/2000-omr-dhcp b/openmptcprouter/files/etc/uci-defaults/2000-omr-dhcp index 0977e94f6..39789a380 100755 --- a/openmptcprouter/files/etc/uci-defaults/2000-omr-dhcp +++ b/openmptcprouter/files/etc/uci-defaults/2000-omr-dhcp @@ -2,6 +2,7 @@ uci -q batch <<-EOF >/dev/null set dhcp.lan.ra_default=1 + set dhcp.lan.dhcpv6=disabled commit dhcp EOF rm -f /tmp/luci-indexcache diff --git a/openmptcprouter/files/etc/uci-defaults/2001-omr-rng b/openmptcprouter/files/etc/uci-defaults/2001-omr-rng new file mode 100755 index 000000000..812919479 --- /dev/null +++ b/openmptcprouter/files/etc/uci-defaults/2001-omr-rng @@ -0,0 +1,14 @@ +#!/bin/sh + +uci -q show system.@rngd[0] || { + uci add system rngd + uci set system.@rngd[0].device=/dev/urandom + uci commit +} + +uci -q batch <<-EOF >/dev/null + set system.@rngd[0].enabled=1 + commit system +EOF + +exit 0 diff --git a/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn b/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn new file mode 100755 index 000000000..9089f11ff --- /dev/null +++ b/openmptcprouter/files/etc/uci-defaults/2020-omr-vpn @@ -0,0 +1,55 @@ +#!/bin/sh + +if [ "$(uci -q get network.omrvpn)" = "" ]; then + uci -q batch <<-EOF >/dev/null + delete network.glorytun + delete network.omrvpn + set network.omrvpn=interface + set network.omrvpn.ifname=tun0 + set network.omrvpn.proto=dhcp + set network.omrvpn.ip4table=vpn + set network.omrvpn.multipath=off + set network.omrvpn.leasetime=12h + set network.omrvpn.mtu=1400 + commit network + EOF +fi + +if [ "$(uci -q get glorytun.vpn.localip)" = "10.0.0.2" ]; then + uci -q batch <<-EOF >/dev/null + delete glorytun.vpn.localip + delete glorytun.vpn.remoteip + EOF +fi + +if [ "$(uci -q get openvpn.omr)" = "" ]; then + uci -q batch <<-EOF >/dev/null + set openvpn.omr=openvpn + set openvpn.omr.dev=tun0 + set openvpn.omr.port=65301 + set openvpn.omr.cipher=AES-256-CBC + set openvpn.omr.proto=tcp-client + set openvpn.omr.compress=lz4 + set openvpn.omr.enabled=0 + set openvpn.omr.ncp_disable=1 + set openvpn.omr.auth_nocache=1 + commit openvpn + EOF +fi + +if [ "$(uci -q show firewall | grep omrvpn)" = "" ]; then + uci -q batch <<-EOF >/dev/null + add_list firewall.zone_vpn.network=omrvpn + delete firewall.allow_dhcp_request_vpn + set firewall.allow_dhcp_request_vpn=rule + set firewall.allow_dhcp_request_vpn.name=Allow-DHCP-Request-VPN + set firewall.allow_dhcp_request_vpn.src=vpn + set firewall.allow_dhcp_request_vpn.proto=udp + set firewall.allow_dhcp_request_vpn.dest_port=67 + set firewall.allow_dhcp_request_vpn.target=ACCEPT + set firewall.allow_dhcp_request_vpn.family=ipv4 + commit firewall + EOF +fi +rm -f /tmp/luci-indexcache +exit 0 diff --git a/openmptcprouter/files/etc/uci-defaults/2030-omr-wifi b/openmptcprouter/files/etc/uci-defaults/2030-omr-wifi new file mode 100755 index 000000000..e79db4dc5 --- /dev/null +++ b/openmptcprouter/files/etc/uci-defaults/2030-omr-wifi @@ -0,0 +1,10 @@ +#!/bin/sh + +uci -q show wireless.default_radio0 && { + uci -q batch <<-EOF >/dev/null + delete wireless.default_radio0 + commit wireless + EOF +} + +exit 0 \ No newline at end of file diff --git a/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm b/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm new file mode 100755 index 000000000..17779cfe7 --- /dev/null +++ b/openmptcprouter/files/etc/uci-defaults/2040-omr-sqm @@ -0,0 +1,33 @@ +#!/bin/sh + +if [ "$(uci -q get sqm.wan1)" = "" ]; then + uci -q batch <<-EOF >/dev/null + delete sqm.eth1 + set sqm.wan1=queue + set sqm.wan1.qdisc="fq_codel" + set sqm.wan1.script="simple.qos" + set sqm.wan1.qdisc_advanced='0' + set sqm.wan1.linklayer='none' + set sqm.wan1.enabled='0' + set sqm.wan1.interface='wan1' + set sqm.wan1.download='' + set sqm.wan1.upload='' + set sqm.wan1.debug_logging='0' + set sqm.wan1.verbosity='5' + set sqm.wan2=queue + set sqm.wan2.qdisc="fq_codel" + set sqm.wan2.script="simple.qos" + set sqm.wan2.qdisc_advanced='0' + set sqm.wan2.linklayer='none' + set sqm.wan2.enabled='0' + set sqm.wan2.interface='wan2' + set sqm.wan2.download='' + set sqm.wan2.upload='' + set sqm.wan2.debug_logging='0' + set sqm.wan2.verbosity='5' + commit sqm + EOF +fi +rm -f /tmp/luci-indexcache + +exit 0 diff --git a/openmptcprouter/files/etc/uci-defaults/9010-omr-6in4 b/openmptcprouter/files/etc/uci-defaults/9010-omr-6in4 deleted file mode 100755 index 34c257d6f..000000000 --- a/openmptcprouter/files/etc/uci-defaults/9010-omr-6in4 +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -. /lib/functions.sh - -if [ "$(uci -q show network | grep omr6in4)" = "" ]; then - uci -q batch <<-EOF - set network.omr6in4=interface - set network.omr6in4.proto=6in4 - set network.omr6in4.ip4table=vpn - set network.omr6in4.multipath=off - set network.omr6in4.ipaddr=10.0.0.2 - set network.omr6in4.peeraddr=10.0.0.1 - set network.omr6in4.gateway=fe80::a00:1 - commit network - add_list firewall.@zone[2].network=omr6in4 - commit firewall - EOF - rm -f /tmp/luci-indexcache -fi -exit 0 diff --git a/shadowsocks-libev/Makefile b/shadowsocks-libev/Makefile index 956860181..96c1ceef9 100644 --- a/shadowsocks-libev/Makefile +++ b/shadowsocks-libev/Makefile @@ -14,14 +14,14 @@ include $(TOPDIR)/rules.mk # - check if default mode has changed from being tcp_only # PKG_NAME:=shadowsocks-libev -PKG_VERSION:=3.1.3 +PKG_VERSION:=3.2.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(PKG_VERSION) -PKG_HASH:=58fb438d2cfe33cfa6ac8c50e587e2138c50e59a4b943f88d22883bf2e192a96 +PKG_HASH:=5521cf623a07fd1e393528516a83acd2b66c5d4bb4535a52662806a6a060c606 -PKG_MAINTAINER:=Yousong Zhou +PKG_MAINTAINER:=Ycarus (Yannick Chabanois) PKG_LICENSE:=GPL-3.0+ PKG_LICENSE_FILES:=LICENSE diff --git a/shadowsocks-libev/files/firewall.ss-rules b/shadowsocks-libev/files/firewall.ss-rules index 3a1d32cdc..3134150d8 100644 --- a/shadowsocks-libev/files/firewall.ss-rules +++ b/shadowsocks-libev/files/firewall.ss-rules @@ -1,2 +1,2 @@ #!/bin/sh -/etc/init.d/shadowsocks-libev reload +/etc/init.d/shadowsocks-libev rules_up diff --git a/shadowsocks-libev/files/shadowsocks-libev.config b/shadowsocks-libev/files/shadowsocks-libev.config index aec3dd044..752d164ca 100644 --- a/shadowsocks-libev/files/shadowsocks-libev.config +++ b/shadowsocks-libev/files/shadowsocks-libev.config @@ -3,7 +3,7 @@ config ss_redir hi option local_address '::' option local_port '1100' option mode 'tcp_and_udp' - option timeout '60' + option timeout '600' option fast_open 1 option verbose 0 option reuse_port 1 @@ -15,7 +15,7 @@ config ss_redir hi2 option local_address '0.0.0.0' option local_port '1100' option mode 'tcp_and_udp' - option timeout '60' + option timeout '600' option fast_open 1 option verbose 0 option reuse_port 1 @@ -25,7 +25,6 @@ config ss_redir hi2 config ss_rules 'ss_rules' option disabled 0 option redir_tcp 'hi' - option redir_udp 'hi' option src_default 'forward' option dst_default 'forward' option local_default 'forward' @@ -35,8 +34,8 @@ config server 'sss0' option disabled 1 option server '192.168.1.3' option server_port '65101' - option key '************' - option method 'aes-256-cfb' + option key '' + option method 'chacha20' config ss_tunnel 'dns' option disabled 1 diff --git a/shadowsocks-libev/files/shadowsocks-libev.init b/shadowsocks-libev/files/shadowsocks-libev.init index adec4d584..abf3467f7 100644 --- a/shadowsocks-libev/files/shadowsocks-libev.init +++ b/shadowsocks-libev/files/shadowsocks-libev.init @@ -9,7 +9,7 @@ USE_PROCD=1 EXTRA_COMMANDS="rules_up rules_down" -START=99 +START=98 ss_confdir=/var/etc/shadowsocks-libev ss_bindir=/usr/bin @@ -49,6 +49,7 @@ ss_mkjson_server_conf_() { [ -n "$server_port" ] || return 1 password="${password//\"/\\\"}" key="$(echo $key | sed 's/+/-/g; s/\//_/g;')" + [ "$method" = "none" -a -z "$key" ] && key="none" cat <<-EOF ${server:+${q}server${q}: ${q}$server${q},} "server_port": $server_port, @@ -82,13 +83,14 @@ ss_mkjson_ss_local_conf() { ss_mkjson_server_conf [ "$obfs" = 0 ] && obfs=false || obfs=true if $obfs; then - obfs_options="--obfs $obfs_type" - [ -z "$obfs_host" ] || obfs_options="$obfs_options --obfs-host $obfs_host" - [ -z "$obfs_uri" ] || obfs_options="$obfs_options --obfs-uri $obfs_uri" - [ "$fast_open" = 1 ] && obfs_options="$obfs_options --fast-open" - [ "$mptcp" = 1 ] && obfs_options="$obfs_options --mptcp" + obfs_options="obfs=$obfs_type" + [ -z "$obfs_host" ] || obfs_options="$obfs_options;obfs-host=$obfs_host" + [ -z "$obfs_uri" ] || obfs_options="$obfs_options;obfs-uri=$obfs_uri" + [ "$fast_open" = true ] && obfs_options="$obfs_options;fast-open" + [ "$mptcp" = true ] && obfs_options="$obfs_options;mptcp" + [ -z "$timeout" ] || obfs_options="$obfs_options;t=$timeout" cat <<-EOF - ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local $obfs_options${q},} + ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local${q},${q}plugin_opts${q}: ${q}$obfs_options${q},} EOF fi } @@ -101,13 +103,14 @@ ss_mkjson_ss_redir_conf() { EOF [ "$obfs" = 0 ] && obfs=false || obfs=true if $obfs; then - obfs_options="--obfs $obfs_type" - [ -z "$obfs_host" ] || obfs_options="$obfs_options --obfs-host $obfs_host" - [ -z "$obfs_uri" ] || obfs_options="$obfs_options --obfs-uri $obfs_uri" - [ "$fast_open" = 1 ] && obfs_options="$obfs_options --fast-open" - [ "$mptcp" = 1 ] && obfs_options="$obfs_options --mptcp" + obfs_options="obfs=$obfs_type" + [ -z "$obfs_host" ] || obfs_options="$obfs_options;obfs-host=$obfs_host" + [ -z "$obfs_uri" ] || obfs_options="$obfs_options;obfs-uri=$obfs_uri" + [ "$fast_open" = true ] && obfs_options="$obfs_options;fast-open" + [ "$mptcp" = true ] && obfs_options="$obfs_options;mptcp" + [ -z "$timeout" ] || obfs_options="$obfs_options;t=$timeout" cat <<-EOF - ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local $obfs_options${q},} + ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local${q},${q}plugin_opts${q}: ${q}$obfs_options${q},} EOF fi } @@ -116,11 +119,12 @@ ss_mkjson_ss_server_conf() { ss_mkjson_server_conf_ [ "$obfs" = 0 ] && obfs=false || obfs=true if $obfs; then - obfs_options="--obfs $obfs_type" - [ "$fast_open" = 1 ] && obfs_options="$obfs_options --fast-open" - [ "$mptcp" = 1 ] && obfs_options="$obfs_options --mptcp" + obfs_options="obfs=$obfs_type" + [ "$fast_open" = true ] && obfs_options="$obfs_options;fast-open" + [ "$mptcp" = true ] && obfs_options="$obfs_options;mptcp" + [ -z "$timeout" ] || obfs_options="$obfs_options;t=$timeout" cat <<-EOF - ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-server $obfs_options${q},} + ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-server${q},${q}plugin_opts${q}: ${q}$obfs_options${q},} EOF fi } @@ -134,10 +138,11 @@ ss_mkjson_ss_tunnel_conf() { [ "$obfs" = 0 ] && obfs=false || obfs=true if $obfs; then obfs_options="obfs=$obfs_type" - [ -z "$obfs_host" ] || obfs_options="$obfs_options --obfs-host $obfs_host" - [ -z "$obfs_uri" ] || obfs_options="$obfs_options --obfs-uri $obfs_uri" + [ -z "$obfs_host" ] || obfs_options="$obfs_options;obfs-host=$obfs_host" + [ -z "$obfs_uri" ] || obfs_options="$obfs_options;obfs-uri=$obfs_uri" + [ -z "$timeout" ] || obfs_options="$obfs_options;t=$timeout" cat <<-EOF - ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local $obfs_options${q},} + ${obfs:+${q}plugin${q}: ${q}/usr/bin/obfs-local${q},${q}plugin_opts${q}: ${q}$obfs_options${q},} EOF fi } @@ -186,11 +191,11 @@ ss_rules_cb() { config_get cfgserver "$cfg" server config_get server "$cfgserver" server ss_redir_servers="$ss_redir_servers $server" - if [ "$mode" = tcp_only -o "$mode" = "tcp_and_udp" ]; then + if [ "$mode" = "tcp_only" -o "$mode" = "tcp_and_udp" ]; then eval "ss_rules_redir_tcp_$cfg=$local_port" eval "ss_rules6_redir_tcp_$cfg=$local_port" fi - if [ "$mode" = udp_only -o "$mode" = "tcp_and_udp" ]; then + if [ "$mode" = "udp_only" -o "$mode" = "tcp_and_udp" ]; then eval "ss_rules_redir_udp_$cfg=$local_port" eval "ss_rules6_redir_udp_$cfg=$local_port" fi @@ -316,6 +321,11 @@ stop_service() { rm -rf "$ss_confdir" } +reload_service() { + stop + start +} + _rules_status() { [ -n "$(iptables -t nat -L | grep ss_rules_forward)" ] && return 1 return 0 @@ -371,7 +381,7 @@ validate_common_server_options_() { local cfgtype="$1"; shift local cfg="$1"; shift local func="$1"; shift - local stream_methods='"table", "rc4", "rc4-md5", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "bf-cfb", "camellia-128-cfb", "camellia-192-cfb", "camellia-256-cfb", "salsa20", "chacha20", "chacha20-ietf"' + local stream_methods='"none", "table", "rc4", "rc4-md5", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "bf-cfb", "camellia-128-cfb", "camellia-192-cfb", "camellia-256-cfb", "salsa20", "chacha20", "chacha20-ietf"' local aead_methods='"aes-128-gcm", "aes-192-gcm", "aes-256-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305"' "${func:-ss_validate}" "$cfgtype" "$cfg" "$@" \ diff --git a/shadowsocks-libev/files/shadowsocks.conf b/shadowsocks-libev/files/shadowsocks.conf index 28421146e..9f705a6f1 100644 --- a/shadowsocks-libev/files/shadowsocks.conf +++ b/shadowsocks-libev/files/shadowsocks.conf @@ -1,6 +1,6 @@ # local sysctl settings can be stored in this directory # max open files -#fs.file-max = 512000 +fs.file-max = 512000 # max read buffer net.core.rmem_max = 134217728 # max write buffer @@ -23,11 +23,11 @@ net.ipv4.tcp_tw_recycle = 0 # short FIN timeout net.ipv4.tcp_fin_timeout = 30 # short keepalive time -net.ipv4.tcp_keepalive_time = 2400 +#net.ipv4.tcp_keepalive_time = 2400 # outbound port range -net.ipv4.ip_local_port_range = 10000 65000 +net.ipv4.ip_local_port_range = 9999 65000 # max SYN backlog -net.ipv4.tcp_max_syn_backlog = 4096 +et.ipv4.tcp_max_syn_backlog = 10240 # max timewait sockets held by system simultaneously net.ipv4.tcp_max_tw_buckets = 10000 # turn on TCP Fast Open on both client and server side @@ -36,7 +36,9 @@ net.ipv4.tcp_fastopen = 3 net.ipv4.tcp_rmem = 4096 87380 134217728 # TCP write buffer net.ipv4.tcp_wmem = 4096 65536 134217728 -# turn on path MTU discovery +# TCP buffer +net.ipv4.tcp_mem = 134217728 134277728 134217728 +# turn off path MTU discovery net.ipv4.tcp_mtu_probing = 0 # for low-latency network, use cubic instead diff --git a/shadowsocks-libev/files/ss-rules b/shadowsocks-libev/files/ss-rules index ecad193dc..37b069b61 100755 --- a/shadowsocks-libev/files/ss-rules +++ b/shadowsocks-libev/files/ss-rules @@ -1,6 +1,7 @@ #!/bin/sh -e # # Copyright (C) 2017 Yousong Zhou +# Copyright (C) 2018 Ycarus (Yannick Chabanois) # # The design idea was derived from ss-rules by Jian Chang # @@ -186,6 +187,7 @@ ss_rules_iptchains_init_tcp() { -I OUTPUT 1 -p tcp -j ss_rules_local_out -A ss_rules_local_out -m set --match-set ss_rules_dst_bypass dst -j RETURN -A ss_rules_local_out -m set --match-set ss_rules_dst_bypass_ dst -j RETURN + -A ss_rules_local_out -m mark --mark 0x539 -j RETURN -A ss_rules_local_out -p tcp $o_ipt_extra -j $local_target -m comment --comment "local_default: $o_local_default" COMMIT EOF @@ -241,7 +243,9 @@ ss_rules_iptchains_init_() { :ss_rules_forward - $(ss_rules_iptchains_mkprerules "$proto") -A ss_rules_pre_src -m set --match-set ss_rules_dst_bypass_ dst -j RETURN + -A ss_rules_pre_src -m set --match-set ss_rules_dst_bypass dst -j MARK --set-mark 0x539 -A ss_rules_pre_src -m set --match-set ss_rules_dst_bypass dst -j RETURN + -A ss_rules_pre_src -m mark --mark 0x539 -j RETURN -A ss_rules_dst -m set --match-set ss_rules_dst_bypass dst -j RETURN -A ss_rules_pre_src -p $proto $o_ipt_extra -j ss_rules_src -A ss_rules_src -m set --match-set ss_rules_src_bypass src -j RETURN diff --git a/shadowsocks-libev/files/ss-rules6 b/shadowsocks-libev/files/ss-rules6 index c408276e2..2335e72e2 100755 --- a/shadowsocks-libev/files/ss-rules6 +++ b/shadowsocks-libev/files/ss-rules6 @@ -52,7 +52,8 @@ EOF } o_dst_bypass_=" - FE80::/10 + fe80::/10 + fd00::/8 " o_src_default=bypass o_dst_default=bypass @@ -168,8 +169,9 @@ ss_rules6_iptchains_init_tcp() { *nat :ss_rules6_local_out - -I OUTPUT 1 -p tcp -j ss_rules6_local_out - -A ss_rules6_local_out -m set --match-set ss_rules6_dst_bypass_ dst -j RETURN -A ss_rules6_local_out -m set --match-set ss_rules6_dst_bypass dst -j RETURN + -A ss_rules6_local_out -m set --match-set ss_rules6_dst_bypass_ dst -j RETURN + -A ss_rules6_local_out -m mark --mark 0x539 -j RETURN -A ss_rules6_local_out -p tcp $o_ipt_extra -j $local_target -m comment --comment "local_default: $o_local_default" COMMIT EOF @@ -226,7 +228,9 @@ ss_rules6_iptchains_init_() { :ss_rules6_forward - $(ss_rules6_iptchains_mkprerules "$proto") -A ss_rules6_pre_src -m set --match-set ss_rules6_dst_bypass_ dst -j RETURN - -A ss_rules6_dst -m set --match-set ss_rules6_dst_bypass dst -j MARK --set-mark 0x539 + -A ss_rules6_pre_src -m set --match-set ss_rules6_dst_bypass dst -j MARK --set-mark 0x539 + -A ss_rules6_pre_src -m set --match-set ss_rules6_dst_bypass dst -j RETURN + -A ss_rules6_pre_src -m mark --mark 0x539 -j RETURN -A ss_rules6_dst -m set --match-set ss_rules6_dst_bypass dst -j RETURN -A ss_rules6_pre_src -p $proto $o_ipt_extra -j ss_rules6_src -A ss_rules6_src -m set --match-set ss_rules6_src_bypass src -j RETURN diff --git a/shadowsocks-libev/patches/020-NOCRYPTO.patch b/shadowsocks-libev/patches/020-NOCRYPTO.patch index 781efa06a..6b83563d3 100644 --- a/shadowsocks-libev/patches/020-NOCRYPTO.patch +++ b/shadowsocks-libev/patches/020-NOCRYPTO.patch @@ -275,10 +275,10 @@ index dcc5fd9b..2e689b7a 100644 @@ -31,7 +31,8 @@ crypto_src = crypto.c \ aead.c \ stream.c \ - ppbloom.c \ + ppbloom.c \ - base64.c + base64.c \ -+ nocrypto.c ++ noencrypt.c plugin_src = plugin.c @@ -504,29 +504,6 @@ index 38057da7..206c18de 100644 +#endif //_NOENCRYPT_H \ No newline at end of file -From bc2e77324ab6e13179c89f59ea270cf7f85a60c5 Mon Sep 17 00:00:00 2001 -From: Fejes Ferenc -Date: Mon, 31 Jul 2017 12:48:26 +0200 -Subject: [PATCH 07/17] fixes - ---- - src/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 2e689b7a..90e2d598 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -32,7 +32,7 @@ crypto_src = crypto.c \ - stream.c \ - ppbloom.c \ - base64.c \ -- nocrypto.c -+ noencrypt.c - - plugin_src = plugin.c - - From 07607127317804319b0cb358080516ee99cf30e0 Mon Sep 17 00:00:00 2001 From: Fejes Ferenc Date: Mon, 31 Jul 2017 12:57:46 +0200 diff --git a/speedtestc/Makefile b/speedtestc/Makefile index 890aa0fd5..531ce4428 100644 --- a/speedtestc/Makefile +++ b/speedtestc/Makefile @@ -8,11 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=speedtestc -PKG_RELEASE:=1 +PKG_RELEASE:=2 -PKG_SOURCE_URL:=https://github.com/mobrembski/SpeedTestC.git +#PKG_SOURCE_URL:=https://github.com/mobrembski/SpeedTestC.git +PKG_SOURCE_URL:=https://github.com/egliu/SpeedTestC.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=56482555e34f7f4002b116efd63cfa68634d389f +#PKG_SOURCE_VERSION:=56482555e34f7f4002b116efd63cfa68634d389f +PKG_SOURCE_VERSION:=f7623914afabda582f146caab1081e601a34e882 PKG_MAINTAINER:=Ycarus (Yannick Chabanois) PKG_LICENSE:=GPL-2.0 diff --git a/speedtestc/patches/compile-fix.patch b/speedtestc/patches/compile-fix.patch new file mode 100644 index 000000000..859866bf1 --- /dev/null +++ b/speedtestc/patches/compile-fix.patch @@ -0,0 +1,81 @@ +diff --git a/src/SpeedtestConfig.c b/SpeedTestC/src/SpeedtestConfig.c +index 7b60a59..d9f58c9 100644 +--- a/src/SpeedtestConfig.c ++++ b/src/SpeedtestConfig.c +@@ -50,7 +50,7 @@ static void parseClient(const char *configline, SPEEDTESTCONFIG_T **result_p) + char lat[16] = {0}; + char lon[16] = {0}; + +- if(sscanf(configline,"%*[^\"]\"%15[^\"]\"%*[^\"]\"%15[^\"]\"%*[^\"]\"%15[^\"]\"%*[^\"]\"%255[^\"]\"", ++ if(sscanf(configline,"%*[^\"]\"%15[^\"]\"%*[^\"]\"%20[^\"]\"%*[^\"]\"%20[^\"]\"%*[^\"]\"%255[^\"]\"", + result->ip, lat, lon, result->isp)!=4) + { + fprintf(stderr,"Cannot parse all fields! Config line: %s", configline); +diff --git a/src/SpeedtestDownloadTest.c b/src/SpeedtestDownloadTest.c +index 54ed45d..545582a 100644 +--- a/src/SpeedtestDownloadTest.c ++++ b/src/SpeedtestDownloadTest.c +@@ -32,7 +32,7 @@ static void *__downloadThread(void *arg) + return NULL; + } + +-void testDownload(const char *url) ++void testDownload(char *url) + { + size_t numOfThreads = speedTestConfig->downloadThreadConfig.count * + speedTestConfig->downloadThreadConfig.sizeLength; +diff --git a/src/SpeedtestDownloadTest.h b/src/SpeedtestDownloadTest.h +index e341f31..45e9d9a 100644 +--- a/src/SpeedtestDownloadTest.h ++++ b/src/SpeedtestDownloadTest.h +@@ -1,6 +1,6 @@ + #ifndef _SPEEDTEST_DOWNLOAD_TEST_ + #define _SPEEDTEST_DOWNLOAD_TEST_ + +-void testDownload(const char *url); ++void testDownload(char *url); + + #endif +diff --git a/src/SpeedtestServers.c b/src/SpeedtestServers.c +index 5456f69..e3ca9b4 100644 +--- a/src/SpeedtestServers.c ++++ b/src/SpeedtestServers.c +@@ -106,9 +106,9 @@ SPEEDTESTSERVER_T **getServers(int *serverCount, char *ignoreServers, float lat, + "http://c.speedtest.net/speedtest-servers-static.php", + "http://www.speedtest.net/speedtest-servers.php", + "http://c.speedtest.net/speedtest-servers.php"}; +- const u_int32_t urlsCount = 4; +- u_int32_t count = 0; +- u_int32_t reallocCount = 0; ++ const __int32_t urlsCount = 4; ++ __int32_t count = 0; ++ __int32_t reallocCount = 0; + + /* malloc the size as the macro SERVER_SIZE defines */ + list = (SPEEDTESTSERVER_T**)calloc(SERVER_SIZE, sizeof(SPEEDTESTSERVER_T**)); +diff --git a/src/SpeedtestUploadTest.c b/src/SpeedtestUploadTest.c +index b0414df..5804af6 100644 +--- a/src/SpeedtestUploadTest.c ++++ b/src/SpeedtestUploadTest.c +@@ -24,7 +24,7 @@ static void *__uploadThread(void *arg) + { + /* Testing upload... */ + THREADARGS_T *threadConfig = (THREADARGS_T *)arg; +- int i, size, sockId; ++ int size, sockId; + unsigned long totalTransfered = 0; + char uploadUrl[1024]; + +diff --git a/src/http.c b/src/http.c +index 7ace0e1..4c03205 100644 +--- a/src/http.c ++++ b/src/http.c +@@ -112,7 +112,7 @@ int httpGet(char* pAddress, int pPort, char* pRequest) + + } + +- if(!success == 1) ++ if((!success) == 1) + { + close(sockId); + return 0; diff --git a/tracebox/Makefile b/tracebox/Makefile new file mode 100644 index 000000000..042ab2b29 --- /dev/null +++ b/tracebox/Makefile @@ -0,0 +1,51 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=tracebox +PKG_VERSION:=0.4.4 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_URL:=git@github.com:tracebox/tracebox.git +PKG_MAINTAINER:=Gregory Detal + +PKG_SOURCE_PROTO:=git +PKG_SOURCE_VERSION:=v0.4.4 + +PKG_FIXUP:=autoreconf + +#include $(INCLUDE_DIR)/uclibc++.mk +include $(INCLUDE_DIR)/package.mk +#include $(INCLUDE_DIR)/autotools.mk + +define Package/tracebox + SECTION:=net + CATEGORY:=Network + TITLE:=tracebox + DEPENDS:=+liblua +libpcap +libpthread +librt +curl +libjson-c +libnetfilter-queue +libstdcpp +endef + +define Package/tracebox/description + Tracebox is a tool that allows to detect middleboxes on any paths, i.e., +between a source and any destination. Tracebox can be viewed as a tool similar +to traceroute as it uses ICMP replies to identify changes in the packets. +endef + +CONFIGURE_VARS += \ + ac_cv_header_lua_h=no \ + ax_header_version_match=yes + +CONFIGURE_ARGS += --enable-sniffer --enable-curl --with-libpcap="$(STAGING_DIR)/usr/include/" +#CONFIGURE_ARGS += --enable-sniffer --enable-curl +#CONFIGURE_ARGS += --disable-shared --enable-static + +EXTRA_CPPFLAGS += -fpermissive -Wno-variadic-macros + +TARGET_CFLAGS += -D_GNU_SOURCE + +define Package/tracebox/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/tracebox/tracebox $(1)/usr/sbin/tracebox +endef + +$(eval $(call BuildPackage,tracebox)) diff --git a/tracebox/patches/101-build-fixes.patch b/tracebox/patches/101-build-fixes.patch new file mode 100644 index 000000000..c10739153 --- /dev/null +++ b/tracebox/patches/101-build-fixes.patch @@ -0,0 +1,33 @@ +diff --git a/noinst/libcrafter/libcrafter/crafter/Fields/NumericFields.cpp b/noinst/libcrafter/libcrafter/crafter/Fields/NumericFields.cpp +index 86b77e6..7de1eb7 100644 +--- a/noinst/libcrafter/libcrafter/crafter/Fields/NumericFields.cpp ++++ b/noinst/libcrafter/libcrafter/crafter/Fields/NumericFields.cpp +@@ -270,8 +270,15 @@ Int64Field::Int64Field(const std::string& name, size_t nword, size_t nbyte) : + offset = nword * 4 + nbyte; + } + ++static string genString(uint64_t val) ++{ ++ char temp[21]; ++ sprintf(temp, "%llu", val); ++ return temp; ++} ++ + void Int64Field::PrintValue(std::ostream& str) const { +- str << GetName() << " = " << dec << (uint64_t)human; ++ str << GetName() << " = " << dec << genString(human); + } + + FieldInfo* Int64Field::Clone() const { +diff --git a/noinst/libcrafter/libcrafter/crafter/Packet.h b/noinst/libcrafter/libcrafter/crafter/Packet.h +index 2fa813d..25c0fa1 100644 +--- a/noinst/libcrafter/libcrafter/crafter/Packet.h ++++ b/noinst/libcrafter/libcrafter/crafter/Packet.h +@@ -33,6 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include + #include + #include ++#include + + #include "Crafter.h" + #include "Utils/RawSocket.h" diff --git a/tracebox/patches/102-configure.patch b/tracebox/patches/102-configure.patch new file mode 100644 index 000000000..9aeb84973 --- /dev/null +++ b/tracebox/patches/102-configure.patch @@ -0,0 +1,19 @@ +--- a/configure.ac 2018-07-20 16:15:42.284633906 +0200 ++++ b/configure.ac 2018-07-20 16:16:09.812296939 +0200 +@@ -162,16 +162,8 @@ + ;; + *) + AC_MSG_RESULT($withval) +- if test -f $withval/pcap.h -a \ +- -f $withval/libpcap.a -a \ +- -d $withval/pcap; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi + PCAPINC="-I$withval -I$withval/bpf" + PCAPLIB="-L$withval -lpcap" +- else +- AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval) +- fi + ;; + esac ], + [ if test -f ${prefix}/include/pcap.h; then diff --git a/tracebox/patches/103-configure.patch b/tracebox/patches/103-configure.patch new file mode 100644 index 000000000..120fcfa71 --- /dev/null +++ b/tracebox/patches/103-configure.patch @@ -0,0 +1,24 @@ +--- a/noinst/libcrafter/libcrafter/configure.ac.anc 2018-07-20 16:45:10.760534965 +0200 ++++ b/noinst/libcrafter/libcrafter/configure.ac 2018-07-20 16:46:03.339973975 +0200 +@@ -29,21 +29,8 @@ + ;; + *) + AC_MSG_RESULT($withval) +- if test -f $withval/pcap.h -a -f $withval/libpcap.a; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi + PCAPINC="-I$withval -I$withval/bpf" + PCAPLIB="-L$withval -lpcap" +- elif test -f $withval/include/pcap.h -a \ +- -f $withval/include/net/bpf.h -a \ +- -f $withval/lib/libpcap.a; then +- owd=`pwd` +- if cd $withval; then withval=`pwd`; cd $owd; fi +- PCAPINC="-I$withval/include" +- PCAPLIB="-L$withval/lib -lpcap" +- else +- AC_ERROR(pcap.h, net/bpf.h, or libpcap.a not found in $withval) +- fi + ;; + esac ], + [ if test -f ${prefix}/include/pcap.h; then diff --git a/tracebox/patches/104-ns_name_compress.patch b/tracebox/patches/104-ns_name_compress.patch new file mode 100644 index 000000000..76cd520a3 --- /dev/null +++ b/tracebox/patches/104-ns_name_compress.patch @@ -0,0 +1,31 @@ +--- a/noinst/libcrafter/libcrafter/crafter/Protocols/DNSQuery.cpp 2018-07-20 17:28:21.252256760 +0200 ++++ b/noinst/libcrafter/libcrafter/crafter/Protocols/DNSQuery.cpp 2018-07-20 17:28:35.092103432 +0200 +@@ -85,7 +85,7 @@ + + size_t DNS::DNSQuery::Compress() { + /* Put data into the buffer */ +- int nbytes = ns_name_compress(qname.c_str(), cqname, sizeof(cqname) , NULL, ++ int nbytes = dn_comp(qname.c_str(), cqname, sizeof(cqname) , NULL, + NULL); + if(nbytes == -1) + throw std::runtime_error("DNS::DNSQuery::Compress() : Error compressing the domain name provided"); +--- a/noinst/libcrafter/libcrafter/crafter/Protocols/DNSAnswer.cpp 2018-07-20 17:37:46.614513337 +0200 ++++ b/noinst/libcrafter/libcrafter/crafter/Protocols/DNSAnswer.cpp 2018-07-20 17:38:24.298131516 +0200 +@@ -209,7 +209,7 @@ + + size_t DNS::DNSAnswer::CompressName() { + /* Put data into the buffer */ +- int nbytes = ns_name_compress(qname.c_str(), cqname, sizeof(cqname), NULL, ++ int nbytes = dn_comp(qname.c_str(), cqname, sizeof(cqname), NULL, + NULL); + if(nbytes == -1) + throw std::runtime_error("DNSAnswer::CompressName() : Error compressing the domain name provided"); +@@ -224,7 +224,7 @@ + size_t DNS::DNSAnswer::CompressRData() { + if (rdata.find_first_of("abcdefghijklmnopqrstuvwxyzABCDEFGHIKKLMNOPQRSTUVWXYZ") != std::string::npos) { + /* Put data into the buffer */ +- int nbytes = ns_name_compress(rdata.c_str(), crdata, sizeof(crdata), ++ int nbytes = dn_comp(rdata.c_str(), crdata, sizeof(crdata), + NULL, NULL); + if(nbytes == -1) + throw std::runtime_error("DNSAnswer::CompressRData() : Error compressing the domain name provided"); diff --git a/tracebox/patches/202-fix-lua-include-hpp.patch b/tracebox/patches/202-fix-lua-include-hpp.patch new file mode 100644 index 000000000..939c23a70 --- /dev/null +++ b/tracebox/patches/202-fix-lua-include-hpp.patch @@ -0,0 +1,32 @@ +--- a/src/tracebox/lua.cc 2018-07-20 18:03:00.439624791 +0200 ++++ b/src/tracebox/lua.cc 2018-07-20 18:03:38.035263456 +0200 +@@ -6,7 +6,12 @@ + */ + + ++extern "C" { ++#include "lua.h" ++#include "lualib.h" ++#include "lauxlib.h" ++} + #include "lua/lua_packet.hpp" + #include "config.h" + + extern lua_State* l_init(); +--- a/src/tracebox/lua/lua_base.hpp 2018-08-06 09:43:49.589813406 +0200 ++++ b/src/tracebox/lua/lua_base.hpp 2018-08-06 09:44:27.773454118 +0200 +@@ -13,8 +13,12 @@ + #include + + #define LUA_COMPAT_ALL +-#include +-#include ++extern "C" { ++#include "lua.h" ++#include "lualib.h" ++#include "lauxlib.h" ++} ++ + + #include "config.h" + diff --git a/tracebox/patches/204-fix-lua-namespace-crafter.patch b/tracebox/patches/204-fix-lua-namespace-crafter.patch new file mode 100644 index 000000000..d58614406 --- /dev/null +++ b/tracebox/patches/204-fix-lua-namespace-crafter.patch @@ -0,0 +1,10 @@ +--- a/src/tracebox/lua.cc 2018-07-20 20:04:08.984285796 +0200 ++++ b/src/tracebox/lua.cc 2018-07-20 20:04:22.336156705 +0200 +@@ -12,6 +12,7 @@ + #include "lauxlib.h" + } + #include "config.h" ++#include "PartialHeader.h" + + extern lua_State* l_init(); + diff --git a/whois/Makefile b/whois/Makefile new file mode 100644 index 000000000..4b6526ea0 --- /dev/null +++ b/whois/Makefile @@ -0,0 +1,46 @@ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=whois +PKG_VERSION:=5.3.2 +PKG_RELEASE:=1 + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.xz +PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/w/whois +PKG_HASH:=79714ba89172bca08a2443f59885daa4af0c5f8d6a49bc9e7f2a83559a286354 +PKG_CAT:=xzcat + +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/whois + SECTION:=net + CATEGORY:=Network + TITLE:=WHOIS commandline utility + URL:=http://ftp.debian.org/debian/pool/main/w/whois + MAINTAINER:=Kihamo +endef + +define Package/whois/description + Utility to display information from WHOIS servers +endef + +define Package/whois/conffiles +/etc/whois.conf +endef + +MAKE_FLAGS += \ + prefix=$(PKG_BUILD_DIR) + +define Package/whois/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/whois $(1)/usr/sbin + $(INSTALL_DIR) $(1)/etc + $(INSTALL_DATA) $(PKG_BUILD_DIR)/whois.conf $(1)/etc/whois.conf +endef + +$(eval $(call BuildPackage,whois)) +