code audit showed wrong # of params;2 params is OK

the calls are done with 2 params , so we need a dummy to satisfy
automatic code audit

Change-Id: I29e31e6e0d3a65745f37dde9988073597a900aba
Signed-off-by: sigoa <si@goat.si>

src/bitmessageqt/__init__.py

@@ -3874,7 +3874,11 @@ class MyForm(settingsmixin.SMainWindow):
         else:
             data = self.getCurrentMessageId()
             if data != False:
+<<<<<<< v0.6
                 message = "Error occurred: could not load message from disk.  THIS IS NOT A BM but an error message."  ## vvvv translate !  _translate 
+=======
+                message = "Error occurred: could not load message from disk." #### TODO: _translate( this ! happens frequently
+>>>>>>> bde2d1a translate: could not load message from disk
         messageTextedit.setCurrentFont(QtGui.QFont())
         messageTextedit.setTextColor(QtGui.QColor())
         messageTextedit.setContent(message)

src/pyelliptic/arithmetic.py

@@ -57,7 +57,7 @@ def base10_add(a,b):
   y = (m*(a[0]-x)-a[1]) % P
   return (x,y)
   
-def base10_double(a):
+def base10_double(a, var_unused):
   if a == None: return None
   m = ((3*a[0]*a[0]+A)*inv(2*a[1],P)) % P
   x = (m*m-2*a[0]) % P