Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba

2 files changed, 1 insertions, 65 deletions

diff --git a/source3/locale/net/de.po b/source3/locale/net/de.po
index d99873b11d..a336936343 100644
--- a/source3/locale/net/de.po
+++ b/source3/locale/net/de.po
@@ -378,14 +378,6 @@ msgstr ""
 msgid "  Use 'net help registry' to get more information about 'net registry' commands."
 msgstr ""
 
-#: ../../utils/net.c:584
-msgid "Open a lua interpreter"
-msgstr ""
-
-#: ../../utils/net.c:585
-msgid "  Use 'net help lua' to get more information about 'net lua' commands."
-msgstr ""
-
 #: ../../utils/net.c:591
 msgid "Process Win32 *.evt eventlog files"
 msgstr ""
@@ -3369,62 +3361,6 @@ msgid ""
 "Usage: \n"
 msgstr ""
 
-#: ../../utils/net_lua.c:60
-msgid "connect: Expected IP-Address"
-msgstr ""
-
-#: ../../utils/net_lua.c:65
-msgid "connect: Expected port"
-msgstr ""
-
-#: ../../utils/net_lua.c:84
-#, c-format
-msgid "connect failed: %s"
-msgstr ""
-
-#: ../../utils/net_lua.c:132
-#, c-format
-msgid "socket domain %s unknown"
-msgstr ""
-
-#: ../../utils/net_lua.c:144
-#, c-format
-msgid "socket type %s unknown"
-msgstr ""
-
-#: ../../utils/net_lua.c:155
-#, c-format
-msgid "socket() failed: %s"
-msgstr ""
-
-#: ../../utils/net_lua.c:278
-msgid "evt_reference_thread failed\n"
-msgstr ""
-
-#: ../../utils/net_lua.c:287
-msgid "event_add_timed failed"
-msgstr ""
-
-#: ../../utils/net_lua.c:300
-msgid "event_once called from non-base thread"
-msgstr ""
-
-#: ../../utils/net_lua.c:323
-msgid "event_context_init failed"
-msgstr ""
-
-#: ../../utils/net_lua.c:353
-msgid "lua_newstate failed\n"
-msgstr ""
-
-#: ../../utils/net_lua.c:371
-msgid "luaL_dofile returned an error\n"
-msgstr ""
-
-#: ../../utils/net_lua.c:376
-msgid "luaL_dostring returned an error\n"
-msgstr ""
-
 #: ../../utils/net_rap.c:39
 msgid ""
 "\n"
diff --git a/source3/locale/net/genmsg b/source3/locale/net/genmsg
index 7202e8108e..fcae0e7fe6 100755
--- a/source3/locale/net/genmsg
+++ b/source3/locale/net/genmsg
@@ -29,7 +29,7 @@ add_basedir_to_filelist() {
 FILES=`add_basedir_to_filelist ../../utils net.c net_ads.c net_ads_gpo.c \
        net_afs.c net_cache.c net_conf.c net_dom.c net_eventlog.c net_file.c \
        net_group.c net_groupmap.c net_help.c net_help_common.c net_idmap.c \
-       net_join.c net_lookup.c net_lua.c net_rap.c net_registry.c \
+       net_join.c net_lookup.c net_rap.c net_registry.c \
        net_registry_util.c net_rpc.c net_rpc_audit.c net_rpc_join.c \
        net_rpc_printer.c net_rpc_registry.c net_rpc_rights.c net_rpc_samsync.c \
        net_rpc_service.c net_rpc_sh_acct.c net_rpc_shell.c net_sam.c \