The unified diff between revisions [5587f68e..] and [95cbeaa8..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'std_hooks.lua'

#
#
# patch "std_hooks.lua"
#  from [3aa6ea33c6bbb6e43c63dd4ff8ed353f3b9d4ce3]
#    to [f7edfb3f0063bd68d3a141693ec1141e9ff8266f]
#
============================================================
--- std_hooks.lua	3aa6ea33c6bbb6e43c63dd4ff8ed353f3b9d4ce3
+++ std_hooks.lua	f7edfb3f0063bd68d3a141693ec1141e9ff8266f
@@ -25,7 +25,7 @@ function execute_confirm(path, ...)
 -- (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
@@ -189,7 +189,7 @@ function edit_comment(basetext, user_log
    io.close(tmp)

    if (execute(exe, tname) ~= 0) then
-      io.write(string.format("Error running editor '%s' to enter log message\n",
+      io.write(string.format(gettext("Error running editor '%s' to enter log message\n"),
                              exe))
       os.remove(tname)
       return nil
@@ -526,7 +526,7 @@ function merge2 (left_path, right_path,

       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 @@ function merge3 (anc_path, left_path, ri
       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 @@ end
    os.remove (old_file);
    os.remove (new_file);
 end
+