join adjacent translatable strings

Alexander Smishlajev · Alexander Smishlajev · commit 7731bdef9ffc · 2004-05-18T19:26:32.000Z
diff --git a/roundup/scripts/roundup_mailgw.py b/roundup/scripts/roundup_mailgw.py
@@ -14,7 +14,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 #
-# $Id: roundup_mailgw.py,v 1.16 2004-05-12 17:50:58 a1s Exp $
+# $Id: roundup_mailgw.py,v 1.17 2004-05-18 19:26:32 a1s Exp $
 
 """Command-line script stub that calls the roundup.mailgw.
 """
@@ -32,17 +32,17 @@
 def usage(args, message=None):
     if message is not None:
         print message
-    print _('Usage: %(program)s [-v] [[-C class] -S field=value]* <instance '
-        'home> [method]')%{'program': args[0]}
-    print _('''
+    print _(
+"""Usage: %(program)s [-v] [[-C class] -S field=value]* <instance home> [method]
+
 Options:
  -v: print version and exit
  -C / -S: see below
 
 The roundup mail gateway may be called in one of four ways:
  . with an instance home as the only argument,
- . with both an instance home and a mail spool file, or
- . with both an instance home and a POP/APOP server account.
+ . with both an instance home and a mail spool file,
+ . with both an instance home and a POP/APOP server account, or
  . with both an instance home and a IMAP/IMAPS server account.
 
 It also supports optional -C and -S arguments that allows you to set a
@@ -94,7 +94,7 @@ def usage(args, message=None):
  This supports the same notation as IMAP.
     imaps username:password@server [mailbox]
 
-''')
+""")%{'program': args[0]}
     return 1
 
 def main(argv):
diff --git a/roundup/scripts/roundup_server.py b/roundup/scripts/roundup_server.py
@@ -17,7 +17,7 @@
 
 """Command-line script that runs a server over roundup.cgi.client.
 
-$Id: roundup_server.py,v 1.49 2004-05-14 20:02:44 a1s Exp $
+$Id: roundup_server.py,v 1.50 2004-05-18 19:25:24 a1s Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -127,8 +127,8 @@ def index(self):
         self.send_header('Content-Type', 'text/html')
         self.end_headers()
         w = self.wfile.write
-        w(_('<html><head><title>Roundup trackers index</title></head>\n'))
-        w(_('<body><h1>Roundup trackers index</h1><ol>\n'))
+        w(_('<html><head><title>Roundup trackers index</title></head>\n'
+            '<body><h1>Roundup trackers index</h1><ol>\n'))
         keys = self.TRACKER_HOMES.keys()
         keys.sort()
         for tracker in keys:
@@ -343,7 +343,8 @@ def get_request(self):
 
 def usage(message=''):
     if RoundupService:
-        win = ''' -c: Windows Service options.  If you want to run the server as a Windows
+        win = \
+""''' -c: Windows Service options.  If you want to run the server as a Windows
      Service, you must configure the rest of the options by changing the
      constants of this program.  You will at least configure one tracker
      in the TRACKER_HOMES variable.  This option is mutually exclusive
