Index: /luci/branches/luci-0.10/build/i18n-lua2po.pl
===================================================================
--- /luci/branches/luci-0.10/build/i18n-lua2po.pl	(revision 6749)
+++ /luci/branches/luci-0.10/build/i18n-lua2po.pl	(revision 6749)
@@ -0,0 +1,120 @@
+#!/usr/bin/perl
+
+@ARGV >= 2 || die "Usage: $0 <source-dir> <dest-dir> [<target-language>]\n";
+
+my $source_dir  = shift @ARGV;
+my $target_dir  = shift @ARGV;
+my $target_lang = shift @ARGV;
+my $master_lang = "en";
+
+
+if( ! -d "$target_dir/" . ( $target_lang || 'templates' ) )
+{
+	system('mkdir', '-p', "$target_dir/" . ( $target_lang || 'templates' ));
+}
+
+
+my %target_strings;
+
+if( $target_lang && open F, "find $source_dir -path '*/luasrc/i18n/*' -name '*.$target_lang.lua' |" )
+{
+	while( chomp( my $file = readline F ) )
+	{
+		if( open L, "< $file" )
+		{
+			my ( $basename ) = $file =~ m{.+/([^/]+)\.[\w\-]+\.lua$};
+			$target_strings{$basename} = { };
+
+			while( chomp( my $entry = readline L ) )
+			{
+				my ( $k, $v );
+				if( $entry =~ /^\s*(\w+)\s*=\s*\[\[(.+)\]\]/ )
+				{
+					( $k, $v ) = ( $1, $2 );
+				}
+				elsif( $entry =~ /^\s*(\w+)\s*=\s*'(.+)'/ )
+				{
+					( $k, $v ) = ( $1, $2 );
+				}
+				elsif( $entry =~ /^\s*(\w+)\s*=\s*"(.+)"/ )
+				{
+					( $k, $v ) = ( $1, $2 );
+				}
+				
+				if( $k && $v )
+				{
+					$v =~ s/"/\\"/g;
+					$v =~ s/\\\\"/\\"/g;
+					$target_strings{$basename}{$k} = $v;
+				}
+			}
+
+			close L;
+		}
+	}
+
+	close F;
+}
+
+
+if( open F, "find . -path '*/luasrc/i18n/*' -name '*.$master_lang.lua' |" )
+{
+	my $destfile = sprintf '%s/%s/%%s.%s',
+		$target_dir,
+		$target_lang || 'templates',
+		$target_lang ? 'po' : 'pot'
+	;
+
+	while( chomp( my $file = readline F ) )
+	{
+		if( open L, "< $file" )
+		{
+			my ( $basename ) = $file =~ m{.+/([^/]+)\.\w+\.lua$};
+			my $filename = sprintf $destfile, $basename;
+
+			if( open T, "> $filename" )
+			{
+				printf "Generating %-40s ", $filename;
+
+				printf T "#  %s.%s\n#  generated from %s\n\nmsgid \"\"\n" .
+				         "msgstr \"Content-Type: text/plain; charset=UTF-8\"\n\n",
+					$basename, $target_lang ? 'po' : 'pot', $file;
+		
+				while( chomp( my $entry = readline L ) )
+				{
+					my ( $k, $v );
+					if( $entry =~ /^\s*(\w+)\s*=\s*\[\[(.+)\]\]/ )
+					{
+						( $k, $v ) = ( $1, $2 );
+					}
+					elsif( $entry =~ /^\s*(\w+)\s*=\s*'(.+)'/ )
+					{
+						( $k, $v ) = ( $1, $2 );
+					}
+					elsif( $entry =~ /^\s*(\w+)\s*=\s*"(.+)"/ )
+					{
+						( $k, $v ) = ( $1, $2 );
+					}
+				
+					if( $k && $v )
+					{
+						$v =~ s/"/\\"/g;
+						$v =~ s/\\\\"/\\"/g;
+						printf T "#: %s:%d\n#. %s\nmsgid \"%s\"\nmsgstr \"%s\"\n\n",
+							$file, $., $v, $k,
+							( $target_strings{$basename} && $target_strings{$basename}{$k} )
+								? $target_strings{$basename}{$k} : "";
+					}
+				}
+				
+				close T;
+				
+				print "done\n";
+			}
+
+			close L;
+		}
+	}
+
+	close F;
+}
Index: /ci/branches/luci-0.10/build/i18n-po2lua.pl
===================================================================
--- /luci/branches/luci-0.10/build/i18n-po2lua.pl	(revision 5036)
+++ 	(revision )
@@ -1,27 +1,0 @@
-#!/usr/bin/perl
-
-@ARGV == 2 || die "Usage: $0 <source-dir> <dest-dir>\n";
-
-my $source_dir  = shift @ARGV;
-my $target_dir  = shift @ARGV;
-
-if( ! -d $target_dir )
-{
-	system('mkdir', '-p', $target_dir);
-}
-
-if( open F, "find $source_dir -type f -name '*.po' |" )
-{
-	while( chomp( my $file = readline F ) )
-	{
-		my ( $lang, $basename ) = $file =~ m{.+/(\w+)/([^/]+)\.po$};
-		$lang = lc $lang;
-		$lang =~ s/_/-/g;
-
-		printf "Generating %-40s ", "$target_dir/$basename.$lang.lmo";
-		system("./build/po2lmo", $file, "$target_dir/$basename.$lang.lmo");
-		print ( -f "$target_dir/$basename.$lang.lmo" ? "done\n" : "empty\n" );
-	}
-
-	close F;
-}
Index: /luci/branches/luci-0.10/contrib/package/iwinfo/src/iwinfo_nl80211.c
===================================================================
--- /luci/branches/luci-0.10/contrib/package/iwinfo/src/iwinfo_nl80211.c	(revision 6606)
+++ /luci/branches/luci-0.10/contrib/package/iwinfo/src/iwinfo_nl80211.c	(revision 6749)
@@ -357,4 +357,5 @@
 								   const char *event)
 {
+	int numtry = 0;
 	int sock = -1;
 	char *rv = NULL;
@@ -396,5 +397,5 @@
 	send(sock, cmd, strlen(cmd), 0);
 
-	while( 1 )
+	while( numtry++ < 5 )
 	{
 		if( nl80211_wpactl_recv(sock, buffer, sizeof(buffer)) <= 0 )
Index: /luci/branches/luci-0.10/modules/admin-core/luasrc/controller/admin/servicectl.lua
===================================================================
--- /luci/branches/luci-0.10/modules/admin-core/luasrc/controller/admin/servicectl.lua	(revision 6268)
+++ /luci/branches/luci-0.10/modules/admin-core/luasrc/controller/admin/servicectl.lua	(revision 6749)
@@ -19,7 +19,7 @@
 	local i18n = luci.i18n.translate
 
-	entry({"servicectl"}, alias("servicectl", "status"), "", 1).sysauth = "root"
-	entry({"servicectl", "status"}, call("action_status"), "", 2).leaf = true
-	entry({"servicectl", "restart"}, call("action_restart"), "", 3).leaf = true
+	entry({"servicectl"}, alias("servicectl", "status"), nil, 1).sysauth = "root"
+	entry({"servicectl", "status"}, call("action_status"), nil, 2).leaf = true
+	entry({"servicectl", "restart"}, call("action_restart"), nil, 3).leaf = true
 end