luci-0.10: merge r7388 - r7450

3a9ee287 · Jo-Philipp Wich · 5312e291 · 3a9ee287 · 3a9ee287 · 5312e291
78 changed file
--- a/build/module.mk
+++ b/build/module.mk
@@ -39,7 +39,7 @@ luastrip: luasource
 	for i in $$(find dist -type f -name '*.lua'); do perl -e 'undef $$/; open( F, "< $$ARGV[0]" ) || die $$!; $$src = <F>; close F; $$src =~ s/--\[\[.*?\]\](--)?//gs; $$src =~ s/^\s*--.*?\n//gm; open( F, "> $$ARGV[0]" ) || die $$!; print F $$src; close F' $$i; done

 luacompile: luasource
-	for i in $$(find dist -name *.lua -not -name debug.lua); do $(LUAC) $(LUAC_OPTIONS) -o $$i $$i; done
+	for i in $$(find dist -name *.lua -not -name debug.lua| sort); do if ! $(LUAC) $(LUAC_OPTIONS) -o $$i $$i; then echo "Error compiling $$i"; exit 1; fi; done

 luaclean:
 	rm -rf dist

--- a/modules/admin-full/luasrc/controller/admin/status.lua
+++ b/modules/admin-full/luasrc/controller/admin/status.lua
@@ -71,57 +71,42 @@ function action_bandwidth()
 	local path  = luci.dispatcher.context.requestpath
 	local iface = path[#path]

-	local fs = require "luci.fs"
-	if fs.access("/var/lib/luci-bwc/if/%s" % iface) then
-		luci.http.prepare_content("application/json")
-
-		local bwc = io.popen("luci-bwc -i %q 2>/dev/null" % iface)
-		if bwc then
-			luci.http.write("[")
-
-			while true do
-				local ln = bwc:read("*l")
-				if not ln then break end
-				luci.http.write(ln)
-			end
-
-			luci.http.write("]")
-			bwc:close()
+	luci.http.prepare_content("application/json")
+
+	local bwc = io.popen("luci-bwc -i %q 2>/dev/null" % iface)
+	if bwc then
+		luci.http.write("[")
+
+		while true do
+			local ln = bwc:read("*l")
+			if not ln then break end
+			luci.http.write(ln)
 		end

-		return
+		luci.http.write("]")
+		bwc:close()
 	end
-
-	luci.http.status(404, "No data available")
 end

 function action_load()
-	local fs = require "luci.fs"
-	if fs.access("/var/lib/luci-bwc/load") then
-		luci.http.prepare_content("application/json")
-
-		local bwc = io.popen("luci-bwc -l 2>/dev/null")
-		if bwc then
-			luci.http.write("[")
-
-			while true do
-				local ln = bwc:read("*l")
-				if not ln then break end
-				luci.http.write(ln)
-			end
-
-			luci.http.write("]")
-			bwc:close()
+	luci.http.prepare_content("application/json")
+
+	local bwc = io.popen("luci-bwc -l 2>/dev/null")
+	if bwc then
+		luci.http.write("[")
+
+		while true do
+			local ln = bwc:read("*l")
+			if not ln then break end
+			luci.http.write(ln)
 		end

-		return
+		luci.http.write("]")
+		bwc:close()
 	end
-
-	luci.http.status(404, "No data available")
 end

 function action_connections()
-	local fs  = require "luci.fs"
 	local sys = require "luci.sys"

 	luci.http.prepare_content("application/json")
@@ -129,20 +114,18 @@ function action_connections()
 	luci.http.write("{ connections: ")
 	luci.http.write_json(sys.net.conntrack())

-	if fs.access("/var/lib/luci-bwc/connections") then
-		local bwc = io.popen("luci-bwc -c 2>/dev/null")
-		if bwc then
-			luci.http.write(", statistics: [")
+	local bwc = io.popen("luci-bwc -c 2>/dev/null")
+	if bwc then
+		luci.http.write(", statistics: [")

-			while true do
-				local ln = bwc:read("*l")
-				if not ln then break end
-				luci.http.write(ln)
-			end
-
-			luci.http.write("]")
-			bwc:close()
+		while true do
+			local ln = bwc:read("*l")
+			if not ln then break end
+			luci.http.write(ln)
 		end
+
+		luci.http.write("]")
+		bwc:close()
 	end

 	luci.http.write(" }")

--- a/modules/admin-full/root/etc/init.d/luci_bwc
+++ b/modules/admin-full/root/etc/init.d/luci_bwc
-#!/bin/sh /etc/rc.common
-
-START=95
-STOP=95
-
-BWC=/usr/bin/luci-bwc
-
-start() {
-	$BWC -d
-}
-
-stop() {
-	killall ${BWC##*/}
-}
--- a/modules/admin-full/src/luci-bwc.c
+++ b/modules/admin-full/src/luci-bwc.c
@@ -25,6 +25,7 @@
 #include <time.h>
 #include <errno.h>
 #include <unistd.h>
+#include <signal.h>

 #include <sys/stat.h>
 #include <sys/mman.h>
@@ -33,6 +34,9 @@

 #define STEP_COUNT	60
 #define STEP_TIME	1
+#define TIMEOUT		10
+
+#define PID_PATH	"/var/run/luci-bwc.pid"

 #define DB_PATH		"/var/lib/luci-bwc"
 #define DB_IF_FILE	DB_PATH "/if/%s"
@@ -90,6 +94,57 @@ static uint64_t htonll(uint64_t value)

 #define ntohll htonll

+static int readpid(void)
+{
+	int fd;
+	int pid = -1;
+	char buf[9] = { 0 };
+
+	if ((fd = open(PID_PATH, O_RDONLY)) > -1)
+	{
+		if (read(fd, buf, sizeof(buf)))
+		{
+			buf[8] = 0;
+			pid = atoi(buf);
+		}
+
+		close(fd);
+	}
+
+	return pid;
+}
+
+static int writepid(void)
+{
+	int fd;
+	int wlen;
+	char buf[9] = { 0 };
+
+	if ((fd = open(PID_PATH, O_WRONLY | O_CREAT | O_TRUNC, 0600)) > -1)
+	{
+		wlen = snprintf(buf, sizeof(buf), "%i", getpid());
+		write(fd, buf, wlen);
+		close(fd);
+
+		return 0;
+	}
+
+	return -1;
+}
+
+static int timeout = TIMEOUT;
+static int countdown = -1;
+
+static void reset_countdown(int sig)
+{
+	countdown = timeout;
+
+}
+
+
+static char *progname;
+static int prognamelen;
+

 static int init_directory(char *path)
 {
@@ -135,6 +190,11 @@ static int init_file(char *path, int esize)
 	return -1;
 }

+static inline uint64_t timeof(void *entry)
+{
+	return ((struct traffic_entry *)entry)->time;
+}
+
 static int update_file(const char *path, void *entry, int esize)
 {
 	int rv = -1;
@@ -148,8 +208,11 @@ static int update_file(const char *path, void *entry, int esize)

 		if ((map != NULL) && (map != MAP_FAILED))
 		{
-			memmove(map, map + esize, esize * (STEP_COUNT-1));
-			memcpy(map + esize * (STEP_COUNT-1), entry, esize);
+			if (timeof(entry) > timeof(map + esize * (STEP_COUNT-1)))
+			{
+				memmove(map, map + esize, esize * (STEP_COUNT-1));
+				memcpy(map + esize * (STEP_COUNT-1), entry, esize);
+			}

 			munmap(map, esize * STEP_COUNT);

@@ -277,7 +340,7 @@ static int update_ldstat(uint16_t load1, uint16_t load5, uint16_t load15)
 	return update_file(path, &e, sizeof(struct load_entry));
 }

-static int run_daemon(int nofork)
+static int run_daemon(void)
 {
 	FILE *info;
 	uint64_t rxb, txb, rxp, txp;
@@ -286,39 +349,54 @@ static int run_daemon(int nofork)
 	char line[1024];
 	char ifname[16];

+	struct sigaction sa;
+
 	struct stat s;
 	const char *ipc = stat("/proc/net/nf_conntrack", &s)
 		? "/proc/net/ip_conntrack" : "/proc/net/nf_conntrack";

-	if (!nofork)
+	switch (fork())
 	{
-		switch (fork())
-		{
-			case -1:
-				perror("fork()");
-				return -1;
+		case -1:
+			perror("fork()");
+			return -1;

-			case 0:
-				if (chdir("/") < 0)
-				{
-					perror("chdir()");
-					exit(1);
-				}
+		case 0:
+			if (chdir("/") < 0)
+			{
+				perror("chdir()");
+				exit(1);
+			}

-				close(0);
-				close(1);
-				close(2);
-				break;
+			close(0);
+			close(1);
+			close(2);
+			break;

-			default:
-				exit(0);
-		}
+		default:
+			return 0;
 	}

+	/* setup USR1 signal handler to reset timer */
+	sa.sa_handler = reset_countdown;
+	sa.sa_flags   = SA_RESTART;
+	sigemptyset(&sa.sa_mask);
+	sigaction(SIGUSR1, &sa, NULL);
+
+	/* write pid */
+	if (writepid())
+	{
+		fprintf(stderr, "Failed to write pid file: %s\n", strerror(errno));
+		return 1;
+	}

 	/* go */
-	while (1)
+	for (reset_countdown(0); countdown >= 0; countdown--)
 	{
+		/* alter progname for ps, top */
+		memset(progname, 0, prognamelen);
+		snprintf(progname, prognamelen, "luci-bwc %d", countdown);
+
 		if ((info = fopen("/proc/net/dev", "r")) != NULL)
 		{
 			while (fgets(line, sizeof(line), info))
@@ -377,6 +455,33 @@ static int run_daemon(int nofork)

 		sleep(STEP_TIME);
 	}
+
+	unlink(PID_PATH);
+
+	return 0;
+}
+
+static void check_daemon(void)
+{
+	int pid;
+
+	if ((pid = readpid()) < 0 || kill(pid, 0) < 0)
+	{
+		/* daemon ping failed, try to start it up */
+		if (run_daemon())
+		{
+			fprintf(stderr,
+				"Failed to ping daemon and unable to start it up: %s\n",
+				strerror(errno));
+
+			exit(1);
+		}
+	}
+	else if (kill(pid, SIGUSR1))
+	{
+		fprintf(stderr, "Failed to send signal: %s\n", strerror(errno));
+		exit(2);
+	}
 }

 static int run_dump_ifname(const char *ifname)
@@ -386,6 +491,7 @@ static int run_dump_ifname(const char *ifname)
 	struct file_map m;
 	struct traffic_entry *e;

+	check_daemon();
 	snprintf(path, sizeof(path), DB_IF_FILE, ifname);

 	if (mmap_file(path, sizeof(struct traffic_entry), &m))
@@ -421,6 +527,7 @@ static int run_dump_conns(void)
 	struct file_map m;
 	struct conn_entry *e;

+	check_daemon();
 	snprintf(path, sizeof(path), DB_CN_FILE);

 	if (mmap_file(path, sizeof(struct conn_entry), &m))
@@ -454,6 +561,7 @@ static int run_dump_load(void)
 	struct file_map m;
 	struct load_entry *e;

+	check_daemon();
 	snprintf(path, sizeof(path), DB_LD_FILE);

 	if (mmap_file(path, sizeof(struct load_entry), &m))
@@ -484,19 +592,19 @@ static int run_dump_load(void)
 int main(int argc, char *argv[])
 {
 	int opt;
-	int daemon = 0;
-	int nofork = 0;

-	while ((opt = getopt(argc, argv, "dfi:cl")) > -1)
+	progname = argv[0];
+	prognamelen = -1;
+
+	for (opt = 0; opt < argc; opt++)
+		prognamelen += 1 + strlen(argv[opt]);
+
+	while ((opt = getopt(argc, argv, "t:i:cl")) > -1)
 	{
 		switch (opt)
 		{
-			case 'd':
-				daemon = 1;
-				break;
-
-			case 'f':
-				nofork = 1;
+			case 't':
+				timeout = atoi(optarg);
 				break;

 			case 'i':
@@ -515,18 +623,13 @@ int main(int argc, char *argv[])
 		}
 	}

-	if (daemon)
-		return run_daemon(nofork);
-
-	else
-		fprintf(stderr,
-			"Usage:\n"
-			"	%s -d [-f]\n"
-			"	%s -i ifname\n"
-			"	%s -c\n"
-			"	%s -l\n",
-				argv[0], argv[0], argv[0], argv[0]
-		);
+	fprintf(stderr,
+		"Usage:\n"
+		"	%s [-t timeout] -i ifname\n"
+		"	%s [-t timeout] -c\n"
+		"	%s [-t timeout] -l\n",
+			argv[0], argv[0], argv[0]
+	);

 	return 1;
 }
--- a/po/ca/base.po
+++ b/po/ca/base.po
@@ -381,6 +381,9 @@ msgstr "Interfície pont"
 msgid "Bridge unit number"
 msgstr ""

+msgid "Bring up on boot"
+msgstr ""
+
 msgid "Buffered"
 msgstr ""

@@ -475,6 +478,9 @@ msgstr ""
 msgid "Configuration file"
 msgstr "Fitxer de configuració"

+msgid "Configuration files will be kept."
+msgstr ""
+
 msgid ""
 "Configure the local DNS server to use the name servers adverticed by the PPP "
 "peer"
@@ -768,9 +774,6 @@ msgstr ""
 msgid "Enable this swap"
 msgstr ""

-msgid "Enable this switch"
-msgstr ""
-
 msgid "Enable/Disable"
 msgstr "Activa/Desactiva"

@@ -1506,6 +1509,9 @@ msgstr ""
 msgid "Not configured"
 msgstr "No configurat"

+msgid "Note: Configuration files will be erased."
+msgstr ""
+
 msgid ""
 "Note: If you choose an interface here which is part of another network, it "
 "will be moved into this network."
@@ -1521,9 +1527,6 @@ msgstr ""
 msgid "OK"
 msgstr "D'acord"

-msgid "OPKG error code %i"
-msgstr ""
-
 msgid "OPKG-Configuration"
 msgstr "Configuració d&#39;OPKG"

@@ -1610,9 +1613,6 @@ msgstr ""
 msgid "Package lists"
 msgstr "Llistes de paquets"

-msgid "Package lists updated"
-msgstr "Llistes de paquets actualitzades"
-
 msgid "Package name"
 msgstr "Nom del paquet"

@@ -1838,9 +1838,6 @@ msgstr "Reinicia Comptadors"
 msgid "Reset router to defaults"
 msgstr "Reinicia els valors per defecte del router"

-msgid "Reset switch during setup"
-msgstr ""
-
 msgid "Resolv and Hosts Files"
 msgstr ""

@@ -2358,9 +2355,6 @@ msgstr "Canvis sense desar"
 msgid "Update package lists"
 msgstr "Actualitza llistes de paquets"

-msgid "Upgrade installed packages"
-msgstr "Actualitza paquets instal·lats"
-
 msgid "Upload an OpenWrt image file to reflash the device."
 msgstr "Penja una imatge d'OpenWRT per actualitzar el firmware del dispositiu."

@@ -2594,6 +2588,12 @@ msgstr ""
 msgid "« Back"
 msgstr ""

+#~ msgid "Package lists updated"
+#~ msgstr "Llistes de paquets actualitzades"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "Actualitza paquets instal·lats"
+
 #~ msgid ""
 #~ "Also kernel or service logfiles can be viewed here to get an overview "
 #~ "over their current state."

--- a/po/ca/statistics.po
+++ b/po/ca/statistics.po
@@ -20,9 +20,9 @@ msgid ""
 "\">Collectd</a> and uses <a href=\"http://oss.oetiker.ch/rrdtool/\">RRD "
 "Tool</a> to render diagram images from collected data."
 msgstr ""
-"El paquet d'estadísitiques està basat en <a href=\\\"http://collectd.org/"
-"index.shtml\\\">Collectd</a> i utilitza l'eina <a href=\\\"http://oss."
-"oetiker.ch/rrdtool/\\\">RRD</a> per renderitzar imatges de diagrama de les "
+"El paquet d'estadísitiques està basat en <a href=\"http://collectd.org/"
+"index.shtml\">Collectd</a> i utilitza l'eina <a href=\"http://oss."
+"oetiker.ch/rrdtool/\">RRD</a> per renderitzar imatges de diagrama de les "
 "dades recoliildes."

 #. System plugins

--- a/po/de/base.po
+++ b/po/de/base.po
@@ -3,13 +3,13 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-26 17:57+0200\n"
-"PO-Revision-Date: 2011-06-10 20:34+0200\n"
-"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"PO-Revision-Date: 2011-08-07 17:06+0200\n"
+"Last-Translator: Manuel <freifunk@somakoma.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"

@@ -265,7 +265,6 @@ msgstr "IPv6 auf folgendem Netzwerk ankündigen"
 msgid "Advertised network ID"
 msgstr "Angekündigte Subnetz-ID"

-#, fuzzy
 msgid "Alert"
 msgstr "Alarm"

@@ -392,6 +391,9 @@ msgstr "Netzwerkbrücke"
 msgid "Bridge unit number"
 msgstr "Geräteindex der Brücke"

+msgid "Bring up on boot"
+msgstr ""
+
 msgid "Buffered"
 msgstr "Gepuffert"

@@ -484,6 +486,9 @@ msgstr "Konfiguration angewendet."
 msgid "Configuration file"
 msgstr "Konfigurationsdatei"

+msgid "Configuration files will be kept."
+msgstr ""
+
 msgid ""
 "Configure the local DNS server to use the name servers adverticed by the PPP "
 "peer"
@@ -785,9 +790,6 @@ msgstr "Diesen Mountpunkt aktivieren"
 msgid "Enable this swap"
 msgstr "Diesen Auslagerungsspeicher aktivieren"

-msgid "Enable this switch"
-msgstr "Switch aktivieren"
-
 msgid "Enable/Disable"
 msgstr "Aktivieren/Deaktivieren"

@@ -1540,6 +1542,9 @@ msgstr "Nicht assoziiert"
 msgid "Not configured"
 msgstr "nicht konfiguriert"

+msgid "Note: Configuration files will be erased."
+msgstr ""
+
 msgid ""
 "Note: If you choose an interface here which is part of another network, it "
 "will be moved into this network."
@@ -1558,9 +1563,6 @@ msgstr ""
 msgid "OK"
 msgstr "OK"

-msgid "OPKG error code %i"
-msgstr "OPKG Fehlercode %i"
-
 msgid "OPKG-Configuration"
 msgstr "OPKG-Konfiguration"

@@ -1649,9 +1651,6 @@ msgstr "Benötige das libiwinfo Paket!"
 msgid "Package lists"
 msgstr "Paketlisten"

-msgid "Package lists updated"
-msgstr "Paketlisten wurden aktualisiert"
-
 msgid "Package name"
 msgstr "Paketname"

@@ -1887,9 +1886,6 @@ msgstr "Zähler zurücksetzen"
 msgid "Reset router to defaults"
 msgstr "Grundeinstellungen wiederherstellen"

-msgid "Reset switch during setup"
-msgstr "Switch während der Einrichtung zurücksetzen"
-
 msgid "Resolv and Hosts Files"
 msgstr "Resolv- und Hosts-Dateien"

@@ -2423,9 +2419,6 @@ msgstr "Ungespeicherte Änderungen"
 msgid "Update package lists"
 msgstr "Paketlisten aktualisieren"

-msgid "Upgrade installed packages"
-msgstr "Installierte Pakete aktualisieren"
-
 msgid "Upload an OpenWrt image file to reflash the device."
 msgstr "Firmware-Image hochladen um das Gerät neu zu flashen."

@@ -2668,6 +2661,21 @@ msgstr "ja"
 msgid "« Back"
 msgstr "« Zurück"

+#~ msgid "Enable this switch"
+#~ msgstr "Switch aktivieren"
+
+#~ msgid "OPKG error code %i"
+#~ msgstr "OPKG Fehlercode %i"
+
+#~ msgid "Package lists updated"
+#~ msgstr "Paketlisten wurden aktualisiert"
+
+#~ msgid "Reset switch during setup"
+#~ msgstr "Switch während der Einrichtung zurücksetzen"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "Installierte Pakete aktualisieren"
+
 #~ msgid ""
 #~ "Also kernel or service logfiles can be viewed here to get an overview "
 #~ "over their current state."

--- a/po/de/multiwan.po
+++ b/po/de/multiwan.po
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2011-08-07 17:29+0200\n"
+"Last-Translator: Manuel <freifunk@somakoma.de>\n"
 "Language-Team: none\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"

 msgid "Attempts Before WAN Failover"
-msgstr ""
+msgstr "Versuche vor Umschalten auf WAN Ersatzverbindung"

 msgid "Attempts Before WAN Recovery"
-msgstr ""
+msgstr "Versuche vor dem Zurückschalten auf normale WAN Verbindung"

 msgid "Auto"
-msgstr ""
+msgstr "automatisch"

 msgid ""
 "Configure rules for directing outbound traffic through specified WAN Uplinks."
 msgstr ""
+"Mit diesen regeln kann ausgehender Verkehr bestimmten WAN-Uplinks zugeordnet "
+"werden."

 msgid "DNS Server(s)"
-msgstr ""
+msgstr "DNS Server"

 msgid "Default Route"
-msgstr ""
+msgstr "Standardroute"

 msgid "Destination Address"
-msgstr ""
+msgstr "Zieladresse"

 msgid "Disable"
-msgstr ""
+msgstr "Deaktivieren"

 msgid "Enable"
-msgstr ""
+msgstr "Aktivieren"

 msgid "Failover Traffic Destination"
 msgstr ""

 msgid "Health Monitor ICMP Host(s)"
-msgstr ""
+msgstr "ICMP Host(s) zur Verbindungsüberwachung"

 msgid "Health Monitor ICMP Timeout"
 msgstr ""
@@ -65,7 +70,7 @@ msgid "Multi-WAN"
 msgstr ""

 msgid "Multi-WAN Traffic Rules"
-msgstr ""
+msgstr "Multi-WAN Verkehrsregeln"

 msgid ""
 "Multi-WAN allows for the use of multiple uplinks for load balancing and "
@@ -73,13 +78,13 @@ msgid ""
 msgstr ""

 msgid "None"
-msgstr ""
+msgstr "Keine"

 msgid "Ports"
 msgstr ""

 msgid "Protocol"
-msgstr ""
+msgstr "Protokoll"

 msgid "Source Address"
 msgstr ""
@@ -91,4 +96,4 @@ msgid "WAN Uplink"
 msgstr ""

 msgid "all"
-msgstr ""
+msgstr "alle"
--- a/po/de/qos.po
+++ b/po/de/qos.po
@@ -5,13 +5,15 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-03-25 22:10+0100\n"
-"PO-Revision-Date: 2009-05-21 19:21+0200\n"
-"Last-Translator: Jo-Philipp Wich <xm@subsignal.org>\n"
+"PO-Revision-Date: 2011-08-07 17:19+0200\n"
+"Last-Translator: Manuel <freifunk@somakoma.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"

 msgid "Quality of Service"
 msgstr "Quality of Service"

--- a/po/de/samba.po
+++ b/po/de/samba.po
@@ -3,32 +3,29 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-26 17:57+0200\n"
-"PO-Revision-Date: 2011-04-13 17:09+0100\n"
-"Last-Translator: Manuel Munz <freifunk@somakoma.de>\n"
+"PO-Revision-Date: 2011-08-07 17:19+0200\n"
+"Last-Translator: Manuel <freifunk@somakoma.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"

-#, fuzzy
 msgid "Allow guests"
-msgstr "Gäste erlauben"
+msgstr "Gastzugang"

-#, fuzzy
 msgid "Allow system users to reach their home directories via network shares"
 msgstr ""
-"Systembenutzer können ihre Heimatverzeichnis über Netzwerkfreigaben "
+"Systembenutzer dürfen ihre Heimatverzeichnis über Netzwerkfreigaben "
 "erreichen."

-#, fuzzy
 msgid "Allowed users"
-msgstr "Erlaubte Benutzer"
+msgstr "Legitimierte Benutzer"

-#, fuzzy
 msgid "Create mask"
-msgstr "Anlegemaske"
+msgstr "Maske anlegen"

 msgid "Description"
 msgstr "Beschreibung"
@@ -46,7 +43,7 @@ msgstr ""
 "Konfigurationsdateien verwendet wird."

 msgid "General Settings"
-msgstr ""
+msgstr "Allgemeine Einstellungen"

 msgid "Hostname"
 msgstr "Hostname"
@@ -58,15 +55,14 @@ msgid "Mask for new files"
 msgstr "Maske für neue Dateien"

 msgid "Name"
-msgstr ""
+msgstr "Name"

 msgid "Network Shares"
 msgstr "Netzwerkfreigaben"

 msgid "Path"
-msgstr ""
+msgstr "Pfad"

-#, fuzzy
 msgid "Read-only"
 msgstr "Nur Lesen"

@@ -74,7 +70,7 @@ msgid "Share home-directories"
 msgstr "Heimatverzeichnisse freigeben"

 msgid "Shared Directories"
-msgstr "Dateifreigaben"
+msgstr "Freigegebene Verzeichnisse"

 msgid ""
 "This is the content of the file '/etc/samba/smb.conf.template' from which "
@@ -84,8 +80,8 @@ msgid ""
 msgstr ""
 "Dieses Fenster zeigt den Inhalt der Datei '/etc/samba/smb.conf.template', "
 "die als Template zum Erstellen der Samba-Konfiguration verwendet wird. Werte "
-"die von Pipe Symbolen eingeschlossen sind sollten nicht verändert werden, da "
-"diese beim Erstellen der Konfiguration mit den Werten aus dem Tab "
+"die von Pipe Symbolen (|) eingeschlossen sind sollten nicht verändert "
+"werden, da diese beim Erstellen der Konfiguration mit den Werten aus dem Tab "
 "'Allgemeine Einstellungen' ersetzt werden."

 msgid "Workgroup"

--- a/po/de/uvc_streamer.po
+++ b/po/de/uvc_streamer.po
@@ -2,28 +2,31 @@
 #  generated from ./applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2011-08-07 17:10+0200\n"
+"Last-Translator: Manuel <freifunk@somakoma.de>\n"
 "Language-Team: none\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"

 #. Frames per second
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:1
 msgid "Frames per second"
-msgstr ""
+msgstr "Frames pro Sekunde"

 #. Resolution
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:2
 msgid "Resolution"
-msgstr ""
+msgstr "Auflösung"

 #. Settings
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:3
 msgid "Settings"
-msgstr ""
+msgstr "Einstellungen"

 #. Webcam streaming
 #: applications/luci-uvc_streamer/luasrc/i18n/uvc_streamer.en.lua:4

--- a/po/de/voice_core.po
+++ b/po/de/voice_core.po
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2011-08-07 17:18+0200\n"
+"Last-Translator: Manuel <freifunk@somakoma.de>\n"
 "Language-Team: none\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"

 msgid "Phones"
-msgstr ""
+msgstr "Telefone"

 msgid "l_v_adminphones"
 msgstr ""
--- a/po/el/base.po
+++ b/po/el/base.po
@@ -387,6 +387,9 @@ msgstr "Γεφύρωμα διεπαφών"
 msgid "Bridge unit number"
 msgstr ""

+msgid "Bring up on boot"
+msgstr ""
+
 msgid "Buffered"
 msgstr ""

@@ -481,6 +484,9 @@ msgstr ""
 msgid "Configuration file"
 msgstr "Αρχείο Παραμετροποίησης"

+msgid "Configuration files will be kept."
+msgstr ""
+
 msgid ""
 "Configure the local DNS server to use the name servers adverticed by the PPP "
 "peer"
@@ -775,9 +781,6 @@ msgstr ""
 msgid "Enable this swap"
 msgstr ""

-msgid "Enable this switch"
-msgstr ""
-
 msgid "Enable/Disable"
 msgstr "Ενεργοποίηση/Απενεργοποίηση"

@@ -1511,6 +1514,9 @@ msgstr ""
 msgid "Not configured"
 msgstr "Μη-ρυθμισμένο"

+msgid "Note: Configuration files will be erased."
+msgstr ""
+
 msgid ""
 "Note: If you choose an interface here which is part of another network, it "
 "will be moved into this network."
@@ -1526,9 +1532,6 @@ msgstr ""
 msgid "OK"
 msgstr "Εντάξει"

-msgid "OPKG error code %i"
-msgstr ""
-
 msgid "OPKG-Configuration"
 msgstr "Παραμετροποίηση OPKG"

@@ -1615,9 +1618,6 @@ msgstr ""
 msgid "Package lists"
 msgstr "Λίστες Πακέτων"

-msgid "Package lists updated"
-msgstr "Η λίστα πακέτων ενημερώθηκε"
-
 msgid "Package name"
 msgstr "Όνομα πακέτου"

@@ -1841,9 +1841,6 @@ msgstr "Μηδενισμός Μετρητών"
 msgid "Reset router to defaults"
 msgstr "Επαναφορά δρομολογητή στα προεπιλεγμένα"

-msgid "Reset switch during setup"
-msgstr ""
-
 msgid "Resolv and Hosts Files"
 msgstr ""

@@ -2362,9 +2359,6 @@ msgstr "Μη-αποθηκευμένες Αλλαγές"
 msgid "Update package lists"
 msgstr "Ενημέρωση λίστας πακέτων"

-msgid "Upgrade installed packages"
-msgstr "Αναβάθμιση εγκατεστημένων πακέτων"
-
 msgid "Upload an OpenWrt image file to reflash the device."
 msgstr "Ανεβάστε ένα αρχείο εικόνας OpenWrt για να φλασάρετε τη συσκευή."

@@ -2601,6 +2595,12 @@ msgstr ""
 msgid "« Back"
 msgstr ""

+#~ msgid "Package lists updated"
+#~ msgstr "Η λίστα πακέτων ενημερώθηκε"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "Αναβάθμιση εγκατεστημένων πακέτων"
+
 #~ msgid ""
 #~ "Also kernel or service logfiles can be viewed here to get an overview "
 #~ "over their current state."

--- a/po/en/base.po
+++ b/po/en/base.po
@@ -3,13 +3,13 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-06-10 03:40+0200\n"
-"PO-Revision-Date: 2011-05-13 09:06+0200\n"
-"Last-Translator: Jo-Philipp <xm@subsignal.org>\n"
+"PO-Revision-Date: 2011-07-22 15:45+0200\n"
+"Last-Translator: w3rd <andrew@fam-passon.nl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"

@@ -391,6 +391,9 @@ msgstr "Bridge interfaces"
 msgid "Bridge unit number"
 msgstr ""

+msgid "Bring up on boot"
+msgstr ""
+
 msgid "Buffered"
 msgstr ""

@@ -488,6 +491,9 @@ msgstr ""
 msgid "Configuration file"
 msgstr "Configuration file"

+msgid "Configuration files will be kept."
+msgstr ""
+
 msgid ""
 "Configure the local DNS server to use the name servers adverticed by the PPP "
 "peer"
@@ -781,9 +787,6 @@ msgstr ""
 msgid "Enable this swap"
 msgstr ""

-msgid "Enable this switch"
-msgstr ""
-
 msgid "Enable/Disable"
 msgstr "Enable/Disable"

@@ -1514,6 +1517,9 @@ msgstr ""
 msgid "Not configured"
 msgstr "Not configured"

+msgid "Note: Configuration files will be erased."
+msgstr ""
+
 msgid ""
 "Note: If you choose an interface here which is part of another network, it "
 "will be moved into this network."
@@ -1528,9 +1534,6 @@ msgstr "Number of failed connection tests to initiate automatic reconnect"
 msgid "OK"
 msgstr "OK"

-msgid "OPKG error code %i"
-msgstr "OPKG error code %i"
-
 msgid "OPKG-Configuration"
 msgstr "OPKG-Configuration"

@@ -1617,9 +1620,6 @@ msgstr ""
 msgid "Package lists"
 msgstr "Package lists"

-msgid "Package lists updated"
-msgstr "Package lists updated"
-
 msgid "Package name"
 msgstr "Package name"

@@ -1841,9 +1841,6 @@ msgstr "Reset Counters"
 msgid "Reset router to defaults"
 msgstr "Reset router to defaults"

-msgid "Reset switch during setup"
-msgstr ""
-
 msgid "Resolv and Hosts Files"
 msgstr ""

@@ -2351,9 +2348,6 @@ msgstr "Unsaved Changes"
 msgid "Update package lists"
 msgstr "Update package lists"

-msgid "Upgrade installed packages"
-msgstr "Upgrade installed packages"
-
 msgid "Upload an OpenWrt image file to reflash the device."
 msgstr "Upload an OpenWrt image file to reflash the device."

@@ -2586,6 +2580,15 @@ msgstr ""
 msgid "« Back"
 msgstr "« Back"

+#~ msgid "OPKG error code %i"
+#~ msgstr "OPKG error code %i"
+
+#~ msgid "Package lists updated"
+#~ msgstr "Package lists updated"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "Upgrade installed packages"
+
 #~ msgid ""
 #~ "Also kernel or service logfiles can be viewed here to get an overview "
 #~ "over their current state."

--- a/po/es/base.po
+++ b/po/es/base.po
@@ -388,6 +388,9 @@ msgstr "Puentear interfaces"
 msgid "Bridge unit number"
 msgstr ""

+msgid "Bring up on boot"
+msgstr ""
+
 msgid "Buffered"
 msgstr ""

@@ -481,6 +484,9 @@ msgstr ""
 msgid "Configuration file"
 msgstr "Fichero configuración"

+msgid "Configuration files will be kept."
+msgstr ""
+
 msgid ""
 "Configure the local DNS server to use the name servers adverticed by the PPP "
 "peer"
@@ -775,9 +781,6 @@ msgstr ""
 msgid "Enable this swap"
 msgstr ""

-msgid "Enable this switch"
-msgstr ""
-
 msgid "Enable/Disable"
 msgstr "Activar/Desactivar"

@@ -1518,6 +1521,9 @@ msgstr ""
 msgid "Not configured"
 msgstr "No configurado"

+msgid "Note: Configuration files will be erased."
+msgstr ""
+
 msgid ""
 "Note: If you choose an interface here which is part of another network, it "
 "will be moved into this network."
@@ -1533,9 +1539,6 @@ msgstr ""
 msgid "OK"
 msgstr "Aceptar"

-msgid "OPKG error code %i"
-msgstr ""
-
 msgid "OPKG-Configuration"
 msgstr "Configuración de OPKG"

@@ -1621,9 +1624,6 @@ msgstr ""
 msgid "Package lists"
 msgstr "Listas de paquetes"

-msgid "Package lists updated"
-msgstr "Listas de paquetes actualizada"
-
 msgid "Package name"
 msgstr "Nombre del paquete"

@@ -1847,9 +1847,6 @@ msgstr "Reiniciar contadores"
 msgid "Reset router to defaults"
 msgstr "Reiniciar router a su configuración de fábrica"

-msgid "Reset switch during setup"
-msgstr ""
-
 msgid "Resolv and Hosts Files"
 msgstr ""

@@ -2367,9 +2364,6 @@ msgstr "Cambios no guardados"
 msgid "Update package lists"
 msgstr "Acutlizar listas de paquetes"

-msgid "Upgrade installed packages"
-msgstr "Actualizar los paquetes instalados"
-
 msgid "Upload an OpenWrt image file to reflash the device."
 msgstr ""
 "Subir un archivo de imágen de OpenWrt o derivado para re-flashear el "
@@ -2610,6 +2604,12 @@ msgstr ""
 msgid "« Back"
 msgstr ""

+#~ msgid "Package lists updated"
+#~ msgstr "Listas de paquetes actualizada"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "Actualizar los paquetes instalados"
+
 #~ msgid ""
 #~ "Also kernel or service logfiles can be viewed here to get an overview "
 #~ "over their current state."

--- a/po/fr/ahcp.po
+++ b/po/fr/ahcp.po
@@ -9,7 +9,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"

 msgid "AHCP Server"
-msgstr ""
+msgstr "Serveur AHCP"

 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
@@ -17,84 +17,89 @@ msgid ""
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
+"AHCP est un protocole d'auto-configuration pour les réseaux IPv6 et double-"
+"pile IPv6/IPv4, destiné à remplacer la recherche de routeur et le service "
+"DHCP sur des réseaux où il est difficile, voire impossible de configurer un "
+"tel serveur pour tous les domaines de diffusion au niveau lien, par exemple "
+"pour des réseaux ad-hoc mobiles."

 msgid "Active AHCP Leases"
-msgstr ""
+msgstr "Baux AHCP actifs"

 msgid "Address"
-msgstr ""
+msgstr "Adresse"

 msgid "Advanced Settings"
-msgstr ""
+msgstr "Paramètres avancés"

 msgid "Age"
-msgstr ""
+msgstr "Age"

 msgid "Announced DNS servers"
-msgstr ""
+msgstr "Serveurs DNS publiés"

 msgid "Announced NTP servers"
-msgstr ""
+msgstr "Serveurs NTP publiés"

 msgid "Announced prefixes"
-msgstr ""
+msgstr "Préfixes publiés"

 msgid "Collecting data..."
-msgstr ""
+msgstr "Récupération des données…"

 msgid "Forwarder"
-msgstr ""
+msgstr "Transmetteur"

 msgid "General Setup"
-msgstr ""
+msgstr "Paramètres principaux"

 msgid "IPv4 and IPv6"
-msgstr ""
+msgstr "IPv4 et IPv6"

 msgid "IPv4 only"
-msgstr ""
+msgstr "IPv4 seulement"

 msgid "IPv6 only"
-msgstr ""
+msgstr "IPv6 seulement"

 msgid "Lease directory"
-msgstr ""
+msgstr "Répertoire d'un bail"

 msgid "Lease validity time"
-msgstr ""
+msgstr "Date de validité d'un bail"

 msgid "Log file"
-msgstr ""
+msgstr "Fichier journal"

 msgid "Multicast address"
-msgstr ""
+msgstr "Adresse multicast"

 msgid "Operation mode"
-msgstr ""
+msgstr "Mode de fonctionnement"

 msgid "Port"
-msgstr ""
+msgstr "Port"

 msgid "Protocol family"
-msgstr ""
+msgstr "Famille de protocole"

 msgid "Served interfaces"
-msgstr ""
+msgstr "Interfaces gérés"

 msgid "Server"
-msgstr ""
+msgstr "Serveur"

 msgid "Specifies the announced IPv4 and IPv6 NTP servers"
-msgstr ""
+msgstr "Décrit les serveurs NTP IPv4 et IPv6 publiés"

 msgid "Specifies the announced IPv4 and IPv6 name servers"
-msgstr ""
+msgstr "Décrit les serveurs de noms IPv4 et IPv6 publiés"

 msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
-msgstr ""
+msgstr "Décrit les préfixes réseaux IPv4 et IPv6 publiés en notation CIDR"

 msgid "There are no active leases."
-msgstr ""
+msgstr "Il n'y a aucun bail actif"

 msgid "Unique ID file"
-msgstr ""
+msgstr "Fichier de l'ID unique"
--- a/po/fr/base.po
+++ b/po/fr/base.po
@@ -3,13 +3,13 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-06-10 03:40+0200\n"
-"PO-Revision-Date: 2011-08-07 16:47+0200\n"
-"Last-Translator: Manuel <freifunk@somakoma.de>\n"
+"PO-Revision-Date: 2011-08-30 23:10+0200\n"
+"Last-Translator: goofy <pierre.gaufillet@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.4\n"

@@ -63,14 +63,14 @@ msgid "<abbr title=\"Domain Name System\">DNS</abbr> query port"
 msgstr "Port des requêtes <abbr title=\"Domain Name System\">DNS</abbr>"

 msgid "<abbr title=\"Domain Name System\">DNS</abbr> server port"
-msgstr "Port du serveur <abbr title=\\\"Domain Name System\\\">DNS</abbr>"
+msgstr "Port du serveur <abbr title=\"Domain Name System\">DNS</abbr>"

 msgid ""
 "<abbr title=\"Domain Name System\">DNS</abbr> servers will be queried in the "
 "order of the resolvfile"
 msgstr ""
-"Les serveurs <abbr title=\\\"Domain Name System\\\">DNS</abbr> seront\n"
-"interrogés dans l'ordre du fichier de résolution"
+"Les serveurs <abbr title=\"Domain Name System\">DNS</abbr> seront<br/"
+">interrogés dans l'ordre du fichier de résolution"

 msgid "<abbr title=\"Domain Name System\">DNS</abbr>-Server"
 msgstr "Serveur <abbr title=\"Domain Name System\">DNS</abbr>"
@@ -140,15 +140,15 @@ msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Dynamic Host Configuration "
 "Protocol\">DHCP</abbr> leases"
 msgstr ""
-"Nombre de baux <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</abbr> "
-"maximum"
+"Nombre de baux <abbr title=\"Dynamic Host Configuration Protocol\">DHCP</"
+"abbr> maximum"

 msgid ""
 "<abbr title=\"maximal\">Max.</abbr> <abbr title=\"Extension Mechanisms for "
 "Domain Name System\">EDNS0</abbr> paket size"
 msgstr ""
-"taille maximum des paquets <abbr title=\"Extension Mechanisms for Domain Name "
-"System\">EDNS0</abbr>"
+"taille maximum des paquets <abbr title=\"Extension Mechanisms for Domain "
+"Name System\">EDNS0</abbr>"

 msgid "<abbr title=\"maximal\">Max.</abbr> concurrent queries"
 msgstr "Maximum de requêtes concurrentes"
@@ -179,13 +179,13 @@ msgstr "Paramètres ATM"

 msgid "ATM Virtual Channel Identifier (VCI)"
 msgstr ""
-"Identifiant de canal virtuel (<abbr title=\"Virtual Channel "
-"Idendifier\">VCI</abbr>) ATM"
+"Identifiant de canal virtuel (<abbr title=\"Virtual Channel Idendifier"
+"\">VCI</abbr>) ATM"

 msgid "ATM Virtual Path Identifier (VPI)"
 msgstr ""
-"Identifiant de chemin virtuel (<abbr title=\\\"Virtual Path "
-"Idendifier\\\">VPI</abbr>) ATM"
+"Identifiant de chemin virtuel (<abbr title=\"Virtual Path Idendifier\">VPI</"
+"abbr>) ATM"

 msgid ""
 "ATM bridges expose encapsulated ethernet in AAL5 connections as virtual "
@@ -240,8 +240,7 @@ msgstr "Ajouter"

 msgid "Add local domain suffix to names served from hosts files"
 msgstr ""
-"Ajouter le suffixe du domaine local aux noms résolus d'après le fichier "
-"hosts"
+"Ajouter le suffixe du domaine local aux noms résolus d'après le fichier hosts"

 msgid "Add new interface..."
 msgstr "Ajout d'une nouvelle interface..."
@@ -399,6 +398,9 @@ msgstr "Bridger les interfaces"
 msgid "Bridge unit number"
 msgstr "Numéro d'unité du pont"

+msgid "Bring up on boot"
+msgstr ""
+
 msgid "Buffered"
 msgstr "Bufferisé"

@@ -494,6 +496,9 @@ msgstr "Configuration appliquée."
 msgid "Configuration file"
 msgstr "Fichier de configuration"

+msgid "Configuration files will be kept."
+msgstr ""
+
 msgid ""
 "Configure the local DNS server to use the name servers adverticed by the PPP "
 "peer"
@@ -612,8 +617,8 @@ msgid ""
 "servers to clients."
 msgstr ""
 "Définir des options DHCP supplémentaires, par exemple "
-"\"<code>6,192.168.2.1,192.168.2.2</code>\" qui publie différents serveurs DNS "
-"à ses clients."
+"\"<code>6,192.168.2.1,192.168.2.2</code>\" qui publie différents serveurs "
+"DNS à ses clients."

 msgid "Delete"
 msgstr "Effacer"
@@ -793,9 +798,6 @@ msgstr "Activer ce montage"
 msgid "Enable this swap"
 msgstr "Activer cette mémoire d'échange (swap)"

-msgid "Enable this switch"
-msgstr "Activer ce switch"
-
 msgid "Enable/Disable"
 msgstr "Activer/Désactiver"

@@ -804,8 +806,8 @@ msgstr "Activé"

 msgid "Enables the Spanning Tree Protocol on this bridge"
 msgstr ""
-"Activer le protocole <abbr title=\"Spanning Tree Protocol\">STP</abbr> sur ce "
-"pont"
+"Activer le protocole <abbr title=\"Spanning Tree Protocol\">STP</abbr> sur "
+"ce pont"

 msgid "Encapsulation mode"
 msgstr "Mode encapsulé"
@@ -1161,7 +1163,8 @@ msgid "Invalid"
 msgstr "Erreur : donnée entrée invalide"

 msgid "Invalid VLAN ID given! Only IDs between %d and %d are allowed."
-msgstr "Identifiant VLAN invalide !Seuls les IDs entre %d et %d sont autorisés."
+msgstr ""
+"Identifiant VLAN invalide !Seuls les IDs entre %d et %d sont autorisés."

 msgid "Invalid username and/or password! Please try again."
 msgstr "Nom d'utilisateur et/ou mot de passe invalides ! Réessayez !"
@@ -1545,6 +1548,9 @@ msgstr "Pas associé"
 msgid "Not configured"
 msgstr "Pas configuré"

+msgid "Note: Configuration files will be erased."
+msgstr ""
+
 msgid ""
 "Note: If you choose an interface here which is part of another network, it "
 "will be moved into this network."
@@ -1561,9 +1567,6 @@ msgstr "Reconnexion si la connexion est perdue"
 msgid "OK"
 msgstr "OK"

-msgid "OPKG error code %i"
-msgstr "Code d'erreur OPKG %i"
-
 msgid "OPKG-Configuration"
 msgstr "Configuration OPKG"

@@ -1650,9 +1653,6 @@ msgstr "Nécessite le paquet libiwinfo !"
 msgid "Package lists"
 msgstr "Listes de paquets"

-msgid "Package lists updated"
-msgstr "Liste des paquets mise à jour"
-
 msgid "Package name"
 msgstr "Nom du paquet"

@@ -1884,9 +1884,6 @@ msgstr "Remise à zéro des compteurs"
 msgid "Reset router to defaults"
 msgstr "Revenir à la configuration par défaut du routeur"

-msgid "Reset switch during setup"
-msgstr "Ré-initialiser le switch pendant la configuration"
-
 msgid "Resolv and Hosts Files"
 msgstr "Fichiers Resolv et Hosts"

@@ -1956,7 +1953,7 @@ msgid "SSID"
 msgstr "SSID"

 msgid "STP"
-msgstr "<abbr title=\\\"Spanning Tree Protocol\\\">STP</abbr>"
+msgstr "<abbr title=\"Spanning Tree Protocol\">STP</abbr>"

 msgid "Save"
 msgstr "Sauvegarder"
@@ -2194,8 +2191,8 @@ msgid ""
 "The allowed characters are: <code>A-Z</code>, <code>a-z</code>, <code>0-9</"
 "code> and <code>_</code>"
 msgstr ""
-"Les caractères autorisés sont : <code>A-Z</code>, <code>a-z</code>, "
-"<code>0-9</code> et <code>_</code>"
+"Les caractères autorisés sont : <code>A-Z</code>, <code>a-z</code>, <code>0-"
+"9</code> et <code>_</code>"

 msgid ""
 "The device file of the memory or partition (<abbr title=\"for example\">e.g."
@@ -2220,8 +2217,8 @@ msgid ""
 msgstr ""
 "L'image du firmware a été chargée. Voici ci-dessous la taille et la "
 "signature de cette image, comparez-les avec le fichier original pour vous "
-"assurer de son intégrité.<br /> Cliquez sur \\\\\\\"Continuer\\\\\\\" pour lancer la "
-"procédure de re-programmation."
+"assurer de son intégrité.<br /> Cliquez sur \"Continuer\" pour "
+"lancer la procédure de re-programmation."

 msgid "The following changes have been committed"
 msgstr "Les changements suivants ont été appliqués"
@@ -2422,9 +2419,6 @@ msgstr "Changements non appliqués"
 msgid "Update package lists"
 msgstr "Mettre à jour la liste des paquets"

-msgid "Upgrade installed packages"
-msgstr "Mettre à jour les paquets installés"
-
 msgid "Upload an OpenWrt image file to reflash the device."
 msgstr "Upload an OpenWrt image file to reflash the device."

@@ -2668,6 +2662,21 @@ msgstr "oui"
 msgid "« Back"
 msgstr "« Retour"

+#~ msgid "Enable this switch"
+#~ msgstr "Activer ce switch"
+
+#~ msgid "OPKG error code %i"
+#~ msgstr "Code d'erreur OPKG %i"
+
+#~ msgid "Package lists updated"
+#~ msgstr "Liste des paquets mise à jour"
+
+#~ msgid "Reset switch during setup"
+#~ msgstr "Ré-initialiser le switch pendant la configuration"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "Mettre à jour les paquets installés"
+
 #~ msgid ""
 #~ "Also kernel or service logfiles can be viewed here to get an overview "
 #~ "over their current state."

--- a/po/fr/diag_devinfo.po
+++ b/po/fr/diag_devinfo.po
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2011-08-11 00:00+0200\n"
+"Last-Translator: goofy <pierre.gaufillet@gmail.com>\n"
 "Language-Team: none\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"

 msgid "Edit"
-msgstr ""
+msgstr "Éditer"

 msgid "Delete"
-msgstr ""
+msgstr "Supprimer"

 msgid "Add"
-msgstr ""
+msgstr "Ajouter"

 msgid "Invalid"
-msgstr ""
+msgstr "Invalide"

 msgid "No SIP devices"
-msgstr ""
+msgstr "Pas de périphérique SIP"

 msgid "No devices detected"
-msgstr ""
+msgstr "Pas de périphérique détecté"

 msgid "check other networks"
-msgstr ""
+msgstr "Explorer d'autres réseaux"

 #. Devices discovered for
 msgid "Devices discovered for"
 msgstr "Devices discovered for"

 msgid "IP Address"
-msgstr ""
+msgstr "Adresse IP"

 msgid "MAC Address"
-msgstr ""
+msgstr "Adresse MAC"

 msgid "Link to Device"
 msgstr ""
@@ -46,19 +49,19 @@ msgid "Raw"
 msgstr ""

 msgid "Enable"
-msgstr ""
+msgstr "Activer"

 msgid "Interface"
-msgstr ""
+msgstr "Interface"

 msgid "Subnet"
-msgstr ""
+msgstr "Sous-réseau"

 msgid "Timeout"
-msgstr ""
+msgstr "Timeout"

 msgid "Time to wait for responses in seconds (default 10)"
-msgstr ""
+msgstr "Durée d'attente des réponses en secondes (par défaut 10)"

 msgid "Repeat Count"
 msgstr ""
@@ -70,22 +73,22 @@ msgid "Sleep Between Requests"
 msgstr ""

 msgid "Milliseconds to sleep between requests (default 100)"
-msgstr ""
+msgstr "Durée d'attente en millisecondes entre les requêtes (par défaut 100) "

 msgid "Phones"
-msgstr ""
+msgstr "Téléphones"

 msgid "Configure"
-msgstr ""
+msgstr "Configurer"

 msgid "SIP Devices on Network"
-msgstr ""
+msgstr "Périphériques SIP sur le réseau"

 msgid "SIP Device Scan"
 msgstr ""

 msgid "Devices on Network"
-msgstr ""
+msgstr "Périphériques sur le réseau"

 msgid "Phone Scan"
 msgstr ""
@@ -100,7 +103,7 @@ msgid "SIP Device Scanning Configuration"
 msgstr ""

 msgid "SIP Device Information"
-msgstr ""
+msgstr "Informations concernant le périphérique SIP"

 msgid "Phone Information"
 msgstr ""
@@ -117,19 +120,19 @@ msgid "MAC range and information used to override system and IEEE databases"
 msgstr ""

 msgid "Name"
-msgstr ""
+msgstr "Nom"

 msgid "Beginning of MAC address range"
-msgstr ""
+msgstr "Début de la plage d'adresses MAC"

 msgid "End of MAC address range"
-msgstr ""
+msgstr "Fin de la plage d'adresses MAC"

 msgid "OUI Owner"
 msgstr ""

 msgid "Scan for devices on specified networks."
-msgstr ""
+msgstr "Rechercher des périphériques sur les réseaux spécifiés."

 msgid "Phone Scanning Configuration"
 msgstr ""

--- a/po/fr/firewall.po
+++ b/po/fr/firewall.po
@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-03-30 17:00+0200\n"
-"PO-Revision-Date: 2011-06-22 20:49+0200\n"
-"Last-Translator: fredb <fblistes+luci@free.fr>\n"
+"PO-Revision-Date: 2011-08-07 18:20+0200\n"
+"Last-Translator: goofy <pierre.gaufillet@gmail.com>\n"
 "Language-Team: French\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"

--- a/po/fr/openvpn.po
+++ b/po/fr/openvpn.po
--- a/po/fr/p910nd.po
+++ b/po/fr/p910nd.po
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-19 19:36+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-07-28 11:29+0200\n"
+"Last-Translator: fredb <fblistes+luci@free.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.0.4\n"

 #. p910nd - Printer server
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:1
 msgid "p910nd - Printer server"
-msgstr ""
+msgstr "p910nd - Serveur d'impression"

 #. First you have to install the packages to get support for USB (kmod-usb-printer) or parallel port (kmod-lp).
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:2
@@ -23,13 +24,17 @@ msgid ""
 "First you have to install the packages to get support for USB (kmod-usb-"
 "printer) or parallel port (kmod-lp)."
 msgstr ""
+"Vous devez d'abord installer les paquets pour gérer les imprimantes USB "
+"(kmod-usb-printer) ou par port parallèle (kmod-lp)"

 #. Bidirectional mode
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:3
 msgid "Bidirectional mode"
-msgstr ""
+msgstr "Mode bi-directionnel"

 #. p910nd listens on port 910+N. E.g. 9100 for the first printer.
 #: applications/luci-p910nd/luasrc/i18n/p910nd.en.lua:4
 msgid "p910nd listens on port 910+N. E.g. 9100 for the first printer."
 msgstr ""
+"p910nd écoute sur le port 910+N, par exemple 9100 pour la première "
+"imprimante."
--- a/po/fr/radvd.po
+++ b/po/fr/radvd.po
@@ -24,7 +24,7 @@ msgid "Advanced"
 msgstr "Avancé"

 msgid "Advertise Home Agent flag"
-msgstr ""
+msgstr "Drapeau de publication de l'agent Personnel (Home Agent)"

 msgid "Advertise router address"
 msgstr "Publier l'adresse du routeur"
@@ -57,23 +57,27 @@ msgstr ""
 "utilisé"

 msgid "Advertises Mobile IPv6 Home Agent capability (RFC3775)"
-msgstr ""
+msgstr "Publie la capacité Home Agent d'IPv6 Mobile (RFC 3775)"

 msgid "Advertises Mobile Router registration capability (NEMO Basic)"
-msgstr ""
+msgstr "Publie la capacité d'enregistrement d'un Routeur Mobile (NEMO basique)"

 msgid ""
 "Advertises assumed reachability time in milliseconds of neighbours in the RA "
 "if specified. 0 disables reachability advertisements"
 msgstr ""
+"Publie le temps d'accès présumé en milli-secondes des voisins dans le RA "
+"s'il est spécifié. 0 désactive les publications d'accessibilité"

 msgid ""
 "Advertises the default Hop Count value for outgoing unicast packets in the "
 "RA. 0 disables hopcount advertisements"
 msgstr ""
+"Publie le nombre de sauts par défaut pour les paquets unicast sortants dans "
+"le RA. 0 désactive les publications de nombre de sauts"

 msgid "Advertises the default router preference"
-msgstr ""
+msgstr "Publie la préférence du routeur par défaut"

 msgid ""
 "Advertises the given link MTU in the RA if specified. 0 disables MTU "
@@ -87,26 +91,38 @@ msgid ""
 "prefix via stateless address autoconfiguration remain preferred. Use 0 to "
 "specify an infinite lifetime"
 msgstr ""
+"Publie la durée en secondes pendant laquelle les adresses générées depuis le "
+"préfixe via l'auto-configuration sans état restent préférées. 0 indique une "
+"durée infinie"

 msgid ""
 "Advertises the length of time in seconds that the prefix is valid for the "
 "purpose of on-link determination. Use 0 to specify an infinite lifetime"
 msgstr ""
+"Publie la durée en secondes pendant laquelle le préfixe est valable pour le "
+"choix des adresses liées-au-support (on-link). 0 indique une durée infinie"

 msgid ""
 "Advertises the lifetime of the default router in seconds. 0 indicates that "
 "the node is no default router"
 msgstr ""
+"Publie la durée du routeur par défaut, en secondes. 0 indique que le nœud "
+"n'est pas un routeur par défaut"

 msgid ""
 "Advertises the time in seconds the router is offering Mobile IPv6 Home Agent "
 "services"
 msgstr ""
+"Publie la durée en secondes pendant laquelle le routeur offre les services "
+"IPv6 Mobile d'agent personnel (Home Agent)"

 msgid ""
 "Advertises wait time in milliseconds between Neighbor Solicitation messages "
 "in the RA if specified. 0 disables retransmit advertisements"
 msgstr ""
+"Publie le temps d'attente en millisecondes entre deux messages de "
+"sollicitation de voisinage dans le RA. 0 indique de ne pas retransmettre les "
+"publications"

 msgid "Advertising"
 msgstr "Publication"
@@ -130,10 +146,10 @@ msgid "DNSSL Configuration"
 msgstr "Configuration DNSSL"

 msgid "Default lifetime"
-msgstr ""
+msgstr "Durée de vie par défaut"

 msgid "Default preference"
-msgstr ""
+msgstr "Préférence par défaut"

 msgid "Enable"
 msgstr "Activer"
@@ -148,56 +164,71 @@ msgid ""
 "Enables the additional stateful administered autoconfiguration protocol "
 "(RFC2462)"
 msgstr ""
+"Active le protocole d'auto-configuration administrée à états supplémentaire "
+"(RFC 2462)"

 msgid ""
 "Enables the autoconfiguration of additional, non address information "
 "(RFC2462)"
 msgstr ""
+"Active l'auto-configuration d'informations autres que l'adresse "
+"supplémentaires (RFC 2462)"

 msgid "General"
 msgstr "Général"

 msgid "Home Agent information"
-msgstr ""
+msgstr "Informations de l'agent personnel (Home Agent)"

 msgid "Home Agent lifetime"
-msgstr ""
+msgstr "Durée de vie de l'agent personnel (Home Agent)"

 msgid "Home Agent preference"
-msgstr ""
+msgstr "Préférence de l'agent personnel (Home Agent)"

 msgid "Include Home Agent Information in the RA"
-msgstr ""
+msgstr "Inclure les informations de l'agent personnel (Home Agent) dans le RA"

 msgid "Include Mobile IPv6 Advertisement Interval option to RA"
 msgstr ""
+"Inclure l'option de l'intervalle de publication de Mobile IPv6 dans le RA"

 msgid "Includes the link-layer address of the outgoing interface in the RA"
-msgstr ""
+msgstr "Inclure l'adresse de niveau lien de l'interface sortante dans le RA"

 msgid ""
 "Indicates that the address of interface is sent instead of network prefix, "
 "as is required by Mobile IPv6"
 msgstr ""
+"Indique que l'adresse de l'interface est envoyée à la place du préfixe "
+"réseau, comme demandé par la norme IPv6 Mobile"

 msgid ""
 "Indicates that the underlying link is not broadcast capable, prevents "
 "unsolicited advertisements from being sent"
 msgstr ""
+"Indique que le lien sous-jacent ne peut faire de publication « broadcast », "
+"pour éviter l'envoi de publications non sollicitées"

 msgid ""
 "Indicates that this prefix can be used for autonomous address configuration "
 "(RFC4862)"
 msgstr ""
+"Indique que ce préfixe peut être utilisé pour la configuration autonome des "
+"adresses (RFC 4862)"

 msgid ""
 "Indicates that this prefix can be used for on-link determination (RFC4861)"
 msgstr ""
+"Indique que ce préfixe peut être utilisé pour la détermination des\n"
+"adresses liées-au-support (On-Link, RFC 4861)"

 msgid ""
 "Indicates whether that RDNSS continues to be available to hosts even if they "
 "moved to a different subnet"
 msgstr ""
+"Indique si le RDNSS contine d'être disponible aux hôtes même s'ils ont migré "
+"sur un sous-réseau différent"

 msgid "Interface"
 msgstr "Interface"
@@ -218,7 +249,7 @@ msgid "Link MTU"
 msgstr "MTU du lien"

 msgid "Managed flag"
-msgstr ""
+msgstr "Indicateur de gestion"

 msgid "Max. interval"
 msgstr "Intervalle Max"
@@ -227,7 +258,7 @@ msgid "Maximum advertisement interval"
 msgstr "Intervalle maximum de publication"

 msgid "Minimum advertisement delay"
-msgstr ""
+msgstr "Délai de publication minimum"

 msgid "Minimum advertisement interval"
 msgstr "Intervalle minimum de publication"
@@ -236,19 +267,19 @@ msgid "Mobile IPv6"
 msgstr "IPv6 Mobile"

 msgid "Mobile IPv6 interval option"
-msgstr ""
+msgstr "Option d'intervalle pour l'IPv6 Mobile"

 msgid "Mobile IPv6 router registration"
-msgstr ""
+msgstr "Enregistrement du routeur pour IPv6 Mobile"

 msgid "Multicast"
-msgstr ""
+msgstr "Multicast"

 msgid "On-link"
-msgstr ""
+msgstr "lié-au-support (On-link)"

 msgid "On-link determination"
-msgstr ""
+msgstr "Détermination de la liaison-au-support (On-link)"

 msgid "Open"
 msgstr "Ouvert"
@@ -257,7 +288,7 @@ msgid "Preference"
 msgstr "Préférence"

 msgid "Preferred lifetime"
-msgstr ""
+msgstr "Durée de vie préférée"

 msgid "Prefix"
 msgstr "Préfixe"
@@ -301,50 +332,62 @@ msgstr ""
 "de routage (Router Advertisement) comme décrit dans la RFC 4861. "

 msgid "Reachable time"
-msgstr ""
+msgstr "temps d'accès"

 msgid ""
 "Restrict communication to specified clients, leave empty to use multicast"
 msgstr ""
+"Restreint la communication aux clients spécifiés, laissez vide pour utiliser "
+"le multicast"

 msgid "Retransmit timer"
 msgstr "Délai de retransmission"

 msgid "Route Configuration"
-msgstr ""
+msgstr "Configuration du routage"

 msgid "Routes"
 msgstr "Routes"

 msgid "Source link-layer address"
-msgstr ""
+msgstr "Adresse-source de niveau lien"

 msgid ""
 "Specifies a logical interface name to derive a 6to4 prefix from. The "
 "interfaces public IPv4 address is combined with 2002::/3 and the value of "
 "the prefix option"
 msgstr ""
+"Décrit le nom d'une interface logique de laquelle le préfixe 6to4 sera "
+"déduit. Les adresses IPv4 des interfaces publiques sont combinées avec "
+"2002::/3 et la valeur de l'option de préfixe"

 msgid ""
 "Specifies the lifetime associated with the route in seconds. Use 0 to "
 "specify an infinite lifetime"
 msgstr ""
+"Précise la durée de vie d'une route, en secondes. Utiliser 0 pour une durée "
+"de vie infinie"

 msgid "Specifies the logical interface name this section belongs to"
 msgstr ""
+"Indique le nom de l'interface logique auquelle cette section est rattachée"

 msgid ""
 "Specifies the maximum duration how long the DNSSL entries are used for name "
 "resolution. Use 0 to specify an infinite lifetime"
 msgstr ""
+"Indique la durée maximum d'utilisation des entrées DNSSL pour la résolution "
+"de nom. Utiliser 0 pour une durée infinie"

 msgid ""
 "Specifies the maximum duration how long the RDNSS entries are used for name "
 "resolution. Use 0 to specify an infinite lifetime"
 msgstr ""
+"Indique la durée maximum d'utilisation des entrées RDNSS pour la résolution "
+"de nom. Utiliser 0 pour une durée infinie"

 msgid "Specifies the preference associated with the default router"
-msgstr ""
+msgstr "Indique la préférence associée au routeur par défaut"

 msgid "Suffix"
 msgstr "Suffixe"
@@ -353,43 +396,49 @@ msgid ""
 "The maximum time allowed between sending unsolicited multicast router "
 "advertisements from the interface, in seconds"
 msgstr ""
+"Temps maximum autorisé entre deux émissions de publications multicast non "
+"sollicitées du routeur depuis cette interface, en secondes"

 msgid ""
 "The minimum time allowed between sending multicast router advertisements "
 "from the interface, in seconds"
 msgstr ""
+"Temps minimum autorisé entre deux émissions de publications multicast du "
+"routeur depuis cette interface, en secondes"

 msgid ""
 "The minimum time allowed between sending unsolicited multicast router "
 "advertisements from the interface, in seconds"
 msgstr ""
+"Temps minimum autorisé entre deux émissions de publications multicast non "
+"sollicitées du routeur depuis cette interface, en secondes"

 msgid "The preference for the Home Agent sending this RA"
-msgstr ""
+msgstr "Préférence pour l'agent personnel (Home Agent) envoyant ce RA"

 msgid "Timing"
-msgstr ""
+msgstr "Délai"

 msgid "Unicast only"
-msgstr ""
+msgstr "Unicast seulement"

 msgid "Valid lifetime"
-msgstr ""
+msgstr "Durée de la validité"

 msgid "Validity time"
-msgstr ""
+msgstr "Durée de validité"

 msgid "default"
-msgstr ""
+msgstr "Défaut"

 msgid "high"
-msgstr ""
+msgstr "haut"

 msgid "low"
-msgstr ""
+msgstr "bas"

 msgid "medium"
-msgstr ""
+msgstr "moyen"

 msgid "no"
 msgstr "non"

--- a/po/fr/statistics.po
+++ b/po/fr/statistics.po
--- a/po/fr/upnp.po
+++ b/po/fr/upnp.po
@@ -16,130 +16,140 @@ msgid ""
 "ACLs specify which external ports may be redirected to which internal "
 "addresses and ports"
 msgstr ""
+"Les ACLs définissent quels ports externes peuvent être redirigés, vers "
+"quelles adresses et ports internes"

 msgid "Action"
-msgstr ""
+msgstr "Action"

 msgid "Active UPnP Redirects"
-msgstr ""
+msgstr "Redirections UPnP actives"

 msgid "Advanced Settings"
-msgstr ""
+msgstr "Paramètres avancés"

 msgid "Allow adding forwards only to requesting ip addresses"
 msgstr ""
+"Permet d'ajouter des redirections seulement vers les adresses IP qui font "
+"des demandes"

 msgid "Announced model number"
-msgstr ""
+msgstr "Numéro de modèle déclaré"

 msgid "Announced serial number"
-msgstr ""
+msgstr "Numéro de série déclaré"

 msgid "Clean rules interval"
-msgstr ""
+msgstr "Intervalle des règles de nettoyage"

 msgid "Clean rules threshold"
-msgstr ""
+msgstr "Niveau des règles de nettoyage"

 msgid "Client Address"
-msgstr ""
+msgstr "Adresse du client"

 msgid "Client Port"
-msgstr ""
+msgstr "Port du client"

 msgid "Collecting data..."
-msgstr ""
+msgstr "Récupération des données…"

 msgid "Comment"
-msgstr ""
+msgstr "Commentaire"

 msgid "Delete Redirect"
-msgstr ""
+msgstr "Détruire la redirection"

 msgid "Device UUID"
-msgstr ""
+msgstr "UUID du périphérique"

 msgid "Downlink"
-msgstr ""
+msgstr "Lien descendant"

 msgid "Enable NAT-PMP functionality"
-msgstr ""
+msgstr "Activer la fonctionnalité NAT-PMP"

 msgid "Enable UPnP functionality"
-msgstr ""
+msgstr "Activer la fonctionnalité UPnP"

 msgid "Enable additional logging"
-msgstr ""
+msgstr "Activer la journalisation additionnelle"

 msgid "Enable secure mode"
-msgstr ""
+msgstr "Activer le mode sécurisé"

 msgid "External Port"
-msgstr ""
+msgstr "Port externe"

 msgid "External ports"
-msgstr ""
+msgstr "Ports externes"

 msgid "General Settings"
-msgstr ""
+msgstr "Paramètres généraux"

 msgid "Internal addresses"
-msgstr ""
+msgstr "Adresses internes"

 msgid "Internal ports"
-msgstr ""
+msgstr "Ports internes"

 msgid "MiniUPnP ACLs"
-msgstr ""
+msgstr "ACLs MiniUPnP"

 msgid "MiniUPnP settings"
-msgstr ""
+msgstr "Paramètres MiniUPnP"

 msgid "Notify interval"
-msgstr ""
+msgstr "Intervalle de notification"

 msgid "Port"
-msgstr ""
+msgstr "Port"

 msgid "Presentation URL"
-msgstr ""
+msgstr "URL de présentation"

 msgid "Protocol"
-msgstr ""
+msgstr "Protocole"

 msgid "Puts extra debugging information into the system log"
-msgstr ""
+msgstr "Rajoute des informations de debug dans le journal-système"

 msgid "Report system instead of daemon uptime"
 msgstr ""
+"Indiquer la durée de fonctionnement du système plutôt que celle du démon "
+"UPnP"

 msgid "Start UPnP and NAT-PMP service"
-msgstr ""
+msgstr "Démarrer les services UPnP et NAT-PMP"

 msgid "There are no active redirects."
-msgstr ""
+msgstr "Il n'y a pas de redirections actives."

 msgid ""
 "UPNP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
+"UPnP permet à des clients du réseau local de configurer automatiquement le "
+"routeur."

 msgid ""
 "UPnP allows clients in the local network to automatically configure the "
 "router."
 msgstr ""
+"UPnP permet à des clients du réseau local de configurer automatiquement le "
+"routeur."

 msgid "UPnP lease file"
-msgstr ""
+msgstr "Fichier des baux UPnP"

 msgid "Universal Plug & Play"
-msgstr ""
+msgstr "Universal Plug & Play"

 msgid "Uplink"
-msgstr ""
+msgstr "Lien remontant"

 msgid "Value in KByte/s, informational only"
-msgstr ""
+msgstr "Valeur en Ko/s, pour information seulement"

 msgid "enable"
-msgstr ""
+msgstr "activer"
--- a/po/fr/vnstat.po
+++ b/po/fr/vnstat.po
@@ -10,53 +10,57 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"

 msgid "Configuration"
-msgstr ""
+msgstr "Configuration"

 msgid "Daily traffic"
-msgstr ""
+msgstr "Trafic quotidien"

 msgid "Graphs"
-msgstr ""
+msgstr "Graphes"

 msgid "Hourly traffic"
-msgstr ""
+msgstr "Trafic horaire"

 msgid "Monitor selected interfaces"
-msgstr ""
+msgstr "Surveiller les interfaces sélectionnées"

 msgid "Monthly traffic"
-msgstr ""
+msgstr "Trafic mensuel"

 msgid ""
 "No database has been set up yet. Go to the VnStat configuration and enable "
 "monitoring for one or more interfaces."
 msgstr ""
+"Aucun enregistrement n'a encore été configuré. Allez dans la configuration "
+"de VnStat et activez la surveillance d'une ou plusieurs interface(s)."

 msgid "Restart VnStat"
-msgstr ""
+msgstr "Redémarrer VnStat"

 msgid "Summary display"
-msgstr ""
+msgstr "Résumé"

 msgid "The VnStat service has been restarted."
-msgstr ""
+msgstr "Le service VnStat a été redémarré."

 msgid "Top 10 display"
-msgstr ""
+msgstr "Top 10"

 msgid "Update »"
-msgstr ""
+msgstr "Mise à jour »"

 msgid "VnStat"
-msgstr ""
+msgstr "VnStat"

 msgid "VnStat Graphs"
-msgstr ""
+msgstr "Graphiques VnStat"

 msgid "VnStat Traffic Monitor"
-msgstr ""
+msgstr "Surveillance du trafic VnStat"

 msgid ""
 "VnStat is a network traffic monitor for Linux that keeps a log of network "
 "traffic for the selected interface(s)."
 msgstr ""
+"VnStat est un outil de surveillance du réseau pour Linux qui garde un\n"
+"journal du trafic du ou des interface(s) sélectionnée(s)."
--- a/po/fr/voice_diag.po
+++ b/po/fr/voice_diag.po
@@ -9,17 +9,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"

 msgid "Diagnostics"
-msgstr ""
+msgstr "Diagnostics"

 msgid ""
 "Under this menu are options that allow you to configure and perform tests on "
 "the voice operations of your system. These are known as diagnostics."
 msgstr ""
+"Ce menu contient des options vous permettant de configurer et lancer des "
+"tests sur les fonctions vocales de votre système. Ils sont nommés "
+"diagnostics."

 msgid ""
 "The diagnostics available on your device depend on the modules that you have "
 "installed."
 msgstr ""
+"Les diagnostics disponibles pour votre périphérique dépendent des modules "
+"que vous avez installé."

 msgid "l_v_d_admindiag"
 msgstr ""
--- a/po/he/base.po
+++ b/po/he/base.po
@@ -4,10 +4,10 @@ msgstr ""
 "PO-Revision-Date: 2011-07-14 13:20+0200\n"
 "Last-Translator: zstorch <zstorch@gmail.com>\n"
 "Language-Team: none\n"
-"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"

@@ -368,6 +368,9 @@ msgstr ""
 msgid "Bridge unit number"
 msgstr ""

+msgid "Bring up on boot"
+msgstr ""
+
 msgid "Buffered"
 msgstr ""

@@ -460,6 +463,9 @@ msgstr ""
 msgid "Configuration file"
 msgstr ""

+msgid "Configuration files will be kept."
+msgstr ""
+
 msgid ""
 "Configure the local DNS server to use the name servers adverticed by the PPP "
 "peer"
@@ -740,9 +746,6 @@ msgstr ""
 msgid "Enable this swap"
 msgstr ""

-msgid "Enable this switch"
-msgstr ""
-
 msgid "Enable/Disable"
 msgstr ""

@@ -1447,6 +1450,9 @@ msgstr ""
 msgid "Not configured"
 msgstr ""

+msgid "Note: Configuration files will be erased."
+msgstr ""
+
 msgid ""
 "Note: If you choose an interface here which is part of another network, it "
 "will be moved into this network."
@@ -1461,9 +1467,6 @@ msgstr ""
 msgid "OK"
 msgstr ""

-msgid "OPKG error code %i"
-msgstr ""
-
 msgid "OPKG-Configuration"
 msgstr ""

@@ -1544,9 +1547,6 @@ msgstr ""
 msgid "Package lists"
 msgstr ""

-msgid "Package lists updated"
-msgstr ""
-
 msgid "Package name"
 msgstr ""

@@ -1766,9 +1766,6 @@ msgstr ""
 msgid "Reset router to defaults"
 msgstr ""

-msgid "Reset switch during setup"
-msgstr ""
-
 msgid "Resolv and Hosts Files"
 msgstr ""

@@ -2245,9 +2242,6 @@ msgstr ""
 msgid "Update package lists"
 msgstr ""

-msgid "Upgrade installed packages"
-msgstr ""
-
 msgid "Upload an OpenWrt image file to reflash the device."
 msgstr ""


--- a/po/it/ahcp.po
+++ b/po/it/ahcp.po
 msgid ""
 msgstr ""
-"Content-Type: text/plain; charset=UTF-8\n"
 "Project-Id-Version: PACKAGE VERSION\n"
-"Last-Translator: Automatically generated\n"
+"PO-Revision-Date: 2011-08-13 12:31+0200\n"
+"Last-Translator: a288204 <a288204@nepwk.com>\n"
 "Language-Team: none\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.4\n"

 msgid "AHCP Server"
-msgstr ""
+msgstr "AHCP Server"

+#, fuzzy
 msgid ""
 "AHCP is an autoconfiguration protocol for IPv6 and dual-stack IPv6/IPv4 "
 "networks designed to be used in place of router discovery and DHCP on "
 "networks where it is difficult or impossible to configure a server within "
 "every link-layer broadcast domain, for example mobile ad-hoc networks."
 msgstr ""
+"AHCP è un protocollo autoconfigurante per reti IPv6 e IPv6/IPv4 progettato "
+"per essere usato al posto del router discovery e DHCP su reti dove è "
+"difficile o impossibile configurare un server entro ogni dominio di "
+"broadcast link-layer, per esempio reti ad-hoc mobili"

 msgid "Active AHCP Leases"
 msgstr ""

 msgid "Address"
-msgstr ""
+msgstr "Indirizzo"

 msgid "Advanced Settings"
-msgstr ""
+msgstr "Impostazioni Avanzate"

 msgid "Age"
-msgstr ""
+msgstr "Età"

+#, fuzzy
 msgid "Announced DNS servers"
-msgstr ""
+msgstr "Server DNS annunciati"

 msgid "Announced NTP servers"
-msgstr ""
+msgstr "Server NTP annunciati"

 msgid "Announced prefixes"
-msgstr ""
+msgstr "Prefissi annunciati"

 msgid "Collecting data..."
-msgstr ""
+msgstr "Raccogliendo dati..."

 msgid "Forwarder"
 msgstr ""

 msgid "General Setup"
-msgstr ""
+msgstr "Impostazioni Generali"

 msgid "IPv4 and IPv6"
-msgstr ""
+msgstr "IPv4 e IPv6"

 msgid "IPv4 only"
-msgstr ""
+msgstr "Solo IPv4"

 msgid "IPv6 only"
-msgstr ""
+msgstr "Solo IPv6"

 msgid "Lease directory"
 msgstr ""
@@ -63,26 +72,28 @@ msgstr ""
 msgid "Lease validity time"
 msgstr ""

+#, fuzzy
 msgid "Log file"
-msgstr ""
+msgstr "File di log"

 msgid "Multicast address"
-msgstr ""
+msgstr "Indirizzo Multicast"

 msgid "Operation mode"
-msgstr ""
+msgstr "Modalità di funzionamento"

 msgid "Port"
-msgstr ""
+msgstr "Porta"

 msgid "Protocol family"
-msgstr ""
+msgstr "Protocollo famiglia"

+#, fuzzy
 msgid "Served interfaces"
-msgstr ""
+msgstr "Interfaccia servita"

 msgid "Server"
-msgstr ""
+msgstr "Server"

 msgid "Specifies the announced IPv4 and IPv6 NTP servers"
 msgstr ""
@@ -90,11 +101,14 @@ msgstr ""
 msgid "Specifies the announced IPv4 and IPv6 name servers"
 msgstr ""

+#, fuzzy
 msgid "Specifies the announced IPv4 and IPv6 network prefixes in CIDR notation"
-msgstr ""
+msgstr "Specifica i prefissi delle reti IPv4 e IPv6 in notazione CIDR"

+#, fuzzy
 msgid "There are no active leases."
-msgstr ""
+msgstr "Non ci sono leases attivi"

+#, fuzzy
 msgid "Unique ID file"
-msgstr ""
+msgstr "File ID unico"
--- a/po/it/base.po
+++ b/po/it/base.po
@@ -6,10 +6,10 @@ msgstr ""
 "PO-Revision-Date: 2011-06-26 16:20+0200\n"
 "Last-Translator: Massimo <coatto87@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.4\n"

@@ -399,6 +399,9 @@ msgstr "Unisci interfacce"
 msgid "Bridge unit number"
 msgstr "Numero Bridge"

+msgid "Bring up on boot"
+msgstr ""
+
 msgid "Buffered"
 msgstr "Buffered"

@@ -496,6 +499,9 @@ msgstr "Configurazione salvata."
 msgid "Configuration file"
 msgstr "File di configurazione"

+msgid "Configuration files will be kept."
+msgstr ""
+
 msgid ""
 "Configure the local DNS server to use the name servers adverticed by the PPP "
 "peer"
@@ -788,9 +794,6 @@ msgstr "Abilita questo mount"
 msgid "Enable this swap"
 msgstr "Abilita questo swap"

-msgid "Enable this switch"
-msgstr "Abilita questo switch"
-
 msgid "Enable/Disable"
 msgstr "Abilita/Disabilita"

@@ -1526,6 +1529,9 @@ msgstr "Non associato"
 msgid "Not configured"
 msgstr "Non configurato"

+msgid "Note: Configuration files will be erased."
+msgstr ""
+
 msgid ""
 "Note: If you choose an interface here which is part of another network, it "
 "will be moved into this network."
@@ -1542,9 +1548,6 @@ msgstr "Numero di test di connettività falliti prima di una riconnessione"
 msgid "OK"
 msgstr "OK"

-msgid "OPKG error code %i"
-msgstr "OPKG codice di errore %i"
-
 msgid "OPKG-Configuration"
 msgstr "Configurazione di OPKG"

@@ -1630,9 +1633,6 @@ msgstr "E' richiesto il pacchetto libiwinfo!"
 msgid "Package lists"
 msgstr "Lista pacchetti"

-msgid "Package lists updated"
-msgstr "Lista pacchetti aggiornata"
-
 msgid "Package name"
 msgstr "Nome pacchetto"

@@ -1862,9 +1862,6 @@ msgstr "Azzera Contatori"
 msgid "Reset router to defaults"
 msgstr "Ripristina il router come predefinito"

-msgid "Reset switch during setup"
-msgstr ""
-
 msgid "Resolv and Hosts Files"
 msgstr ""

@@ -2375,9 +2372,6 @@ msgstr "Modifiche non salvate"
 msgid "Update package lists"
 msgstr "Aggiorna lista pacchetti"

-msgid "Upgrade installed packages"
-msgstr "Upgrade installed packages"
-
 msgid "Upload an OpenWrt image file to reflash the device."
 msgstr "Upload an OpenWrt image file to reflash the device."

@@ -2606,6 +2600,18 @@ msgstr ""
 msgid "« Back"
 msgstr ""

+#~ msgid "Enable this switch"
+#~ msgstr "Abilita questo switch"
+
+#~ msgid "OPKG error code %i"
+#~ msgstr "OPKG codice di errore %i"
+
+#~ msgid "Package lists updated"
+#~ msgstr "Lista pacchetti aggiornata"
+
+#~ msgid "Upgrade installed packages"
+#~ msgstr "Upgrade installed packages"
+
 #~ msgid ""
 #~ "Also kernel or service logfiles can be viewed here to get an overview "
 #~ "over their current state."

--- a/po/it/ddns.po
+++ b/po/it/ddns.po
@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-04-02 13:44+0100\n"
-"PO-Revision-Date: 2011-05-17 21:56+0200\n"
-"Last-Translator: coatto87 <coatto87@gmail.com>\n"
+"PO-Revision-Date: 2011-08-13 12:34+0200\n"
+"Last-Translator: a288204 <a288204@nepwk.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
@@ -36,13 +36,13 @@ msgid "Custom update-URL"
 msgstr "URL di aggiornamento personalizzato"

 msgid "Hostname"
-msgstr ""
+msgstr "Nome Host"

 msgid "Username"
-msgstr ""
+msgstr "Nome Utente"

 msgid "Password"
-msgstr ""
+msgstr "Password"

 msgid "Source of IP address"
 msgstr "Origine dell'indirizzo IP"
@@ -54,7 +54,7 @@ msgid "interface"
 msgstr "interfaccia"

 msgid "URL"
-msgstr ""
+msgstr "URL"

 msgid "Network"
 msgstr "Rete"
@@ -70,7 +70,7 @@ msgstr ""

 # Minutes (not minimum)
 msgid "min"
-msgstr ""
+msgstr "min"

 # Hours
 msgid "h"
@@ -80,4 +80,4 @@ msgid "Force update every"
 msgstr "Forza aggiornamento ogni"

 msgid "Force-time unit"
-msgstr ""
+msgstr "Unità di tempo per l'aggiornamento"
--- a/po/ja/base.po
+++ b/po/ja/base.po
--- a/po/ja/hd_idle.po
+++ b/po/ja/hd_idle.po
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-04-14 10:33+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-08-19 05:37+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"

 msgid ""
 "hd-idle is a utility program for spinning-down external disks after a period "
 "of idle time."
-msgstr ""
+msgstr "hd-idleはアイドル時に外部ディスクをスピンダウンさせるための、ユーティリティプログラムです。"

 msgid "Settings"
-msgstr ""
+msgstr "設定"

 msgid "Enable"
-msgstr ""
+msgstr "有効"

 msgid "Disk"
-msgstr ""
+msgstr "ディスク"

 msgid "Idle-time"
-msgstr ""
+msgstr "アイドル時間"

 msgid "Idle-time unit"
-msgstr ""
+msgstr "アイドル時間 (単位)"

 # Minutes (not minimum)
 msgid "min"
-msgstr ""
+msgstr "分"

 # Hours
 msgid "h"
-msgstr ""
+msgstr "時"

 msgid "Enable debug"
-msgstr ""
+msgstr "デバッグを有効にする"
--- a/po/ja/mmc_over_gpio.po
+++ b/po/ja/mmc_over_gpio.po
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-19 19:36+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2011-08-19 05:35+0200\n"
+"Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.4\n"

 #. Settings
 #: applications/luci-mmc_over_gpio/luasrc/i18n/mmc_over_gpio.en.lua:3
 msgid "Settings"
-msgstr ""
+msgstr "設定"
--- a/po/ja/multiwan.po
+++ b/po/ja/multiwan.po
--- a/po/ja/upnp.po
+++ b/po/ja/upnp.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-05-19 19:36+0200\n"
-"PO-Revision-Date: 2011-05-31 12:02+0200\n"
+"PO-Revision-Date: 2011-08-21 14:11+0200\n"
 "Last-Translator: Kentaro <kentaro.matsuyama@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: ja\n"
@@ -22,7 +22,7 @@ msgid "Action"
 msgstr "動作"

 msgid "Active UPnP Redirects"
-msgstr ""
+msgstr "稼働中のUPnPリダイレクト"

 msgid "Advanced Settings"
 msgstr "詳細設定"
@@ -82,7 +82,7 @@ msgid "External ports"
 msgstr "外部ポート"

 msgid "General Settings"
-msgstr ""
+msgstr "一般設定"

 msgid "Internal addresses"
 msgstr "内部アドレス"

--- a/po/ja/vnstat.po
+++ b/po/ja/vnstat.po
--- a/po/ja/wol.po
+++ b/po/ja/wol.po
--- a/po/ms/base.po
+++ b/po/ms/base.po
--- a/po/no/base.po
+++ b/po/no/base.po
--- a/po/pl/base.po
+++ b/po/pl/base.po
--- a/po/pl/diag_core.po
+++ b/po/pl/diag_core.po
--- a/po/pl/mmc_over_gpio.po
+++ b/po/pl/mmc_over_gpio.po
--- a/po/pl/qos.po
+++ b/po/pl/qos.po
--- a/po/pl/samba.po
+++ b/po/pl/samba.po
--- a/po/pl/tinyproxy.po
+++ b/po/pl/tinyproxy.po
--- a/po/pl/ushare.po
+++ b/po/pl/ushare.po
--- a/po/pl/uvc_streamer.po
+++ b/po/pl/uvc_streamer.po
--- a/po/pl/voice_core.po
+++ b/po/pl/voice_core.po
--- a/po/pl/wol.po
+++ b/po/pl/wol.po
--- a/po/pt/base.po
+++ b/po/pt/base.po
--- a/po/pt/openvpn.po
+++ b/po/pt/openvpn.po
@@ -59,7 +59,7 @@ msgstr "Protocolo"
 #. Instance \"%s\"
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:13
 msgid "Instance \"%s\""
-msgstr "Instância \\\"%s\\\""
+msgstr "Instância \"%s\""

 #. OpenVPN instances
 #: applications/luci-openvpn/luasrc/i18n/openvpn.en.lua:15

--- a/po/pt_BR/base.po
+++ b/po/pt_BR/base.po
--- a/po/pt_BR/openvpn.po
+++ b/po/pt_BR/openvpn.po
--- a/po/ru/ahcp.po
+++ b/po/ru/ahcp.po
--- a/po/ru/base.po
+++ b/po/ru/base.po
--- a/po/ru/coovachilli.po
+++ b/po/ru/coovachilli.po
--- a/po/ru/ffwizard.po
+++ b/po/ru/ffwizard.po
--- a/po/ru/freifunk-policyrouting.po
+++ b/po/ru/freifunk-policyrouting.po
--- a/po/ru/freifunk.po
+++ b/po/ru/freifunk.po
--- a/po/ru/meshwizard.po
+++ b/po/ru/meshwizard.po
--- a/po/ru/multiwan.po
+++ b/po/ru/multiwan.po
--- a/po/ru/ntpc.po
+++ b/po/ru/ntpc.po
--- a/po/ru/olsr.po
+++ b/po/ru/olsr.po
--- a/po/ru/polipo.po
+++ b/po/ru/polipo.po
--- a/po/ru/qos.po
+++ b/po/ru/qos.po
--- a/po/ru/radvd.po
+++ b/po/ru/radvd.po
--- a/po/ru/rrdtool.po
+++ b/po/ru/rrdtool.po
--- a/po/ru/samba.po
+++ b/po/ru/samba.po
--- a/po/ru/statistics.po
+++ b/po/ru/statistics.po
--- a/po/ru/tinyproxy.po
+++ b/po/ru/tinyproxy.po
--- a/po/ru/upnp.po
+++ b/po/ru/upnp.po
--- a/po/templates/base.pot
+++ b/po/templates/base.pot
--- a/po/vi/base.po
+++ b/po/vi/base.po
--- a/po/zh_CN/base.po
+++ b/po/zh_CN/base.po
--- a/po/zh_CN/openvpn.po
+++ b/po/zh_CN/openvpn.po
--- a/po/zh_CN/polipo.po
+++ b/po/zh_CN/polipo.po
--- a/po/zh_CN/rrdtool.po
+++ b/po/zh_CN/rrdtool.po
--- a/po/zh_CN/tinyproxy.po
+++ b/po/zh_CN/tinyproxy.po