#
# patch "ChangeLog"
#  from [ae2d98f6da60ef8b4edc783a55c8adc393dd5576]
#    to [00ebdfe33bf3f9ed9f32f365792c519329a91470]
#
# patch "std_hooks.lua"
#  from [1bfbfb61d9ed33ab2cc2be5af65ac11f5bd28f07]
#    to [f7edfb3f0063bd68d3a141693ec1141e9ff8266f]
#
========================================================================
--- ChangeLog	ae2d98f6da60ef8b4edc783a55c8adc393dd5576
+++ ChangeLog	00ebdfe33bf3f9ed9f32f365792c519329a91470
@@ -1,3 +1,11 @@
+2005-09-23  Benoît Dejean  <address@hidden>
+
+	* std_hooks.lua: More i18n strings.
+	
+	I don't know how to handle lua
+	"multiline" ..
+	"strings" because gettext doesn't join them.
+
 2005-09-22  Benoît Dejean  <address@hidden>

 	* sanity.{cc,hh}: Uninlined F() and FP().
========================================================================
--- std_hooks.lua	1bfbfb61d9ed33ab2cc2be5af65ac11f5bd28f07
+++ std_hooks.lua	f7edfb3f0063bd68d3a141693ec1141e9ff8266f
@@ -25,7 +25,7 @@
 -- (e.g. on OS X)
 function execute_confirm(path, ...)
    execute(path, unpack(arg))
-   print("Press enter when the subprocess has completed")
+   print(gettext("Press enter when the subprocess has completed"))
    io.read()
    return ret
 end
@@ -526,7 +526,7 @@

       if cmd ~=nil
       then
-         io.write (string.format("executing external 2-way merge command\n"))
+         io.write (string.format(gettext("executing external 2-way merge command\n")))
          cmd ()
          if tbl.meld_exists
          then
@@ -634,7 +634,7 @@
       local cmd =   get_preferred_merge3_command (tbl)
       if cmd ~=nil
       then
-         io.write (string.format("executing external 3-way merge command\n"))
+         io.write (string.format(gettext("executing external 3-way merge command\n")))
          cmd ()
          if tbl.meld_exists
          then
@@ -771,3 +771,4 @@
    os.remove (old_file);
    os.remove (new_file);
 end
+