From de703962616d3a054816f3b8876acc50c0419cc1 Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Sat, 14 Nov 2015 11:43:18 +0530 Subject: [PATCH] Update translations for i18n fixes --- plinth/locale/de/LC_MESSAGES/django.po | 211 ++++++++------- plinth/locale/es/LC_MESSAGES/django.po | 211 ++++++++------- plinth/locale/fake/LC_MESSAGES/django.po | 323 +++++++++++------------ plinth/locale/fr/LC_MESSAGES/django.po | 237 +++++++++-------- plinth/locale/it/LC_MESSAGES/django.po | 211 ++++++++------- plinth/locale/pt/LC_MESSAGES/django.po | 211 ++++++++------- 6 files changed, 694 insertions(+), 710 deletions(-) diff --git a/plinth/locale/de/LC_MESSAGES/django.po b/plinth/locale/de/LC_MESSAGES/django.po index 3dcc547cc..8b7ffbc2b 100644 --- a/plinth/locale/de/LC_MESSAGES/django.po +++ b/plinth/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-13 22:39+0530\n" +"POT-Creation-Date: 2015-11-14 11:19+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -64,7 +64,7 @@ msgstr "" #, python-format msgid "" "You can install and run various services and applications on your " -"%(cfg.box_name)s." +"%(box_name)s." msgstr "" #: modules/apps/templates/apps.html:35 @@ -99,8 +99,8 @@ msgstr "" #: modules/deluge/templates/deluge.html:39 modules/dynamicdns/dynamicdns.py:38 #: modules/firewall/templates/firewall.html:57 #: modules/mumble/templates/mumble.html:44 -#: modules/networks/templates/connection_show.html:257 -#: modules/openvpn/templates/openvpn.html:82 +#: modules/networks/templates/connection_show.html:261 +#: modules/openvpn/templates/openvpn.html:81 #: modules/privoxy/templates/privoxy.html:48 modules/tor/templates/tor.html:39 #: modules/transmission/templates/transmission.html:42 #: modules/xmpp/templates/xmpp.html:58 @@ -120,7 +120,7 @@ msgstr "" #: modules/deluge/templates/deluge.html:53 #: modules/ikiwiki/templates/ikiwiki.html:35 #: modules/mumble/templates/mumble.html:59 -#: modules/openvpn/templates/openvpn.html:131 +#: modules/openvpn/templates/openvpn.html:130 #: modules/owncloud/templates/owncloud.html:51 #: modules/privoxy/templates/privoxy.html:62 #: modules/roundcube/templates/roundcube.html:62 @@ -137,7 +137,7 @@ msgstr "" #: modules/ikiwiki/templates/ikiwiki.html:43 #: modules/ikiwiki/templates/ikiwiki_create.html:32 #: modules/mumble/templates/mumble.html:67 -#: modules/openvpn/templates/openvpn.html:139 +#: modules/openvpn/templates/openvpn.html:138 #: modules/privoxy/templates/privoxy.html:70 #: modules/restore/templates/restore_index.html:52 #: modules/roundcube/templates/roundcube.html:70 @@ -593,9 +593,8 @@ msgstr "" #, python-format msgid "" "Firewall is a network security system that controls the incoming and " -"outgoing network traffic on your %(cfg.box_name)s. Keeping a firewall " -"enabled and properly configured reduces risk of security threat from the " -"Internet." +"outgoing network traffic on your %(box_name)s. Keeping a firewall enabled " +"and properly configured reduces risk of security threat from the Internet." msgstr "" #: modules/firewall/templates/firewall.html:36 @@ -606,9 +605,9 @@ msgstr "" #, python-format msgid "" "Firewall daemon is not running. Please run it. Firewall comes enabled by " -"default on %(cfg.box_name)s. On any Debian based system (such as " -"%(cfg.box_name)s) you may run it using the command 'service firewalld start' " -"or in case of a system with systemd 'systemctl start firewalld'" +"default on %(box_name)s. On any Debian based system (such as %(box_name)s) " +"you may run it using the command 'service firewalld start' or in case of a " +"system with systemd 'systemctl start firewalld'" msgstr "" #: modules/firewall/templates/firewall.html:56 @@ -790,7 +789,7 @@ msgstr "" #, python-format msgid "" "The FreedomBox Manual is the best place to " -"start for information regarding %(cfg.box_name)s." +"start for information regarding %(box_name)s." msgstr "" #: modules/help/templates/help_index.html:36 @@ -1033,7 +1032,7 @@ msgid "Physical interface" msgstr "" #: modules/networks/forms.py:119 -#: modules/networks/templates/connection_show.html:142 +#: modules/networks/templates/connection_show.html:144 msgid "SSID" msgstr "" @@ -1042,7 +1041,7 @@ msgid "The visible name of the network." msgstr "" #: modules/networks/forms.py:122 -#: modules/networks/templates/connection_show.html:153 +#: modules/networks/templates/connection_show.html:157 msgid "Mode" msgstr "" @@ -1190,8 +1189,8 @@ msgid "Primary connection" msgstr "" #: modules/networks/templates/connection_show.html:73 -#: modules/networks/templates/connection_show.html:213 -#: modules/networks/templates/connection_show.html:252 +#: modules/networks/templates/connection_show.html:217 +#: modules/networks/templates/connection_show.html:256 msgid "yes" msgstr "" @@ -1236,90 +1235,90 @@ msgid "please check cable" msgstr "" #: modules/networks/templates/connection_show.html:133 -#: modules/networks/templates/connection_show.html:147 +#: modules/networks/templates/connection_show.html:149 msgid "Speed" msgstr "" #: modules/networks/templates/connection_show.html:135 #, python-format -msgid "%(device.ethernet.speed)s Mbit/s" +msgid "%(ethernet_speed)s Mbit/s" msgstr "" -#: modules/networks/templates/connection_show.html:149 +#: modules/networks/templates/connection_show.html:151 #, python-format -msgid "%(device.wireless.bitrate)s Mbit/s" +msgid "%(wireless_bitrate)s Mbit/s" msgstr "" -#: modules/networks/templates/connection_show.html:159 +#: modules/networks/templates/connection_show.html:163 msgid "Signal strength" msgstr "" -#: modules/networks/templates/connection_show.html:169 +#: modules/networks/templates/connection_show.html:173 msgid "Channel" msgstr "" -#: modules/networks/templates/connection_show.html:177 +#: modules/networks/templates/connection_show.html:181 msgid "IPv4" msgstr "" -#: modules/networks/templates/connection_show.html:182 -#: modules/networks/templates/connection_show.html:223 +#: modules/networks/templates/connection_show.html:186 +#: modules/networks/templates/connection_show.html:227 msgid "Method" msgstr "" -#: modules/networks/templates/connection_show.html:189 -#: modules/networks/templates/connection_show.html:230 +#: modules/networks/templates/connection_show.html:193 +#: modules/networks/templates/connection_show.html:234 msgid "IP address" msgstr "" -#: modules/networks/templates/connection_show.html:198 -#: modules/networks/templates/connection_show.html:237 +#: modules/networks/templates/connection_show.html:202 +#: modules/networks/templates/connection_show.html:241 msgid "Gateway" msgstr "" -#: modules/networks/templates/connection_show.html:205 -#: modules/networks/templates/connection_show.html:244 +#: modules/networks/templates/connection_show.html:209 +#: modules/networks/templates/connection_show.html:248 msgid "DNS server" msgstr "" -#: modules/networks/templates/connection_show.html:212 -#: modules/networks/templates/connection_show.html:251 +#: modules/networks/templates/connection_show.html:216 +#: modules/networks/templates/connection_show.html:255 msgid "Default" msgstr "" -#: modules/networks/templates/connection_show.html:218 +#: modules/networks/templates/connection_show.html:222 msgid "IPv6" msgstr "" -#: modules/networks/templates/connection_show.html:259 +#: modules/networks/templates/connection_show.html:263 msgid "This connection is not active." msgstr "" -#: modules/networks/templates/connection_show.html:262 +#: modules/networks/templates/connection_show.html:266 msgid "Security" msgstr "" -#: modules/networks/templates/connection_show.html:267 -#: modules/networks/templates/connection_show.html:287 -#: modules/networks/templates/connection_show.html:306 +#: modules/networks/templates/connection_show.html:271 +#: modules/networks/templates/connection_show.html:291 +#: modules/networks/templates/connection_show.html:310 msgid "Firewall zone" msgstr "" -#: modules/networks/templates/connection_show.html:276 +#: modules/networks/templates/connection_show.html:280 msgid "" "This interface should be connected to local network/machine. If you connect " "this interface to a public network, services meant to be available only " "internally will become available externally. This is a security risk." msgstr "" -#: modules/networks/templates/connection_show.html:296 +#: modules/networks/templates/connection_show.html:300 msgid "" "This interface should receive your Internet connection. If you connect it " "your a local network/machine, many services meant to available only " "internally will not be available." msgstr "" -#: modules/networks/templates/connection_show.html:315 +#: modules/networks/templates/connection_show.html:319 msgid "" "This interface is not maintained by FreedomBox. Its security status is " "unknown to FreedomBox. Many FreedomBox services may not be available on " @@ -1369,7 +1368,6 @@ msgid "Wi-Fi" msgstr "" #: modules/networks/templates/connections_diagram.html:89 -#: modules/networks/templates/connections_diagram.html:119 #, python-format msgid "Show connection %(connection.name)s" msgstr "" @@ -1378,13 +1376,18 @@ msgstr "" msgid "Internal" msgstr "" +#: modules/networks/templates/connections_diagram.html:119 +#, python-format +msgid "Show connection %(name)s" +msgstr "" + #: modules/networks/templates/connections_diagram.html:131 msgid "Computer" msgstr "" #: modules/networks/templates/connections_list.html:67 #, python-format -msgid "Delete connection %(connection.name)s" +msgid "Delete connection %(name)s" msgstr "" #: modules/networks/templates/connections_list.html:92 @@ -1413,66 +1416,65 @@ msgstr "" msgid "" "Virtual Private Network (VPN) is a technique for securely connecting two " "machines in order to access resources of a private network. While you are " -"away from home, you can connect to your %(cfg.box_name)s in order to join " -"your home network and access private/internal services provided by " -"%(cfg.box_name)s. You can also access the rest of the Internet via " -"%(cfg.box_name)s for added security and anonymity." +"away from home, you can connect to your %(box_name)s in order to join your " +"home network and access private/internal services provided by %(box_name)s. " +"You can also access the rest of the Internet via %(box_name)s for added " +"security and anonymity." msgstr "" -#: modules/openvpn/templates/openvpn.html:52 +#: modules/openvpn/templates/openvpn.html:51 msgid "Profile" msgstr "" -#: modules/openvpn/templates/openvpn.html:55 +#: modules/openvpn/templates/openvpn.html:54 #, python-format msgid "" -"To connect to %(cfg.box_name)s's VPN, you need to download a profile and " -"feed it to an OpenVPN client on your mobile or desktop machine. OpenVPN " -"Clients are available for most platforms. See documentation on recommended clients and instructions on how to " "configure them." msgstr "" -#: modules/openvpn/templates/openvpn.html:67 +#: modules/openvpn/templates/openvpn.html:66 #, python-format -msgid "" -"Profile is specific to each user of %(cfg.box_name)s. Keep it a secret." +msgid "Profile is specific to each user of %(box_name)s. Keep it a secret." msgstr "" -#: modules/openvpn/templates/openvpn.html:77 +#: modules/openvpn/templates/openvpn.html:76 msgid "Download my profile" msgstr "" -#: modules/openvpn/templates/openvpn.html:86 +#: modules/openvpn/templates/openvpn.html:85 #, python-format msgid "" "OpenVPN has not yet been setup. Performing a secure setup takes a very long " -"time. Depending on how fast your %(cfg.box_name)s is, it may even take " -"hours. If the setup is interrupted, you may start it again." +"time. Depending on how fast your %(box_name)s is, it may even take hours. " +"If the setup is interrupted, you may start it again." msgstr "" -#: modules/openvpn/templates/openvpn.html:98 +#: modules/openvpn/templates/openvpn.html:97 msgid "Start setup" msgstr "" -#: modules/openvpn/templates/openvpn.html:105 +#: modules/openvpn/templates/openvpn.html:104 msgid "OpenVPN setup is running" msgstr "" -#: modules/openvpn/templates/openvpn.html:109 +#: modules/openvpn/templates/openvpn.html:108 #, python-format msgid "" "To perform a secure setup, this process takes a very long time. Depending " -"on how fast your %(cfg.box_name)s is, it may even take hours. If the setup " -"is interrupted, you may start it again." +"on how fast your %(box_name)s is, it may even take hours. If the setup is " +"interrupted, you may start it again." msgstr "" -#: modules/openvpn/templates/openvpn.html:122 +#: modules/openvpn/templates/openvpn.html:121 msgid "OpenVPN server is running" msgstr "" -#: modules/openvpn/templates/openvpn.html:125 +#: modules/openvpn/templates/openvpn.html:124 msgid "OpenVPN server is not running" msgstr "" @@ -1666,7 +1668,7 @@ msgstr "" #: modules/pagekite/templates/pagekite_custom_services.html:89 #, python-format -msgid "connected to %(service.backend_host)s:%(service.backend_port)s" +msgid "connected to %(backend_host)s:%(backend_port)s" msgstr "" #: modules/pagekite/templates/pagekite_custom_services.html:101 @@ -1676,21 +1678,21 @@ msgstr "" #: modules/pagekite/templates/pagekite_introduction.html:26 #, python-format msgid "" -"PageKite is a system for exposing %(cfg.box_name)s services when you don't " -"have a direct connection to the Internet. You only need this if your " -"%(cfg.box_name)s services are unreachable from the rest of the Internet. " -"This includes the following situations:" +"PageKite is a system for exposing %(box_name)s services when you don't have " +"a direct connection to the Internet. You only need this if your %(box_name)s " +"services are unreachable from the rest of the Internet. This includes the " +"following situations:" msgstr "" #: modules/pagekite/templates/pagekite_introduction.html:37 #, python-format -msgid "%(cfg.box_name)s is behind a restricted firewall." +msgid "%(box_name)s is behind a restricted firewall." msgstr "" #: modules/pagekite/templates/pagekite_introduction.html:43 #, python-format msgid "" -"%(cfg.box_name)s is connected to a (wireless) router which you don't control." +"%(box_name)s is connected to a (wireless) router which you don't control." msgstr "" #: modules/pagekite/templates/pagekite_introduction.html:50 @@ -1715,10 +1717,10 @@ msgid "" "PageKite works around NAT, firewalls and IP-address limitations by using a " "combination of tunnels and reverse proxies. You can use any pagekite service " "provider, for example pagekite.net. In " -"future it might be possible to use your buddy's %(cfg.box_name)s for this." +"future it might be possible to use your buddy's %(box_name)s for this." msgstr "" -#: modules/pagekite/templates/pagekite_introduction.html:79 +#: modules/pagekite/templates/pagekite_introduction.html:78 #: modules/pagekite/views.py:36 msgid "Configure PageKite" msgstr "" @@ -1809,10 +1811,10 @@ msgstr "" #, python-format msgid "" "You can use Privoxy by modifying your browser proxy settings to your " -"%(cfg.box_name)s hostname (or IP address) with port 8118. While using " -"Privoxy, you can see its configuration details and documentation at http://config.privoxy.org/ or http://p.p" +"%(box_name)s hostname (or IP address) with port 8118. While using Privoxy, " +"you can see its configuration details and documentation at http://config.privoxy.org/ or http://p.p" msgstr "" #: modules/privoxy/templates/privoxy.html:53 @@ -1920,15 +1922,13 @@ msgstr "" #: modules/system/templates/system.html:28 #, python-format -msgid "" -"Here you can administrate the underlying system of your %(cfg.box_name)s." +msgid "Here you can administrate the underlying system of your %(box_name)s." msgstr "" #: modules/system/templates/system.html:35 #, python-format msgid "" -"The options affect the %(cfg.box_name)s at its most general level, so be " -"careful!" +"The options affect the %(box_name)s at its most general level, so be careful!" msgstr "" #: modules/tor/__init__.py:50 @@ -1978,7 +1978,7 @@ msgstr "" msgid "Hidden Service" msgstr "" -#: modules/tor/templates/tor.html:60 modules/tor/templates/tor.html.py:103 +#: modules/tor/templates/tor.html:60 modules/tor/templates/tor.html.py:102 msgid "Port" msgstr "" @@ -1989,24 +1989,23 @@ msgstr "" #: modules/tor/templates/tor.html:88 #, python-format msgid "" -"Your %(cfg.box_name)s is configured as a Tor bridge with obfsproxy, so it " -"can help circumvent censorship. If your {{ cfg.box_name }} is behind a " -"router or firewall, you should make sure the following ports are open, and " -"port-forwarded, if necessary:" +"Your %(box_name)s is configured as a Tor bridge with obfsproxy, so it can " +"help circumvent censorship. If your %(box_name)s is behind a router or " +"firewall, you should make sure the following ports are open, and port-" +"forwarded, if necessary:" msgstr "" -#: modules/tor/templates/tor.html:102 +#: modules/tor/templates/tor.html:101 msgid "Service" msgstr "" -#: modules/tor/templates/tor.html:118 +#: modules/tor/templates/tor.html:117 msgid "SOCKS" msgstr "" -#: modules/tor/templates/tor.html:121 +#: modules/tor/templates/tor.html:120 #, python-format -msgid "" -"A Tor SOCKS port is available on your %(cfg.box_name)s on TCP port 9050." +msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050." msgstr "" #: modules/tor/tor.py:44 @@ -2241,7 +2240,7 @@ msgstr "" #: modules/users/templates/users_change_password.html:27 #, python-format -msgid "Change Password for %(form.user.username)s" +msgid "Change Password for %(username)s" msgstr "" #: modules/users/templates/users_change_password.html:40 @@ -2255,7 +2254,7 @@ msgstr "" #: modules/users/templates/users_delete.html:27 #, python-format -msgid "Delete User %(object.username)s" +msgid "Delete User %(username)s" msgstr "" #: modules/users/templates/users_delete.html:32 @@ -2264,22 +2263,22 @@ msgstr "" #: modules/users/templates/users_delete.html:38 #, python-format -msgid "Delete %(object.username)s" +msgid "Delete %(username)s" msgstr "" #: modules/users/templates/users_list.html:46 #, python-format -msgid "Delete user %(user.username)s" +msgid "Delete user %(username)s" msgstr "" #: modules/users/templates/users_list.html:53 #, python-format -msgid "Edit user %(user.username)s" +msgid "Edit user %(username)s" msgstr "" #: modules/users/templates/users_update.html:35 #, python-format -msgid "Edit User %(object.username)s" +msgid "Edit User %(username)s" msgstr "" #: modules/users/templates/users_update.html:43 @@ -2487,12 +2486,10 @@ msgstr "" #: templates/package_install.html:74 #, python-format -msgid "" -"Installing %(transaction.package_names|join:\", \")s: " -"%(transaction.status_string)s" +msgid "Installing %(package_names)s: %(status)s" msgstr "" -#: templates/package_install.html:85 +#: templates/package_install.html:84 #, python-format -msgid "%(transaction.percentage)s%% complete" +msgid "%(percentage)s%% complete" msgstr "" diff --git a/plinth/locale/es/LC_MESSAGES/django.po b/plinth/locale/es/LC_MESSAGES/django.po index 3dcc547cc..8b7ffbc2b 100644 --- a/plinth/locale/es/LC_MESSAGES/django.po +++ b/plinth/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-13 22:39+0530\n" +"POT-Creation-Date: 2015-11-14 11:19+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -64,7 +64,7 @@ msgstr "" #, python-format msgid "" "You can install and run various services and applications on your " -"%(cfg.box_name)s." +"%(box_name)s." msgstr "" #: modules/apps/templates/apps.html:35 @@ -99,8 +99,8 @@ msgstr "" #: modules/deluge/templates/deluge.html:39 modules/dynamicdns/dynamicdns.py:38 #: modules/firewall/templates/firewall.html:57 #: modules/mumble/templates/mumble.html:44 -#: modules/networks/templates/connection_show.html:257 -#: modules/openvpn/templates/openvpn.html:82 +#: modules/networks/templates/connection_show.html:261 +#: modules/openvpn/templates/openvpn.html:81 #: modules/privoxy/templates/privoxy.html:48 modules/tor/templates/tor.html:39 #: modules/transmission/templates/transmission.html:42 #: modules/xmpp/templates/xmpp.html:58 @@ -120,7 +120,7 @@ msgstr "" #: modules/deluge/templates/deluge.html:53 #: modules/ikiwiki/templates/ikiwiki.html:35 #: modules/mumble/templates/mumble.html:59 -#: modules/openvpn/templates/openvpn.html:131 +#: modules/openvpn/templates/openvpn.html:130 #: modules/owncloud/templates/owncloud.html:51 #: modules/privoxy/templates/privoxy.html:62 #: modules/roundcube/templates/roundcube.html:62 @@ -137,7 +137,7 @@ msgstr "" #: modules/ikiwiki/templates/ikiwiki.html:43 #: modules/ikiwiki/templates/ikiwiki_create.html:32 #: modules/mumble/templates/mumble.html:67 -#: modules/openvpn/templates/openvpn.html:139 +#: modules/openvpn/templates/openvpn.html:138 #: modules/privoxy/templates/privoxy.html:70 #: modules/restore/templates/restore_index.html:52 #: modules/roundcube/templates/roundcube.html:70 @@ -593,9 +593,8 @@ msgstr "" #, python-format msgid "" "Firewall is a network security system that controls the incoming and " -"outgoing network traffic on your %(cfg.box_name)s. Keeping a firewall " -"enabled and properly configured reduces risk of security threat from the " -"Internet." +"outgoing network traffic on your %(box_name)s. Keeping a firewall enabled " +"and properly configured reduces risk of security threat from the Internet." msgstr "" #: modules/firewall/templates/firewall.html:36 @@ -606,9 +605,9 @@ msgstr "" #, python-format msgid "" "Firewall daemon is not running. Please run it. Firewall comes enabled by " -"default on %(cfg.box_name)s. On any Debian based system (such as " -"%(cfg.box_name)s) you may run it using the command 'service firewalld start' " -"or in case of a system with systemd 'systemctl start firewalld'" +"default on %(box_name)s. On any Debian based system (such as %(box_name)s) " +"you may run it using the command 'service firewalld start' or in case of a " +"system with systemd 'systemctl start firewalld'" msgstr "" #: modules/firewall/templates/firewall.html:56 @@ -790,7 +789,7 @@ msgstr "" #, python-format msgid "" "The FreedomBox Manual is the best place to " -"start for information regarding %(cfg.box_name)s." +"start for information regarding %(box_name)s." msgstr "" #: modules/help/templates/help_index.html:36 @@ -1033,7 +1032,7 @@ msgid "Physical interface" msgstr "" #: modules/networks/forms.py:119 -#: modules/networks/templates/connection_show.html:142 +#: modules/networks/templates/connection_show.html:144 msgid "SSID" msgstr "" @@ -1042,7 +1041,7 @@ msgid "The visible name of the network." msgstr "" #: modules/networks/forms.py:122 -#: modules/networks/templates/connection_show.html:153 +#: modules/networks/templates/connection_show.html:157 msgid "Mode" msgstr "" @@ -1190,8 +1189,8 @@ msgid "Primary connection" msgstr "" #: modules/networks/templates/connection_show.html:73 -#: modules/networks/templates/connection_show.html:213 -#: modules/networks/templates/connection_show.html:252 +#: modules/networks/templates/connection_show.html:217 +#: modules/networks/templates/connection_show.html:256 msgid "yes" msgstr "" @@ -1236,90 +1235,90 @@ msgid "please check cable" msgstr "" #: modules/networks/templates/connection_show.html:133 -#: modules/networks/templates/connection_show.html:147 +#: modules/networks/templates/connection_show.html:149 msgid "Speed" msgstr "" #: modules/networks/templates/connection_show.html:135 #, python-format -msgid "%(device.ethernet.speed)s Mbit/s" +msgid "%(ethernet_speed)s Mbit/s" msgstr "" -#: modules/networks/templates/connection_show.html:149 +#: modules/networks/templates/connection_show.html:151 #, python-format -msgid "%(device.wireless.bitrate)s Mbit/s" +msgid "%(wireless_bitrate)s Mbit/s" msgstr "" -#: modules/networks/templates/connection_show.html:159 +#: modules/networks/templates/connection_show.html:163 msgid "Signal strength" msgstr "" -#: modules/networks/templates/connection_show.html:169 +#: modules/networks/templates/connection_show.html:173 msgid "Channel" msgstr "" -#: modules/networks/templates/connection_show.html:177 +#: modules/networks/templates/connection_show.html:181 msgid "IPv4" msgstr "" -#: modules/networks/templates/connection_show.html:182 -#: modules/networks/templates/connection_show.html:223 +#: modules/networks/templates/connection_show.html:186 +#: modules/networks/templates/connection_show.html:227 msgid "Method" msgstr "" -#: modules/networks/templates/connection_show.html:189 -#: modules/networks/templates/connection_show.html:230 +#: modules/networks/templates/connection_show.html:193 +#: modules/networks/templates/connection_show.html:234 msgid "IP address" msgstr "" -#: modules/networks/templates/connection_show.html:198 -#: modules/networks/templates/connection_show.html:237 +#: modules/networks/templates/connection_show.html:202 +#: modules/networks/templates/connection_show.html:241 msgid "Gateway" msgstr "" -#: modules/networks/templates/connection_show.html:205 -#: modules/networks/templates/connection_show.html:244 +#: modules/networks/templates/connection_show.html:209 +#: modules/networks/templates/connection_show.html:248 msgid "DNS server" msgstr "" -#: modules/networks/templates/connection_show.html:212 -#: modules/networks/templates/connection_show.html:251 +#: modules/networks/templates/connection_show.html:216 +#: modules/networks/templates/connection_show.html:255 msgid "Default" msgstr "" -#: modules/networks/templates/connection_show.html:218 +#: modules/networks/templates/connection_show.html:222 msgid "IPv6" msgstr "" -#: modules/networks/templates/connection_show.html:259 +#: modules/networks/templates/connection_show.html:263 msgid "This connection is not active." msgstr "" -#: modules/networks/templates/connection_show.html:262 +#: modules/networks/templates/connection_show.html:266 msgid "Security" msgstr "" -#: modules/networks/templates/connection_show.html:267 -#: modules/networks/templates/connection_show.html:287 -#: modules/networks/templates/connection_show.html:306 +#: modules/networks/templates/connection_show.html:271 +#: modules/networks/templates/connection_show.html:291 +#: modules/networks/templates/connection_show.html:310 msgid "Firewall zone" msgstr "" -#: modules/networks/templates/connection_show.html:276 +#: modules/networks/templates/connection_show.html:280 msgid "" "This interface should be connected to local network/machine. If you connect " "this interface to a public network, services meant to be available only " "internally will become available externally. This is a security risk." msgstr "" -#: modules/networks/templates/connection_show.html:296 +#: modules/networks/templates/connection_show.html:300 msgid "" "This interface should receive your Internet connection. If you connect it " "your a local network/machine, many services meant to available only " "internally will not be available." msgstr "" -#: modules/networks/templates/connection_show.html:315 +#: modules/networks/templates/connection_show.html:319 msgid "" "This interface is not maintained by FreedomBox. Its security status is " "unknown to FreedomBox. Many FreedomBox services may not be available on " @@ -1369,7 +1368,6 @@ msgid "Wi-Fi" msgstr "" #: modules/networks/templates/connections_diagram.html:89 -#: modules/networks/templates/connections_diagram.html:119 #, python-format msgid "Show connection %(connection.name)s" msgstr "" @@ -1378,13 +1376,18 @@ msgstr "" msgid "Internal" msgstr "" +#: modules/networks/templates/connections_diagram.html:119 +#, python-format +msgid "Show connection %(name)s" +msgstr "" + #: modules/networks/templates/connections_diagram.html:131 msgid "Computer" msgstr "" #: modules/networks/templates/connections_list.html:67 #, python-format -msgid "Delete connection %(connection.name)s" +msgid "Delete connection %(name)s" msgstr "" #: modules/networks/templates/connections_list.html:92 @@ -1413,66 +1416,65 @@ msgstr "" msgid "" "Virtual Private Network (VPN) is a technique for securely connecting two " "machines in order to access resources of a private network. While you are " -"away from home, you can connect to your %(cfg.box_name)s in order to join " -"your home network and access private/internal services provided by " -"%(cfg.box_name)s. You can also access the rest of the Internet via " -"%(cfg.box_name)s for added security and anonymity." +"away from home, you can connect to your %(box_name)s in order to join your " +"home network and access private/internal services provided by %(box_name)s. " +"You can also access the rest of the Internet via %(box_name)s for added " +"security and anonymity." msgstr "" -#: modules/openvpn/templates/openvpn.html:52 +#: modules/openvpn/templates/openvpn.html:51 msgid "Profile" msgstr "" -#: modules/openvpn/templates/openvpn.html:55 +#: modules/openvpn/templates/openvpn.html:54 #, python-format msgid "" -"To connect to %(cfg.box_name)s's VPN, you need to download a profile and " -"feed it to an OpenVPN client on your mobile or desktop machine. OpenVPN " -"Clients are available for most platforms. See documentation on recommended clients and instructions on how to " "configure them." msgstr "" -#: modules/openvpn/templates/openvpn.html:67 +#: modules/openvpn/templates/openvpn.html:66 #, python-format -msgid "" -"Profile is specific to each user of %(cfg.box_name)s. Keep it a secret." +msgid "Profile is specific to each user of %(box_name)s. Keep it a secret." msgstr "" -#: modules/openvpn/templates/openvpn.html:77 +#: modules/openvpn/templates/openvpn.html:76 msgid "Download my profile" msgstr "" -#: modules/openvpn/templates/openvpn.html:86 +#: modules/openvpn/templates/openvpn.html:85 #, python-format msgid "" "OpenVPN has not yet been setup. Performing a secure setup takes a very long " -"time. Depending on how fast your %(cfg.box_name)s is, it may even take " -"hours. If the setup is interrupted, you may start it again." +"time. Depending on how fast your %(box_name)s is, it may even take hours. " +"If the setup is interrupted, you may start it again." msgstr "" -#: modules/openvpn/templates/openvpn.html:98 +#: modules/openvpn/templates/openvpn.html:97 msgid "Start setup" msgstr "" -#: modules/openvpn/templates/openvpn.html:105 +#: modules/openvpn/templates/openvpn.html:104 msgid "OpenVPN setup is running" msgstr "" -#: modules/openvpn/templates/openvpn.html:109 +#: modules/openvpn/templates/openvpn.html:108 #, python-format msgid "" "To perform a secure setup, this process takes a very long time. Depending " -"on how fast your %(cfg.box_name)s is, it may even take hours. If the setup " -"is interrupted, you may start it again." +"on how fast your %(box_name)s is, it may even take hours. If the setup is " +"interrupted, you may start it again." msgstr "" -#: modules/openvpn/templates/openvpn.html:122 +#: modules/openvpn/templates/openvpn.html:121 msgid "OpenVPN server is running" msgstr "" -#: modules/openvpn/templates/openvpn.html:125 +#: modules/openvpn/templates/openvpn.html:124 msgid "OpenVPN server is not running" msgstr "" @@ -1666,7 +1668,7 @@ msgstr "" #: modules/pagekite/templates/pagekite_custom_services.html:89 #, python-format -msgid "connected to %(service.backend_host)s:%(service.backend_port)s" +msgid "connected to %(backend_host)s:%(backend_port)s" msgstr "" #: modules/pagekite/templates/pagekite_custom_services.html:101 @@ -1676,21 +1678,21 @@ msgstr "" #: modules/pagekite/templates/pagekite_introduction.html:26 #, python-format msgid "" -"PageKite is a system for exposing %(cfg.box_name)s services when you don't " -"have a direct connection to the Internet. You only need this if your " -"%(cfg.box_name)s services are unreachable from the rest of the Internet. " -"This includes the following situations:" +"PageKite is a system for exposing %(box_name)s services when you don't have " +"a direct connection to the Internet. You only need this if your %(box_name)s " +"services are unreachable from the rest of the Internet. This includes the " +"following situations:" msgstr "" #: modules/pagekite/templates/pagekite_introduction.html:37 #, python-format -msgid "%(cfg.box_name)s is behind a restricted firewall." +msgid "%(box_name)s is behind a restricted firewall." msgstr "" #: modules/pagekite/templates/pagekite_introduction.html:43 #, python-format msgid "" -"%(cfg.box_name)s is connected to a (wireless) router which you don't control." +"%(box_name)s is connected to a (wireless) router which you don't control." msgstr "" #: modules/pagekite/templates/pagekite_introduction.html:50 @@ -1715,10 +1717,10 @@ msgid "" "PageKite works around NAT, firewalls and IP-address limitations by using a " "combination of tunnels and reverse proxies. You can use any pagekite service " "provider, for example pagekite.net. In " -"future it might be possible to use your buddy's %(cfg.box_name)s for this." +"future it might be possible to use your buddy's %(box_name)s for this." msgstr "" -#: modules/pagekite/templates/pagekite_introduction.html:79 +#: modules/pagekite/templates/pagekite_introduction.html:78 #: modules/pagekite/views.py:36 msgid "Configure PageKite" msgstr "" @@ -1809,10 +1811,10 @@ msgstr "" #, python-format msgid "" "You can use Privoxy by modifying your browser proxy settings to your " -"%(cfg.box_name)s hostname (or IP address) with port 8118. While using " -"Privoxy, you can see its configuration details and documentation at http://config.privoxy.org/ or http://p.p" +"%(box_name)s hostname (or IP address) with port 8118. While using Privoxy, " +"you can see its configuration details and documentation at http://config.privoxy.org/ or http://p.p" msgstr "" #: modules/privoxy/templates/privoxy.html:53 @@ -1920,15 +1922,13 @@ msgstr "" #: modules/system/templates/system.html:28 #, python-format -msgid "" -"Here you can administrate the underlying system of your %(cfg.box_name)s." +msgid "Here you can administrate the underlying system of your %(box_name)s." msgstr "" #: modules/system/templates/system.html:35 #, python-format msgid "" -"The options affect the %(cfg.box_name)s at its most general level, so be " -"careful!" +"The options affect the %(box_name)s at its most general level, so be careful!" msgstr "" #: modules/tor/__init__.py:50 @@ -1978,7 +1978,7 @@ msgstr "" msgid "Hidden Service" msgstr "" -#: modules/tor/templates/tor.html:60 modules/tor/templates/tor.html.py:103 +#: modules/tor/templates/tor.html:60 modules/tor/templates/tor.html.py:102 msgid "Port" msgstr "" @@ -1989,24 +1989,23 @@ msgstr "" #: modules/tor/templates/tor.html:88 #, python-format msgid "" -"Your %(cfg.box_name)s is configured as a Tor bridge with obfsproxy, so it " -"can help circumvent censorship. If your {{ cfg.box_name }} is behind a " -"router or firewall, you should make sure the following ports are open, and " -"port-forwarded, if necessary:" +"Your %(box_name)s is configured as a Tor bridge with obfsproxy, so it can " +"help circumvent censorship. If your %(box_name)s is behind a router or " +"firewall, you should make sure the following ports are open, and port-" +"forwarded, if necessary:" msgstr "" -#: modules/tor/templates/tor.html:102 +#: modules/tor/templates/tor.html:101 msgid "Service" msgstr "" -#: modules/tor/templates/tor.html:118 +#: modules/tor/templates/tor.html:117 msgid "SOCKS" msgstr "" -#: modules/tor/templates/tor.html:121 +#: modules/tor/templates/tor.html:120 #, python-format -msgid "" -"A Tor SOCKS port is available on your %(cfg.box_name)s on TCP port 9050." +msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050." msgstr "" #: modules/tor/tor.py:44 @@ -2241,7 +2240,7 @@ msgstr "" #: modules/users/templates/users_change_password.html:27 #, python-format -msgid "Change Password for %(form.user.username)s" +msgid "Change Password for %(username)s" msgstr "" #: modules/users/templates/users_change_password.html:40 @@ -2255,7 +2254,7 @@ msgstr "" #: modules/users/templates/users_delete.html:27 #, python-format -msgid "Delete User %(object.username)s" +msgid "Delete User %(username)s" msgstr "" #: modules/users/templates/users_delete.html:32 @@ -2264,22 +2263,22 @@ msgstr "" #: modules/users/templates/users_delete.html:38 #, python-format -msgid "Delete %(object.username)s" +msgid "Delete %(username)s" msgstr "" #: modules/users/templates/users_list.html:46 #, python-format -msgid "Delete user %(user.username)s" +msgid "Delete user %(username)s" msgstr "" #: modules/users/templates/users_list.html:53 #, python-format -msgid "Edit user %(user.username)s" +msgid "Edit user %(username)s" msgstr "" #: modules/users/templates/users_update.html:35 #, python-format -msgid "Edit User %(object.username)s" +msgid "Edit User %(username)s" msgstr "" #: modules/users/templates/users_update.html:43 @@ -2487,12 +2486,10 @@ msgstr "" #: templates/package_install.html:74 #, python-format -msgid "" -"Installing %(transaction.package_names|join:\", \")s: " -"%(transaction.status_string)s" +msgid "Installing %(package_names)s: %(status)s" msgstr "" -#: templates/package_install.html:85 +#: templates/package_install.html:84 #, python-format -msgid "%(transaction.percentage)s%% complete" +msgid "%(percentage)s%% complete" msgstr "" diff --git a/plinth/locale/fake/LC_MESSAGES/django.po b/plinth/locale/fake/LC_MESSAGES/django.po index 870d5276d..f1762744c 100644 --- a/plinth/locale/fake/LC_MESSAGES/django.po +++ b/plinth/locale/fake/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Plinth 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-13 22:39+0530\n" -"PO-Revision-Date: 2015-11-13 21:27+0530\n" +"POT-Creation-Date: 2015-11-14 11:19+0530\n" +"PO-Revision-Date: 2015-11-14 11:18+0530\n" "Last-Translator: Sunil Mohan Adapa \n" "Language-Team: Plinth Developers \n" @@ -65,10 +65,10 @@ msgstr "SERVICES AND APPLICATIONS" #, python-format msgid "" "You can install and run various services and applications on your " -"%(cfg.box_name)s." +"%(box_name)s." msgstr "" "YOU CAN INSTALL AND RUN VARIOUS SERVICES AND APPLICATIONS ON YOUR " -"%(cfg.box_name)s." +"%(box_name)s." #: modules/apps/templates/apps.html:35 msgid "" @@ -112,8 +112,8 @@ msgstr "" #: modules/deluge/templates/deluge.html:39 modules/dynamicdns/dynamicdns.py:38 #: modules/firewall/templates/firewall.html:57 #: modules/mumble/templates/mumble.html:44 -#: modules/networks/templates/connection_show.html:257 -#: modules/openvpn/templates/openvpn.html:82 +#: modules/networks/templates/connection_show.html:261 +#: modules/openvpn/templates/openvpn.html:81 #: modules/privoxy/templates/privoxy.html:48 modules/tor/templates/tor.html:39 #: modules/transmission/templates/transmission.html:42 #: modules/xmpp/templates/xmpp.html:58 @@ -133,7 +133,7 @@ msgstr "SERVICE DISCOVERY SERVER IS NOT RUNNING" #: modules/deluge/templates/deluge.html:53 #: modules/ikiwiki/templates/ikiwiki.html:35 #: modules/mumble/templates/mumble.html:59 -#: modules/openvpn/templates/openvpn.html:131 +#: modules/openvpn/templates/openvpn.html:130 #: modules/owncloud/templates/owncloud.html:51 #: modules/privoxy/templates/privoxy.html:62 #: modules/roundcube/templates/roundcube.html:62 @@ -150,7 +150,7 @@ msgstr "CONFIGURATION" #: modules/ikiwiki/templates/ikiwiki.html:43 #: modules/ikiwiki/templates/ikiwiki_create.html:32 #: modules/mumble/templates/mumble.html:67 -#: modules/openvpn/templates/openvpn.html:139 +#: modules/openvpn/templates/openvpn.html:138 #: modules/privoxy/templates/privoxy.html:70 #: modules/restore/templates/restore_index.html:52 #: modules/roundcube/templates/roundcube.html:70 @@ -662,14 +662,12 @@ msgstr "FIREWALL" #, python-format msgid "" "Firewall is a network security system that controls the incoming and " -"outgoing network traffic on your %(cfg.box_name)s. Keeping a firewall " -"enabled and properly configured reduces risk of security threat from the " -"Internet." +"outgoing network traffic on your %(box_name)s. Keeping a firewall enabled " +"and properly configured reduces risk of security threat from the Internet." msgstr "" "FIREWALL IS A NETWORK SECURITY SYSTEM THAT CONTROLS THE INCOMING AND " -"OUTGOING NETWORK TRAFFIC ON YOUR %(cfg.box_name)s. KEEPING A FIREWALL " -"ENABLED AND PROPERLY CONFIGURED REDUCES RISK OF SECURITY THREAT FROM THE " -"INTERNET." +"OUTGOING NETWORK TRAFFIC ON YOUR %(box_name)s. KEEPING A FIREWALL ENABLED " +"AND PROPERLY CONFIGURED REDUCES RISK OF SECURITY THREAT FROM THE INTERNET." #: modules/firewall/templates/firewall.html:36 msgid "The following is the current status:" @@ -679,14 +677,14 @@ msgstr "THE FOLLOWING IS THE CURRENT STATUS:" #, python-format msgid "" "Firewall daemon is not running. Please run it. Firewall comes enabled by " -"default on %(cfg.box_name)s. On any Debian based system (such as " -"%(cfg.box_name)s) you may run it using the command 'service firewalld start' " -"or in case of a system with systemd 'systemctl start firewalld'" +"default on %(box_name)s. On any Debian based system (such as %(box_name)s) " +"you may run it using the command 'service firewalld start' or in case of a " +"system with systemd 'systemctl start firewalld'" msgstr "" "FIREWALL DAEMON IS NOT RUNNING. PLEASE RUN IT. FIREWALL COMES ENABLED BY " -"DEFAULT ON %(cfg.box_name)s. ON ANY DEBIAN BASED SYSTEM (SUCH AS " -"%(cfg.box_name)s) YOU MAY RUN IT USING THE COMMAND 'SERVICE FIREWALLD START' " -"OR IN CASE OF A SYSTEM WITH SYSTEMD 'SYSTEMCTL START FIREWALLD'" +"DEFAULT ON %(box_name)s. ON ANY DEBIAN BASED SYSTEM (SUCH AS %(box_name)s) " +"YOU MAY RUN IT USING THE COMMAND 'SERVICE FIREWALLD START' OR IN CASE OF A " +"SYSTEM WITH SYSTEMD 'SYSTEMCTL START FIREWALLD'" #: modules/firewall/templates/firewall.html:56 msgid "Service/Port" @@ -896,10 +894,10 @@ msgstr "HELP" #, python-format msgid "" "The FreedomBox Manual is the best place to " -"start for information regarding %(cfg.box_name)s." +"start for information regarding %(box_name)s." msgstr "" "THE FREEDOMBOX MANUAL IS THE BEST PLACE TO " -"START FOR INFORMATION REGARDING %(cfg.box_name)s." +"START FOR INFORMATION REGARDING %(box_name)s." #: modules/help/templates/help_index.html:36 msgid "" @@ -1160,7 +1158,7 @@ msgid "Physical interface" msgstr "PHYSICAL INTERFACE" #: modules/networks/forms.py:119 -#: modules/networks/templates/connection_show.html:142 +#: modules/networks/templates/connection_show.html:144 msgid "SSID" msgstr "SSID" @@ -1169,7 +1167,7 @@ msgid "The visible name of the network." msgstr "THE VISIBLE NAME OF THE NETWORK." #: modules/networks/forms.py:122 -#: modules/networks/templates/connection_show.html:153 +#: modules/networks/templates/connection_show.html:157 msgid "Mode" msgstr "MODE" @@ -1321,8 +1319,8 @@ msgid "Primary connection" msgstr "PRIMARY CONNECTION" #: modules/networks/templates/connection_show.html:73 -#: modules/networks/templates/connection_show.html:213 -#: modules/networks/templates/connection_show.html:252 +#: modules/networks/templates/connection_show.html:217 +#: modules/networks/templates/connection_show.html:256 msgid "yes" msgstr "YES" @@ -1367,76 +1365,76 @@ msgid "please check cable" msgstr "PLEASE CHECK CABLE" #: modules/networks/templates/connection_show.html:133 -#: modules/networks/templates/connection_show.html:147 +#: modules/networks/templates/connection_show.html:149 msgid "Speed" msgstr "SPEED" #: modules/networks/templates/connection_show.html:135 #, python-format -msgid "%(device.ethernet.speed)s Mbit/s" -msgstr "%(device.ethernet.speed)s MBIT/s" +msgid "%(ethernet_speed)s Mbit/s" +msgstr "%(ethernet_speed)s MBIT/s" -#: modules/networks/templates/connection_show.html:149 +#: modules/networks/templates/connection_show.html:151 #, python-format -msgid "%(device.wireless.bitrate)s Mbit/s" -msgstr "%(device.wireless.bitrate)s MBIT/s" +msgid "%(wireless_bitrate)s Mbit/s" +msgstr "%(wireless_bitrate)s MBIT/s" -#: modules/networks/templates/connection_show.html:159 +#: modules/networks/templates/connection_show.html:163 msgid "Signal strength" msgstr "SIGNAL STRENGTH" -#: modules/networks/templates/connection_show.html:169 +#: modules/networks/templates/connection_show.html:173 msgid "Channel" msgstr "CHANNEL" -#: modules/networks/templates/connection_show.html:177 +#: modules/networks/templates/connection_show.html:181 msgid "IPv4" msgstr "IPV4" -#: modules/networks/templates/connection_show.html:182 -#: modules/networks/templates/connection_show.html:223 +#: modules/networks/templates/connection_show.html:186 +#: modules/networks/templates/connection_show.html:227 msgid "Method" msgstr "METHOD" -#: modules/networks/templates/connection_show.html:189 -#: modules/networks/templates/connection_show.html:230 +#: modules/networks/templates/connection_show.html:193 +#: modules/networks/templates/connection_show.html:234 msgid "IP address" msgstr "IP ADDRESS" -#: modules/networks/templates/connection_show.html:198 -#: modules/networks/templates/connection_show.html:237 +#: modules/networks/templates/connection_show.html:202 +#: modules/networks/templates/connection_show.html:241 msgid "Gateway" msgstr "GATEWAY" -#: modules/networks/templates/connection_show.html:205 -#: modules/networks/templates/connection_show.html:244 +#: modules/networks/templates/connection_show.html:209 +#: modules/networks/templates/connection_show.html:248 msgid "DNS server" msgstr "DNS SERVER" -#: modules/networks/templates/connection_show.html:212 -#: modules/networks/templates/connection_show.html:251 +#: modules/networks/templates/connection_show.html:216 +#: modules/networks/templates/connection_show.html:255 msgid "Default" msgstr "DEFAULT" -#: modules/networks/templates/connection_show.html:218 +#: modules/networks/templates/connection_show.html:222 msgid "IPv6" msgstr "IPV6" -#: modules/networks/templates/connection_show.html:259 +#: modules/networks/templates/connection_show.html:263 msgid "This connection is not active." msgstr "THIS CONNECTION IS NOT ACTIVE." -#: modules/networks/templates/connection_show.html:262 +#: modules/networks/templates/connection_show.html:266 msgid "Security" msgstr "SECURITY" -#: modules/networks/templates/connection_show.html:267 -#: modules/networks/templates/connection_show.html:287 -#: modules/networks/templates/connection_show.html:306 +#: modules/networks/templates/connection_show.html:271 +#: modules/networks/templates/connection_show.html:291 +#: modules/networks/templates/connection_show.html:310 msgid "Firewall zone" msgstr "FIREWALL ZONE" -#: modules/networks/templates/connection_show.html:276 +#: modules/networks/templates/connection_show.html:280 msgid "" "This interface should be connected to local network/machine. If you connect " "this interface to a public network, services meant to be available only " @@ -1446,7 +1444,7 @@ msgstr "" "THIS INTERFACE TO A PUBLIC NETWORK, SERVICES MEANT TO BE AVAILABLE ONLY " "INTERNALLY WILL BECOME AVAILABLE EXTERNALLY. THIS IS A SECURITY RISK." -#: modules/networks/templates/connection_show.html:296 +#: modules/networks/templates/connection_show.html:300 msgid "" "This interface should receive your Internet connection. If you connect it " "your a local network/machine, many services meant to available only " @@ -1456,7 +1454,7 @@ msgstr "" "YOUR A LOCAL NETWORK/MACHINE, MANY SERVICES MEANT TO AVAILABLE ONLY " "INTERNALLY WILL NOT BE AVAILABLE." -#: modules/networks/templates/connection_show.html:315 +#: modules/networks/templates/connection_show.html:319 msgid "" "This interface is not maintained by FreedomBox. Its security status is " "unknown to FreedomBox. Many FreedomBox services may not be available on " @@ -1510,7 +1508,6 @@ msgid "Wi-Fi" msgstr "WI-FI" #: modules/networks/templates/connections_diagram.html:89 -#: modules/networks/templates/connections_diagram.html:119 #, python-format msgid "Show connection %(connection.name)s" msgstr "SHOW CONNECTION %(connection.name)s" @@ -1519,14 +1516,19 @@ msgstr "SHOW CONNECTION %(connection.name)s" msgid "Internal" msgstr "INTERNAL" +#: modules/networks/templates/connections_diagram.html:119 +#, python-format +msgid "Show connection %(name)s" +msgstr "SHOW CONNECTION %(name)s" + #: modules/networks/templates/connections_diagram.html:131 msgid "Computer" msgstr "COMPUTER" #: modules/networks/templates/connections_list.html:67 #, python-format -msgid "Delete connection %(connection.name)s" -msgstr "DELETE CONNECTION %(connection.name)s" +msgid "Delete connection %(name)s" +msgstr "DELETE CONNECTION %(name)s" #: modules/networks/templates/connections_list.html:92 msgid "Active" @@ -1554,85 +1556,83 @@ msgstr "ENABLE OPENVPN SERVER" msgid "" "Virtual Private Network (VPN) is a technique for securely connecting two " "machines in order to access resources of a private network. While you are " -"away from home, you can connect to your %(cfg.box_name)s in order to join " -"your home network and access private/internal services provided by " -"%(cfg.box_name)s. You can also access the rest of the Internet via " -"%(cfg.box_name)s for added security and anonymity." +"away from home, you can connect to your %(box_name)s in order to join your " +"home network and access private/internal services provided by %(box_name)s. " +"You can also access the rest of the Internet via %(box_name)s for added " +"security and anonymity." msgstr "" "VIRTUAL PRIVATE NETWORK (VPN) IS A TECHNIQUE FOR SECURELY CONNECTING TWO " "MACHINES IN ORDER TO ACCESS RESOURCES OF A PRIVATE NETWORK. WHILE YOU ARE " -"AWAY FROM HOME, YOU CAN CONNECT TO YOUR %(cfg.box_name)s IN ORDER TO JOIN " -"YOUR HOME NETWORK AND ACCESS PRIVATE/INTERNAL SERVICES PROVIDED BY " -"%(cfg.box_name)s. YOU CAN ALSO ACCESS THE REST OF THE INTERNET VIA " -"%(cfg.box_name)s FOR ADDED SECURITY AND ANONYMITY." +"AWAY FROM HOME, YOU CAN CONNECT TO YOUR %(box_name)s IN ORDER TO JOIN YOUR " +"HOME NETWORK AND ACCESS PRIVATE/INTERNAL SERVICES PROVIDED BY %(box_name)s. " +"YOU CAN ALSO ACCESS THE REST OF THE INTERNET VIA %(box_name)s FOR ADDED " +"SECURITY AND ANONYMITY." -#: modules/openvpn/templates/openvpn.html:52 +#: modules/openvpn/templates/openvpn.html:51 msgid "Profile" msgstr "PROFILE" -#: modules/openvpn/templates/openvpn.html:55 +#: modules/openvpn/templates/openvpn.html:54 #, python-format msgid "" -"To connect to %(cfg.box_name)s's VPN, you need to download a profile and " -"feed it to an OpenVPN client on your mobile or desktop machine. OpenVPN " -"Clients are available for most platforms. See documentation on recommended clients and instructions on how to " "configure them." msgstr "" -"TO CONNECT TO %(cfg.box_name)s's VPN, YOU NEED TO DOWNLOAD A PROFILE AND " -"FEED IT TO AN OPENVPN CLIENT ON YOUR MOBILE OR DESKTOP MACHINE. OPENVPN " -"CLIENTS ARE AVAILABLE FOR MOST PLATFORMS. SEE DOCUMENTATION ON RECOMMENDED CLIENTS AND INSTRUCTIONS ON HOW TO " "CONFIGURE THEM." -#: modules/openvpn/templates/openvpn.html:67 +#: modules/openvpn/templates/openvpn.html:66 #, python-format -msgid "" -"Profile is specific to each user of %(cfg.box_name)s. Keep it a secret." -msgstr "" -"PROFILE IS SPECIFIC TO EACH USER OF %(cfg.box_name)s. KEEP IT A SECRET." +msgid "Profile is specific to each user of %(box_name)s. Keep it a secret." +msgstr "PROFILE IS SPECIFIC TO EACH USER OF %(box_name)s. KEEP IT A SECRET." -#: modules/openvpn/templates/openvpn.html:77 +#: modules/openvpn/templates/openvpn.html:76 msgid "Download my profile" msgstr "DOWNLOAD MY PROFILE" -#: modules/openvpn/templates/openvpn.html:86 +#: modules/openvpn/templates/openvpn.html:85 #, python-format msgid "" "OpenVPN has not yet been setup. Performing a secure setup takes a very long " -"time. Depending on how fast your %(cfg.box_name)s is, it may even take " -"hours. If the setup is interrupted, you may start it again." +"time. Depending on how fast your %(box_name)s is, it may even take hours. " +"If the setup is interrupted, you may start it again." msgstr "" "OPENVPN HAS NOT YET BEEN SETUP. PERFORMING A SECURE SETUP TAKES A VERY LONG " -"TIME. DEPENDING ON HOW FAST YOUR %(cfg.box_name)s IS, IT MAY EVEN TAKE " -"HOURS. IF THE SETUP IS INTERRUPTED, YOU MAY START IT AGAIN." +"TIME. DEPENDING ON HOW FAST YOUR %(box_name)s IS, IT MAY EVEN TAKE HOURS. " +"IF THE SETUP IS INTERRUPTED, YOU MAY START IT AGAIN." -#: modules/openvpn/templates/openvpn.html:98 +#: modules/openvpn/templates/openvpn.html:97 msgid "Start setup" msgstr "START SETUP" -#: modules/openvpn/templates/openvpn.html:105 +#: modules/openvpn/templates/openvpn.html:104 msgid "OpenVPN setup is running" msgstr "OPENVPN SETUP IS RUNNING" -#: modules/openvpn/templates/openvpn.html:109 +#: modules/openvpn/templates/openvpn.html:108 #, python-format msgid "" "To perform a secure setup, this process takes a very long time. Depending " -"on how fast your %(cfg.box_name)s is, it may even take hours. If the setup " -"is interrupted, you may start it again." +"on how fast your %(box_name)s is, it may even take hours. If the setup is " +"interrupted, you may start it again." msgstr "" "TO PERFORM A SECURE SETUP, THIS PROCESS TAKES A VERY LONG TIME. DEPENDING " -"ON HOW FAST YOUR %(cfg.box_name)s IS, IT MAY EVEN TAKE HOURS. IF THE SETUP " -"IS INTERRUPTED, YOU MAY START IT AGAIN." +"ON HOW FAST YOUR %(box_name)s IS, IT MAY EVEN TAKE HOURS. IF THE SETUP IS " +"INTERRUPTED, YOU MAY START IT AGAIN." -#: modules/openvpn/templates/openvpn.html:122 +#: modules/openvpn/templates/openvpn.html:121 msgid "OpenVPN server is running" msgstr "OPENVPN SERVER IS RUNNING" -#: modules/openvpn/templates/openvpn.html:125 +#: modules/openvpn/templates/openvpn.html:124 msgid "OpenVPN server is not running" msgstr "OPENVPN SERVER IS NOT RUNNING" @@ -1844,8 +1844,8 @@ msgstr "YOU DON'T HAVE ANY CUSTOM SERVICES ENABLED" #: modules/pagekite/templates/pagekite_custom_services.html:89 #, python-format -msgid "connected to %(service.backend_host)s:%(service.backend_port)s" -msgstr "CONNECTED TO %(service.backend_host)s:%(service.backend_port)s" +msgid "connected to %(backend_host)s:%(backend_port)s" +msgstr "CONNECTED TO %(backend_host)s:%(backend_port)s" #: modules/pagekite/templates/pagekite_custom_services.html:101 msgid "Delete this service" @@ -1854,27 +1854,27 @@ msgstr "DELETE THIS SERVICE" #: modules/pagekite/templates/pagekite_introduction.html:26 #, python-format msgid "" -"PageKite is a system for exposing %(cfg.box_name)s services when you don't " -"have a direct connection to the Internet. You only need this if your " -"%(cfg.box_name)s services are unreachable from the rest of the Internet. " -"This includes the following situations:" +"PageKite is a system for exposing %(box_name)s services when you don't have " +"a direct connection to the Internet. You only need this if your %(box_name)s " +"services are unreachable from the rest of the Internet. This includes the " +"following situations:" msgstr "" -"PAGEKITE IS A SYSTEM FOR EXPOSING %(cfg.box_name)s SERVICES WHEN YOU DON'T " -"HAVE A DIRECT CONNECTION TO THE INTERNET. YOU ONLY NEED THIS IF YOUR " -"%(cfg.box_name)s SERVICES ARE UNREACHABLE FROM THE REST OF THE INTERNET. " -"THIS INCLUDES THE FOLLOWING SITUATIONS:" +"PAGEKITE IS A SYSTEM FOR EXPOSING %(box_name)s SERVICES WHEN YOU DON'T HAVE " +"A DIRECT CONNECTION TO THE INTERNET. YOU ONLY NEED THIS IF YOUR %(box_name)s " +"SERVICES ARE UNREACHABLE FROM THE REST OF THE INTERNET. THIS INCLUDES THE " +"FOLLOWING SITUATIONS:" #: modules/pagekite/templates/pagekite_introduction.html:37 #, python-format -msgid "%(cfg.box_name)s is behind a restricted firewall." -msgstr "%(cfg.box_name)s IS BEHIND A RESTRICTED FIREWALL." +msgid "%(box_name)s is behind a restricted firewall." +msgstr "%(box_name)s IS BEHIND A RESTRICTED FIREWALL." #: modules/pagekite/templates/pagekite_introduction.html:43 #, python-format msgid "" -"%(cfg.box_name)s is connected to a (wireless) router which you don't control." +"%(box_name)s is connected to a (wireless) router which you don't control." msgstr "" -"%(cfg.box_name)s IS CONNECTED TO A (WIRELESS) ROUTER WHICH YOU DON'T CONTROL." +"%(box_name)s IS CONNECTED TO A (WIRELESS) ROUTER WHICH YOU DON'T CONTROL." #: modules/pagekite/templates/pagekite_introduction.html:50 msgid "" @@ -1902,14 +1902,14 @@ msgid "" "PageKite works around NAT, firewalls and IP-address limitations by using a " "combination of tunnels and reverse proxies. You can use any pagekite service " "provider, for example pagekite.net. In " -"future it might be possible to use your buddy's %(cfg.box_name)s for this." +"future it might be possible to use your buddy's %(box_name)s for this." msgstr "" "PAGEKITE WORKS AROUND NAT, FIREWALLS AND IP-ADDRESS LIMITATIONS BY USING A " "COMBINATION OF TUNNELS AND REVERSE PROXIES. YOU CAN USE ANY PAGEKITE SERVICE " "PROVIDER, FOR EXAMPLE PAGEKITE.NET. IN " -"FUTURE IT MIGHT BE POSSIBLE TO USE YOUR BUDDY'S %(cfg.box_name)s FOR THIS." +"FUTURE IT MIGHT BE POSSIBLE TO USE YOUR BUDDY'S %(box_name)s FOR THIS." -#: modules/pagekite/templates/pagekite_introduction.html:79 +#: modules/pagekite/templates/pagekite_introduction.html:78 #: modules/pagekite/views.py:36 msgid "Configure PageKite" msgstr "CONFIGURE PAGEKITE" @@ -2006,16 +2006,16 @@ msgstr "" #, python-format msgid "" "You can use Privoxy by modifying your browser proxy settings to your " -"%(cfg.box_name)s hostname (or IP address) with port 8118. While using " -"Privoxy, you can see its configuration details and documentation at http://config.privoxy.org/ or http://p.p" +"%(box_name)s hostname (or IP address) with port 8118. While using Privoxy, " +"you can see its configuration details and documentation at http://config.privoxy.org/ or http://p.p" msgstr "" "YOU CAN USE PRIVOXY BY MODIFYING YOUR BROWSER PROXY SETTINGS TO YOUR " -"%(cfg.box_name)s HOSTNAME (OR IP ADDRESS) WITH PORT 8118. WHILE USING " -"PRIVOXY, YOU CAN SEE ITS CONFIGURATION DETAILS AND DOCUMENTATION AT HTTP://CONFIG.PRIVOXY.ORG/ OR HTTP://P.P\"" +"%(box_name)s HOSTNAME (OR IP ADDRESS) WITH PORT 8118. WHILE USING PRIVOXY, " +"YOU CAN SEE ITS CONFIGURATION DETAILS AND DOCUMENTATION AT HTTP://CONFIG.PRIVOXY.ORG/ OR HTTP://P.P\"" #: modules/privoxy/templates/privoxy.html:53 msgid "Privoxy is running" @@ -2145,19 +2145,15 @@ msgstr "SYSTEM CONFIGURATION" #: modules/system/templates/system.html:28 #, python-format -msgid "" -"Here you can administrate the underlying system of your %(cfg.box_name)s." -msgstr "" -"HERE YOU CAN ADMINISTRATE THE UNDERLYING SYSTEM OF YOUR %(cfg.box_name)s." +msgid "Here you can administrate the underlying system of your %(box_name)s." +msgstr "HERE YOU CAN ADMINISTRATE THE UNDERLYING SYSTEM OF YOUR %(box_name)s." #: modules/system/templates/system.html:35 #, python-format msgid "" -"The options affect the %(cfg.box_name)s at its most general level, so be " -"careful!" +"The options affect the %(box_name)s at its most general level, so be careful!" msgstr "" -"THE OPTIONS AFFECT THE %(cfg.box_name)s AT ITS MOST GENERAL LEVEL, SO BE " -"CAREFUL!" +"THE OPTIONS AFFECT THE %(box_name)s AT ITS MOST GENERAL LEVEL, SO BE CAREFUL!" #: modules/tor/__init__.py:50 msgid "Tor relay port available" @@ -2211,7 +2207,7 @@ msgstr "TOR IS NOT RUNNING" msgid "Hidden Service" msgstr "HIDDEN SERVICE" -#: modules/tor/templates/tor.html:60 modules/tor/templates/tor.html.py:103 +#: modules/tor/templates/tor.html:60 modules/tor/templates/tor.html.py:102 msgid "Port" msgstr "PORT" @@ -2222,30 +2218,28 @@ msgstr "BRIDGE" #: modules/tor/templates/tor.html:88 #, python-format msgid "" -"Your %(cfg.box_name)s is configured as a Tor bridge with obfsproxy, so it " -"can help circumvent censorship. If your {{ cfg.box_name }} is behind a " -"router or firewall, you should make sure the following ports are open, and " -"port-forwarded, if necessary:" +"Your %(box_name)s is configured as a Tor bridge with obfsproxy, so it can " +"help circumvent censorship. If your %(box_name)s is behind a router or " +"firewall, you should make sure the following ports are open, and port-" +"forwarded, if necessary:" msgstr "" -"YOUR %(cfg.box_name)s IS CONFIGURED AS A TOR BRIDGE WITH OBFSPROXY, SO IT " -"CAN HELP CIRCUMVENT CENSORSHIP. IF YOUR {{ cfg.box_name }} IS BEHIND A " -"ROUTER OR FIREWALL, YOU SHOULD MAKE SURE THE FOLLOWING PORTS ARE OPEN, AND " -"PORT-FORWARDED, IF NECESSARY:" +"YOUR %(box_name)s IS CONFIGURED AS A TOR BRIDGE WITH OBFSPROXY, SO IT CAN " +"HELP CIRCUMVENT CENSORSHIP. IF YOUR %(box_name)s IS BEHIND A ROUTER OR " +"FIREWALL, YOU SHOULD MAKE SURE THE FOLLOWING PORTS ARE OPEN, AND PORT-" +"FORWARDED, IF NECESSARY:" -#: modules/tor/templates/tor.html:102 +#: modules/tor/templates/tor.html:101 msgid "Service" msgstr "SERVICE" -#: modules/tor/templates/tor.html:118 +#: modules/tor/templates/tor.html:117 msgid "SOCKS" msgstr "SOCKS" -#: modules/tor/templates/tor.html:121 +#: modules/tor/templates/tor.html:120 #, python-format -msgid "" -"A Tor SOCKS port is available on your %(cfg.box_name)s on TCP port 9050." -msgstr "" -"A TOR SOCKS PORT IS AVAILABLE ON YOUR %(cfg.box_name)s ON TCP PORT 9050." +msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050." +msgstr "A TOR SOCKS PORT IS AVAILABLE ON YOUR %(box_name)s ON TCP PORT 9050." #: modules/tor/tor.py:44 msgid "Enable Tor" @@ -2501,8 +2495,8 @@ msgstr "CHANGING LDAP USER PASSWORD FAILED." #: modules/users/templates/users_change_password.html:27 #, python-format -msgid "Change Password for %(form.user.username)s" -msgstr "CHANGE PASSWORD FOR %(form.user.username)s" +msgid "Change Password for %(username)s" +msgstr "CHANGE PASSWORD FOR %(username)s" #: modules/users/templates/users_change_password.html:40 msgid "Save Password" @@ -2515,8 +2509,8 @@ msgstr "CREATE USER" #: modules/users/templates/users_delete.html:27 #, python-format -msgid "Delete User %(object.username)s" -msgstr "DELETE USER %(object.username)s" +msgid "Delete User %(username)s" +msgstr "DELETE USER %(username)s" #: modules/users/templates/users_delete.html:32 msgid "Delete user permanently?" @@ -2524,23 +2518,23 @@ msgstr "DELETE USER PERMANENTLY?" #: modules/users/templates/users_delete.html:38 #, python-format -msgid "Delete %(object.username)s" -msgstr "DELETE %(object.username)s" +msgid "Delete %(username)s" +msgstr "DELETE %(username)s" #: modules/users/templates/users_list.html:46 #, python-format -msgid "Delete user %(user.username)s" -msgstr "DELETE USER %(user.username)s" +msgid "Delete user %(username)s" +msgstr "DELETE USER %(username)s" #: modules/users/templates/users_list.html:53 #, python-format -msgid "Edit user %(user.username)s" -msgstr "EDIT USER %(user.username)s" +msgid "Edit user %(username)s" +msgstr "EDIT USER %(username)s" #: modules/users/templates/users_update.html:35 #, python-format -msgid "Edit User %(object.username)s" -msgstr "EDIT USER %(object.username)s" +msgid "Edit User %(username)s" +msgstr "EDIT USER %(username)s" #: modules/users/templates/users_update.html:43 #, python-format @@ -2765,14 +2759,13 @@ msgstr "INSTALL" #: templates/package_install.html:74 #, python-format -msgid "" -"Installing %(transaction.package_names|join:\", \")s: " -"%(transaction.status_string)s" -msgstr "" -"Installing %(transaction.package_names|join:\", \")s: " -"%(transaction.status_string)s" +msgid "Installing %(package_names)s: %(status)s" +msgstr "INSTALLING %(package_names)s: %(status)s" -#: templates/package_install.html:85 +#: templates/package_install.html:84 #, python-format -msgid "%(transaction.percentage)s%% complete" -msgstr "%(transaction.percentage)s%% COMPLETE" +msgid "%(percentage)s%% complete" +msgstr "%(percentage)s%% COMPLETE" + +#~ msgid "Delete %(object.username)s" +#~ msgstr "DELETE %(object.username)s" diff --git a/plinth/locale/fr/LC_MESSAGES/django.po b/plinth/locale/fr/LC_MESSAGES/django.po index 2254d29bc..fc6a4e193 100644 --- a/plinth/locale/fr/LC_MESSAGES/django.po +++ b/plinth/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-13 22:39+0530\n" +"POT-Creation-Date: 2015-11-14 11:19+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -66,7 +66,7 @@ msgstr "Applications" #, python-format msgid "" "You can install and run various services and applications on your " -"%(cfg.box_name)s." +"%(box_name)s." msgstr "" #: modules/apps/templates/apps.html:35 @@ -101,8 +101,8 @@ msgstr "" #: modules/deluge/templates/deluge.html:39 modules/dynamicdns/dynamicdns.py:38 #: modules/firewall/templates/firewall.html:57 #: modules/mumble/templates/mumble.html:44 -#: modules/networks/templates/connection_show.html:257 -#: modules/openvpn/templates/openvpn.html:82 +#: modules/networks/templates/connection_show.html:261 +#: modules/openvpn/templates/openvpn.html:81 #: modules/privoxy/templates/privoxy.html:48 modules/tor/templates/tor.html:39 #: modules/transmission/templates/transmission.html:42 #: modules/xmpp/templates/xmpp.html:58 @@ -124,7 +124,7 @@ msgstr "" #: modules/deluge/templates/deluge.html:53 #: modules/ikiwiki/templates/ikiwiki.html:35 #: modules/mumble/templates/mumble.html:59 -#: modules/openvpn/templates/openvpn.html:131 +#: modules/openvpn/templates/openvpn.html:130 #: modules/owncloud/templates/owncloud.html:51 #: modules/privoxy/templates/privoxy.html:62 #: modules/roundcube/templates/roundcube.html:62 @@ -143,7 +143,7 @@ msgstr "Configuration système" #: modules/ikiwiki/templates/ikiwiki.html:43 #: modules/ikiwiki/templates/ikiwiki_create.html:32 #: modules/mumble/templates/mumble.html:67 -#: modules/openvpn/templates/openvpn.html:139 +#: modules/openvpn/templates/openvpn.html:138 #: modules/privoxy/templates/privoxy.html:70 #: modules/restore/templates/restore_index.html:52 #: modules/roundcube/templates/roundcube.html:70 @@ -631,9 +631,8 @@ msgstr "Pare-feu" #, python-format msgid "" "Firewall is a network security system that controls the incoming and " -"outgoing network traffic on your %(cfg.box_name)s. Keeping a firewall " -"enabled and properly configured reduces risk of security threat from the " -"Internet." +"outgoing network traffic on your %(box_name)s. Keeping a firewall enabled " +"and properly configured reduces risk of security threat from the Internet." msgstr "" #: modules/firewall/templates/firewall.html:36 @@ -644,9 +643,9 @@ msgstr "" #, python-format msgid "" "Firewall daemon is not running. Please run it. Firewall comes enabled by " -"default on %(cfg.box_name)s. On any Debian based system (such as " -"%(cfg.box_name)s) you may run it using the command 'service firewalld start' " -"or in case of a system with systemd 'systemctl start firewalld'" +"default on %(box_name)s. On any Debian based system (such as %(box_name)s) " +"you may run it using the command 'service firewalld start' or in case of a " +"system with systemd 'systemctl start firewalld'" msgstr "" #: modules/firewall/templates/firewall.html:56 @@ -843,7 +842,7 @@ msgstr "" #, python-format msgid "" "The FreedomBox Manual is the best place to " -"start for information regarding %(cfg.box_name)s." +"start for information regarding %(box_name)s." msgstr "" #: modules/help/templates/help_index.html:36 @@ -1098,7 +1097,7 @@ msgid "Physical interface" msgstr "Interface physique" #: modules/networks/forms.py:119 -#: modules/networks/templates/connection_show.html:142 +#: modules/networks/templates/connection_show.html:144 msgid "SSID" msgstr "SSID" @@ -1107,7 +1106,7 @@ msgid "The visible name of the network." msgstr "Le nom visible du réseau." #: modules/networks/forms.py:122 -#: modules/networks/templates/connection_show.html:153 +#: modules/networks/templates/connection_show.html:157 msgid "Mode" msgstr "Mode" @@ -1277,8 +1276,8 @@ msgid "Primary connection" msgstr "Modifier la connexion" #: modules/networks/templates/connection_show.html:73 -#: modules/networks/templates/connection_show.html:213 -#: modules/networks/templates/connection_show.html:252 +#: modules/networks/templates/connection_show.html:217 +#: modules/networks/templates/connection_show.html:256 msgid "yes" msgstr "" @@ -1331,98 +1330,98 @@ msgid "please check cable" msgstr "" #: modules/networks/templates/connection_show.html:133 -#: modules/networks/templates/connection_show.html:147 +#: modules/networks/templates/connection_show.html:149 msgid "Speed" msgstr "" #: modules/networks/templates/connection_show.html:135 #, python-format -msgid "%(device.ethernet.speed)s Mbit/s" +msgid "%(ethernet_speed)s Mbit/s" msgstr "" -#: modules/networks/templates/connection_show.html:149 +#: modules/networks/templates/connection_show.html:151 #, python-format -msgid "%(device.wireless.bitrate)s Mbit/s" +msgid "%(wireless_bitrate)s Mbit/s" msgstr "" -#: modules/networks/templates/connection_show.html:159 +#: modules/networks/templates/connection_show.html:163 msgid "Signal strength" msgstr "" -#: modules/networks/templates/connection_show.html:169 +#: modules/networks/templates/connection_show.html:173 msgid "Channel" msgstr "" -#: modules/networks/templates/connection_show.html:177 +#: modules/networks/templates/connection_show.html:181 msgid "IPv4" msgstr "" -#: modules/networks/templates/connection_show.html:182 -#: modules/networks/templates/connection_show.html:223 +#: modules/networks/templates/connection_show.html:186 +#: modules/networks/templates/connection_show.html:227 msgid "Method" msgstr "" -#: modules/networks/templates/connection_show.html:189 -#: modules/networks/templates/connection_show.html:230 +#: modules/networks/templates/connection_show.html:193 +#: modules/networks/templates/connection_show.html:234 #, fuzzy #| msgid "Address" msgid "IP address" msgstr "Adresse" -#: modules/networks/templates/connection_show.html:198 -#: modules/networks/templates/connection_show.html:237 +#: modules/networks/templates/connection_show.html:202 +#: modules/networks/templates/connection_show.html:241 msgid "Gateway" msgstr "" -#: modules/networks/templates/connection_show.html:205 -#: modules/networks/templates/connection_show.html:244 +#: modules/networks/templates/connection_show.html:209 +#: modules/networks/templates/connection_show.html:248 #, fuzzy #| msgid "Web Server" msgid "DNS server" msgstr "Serveur web" -#: modules/networks/templates/connection_show.html:212 -#: modules/networks/templates/connection_show.html:251 +#: modules/networks/templates/connection_show.html:216 +#: modules/networks/templates/connection_show.html:255 msgid "Default" msgstr "" -#: modules/networks/templates/connection_show.html:218 +#: modules/networks/templates/connection_show.html:222 msgid "IPv6" msgstr "" -#: modules/networks/templates/connection_show.html:259 +#: modules/networks/templates/connection_show.html:263 #, fuzzy #| msgid "This type of connection is not yet understood." msgid "This connection is not active." msgstr "Ce type de connection n'est pas encore intelligible." -#: modules/networks/templates/connection_show.html:262 +#: modules/networks/templates/connection_show.html:266 msgid "Security" msgstr "" -#: modules/networks/templates/connection_show.html:267 -#: modules/networks/templates/connection_show.html:287 -#: modules/networks/templates/connection_show.html:306 +#: modules/networks/templates/connection_show.html:271 +#: modules/networks/templates/connection_show.html:291 +#: modules/networks/templates/connection_show.html:310 #, fuzzy #| msgid "Firewall Zone" msgid "Firewall zone" msgstr "Zone Pare-feu" -#: modules/networks/templates/connection_show.html:276 +#: modules/networks/templates/connection_show.html:280 msgid "" "This interface should be connected to local network/machine. If you connect " "this interface to a public network, services meant to be available only " "internally will become available externally. This is a security risk." msgstr "" -#: modules/networks/templates/connection_show.html:296 +#: modules/networks/templates/connection_show.html:300 msgid "" "This interface should receive your Internet connection. If you connect it " "your a local network/machine, many services meant to available only " "internally will not be available." msgstr "" -#: modules/networks/templates/connection_show.html:315 +#: modules/networks/templates/connection_show.html:319 msgid "" "This interface is not maintained by FreedomBox. Its security status is " "unknown to FreedomBox. Many FreedomBox services may not be available on " @@ -1479,7 +1478,6 @@ msgid "Wi-Fi" msgstr "" #: modules/networks/templates/connections_diagram.html:89 -#: modules/networks/templates/connections_diagram.html:119 #, fuzzy, python-format #| msgid "Show Connection information" msgid "Show connection %(connection.name)s" @@ -1489,6 +1487,12 @@ msgstr "Montrer les informations sur la connection" msgid "Internal" msgstr "" +#: modules/networks/templates/connections_diagram.html:119 +#, fuzzy, python-format +#| msgid "Show Connection information" +msgid "Show connection %(name)s" +msgstr "Montrer les informations sur la connection" + #: modules/networks/templates/connections_diagram.html:131 msgid "Computer" msgstr "" @@ -1496,7 +1500,7 @@ msgstr "" #: modules/networks/templates/connections_list.html:67 #, fuzzy, python-format #| msgid "Failed to delete connection: Connection not found." -msgid "Delete connection %(connection.name)s" +msgid "Delete connection %(name)s" msgstr "Échec de la suppression de la connexion : connexion introuvable." #: modules/networks/templates/connections_list.html:92 @@ -1527,68 +1531,67 @@ msgstr "Activer les services cachés Tor" msgid "" "Virtual Private Network (VPN) is a technique for securely connecting two " "machines in order to access resources of a private network. While you are " -"away from home, you can connect to your %(cfg.box_name)s in order to join " -"your home network and access private/internal services provided by " -"%(cfg.box_name)s. You can also access the rest of the Internet via " -"%(cfg.box_name)s for added security and anonymity." +"away from home, you can connect to your %(box_name)s in order to join your " +"home network and access private/internal services provided by %(box_name)s. " +"You can also access the rest of the Internet via %(box_name)s for added " +"security and anonymity." msgstr "" -#: modules/openvpn/templates/openvpn.html:52 +#: modules/openvpn/templates/openvpn.html:51 msgid "Profile" msgstr "" -#: modules/openvpn/templates/openvpn.html:55 +#: modules/openvpn/templates/openvpn.html:54 #, python-format msgid "" -"To connect to %(cfg.box_name)s's VPN, you need to download a profile and " -"feed it to an OpenVPN client on your mobile or desktop machine. OpenVPN " -"Clients are available for most platforms. See documentation on recommended clients and instructions on how to " "configure them." msgstr "" -#: modules/openvpn/templates/openvpn.html:67 +#: modules/openvpn/templates/openvpn.html:66 #, python-format -msgid "" -"Profile is specific to each user of %(cfg.box_name)s. Keep it a secret." +msgid "Profile is specific to each user of %(box_name)s. Keep it a secret." msgstr "" -#: modules/openvpn/templates/openvpn.html:77 +#: modules/openvpn/templates/openvpn.html:76 msgid "Download my profile" msgstr "" -#: modules/openvpn/templates/openvpn.html:86 +#: modules/openvpn/templates/openvpn.html:85 #, python-format msgid "" "OpenVPN has not yet been setup. Performing a secure setup takes a very long " -"time. Depending on how fast your %(cfg.box_name)s is, it may even take " -"hours. If the setup is interrupted, you may start it again." +"time. Depending on how fast your %(box_name)s is, it may even take hours. " +"If the setup is interrupted, you may start it again." msgstr "" -#: modules/openvpn/templates/openvpn.html:98 +#: modules/openvpn/templates/openvpn.html:97 msgid "Start setup" msgstr "" -#: modules/openvpn/templates/openvpn.html:105 +#: modules/openvpn/templates/openvpn.html:104 msgid "OpenVPN setup is running" msgstr "" -#: modules/openvpn/templates/openvpn.html:109 +#: modules/openvpn/templates/openvpn.html:108 #, python-format msgid "" "To perform a secure setup, this process takes a very long time. Depending " -"on how fast your %(cfg.box_name)s is, it may even take hours. If the setup " -"is interrupted, you may start it again." +"on how fast your %(box_name)s is, it may even take hours. If the setup is " +"interrupted, you may start it again." msgstr "" -#: modules/openvpn/templates/openvpn.html:122 +#: modules/openvpn/templates/openvpn.html:121 #, fuzzy #| msgid "Enable Tor Hidden Service" msgid "OpenVPN server is running" msgstr "Activer les services cachés Tor" -#: modules/openvpn/templates/openvpn.html:125 +#: modules/openvpn/templates/openvpn.html:124 msgid "OpenVPN server is not running" msgstr "" @@ -1808,7 +1811,7 @@ msgstr "Services cachés Tor activés" #: modules/pagekite/templates/pagekite_custom_services.html:89 #, python-format -msgid "connected to %(service.backend_host)s:%(service.backend_port)s" +msgid "connected to %(backend_host)s:%(backend_port)s" msgstr "" #: modules/pagekite/templates/pagekite_custom_services.html:101 @@ -1820,21 +1823,21 @@ msgstr "Service personnalisé supprimé" #: modules/pagekite/templates/pagekite_introduction.html:26 #, python-format msgid "" -"PageKite is a system for exposing %(cfg.box_name)s services when you don't " -"have a direct connection to the Internet. You only need this if your " -"%(cfg.box_name)s services are unreachable from the rest of the Internet. " -"This includes the following situations:" +"PageKite is a system for exposing %(box_name)s services when you don't have " +"a direct connection to the Internet. You only need this if your %(box_name)s " +"services are unreachable from the rest of the Internet. This includes the " +"following situations:" msgstr "" #: modules/pagekite/templates/pagekite_introduction.html:37 #, python-format -msgid "%(cfg.box_name)s is behind a restricted firewall." +msgid "%(box_name)s is behind a restricted firewall." msgstr "" #: modules/pagekite/templates/pagekite_introduction.html:43 #, python-format msgid "" -"%(cfg.box_name)s is connected to a (wireless) router which you don't control." +"%(box_name)s is connected to a (wireless) router which you don't control." msgstr "" #: modules/pagekite/templates/pagekite_introduction.html:50 @@ -1859,10 +1862,10 @@ msgid "" "PageKite works around NAT, firewalls and IP-address limitations by using a " "combination of tunnels and reverse proxies. You can use any pagekite service " "provider, for example pagekite.net. In " -"future it might be possible to use your buddy's %(cfg.box_name)s for this." +"future it might be possible to use your buddy's %(box_name)s for this." msgstr "" -#: modules/pagekite/templates/pagekite_introduction.html:79 +#: modules/pagekite/templates/pagekite_introduction.html:78 #: modules/pagekite/views.py:36 msgid "Configure PageKite" msgstr "Configurer PageKite" @@ -1959,10 +1962,10 @@ msgstr "" #, python-format msgid "" "You can use Privoxy by modifying your browser proxy settings to your " -"%(cfg.box_name)s hostname (or IP address) with port 8118. While using " -"Privoxy, you can see its configuration details and documentation at http://config.privoxy.org/ or http://p.p" +"%(box_name)s hostname (or IP address) with port 8118. While using Privoxy, " +"you can see its configuration details and documentation at http://config.privoxy.org/ or http://p.p" msgstr "" #: modules/privoxy/templates/privoxy.html:53 @@ -2072,15 +2075,13 @@ msgstr "Configuration système" #: modules/system/templates/system.html:28 #, python-format -msgid "" -"Here you can administrate the underlying system of your %(cfg.box_name)s." +msgid "Here you can administrate the underlying system of your %(box_name)s." msgstr "" #: modules/system/templates/system.html:35 #, python-format msgid "" -"The options affect the %(cfg.box_name)s at its most general level, so be " -"careful!" +"The options affect the %(box_name)s at its most general level, so be careful!" msgstr "" #: modules/tor/__init__.py:50 @@ -2132,7 +2133,7 @@ msgstr "" msgid "Hidden Service" msgstr "Activer les services cachés Tor" -#: modules/tor/templates/tor.html:60 modules/tor/templates/tor.html.py:103 +#: modules/tor/templates/tor.html:60 modules/tor/templates/tor.html.py:102 msgid "Port" msgstr "" @@ -2143,26 +2144,25 @@ msgstr "" #: modules/tor/templates/tor.html:88 #, python-format msgid "" -"Your %(cfg.box_name)s is configured as a Tor bridge with obfsproxy, so it " -"can help circumvent censorship. If your {{ cfg.box_name }} is behind a " -"router or firewall, you should make sure the following ports are open, and " -"port-forwarded, if necessary:" +"Your %(box_name)s is configured as a Tor bridge with obfsproxy, so it can " +"help circumvent censorship. If your %(box_name)s is behind a router or " +"firewall, you should make sure the following ports are open, and port-" +"forwarded, if necessary:" msgstr "" -#: modules/tor/templates/tor.html:102 +#: modules/tor/templates/tor.html:101 #, fuzzy #| msgid "Service type" msgid "Service" msgstr "Type de service" -#: modules/tor/templates/tor.html:118 +#: modules/tor/templates/tor.html:117 msgid "SOCKS" msgstr "" -#: modules/tor/templates/tor.html:121 +#: modules/tor/templates/tor.html:120 #, python-format -msgid "" -"A Tor SOCKS port is available on your %(cfg.box_name)s on TCP port 9050." +msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050." msgstr "" #: modules/tor/tor.py:44 @@ -2426,7 +2426,7 @@ msgstr "Le changement de mot de passe pour l'utilisateur LDAP a échoué." #: modules/users/templates/users_change_password.html:27 #, python-format -msgid "Change Password for %(form.user.username)s" +msgid "Change Password for %(username)s" msgstr "" #: modules/users/templates/users_change_password.html:40 @@ -2441,34 +2441,38 @@ msgid "Create User" msgstr "Créer un utilisateur" #: modules/users/templates/users_delete.html:27 -#, python-format -msgid "Delete User %(object.username)s" -msgstr "" +#, fuzzy, python-format +#| msgid "Delete Connection" +msgid "Delete User %(username)s" +msgstr "Supprimer connexion" #: modules/users/templates/users_delete.html:32 msgid "Delete user permanently?" msgstr "" #: modules/users/templates/users_delete.html:38 -#, python-format -msgid "Delete %(object.username)s" -msgstr "" +#, fuzzy, python-format +#| msgid "Delete User" +msgid "Delete %(username)s" +msgstr "Supprimer l'utilisateur" #: modules/users/templates/users_list.html:46 -#, python-format -msgid "Delete user %(user.username)s" -msgstr "" +#, fuzzy, python-format +#| msgid "Delete User" +msgid "Delete user %(username)s" +msgstr "Supprimer l'utilisateur" #: modules/users/templates/users_list.html:53 #, fuzzy, python-format #| msgid "User %(username)s created." -msgid "Edit user %(user.username)s" +msgid "Edit user %(username)s" msgstr "Utilisateur %(username)s créé." #: modules/users/templates/users_update.html:35 -#, python-format -msgid "Edit User %(object.username)s" -msgstr "" +#, fuzzy, python-format +#| msgid "User %(username)s created." +msgid "Edit User %(username)s" +msgstr "Utilisateur %(username)s créé." #: modules/users/templates/users_update.html:43 #, python-format @@ -2681,15 +2685,14 @@ msgid "Install" msgstr "" #: templates/package_install.html:74 -#, python-format -msgid "" -"Installing %(transaction.package_names|join:\", \")s: " -"%(transaction.status_string)s" -msgstr "" +#, fuzzy, python-format +#| msgid "Error installing packages: {details}" +msgid "Installing %(package_names)s: %(status)s" +msgstr "Erreur dans l'installation des paquets : {details}" -#: templates/package_install.html:85 +#: templates/package_install.html:84 #, python-format -msgid "%(transaction.percentage)s%% complete" +msgid "%(percentage)s%% complete" msgstr "" #~ msgid "dynamicdns" diff --git a/plinth/locale/it/LC_MESSAGES/django.po b/plinth/locale/it/LC_MESSAGES/django.po index 3dcc547cc..8b7ffbc2b 100644 --- a/plinth/locale/it/LC_MESSAGES/django.po +++ b/plinth/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-13 22:39+0530\n" +"POT-Creation-Date: 2015-11-14 11:19+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -64,7 +64,7 @@ msgstr "" #, python-format msgid "" "You can install and run various services and applications on your " -"%(cfg.box_name)s." +"%(box_name)s." msgstr "" #: modules/apps/templates/apps.html:35 @@ -99,8 +99,8 @@ msgstr "" #: modules/deluge/templates/deluge.html:39 modules/dynamicdns/dynamicdns.py:38 #: modules/firewall/templates/firewall.html:57 #: modules/mumble/templates/mumble.html:44 -#: modules/networks/templates/connection_show.html:257 -#: modules/openvpn/templates/openvpn.html:82 +#: modules/networks/templates/connection_show.html:261 +#: modules/openvpn/templates/openvpn.html:81 #: modules/privoxy/templates/privoxy.html:48 modules/tor/templates/tor.html:39 #: modules/transmission/templates/transmission.html:42 #: modules/xmpp/templates/xmpp.html:58 @@ -120,7 +120,7 @@ msgstr "" #: modules/deluge/templates/deluge.html:53 #: modules/ikiwiki/templates/ikiwiki.html:35 #: modules/mumble/templates/mumble.html:59 -#: modules/openvpn/templates/openvpn.html:131 +#: modules/openvpn/templates/openvpn.html:130 #: modules/owncloud/templates/owncloud.html:51 #: modules/privoxy/templates/privoxy.html:62 #: modules/roundcube/templates/roundcube.html:62 @@ -137,7 +137,7 @@ msgstr "" #: modules/ikiwiki/templates/ikiwiki.html:43 #: modules/ikiwiki/templates/ikiwiki_create.html:32 #: modules/mumble/templates/mumble.html:67 -#: modules/openvpn/templates/openvpn.html:139 +#: modules/openvpn/templates/openvpn.html:138 #: modules/privoxy/templates/privoxy.html:70 #: modules/restore/templates/restore_index.html:52 #: modules/roundcube/templates/roundcube.html:70 @@ -593,9 +593,8 @@ msgstr "" #, python-format msgid "" "Firewall is a network security system that controls the incoming and " -"outgoing network traffic on your %(cfg.box_name)s. Keeping a firewall " -"enabled and properly configured reduces risk of security threat from the " -"Internet." +"outgoing network traffic on your %(box_name)s. Keeping a firewall enabled " +"and properly configured reduces risk of security threat from the Internet." msgstr "" #: modules/firewall/templates/firewall.html:36 @@ -606,9 +605,9 @@ msgstr "" #, python-format msgid "" "Firewall daemon is not running. Please run it. Firewall comes enabled by " -"default on %(cfg.box_name)s. On any Debian based system (such as " -"%(cfg.box_name)s) you may run it using the command 'service firewalld start' " -"or in case of a system with systemd 'systemctl start firewalld'" +"default on %(box_name)s. On any Debian based system (such as %(box_name)s) " +"you may run it using the command 'service firewalld start' or in case of a " +"system with systemd 'systemctl start firewalld'" msgstr "" #: modules/firewall/templates/firewall.html:56 @@ -790,7 +789,7 @@ msgstr "" #, python-format msgid "" "The FreedomBox Manual is the best place to " -"start for information regarding %(cfg.box_name)s." +"start for information regarding %(box_name)s." msgstr "" #: modules/help/templates/help_index.html:36 @@ -1033,7 +1032,7 @@ msgid "Physical interface" msgstr "" #: modules/networks/forms.py:119 -#: modules/networks/templates/connection_show.html:142 +#: modules/networks/templates/connection_show.html:144 msgid "SSID" msgstr "" @@ -1042,7 +1041,7 @@ msgid "The visible name of the network." msgstr "" #: modules/networks/forms.py:122 -#: modules/networks/templates/connection_show.html:153 +#: modules/networks/templates/connection_show.html:157 msgid "Mode" msgstr "" @@ -1190,8 +1189,8 @@ msgid "Primary connection" msgstr "" #: modules/networks/templates/connection_show.html:73 -#: modules/networks/templates/connection_show.html:213 -#: modules/networks/templates/connection_show.html:252 +#: modules/networks/templates/connection_show.html:217 +#: modules/networks/templates/connection_show.html:256 msgid "yes" msgstr "" @@ -1236,90 +1235,90 @@ msgid "please check cable" msgstr "" #: modules/networks/templates/connection_show.html:133 -#: modules/networks/templates/connection_show.html:147 +#: modules/networks/templates/connection_show.html:149 msgid "Speed" msgstr "" #: modules/networks/templates/connection_show.html:135 #, python-format -msgid "%(device.ethernet.speed)s Mbit/s" +msgid "%(ethernet_speed)s Mbit/s" msgstr "" -#: modules/networks/templates/connection_show.html:149 +#: modules/networks/templates/connection_show.html:151 #, python-format -msgid "%(device.wireless.bitrate)s Mbit/s" +msgid "%(wireless_bitrate)s Mbit/s" msgstr "" -#: modules/networks/templates/connection_show.html:159 +#: modules/networks/templates/connection_show.html:163 msgid "Signal strength" msgstr "" -#: modules/networks/templates/connection_show.html:169 +#: modules/networks/templates/connection_show.html:173 msgid "Channel" msgstr "" -#: modules/networks/templates/connection_show.html:177 +#: modules/networks/templates/connection_show.html:181 msgid "IPv4" msgstr "" -#: modules/networks/templates/connection_show.html:182 -#: modules/networks/templates/connection_show.html:223 +#: modules/networks/templates/connection_show.html:186 +#: modules/networks/templates/connection_show.html:227 msgid "Method" msgstr "" -#: modules/networks/templates/connection_show.html:189 -#: modules/networks/templates/connection_show.html:230 +#: modules/networks/templates/connection_show.html:193 +#: modules/networks/templates/connection_show.html:234 msgid "IP address" msgstr "" -#: modules/networks/templates/connection_show.html:198 -#: modules/networks/templates/connection_show.html:237 +#: modules/networks/templates/connection_show.html:202 +#: modules/networks/templates/connection_show.html:241 msgid "Gateway" msgstr "" -#: modules/networks/templates/connection_show.html:205 -#: modules/networks/templates/connection_show.html:244 +#: modules/networks/templates/connection_show.html:209 +#: modules/networks/templates/connection_show.html:248 msgid "DNS server" msgstr "" -#: modules/networks/templates/connection_show.html:212 -#: modules/networks/templates/connection_show.html:251 +#: modules/networks/templates/connection_show.html:216 +#: modules/networks/templates/connection_show.html:255 msgid "Default" msgstr "" -#: modules/networks/templates/connection_show.html:218 +#: modules/networks/templates/connection_show.html:222 msgid "IPv6" msgstr "" -#: modules/networks/templates/connection_show.html:259 +#: modules/networks/templates/connection_show.html:263 msgid "This connection is not active." msgstr "" -#: modules/networks/templates/connection_show.html:262 +#: modules/networks/templates/connection_show.html:266 msgid "Security" msgstr "" -#: modules/networks/templates/connection_show.html:267 -#: modules/networks/templates/connection_show.html:287 -#: modules/networks/templates/connection_show.html:306 +#: modules/networks/templates/connection_show.html:271 +#: modules/networks/templates/connection_show.html:291 +#: modules/networks/templates/connection_show.html:310 msgid "Firewall zone" msgstr "" -#: modules/networks/templates/connection_show.html:276 +#: modules/networks/templates/connection_show.html:280 msgid "" "This interface should be connected to local network/machine. If you connect " "this interface to a public network, services meant to be available only " "internally will become available externally. This is a security risk." msgstr "" -#: modules/networks/templates/connection_show.html:296 +#: modules/networks/templates/connection_show.html:300 msgid "" "This interface should receive your Internet connection. If you connect it " "your a local network/machine, many services meant to available only " "internally will not be available." msgstr "" -#: modules/networks/templates/connection_show.html:315 +#: modules/networks/templates/connection_show.html:319 msgid "" "This interface is not maintained by FreedomBox. Its security status is " "unknown to FreedomBox. Many FreedomBox services may not be available on " @@ -1369,7 +1368,6 @@ msgid "Wi-Fi" msgstr "" #: modules/networks/templates/connections_diagram.html:89 -#: modules/networks/templates/connections_diagram.html:119 #, python-format msgid "Show connection %(connection.name)s" msgstr "" @@ -1378,13 +1376,18 @@ msgstr "" msgid "Internal" msgstr "" +#: modules/networks/templates/connections_diagram.html:119 +#, python-format +msgid "Show connection %(name)s" +msgstr "" + #: modules/networks/templates/connections_diagram.html:131 msgid "Computer" msgstr "" #: modules/networks/templates/connections_list.html:67 #, python-format -msgid "Delete connection %(connection.name)s" +msgid "Delete connection %(name)s" msgstr "" #: modules/networks/templates/connections_list.html:92 @@ -1413,66 +1416,65 @@ msgstr "" msgid "" "Virtual Private Network (VPN) is a technique for securely connecting two " "machines in order to access resources of a private network. While you are " -"away from home, you can connect to your %(cfg.box_name)s in order to join " -"your home network and access private/internal services provided by " -"%(cfg.box_name)s. You can also access the rest of the Internet via " -"%(cfg.box_name)s for added security and anonymity." +"away from home, you can connect to your %(box_name)s in order to join your " +"home network and access private/internal services provided by %(box_name)s. " +"You can also access the rest of the Internet via %(box_name)s for added " +"security and anonymity." msgstr "" -#: modules/openvpn/templates/openvpn.html:52 +#: modules/openvpn/templates/openvpn.html:51 msgid "Profile" msgstr "" -#: modules/openvpn/templates/openvpn.html:55 +#: modules/openvpn/templates/openvpn.html:54 #, python-format msgid "" -"To connect to %(cfg.box_name)s's VPN, you need to download a profile and " -"feed it to an OpenVPN client on your mobile or desktop machine. OpenVPN " -"Clients are available for most platforms. See documentation on recommended clients and instructions on how to " "configure them." msgstr "" -#: modules/openvpn/templates/openvpn.html:67 +#: modules/openvpn/templates/openvpn.html:66 #, python-format -msgid "" -"Profile is specific to each user of %(cfg.box_name)s. Keep it a secret." +msgid "Profile is specific to each user of %(box_name)s. Keep it a secret." msgstr "" -#: modules/openvpn/templates/openvpn.html:77 +#: modules/openvpn/templates/openvpn.html:76 msgid "Download my profile" msgstr "" -#: modules/openvpn/templates/openvpn.html:86 +#: modules/openvpn/templates/openvpn.html:85 #, python-format msgid "" "OpenVPN has not yet been setup. Performing a secure setup takes a very long " -"time. Depending on how fast your %(cfg.box_name)s is, it may even take " -"hours. If the setup is interrupted, you may start it again." +"time. Depending on how fast your %(box_name)s is, it may even take hours. " +"If the setup is interrupted, you may start it again." msgstr "" -#: modules/openvpn/templates/openvpn.html:98 +#: modules/openvpn/templates/openvpn.html:97 msgid "Start setup" msgstr "" -#: modules/openvpn/templates/openvpn.html:105 +#: modules/openvpn/templates/openvpn.html:104 msgid "OpenVPN setup is running" msgstr "" -#: modules/openvpn/templates/openvpn.html:109 +#: modules/openvpn/templates/openvpn.html:108 #, python-format msgid "" "To perform a secure setup, this process takes a very long time. Depending " -"on how fast your %(cfg.box_name)s is, it may even take hours. If the setup " -"is interrupted, you may start it again." +"on how fast your %(box_name)s is, it may even take hours. If the setup is " +"interrupted, you may start it again." msgstr "" -#: modules/openvpn/templates/openvpn.html:122 +#: modules/openvpn/templates/openvpn.html:121 msgid "OpenVPN server is running" msgstr "" -#: modules/openvpn/templates/openvpn.html:125 +#: modules/openvpn/templates/openvpn.html:124 msgid "OpenVPN server is not running" msgstr "" @@ -1666,7 +1668,7 @@ msgstr "" #: modules/pagekite/templates/pagekite_custom_services.html:89 #, python-format -msgid "connected to %(service.backend_host)s:%(service.backend_port)s" +msgid "connected to %(backend_host)s:%(backend_port)s" msgstr "" #: modules/pagekite/templates/pagekite_custom_services.html:101 @@ -1676,21 +1678,21 @@ msgstr "" #: modules/pagekite/templates/pagekite_introduction.html:26 #, python-format msgid "" -"PageKite is a system for exposing %(cfg.box_name)s services when you don't " -"have a direct connection to the Internet. You only need this if your " -"%(cfg.box_name)s services are unreachable from the rest of the Internet. " -"This includes the following situations:" +"PageKite is a system for exposing %(box_name)s services when you don't have " +"a direct connection to the Internet. You only need this if your %(box_name)s " +"services are unreachable from the rest of the Internet. This includes the " +"following situations:" msgstr "" #: modules/pagekite/templates/pagekite_introduction.html:37 #, python-format -msgid "%(cfg.box_name)s is behind a restricted firewall." +msgid "%(box_name)s is behind a restricted firewall." msgstr "" #: modules/pagekite/templates/pagekite_introduction.html:43 #, python-format msgid "" -"%(cfg.box_name)s is connected to a (wireless) router which you don't control." +"%(box_name)s is connected to a (wireless) router which you don't control." msgstr "" #: modules/pagekite/templates/pagekite_introduction.html:50 @@ -1715,10 +1717,10 @@ msgid "" "PageKite works around NAT, firewalls and IP-address limitations by using a " "combination of tunnels and reverse proxies. You can use any pagekite service " "provider, for example pagekite.net. In " -"future it might be possible to use your buddy's %(cfg.box_name)s for this." +"future it might be possible to use your buddy's %(box_name)s for this." msgstr "" -#: modules/pagekite/templates/pagekite_introduction.html:79 +#: modules/pagekite/templates/pagekite_introduction.html:78 #: modules/pagekite/views.py:36 msgid "Configure PageKite" msgstr "" @@ -1809,10 +1811,10 @@ msgstr "" #, python-format msgid "" "You can use Privoxy by modifying your browser proxy settings to your " -"%(cfg.box_name)s hostname (or IP address) with port 8118. While using " -"Privoxy, you can see its configuration details and documentation at http://config.privoxy.org/ or http://p.p" +"%(box_name)s hostname (or IP address) with port 8118. While using Privoxy, " +"you can see its configuration details and documentation at http://config.privoxy.org/ or http://p.p" msgstr "" #: modules/privoxy/templates/privoxy.html:53 @@ -1920,15 +1922,13 @@ msgstr "" #: modules/system/templates/system.html:28 #, python-format -msgid "" -"Here you can administrate the underlying system of your %(cfg.box_name)s." +msgid "Here you can administrate the underlying system of your %(box_name)s." msgstr "" #: modules/system/templates/system.html:35 #, python-format msgid "" -"The options affect the %(cfg.box_name)s at its most general level, so be " -"careful!" +"The options affect the %(box_name)s at its most general level, so be careful!" msgstr "" #: modules/tor/__init__.py:50 @@ -1978,7 +1978,7 @@ msgstr "" msgid "Hidden Service" msgstr "" -#: modules/tor/templates/tor.html:60 modules/tor/templates/tor.html.py:103 +#: modules/tor/templates/tor.html:60 modules/tor/templates/tor.html.py:102 msgid "Port" msgstr "" @@ -1989,24 +1989,23 @@ msgstr "" #: modules/tor/templates/tor.html:88 #, python-format msgid "" -"Your %(cfg.box_name)s is configured as a Tor bridge with obfsproxy, so it " -"can help circumvent censorship. If your {{ cfg.box_name }} is behind a " -"router or firewall, you should make sure the following ports are open, and " -"port-forwarded, if necessary:" +"Your %(box_name)s is configured as a Tor bridge with obfsproxy, so it can " +"help circumvent censorship. If your %(box_name)s is behind a router or " +"firewall, you should make sure the following ports are open, and port-" +"forwarded, if necessary:" msgstr "" -#: modules/tor/templates/tor.html:102 +#: modules/tor/templates/tor.html:101 msgid "Service" msgstr "" -#: modules/tor/templates/tor.html:118 +#: modules/tor/templates/tor.html:117 msgid "SOCKS" msgstr "" -#: modules/tor/templates/tor.html:121 +#: modules/tor/templates/tor.html:120 #, python-format -msgid "" -"A Tor SOCKS port is available on your %(cfg.box_name)s on TCP port 9050." +msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050." msgstr "" #: modules/tor/tor.py:44 @@ -2241,7 +2240,7 @@ msgstr "" #: modules/users/templates/users_change_password.html:27 #, python-format -msgid "Change Password for %(form.user.username)s" +msgid "Change Password for %(username)s" msgstr "" #: modules/users/templates/users_change_password.html:40 @@ -2255,7 +2254,7 @@ msgstr "" #: modules/users/templates/users_delete.html:27 #, python-format -msgid "Delete User %(object.username)s" +msgid "Delete User %(username)s" msgstr "" #: modules/users/templates/users_delete.html:32 @@ -2264,22 +2263,22 @@ msgstr "" #: modules/users/templates/users_delete.html:38 #, python-format -msgid "Delete %(object.username)s" +msgid "Delete %(username)s" msgstr "" #: modules/users/templates/users_list.html:46 #, python-format -msgid "Delete user %(user.username)s" +msgid "Delete user %(username)s" msgstr "" #: modules/users/templates/users_list.html:53 #, python-format -msgid "Edit user %(user.username)s" +msgid "Edit user %(username)s" msgstr "" #: modules/users/templates/users_update.html:35 #, python-format -msgid "Edit User %(object.username)s" +msgid "Edit User %(username)s" msgstr "" #: modules/users/templates/users_update.html:43 @@ -2487,12 +2486,10 @@ msgstr "" #: templates/package_install.html:74 #, python-format -msgid "" -"Installing %(transaction.package_names|join:\", \")s: " -"%(transaction.status_string)s" +msgid "Installing %(package_names)s: %(status)s" msgstr "" -#: templates/package_install.html:85 +#: templates/package_install.html:84 #, python-format -msgid "%(transaction.percentage)s%% complete" +msgid "%(percentage)s%% complete" msgstr "" diff --git a/plinth/locale/pt/LC_MESSAGES/django.po b/plinth/locale/pt/LC_MESSAGES/django.po index 3dcc547cc..8b7ffbc2b 100644 --- a/plinth/locale/pt/LC_MESSAGES/django.po +++ b/plinth/locale/pt/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-11-13 22:39+0530\n" +"POT-Creation-Date: 2015-11-14 11:19+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -64,7 +64,7 @@ msgstr "" #, python-format msgid "" "You can install and run various services and applications on your " -"%(cfg.box_name)s." +"%(box_name)s." msgstr "" #: modules/apps/templates/apps.html:35 @@ -99,8 +99,8 @@ msgstr "" #: modules/deluge/templates/deluge.html:39 modules/dynamicdns/dynamicdns.py:38 #: modules/firewall/templates/firewall.html:57 #: modules/mumble/templates/mumble.html:44 -#: modules/networks/templates/connection_show.html:257 -#: modules/openvpn/templates/openvpn.html:82 +#: modules/networks/templates/connection_show.html:261 +#: modules/openvpn/templates/openvpn.html:81 #: modules/privoxy/templates/privoxy.html:48 modules/tor/templates/tor.html:39 #: modules/transmission/templates/transmission.html:42 #: modules/xmpp/templates/xmpp.html:58 @@ -120,7 +120,7 @@ msgstr "" #: modules/deluge/templates/deluge.html:53 #: modules/ikiwiki/templates/ikiwiki.html:35 #: modules/mumble/templates/mumble.html:59 -#: modules/openvpn/templates/openvpn.html:131 +#: modules/openvpn/templates/openvpn.html:130 #: modules/owncloud/templates/owncloud.html:51 #: modules/privoxy/templates/privoxy.html:62 #: modules/roundcube/templates/roundcube.html:62 @@ -137,7 +137,7 @@ msgstr "" #: modules/ikiwiki/templates/ikiwiki.html:43 #: modules/ikiwiki/templates/ikiwiki_create.html:32 #: modules/mumble/templates/mumble.html:67 -#: modules/openvpn/templates/openvpn.html:139 +#: modules/openvpn/templates/openvpn.html:138 #: modules/privoxy/templates/privoxy.html:70 #: modules/restore/templates/restore_index.html:52 #: modules/roundcube/templates/roundcube.html:70 @@ -593,9 +593,8 @@ msgstr "" #, python-format msgid "" "Firewall is a network security system that controls the incoming and " -"outgoing network traffic on your %(cfg.box_name)s. Keeping a firewall " -"enabled and properly configured reduces risk of security threat from the " -"Internet." +"outgoing network traffic on your %(box_name)s. Keeping a firewall enabled " +"and properly configured reduces risk of security threat from the Internet." msgstr "" #: modules/firewall/templates/firewall.html:36 @@ -606,9 +605,9 @@ msgstr "" #, python-format msgid "" "Firewall daemon is not running. Please run it. Firewall comes enabled by " -"default on %(cfg.box_name)s. On any Debian based system (such as " -"%(cfg.box_name)s) you may run it using the command 'service firewalld start' " -"or in case of a system with systemd 'systemctl start firewalld'" +"default on %(box_name)s. On any Debian based system (such as %(box_name)s) " +"you may run it using the command 'service firewalld start' or in case of a " +"system with systemd 'systemctl start firewalld'" msgstr "" #: modules/firewall/templates/firewall.html:56 @@ -790,7 +789,7 @@ msgstr "" #, python-format msgid "" "The FreedomBox Manual is the best place to " -"start for information regarding %(cfg.box_name)s." +"start for information regarding %(box_name)s." msgstr "" #: modules/help/templates/help_index.html:36 @@ -1033,7 +1032,7 @@ msgid "Physical interface" msgstr "" #: modules/networks/forms.py:119 -#: modules/networks/templates/connection_show.html:142 +#: modules/networks/templates/connection_show.html:144 msgid "SSID" msgstr "" @@ -1042,7 +1041,7 @@ msgid "The visible name of the network." msgstr "" #: modules/networks/forms.py:122 -#: modules/networks/templates/connection_show.html:153 +#: modules/networks/templates/connection_show.html:157 msgid "Mode" msgstr "" @@ -1190,8 +1189,8 @@ msgid "Primary connection" msgstr "" #: modules/networks/templates/connection_show.html:73 -#: modules/networks/templates/connection_show.html:213 -#: modules/networks/templates/connection_show.html:252 +#: modules/networks/templates/connection_show.html:217 +#: modules/networks/templates/connection_show.html:256 msgid "yes" msgstr "" @@ -1236,90 +1235,90 @@ msgid "please check cable" msgstr "" #: modules/networks/templates/connection_show.html:133 -#: modules/networks/templates/connection_show.html:147 +#: modules/networks/templates/connection_show.html:149 msgid "Speed" msgstr "" #: modules/networks/templates/connection_show.html:135 #, python-format -msgid "%(device.ethernet.speed)s Mbit/s" +msgid "%(ethernet_speed)s Mbit/s" msgstr "" -#: modules/networks/templates/connection_show.html:149 +#: modules/networks/templates/connection_show.html:151 #, python-format -msgid "%(device.wireless.bitrate)s Mbit/s" +msgid "%(wireless_bitrate)s Mbit/s" msgstr "" -#: modules/networks/templates/connection_show.html:159 +#: modules/networks/templates/connection_show.html:163 msgid "Signal strength" msgstr "" -#: modules/networks/templates/connection_show.html:169 +#: modules/networks/templates/connection_show.html:173 msgid "Channel" msgstr "" -#: modules/networks/templates/connection_show.html:177 +#: modules/networks/templates/connection_show.html:181 msgid "IPv4" msgstr "" -#: modules/networks/templates/connection_show.html:182 -#: modules/networks/templates/connection_show.html:223 +#: modules/networks/templates/connection_show.html:186 +#: modules/networks/templates/connection_show.html:227 msgid "Method" msgstr "" -#: modules/networks/templates/connection_show.html:189 -#: modules/networks/templates/connection_show.html:230 +#: modules/networks/templates/connection_show.html:193 +#: modules/networks/templates/connection_show.html:234 msgid "IP address" msgstr "" -#: modules/networks/templates/connection_show.html:198 -#: modules/networks/templates/connection_show.html:237 +#: modules/networks/templates/connection_show.html:202 +#: modules/networks/templates/connection_show.html:241 msgid "Gateway" msgstr "" -#: modules/networks/templates/connection_show.html:205 -#: modules/networks/templates/connection_show.html:244 +#: modules/networks/templates/connection_show.html:209 +#: modules/networks/templates/connection_show.html:248 msgid "DNS server" msgstr "" -#: modules/networks/templates/connection_show.html:212 -#: modules/networks/templates/connection_show.html:251 +#: modules/networks/templates/connection_show.html:216 +#: modules/networks/templates/connection_show.html:255 msgid "Default" msgstr "" -#: modules/networks/templates/connection_show.html:218 +#: modules/networks/templates/connection_show.html:222 msgid "IPv6" msgstr "" -#: modules/networks/templates/connection_show.html:259 +#: modules/networks/templates/connection_show.html:263 msgid "This connection is not active." msgstr "" -#: modules/networks/templates/connection_show.html:262 +#: modules/networks/templates/connection_show.html:266 msgid "Security" msgstr "" -#: modules/networks/templates/connection_show.html:267 -#: modules/networks/templates/connection_show.html:287 -#: modules/networks/templates/connection_show.html:306 +#: modules/networks/templates/connection_show.html:271 +#: modules/networks/templates/connection_show.html:291 +#: modules/networks/templates/connection_show.html:310 msgid "Firewall zone" msgstr "" -#: modules/networks/templates/connection_show.html:276 +#: modules/networks/templates/connection_show.html:280 msgid "" "This interface should be connected to local network/machine. If you connect " "this interface to a public network, services meant to be available only " "internally will become available externally. This is a security risk." msgstr "" -#: modules/networks/templates/connection_show.html:296 +#: modules/networks/templates/connection_show.html:300 msgid "" "This interface should receive your Internet connection. If you connect it " "your a local network/machine, many services meant to available only " "internally will not be available." msgstr "" -#: modules/networks/templates/connection_show.html:315 +#: modules/networks/templates/connection_show.html:319 msgid "" "This interface is not maintained by FreedomBox. Its security status is " "unknown to FreedomBox. Many FreedomBox services may not be available on " @@ -1369,7 +1368,6 @@ msgid "Wi-Fi" msgstr "" #: modules/networks/templates/connections_diagram.html:89 -#: modules/networks/templates/connections_diagram.html:119 #, python-format msgid "Show connection %(connection.name)s" msgstr "" @@ -1378,13 +1376,18 @@ msgstr "" msgid "Internal" msgstr "" +#: modules/networks/templates/connections_diagram.html:119 +#, python-format +msgid "Show connection %(name)s" +msgstr "" + #: modules/networks/templates/connections_diagram.html:131 msgid "Computer" msgstr "" #: modules/networks/templates/connections_list.html:67 #, python-format -msgid "Delete connection %(connection.name)s" +msgid "Delete connection %(name)s" msgstr "" #: modules/networks/templates/connections_list.html:92 @@ -1413,66 +1416,65 @@ msgstr "" msgid "" "Virtual Private Network (VPN) is a technique for securely connecting two " "machines in order to access resources of a private network. While you are " -"away from home, you can connect to your %(cfg.box_name)s in order to join " -"your home network and access private/internal services provided by " -"%(cfg.box_name)s. You can also access the rest of the Internet via " -"%(cfg.box_name)s for added security and anonymity." +"away from home, you can connect to your %(box_name)s in order to join your " +"home network and access private/internal services provided by %(box_name)s. " +"You can also access the rest of the Internet via %(box_name)s for added " +"security and anonymity." msgstr "" -#: modules/openvpn/templates/openvpn.html:52 +#: modules/openvpn/templates/openvpn.html:51 msgid "Profile" msgstr "" -#: modules/openvpn/templates/openvpn.html:55 +#: modules/openvpn/templates/openvpn.html:54 #, python-format msgid "" -"To connect to %(cfg.box_name)s's VPN, you need to download a profile and " -"feed it to an OpenVPN client on your mobile or desktop machine. OpenVPN " -"Clients are available for most platforms. See documentation on recommended clients and instructions on how to " "configure them." msgstr "" -#: modules/openvpn/templates/openvpn.html:67 +#: modules/openvpn/templates/openvpn.html:66 #, python-format -msgid "" -"Profile is specific to each user of %(cfg.box_name)s. Keep it a secret." +msgid "Profile is specific to each user of %(box_name)s. Keep it a secret." msgstr "" -#: modules/openvpn/templates/openvpn.html:77 +#: modules/openvpn/templates/openvpn.html:76 msgid "Download my profile" msgstr "" -#: modules/openvpn/templates/openvpn.html:86 +#: modules/openvpn/templates/openvpn.html:85 #, python-format msgid "" "OpenVPN has not yet been setup. Performing a secure setup takes a very long " -"time. Depending on how fast your %(cfg.box_name)s is, it may even take " -"hours. If the setup is interrupted, you may start it again." +"time. Depending on how fast your %(box_name)s is, it may even take hours. " +"If the setup is interrupted, you may start it again." msgstr "" -#: modules/openvpn/templates/openvpn.html:98 +#: modules/openvpn/templates/openvpn.html:97 msgid "Start setup" msgstr "" -#: modules/openvpn/templates/openvpn.html:105 +#: modules/openvpn/templates/openvpn.html:104 msgid "OpenVPN setup is running" msgstr "" -#: modules/openvpn/templates/openvpn.html:109 +#: modules/openvpn/templates/openvpn.html:108 #, python-format msgid "" "To perform a secure setup, this process takes a very long time. Depending " -"on how fast your %(cfg.box_name)s is, it may even take hours. If the setup " -"is interrupted, you may start it again." +"on how fast your %(box_name)s is, it may even take hours. If the setup is " +"interrupted, you may start it again." msgstr "" -#: modules/openvpn/templates/openvpn.html:122 +#: modules/openvpn/templates/openvpn.html:121 msgid "OpenVPN server is running" msgstr "" -#: modules/openvpn/templates/openvpn.html:125 +#: modules/openvpn/templates/openvpn.html:124 msgid "OpenVPN server is not running" msgstr "" @@ -1666,7 +1668,7 @@ msgstr "" #: modules/pagekite/templates/pagekite_custom_services.html:89 #, python-format -msgid "connected to %(service.backend_host)s:%(service.backend_port)s" +msgid "connected to %(backend_host)s:%(backend_port)s" msgstr "" #: modules/pagekite/templates/pagekite_custom_services.html:101 @@ -1676,21 +1678,21 @@ msgstr "" #: modules/pagekite/templates/pagekite_introduction.html:26 #, python-format msgid "" -"PageKite is a system for exposing %(cfg.box_name)s services when you don't " -"have a direct connection to the Internet. You only need this if your " -"%(cfg.box_name)s services are unreachable from the rest of the Internet. " -"This includes the following situations:" +"PageKite is a system for exposing %(box_name)s services when you don't have " +"a direct connection to the Internet. You only need this if your %(box_name)s " +"services are unreachable from the rest of the Internet. This includes the " +"following situations:" msgstr "" #: modules/pagekite/templates/pagekite_introduction.html:37 #, python-format -msgid "%(cfg.box_name)s is behind a restricted firewall." +msgid "%(box_name)s is behind a restricted firewall." msgstr "" #: modules/pagekite/templates/pagekite_introduction.html:43 #, python-format msgid "" -"%(cfg.box_name)s is connected to a (wireless) router which you don't control." +"%(box_name)s is connected to a (wireless) router which you don't control." msgstr "" #: modules/pagekite/templates/pagekite_introduction.html:50 @@ -1715,10 +1717,10 @@ msgid "" "PageKite works around NAT, firewalls and IP-address limitations by using a " "combination of tunnels and reverse proxies. You can use any pagekite service " "provider, for example pagekite.net. In " -"future it might be possible to use your buddy's %(cfg.box_name)s for this." +"future it might be possible to use your buddy's %(box_name)s for this." msgstr "" -#: modules/pagekite/templates/pagekite_introduction.html:79 +#: modules/pagekite/templates/pagekite_introduction.html:78 #: modules/pagekite/views.py:36 msgid "Configure PageKite" msgstr "" @@ -1809,10 +1811,10 @@ msgstr "" #, python-format msgid "" "You can use Privoxy by modifying your browser proxy settings to your " -"%(cfg.box_name)s hostname (or IP address) with port 8118. While using " -"Privoxy, you can see its configuration details and documentation at http://config.privoxy.org/ or http://p.p" +"%(box_name)s hostname (or IP address) with port 8118. While using Privoxy, " +"you can see its configuration details and documentation at http://config.privoxy.org/ or http://p.p" msgstr "" #: modules/privoxy/templates/privoxy.html:53 @@ -1920,15 +1922,13 @@ msgstr "" #: modules/system/templates/system.html:28 #, python-format -msgid "" -"Here you can administrate the underlying system of your %(cfg.box_name)s." +msgid "Here you can administrate the underlying system of your %(box_name)s." msgstr "" #: modules/system/templates/system.html:35 #, python-format msgid "" -"The options affect the %(cfg.box_name)s at its most general level, so be " -"careful!" +"The options affect the %(box_name)s at its most general level, so be careful!" msgstr "" #: modules/tor/__init__.py:50 @@ -1978,7 +1978,7 @@ msgstr "" msgid "Hidden Service" msgstr "" -#: modules/tor/templates/tor.html:60 modules/tor/templates/tor.html.py:103 +#: modules/tor/templates/tor.html:60 modules/tor/templates/tor.html.py:102 msgid "Port" msgstr "" @@ -1989,24 +1989,23 @@ msgstr "" #: modules/tor/templates/tor.html:88 #, python-format msgid "" -"Your %(cfg.box_name)s is configured as a Tor bridge with obfsproxy, so it " -"can help circumvent censorship. If your {{ cfg.box_name }} is behind a " -"router or firewall, you should make sure the following ports are open, and " -"port-forwarded, if necessary:" +"Your %(box_name)s is configured as a Tor bridge with obfsproxy, so it can " +"help circumvent censorship. If your %(box_name)s is behind a router or " +"firewall, you should make sure the following ports are open, and port-" +"forwarded, if necessary:" msgstr "" -#: modules/tor/templates/tor.html:102 +#: modules/tor/templates/tor.html:101 msgid "Service" msgstr "" -#: modules/tor/templates/tor.html:118 +#: modules/tor/templates/tor.html:117 msgid "SOCKS" msgstr "" -#: modules/tor/templates/tor.html:121 +#: modules/tor/templates/tor.html:120 #, python-format -msgid "" -"A Tor SOCKS port is available on your %(cfg.box_name)s on TCP port 9050." +msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050." msgstr "" #: modules/tor/tor.py:44 @@ -2241,7 +2240,7 @@ msgstr "" #: modules/users/templates/users_change_password.html:27 #, python-format -msgid "Change Password for %(form.user.username)s" +msgid "Change Password for %(username)s" msgstr "" #: modules/users/templates/users_change_password.html:40 @@ -2255,7 +2254,7 @@ msgstr "" #: modules/users/templates/users_delete.html:27 #, python-format -msgid "Delete User %(object.username)s" +msgid "Delete User %(username)s" msgstr "" #: modules/users/templates/users_delete.html:32 @@ -2264,22 +2263,22 @@ msgstr "" #: modules/users/templates/users_delete.html:38 #, python-format -msgid "Delete %(object.username)s" +msgid "Delete %(username)s" msgstr "" #: modules/users/templates/users_list.html:46 #, python-format -msgid "Delete user %(user.username)s" +msgid "Delete user %(username)s" msgstr "" #: modules/users/templates/users_list.html:53 #, python-format -msgid "Edit user %(user.username)s" +msgid "Edit user %(username)s" msgstr "" #: modules/users/templates/users_update.html:35 #, python-format -msgid "Edit User %(object.username)s" +msgid "Edit User %(username)s" msgstr "" #: modules/users/templates/users_update.html:43 @@ -2487,12 +2486,10 @@ msgstr "" #: templates/package_install.html:74 #, python-format -msgid "" -"Installing %(transaction.package_names|join:\", \")s: " -"%(transaction.status_string)s" +msgid "Installing %(package_names)s: %(status)s" msgstr "" -#: templates/package_install.html:85 +#: templates/package_install.html:84 #, python-format -msgid "%(transaction.percentage)s%% complete" +msgid "%(percentage)s%% complete" msgstr ""