Update ejabberd.pot

rebar.config

@@ -25,7 +25,7 @@
         {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.22"}}},
         {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.11"}}},
         {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.30"}}},
-        {xmpp, ".*", {git, "https://github.com/processone/xmpp", "0259a54"}},
+        {xmpp, ".*", {git, "https://github.com/processone/xmpp", "5df8f4b"}},
         {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.14"}}},
         {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},
         {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.3"}}},

src/gen_iq_handler.erl

@@ -39,6 +39,7 @@
 
 -include("logger.hrl").
 -include("xmpp.hrl").
+-include("translate.hrl").
 
 -type component() :: ejabberd_sm | ejabberd_local.
 
@@ -87,8 +88,8 @@ handle(Component,
 handle(_, #iq{type = T, lang = Lang, sub_els = SubEls} = Packet)
   when T == get; T == set ->
     Txt = case SubEls of
-	      [] -> <<"No child elements found">>;
-	      _ -> <<"Too many child elements">>
+	      [] -> ?T("No child elements found");
+	      _ -> ?T("Too many child elements")
 	  end,
     Err = xmpp:err_bad_request(Txt, Lang),
     ejabberd_router:route_error(Packet, Err);

src/mod_configure.erl

@@ -1091,7 +1091,7 @@ get_form(Host, [<<"config">>, <<"acls">>], Lang) ->
 	    type = form,
 	    fields = [?HFIELD(),
 		      #xdata_field{type = 'text-multi',
-				   label = ?T(Lang, <<"Access control lists">>),
+				   label = ?T(Lang, <<"Access Control Lists">>),
 				   var = <<"acls">>,
 				   values = ACLs}]}};
 get_form(Host, [<<"config">>, <<"access">>], Lang) ->
@@ -1109,7 +1109,7 @@ get_form(Host, [<<"config">>, <<"access">>], Lang) ->
 	    type = form,
 	    fields = [?HFIELD(),
 		      #xdata_field{type = 'text-multi',
-				   label = ?T(Lang, <<"Access rules">>),
+				   label = ?T(Lang, <<"Access Rules">>),
 				   var = <<"access">>,
 				   values = Accs}]}};
 get_form(_Host, ?NS_ADMINL(<<"add-user">>), Lang) ->

tools/extract-tr.sh

@@ -2,21 +2,26 @@
 %% -*- erlang -*-
 %%! -pa ebin
 
-main([Dir]) ->
+main(Dirs) ->
     Txts =
-	filelib:fold_files(
-	  Dir, ".+\.beam\$", false,
-	  fun(BeamFile, Res) ->
-		  Mod = mod(BeamFile),
-		  ErlFile = filename:join("src", Mod ++ ".erl"),
-		  case get_forms(BeamFile, ErlFile) of
-		      {ok, BeamForms, ErlForms} ->
-			  process_forms(BeamForms, Mod, application) ++
-			      process_forms(ErlForms, Mod, macro) ++ Res;
-		      _Err ->
-			  Res
-		  end
-	  end, []),
+	lists:foldl(
+	  fun(Dir, Acc) ->
+		  EbinDir = filename:join(Dir, "ebin"),
+		  SrcDir = filename:join(Dir, "src"),
+		  filelib:fold_files(
+		    EbinDir, ".+\.beam\$", false,
+		    fun(BeamFile, Res) ->
+			    Mod = mod(BeamFile),
+			    ErlFile = filename:join(SrcDir, Mod ++ ".erl"),
+			    case get_forms(BeamFile, ErlFile) of
+				{ok, BeamForms, ErlForms} ->
+				    process_forms(BeamForms, Mod, application) ++
+					process_forms(ErlForms, Mod, macro) ++ Res;
+				_Err ->
+				    Res
+			    end
+		    end, Acc)
+	  end, [], Dirs),
     Dict = lists:foldl(
 	     fun({B, Meta}, Acc) ->
 		     dict:update(
@@ -137,6 +142,7 @@ analyze_app(Form, Mod) ->
 		  {xmpp, "err_" ++ _, 2, [T|_]} -> T;
 		  {xmpp, "serr_" ++ _, 2, [T|_]} -> T;
 		  {xmpp, "mk_text", 2, [T|_]} -> T;
+		  {xmpp_tr, "tr", 2, [_,T|_]} -> T;
 		  {translate, "translate", 2, [_,T|_]} -> T
 	      end,
 	Pos = erl_syntax:get_pos(Txt),