Merge lp:~kgoetz/merge-o-matic/mom-misc into lp:merge-o-matic

[KarlGoetz]

[KarlGoetz (kgoetz)]

Just a few typos and a mode change on a file. I split them into a separate branch because I wasn't sure if they were correct.

[lp:~kgoetz/merge-o-matic/mom-misc]

174. By KarlGoetz on 2010-03-03

Missing space means 'the like' is printed as 'thelike'

[Delyan Raychev (delqn)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 review approve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkuydVgACgkQ476ochDlJfTpTgCgn7Sr0suZ6/x/pvrSQD+Mww2e
5hMAoKg5CxJ7lnTpYm/9X9W0dpVTrXxM
=CmBC
-----END PGP SIGNATURE-----

review: Approve

[Delyan Raychev (delqn)]

Thank you Karl for the fixes!

review: Approve

[Loïc Minier (lool)]

I didn't merge the deb/version.py change since I do prefer the variable name in the docstring

[KarlGoetz (kgoetz)]

On Mon, 17 May 2010 12:52:25 -0000
Loïc Minier <email address hidden> wrote:

> I didn't merge the deb/version.py change since I do prefer the
> variable name in the docstring

no probs, thanks for the merge.
kk

--
Karl Goetz, (Kamping_Kaiser / VK5FOSS)
Debian contributor / gNewSense Maintainer
http://www.kgoetz.id.au
No, I won't join your social networking group

=== modified file 'addcomment.py'
--- addcomment.py	2009-03-13 12:49:35 +0000
+++ addcomment.py	2010-03-03 07:35:29 +0000
@@ -9,5 +9,5 @@
     else:
         req.write("Comment added.")
 else:
-    req.write("I need at least two parameters: package and comment. component is optional.")
+    req.write("I need at least two parameters: package and comment. Component is optional.")
 %>
 
=== modified file 'deb/version.py'
--- deb/version.py	2008-01-10 13:19:44 +0000
+++ deb/version.py	2010-03-03 07:35:29 +0000
@@ -127,7 +127,7 @@
 
 
 def strcut(str, idx, accept):
-    """Cut characters from str that are entirely in accept."""
+    """Cut characters from string that are entirely in accept."""
     ret = ""
     while idx < len(str) and str[idx] in accept:
         ret += str[idx]
 
=== modified file 'merge-status.py'
--- merge-status.py	2009-03-02 15:33:48 +0000
+++ merge-status.py	2010-03-03 07:35:29 +0000
@@ -224,7 +224,7 @@
                          "have your name and a list of the outstanding "
                          "Ubuntu changes.</li>")
         print >>status, ("<li>Try and keep the diff small, this may involve "
-                         "manually tweaking <tt>po</tt> files and the"
+                         "manually tweaking <tt>po</tt> files and the "
                          "like.</li>")
         print >>status, "</ul>"
 
 
=== modified file 'momlib.py' (properties changed: +x to -x)