Merge commit 'v25' into upstreamupstream

26 files changed, 1902 insertions, 1901 deletions

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..0cc4800
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1 @@
+Reinier Heeres <reinier@heeres.eu>
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..d511905
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff --git a/MANIFEST b/MANIFEST
index 7acdd8f..14bb63a 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,3 +1,6 @@
+AUTHORS
+COPYING
+NEWS
 activity/activity.info
 activity/calculate.svg
 calculate.py
@@ -7,6 +10,7 @@ layout.py
 mathlib.py
 plotlib.py
 rational.py
+setup.py
 svgimage.py
 toolbars.py
 icons/algebra-xpowy.svg
@@ -75,8 +79,6 @@ locale/bg/LC_MESSAGES/org.laptop.Calculate.mo
 locale/bg/activity.linfo
 locale/fr/LC_MESSAGES/org.laptop.Calculate.mo
 locale/fr/activity.linfo
-locale/pseudo/LC_MESSAGES/org.laptop.Calculate.mo
-locale/pseudo/activity.linfo
 locale/el/LC_MESSAGES/org.laptop.Calculate.mo
 locale/el/activity.linfo
 locale/ht/LC_MESSAGES/org.laptop.Calculate.mo
@@ -192,7 +194,6 @@ po/pap.po
 po/pis.po
 po/pl.po
 po/POTFILES.in
-po/pseudo.po
 po/ps.po
 po/pt_BR.po
 po/pt.po
diff --git a/NEWS b/NEWS
index ef4ff69..3ae9edb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+25
+
+* Spell 'license' correctly
+
+24
+
+* Division by 0 returns 'Undefined'
+* Make 'clear' and 'enter' translateable
+* Remove pseudo.po
+* Fix ne.po (newlines)
+* Fix translations that had taken mul_sym litterally
+* Add COPYING and AUTHORS
+* Update MANIFEST
+
 23
 
 * Add locale dir contents to MANIFEST
diff --git a/activity/activity.info b/activity/activity.info
index 9b1f4f4..a83fe9b 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,7 +1,10 @@
 [Activity]
 name = Calculate
-service_name = org.laptop.Calculate
-class = calculate.Calculate
+bundle_id = org.laptop.Calculate
 icon = calculate
-activity_version = 23
+exec = sugar-activity calculate.Calculate -s
+activity_version = 25
+host_version = 1
 show_launcher = yes
+license = GPLv2+
+update_url = http://dev.laptop.org/~rwh/calculate
diff --git a/eqnparser.py b/eqnparser.py
index 4b6c82e..a0cde8f 100644
--- a/eqnparser.py
+++ b/eqnparser.py
@@ -665,6 +665,8 @@ class EqnParser:
         return ret
 
     def div_operator(self, a, b):
+        if b == 0 or b == 0.0:
+            return _('Undefined')
         if isinstance(a, Rational) or isinstance(b, Rational):
             return a / b
         elif self.ml.is_int(a) and float(self.ml.abs(a)) < 1e12 and \
diff --git a/layout.py b/layout.py
index 91e5958..08825cd 100644
--- a/layout.py
+++ b/layout.py
@@ -41,7 +41,7 @@ class CalcLayout:
 # Deprecated -- functionality available through interface and labels
 #            [2, 3, 1, 'Ans', self.col_gray2, lambda w: self._parent.add_text('Ans')],
      
-            [3, 0, 3, 'clear', self.col_gray1, lambda w: self._parent.clear()],
+            [3, 0, 3, _('Clear'), self.col_gray1, lambda w: self._parent.clear()],
  
             [3, 1, 1, '+', self.col_gray3, lambda w: self._parent.add_text('+')],
             [4, 1, 1, '-', self.col_gray3, lambda w: self._parent.add_text('-')],
@@ -50,7 +50,7 @@ class CalcLayout:
             [4, 2, 1, div_sym, self.col_gray3, lambda w: self._parent.add_text(div_sym)],
             [5, 2, 1, ')', self.col_gray3, lambda w: self._parent.add_text(')')],
 
-            [3, 3, 3, 'enter', self.col_gray1, lambda w: self._parent.process()],
+            [3, 3, 3, _('Enter'), self.col_gray1, lambda w: self._parent.process()],
         ]
 
     def create_dialog(self):
diff --git a/mathlib.py b/mathlib.py
index c81c6f9..fadb516 100644
--- a/mathlib.py
+++ b/mathlib.py
@@ -72,12 +72,12 @@ class MathLib:
 
         # TRANS: multiplication symbol (default: '*')
         self.mul_sym = _('mul_sym')
-        if self.mul_sym == 'mul_sym':
+        if len(self.mul_sym) == 0 or len(self.mul_sym) > 3:
             self.mul_sym = '*'
 
         # TRANS: division symbol (default: '/')
         self.div_sym = _('div_sym')
-        if self.div_sym == 'div_sym':
+        if len(self.div_sym) == 0 or len(self.div_sym) > 3:
             self.div_sym = '/'
 
     def set_angle_type(self, type):
diff --git a/po/Calculate.pot b/po/Calculate.pot
index ac76c35..c5fdfcd 100644
--- a/po/Calculate.pot
+++ b/po/Calculate.pot
@@ -355,6 +355,14 @@ msgstr ""
 msgid "No help about '%s' available, use help(index) for the index"
 msgstr ""
 
+#: layout.py:44
+msgid "Clear"
+msgstr ""
+
+#: layout.py:53
+msgid "Enter"
+msgstr ""
+
 #: layout.py:60
 msgid "Edit"
 msgstr ""
diff --git a/po/de.po b/po/de.po
index 86a3f67..99c3ec2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-23 00:30-0400\n"
+"POT-Creation-Date: 2008-08-20 19:45+0530\n"
 "PO-Revision-Date: 2008-07-01 17:35-0400\n"
 "Last-Translator: Markus Schlager <m.slg@gmx.de>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,121 +20,6 @@ msgstr ""
 msgid "Calculate"
 msgstr "Rechnen"
 
-#: calculate.py:80
-#, python-format
-msgid "Equation.parse() string invalid (%s)"
-msgstr "Equation.parse() Zeichenkette ungültig (%s)"
-
-#: calculate.py:210
-msgid "Available functions:"
-msgstr "Verfügbare Funktionen:"
-
-#: calculate.py:504
-#, python-format
-msgid "Writing to journal (%s)"
-msgstr "Schreibe ins Journal (%s)"
-
-#: calculate.py:788
-msgid "button_pressed(): invalid type"
-msgstr "button_pressed(): ungültiger Typ"
-
-#: eqnparser.py:33
-msgid "Parse error"
-msgstr "Verarbeitungsfehler"
-
-#: eqnparser.py:58
-#, python-format
-msgid "level: %d, ofs %d"
-msgstr "Ebene: %d, von %d"
-
-#: eqnparser.py:117
-#, python-format
-msgid "Error at %d"
-msgstr "Fehler bei %d"
-
-#: eqnparser.py:249 eqnparserhelp.py:128
-msgid "Use help(test) for help about 'test', or help(index) for the index"
-msgstr ""
-"Verwende Hilfe(Test) für Hilfe über 'Test' oder Hilfe(Index) für den Index"
-
-#: eqnparser.py:353 eqnparser.py:354
-#, python-format
-msgid "Function '%s' not defined"
-msgstr "Funktion '%s' nicht definiert"
-
-#: eqnparser.py:359
-#, python-format
-msgid "Invalid number of arguments (%d instead of %d)"
-msgstr "Ungültige Anzahl von Argumenten (%d anstatt von %d)"
-
-#: eqnparser.py:360
-#, python-format
-msgid "function takes %d args"
-msgstr "Funktion nimmt %d Argumente"
-
-#: eqnparser.py:370 eqnparser.py:371
-#, python-format
-msgid "Unable to parse argument %d: '%s'"
-msgstr "Nicht bestimmbares Argument %d: '%s'"
-
-#: eqnparser.py:380
-#, python-format
-msgid "Function error: %s"
-msgstr "Funktionsfehler: %s"
-
-#: eqnparser.py:481
-#, python-format
-msgid "Variable '%s' not defined"
-msgstr "Variable '%s' nicht definiert"
-
-#: eqnparser.py:504
-msgid "Left parenthesis unexpected"
-msgstr "Linke Klammer unerwartet"
-
-#: eqnparser.py:516
-msgid "Parse error (right parenthesis)"
-msgstr "Bestimmungsfehler (Rechte Klammer)"
-
-#: eqnparser.py:517 eqnparser.py:528 eqnparser.py:535 eqnparser.py:610
-msgid "Right parenthesis unexpected"
-msgstr "Rechte Klammer unerwartet"
-
-#: eqnparser.py:527
-msgid "Parse error (right parenthesis, no left_val)"
-msgstr "Bestimmungsfehler (Rechte Klammer, kein linker Wert)"
-
-#: eqnparser.py:534
-msgid "Parse error (right parenthesis, no level to close)"
-msgstr "Verarbeitungsfehler (Rechte Klammer, kein Möglichkeit zum schließen)"
-
-#: eqnparser.py:541 eqnparser.py:542
-msgid "Number not expected"
-msgstr "Unerwartete Zahl"
-
-#: eqnparser.py:550
-msgid "Operator not expected"
-msgstr "Unerwarteter Operator"
-
-#: eqnparser.py:566
-msgid "Parse error: number or variable expected"
-msgstr "Verarbeitungsfehler: Zahl oder Variable erwartet"
-
-#: eqnparser.py:567
-msgid "Number or variable expected"
-msgstr "Zahl oder Variable erwartet"
-
-#: eqnparser.py:596
-msgid "Invalid operator"
-msgstr "Ungültiger Operator"
-
-#: eqnparser.py:603
-msgid "Operator expected"
-msgstr "Operator erwartet"
-
-#: eqnparser.py:616
-msgid "_parse(): returning None"
-msgstr "_parse(): kein Rückgabewert"
-
 # TRANS: It is possible to translate commands. However, I would highly
 # recommend NOT doing so for mathematical functions like cos(). help(),
 # functions() etc should be translated.
@@ -380,6 +265,11 @@ msgstr ""
 "'Falsch' ist) oder wenn y 'Wahr' ist (und x 'Falsch' ist ). Andernfalls wird "
 "'Falsch' zurückgegeben."
 
+#: eqnparserhelp.py:128 eqnparser.py:249
+msgid "Use help(test) for help about 'test', or help(index) for the index"
+msgstr ""
+"Verwende Hilfe(Test) für Hilfe über 'Test' oder Hilfe(Index) für den Index"
+
 #. TRANS: help(index), both 'index' and the translation  will work
 #: eqnparserhelp.py:131
 msgid "index"
@@ -396,6 +286,98 @@ msgstr ""
 "Keine Hilfe bezüglich '%s' verfügbar, verwende help(index) um Übersicht "
 "anzuzeigen"
 
+#: eqnparser.py:33
+msgid "Parse error"
+msgstr "Verarbeitungsfehler"
+
+#: eqnparser.py:58
+#, python-format
+msgid "level: %d, ofs %d"
+msgstr "Ebene: %d, von %d"
+
+#: eqnparser.py:117
+#, python-format
+msgid "Error at %d"
+msgstr "Fehler bei %d"
+
+#: eqnparser.py:353 eqnparser.py:354
+#, python-format
+msgid "Function '%s' not defined"
+msgstr "Funktion '%s' nicht definiert"
+
+#: eqnparser.py:359
+#, python-format
+msgid "Invalid number of arguments (%d instead of %d)"
+msgstr "Ungültige Anzahl von Argumenten (%d anstatt von %d)"
+
+#: eqnparser.py:360
+#, python-format
+msgid "function takes %d args"
+msgstr "Funktion nimmt %d Argumente"
+
+#: eqnparser.py:370 eqnparser.py:371
+#, python-format
+msgid "Unable to parse argument %d: '%s'"
+msgstr "Nicht bestimmbares Argument %d: '%s'"
+
+#: eqnparser.py:380
+#, python-format
+msgid "Function error: %s"
+msgstr "Funktionsfehler: %s"
+
+#: eqnparser.py:481
+#, python-format
+msgid "Variable '%s' not defined"
+msgstr "Variable '%s' nicht definiert"
+
+#: eqnparser.py:504
+msgid "Left parenthesis unexpected"
+msgstr "Linke Klammer unerwartet"
+
+#: eqnparser.py:516
+msgid "Parse error (right parenthesis)"
+msgstr "Bestimmungsfehler (Rechte Klammer)"
+
+#: eqnparser.py:517 eqnparser.py:528 eqnparser.py:535 eqnparser.py:610
+msgid "Right parenthesis unexpected"
+msgstr "Rechte Klammer unerwartet"
+
+#: eqnparser.py:527
+msgid "Parse error (right parenthesis, no left_val)"
+msgstr "Bestimmungsfehler (Rechte Klammer, kein linker Wert)"
+
+#: eqnparser.py:534
+msgid "Parse error (right parenthesis, no level to close)"
+msgstr "Verarbeitungsfehler (Rechte Klammer, kein Möglichkeit zum schließen)"
+
+#: eqnparser.py:541 eqnparser.py:542
+msgid "Number not expected"
+msgstr "Unerwartete Zahl"
+
+#: eqnparser.py:550
+msgid "Operator not expected"
+msgstr "Unerwarteter Operator"
+
+#: eqnparser.py:566
+msgid "Parse error: number or variable expected"
+msgstr "Verarbeitungsfehler: Zahl oder Variable erwartet"
+
+#: eqnparser.py:567
+msgid "Number or variable expected"
+msgstr "Zahl oder Variable erwartet"
+
+#: eqnparser.py:596
+msgid "Invalid operator"
+msgstr "Ungültiger Operator"
+
+#: eqnparser.py:603
+msgid "Operator expected"
+msgstr "Operator erwartet"
+
+#: eqnparser.py:616
+msgid "_parse(): returning None"
+msgstr "_parse(): kein Rückgabewert"
+
 #: layout.py:60
 msgid "Edit"
 msgstr "Bearbeiten"
@@ -440,24 +422,6 @@ msgstr "Verlauf anzeigen"
 msgid "Show variables"
 msgstr "Variablen anzeigen"
 
-#. TRANS: multiplication symbol (default: '*')
-#: mathlib.py:74
-msgid "mul_sym"
-msgstr "* ist das Zeichen für multiplizieren."
-
-#. TRANS: division symbol (default: '/')
-#: mathlib.py:79
-msgid "div_sym"
-msgstr "/ ist das Zeichen für die Division."
-
-#: mathlib.py:134
-msgid "Undefined"
-msgstr "Nicht definiert"
-
-#: mathlib.py:144
-msgid "Error: unsupported type"
-msgstr "Fehler: Typ nicht unterstützt"
-
 #: toolbars.py:53
 msgid "Help"
 msgstr "Hilfe"
@@ -574,6 +538,42 @@ msgstr "Radiant"
 msgid "Degrees / radians"
 msgstr "Grad / Radiant"
 
+#. TRANS: multiplication symbol (default: '*')
+#: mathlib.py:74
+msgid "mul_sym"
+msgstr "*"
+
+#. TRANS: division symbol (default: '/')
+#: mathlib.py:79
+msgid "div_sym"
+msgstr "/"
+
+#: mathlib.py:134
+msgid "Undefined"
+msgstr "Nicht definiert"
+
+#: mathlib.py:144
+msgid "Error: unsupported type"
+msgstr "Fehler: Typ nicht unterstützt"
+
+#: calculate.py:80
+#, python-format
+msgid "Equation.parse() string invalid (%s)"
+msgstr "Equation.parse() Zeichenkette ungültig (%s)"
+
+#: calculate.py:210
+msgid "Available functions:"
+msgstr "Verfügbare Funktionen:"
+
+#: calculate.py:504
+#, python-format
+msgid "Writing to journal (%s)"
+msgstr "Schreibe ins Journal (%s)"
+
+#: calculate.py:788
+msgid "button_pressed(): invalid type"
+msgstr "button_pressed(): ungültiger Typ"
+
 #, python-format
 #~ msgid "Reading from journal (%s)"
 #~ msgstr "Lese vom Journal (%s)"
diff --git a/po/el.po b/po/el.po
index c4adfac..571168f 100644
--- a/po/el.po
+++ b/po/el.po
@@ -452,13 +452,13 @@ msgstr "Εμφάνιση μεταβλητών"
 #. TRANS: multiplication symbol (default: '*')
 #: mathlib.py:74
 msgid "mul_sym"
-msgstr "συμβ_πολλ/σμού"
+msgstr "*"
 
 # Σύμβολο διαίρεσης (προκαθορισμένο: '/')
 #. TRANS: division symbol (default: '/')
 #: mathlib.py:79
 msgid "div_sym"
-msgstr "συμβ_διαίρεσης"
+msgstr "/"
 
 #: mathlib.py:134
 msgid "Undefined"
diff --git a/po/fa_AF.po b/po/fa_AF.po
index cea675a..c77f815 100644
--- a/po/fa_AF.po
+++ b/po/fa_AF.po
@@ -295,12 +295,12 @@ msgstr "کسر_sep"
 #. TRANS: multiplication symbol (default: '*')
 #: mathlib.py:74
 msgid "mul_sym"
-msgstr "نماد ضرب"
+msgstr "*"
 
 #. TRANS: division symbol (default: '/')
 #: mathlib.py:79
 msgid "div_sym"
-msgstr "نماد تقسیم"
+msgstr "/"
 
 #: mathlib.py:132
 msgid "Undefined"
diff --git a/po/it.po b/po/it.po
index d40e429..9563d77 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-23 00:30-0400\n"
-"PO-Revision-Date: 2008-07-02 07:41-0400\n"
+"POT-Creation-Date: 2008-08-20 19:45+0530\n"
+"PO-Revision-Date: 2008-08-27 09:04-0400\n"
 "Last-Translator: Carlo Falciola <cfalciola@yahoo.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,122 +19,6 @@ msgstr ""
 msgid "Calculate"
 msgstr "Calcola"
 
-#: calculate.py:80
-#, python-format
-msgid "Equation.parse() string invalid (%s)"
-msgstr "Equation.parse() stringa non valida (%s)"
-
-#: calculate.py:210
-msgid "Available functions:"
-msgstr "Funzioni disponibili:"
-
-#: calculate.py:504
-#, python-format
-msgid "Writing to journal (%s)"
-msgstr "Scrittura nel diario (%s) "
-
-#: calculate.py:788
-msgid "button_pressed(): invalid type"
-msgstr "button_pressed(): tipo non valido"
-
-#: eqnparser.py:33
-msgid "Parse error"
-msgstr "Errore di compilazione"
-
-#: eqnparser.py:58
-#, python-format
-msgid "level: %d, ofs %d"
-msgstr "livello: %d, ofs %d"
-
-#: eqnparser.py:117
-#, python-format
-msgid "Error at %d"
-msgstr "Errore a %d"
-
-#: eqnparser.py:249 eqnparserhelp.py:128
-msgid "Use help(test) for help about 'test', or help(index) for the index"
-msgstr "Usa help(test) per aiuto su 'test', oppure help(index) per l'indice"
-
-#: eqnparser.py:353 eqnparser.py:354
-#, python-format
-msgid "Function '%s' not defined"
-msgstr "Funzione '%s' non definita"
-
-#: eqnparser.py:359
-#, python-format
-msgid "Invalid number of arguments (%d instead of %d)"
-msgstr "Errato numero di parametri (%d invece di %d)"
-
-#: eqnparser.py:360
-#, python-format
-msgid "function takes %d args"
-msgstr "la funzione vuole %d parametri"
-
-#: eqnparser.py:370 eqnparser.py:371
-#, python-format
-msgid "Unable to parse argument %d: '%s'"
-msgstr "Impossibile interpretare il %d parametro: '%s'"
-
-#: eqnparser.py:380
-#, python-format
-msgid "Function error: %s"
-msgstr "Errore della funzione: %s"
-
-#: eqnparser.py:481
-#, python-format
-msgid "Variable '%s' not defined"
-msgstr "La variabile '%s' indefinita"
-
-#: eqnparser.py:504
-msgid "Left parenthesis unexpected"
-msgstr "Parentesi aperta inattesa"
-
-#: eqnparser.py:516
-msgid "Parse error (right parenthesis)"
-msgstr "Errore di interpretazione (parentesi destra)"
-
-#: eqnparser.py:517 eqnparser.py:528 eqnparser.py:535 eqnparser.py:610
-msgid "Right parenthesis unexpected"
-msgstr "Parentesi chiusa inattesa"
-
-#: eqnparser.py:527
-msgid "Parse error (right parenthesis, no left_val)"
-msgstr "Errore di interpretazione (parentesi chiusa, left_val assente)"
-
-#: eqnparser.py:534
-msgid "Parse error (right parenthesis, no level to close)"
-msgstr ""
-"Errore di interpretazione (parentesi chiusa, lnon esiste un livello "
-"equivalente da chiudere)"
-
-#: eqnparser.py:541 eqnparser.py:542
-msgid "Number not expected"
-msgstr "Numero inatteso"
-
-#: eqnparser.py:550
-msgid "Operator not expected"
-msgstr "Operatore inatteso"
-
-#: eqnparser.py:566
-msgid "Parse error: number or variable expected"
-msgstr "Errore di scansione: atteso numero o variabile"
-
-#: eqnparser.py:567
-msgid "Number or variable expected"
-msgstr "Atteso numero o variabile"
-
-#: eqnparser.py:596
-msgid "Invalid operator"
-msgstr "Operatore non valido"
-
-#: eqnparser.py:603
-msgid "Operator expected"
-msgstr "Atteso operatore"
-
-#: eqnparser.py:616
-msgid "_parse(): returning None"
-msgstr "_parse(): ritorna None"
-
 #. TRANS: It is possible to translate commands. However, I would highly
 #. recommend NOT doing so for mathematical functions like cos(). help(),
 #. functions() etc should be translated.
@@ -229,7 +113,6 @@ msgid "functions"
 msgstr "funzioni"
 
 #: eqnparserhelp.py:69
-#, fuzzy
 msgid "functions(), return a list of all the functions that are defined"
 msgstr "funzioni(), ritorna una lista di tutte le funzioni che sono definite"
 
@@ -371,6 +254,10 @@ msgstr ""
 "le condizioni: o x è True (ed y è False) oppure y è True (ed x è False), "
 "altrimenti ritorna False"
 
+#: eqnparserhelp.py:128 eqnparser.py:249
+msgid "Use help(test) for help about 'test', or help(index) for the index"
+msgstr "Usa help(test) per aiuto su 'test', oppure help(index) per l'indice"
+
 #. TRANS: help(index), both 'index' and the translation  will work
 #: eqnparserhelp.py:131
 msgid "index"
@@ -387,6 +274,100 @@ msgstr ""
 "Non ci sono informazioni disponibili per '%s', utilizzare help(index) per "
 "l'indice"
 
+#: eqnparser.py:33
+msgid "Parse error"
+msgstr "Errore di compilazione"
+
+#: eqnparser.py:58
+#, python-format
+msgid "level: %d, ofs %d"
+msgstr "livello: %d, ofs %d"
+
+#: eqnparser.py:117
+#, python-format
+msgid "Error at %d"
+msgstr "Errore a %d"
+
+#: eqnparser.py:353 eqnparser.py:354
+#, python-format
+msgid "Function '%s' not defined"
+msgstr "Funzione '%s' non definita"
+
+#: eqnparser.py:359
+#, python-format
+msgid "Invalid number of arguments (%d instead of %d)"
+msgstr "Errato numero di parametri (%d invece di %d)"
+
+#: eqnparser.py:360
+#, python-format
+msgid "function takes %d args"
+msgstr "la funzione vuole %d parametri"
+
+#: eqnparser.py:370 eqnparser.py:371
+#, python-format
+msgid "Unable to parse argument %d: '%s'"
+msgstr "Impossibile interpretare il %d parametro: '%s'"
+
+#: eqnparser.py:380
+#, python-format
+msgid "Function error: %s"
+msgstr "Errore della funzione: %s"
+
+#: eqnparser.py:481
+#, python-format
+msgid "Variable '%s' not defined"
+msgstr "La variabile '%s' indefinita"
+
+#: eqnparser.py:504
+msgid "Left parenthesis unexpected"
+msgstr "Parentesi aperta inattesa"
+
+#: eqnparser.py:516
+msgid "Parse error (right parenthesis)"
+msgstr "Errore di interpretazione (parentesi destra)"
+
+#: eqnparser.py:517 eqnparser.py:528 eqnparser.py:535 eqnparser.py:610
+msgid "Right parenthesis unexpected"
+msgstr "Parentesi chiusa inattesa"
+
+#: eqnparser.py:527
+msgid "Parse error (right parenthesis, no left_val)"
+msgstr "Errore di interpretazione (parentesi chiusa, left_val assente)"
+
+#: eqnparser.py:534
+msgid "Parse error (right parenthesis, no level to close)"
+msgstr ""
+"Errore di interpretazione (parentesi chiusa, lnon esiste un livello "
+"equivalente da chiudere)"
+
+#: eqnparser.py:541 eqnparser.py:542
+msgid "Number not expected"
+msgstr "Numero inatteso"
+
+#: eqnparser.py:550
+msgid "Operator not expected"
+msgstr "Operatore inatteso"
+
+#: eqnparser.py:566
+msgid "Parse error: number or variable expected"
+msgstr "Errore di scansione: atteso numero o variabile"
+
+#: eqnparser.py:567
+msgid "Number or variable expected"
+msgstr "Atteso numero o variabile"
+
+#: eqnparser.py:596
+msgid "Invalid operator"
+msgstr "Operatore non valido"
+
+#: eqnparser.py:603
+msgid "Operator expected"
+msgstr "Atteso operatore"
+
+#: eqnparser.py:616
+msgid "_parse(): returning None"
+msgstr "_parse(): ritorna None"
+
 #: layout.py:60
 msgid "Edit"
 msgstr "Modifica"
@@ -431,26 +412,6 @@ msgstr "Mostra storico"
 msgid "Show variables"
 msgstr "Mostra variabili"
 
-#. TRANS: multiplication symbol (default: '*')
-#: mathlib.py:74
-#, fuzzy
-msgid "mul_sym"
-msgstr "mul_sym"
-
-#. TRANS: division symbol (default: '/')
-#: mathlib.py:79
-#, fuzzy
-msgid "div_sym"
-msgstr "div_sym"
-
-#: mathlib.py:134
-msgid "Undefined"
-msgstr "Indefinito"
-
-#: mathlib.py:144
-msgid "Error: unsupported type"
-msgstr "Errore: tipo non supportato"
-
 #: toolbars.py:53
 msgid "Help"
 msgstr "Aiuto"
@@ -566,3 +527,39 @@ msgstr "Radianti"
 #: toolbars.py:252
 msgid "Degrees / radians"
 msgstr "Gradi / radianti"
+
+#. TRANS: multiplication symbol (default: '*')
+#: mathlib.py:74
+msgid "mul_sym"
+msgstr "*"
+
+#. TRANS: division symbol (default: '/')
+#: mathlib.py:79
+msgid "div_sym"
+msgstr "/"
+
+#: mathlib.py:134
+msgid "Undefined"
+msgstr "Indefinito"
+
+#: mathlib.py:144
+msgid "Error: unsupported type"
+msgstr "Errore: tipo non supportato"
+
+#: calculate.py:80
+#, python-format
+msgid "Equation.parse() string invalid (%s)"
+msgstr "Equation.parse() stringa non valida (%s)"
+
+#: calculate.py:210
+msgid "Available functions:"
+msgstr "Funzioni disponibili:"
+
+#: calculate.py:504
+#, python-format
+msgid "Writing to journal (%s)"
+msgstr "Scrittura nel diario (%s) "
+
+#: calculate.py:788
+msgid "button_pressed(): invalid type"
+msgstr "button_pressed(): tipo non valido"
diff --git a/po/ja.po b/po/ja.po
index 510f9da..5d6b25d 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,748 +6,664 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-26 11:55-0500\n"
-"PO-Revision-Date: 2008-01-04 19:04+0000\n"
-"Last-Translator: Taizo Shiozaki <taizo@shiozaki.com>\n"
+"POT-Creation-Date: 2008-08-20 19:45+0530\n"
+"PO-Revision-Date: 2008-08-22 11:43-0400\n"
+"Last-Translator: korakurider <korakurider@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.0.2\n"
+"X-Generator: Pootle 1.1.0rc2\n"
 
 #: activity/activity.info:2
-#, fuzzy
 msgid "Calculate"
-msgstr "電卓"
+msgstr "Calculate"
 
-#: calculate.py:80
-#, python-format
-#, fuzzy
-msgid "Equation.parse() string invalid (%s)"
-msgstr "Equation.parse() の文字列が無効です(%s)"
+#. TRANS: It is possible to translate commands. However, I would highly
+#. recommend NOT doing so for mathematical functions like cos(). help(),
+#. functions() etc should be translated.
+#: eqnparserhelp.py:39
+msgid "acos"
+msgstr "acos"
 
-#: calculate.py:210
-#, fuzzy
-msgid "Available functions:"
-msgstr "利用可能な関数："
+#: eqnparserhelp.py:40
+msgid ""
+"acos(x), return the arc cosine of x. This is the angle for which the cosine "
+"is x. Defined for -1 <= x < 1"
+msgstr "関数acos(x)はxに対するアークコサインを返します。これは-1<= x <1の範囲にあるxを与えるコサインの角度となります。"
 
-#: calculate.py:504
-#, python-format
-#, fuzzy
-msgid "Writing to journal (%s)"
-msgstr "ジャーナルへ保存中(%s)"
+#: eqnparserhelp.py:43
+msgid "and"
+msgstr "and"
 
-#: calculate.py:522
-#, python-format
-#, fuzzy
-msgid "Reading from journal (%s)"
-msgstr "ジャーナルから読み込み中(%s)"
+#: eqnparserhelp.py:44
+msgid ""
+"and(x, y), logical and. Returns True if x and y are True, else returns False"
+msgstr "関数and(x,y)は論理積です。これはxとyが共に真のとき真(true)を返します。それ以外の場合は偽(false)を返します。"
 
-#: calculate.py:528
-#, fuzzy
-msgid "Unable to determine version"
-msgstr "バージョンが識別できません"
+#: eqnparserhelp.py:46
+msgid "asin"
+msgstr "asin"
 
-#: calculate.py:533
-#, python-format
-#, fuzzy
-msgid "Reading journal entry (version %s)"
-msgstr "ジャーナルのエントリを読み込み中(version %s)"
+#: eqnparserhelp.py:47
+msgid ""
+"asin(x), return the arc sine of x. This is the angle for which the sine is "
+"x. Defined for -1 <= x <= 1"
+msgstr "関数asin(x)はxに対するアークサインを返します。これは-1<= x <1で定義されるxに対するサインの角度です。"
 
-#: calculate.py:538
-#, python-format
-#, fuzzy
-msgid "State line invalid (%s)"
-msgstr "入力行の内容が不適切です（%s）"
+#: eqnparserhelp.py:50
+msgid "atan"
+msgstr "atan"
+
+#: eqnparserhelp.py:51
+msgid ""
+"atan(x), return the arc tangent of x. This is the angle for which the "
+"tangent is x. Defined for all x"
+msgstr "関数atan(x)はxに対するアークタンジェントを返します。これは全てのxに対し、タンジェントを与える角度を返します。"
+
+#: eqnparserhelp.py:54
+msgid "cos"
+msgstr "cos"
+
+#: eqnparserhelp.py:55
+msgid ""
+"cos(x), return the cosine of x. This is the x-coordinate on the unit circle "
+"at the angle x"
+msgstr "関数cos(x)はxのコサインを返します。これは単位円における角度xの時のx座標の値です。"
+
+#: eqnparserhelp.py:58
+msgid "cosh"
+msgstr "cosh"
+
+#: eqnparserhelp.py:59
+msgid ""
+"cosh(x), return the hyperbolic cosine of x. Given by (exp(x) + exp(-x)) / 2"
+msgstr "関数cosh(x)はxに対するハイパーボリックコサインを返します。この値は(exp(x)+exp(-x))/2によって与えられます。"
+
+#: eqnparserhelp.py:61
+msgid "exp"
+msgstr "exp"
+
+#: eqnparserhelp.py:62
+msgid "exp(x), return the natural exponent of x. Given by e^x"
+msgstr "関数exp(x)は,xに対する自然に対する指数関数の値を返します。この値はe^xで与えられます。"
+
+#: eqnparserhelp.py:64
+msgid "fac"
+msgstr "fac"
+
+#: eqnparserhelp.py:65
+msgid "fac(x), return the factorial of x. Given by x * (x - 1) * (x - 2) * ..."
+msgstr "関数fac(x)はxの階乗を返します。これはx*(x-1)*(x-2)*...で与えられます。"
+
+#. TRANS: This command is descriptive, so can be translated
+#: eqnparserhelp.py:68
+msgid "functions"
+msgstr "functions"
+
+#: eqnparserhelp.py:69
+msgid "functions(), return a list of all the functions that are defined"
+msgstr "関数functions()は定義されている全ての関数のリストを返します。"
+
+#: eqnparserhelp.py:71
+msgid "ln"
+msgstr "ln"
+
+#: eqnparserhelp.py:72
+msgid ""
+"ln(x), return the natural logarithm of x. This is the value for which the "
+"exponent exp() equals x. Defined for x >= 0."
+msgstr "関数ln(x)はxに対する自然対数を返します。これはx >=0 であるxに対し、exp()がxとなるような値です。"
+
+#. TRANS: This command is descriptive, so can be translated
+#: eqnparserhelp.py:76
+msgid "operators"
+msgstr "operators"
+
+#: eqnparserhelp.py:77
+msgid "operators(), return a list of the operators that are defined"
+msgstr "関数operators()は、定義済み演算子のリストを返します。"
+
+#: eqnparserhelp.py:79
+msgid "or"
+msgstr "or"
+
+#: eqnparserhelp.py:80
+msgid ""
+"or(x, y), logical or. Returns True if x and/or y are True, else return False"
+msgstr "関数or(x,y)は論理和orです。これはxと／またはyが真のとき真(true)を返し、それ以外は偽(false)を返す関数です。"
+
+#: eqnparserhelp.py:82
+msgid "plot"
+msgstr "plot"
+
+#: eqnparserhelp.py:83
+msgid ""
+"plot(eqn, var=-a..b), plot the equation 'eqn' with the variable 'var' in the "
+"range from a to b"
+msgstr "関数plot(eqn var=-a..b)は、等式'eqn'に対するaからbの範囲の変数'var'について関数を作画します。"
+
+#: eqnparserhelp.py:86
+msgid "sin"
+msgstr "sin"
 
-#: calculate.py:555
+#: eqnparserhelp.py:87
+msgid ""
+"sin(x), return the sine of x. This is the y-coordinate on the unit circle at "
+"the angle x"
+msgstr "関数sin(x)は、xのサインを返します。これは単位円上の角度xにおけるy座標の値となります。"
+
+#: eqnparserhelp.py:90
+msgid "sinh"
+msgstr "sinh"
+
+#: eqnparserhelp.py:91
+msgid ""
+"sinh(x), return the hyperbolic sine of x. Given by (exp(x) - exp(-x)) / 2"
+msgstr "関数sinh(x)はxに対するハイパーボリックサインを返します。これは(exp(x)-exp(-x))/2により与えられます。"
+
+#: eqnparserhelp.py:93
+msgid "sqrt"
+msgstr "sqrt"
+
+#: eqnparserhelp.py:94
+msgid ""
+"sqrt(x), return the square root of x. This is the value for which the square "
+"equals x. Defined for x >= 0."
+msgstr "関数sqrt(x)はxの平方根を与えます。これはx >=0であるようなxに対し、その二乗がxとなるような値です。"
+
+#: eqnparserhelp.py:97
+msgid "square"
+msgstr "二乗"
+
+#: eqnparserhelp.py:98
+msgid "square(x), return the square of x. Given by x * x"
+msgstr "関数square(x)は、xの二乗を返します。これはx*xで与えられます。"
+
+#: eqnparserhelp.py:101
+msgid "tan"
+msgstr "tan"
+
+#: eqnparserhelp.py:102
+msgid ""
+"tan(x), return the tangent of x. This is the slope of the line from the "
+"origin of the unit circle to the point on the unit circle defined by the "
+"angle x. Given by sin(x) / cos(x)"
+msgstr ""
+"関数tan(x)はxのタンジェントを返します。これは単位円において原点からの直線が角度xで単位円と交わるときの、直線の傾きを与えます。またこれはsin("
+"x)/cos(x)で与えられます。"
+
+#: eqnparserhelp.py:106
+msgid "tanh"
+msgstr "tanh"
+
+#: eqnparserhelp.py:107
+msgid "tanh(x), return the hyperbolic tangent of x. Given by sinh(x) / cosh(x)"
+msgstr "関数tanh(x)はハイパーボリックタンジェントを返します。これはsinh(x)/cosh(x)で与えられます。"
+
+#: eqnparserhelp.py:109
+msgid "test"
+msgstr "test"
+
+#: eqnparserhelp.py:110
+msgid "This is just a test topic, use help(index) for the index"
+msgstr "単にtestのトピックスです。索引はhelp(index)と入力してください。"
+
+#. TRANS: This command is descriptive, so can be translated
+#: eqnparserhelp.py:113
+msgid "variables"
+msgstr "variables"
+
+#: eqnparserhelp.py:114
+msgid "variables(), return a list of the variables that are currently defined"
+msgstr "関数variables()は現在定義されている変数群をリストで返します。"
+
+#: eqnparserhelp.py:116
+msgid "xor"
+msgstr "xor"
+
+#: eqnparserhelp.py:117
+msgid ""
+"xor(x, y), logical xor. Returns True if either x is True (and y is False) or "
+"y is True (and x is False), else returns False"
+msgstr ""
+"関数xor(x,y)は排他的論理和を返します。これはxが真でyが偽、もしくはxが偽でyが真の時のみ真(true)となり、それ以外のときは偽(false)"
+"となるような関数です。"
+
+#: eqnparserhelp.py:128 eqnparser.py:249
+msgid "Use help(test) for help about 'test', or help(index) for the index"
+msgstr "'test'についてのヘルプを見るにはhelp(test)と入力してください。索引を見るにはhelp(index)と入力します。"
+
+#. TRANS: help(index), both 'index' and the translation  will work
+#: eqnparserhelp.py:131
+msgid "index"
+msgstr "index"
+
+#: eqnparserhelp.py:132
+msgid "Topics"
+msgstr "トピックス"
+
+#: eqnparserhelp.py:143
 #, python-format
-#, fuzzy
-msgid "Unable to read journal entry, unknown version (%s)"
-msgstr "ジャーナル上のエントリが読み込めません。不明のバージョンです(%s)"
+msgid "No help about '%s' available, use help(index) for the index"
+msgstr "'%s' に関するヘルプ情報はありません。help(index)で索引を確認してください"
 
-#: calculate.py:788
-#, fuzzy
-msgid "button_pressed(): invalid type"
-msgstr "button_pressed(): 無効のタイプです"
+#: eqnparser.py:33
+msgid "Parse error"
+msgstr "文法チェックエラー"
 
 #: eqnparser.py:58
 #, python-format
-#, fuzzy
 msgid "level: %d, ofs %d"
-msgstr "レベル: %d、 ofs %d"
+msgstr "レベル: %d, ofs %d"
 
 #: eqnparser.py:117
 #, python-format
-#, fuzzy
 msgid "Error at %d"
-msgstr "%dでエラーがあります"
-
-#: eqnparser.py:235
-#, fuzzy
-msgid "help_var"
-msgstr "help_var"
+msgstr "%dにエラーがあります"
 
 #: eqnparser.py:353 eqnparser.py:354
 #, python-format
-#, fuzzy
 msgid "Function '%s' not defined"
-msgstr "関数'%s'が未定義です"
+msgstr "関数'%s'が定義されていません。"
 
 #: eqnparser.py:359
 #, python-format
-#, fuzzy
 msgid "Invalid number of arguments (%d instead of %d)"
-msgstr "引数の数が違います(正解は%dで間違いは%d）"
+msgstr "引数の数が違います(正しくは%dで、%dは間違いです。）"
 
 #: eqnparser.py:360
 #, python-format
-#, fuzzy
 msgid "function takes %d args"
-msgstr "この関数は%d個の引数まで対応します"
+msgstr "この関数は%d個の引数をとります。"
 
 #: eqnparser.py:370 eqnparser.py:371
 #, python-format
-#, fuzzy
 msgid "Unable to parse argument %d: '%s'"
-msgstr "%d引数がパースできません: '%s'"
+msgstr "%dに与えられた右の引数に問題があります。: '%s'"
 
 #: eqnparser.py:380
 #, python-format
-#, fuzzy
 msgid "Function error: %s"
-msgstr "関数エラー: %s"
+msgstr "関数のエラー: %s"
 
 #: eqnparser.py:481
 #, python-format
-#, fuzzy
 msgid "Variable '%s' not defined"
-msgstr "変数 '%s' が未定義です"
+msgstr "変数 '%s' が定義されていません。"
+
+#: eqnparser.py:504
+msgid "Left parenthesis unexpected"
+msgstr "余計な左カッコがあります。"
 
 #: eqnparser.py:516
-#, fuzzy
 msgid "Parse error (right parenthesis)"
-msgstr "パースエラー（右の丸括弧）"
+msgstr "文法チェックエラー（右カッコ）"
 
 #: eqnparser.py:517 eqnparser.py:528 eqnparser.py:535 eqnparser.py:610
-#, fuzzy
 msgid "Right parenthesis unexpected"
-msgstr "右の丸括弧に対応できません"
+msgstr "余計な右カッコがあります。"
 
 #: eqnparser.py:527
-#, fuzzy
 msgid "Parse error (right parenthesis, no left_val)"
-msgstr "パースエラー（右の丸括弧、left_valなし）"
+msgstr "文法チェックエラー（右カッコ、左辺値なし）"
+
+#: eqnparser.py:534
+msgid "Parse error (right parenthesis, no level to close)"
+msgstr "文法チェックエラー（右カッコ、あるいは閉じる対象のレベル無し）"
 
 #: eqnparser.py:541 eqnparser.py:542
-#, fuzzy
 msgid "Number not expected"
-msgstr "数値に対応できません"
+msgstr "数値が現れてはいけません。"
 
 #: eqnparser.py:550
-#, fuzzy
 msgid "Operator not expected"
-msgstr "演算子に対応できません"
+msgstr "演算子は指定できません。"
+
+#: eqnparser.py:566
+msgid "Parse error: number or variable expected"
+msgstr "文法エラー：数値もしくは変数を指定してください。"
+
+#: eqnparser.py:567
+msgid "Number or variable expected"
+msgstr "数値もしくは変数を指定してください。"
 
 #: eqnparser.py:596
-#, fuzzy
 msgid "Invalid operator"
 msgstr "無効な演算子です"
 
 #: eqnparser.py:603
-#, fuzzy
 msgid "Operator expected"
-msgstr "演算子が必要です"
+msgstr "演算子を指定してください。"
 
 #: eqnparser.py:616
-#, fuzzy
 msgid "_parse(): returning None"
 msgstr "_parse(): 返す値がありません"
 
-#: eqnparserhelp.py:37
-#, fuzzy
-msgid "help_acos"
-msgstr "help_acos"
-
-#: eqnparserhelp.py:38
-#, fuzzy
-msgid "help_and"
-msgstr "help_and"
-
-#: eqnparserhelp.py:39
-#, fuzzy
-msgid "help_asin"
-msgstr "help_asin"
-
-#: eqnparserhelp.py:40
-#, fuzzy
-msgid "help_atan"
-msgstr "help_atan"
-
-#: eqnparserhelp.py:41
-#, fuzzy
-msgid "help_cos"
-msgstr "help_cos"
-
-#: eqnparserhelp.py:42
-#, fuzzy
-msgid "help_cosh"
-msgstr "help_cosh"
-
-#: eqnparserhelp.py:43
-#, fuzzy
-msgid "help_exp"
-msgstr "help_exp"
-
-#: eqnparserhelp.py:44
-#, fuzzy
-msgid "help_fac"
-msgstr "help_fac"
-
-#: eqnparserhelp.py:45
-#, fuzzy
-msgid "help_functions"
-msgstr "help_functions"
-
-#: eqnparserhelp.py:46
-#, fuzzy
-msgid "help_ln"
-msgstr "help_ln"
-
-#: eqnparserhelp.py:47
-#, fuzzy
-msgid "help_operators"
-msgstr "help_operators"
-
-#: eqnparserhelp.py:48
-#, fuzzy
-msgid "help_or"
-msgstr "help_or"
-
-#: eqnparserhelp.py:49
-#, fuzzy
-msgid "help_plot"
-msgstr "help_plot"
-
-#: eqnparserhelp.py:50
-#, fuzzy
-msgid "help_sin"
-msgstr "help_sin"
-
-#: eqnparserhelp.py:51
-#, fuzzy
-msgid "help_sinh"
-msgstr "help_sinh"
-
-#: eqnparserhelp.py:52
-#, fuzzy
-msgid "help_sqrt"
-msgstr "help_sqrt"
-
-#: eqnparserhelp.py:53
-#, fuzzy
-msgid "help_square"
-msgstr "help_square"
-
-#: eqnparserhelp.py:54
-#, fuzzy
-msgid "help_tan"
-msgstr "help_tan"
-
-#: eqnparserhelp.py:55
-#, fuzzy
-msgid "help_tanh"
-msgstr "help_tanh"
-
-#: eqnparserhelp.py:56
-#, fuzzy
-msgid "help_test"
-msgstr "help_test"
-
-#: eqnparserhelp.py:57
-#, fuzzy
-msgid "help_variables"
-msgstr "help_variables"
-
-#: eqnparserhelp.py:58
-#, fuzzy
-msgid "help_xor"
-msgstr "help_xor"
-
-#: eqnparserhelp.py:69
-#, fuzzy
-msgid "help_usage"
-msgstr "help_usage"
-
-#: eqnparserhelp.py:132
-#, fuzzy
-msgid "Topics"
-msgstr "トピック"
-
-#: eqnparserhelp.py:143
-#, python-format
-#, fuzzy
-msgid "No help about '%s' available, use help(index) for the index"
-msgstr "'%s' に関するヘルプ情報はありません。ヘルプ（索引）を確認してください"
-
 #: layout.py:60
-#, fuzzy
 msgid "Edit"
 msgstr "編集"
 
 #: layout.py:61
-#, fuzzy
 msgid "Algebra"
-msgstr "代数学"
+msgstr "代数"
 
 #: layout.py:62
-#, fuzzy
 msgid "Trigonometry"
 msgstr "三角法"
 
 #: layout.py:63
-#, fuzzy
 msgid "Boolean"
-msgstr "ブーリアン"
+msgstr "論理関数"
 
 #: layout.py:64
-#, fuzzy
 msgid "Constants"
 msgstr "定数"
 
 #: layout.py:65
-#, fuzzy
 msgid "Format"
 msgstr "書式"
 
 #: layout.py:86
-#, fuzzy
 msgid "Label:"
 msgstr "ラベル:"
 
 #: layout.py:118
-#, fuzzy
 msgid "All equations"
-msgstr "すべての式"
+msgstr "すべての等式"
 
 #: layout.py:118
-#, fuzzy
 msgid "My equations"
-msgstr "私の式"
+msgstr "私の等式"
 
 #: layout.py:120
-#, fuzzy
 msgid "Show history"
-msgstr "履歴の表示"
+msgstr "履歴を表示"
 
 #: layout.py:120
-#, fuzzy
 msgid "Show variables"
-msgstr "変数の表示"
-
-#: mathlib.py:58
-#, fuzzy
-msgid "thousand_sep"
-msgstr "thousand_sep"
+msgstr "変数を表示"
 
-#: mathlib.py:63
-#, fuzzy
-msgid "fraction_sep"
-msgstr "fraction_sep"
-
-#. TRANS: multiplication symbol (default: '*')
-#: mathlib.py:74
-#, fuzzy
-msgid "mul_sym"
-msgstr "mul_sym"
-
-#. TRANS: division symbol (default: '/')
-#: mathlib.py:79
-#, fuzzy
-msgid "div_sym"
-msgstr "div_sym"
-
-#: mathlib.py:132
-#, fuzzy
-msgid "Undefined"
-msgstr "未定義"
-
-#: mathlib.py:142
-#, fuzzy
-msgid "Error: unsupported type"
-msgstr "エラー: 不明なタイプです"
-
-#: toolbars.py:36
-#, fuzzy
+#: toolbars.py:53
 msgid "Help"
 msgstr "ヘルプ"
 
-#: toolbars.py:86
-#, fuzzy
+#: toolbars.py:111
 msgid "Copy"
 msgstr "コピー"
 
-#: toolbars.py:89
-#, fuzzy
+#: toolbars.py:115
 msgid "Paste"
-msgstr "ペースト"
+msgstr "貼り付け"
 
-#: toolbars.py:92
-#, fuzzy
+#: toolbars.py:119
 msgid "Cut"
-msgstr "カット"
+msgstr "切り取り"
 
-#: toolbars.py:99
-#, fuzzy
+#: toolbars.py:127
 msgid "Square"
 msgstr "二乗"
 
-#: toolbars.py:103
-#, fuzzy
+#: toolbars.py:132
 msgid "Square root"
 msgstr "平方根"
 
-#: toolbars.py:109
-#, fuzzy
+#: toolbars.py:137
+msgid "Inverse"
+msgstr "入れ替え(逆関数)"
+
+#: toolbars.py:144
 msgid "e to the power x"
 msgstr "eのx乗"
 
-#: toolbars.py:117
-#, fuzzy
+#: toolbars.py:149
+msgid "x to the power y"
+msgstr "xのy乗"
+
+#: toolbars.py:154
 msgid "Natural logarithm"
 msgstr "自然対数"
 
-#: toolbars.py:123
-#, fuzzy
+#: toolbars.py:160
 msgid "Factorial"
 msgstr "階乗"
 
-#: toolbars.py:131
-#, fuzzy
+#: toolbars.py:168
 msgid "Sine"
 msgstr "正弦（sin）"
 
-#: toolbars.py:135
-#, fuzzy
+#: toolbars.py:172
 msgid "Cosine"
 msgstr "余弦（cos）"
 
-#: toolbars.py:139
-#, fuzzy
+#: toolbars.py:176
 msgid "Tangent"
 msgstr "正接（tan）"
 
-#: toolbars.py:145
-#, fuzzy
+#: toolbars.py:182
 msgid "Arc sine"
 msgstr "逆正弦（arcsin）"
 
-#: toolbars.py:149
-#, fuzzy
+#: toolbars.py:186
 msgid "Arc cosine"
 msgstr "逆余弦（arccos）"
 
-#: toolbars.py:153
-#, fuzzy
+#: toolbars.py:190
 msgid "Arc tangent"
 msgstr "逆正接（arctan）"
 
-#: toolbars.py:159
-#, fuzzy
+#: toolbars.py:196
 msgid "Hyperbolic sine"
 msgstr "双曲正弦（sinh）"
 
-#: toolbars.py:163
-#, fuzzy
+#: toolbars.py:200
 msgid "Hyperbolic cosine"
 msgstr "双曲余弦（cosh）"
 
-#: toolbars.py:167
-#, fuzzy
+#: toolbars.py:204
 msgid "Hyperbolic tangent"
 msgstr "双曲正接（tanh）"
 
-#: toolbars.py:175
-#, fuzzy
+#: toolbars.py:212
 msgid "Logical and"
 msgstr "論理積（AND）"
 
-#: toolbars.py:179
-#, fuzzy
+#: toolbars.py:216
 msgid "Logical or"
 msgstr "論理和（OR）"
 
-#: toolbars.py:174
-#, fuzzy
-msgid "Logical xor"
-msgstr "排他的論理和（XOR）"
-
-#: toolbars.py:189
-#, fuzzy
+#: toolbars.py:226
 msgid "Equals"
 msgstr "等号"
 
-#: toolbars.py:192
-#, fuzzy
+#: toolbars.py:229
 msgid "Not equals"
 msgstr "不等号"
 
-#: toolbars.py:199
-#, fuzzy
+#: toolbars.py:236
 msgid "Pi"
 msgstr "π（円周率）"
 
-#: toolbars.py:202
-#, fuzzy
+#: toolbars.py:240
 msgid "e"
 msgstr "e（オイラー数）"
 
-#: toolbars.py:209
-#, fuzzy
+#: toolbars.py:247
 msgid "Degrees"
 msgstr "角度"
 
-#: toolbars.py:210
-#, fuzzy
+#: toolbars.py:248
 msgid "Radians"
 msgstr "ラジアン"
 
-#: eqnparser.py:33
-msgid "Parse error"
-msgstr ""
-
-#: eqnparser.py:249 eqnparserhelp.py:128
-msgid "Use help(test) for help about 'test', or help(index) for the index"
-msgstr ""
-
-#: eqnparser.py:504
-msgid "Left parenthesis unexpected"
-msgstr ""
-
-#: eqnparser.py:534
-msgid "Parse error (right parenthesis, no level to close)"
-msgstr ""
+#: toolbars.py:252
+msgid "Degrees / radians"
+msgstr "角度/ラジアン"
 
-#: eqnparser.py:566
-msgid "Parse error: number or variable expected"
-msgstr ""
-
-#: eqnparser.py:567
-msgid "Number or variable expected"
-msgstr ""
-
-#. TRANS: It is possible to translate commands. However, I would highly
-#. recommend NOT doing so for mathematical functions like cos(). help(),
-#. functions() etc should be translated.
-#: eqnparserhelp.py:39
-msgid "acos"
-msgstr ""
-
-#: eqnparserhelp.py:40
-msgid ""
-"acos(x), return the arc cosine of x. This is the angle for which the cosine "
-"is x. Defined for -1 <= x < 1"
-msgstr ""
-
-#: eqnparserhelp.py:43
-msgid "and"
-msgstr ""
-
-#: eqnparserhelp.py:44
-msgid ""
-"and(x, y), logical and. Returns True if x and y are True, else returns False"
-msgstr ""
-
-#: eqnparserhelp.py:46
-msgid "asin"
-msgstr ""
-
-#: eqnparserhelp.py:47
-msgid ""
-"asin(x), return the arc sine of x. This is the angle for which the sine is "
-"x. Defined for -1 <= x <= 1"
-msgstr ""
-
-#: eqnparserhelp.py:50
-msgid "atan"
-msgstr ""
+#. TRANS: multiplication symbol (default: '*')
+#: mathlib.py:74
+msgid "mul_sym"
+msgstr "*"
 
-#: eqnparserhelp.py:51
-msgid ""
-"atan(x), return the arc tangent of x. This is the angle for which the "
-"tangent is x. Defined for all x"
-msgstr ""
+#. TRANS: division symbol (default: '/')
+#: mathlib.py:79
+msgid "div_sym"
+msgstr "/"
 
-#: eqnparserhelp.py:54
-msgid "cos"
-msgstr ""
+#: mathlib.py:134
+msgid "Undefined"
+msgstr "未定義"
 
-#: eqnparserhelp.py:55
-msgid ""
-"cos(x), return the cosine of x. This is the x-coordinate on the unit circle "
-"at the angle x"
-msgstr ""
+#: mathlib.py:144
+msgid "Error: unsupported type"
+msgstr "エラー: 取り扱えない型です"
 
-#: eqnparserhelp.py:58
-msgid "cosh"
-msgstr ""
+#: calculate.py:80
+#, python-format
+msgid "Equation.parse() string invalid (%s)"
+msgstr "Equation.parse() の文字列が無効です(%s)"
 
-#: eqnparserhelp.py:59
-msgid ""
-"cosh(x), return the hyperbolic cosine of x. Given by (exp(x) + exp(-x)) / 2"
-msgstr ""
+#: calculate.py:210
+msgid "Available functions:"
+msgstr "利用可能な関数："
 
-#: eqnparserhelp.py:61
-msgid "exp"
-msgstr ""
+#: calculate.py:504
+#, python-format
+msgid "Writing to journal (%s)"
+msgstr "ジャーナルへ保存中(%s)"
 
-#: eqnparserhelp.py:62
-msgid "exp(x), return the natural exponent of x. Given by e^x"
-msgstr ""
+#: calculate.py:788
+msgid "button_pressed(): invalid type"
+msgstr "button_pressed(): 無効なタイプです"
 
-#: eqnparserhelp.py:64
-msgid "fac"
-msgstr ""
+#, python-format
+#, fuzzy
+#~ msgid "Reading from journal (%s)"
+#~ msgstr "ジャーナルから読み込み中(%s)"
 
-#: eqnparserhelp.py:65
-msgid "fac(x), return the factorial of x. Given by x * (x - 1) * (x - 2) * ..."
-msgstr ""
+#, fuzzy
+#~ msgid "Unable to determine version"
+#~ msgstr "バージョンが識別できません"
 
-#. TRANS: This command is descriptive, so can be translated
-#: eqnparserhelp.py:68
-msgid "functions"
-msgstr ""
+#, python-format
+#, fuzzy
+#~ msgid "Reading journal entry (version %s)"
+#~ msgstr "ジャーナルのエントリを読み込み中(version %s)"
 
-#: eqnparserhelp.py:69
-msgid "functions(), return a list of all the functions that are defined"
-msgstr ""
+#, python-format
+#, fuzzy
+#~ msgid "State line invalid (%s)"
+#~ msgstr "入力行の内容が不適切です（%s）"
 
-#: eqnparserhelp.py:71
-msgid "ln"
-msgstr ""
+#, python-format
+#, fuzzy
+#~ msgid "Unable to read journal entry, unknown version (%s)"
+#~ msgstr "ジャーナル上のエントリが読み込めません。不明のバージョンです(%s)"
 
-#: eqnparserhelp.py:72
-msgid ""
-"ln(x), return the natural logarithm of x. This is the value for which the "
-"exponent exp() equals x. Defined for x >= 0."
-msgstr ""
+#, fuzzy
+#~ msgid "help_var"
+#~ msgstr "help_var"
 
-#. TRANS: This command is descriptive, so can be translated
-#: eqnparserhelp.py:76
-msgid "operators"
-msgstr ""
+#, fuzzy
+#~ msgid "help_acos"
+#~ msgstr "help_acos"
 
-#: eqnparserhelp.py:77
-msgid "operators(), return a list of the operators that are defined"
-msgstr ""
+#, fuzzy
+#~ msgid "help_and"
+#~ msgstr "help_and"
 
-#: eqnparserhelp.py:79
-msgid "or"
-msgstr ""
+#, fuzzy
+#~ msgid "help_asin"
+#~ msgstr "help_asin"
 
-#: eqnparserhelp.py:80
-msgid ""
-"or(x, y), logical or. Returns True if x and/or y are True, else return False"
-msgstr ""
+#, fuzzy
+#~ msgid "help_atan"
+#~ msgstr "help_atan"
 
-#: eqnparserhelp.py:82
-msgid "plot"
-msgstr ""
+#, fuzzy
+#~ msgid "help_cos"
+#~ msgstr "help_cos"
 
-#: eqnparserhelp.py:83
-msgid ""
-"plot(eqn, var=-a..b), plot the equation 'eqn' with the variable 'var' in the "
-"range from a to b"
-msgstr ""
+#, fuzzy
+#~ msgid "help_cosh"
+#~ msgstr "help_cosh"
 
-#: eqnparserhelp.py:86
-msgid "sin"
-msgstr ""
+#, fuzzy
+#~ msgid "help_exp"
+#~ msgstr "help_exp"
 
-#: eqnparserhelp.py:87
-msgid ""
-"sin(x), return the sine of x. This is the y-coordinate on the unit circle at "
-"the angle x"
-msgstr ""
+#, fuzzy
+#~ msgid "help_fac"
+#~ msgstr "help_fac"
 
-#: eqnparserhelp.py:90
-msgid "sinh"
-msgstr ""
+#, fuzzy
+#~ msgid "help_functions"
+#~ msgstr "help_functions"
 
-#: eqnparserhelp.py:91
-msgid ""
-"sinh(x), return the hyperbolic sine of x. Given by (exp(x) - exp(-x)) / 2"
-msgstr ""
+#, fuzzy
+#~ msgid "help_ln"
+#~ msgstr "help_ln"
 
-#: eqnparserhelp.py:93
-msgid "sqrt"
-msgstr ""
+#, fuzzy
+#~ msgid "help_operators"
+#~ msgstr "help_operators"
 
-#: eqnparserhelp.py:94
-msgid ""
-"sqrt(x), return the square root of x. This is the value for which the square "
-"equals x. Defined for x >= 0."
-msgstr ""
+#, fuzzy
+#~ msgid "help_or"
+#~ msgstr "help_or"
 
-#: eqnparserhelp.py:97
-msgid "square"
-msgstr ""
+#, fuzzy
+#~ msgid "help_plot"
+#~ msgstr "help_plot"
 
-#: eqnparserhelp.py:98
-msgid "square(x), return the square of x. Given by x * x"
-msgstr ""
+#, fuzzy
+#~ msgid "help_sin"
+#~ msgstr "help_sin"
 
-#: eqnparserhelp.py:101
-msgid "tan"
-msgstr ""
+#, fuzzy
+#~ msgid "help_sinh"
+#~ msgstr "help_sinh"
 
-#: eqnparserhelp.py:102
-msgid ""
-"tan(x), return the tangent of x. This is the slope of the line from the "
-"origin of the unit circle to the point on the unit circle defined by the "
-"angle x. Given by sin(x) / cos(x)"
-msgstr ""
+#, fuzzy
+#~ msgid "help_sqrt"
+#~ msgstr "help_sqrt"
 
-#: eqnparserhelp.py:106
-msgid "tanh"
-msgstr ""
+#, fuzzy
+#~ msgid "help_square"
+#~ msgstr "help_square"
 
-#: eqnparserhelp.py:107
-msgid "sinh(x), return the hyperbolic tangent of x. Given by sinh(x) / cosh(x)"
-msgstr ""
+#, fuzzy
+#~ msgid "help_tan"
+#~ msgstr "help_tan"
 
-#: eqnparserhelp.py:109
-msgid "test"
-msgstr ""
+#, fuzzy
+#~ msgid "help_tanh"
+#~ msgstr "help_tanh"
 
-#: eqnparserhelp.py:110
-msgid "This is just a test topic, use help(index) for the index"
-msgstr ""
+#, fuzzy
+#~ msgid "help_test"
+#~ msgstr "help_test"
 
-#. TRANS: This command is descriptive, so can be translated
-#: eqnparserhelp.py:113
-msgid "variables"
-msgstr ""
+#, fuzzy
+#~ msgid "help_variables"
+#~ msgstr "help_variables"
 
-#: eqnparserhelp.py:114
-msgid "variables(), return a list of the variables that are currently defined"
-msgstr ""
+#, fuzzy
+#~ msgid "help_xor"
+#~ msgstr "help_xor"
 
-#: eqnparserhelp.py:116
-msgid "xor"
-msgstr ""
+#, fuzzy
+#~ msgid "help_usage"
+#~ msgstr "help_usage"
 
-#: eqnparserhelp.py:117
-msgid ""
-"xor(x, y), logical xor. Returns True if either x is True (and y is False) or "
-"y is True (and x is False), else returns False"
-msgstr ""
+#, fuzzy
+#~ msgid "thousand_sep"
+#~ msgstr "thousand_sep"
 
-#. TRANS: help(index), both 'index' and the translation  will work
-#: eqnparserhelp.py:131
-msgid "index"
-msgstr ""
+#, fuzzy
+#~ msgid "fraction_sep"
+#~ msgstr "fraction_sep"
 
-#: toolbars.py:113
-msgid "x to the power y"
-msgstr ""
+#, fuzzy
+#~ msgid "Logical xor"
+#~ msgstr "排他的論理和（XOR）"
diff --git a/po/mr.po b/po/mr.po
index 08722ea..0535ffc 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -425,12 +425,12 @@ msgstr "वेरियबल्स दाखवा."
 #. TRANS: multiplication symbol (default: '*')
 #: mathlib.py:74
 msgid "mul_sym"
-msgstr "mul_sym"
+msgstr "*"
 
 #. TRANS: division symbol (default: '/')
 #: mathlib.py:79
 msgid "div_sym"
-msgstr "div_sym"
+msgstr "/"
 
 #: mathlib.py:134
 msgid "Undefined"
diff --git a/po/ne.po b/po/ne.po
index ab2232e..53c9851 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -148,7 +148,6 @@ msgid ""
 "acos(x), return the arc cosine of x. This is the angle for which the cosine "
 "is x. Defined for -1 <= x < 1"
 msgstr ""
-"\n"
 "acos(x), return the arc cosine of x. This is the angle for which the cosine "
 "is x. Defined for -1 <= x < 1"
 
@@ -160,7 +159,6 @@ msgstr "and"
 msgid ""
 "and(x, y), logical and. Returns True if x and y are True, else returns False"
 msgstr ""
-"\n"
 "and(x, y), logical and. Returns True if x and y are True, else returns False"
 
 #: eqnparserhelp.py:46
@@ -172,7 +170,6 @@ msgid ""
 "asin(x), return the arc sine of x. This is the angle for which the sine is "
 "x. Defined for -1 <= x <= 1"
 msgstr ""
-"\n"
 "asin(x), return the arc sine of x. This is the angle for which the sine is "
 "x. Defined for -1 <= x <= 1"
 
@@ -185,7 +182,6 @@ msgid ""
 "atan(x), return the arc tangent of x. This is the angle for which the "
 "tangent is x. Defined for all x"
 msgstr ""
-"\n"
 "atan(x), return the arc tangent of x. This is the angle for which the "
 "tangent is x. Defined for all x"
 
@@ -198,7 +194,6 @@ msgid ""
 "cos(x), return the cosine of x. This is the x-coordinate on the unit circle "
 "at the angle x"
 msgstr ""
-"\n"
 "cos(x), return the cosine of x. This is the x-coordinate on the unit circle "
 "at the angle x"
 
@@ -210,7 +205,6 @@ msgstr "cosh"
 msgid ""
 "cosh(x), return the hyperbolic cosine of x. Given by (exp(x) + exp(-x)) / 2"
 msgstr ""
-"\n"
 "cosh(x), return the hyperbolic cosine of x. Given by (exp(x) + exp(-x)) / 2"
 
 #: eqnparserhelp.py:61
@@ -247,7 +241,6 @@ msgid ""
 "ln(x), return the natural logarithm of x. This is the value for which the "
 "exponent exp() equals x. Defined for x >= 0."
 msgstr ""
-"\n"
 "ln(x), return the natural logarithm of x. This is the value for which the "
 "exponent exp() equals x. Defined for x >= 0."
 
@@ -268,7 +261,6 @@ msgstr "or"
 msgid ""
 "or(x, y), logical or. Returns True if x and/or y are True, else return False"
 msgstr ""
-"\n"
 "or(x, y), logical or. Returns True if x and/or y are True, else return False"
 
 #: eqnparserhelp.py:82
@@ -280,7 +272,6 @@ msgid ""
 "plot(eqn, var=-a..b), plot the equation 'eqn' with the variable 'var' in the "
 "range from a to b"
 msgstr ""
-"\n"
 "plot(eqn, var=-a..b), plot the equation 'eqn' with the variable 'var' in the "
 "range from a to b"
 
@@ -293,7 +284,6 @@ msgid ""
 "sin(x), return the sine of x. This is the y-coordinate on the unit circle at "
 "the angle x"
 msgstr ""
-"\n"
 "sin(x), return the sine of x. This is the y-coordinate on the unit circle at "
 "the angle x"
 
@@ -305,7 +295,6 @@ msgstr "sinh"
 msgid ""
 "sinh(x), return the hyperbolic sine of x. Given by (exp(x) - exp(-x)) / 2"
 msgstr ""
-"\n"
 "sinh(x), return the hyperbolic sine of x. Given by (exp(x) - exp(-x)) / 2"
 
 #: eqnparserhelp.py:93
@@ -317,7 +306,6 @@ msgid ""
 "sqrt(x), return the square root of x. This is the value for which the square "
 "equals x. Defined for x >= 0."
 msgstr ""
-"\n"
 "sqrt(x), return the square root of x. This is the value for which the square "
 "equals x. Defined for x >= 0."
 
@@ -339,7 +327,6 @@ msgid ""
 "origin of the unit circle to the point on the unit circle defined by the "
 "angle x. Given by sin(x) / cos(x)"
 msgstr ""
-"\n"
 "tan(x), return the tangent of x. This is the slope of the line from the "
 "origin of the unit circle to the point on the unit circle defined by the "
 "angle x. Given by sin(x) / cos(x)"
@@ -349,9 +336,8 @@ msgid "tanh"
 msgstr "tanh"
 
 #: eqnparserhelp.py:107
-#, fuzzy
 msgid "tanh(x), return the hyperbolic tangent of x. Given by sinh(x) / cosh(x)"
-msgstr "sinh(x), return the hyperbolic tangent of x. Given by sinh(x) / cos(x)"
+msgstr "tanh(x), return the hyperbolic tangent of x. Given by sinh(x) / cos(x)"
 
 #: eqnparserhelp.py:109
 msgid "test"
@@ -379,7 +365,6 @@ msgid ""
 "xor(x, y), logical xor. Returns True if either x is True (and y is False) or "
 "y is True (and x is False), else returns False"
 msgstr ""
-"\n"
 "xor(x, y), logical xor. Returns True if either x is True (and y is False) or "
 "y is True (and x is False), else returns False"
 
diff --git a/po/ps.po b/po/ps.po
index 551fbab..6aafdc2 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -407,12 +407,12 @@ msgstr "بدلېدنې ښکاره کول"
 #. TRANS: multiplication symbol (default: '*')
 #: mathlib.py:74
 msgid "mul_sym"
-msgstr "ضرب_اېس وای اېم"
+msgstr "*"
 
 #. TRANS: division symbol (default: '/')
 #: mathlib.py:79
 msgid "div_sym"
-msgstr "وېشل_اېس وای اې"
+msgstr "/"
 
 #: mathlib.py:132
 msgid "Undefined"
diff --git a/po/pseudo.po b/po/pseudo.po
deleted file mode 100644
index 472ca13..0000000
--- a/po/pseudo.po
+++ /dev/null
@@ -1,242 +0,0 @@
-# POT file for the Calculate activity
-# Copyright (C) 2007
-# This file is distributed under the same license as the Calculate package.
-# Reinier Heeres <reinier@heeres.eu>, 2007
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-22 18:20+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.0.1\n"
-
-#: calculate.py:27 calculate.py:170 setup.py:3
-msgid "Calculate"
-msgstr ""
-
-#: calculate.py:204
-msgid "Available functions:"
-msgstr ""
-
-#-----------------------------------------
-# The help system uses topic msgid's that should be translated here.
-#-----------------------------------------
-#: eqnparserhelp.py:33
-msgid "help_acos"
-msgstr ""
-
-#: eqnparserhelp.py:34
-msgid "help_asin"
-msgstr ""
-
-#: eqnparserhelp.py:35
-msgid "help_exp"
-msgstr ""
-
-#: eqnparserhelp.py:36
-msgid "help_functions"
-msgstr ""
-
-#: eqnparserhelp.py:37
-msgid "help_operators"
-msgstr ""
-
-#: eqnparserhelp.py:38
-msgid "help_plot"
-msgstr ""
-
-#: eqnparserhelp.py:39
-msgid "help_sqrt"
-msgstr ""
-
-#: eqnparserhelp.py:40
-msgid "help_test"
-msgstr ""
-
-#: eqnparserhelp.py:41
-msgid "help_variables"
-msgstr ""
-
-#: eqnparserhelp.py:49
-msgid "help_usage"
-msgstr ""
-
-# Text assigned to the 'help' variable
-msgid "help_var"
-msgstr ""
-
-#-----------------------------------------
-# End of help topics
-#-----------------------------------------
-
-#: eqnparserhelp.py:52
-msgid "Topics: "
-msgstr ""
-
-#: eqnparserhelp.py:63
-#, python-format
-msgid "No help about '%s' available, use help(index) for the index"
-msgstr ""
-
-#: eqnparser.py:87
-msgid "Type error"
-msgstr ""
-
-#: eqnparser.py:107
-#, python-format
-msgid "Error at %d"
-msgstr ""
-
-#: eqnparser.py:299
-#, python-format
-msgid "variable %s not defined"
-msgstr ""
-
-#: eqnparser.py:329 eqnparser.py:330
-#, python-format
-msgid "Function '%s' not defined"
-msgstr ""
-
-#: eqnparser.py:335
-#, python-format
-msgid "Invalid number of arguments (%d instead of %d)"
-msgstr ""
-
-#: eqnparser.py:336
-#, python-format
-msgid "function takes %d args"
-msgstr ""
-
-#: eqnparser.py:346 eqnparser.py:347
-#, python-format
-msgid "Unable to parse argument %d: '%s'"
-msgstr ""
-
-#: eqnparser.py:356
-#, python-format
-msgid "Function error: %s"
-msgstr ""
-
-#: eqnparser.py:358
-#, python-format
-msgid "Function '%s' returned %s"
-msgstr ""
-
-#: eqnparser.py:457
-#, python-format
-msgid "Variable '%s' undefined"
-msgstr ""
-
-#: eqnparser.py:487
-msgid "Parse error (right parenthesis)"
-msgstr ""
-
-#: eqnparser.py:488 eqnparser.py:499 eqnparser.py:506 eqnparser.py:566
-msgid "Right parenthesis unexpected"
-msgstr ""
-
-#: eqnparser.py:498
-msgid "Parse error (right parenthesis, no left_val)"
-msgstr ""
-
-#: eqnparser.py:505
-msgid "Parse error (right parenthesis, no level to close)"
-msgstr ""
-
-#: eqnparser.py:513
-msgid "Number not expected"
-msgstr ""
-
-#: eqnparser.py:556 eqnparser.py:557
-msgid "Invalid operator"
-msgstr ""
-
-#: eqnparser.py:565
-msgid "Parse error: ')' expected"
-msgstr ""
-
-#: eqnparser.py:572
-msgid "_parse(): returning None"
-msgstr ""
-
-#: layout.py:46
-msgid "clear"
-msgstr ""
-
-#: layout.py:55
-msgid "enter"
-msgstr ""
-
-#: layout.py:62
-msgid "Edit"
-msgstr ""
-
-#: layout.py:63
-msgid "Algebra"
-msgstr ""
-
-#: layout.py:64
-msgid "Trigonometry"
-msgstr ""
-
-#: layout.py:65
-msgid "Boolean"
-msgstr ""
-
-#: layout.py:66
-msgid "Constants"
-msgstr ""
-
-#: layout.py:67
-msgid "Format"
-msgstr ""
-
-#: layout.py:88
-msgid "Label:"
-msgstr ""
-
-#: layout.py:120
-msgid "All equations"
-msgstr ""
-
-#: layout.py:120
-msgid "My equations"
-msgstr ""
-
-#: layout.py:122
-msgid "Show history"
-msgstr ""
-
-#: layout.py:122
-msgid "Show variables"
-msgstr ""
-
-#: mathlib.py:86
-msgid "Error"
-msgstr ""
-
-#: mathlib.py:92
-msgid "Error: unsupported type"
-msgstr ""
-
-#: plotlib.py:134
-msgid "Unable to parse range"
-msgstr ""
-
-#: toolbars.py:57
-msgid "Copy"
-msgstr ""
-
-#: toolbars.py:60
-msgid "Paste"
-msgstr ""
-
-#: toolbars.py:63
-msgid "Cut"
-msgstr ""
diff --git a/po/pt.po b/po/pt.po
index c10c0c3..c2f278e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,517 +6,207 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-26 11:55-0500\n"
-"PO-Revision-Date: 2008-01-09 04:06+0000\n"
-"Last-Translator: Ivo Emanuel Gonçalves <justivo@gmail.com>\n"
+"POT-Creation-Date: 2008-08-20 19:45+0530\n"
+"PO-Revision-Date: 2008-08-26 08:25-0400\n"
+"Last-Translator: Eduardo H. Silva <HoboPrimate@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.0.2\n"
+"X-Generator: Pootle 1.1.0rc2\n"
 
 #: activity/activity.info:2
 msgid "Calculate"
 msgstr "Calcular"
 
-#: calculate.py:210
-msgid "Available functions:"
-msgstr "Funções disponíveis:"
-
-#-----------------------------------------
-# The help system uses topic msgid's that should be translated here.
-#-----------------------------------------
-#. These are the help topics and should explain how things work
-#: eqnparserhelp.py:37
-msgid "help_acos"
-msgstr ""
-
-#: eqnparserhelp.py:38
-msgid "help_asin"
-msgstr ""
-
-#: eqnparserhelp.py:40
-msgid "help_exp"
-msgstr ""
-
-#: eqnparserhelp.py:41
-msgid "help_functions"
-msgstr ""
-
-#: eqnparserhelp.py:42
-msgid "help_operators"
-msgstr ""
-
-#: eqnparserhelp.py:43
-msgid "help_plot"
-msgstr ""
-
-#: eqnparserhelp.py:45
-msgid "help_sqrt"
-msgstr ""
-
-#: eqnparserhelp.py:46
-msgid "help_test"
-msgstr "ajuda_teste"
-
-#: eqnparserhelp.py:47
-msgid "help_variables"
-msgstr "ajuda_variáveis"
-
-#: eqnparserhelp.py:58
-msgid "help_usage"
-msgstr ""
-
-# Text assigned to the 'help' variable
-#: eqnparser.py:234
-msgid "help_var"
-msgstr ""
-
-#-----------------------------------------
-# End of help topics
-#-----------------------------------------
-
-#: eqnparserhelp.py:52
-msgid "Topics: "
-msgstr "Tópicos: "
-
-#: eqnparserhelp.py:143
-#, python-format
-msgid "No help about '%s' available, use help(index) for the index"
-msgstr "Não existe ajuda sobre '%s', usa ajuda(indice) para veres o índice"
-
-#: eqnparser.py:87
-msgid "Type error"
-msgstr ""
-
-#: eqnparser.py:117
-#, python-format
-msgid "Error at %d"
-msgstr ""
-
-#: eqnparser.py:299
-#, python-format
-msgid "variable %s not defined"
-msgstr ""
-
-#: eqnparser.py:353 eqnparser.py:354
-#, python-format
-msgid "Function '%s' not defined"
-msgstr ""
-
-#: eqnparser.py:359
-#, python-format
-msgid "Invalid number of arguments (%d instead of %d)"
-msgstr ""
-
-#: eqnparser.py:360
-#, python-format
-msgid "function takes %d args"
-msgstr ""
-
-#: eqnparser.py:370 eqnparser.py:371
-#, python-format
-msgid "Unable to parse argument %d: '%s'"
-msgstr ""
-
-#: eqnparser.py:380
-#, python-format
-msgid "Function error: %s"
-msgstr ""
-
-#: eqnparser.py:358
-#, python-format
-msgid "Function '%s' returned %s"
-msgstr ""
-
-#: eqnparser.py:457
-#, python-format
-msgid "Variable '%s' undefined"
-msgstr ""
-
-#: eqnparser.py:516
-msgid "Parse error (right parenthesis)"
-msgstr ""
-
-#: eqnparser.py:517 eqnparser.py:528 eqnparser.py:535 eqnparser.py:610
-msgid "Right parenthesis unexpected"
-msgstr ""
-
-#: eqnparser.py:527
-msgid "Parse error (right parenthesis, no left_val)"
-msgstr ""
-
-#: eqnparser.py:534
-msgid "Parse error (right parenthesis, no level to close)"
-msgstr ""
-
-#: eqnparser.py:541 eqnparser.py:542
-msgid "Number not expected"
-msgstr ""
-
-#: eqnparser.py:596
-msgid "Invalid operator"
-msgstr ""
-
-#: eqnparser.py:565
-msgid "Parse error: ')' expected"
-msgstr ""
-
-#: eqnparser.py:616
-msgid "_parse(): returning None"
-msgstr ""
-
-#: layout.py:46
-msgid "clear"
-msgstr ""
-
-#: layout.py:55
-msgid "enter"
-msgstr ""
-
-#: layout.py:60
-msgid "Edit"
-msgstr ""
-
-#: layout.py:61
-msgid "Algebra"
-msgstr ""
-
-#: layout.py:62
-msgid "Trigonometry"
-msgstr ""
-
-#: layout.py:63
-msgid "Boolean"
-msgstr ""
-
-#: layout.py:64
-msgid "Constants"
-msgstr ""
-
-#: layout.py:65
-msgid "Format"
-msgstr ""
-
-#: layout.py:86
-msgid "Label:"
-msgstr ""
-
-#: layout.py:118
-msgid "All equations"
-msgstr ""
-
-#: layout.py:118
-msgid "My equations"
-msgstr ""
-
-#: layout.py:120
-msgid "Show history"
-msgstr ""
-
-#: layout.py:120
-msgid "Show variables"
-msgstr ""
-
-#: mathlib.py:86
-msgid "Error"
-msgstr ""
-
-#: mathlib.py:142
-msgid "Error: unsupported type"
-msgstr ""
-
-#: plotlib.py:134
-msgid "Unable to parse range"
-msgstr ""
-
-#: toolbars.py:86
-msgid "Copy"
-msgstr ""
-
-#: toolbars.py:89
-msgid "Paste"
-msgstr ""
-
-#: toolbars.py:92
-msgid "Cut"
-msgstr ""
-
-#: calculate.py:80
-#, python-format
-msgid "Equation.parse() string invalid (%s)"
-msgstr ""
-
-#: calculate.py:504
-#, python-format
-msgid "Writing to journal (%s)"
-msgstr ""
-
-#: calculate.py:506
-#, python-format
-msgid "Reading from journal (%s)"
-msgstr ""
-
-#: calculate.py:512
-msgid "Unable to determine version"
-msgstr ""
-
-#: calculate.py:517
-#, python-format
-msgid "Reading journal entry (version %s)"
-msgstr ""
-
-#: calculate.py:522
-#, python-format
-msgid "State line invalid (%s)"
-msgstr ""
-
-#: calculate.py:539
-#, python-format
-msgid "Unable to read journal entry, unknown version (%s)"
-msgstr ""
-
-#: calculate.py:788
-msgid "button_pressed(): invalid type"
-msgstr ""
-
-#: eqnparser.py:58
-#, python-format
-msgid "level: %d, ofs %d"
-msgstr ""
-
-#: eqnparser.py:481
-#, python-format
-msgid "Variable '%s' not defined"
-msgstr ""
-
-#: eqnparser.py:550
-msgid "Operator not expected"
-msgstr ""
-
-#: eqnparser.py:603
-msgid "Operator expected"
-msgstr ""
-
-#: eqnparserhelp.py:39
-msgid "help_cos"
-msgstr ""
-
-#: eqnparserhelp.py:44
-msgid "help_sin"
-msgstr ""
-
-#: eqnparserhelp.py:132
-#, fuzzy
-msgid "Topics"
-msgstr "Tópicos: "
-
-#. The separator to mark thousands (default: ',')
-#: mathlib.py:58
-msgid "thousand_sep"
-msgstr ""
-
-#. The separator to mark fractions (default: '.')
-#: mathlib.py:63
-msgid "fraction_sep"
-msgstr ""
-
-#. The multiplication symbol (default: '*')
-#. TRANS: multiplication symbol (default: '*')
-#: mathlib.py:74
-msgid "mul_sym"
-msgstr ""
-
-#. The division symbol (default: '/')
-#. TRANS: division symbol (default: '/')
-#: mathlib.py:79
-msgid "div_sym"
-msgstr ""
-
-#: eqnparser.py:33
-msgid "Parse error"
-msgstr ""
-
-#: eqnparser.py:249 eqnparserhelp.py:128
-msgid "Use help(test) for help about 'test', or help(index) for the index"
-msgstr ""
-
-#: eqnparser.py:504
-msgid "Left parenthesis unexpected"
-msgstr ""
-
-#: eqnparser.py:566
-msgid "Parse error: number or variable expected"
-msgstr ""
-
-#: eqnparser.py:567
-msgid "Number or variable expected"
-msgstr ""
-
 #. TRANS: It is possible to translate commands. However, I would highly
 #. recommend NOT doing so for mathematical functions like cos(). help(),
 #. functions() etc should be translated.
 #: eqnparserhelp.py:39
 msgid "acos"
-msgstr ""
+msgstr "acos"
 
 #: eqnparserhelp.py:40
 msgid ""
 "acos(x), return the arc cosine of x. This is the angle for which the cosine "
 "is x. Defined for -1 <= x < 1"
 msgstr ""
+"acos(x), devolve o arcocosseno de x. Este é o ângulo cujo co-seno é x. "
+"Definido para -1 <= x < 1"
 
 #: eqnparserhelp.py:43
 msgid "and"
-msgstr ""
+msgstr "and"
 
 #: eqnparserhelp.py:44
 msgid ""
 "and(x, y), logical and. Returns True if x and y are True, else returns False"
 msgstr ""
+"and(x,y), Conjunção lógica E (\"and\"). Devolve Verdadeiro (\"True\") se x e y "
+"forem verdadeiros, caso contrário devolve Falso (\"False\")"
 
 #: eqnparserhelp.py:46
 msgid "asin"
-msgstr ""
+msgstr "asin"
 
 #: eqnparserhelp.py:47
 msgid ""
 "asin(x), return the arc sine of x. This is the angle for which the sine is "
 "x. Defined for -1 <= x <= 1"
 msgstr ""
+"asin(x), devolve o arcosseno de x. Este é o ângulo cujo seno é x. Definido "
+"para -1 <= x <= 1"
 
 #: eqnparserhelp.py:50
 msgid "atan"
-msgstr ""
+msgstr "atan"
 
 #: eqnparserhelp.py:51
 msgid ""
 "atan(x), return the arc tangent of x. This is the angle for which the "
 "tangent is x. Defined for all x"
 msgstr ""
+"atan(x), devolve o arcotangente de x. Este é o ângulo cuja tangente é x. "
+"Definido para todo x"
 
 #: eqnparserhelp.py:54
 msgid "cos"
-msgstr ""
+msgstr "cos"
 
 #: eqnparserhelp.py:55
 msgid ""
 "cos(x), return the cosine of x. This is the x-coordinate on the unit circle "
 "at the angle x"
 msgstr ""
+"cos(x), devolve o co-seno de x. Esta é a coordenada-x no círculo unitário no "
+"ângulo x"
 
 #: eqnparserhelp.py:58
 msgid "cosh"
-msgstr ""
+msgstr "cosh"
 
 #: eqnparserhelp.py:59
 msgid ""
 "cosh(x), return the hyperbolic cosine of x. Given by (exp(x) + exp(-x)) / 2"
 msgstr ""
+"cosh(x), devolve o cosseno hiperbólico de x. Obtido por (exp(x) + exp(-x)) / "
+"2"
 
 #: eqnparserhelp.py:61
 msgid "exp"
-msgstr ""
+msgstr "exp"
 
 #: eqnparserhelp.py:62
 msgid "exp(x), return the natural exponent of x. Given by e^x"
-msgstr ""
+msgstr "exp(x), devolve o expoente natural de x. Obtido por e^x"
 
 #: eqnparserhelp.py:64
 msgid "fac"
-msgstr ""
+msgstr "fac"
 
 #: eqnparserhelp.py:65
 msgid "fac(x), return the factorial of x. Given by x * (x - 1) * (x - 2) * ..."
 msgstr ""
+"fac(x), devolve o factorial de x. Obtido por x * (x - 1) * (x - 2) * ..."
 
 #. TRANS: This command is descriptive, so can be translated
 #: eqnparserhelp.py:68
 msgid "functions"
-msgstr ""
+msgstr "funções"
 
 #: eqnparserhelp.py:69
 msgid "functions(), return a list of all the functions that are defined"
-msgstr ""
+msgstr "funções(), devolve a lista de todas as funções que estão definidas"
 
 #: eqnparserhelp.py:71
 msgid "ln"
-msgstr ""
+msgstr "ln"
 
 #: eqnparserhelp.py:72
 msgid ""
 "ln(x), return the natural logarithm of x. This is the value for which the "
 "exponent exp() equals x. Defined for x >= 0."
 msgstr ""
+"ln(x), devolve o logaritmo natural de x. Este é o valor cujo expoente exp() "
+"é igual a x. Definido para x >= 0."
 
 #. TRANS: This command is descriptive, so can be translated
 #: eqnparserhelp.py:76
 msgid "operators"
-msgstr ""
+msgstr "operadores"
 
 #: eqnparserhelp.py:77
 msgid "operators(), return a list of the operators that are defined"
-msgstr ""
+msgstr "operadores(), devolve uma lista dos operadores que estão definidos"
 
 #: eqnparserhelp.py:79
 msgid "or"
-msgstr ""
+msgstr "or"
 
 #: eqnparserhelp.py:80
 msgid ""
 "or(x, y), logical or. Returns True if x and/or y are True, else return False"
 msgstr ""
+"or(x, y), disjunção lógica OU (\"or\"). Devolve Verdadeiro (\"True\") se x e/ou "
+"y forem verdadeiros, caso contrário devolve Falso (\"False\")"
 
 #: eqnparserhelp.py:82
 msgid "plot"
-msgstr ""
+msgstr "plot"
 
 #: eqnparserhelp.py:83
 msgid ""
 "plot(eqn, var=-a..b), plot the equation 'eqn' with the variable 'var' in the "
 "range from a to b"
 msgstr ""
+"plot(eqn, var=-a..b), cria gráfico da equação 'eqn' com variável 'var' no "
+"intervalo entre a e b"
 
 #: eqnparserhelp.py:86
 msgid "sin"
-msgstr ""
+msgstr "sin"
 
 #: eqnparserhelp.py:87
 msgid ""
 "sin(x), return the sine of x. This is the y-coordinate on the unit circle at "
 "the angle x"
 msgstr ""
+"sin(x), devolve o seno de x. Esta é a coordenada-y no círculo unitário no "
+"ângulo x"
 
 #: eqnparserhelp.py:90
 msgid "sinh"
-msgstr ""
+msgstr "sinh"
 
 #: eqnparserhelp.py:91
 msgid ""
 "sinh(x), return the hyperbolic sine of x. Given by (exp(x) - exp(-x)) / 2"
 msgstr ""
+"sinh(x), devolve o seno hiperbólico de x. Obtido por (exp(x) - exp(-x)) / 2"
 
 #: eqnparserhelp.py:93
 msgid "sqrt"
-msgstr ""
+msgstr "sqrt"
 
 #: eqnparserhelp.py:94
 msgid ""
 "sqrt(x), return the square root of x. This is the value for which the square "
 "equals x. Defined for x >= 0."
 msgstr ""
+"sqrt(x), devolve a raiz quadrada de x. Este é o valor cujo quadrado (elevado "
+"a 2) é igual a x. Definido para x >= 0."
 
 #: eqnparserhelp.py:97
 msgid "square"
-msgstr ""
+msgstr "square"
 
 #: eqnparserhelp.py:98
 msgid "square(x), return the square of x. Given by x * x"
-msgstr ""
+msgstr "square(x), devolve o quadrado (elevado a 2) de x. Obtido por x * x"
 
 #: eqnparserhelp.py:101
 msgid "tan"
-msgstr ""
+msgstr "tan"
 
 #: eqnparserhelp.py:102
 msgid ""
@@ -524,143 +214,364 @@ msgid ""
 "origin of the unit circle to the point on the unit circle defined by the "
 "angle x. Given by sin(x) / cos(x)"
 msgstr ""
+"tan(x), devolve a tangente de x. Esta é a inclinação da linha desde a origem "
+"do círculo unitário até ao pelo ponto no círculo unitário definido pelo "
+"ângulo x. Obtido por sin(x) / cos(x)"
 
 #: eqnparserhelp.py:106
 msgid "tanh"
-msgstr ""
+msgstr "tanh"
 
 #: eqnparserhelp.py:107
-msgid "sinh(x), return the hyperbolic tangent of x. Given by sinh(x) / cosh(x)"
+msgid "tanh(x), return the hyperbolic tangent of x. Given by sinh(x) / cosh(x)"
 msgstr ""
+"tanh(x), devolve a tangente hiperbólica de x. Obtido por sinh(x) / cosh(x)"
 
 #: eqnparserhelp.py:109
 msgid "test"
-msgstr ""
+msgstr "teste"
 
 #: eqnparserhelp.py:110
 msgid "This is just a test topic, use help(index) for the index"
 msgstr ""
+"Este é apenas um tópico de teste, utilize help(index) para obter o índice"
 
 #. TRANS: This command is descriptive, so can be translated
 #: eqnparserhelp.py:113
 msgid "variables"
-msgstr ""
+msgstr "variaveis"
 
 #: eqnparserhelp.py:114
 msgid "variables(), return a list of the variables that are currently defined"
 msgstr ""
+"variáveis(), devolve uma lista das variáveis que estão de momento definidas"
 
 #: eqnparserhelp.py:116
 msgid "xor"
-msgstr ""
+msgstr "xor"
 
 #: eqnparserhelp.py:117
 msgid ""
 "xor(x, y), logical xor. Returns True if either x is True (and y is False) or "
 "y is True (and x is False), else returns False"
 msgstr ""
+"xor(x, y), disjunção exclusiva XOR. Devolve Verdadeiro (\"True\") caso x for "
+"Verdadeiro e y for Falso, ou y for Verdadeiro e x for Falso. Caso contrário "
+"devolve Falso (\"False\")"
+
+#: eqnparserhelp.py:128 eqnparser.py:249
+msgid "Use help(test) for help about 'test', or help(index) for the index"
+msgstr ""
+"Utiliza help(teste) para obteres ajuda sobre 'teste', ou help(index) para o "
+"índice"
 
 #. TRANS: help(index), both 'index' and the translation  will work
 #: eqnparserhelp.py:131
 msgid "index"
-msgstr ""
+msgstr "index"
 
-#: mathlib.py:132
-msgid "Undefined"
-msgstr ""
+#: eqnparserhelp.py:132
+msgid "Topics"
+msgstr "Tópicos"
+
+#: eqnparserhelp.py:143
+#, python-format
+msgid "No help about '%s' available, use help(index) for the index"
+msgstr "Não existe ajuda sobre '%s', use help(index) para ver o índice"
+
+#: eqnparser.py:33
+msgid "Parse error"
+msgstr "Erro na avaliação"
+
+#: eqnparser.py:58
+#, python-format
+msgid "level: %d, ofs %d"
+msgstr "nível: %d, ofs %d"
+
+#: eqnparser.py:117
+#, python-format
+msgid "Error at %d"
+msgstr "Erro em %d"
+
+#: eqnparser.py:353 eqnparser.py:354
+#, python-format
+msgid "Function '%s' not defined"
+msgstr "Função '%s' não definida"
+
+#: eqnparser.py:359
+#, python-format
+msgid "Invalid number of arguments (%d instead of %d)"
+msgstr "Número inválido de argumentos (%d em vez de %d)"
+
+#: eqnparser.py:360
+#, python-format
+msgid "function takes %d args"
+msgstr "função leva %d args"
+
+#: eqnparser.py:370 eqnparser.py:371
+#, python-format
+msgid "Unable to parse argument %d: '%s'"
+msgstr "Incapaz de avaliar argumento %d: '%s'"
+
+#: eqnparser.py:380
+#, python-format
+msgid "Function error: %s"
+msgstr "Erro de função: %s"
+
+#: eqnparser.py:481
+#, python-format
+msgid "Variable '%s' not defined"
+msgstr "Variável '%s' não definida"
+
+#: eqnparser.py:504
+msgid "Left parenthesis unexpected"
+msgstr "Parêntesis esquerdo inesperado"
+
+#: eqnparser.py:516
+msgid "Parse error (right parenthesis)"
+msgstr "Erro de avaliação (parêntesis direito)"
+
+#: eqnparser.py:517 eqnparser.py:528 eqnparser.py:535 eqnparser.py:610
+msgid "Right parenthesis unexpected"
+msgstr "Parêntesis direito inesperado"
+
+#: eqnparser.py:527
+msgid "Parse error (right parenthesis, no left_val)"
+msgstr "Erro de avaliação (parêntesis direito, nenhum val_esq)"
+
+#: eqnparser.py:534
+msgid "Parse error (right parenthesis, no level to close)"
+msgstr "Erro de avaliação (parêntesis direito, sem nível que feche)"
+
+#: eqnparser.py:541 eqnparser.py:542
+msgid "Number not expected"
+msgstr "Número não esperado"
+
+#: eqnparser.py:550
+msgid "Operator not expected"
+msgstr "Operador não esperado"
+
+#: eqnparser.py:566
+msgid "Parse error: number or variable expected"
+msgstr "Erro de avaliação: número ou variável esperados"
+
+#: eqnparser.py:567
+msgid "Number or variable expected"
+msgstr "Número ou variável esperados"
+
+#: eqnparser.py:596
+msgid "Invalid operator"
+msgstr "Operador inválido"
+
+#: eqnparser.py:603
+msgid "Operator expected"
+msgstr "Operador esperado"
+
+#: eqnparser.py:616
+msgid "_parse(): returning None"
+msgstr "_parse(): devolvendo Nenhum"
+
+#: layout.py:60
+msgid "Edit"
+msgstr "Editar"
+
+#: layout.py:61
+msgid "Algebra"
+msgstr "Álgebra"
+
+#: layout.py:62
+msgid "Trigonometry"
+msgstr "Trigonometria"
+
+#: layout.py:63
+msgid "Boolean"
+msgstr "Booleano"
+
+#: layout.py:64
+msgid "Constants"
+msgstr "Constantes"
+
+#: layout.py:65
+msgid "Format"
+msgstr "Formato"
 
-#: toolbars.py:36
+#: layout.py:86
+msgid "Label:"
+msgstr "Etiqueta:"
+
+#: layout.py:118
+msgid "All equations"
+msgstr "Todas as equações"
+
+#: layout.py:118
+msgid "My equations"
+msgstr "Minhas equações"
+
+#: layout.py:120
+msgid "Show history"
+msgstr "Mostrar histórico"
+
+#: layout.py:120
+msgid "Show variables"
+msgstr "Mostrar variáveis"
+
+#: toolbars.py:53
 msgid "Help"
-msgstr ""
+msgstr "Ajuda"
+
+#: toolbars.py:111
+msgid "Copy"
+msgstr "Copiar"
+
+#: toolbars.py:115
+msgid "Paste"
+msgstr "Colar"
+
+#: toolbars.py:119
+msgid "Cut"
+msgstr "Cortar"
 
-#: toolbars.py:99
+#: toolbars.py:127
 msgid "Square"
-msgstr ""
+msgstr "Quadrado"
 
-#: toolbars.py:103
+#: toolbars.py:132
 msgid "Square root"
-msgstr ""
+msgstr "Raíz quadrada"
+
+#: toolbars.py:137
+msgid "Inverse"
+msgstr "Inverso"
 
-#: toolbars.py:109
+#: toolbars.py:144
 msgid "e to the power x"
-msgstr ""
+msgstr "e elevado a x"
+
+#: toolbars.py:149
+msgid "x to the power y"
+msgstr "x elevado a y"
 
-#: toolbars.py:117
+#: toolbars.py:154
 msgid "Natural logarithm"
-msgstr ""
+msgstr "Logaritmo natural"
 
-#: toolbars.py:123
+#: toolbars.py:160
 msgid "Factorial"
-msgstr ""
+msgstr "Factorial"
 
-#: toolbars.py:131
+#: toolbars.py:168
 msgid "Sine"
-msgstr ""
+msgstr "Seno"
 
-#: toolbars.py:135
+#: toolbars.py:172
 msgid "Cosine"
-msgstr ""
+msgstr "Cosseno"
 
-#: toolbars.py:139
+#: toolbars.py:176
 msgid "Tangent"
-msgstr ""
+msgstr "Tangente"
 
-#: toolbars.py:145
+#: toolbars.py:182
 msgid "Arc sine"
-msgstr ""
+msgstr "Arco-seno"
 
-#: toolbars.py:149
+#: toolbars.py:186
 msgid "Arc cosine"
-msgstr ""
+msgstr "Arco-cosseno"
 
-#: toolbars.py:153
+#: toolbars.py:190
 msgid "Arc tangent"
-msgstr ""
+msgstr "Arco-tangente"
 
-#: toolbars.py:159
+#: toolbars.py:196
 msgid "Hyperbolic sine"
-msgstr ""
+msgstr "Seno hiperbólico"
 
-#: toolbars.py:163
+#: toolbars.py:200
 msgid "Hyperbolic cosine"
-msgstr ""
+msgstr "Cosseno hiperbólico"
 
-#: toolbars.py:167
+#: toolbars.py:204
 msgid "Hyperbolic tangent"
-msgstr ""
+msgstr "Tangente hiperbólica"
 
-#: toolbars.py:175
+#: toolbars.py:212
 msgid "Logical and"
-msgstr ""
+msgstr "Conjunção lógica E"
 
-#: toolbars.py:179
+#: toolbars.py:216
 msgid "Logical or"
-msgstr ""
+msgstr "Disjunção lógica OU"
 
-#: toolbars.py:189
+#: toolbars.py:226
 msgid "Equals"
-msgstr ""
+msgstr "É igual a"
 
-#: toolbars.py:192
+#: toolbars.py:229
 msgid "Not equals"
-msgstr ""
+msgstr "Não é igual a"
 
-#: toolbars.py:199
+#: toolbars.py:236
 msgid "Pi"
-msgstr ""
+msgstr "Pi"
 
-#: toolbars.py:202
+#: toolbars.py:240
 msgid "e"
-msgstr ""
+msgstr "e"
 
-#: toolbars.py:209
+#: toolbars.py:247
 msgid "Degrees"
-msgstr ""
+msgstr "Graus"
 
-#: toolbars.py:210
+#: toolbars.py:248
 msgid "Radians"
+msgstr "Radianos"
+
+#: toolbars.py:252
+msgid "Degrees / radians"
+msgstr "Graus / radianos"
+
+#. TRANS: multiplication symbol (default: '*')
+#: mathlib.py:74
+msgid "mul_sym"
 msgstr ""
 
-#: toolbars.py:113
-msgid "x to the power y"
+#. TRANS: division symbol (default: '/')
+#: mathlib.py:79
+msgid "div_sym"
 msgstr ""
+
+#: mathlib.py:134
+msgid "Undefined"
+msgstr "Indefinido"
+
+#: mathlib.py:144
+msgid "Error: unsupported type"
+msgstr "Erro: tipo não suportado"
+
+#: calculate.py:80
+#, python-format
+msgid "Equation.parse() string invalid (%s)"
+msgstr "Avaliação.equação() texto invalido (%s)"
+
+#: calculate.py:210
+msgid "Available functions:"
+msgstr "Funções disponíveis:"
+
+#: calculate.py:504
+#, python-format
+msgid "Writing to journal (%s)"
+msgstr "Escrevendo no diário (%s)"
+
+#: calculate.py:788
+msgid "button_pressed(): invalid type"
+msgstr "botão_pressionado(): tipo inválido"
+
+#~ msgid "help_test"
+#~ msgstr "ajuda_teste"
+
+#~ msgid "help_variables"
+#~ msgstr "ajuda_variáveis"
+
+#~ msgid "Topics: "
+#~ msgstr "Tópicos: "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 50c06ec..7239e9e 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -261,16 +261,14 @@ msgstr "sep_frações"
 #. The multiplication symbol (default: '*')
 #. TRANS: multiplication symbol (default: '*')
 #: mathlib.py:74
-#, fuzzy
 msgid "mul_sym"
-msgstr "sím_mult"
+msgstr "*"
 
 #. The division symbol (default: '/')
 #. TRANS: division symbol (default: '/')
 #: mathlib.py:79
-#, fuzzy
 msgid "div_sym"
-msgstr "sím_div"
+msgstr "/"
 
 #: eqnparser.py:33
 #, fuzzy
diff --git a/po/rw.po b/po/rw.po
index 96da8ed..316fbfa 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-23 00:30-0400\n"
+"POT-Creation-Date: 2008-08-20 19:45+0530\n"
 "PO-Revision-Date: 2008-07-16 01:33+0200\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,127 +19,6 @@ msgstr ""
 msgid "Calculate"
 msgstr "Kubara"
 
-#: calculate.py:80
-#, python-format
-msgid "Equation.parse() string invalid (%s)"
-msgstr "Equation.parse() string invalid (%s)"
-
-#: calculate.py:210
-msgid "Available functions:"
-msgstr "Akamaro kaboneka"
-
-#: calculate.py:504
-#, python-format
-msgid "Writing to journal (%s)"
-msgstr "Kwandika kukinyamakuru (%s)"
-
-#: calculate.py:788
-msgid "button_pressed(): invalid type"
-msgstr "Ububuto_ bwakanzwe(): Ubwoko butemewe"
-
-#: eqnparser.py:33
-msgid "Parse error"
-msgstr "Tambutsa ikosa"
-
-#: eqnparser.py:58
-#, python-format
-msgid "level: %d, ofs %d"
-msgstr "Urwego: %d, ofs %d"
-
-#: eqnparser.py:117
-#, python-format
-msgid "Error at %d"
-msgstr "Ikosa riri %d"
-
-#: eqnparser.py:249
-#: eqnparserhelp.py:128
-msgid "Use help(test) for help about 'test', or help(index) for the index"
-msgstr "Koresha gufasha(test) kugufasha kwerekeye 'test', or gufasha(index) for the index"
-
-#: eqnparser.py:353
-#: eqnparser.py:354
-#, python-format
-msgid "Function '%s' not defined"
-msgstr "Akamaro '%s' kadasobanuwe"
-
-#: eqnparser.py:359
-#, python-format
-msgid "Invalid number of arguments (%d instead of %d)"
-msgstr "Umubare wibitekerezo  bitemewe"
-
-#: eqnparser.py:360
-#, python-format
-msgid "function takes %d args"
-msgstr "Akamaro kagyanye %d args"
-
-#: eqnparser.py:370
-#: eqnparser.py:371
-#, python-format
-msgid "Unable to parse argument %d: '%s'"
-msgstr "Kuba udashobora gutambutsa igitekerezo %d: '%s'"
-
-#: eqnparser.py:380
-#, python-format
-msgid "Function error: %s"
-msgstr "Akamaro kikosa: %s"
-
-#: eqnparser.py:481
-#, python-format
-msgid "Variable '%s' not defined"
-msgstr "Variable '%s' Idasobanuye"
-
-#: eqnparser.py:504
-msgid "Left parenthesis unexpected"
-msgstr "Agakubo k`ibumoso katari kiteguwe"
-
-#: eqnparser.py:516
-msgid "Parse error (right parenthesis)"
-msgstr "Tambutsa ikosa( agakubo k`iburyo)"
-
-#: eqnparser.py:517
-#: eqnparser.py:528
-#: eqnparser.py:535
-#: eqnparser.py:610
-msgid "Right parenthesis unexpected"
-msgstr "Agakubo k`iburyo katari kiteguwe"
-
-#: eqnparser.py:527
-msgid "Parse error (right parenthesis, no left_val)"
-msgstr "Tambutsa ikosa (agakubo k`iburyo, no left_val)"
-
-#: eqnparser.py:534
-msgid "Parse error (right parenthesis, no level to close)"
-msgstr "Tambutsa  ikosa(ikuba ryiburyo,ntarwego rufunga)"
-
-#: eqnparser.py:541
-#: eqnparser.py:542
-msgid "Number not expected"
-msgstr "Umubare utatekerezwaga"
-
-#: eqnparser.py:550
-msgid "Operator not expected"
-msgstr "Ikimenyetso kitatekerezwaga"
-
-#: eqnparser.py:566
-msgid "Parse error: number or variable expected"
-msgstr "Parse error: number or variable expected"
-
-#: eqnparser.py:567
-msgid "Number or variable expected"
-msgstr "Number or variable expected"
-
-#: eqnparser.py:596
-msgid "Invalid operator"
-msgstr "Ikimenyetso kitemewe"
-
-#: eqnparser.py:603
-msgid "Operator expected"
-msgstr "Ikimenyetso kemewe"
-
-#: eqnparser.py:616
-msgid "_parse(): returning None"
-msgstr "_parse(): returning None"
-
 #. TRANS: It is possible to translate commands. However, I would highly
 #. recommend NOT doing so for mathematical functions like cos(). help(),
 #. functions() etc should be translated.
@@ -148,48 +27,68 @@ msgid "acos"
 msgstr "acos"
 
 #: eqnparserhelp.py:40
-msgid "acos(x), return the arc cosine of x. This is the angle for which the cosine is x. Defined for -1 <= x < 1"
-msgstr "acos(x), return the arc cosine of x. This is the angle for which the cosine is x. Defined for -1 <= x < 1"
+msgid ""
+"acos(x), return the arc cosine of x. This is the angle for which the cosine "
+"is x. Defined for -1 <= x < 1"
+msgstr ""
+"acos(x), return the arc cosine of x. This is the angle for which the cosine "
+"is x. Defined for -1 <= x < 1"
 
 #: eqnparserhelp.py:43
 msgid "and"
 msgstr "Na"
 
 #: eqnparserhelp.py:44
-msgid "and(x, y), logical and. Returns True if x and y are True, else returns False"
-msgstr "and(x, y), logical and. Returns True if x and y are True, else returns False"
+msgid ""
+"and(x, y), logical and. Returns True if x and y are True, else returns False"
+msgstr ""
+"and(x, y), logical and. Returns True if x and y are True, else returns False"
 
 #: eqnparserhelp.py:46
 msgid "asin"
 msgstr "asin"
 
 #: eqnparserhelp.py:47
-msgid "asin(x), return the arc sine of x. This is the angle for which the sine is x. Defined for -1 <= x <= 1"
-msgstr "asin(x), return the arc sine of x. This is the angle for which the sine is x. Defined for -1 <= x <= 1"
+msgid ""
+"asin(x), return the arc sine of x. This is the angle for which the sine is "
+"x. Defined for -1 <= x <= 1"
+msgstr ""
+"asin(x), return the arc sine of x. This is the angle for which the sine is "
+"x. Defined for -1 <= x <= 1"
 
 #: eqnparserhelp.py:50
 msgid "atan"
 msgstr "atan"
 
 #: eqnparserhelp.py:51
-msgid "atan(x), return the arc tangent of x. This is the angle for which the tangent is x. Defined for all x"
-msgstr "atan(x), return the arc tangent of x. This is the angle for which the tangent is x. Defined for all x"
+msgid ""
+"atan(x), return the arc tangent of x. This is the angle for which the "
+"tangent is x. Defined for all x"
+msgstr ""
+"atan(x), return the arc tangent of x. This is the angle for which the "
+"tangent is x. Defined for all x"
 
 #: eqnparserhelp.py:54
 msgid "cos"
 msgstr "cos"
 
 #: eqnparserhelp.py:55
-msgid "cos(x), return the cosine of x. This is the x-coordinate on the unit circle at the angle x"
-msgstr "cos(x), return the cosine of x. This is the x-coordinate on the unit circle at the angle x"
+msgid ""
+"cos(x), return the cosine of x. This is the x-coordinate on the unit circle "
+"at the angle x"
+msgstr ""
+"cos(x), return the cosine of x. This is the x-coordinate on the unit circle "
+"at the angle x"
 
 #: eqnparserhelp.py:58
 msgid "cosh"
 msgstr "cosh"
 
 #: eqnparserhelp.py:59
-msgid "cosh(x), return the hyperbolic cosine of x. Given by (exp(x) + exp(-x)) / 2"
-msgstr "cosh(x), return the hyperbolic cosine of x. Given by (exp(x) + exp(-x)) / 2"
+msgid ""
+"cosh(x), return the hyperbolic cosine of x. Given by (exp(x) + exp(-x)) / 2"
+msgstr ""
+"cosh(x), return the hyperbolic cosine of x. Given by (exp(x) + exp(-x)) / 2"
 
 #: eqnparserhelp.py:61
 msgid "exp"
@@ -221,8 +120,12 @@ msgid "ln"
 msgstr "muri"
 
 #: eqnparserhelp.py:72
-msgid "ln(x), return the natural logarithm of x. This is the value for which the exponent exp() equals x. Defined for x >= 0."
-msgstr "ln(x), return the natural logarithm of x. This is the value for which the exponent exp() equals x. Defined for x >= 0."
+msgid ""
+"ln(x), return the natural logarithm of x. This is the value for which the "
+"exponent exp() equals x. Defined for x >= 0."
+msgstr ""
+"ln(x), return the natural logarithm of x. This is the value for which the "
+"exponent exp() equals x. Defined for x >= 0."
 
 #. TRANS: This command is descriptive, so can be translated
 #: eqnparserhelp.py:76
@@ -238,40 +141,56 @@ msgid "or"
 msgstr "cyangwa"
 
 #: eqnparserhelp.py:80
-msgid "or(x, y), logical or. Returns True if x and/or y are True, else return False"
-msgstr "or(x, y), logical or. Returns True if x and/or y are True, else return False"
+msgid ""
+"or(x, y), logical or. Returns True if x and/or y are True, else return False"
+msgstr ""
+"or(x, y), logical or. Returns True if x and/or y are True, else return False"
 
 #: eqnparserhelp.py:82
 msgid "plot"
 msgstr "plot"
 
 #: eqnparserhelp.py:83
-msgid "plot(eqn, var=-a..b), plot the equation 'eqn' with the variable 'var' in the range from a to b"
-msgstr "plot(eqn, var=-a..b), plot the equation 'eqn' with the variable 'var' in the range from a to b"
+msgid ""
+"plot(eqn, var=-a..b), plot the equation 'eqn' with the variable 'var' in the "
+"range from a to b"
+msgstr ""
+"plot(eqn, var=-a..b), plot the equation 'eqn' with the variable 'var' in the "
+"range from a to b"
 
 #: eqnparserhelp.py:86
 msgid "sin"
 msgstr "sin"
 
 #: eqnparserhelp.py:87
-msgid "sin(x), return the sine of x. This is the y-coordinate on the unit circle at the angle x"
-msgstr "sin(x), return the sine of x. This is the y-coordinate on the unit circle at the angle x"
+msgid ""
+"sin(x), return the sine of x. This is the y-coordinate on the unit circle at "
+"the angle x"
+msgstr ""
+"sin(x), return the sine of x. This is the y-coordinate on the unit circle at "
+"the angle x"
 
 #: eqnparserhelp.py:90
 msgid "sinh"
 msgstr "sinh"
 
 #: eqnparserhelp.py:91
-msgid "sinh(x), return the hyperbolic sine of x. Given by (exp(x) - exp(-x)) / 2"
-msgstr "sinh(x), return the hyperbolic sine of x. Given by (exp(x) - exp(-x)) / 2"
+msgid ""
+"sinh(x), return the hyperbolic sine of x. Given by (exp(x) - exp(-x)) / 2"
+msgstr ""
+"sinh(x), return the hyperbolic sine of x. Given by (exp(x) - exp(-x)) / 2"
 
 #: eqnparserhelp.py:93
 msgid "sqrt"
 msgstr "sqrt"
 
 #: eqnparserhelp.py:94
-msgid "sqrt(x), return the square root of x. This is the value for which the square equals x. Defined for x >= 0."
-msgstr "sqrt(x), return the square root of x. This is the value for which the square equals x. Defined for x >= 0."
+msgid ""
+"sqrt(x), return the square root of x. This is the value for which the square "
+"equals x. Defined for x >= 0."
+msgstr ""
+"sqrt(x), return the square root of x. This is the value for which the square "
+"equals x. Defined for x >= 0."
 
 #: eqnparserhelp.py:97
 msgid "square"
@@ -286,8 +205,14 @@ msgid "tan"
 msgstr "tan"
 
 #: eqnparserhelp.py:102
-msgid "tan(x), return the tangent of x. This is the slope of the line from the origin of the unit circle to the point on the unit circle defined by the angle x. Given by sin(x) / cos(x)"
-msgstr "tan(x), return the tangent of x. This is the slope of the line from the origin of the unit circle to the point on the unit circle defined by the angle x. Given by sin(x) / cos(x)"
+msgid ""
+"tan(x), return the tangent of x. This is the slope of the line from the "
+"origin of the unit circle to the point on the unit circle defined by the "
+"angle x. Given by sin(x) / cos(x)"
+msgstr ""
+"tan(x), return the tangent of x. This is the slope of the line from the "
+"origin of the unit circle to the point on the unit circle defined by the "
+"angle x. Given by sin(x) / cos(x)"
 
 #: eqnparserhelp.py:106
 msgid "tanh"
@@ -319,8 +244,18 @@ msgid "xor"
 msgstr "xor"
 
 #: eqnparserhelp.py:117
-msgid "xor(x, y), logical xor. Returns True if either x is True (and y is False) or y is True (and x is False), else returns False"
-msgstr "xor(x, y), logical xor. Returns True if either x is True (and y is False) or y is True (and x is False), else returns False"
+msgid ""
+"xor(x, y), logical xor. Returns True if either x is True (and y is False) or "
+"y is True (and x is False), else returns False"
+msgstr ""
+"xor(x, y), logical xor. Returns True if either x is True (and y is False) or "
+"y is True (and x is False), else returns False"
+
+#: eqnparserhelp.py:128 eqnparser.py:249
+msgid "Use help(test) for help about 'test', or help(index) for the index"
+msgstr ""
+"Koresha gufasha(test) kugufasha kwerekeye 'test', or gufasha(index) for the "
+"index"
 
 #. TRANS: help(index), both 'index' and the translation  will work
 #: eqnparserhelp.py:131
@@ -336,6 +271,98 @@ msgstr "Imitwe yingenzi"
 msgid "No help about '%s' available, use help(index) for the index"
 msgstr "No help about '%s' available, use help(index) for the index"
 
+#: eqnparser.py:33
+msgid "Parse error"
+msgstr "Tambutsa ikosa"
+
+#: eqnparser.py:58
+#, python-format
+msgid "level: %d, ofs %d"
+msgstr "Urwego: %d, ofs %d"
+
+#: eqnparser.py:117
+#, python-format
+msgid "Error at %d"
+msgstr "Ikosa riri %d"
+
+#: eqnparser.py:353 eqnparser.py:354
+#, python-format
+msgid "Function '%s' not defined"
+msgstr "Akamaro '%s' kadasobanuwe"
+
+#: eqnparser.py:359
+#, python-format
+msgid "Invalid number of arguments (%d instead of %d)"
+msgstr ""
+
+#: eqnparser.py:360
+#, python-format
+msgid "function takes %d args"
+msgstr "Akamaro kagyanye %d args"
+
+#: eqnparser.py:370 eqnparser.py:371
+#, python-format
+msgid "Unable to parse argument %d: '%s'"
+msgstr "Kuba udashobora gutambutsa igitekerezo %d: '%s'"
+
+#: eqnparser.py:380
+#, python-format
+msgid "Function error: %s"
+msgstr "Akamaro kikosa: %s"
+
+#: eqnparser.py:481
+#, python-format
+msgid "Variable '%s' not defined"
+msgstr "Variable '%s' Idasobanuye"
+
+#: eqnparser.py:504
+msgid "Left parenthesis unexpected"
+msgstr "Agakubo k`ibumoso katari kiteguwe"
+
+#: eqnparser.py:516
+msgid "Parse error (right parenthesis)"
+msgstr "Tambutsa ikosa( agakubo k`iburyo)"
+
+#: eqnparser.py:517 eqnparser.py:528 eqnparser.py:535 eqnparser.py:610
+msgid "Right parenthesis unexpected"
+msgstr "Agakubo k`iburyo katari kiteguwe"
+
+#: eqnparser.py:527
+msgid "Parse error (right parenthesis, no left_val)"
+msgstr "Tambutsa ikosa (agakubo k`iburyo, no left_val)"
+
+#: eqnparser.py:534
+msgid "Parse error (right parenthesis, no level to close)"
+msgstr "Tambutsa  ikosa(ikuba ryiburyo,ntarwego rufunga)"
+
+#: eqnparser.py:541 eqnparser.py:542
+msgid "Number not expected"
+msgstr "Umubare utatekerezwaga"
+
+#: eqnparser.py:550
+msgid "Operator not expected"
+msgstr "Ikimenyetso kitatekerezwaga"
+
+#: eqnparser.py:566
+msgid "Parse error: number or variable expected"
+msgstr "Parse error: number or variable expected"
+
+#: eqnparser.py:567
+msgid "Number or variable expected"
+msgstr "Number or variable expected"
+
+#: eqnparser.py:596
+msgid "Invalid operator"
+msgstr "Ikimenyetso kitemewe"
+
+#: eqnparser.py:603
+msgid "Operator expected"
+msgstr "Ikimenyetso kemewe"
+
+#: eqnparser.py:616
+msgid "_parse(): returning None"
+msgstr "_parse(): returning None"
+
 #: layout.py:60
 msgid "Edit"
 msgstr "Hindura"
@@ -380,24 +407,6 @@ msgstr "Erekana amateka"
 msgid "Show variables"
 msgstr "Show variables"
 
-#. TRANS: multiplication symbol (default: '*')
-#: mathlib.py:74
-msgid "mul_sym"
-msgstr "mul_sym"
-
-#. TRANS: division symbol (default: '/')
-#: mathlib.py:79
-msgid "div_sym"
-msgstr "div_sym"
-
-#: mathlib.py:134
-msgid "Undefined"
-msgstr "Ikidasobanuye"
-
-#: mathlib.py:144
-msgid "Error: unsupported type"
-msgstr "Ikosa:ubwoko budafashijwe"
-
 #: toolbars.py:53
 msgid "Help"
 msgstr "Gufasha"
@@ -514,3 +523,38 @@ msgstr "Radians"
 msgid "Degrees / radians"
 msgstr "Ingano/radians"
 
+#. TRANS: multiplication symbol (default: '*')
+#: mathlib.py:74
+msgid "mul_sym"
+msgstr "*"
+
+#. TRANS: division symbol (default: '/')
+#: mathlib.py:79
+msgid "div_sym"
+msgstr "/"
+
+#: mathlib.py:134
+msgid "Undefined"
+msgstr "Ikidasobanuye"
+
+#: mathlib.py:144
+msgid "Error: unsupported type"
+msgstr "Ikosa:ubwoko budafashijwe"
+
+#: calculate.py:80
+#, python-format
+msgid "Equation.parse() string invalid (%s)"
+msgstr "Equation.parse() string invalid (%s)"
+
+#: calculate.py:210
+msgid "Available functions:"
+msgstr "Akamaro kaboneka"
+
+#: calculate.py:504
+#, python-format
+msgid "Writing to journal (%s)"
+msgstr "Kwandika kukinyamakuru (%s)"
+
+#: calculate.py:788
+msgid "button_pressed(): invalid type"
+msgstr "Ububuto_ bwakanzwe(): Ubwoko butemewe"
diff --git a/po/sl.po b/po/sl.po
index a3dd0ba..fc12f38 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -403,12 +403,12 @@ msgstr "Pokaži spremenljivke"
 #. TRANS: multiplication symbol (default: '*')
 #: mathlib.py:74
 msgid "mul_sym"
-msgstr "mul_sym"
+msgstr "*"
 
 #. TRANS: division symbol (default: '/')
 #: mathlib.py:79
 msgid "div_sym"
-msgstr "div_sym"
+msgstr "/"
 
 #: mathlib.py:134
 msgid "Undefined"
diff --git a/po/te.po b/po/te.po
index 9e031b3..761cad7 100644
--- a/po/te.po
+++ b/po/te.po
@@ -439,12 +439,12 @@ msgstr "వేరియబుల్స్ ని చూపుము"
 #. TRANS: multiplication symbol (default: '*')
 #: mathlib.py:74
 msgid "mul_sym"
-msgstr "ముల్_సిమ్"
+msgstr "*"
 
 #. TRANS: division symbol (default: '/')
 #: mathlib.py:79
 msgid "div_sym"
-msgstr "డివ్_సిమ్"
+msgstr "/"
 
 #: mathlib.py:134
 msgid "Undefined"
diff --git a/po/tr.po b/po/tr.po
index 2c613d8..08ceb93 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,297 +6,195 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-12 00:30-0500\n"
-"PO-Revision-Date: 2008-02-18 23:04-0500\n"
-"Last-Translator: Serkan Cabi <serkancabi@gmail.com>\n"
+"POT-Creation-Date: 2008-08-20 19:45+0530\n"
+"PO-Revision-Date: 2008-08-26 04:57-0400\n"
+"Last-Translator: abdullah kocabas <abdullah.kocabas@abcdizustu.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.0.2\n"
+"X-Generator: Pootle 1.1.0rc2\n"
 
 #: activity/activity.info:2
 msgid "Calculate"
-msgstr "Hesapla"
-
-#: calculate.py:80
-#, python-format
-msgid "Equation.parse() string invalid (%s)"
-msgstr ""
-
-#: calculate.py:210
-msgid "Available functions:"
-msgstr ""
-
-#: calculate.py:504
-#, python-format
-msgid "Writing to journal (%s)"
-msgstr ""
-
-#: calculate.py:788
-msgid "button_pressed(): invalid type"
-msgstr ""
-
-#: eqnparser.py:33
-msgid "Parse error"
-msgstr ""
-
-#: eqnparser.py:58
-#, python-format
-msgid "level: %d, ofs %d"
-msgstr ""
-
-#: eqnparser.py:117
-#, python-format
-msgid "Error at %d"
-msgstr ""
-
-#: eqnparser.py:249 eqnparserhelp.py:128
-msgid "Use help(test) for help about 'test', or help(index) for the index"
-msgstr ""
-
-#: eqnparser.py:353 eqnparser.py:354
-#, python-format
-msgid "Function '%s' not defined"
-msgstr ""
-
-#: eqnparser.py:359
-#, python-format
-msgid "Invalid number of arguments (%d instead of %d)"
-msgstr ""
-
-#: eqnparser.py:360
-#, python-format
-msgid "function takes %d args"
-msgstr ""
-
-#: eqnparser.py:370 eqnparser.py:371
-#, python-format
-msgid "Unable to parse argument %d: '%s'"
-msgstr ""
-
-#: eqnparser.py:380
-#, python-format
-msgid "Function error: %s"
-msgstr ""
-
-#: eqnparser.py:481
-#, python-format
-msgid "Variable '%s' not defined"
-msgstr ""
-
-#: eqnparser.py:504
-msgid "Left parenthesis unexpected"
-msgstr ""
-
-#: eqnparser.py:516
-msgid "Parse error (right parenthesis)"
-msgstr ""
-
-#: eqnparser.py:517 eqnparser.py:528 eqnparser.py:535 eqnparser.py:610
-msgid "Right parenthesis unexpected"
-msgstr ""
-
-#: eqnparser.py:527
-msgid "Parse error (right parenthesis, no left_val)"
-msgstr ""
-
-#: eqnparser.py:534
-msgid "Parse error (right parenthesis, no level to close)"
-msgstr ""
-
-#: eqnparser.py:541 eqnparser.py:542
-msgid "Number not expected"
-msgstr ""
-
-#: eqnparser.py:550
-msgid "Operator not expected"
-msgstr ""
-
-#: eqnparser.py:566
-msgid "Parse error: number or variable expected"
-msgstr ""
-
-#: eqnparser.py:567
-msgid "Number or variable expected"
-msgstr ""
-
-#: eqnparser.py:596
-msgid "Invalid operator"
-msgstr ""
-
-#: eqnparser.py:603
-msgid "Operator expected"
-msgstr ""
-
-#: eqnparser.py:616
-msgid "_parse(): returning None"
-msgstr ""
+msgstr "Hesaplayınız"
 
 #. TRANS: It is possible to translate commands. However, I would highly
 #. recommend NOT doing so for mathematical functions like cos(). help(),
 #. functions() etc should be translated.
 #: eqnparserhelp.py:39
 msgid "acos"
-msgstr ""
+msgstr "acos"
 
 #: eqnparserhelp.py:40
 msgid ""
 "acos(x), return the arc cosine of x. This is the angle for which the cosine "
 "is x. Defined for -1 <= x < 1"
-msgstr ""
+msgstr "acos(x) arc kosinüs(x)'e dönüyor. bu açı için kosinüs x'tir. -1 <=x< 1"
 
 #: eqnparserhelp.py:43
 msgid "and"
-msgstr ""
+msgstr "ve"
 
 #: eqnparserhelp.py:44
 msgid ""
 "and(x, y), logical and. Returns True if x and y are True, else returns False"
 msgstr ""
+"ve(x,y), mantıksal doğrulamadır. x ve y doğruysa sonuç doğrudur, değilse "
+"sonuç yanlıştır."
 
 #: eqnparserhelp.py:46
 msgid "asin"
-msgstr ""
+msgstr "asinüs"
 
 #: eqnparserhelp.py:47
 msgid ""
 "asin(x), return the arc sine of x. This is the angle for which the sine is "
 "x. Defined for -1 <= x <= 1"
-msgstr ""
+msgstr "asin(x), arc sinüs x oluyor. bu açı için sinüs x'tir. -1 <=x <=1"
 
 #: eqnparserhelp.py:50
 msgid "atan"
-msgstr ""
+msgstr "atan"
 
 #: eqnparserhelp.py:51
 msgid ""
 "atan(x), return the arc tangent of x. This is the angle for which the "
 "tangent is x. Defined for all x"
 msgstr ""
+"atan(x), arc tanjant x oluyor. bu açı için tanjant x'tir.tüm x'ler için "
+"geçerlidir"
 
 #: eqnparserhelp.py:54
 msgid "cos"
-msgstr ""
+msgstr "cos"
 
 #: eqnparserhelp.py:55
 msgid ""
 "cos(x), return the cosine of x. This is the x-coordinate on the unit circle "
 "at the angle x"
 msgstr ""
+"cos(x), kosinüs x oluyor. bu, birim çemberde x açısında x-doğrusu oluyor."
 
 #: eqnparserhelp.py:58
 msgid "cosh"
-msgstr ""
+msgstr "cosh"
 
 #: eqnparserhelp.py:59
 msgid ""
 "cosh(x), return the hyperbolic cosine of x. Given by (exp(x) + exp(-x)) / 2"
-msgstr ""
+msgstr "cosh(x), hiperbol kosinüs x oluyor. (exp(x) + exp(-x)) /2 verir."
 
 #: eqnparserhelp.py:61
 msgid "exp"
-msgstr ""
+msgstr "exp"
 
 #: eqnparserhelp.py:62
 msgid "exp(x), return the natural exponent of x. Given by e^x"
-msgstr ""
+msgstr "exp(x) x'in doğal üssüdür. e^x verir."
 
 #: eqnparserhelp.py:64
 msgid "fac"
-msgstr ""
+msgstr "çarpan"
 
 #: eqnparserhelp.py:65
 msgid "fac(x), return the factorial of x. Given by x * (x - 1) * (x - 2) * ..."
-msgstr ""
+msgstr "fac(x), x'in faktörüdür. x*(x-1) * (x-2) *... verir."
 
 #. TRANS: This command is descriptive, so can be translated
 #: eqnparserhelp.py:68
 msgid "functions"
-msgstr ""
+msgstr "kuvvetleri"
 
 #: eqnparserhelp.py:69
 msgid "functions(), return a list of all the functions that are defined"
-msgstr ""
+msgstr "kuvvetler(), tanımlı tüm kuvvetlerinin listesini verir"
 
 #: eqnparserhelp.py:71
 msgid "ln"
-msgstr ""
+msgstr "ln"
 
 #: eqnparserhelp.py:72
 msgid ""
 "ln(x), return the natural logarithm of x. This is the value for which the "
 "exponent exp() equals x. Defined for x >= 0."
 msgstr ""
+"ln(x), x'in doğal logaritmasını verir. bu değer için exp() üssü x'e eşittir. "
+"x >=0"
 
 #. TRANS: This command is descriptive, so can be translated
 #: eqnparserhelp.py:76
 msgid "operators"
-msgstr ""
+msgstr "kullanıcılar"
 
 #: eqnparserhelp.py:77
 msgid "operators(), return a list of the operators that are defined"
-msgstr ""
+msgstr "operatörler(), tanımlı operatörlerin listesini verir"
 
 #: eqnparserhelp.py:79
 msgid "or"
-msgstr ""
+msgstr "veya"
 
 #: eqnparserhelp.py:80
 msgid ""
 "or(x, y), logical or. Returns True if x and/or y are True, else return False"
 msgstr ""
+"seçenek(x,y), mantıksal seçeneklemedir. x ve/veya y doğruysa doğrudur, "
+"değilse yanlıştır"
 
 #: eqnparserhelp.py:82
 msgid "plot"
-msgstr ""
+msgstr "çiziniz"
 
 #: eqnparserhelp.py:83
 msgid ""
 "plot(eqn, var=-a..b), plot the equation 'eqn' with the variable 'var' in the "
 "range from a to b"
 msgstr ""
+"plot(eqn, var=-a..b), 'eqn' eşitliğini 'var' değişkeniyle a'dan b'ye çizer"
 
 #: eqnparserhelp.py:86
 msgid "sin"
-msgstr ""
+msgstr "sinüs"
 
 #: eqnparserhelp.py:87
 msgid ""
 "sin(x), return the sine of x. This is the y-coordinate on the unit circle at "
 "the angle x"
-msgstr ""
+msgstr "sin(x) sinüs x'i verir. birim çemberde x açısında y-doğrusudur."
 
 #: eqnparserhelp.py:90
 msgid "sinh"
-msgstr ""
+msgstr "sinh"
 
 #: eqnparserhelp.py:91
 msgid ""
 "sinh(x), return the hyperbolic sine of x. Given by (exp(x) - exp(-x)) / 2"
-msgstr ""
+msgstr "sinh(x), hyperbolic sinüs x'i verir. (exp(x) - exp(-x)) /2 verir"
 
 #: eqnparserhelp.py:93
 msgid "sqrt"
-msgstr ""
+msgstr "sqrt"
 
 #: eqnparserhelp.py:94
 msgid ""
 "sqrt(x), return the square root of x. This is the value for which the square "
 "equals x. Defined for x >= 0."
 msgstr ""
+"sqrt(x), karekök x'i verir. bu değer için kare x'e eşittir. x>=0 için "
+"tanımlıdır."
 
 #: eqnparserhelp.py:97
 msgid "square"
-msgstr ""
+msgstr "kare"
 
 #: eqnparserhelp.py:98
 msgid "square(x), return the square of x. Given by x * x"
-msgstr ""
+msgstr "kare(x), x'in karesini verir. x*x ile gösterilir"
 
 #: eqnparserhelp.py:101
 msgid "tan"
-msgstr ""
+msgstr "tanjant"
 
 #: eqnparserhelp.py:102
 msgid ""
@@ -304,226 +202,352 @@ msgid ""
 "origin of the unit circle to the point on the unit circle defined by the "
 "angle x. Given by sin(x) / cos(x)"
 msgstr ""
+"tan(x), tanjant x'i verir. bu değer, birim çemberin merkezinden çıkan ve "
+"birim çember üzerinde x açısıyla belirlenmiş bir noktanın arasında kalan "
+"doğrunun eğimini verir. sin(x) / cos(x) ile gösterilir"
 
 #: eqnparserhelp.py:106
 msgid "tanh"
-msgstr ""
+msgstr "tanh"
 
 #: eqnparserhelp.py:107
-msgid "sinh(x), return the hyperbolic tangent of x. Given by sinh(x) / cosh(x)"
-msgstr ""
+msgid "tanh(x), return the hyperbolic tangent of x. Given by sinh(x) / cosh(x)"
+msgstr "tanh(x), hiperbolik tanjant x'i verir. sinh(x) / cosh(x) ile gösterilir"
 
 #: eqnparserhelp.py:109
 msgid "test"
-msgstr ""
+msgstr "deneme"
 
 #: eqnparserhelp.py:110
 msgid "This is just a test topic, use help(index) for the index"
-msgstr ""
+msgstr "bu sadece bir deneme konusudur, içerik için yardım(içerik)'i kullanın"
 
 #. TRANS: This command is descriptive, so can be translated
 #: eqnparserhelp.py:113
 msgid "variables"
-msgstr ""
+msgstr "değişkenler"
 
 #: eqnparserhelp.py:114
 msgid "variables(), return a list of the variables that are currently defined"
-msgstr ""
+msgstr "değişkenler(), şu anda geçerli değişkenlerin bir listesini verir."
 
 #: eqnparserhelp.py:116
 msgid "xor"
-msgstr ""
+msgstr "xor"
 
 #: eqnparserhelp.py:117
 msgid ""
 "xor(x, y), logical xor. Returns True if either x is True (and y is False) or "
 "y is True (and x is False), else returns False"
 msgstr ""
+"xor(x,y) mantıksal xor'dur. x doğru (ve y yanlışsa)veya y doğru ( ve x "
+"yanlışsa) ise doğrudur, değilse yanlıştır."
+
+#: eqnparserhelp.py:128 eqnparser.py:249
+msgid "Use help(test) for help about 'test', or help(index) for the index"
+msgstr ""
+"'test'ler hakkında yardım için yardım(test)i kullanın ya da içerik için "
+"yardım(içerik)i kullanın."
 
 #. TRANS: help(index), both 'index' and the translation  will work
 #: eqnparserhelp.py:131
 msgid "index"
-msgstr ""
+msgstr "içerik"
 
 #: eqnparserhelp.py:132
 msgid "Topics"
-msgstr ""
+msgstr "konular"
 
 #: eqnparserhelp.py:143
 #, python-format
 msgid "No help about '%s' available, use help(index) for the index"
 msgstr ""
+"'%s' hakkında yardım mevcut değil, içerik için yardım(içerik)'i kullanın."
+
+#: eqnparser.py:33
+msgid "Parse error"
+msgstr "ayrım hatası"
+
+#: eqnparser.py:58
+#, python-format
+msgid "level: %d, ofs %d"
+msgstr "seviye: %d'nin %d'sidir."
+
+#: eqnparser.py:117
+#, python-format
+msgid "Error at %d"
+msgstr "%d'de hata vardır."
+
+#: eqnparser.py:353 eqnparser.py:354
+#, python-format
+msgid "Function '%s' not defined"
+msgstr "'%s' fonksiyonu tanımlı değildir."
+
+#: eqnparser.py:359
+#, python-format
+msgid "Invalid number of arguments (%d instead of %d)"
+msgstr "geçersiz argüman sayısı (%d yerine %d)"
+
+#: eqnparser.py:360
+#, python-format
+msgid "function takes %d args"
+msgstr "fonksiyon %d args alır."
+
+#: eqnparser.py:370 eqnparser.py:371
+#, python-format
+msgid "Unable to parse argument %d: '%s'"
+msgstr "%d argümanını ayıramıyor: '%s'"
+
+#: eqnparser.py:380
+#, python-format
+msgid "Function error: %s"
+msgstr "görev hatası: %s"
+
+#: eqnparser.py:481
+#, python-format
+msgid "Variable '%s' not defined"
+msgstr "'%s' değişkeni tanımlanamıyor."
+
+#: eqnparser.py:504
+msgid "Left parenthesis unexpected"
+msgstr "sol parantezler kullanılmamış."
+
+#: eqnparser.py:516
+msgid "Parse error (right parenthesis)"
+msgstr "ayırma hatası (sağ parantezler)"
+
+#: eqnparser.py:517 eqnparser.py:528 eqnparser.py:535 eqnparser.py:610
+msgid "Right parenthesis unexpected"
+msgstr "sağ parantezler kullanılmamıştır."
+
+#: eqnparser.py:527
+msgid "Parse error (right parenthesis, no left_val)"
+msgstr "ayırma hatası (sağ parantez, solda boşluk yok)"
+
+#: eqnparser.py:534
+msgid "Parse error (right parenthesis, no level to close)"
+msgstr "ayırma hatası (sağ parantez, kapatma yeri yok)"
+
+#: eqnparser.py:541 eqnparser.py:542
+msgid "Number not expected"
+msgstr "sayı kullanılmıyor."
+
+#: eqnparser.py:550
+msgid "Operator not expected"
+msgstr "işletici kullanılmıyor."
+
+#: eqnparser.py:566
+msgid "Parse error: number or variable expected"
+msgstr "ayırma hatası: sayı ya da değişken bekleniyor."
+
+#: eqnparser.py:567
+msgid "Number or variable expected"
+msgstr "sayı ya da değişken bekleniyor."
+
+#: eqnparser.py:596
+msgid "Invalid operator"
+msgstr "geçersiz işletici"
+
+#: eqnparser.py:603
+msgid "Operator expected"
+msgstr "işletici bekleniyor."
+
+#: eqnparser.py:616
+msgid "_parse(): returning None"
+msgstr "_ayrım(): hiçbirine dönmeyiniz."
 
 #: layout.py:60
 msgid "Edit"
-msgstr ""
+msgstr "düzenleyiniz."
 
 #: layout.py:61
 msgid "Algebra"
-msgstr ""
+msgstr "cebir"
 
 #: layout.py:62
 msgid "Trigonometry"
-msgstr ""
+msgstr "trigonometri"
 
 #: layout.py:63
 msgid "Boolean"
-msgstr ""
+msgstr "doğru ve yanlış değer alan"
 
 #: layout.py:64
 msgid "Constants"
-msgstr ""
+msgstr "sabit değerler"
 
 #: layout.py:65
 msgid "Format"
-msgstr ""
+msgstr "biçim"
 
 #: layout.py:86
 msgid "Label:"
-msgstr ""
+msgstr "etiket"
 
 #: layout.py:118
 msgid "All equations"
-msgstr ""
+msgstr "tüm eşitlikler"
 
 #: layout.py:118
 msgid "My equations"
-msgstr ""
+msgstr "eşitliklerim"
 
 #: layout.py:120
 msgid "Show history"
-msgstr ""
+msgstr "geçmişi gösteriniz."
 
 #: layout.py:120
 msgid "Show variables"
-msgstr ""
-
-#. TRANS: multiplication symbol (default: '*')
-#: mathlib.py:74
-msgid "mul_sym"
-msgstr ""
-
-#. TRANS: division symbol (default: '/')
-#: mathlib.py:79
-msgid "div_sym"
-msgstr ""
-
-#: mathlib.py:132
-msgid "Undefined"
-msgstr ""
-
-#: mathlib.py:142
-msgid "Error: unsupported type"
-msgstr ""
+msgstr "değişkenleri gösteriniz."
 
-#: toolbars.py:36
+#: toolbars.py:53
 msgid "Help"
-msgstr ""
+msgstr "yardım"
 
-#: toolbars.py:86
+#: toolbars.py:111
 msgid "Copy"
-msgstr ""
+msgstr "kopyalayınız."
 
-#: toolbars.py:89
+#: toolbars.py:115
 msgid "Paste"
-msgstr ""
+msgstr "yapıştırınız."
 
-#: toolbars.py:92
+#: toolbars.py:119
 msgid "Cut"
-msgstr ""
+msgstr "kesiniz."
 
-#: toolbars.py:99
+#: toolbars.py:127
 msgid "Square"
-msgstr ""
+msgstr "kare"
 
-#: toolbars.py:103
+#: toolbars.py:132
 msgid "Square root"
-msgstr ""
+msgstr "karekök"
 
-#: toolbars.py:107
+#: toolbars.py:137
 msgid "Inverse"
-msgstr ""
+msgstr "ters"
 
-#: toolbars.py:113
+#: toolbars.py:144
 msgid "e to the power x"
-msgstr ""
+msgstr "e üssü x"
 
-#: toolbars.py:117
+#: toolbars.py:149
 msgid "x to the power y"
-msgstr ""
+msgstr "x üssü y"
 
-#: toolbars.py:121
+#: toolbars.py:154
 msgid "Natural logarithm"
-msgstr ""
+msgstr "doğal logaritma"
 
-#: toolbars.py:127
+#: toolbars.py:160
 msgid "Factorial"
-msgstr ""
+msgstr "çarpım"
 
-#: toolbars.py:135
+#: toolbars.py:168
 msgid "Sine"
-msgstr ""
+msgstr "sine"
 
-#: toolbars.py:139
+#: toolbars.py:172
 msgid "Cosine"
-msgstr ""
+msgstr "cosine"
 
-#: toolbars.py:143
+#: toolbars.py:176
 msgid "Tangent"
-msgstr ""
+msgstr "tanjant"
 
-#: toolbars.py:149
+#: toolbars.py:182
 msgid "Arc sine"
-msgstr ""
+msgstr "Arc sine"
 
-#: toolbars.py:153
+#: toolbars.py:186
 msgid "Arc cosine"
-msgstr ""
+msgstr "Arc cosine"
 
-#: toolbars.py:157
+#: toolbars.py:190
 msgid "Arc tangent"
-msgstr ""
+msgstr "Arc tanjant"
 
-#: toolbars.py:163
+#: toolbars.py:196
 msgid "Hyperbolic sine"
-msgstr ""
+msgstr "hiperbolik sine"
 
-#: toolbars.py:167
+#: toolbars.py:200
 msgid "Hyperbolic cosine"
-msgstr ""
+msgstr "hiperbolik cosine"
 
-#: toolbars.py:171
+#: toolbars.py:204
 msgid "Hyperbolic tangent"
-msgstr ""
+msgstr "hiperbolik tanjant"
 
-#: toolbars.py:179
+#: toolbars.py:212
 msgid "Logical and"
-msgstr ""
+msgstr "mantıksal doğrulama"
 
-#: toolbars.py:183
+#: toolbars.py:216
 msgid "Logical or"
-msgstr ""
+msgstr "mantıksal seçenekleme"
 
-#: toolbars.py:193
+#: toolbars.py:226
 msgid "Equals"
-msgstr ""
+msgstr "eşit"
 
-#: toolbars.py:196
+#: toolbars.py:229
 msgid "Not equals"
-msgstr ""
+msgstr "eşit değil"
 
-#: toolbars.py:203
+#: toolbars.py:236
 msgid "Pi"
-msgstr ""
+msgstr "pi"
 
-#: toolbars.py:206
+#: toolbars.py:240
 msgid "e"
-msgstr ""
+msgstr "e"
 
-#: toolbars.py:213
+#: toolbars.py:247
 msgid "Degrees"
-msgstr ""
+msgstr "derece"
 
-#: toolbars.py:214
+#: toolbars.py:248
 msgid "Radians"
-msgstr ""
+msgstr "radyan"
+
+#: toolbars.py:252
+msgid "Degrees / radians"
+msgstr "radyan derecesi"
+
+#. TRANS: multiplication symbol (default: '*')
+#: mathlib.py:74
+msgid "mul_sym"
+msgstr "çarpma sembolü '*'"
+
+#. TRANS: division symbol (default: '/')
+#: mathlib.py:79
+msgid "div_sym"
+msgstr "bölme sembolü '/'"
+
+#: mathlib.py:134
+msgid "Undefined"
+msgstr "tanımsız"
+
+#: mathlib.py:144
+msgid "Error: unsupported type"
+msgstr "hata: desteklenmeyen tür"
+
+#: calculate.py:80
+#, python-format
+msgid "Equation.parse() string invalid (%s)"
+msgstr "eşitlik.ayırma() dizi geçerli değildir (%s)."
+
+#: calculate.py:210
+msgid "Available functions:"
+msgstr "geçerli fonksiyonlar"
+
+#: calculate.py:504
+#, python-format
+msgid "Writing to journal (%s)"
+msgstr "günlüğe yazınız (%s)."
+
+#: calculate.py:788
+msgid "button_pressed(): invalid type"
+msgstr "basılan tuş: geçersiz türdür."
diff --git a/po/ur.po b/po/ur.po
index d97fe21..3cbdd6b 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -435,12 +435,12 @@ msgstr "ويری ايبل ديکھائيں"
 #. TRANS: multiplication symbol (default: '*')
 #: mathlib.py:74
 msgid "mul_sym"
-msgstr "ضرب_ايس وائی ايم"
+msgstr "*"
 
 #. TRANS: division symbol (default: '/')
 #: mathlib.py:79
 msgid "div_sym"
-msgstr "تقسيم"
+msgstr "/"
 
 #: mathlib.py:134
 msgid "Undefined"
diff --git a/setup.py b/setup.py
index 652db6b..ec0f64e 100755
--- a/setup.py
+++ b/setup.py
@@ -1,3 +1,3 @@
 #!/usr/bin/env python
 from sugar.activity import bundlebuilder
-bundlebuilder.start('Calculate')
+bundlebuilder.start()