Merge commit '96b89bc07' into upstream

11 files changed, 2429 insertions, 1467 deletions

diff --git a/MANIFEST b/MANIFEST
index 3242ddc..7acdd8f 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,3 +1,5 @@
+activity/activity.info
+activity/calculate.svg
 calculate.py
 eqnparser.py
 eqnparserhelp.py
@@ -31,6 +33,124 @@ icons/trigonometry-acos.svg
 icons/trigonometry-tanh.svg
 icons/trigonometry-sinh.svg
 icons/trigonometry-cosh.svg
+locale/ar/LC_MESSAGES/org.laptop.Calculate.mo
+locale/ar/activity.linfo
+locale/tr/LC_MESSAGES/org.laptop.Calculate.mo
+locale/tr/activity.linfo
+locale/tpi/LC_MESSAGES/org.laptop.Calculate.mo
+locale/tpi/activity.linfo
+locale/en/LC_MESSAGES/org.laptop.Calculate.mo
+locale/en/activity.linfo
+locale/si/LC_MESSAGES/org.laptop.Calculate.mo
+locale/si/activity.linfo
+locale/es/LC_MESSAGES/org.laptop.Calculate.mo
+locale/es/activity.linfo
+locale/hi/LC_MESSAGES/org.laptop.Calculate.mo
+locale/hi/activity.linfo
+locale/sd/LC_MESSAGES/org.laptop.Calculate.mo
+locale/sd/activity.linfo
+locale/mk/LC_MESSAGES/org.laptop.Calculate.mo
+locale/mk/activity.linfo
+locale/ne/LC_MESSAGES/org.laptop.Calculate.mo
+locale/ne/activity.linfo
+locale/vi/LC_MESSAGES/org.laptop.Calculate.mo
+locale/vi/activity.linfo
+locale/bn/LC_MESSAGES/org.laptop.Calculate.mo
+locale/bn/activity.linfo
+locale/ja/LC_MESSAGES/org.laptop.Calculate.mo
+locale/ja/activity.linfo
+locale/ay/LC_MESSAGES/org.laptop.Calculate.mo
+locale/ay/activity.linfo
+locale/te/LC_MESSAGES/org.laptop.Calculate.mo
+locale/te/activity.linfo
+locale/th/LC_MESSAGES/org.laptop.Calculate.mo
+locale/th/activity.linfo
+locale/mn/LC_MESSAGES/org.laptop.Calculate.mo
+locale/mn/activity.linfo
+locale/is/LC_MESSAGES/org.laptop.Calculate.mo
+locale/is/activity.linfo
+locale/mr/LC_MESSAGES/org.laptop.Calculate.mo
+locale/mr/activity.linfo
+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
+locale/ht/activity.linfo
+locale/it/LC_MESSAGES/org.laptop.Calculate.mo
+locale/it/activity.linfo
+locale/ko/LC_MESSAGES/org.laptop.Calculate.mo
+locale/ko/activity.linfo
+locale/gu/LC_MESSAGES/org.laptop.Calculate.mo
+locale/gu/activity.linfo
+locale/nl/LC_MESSAGES/org.laptop.Calculate.mo
+locale/nl/activity.linfo
+locale/ur/LC_MESSAGES/org.laptop.Calculate.mo
+locale/ur/activity.linfo
+locale/yo/LC_MESSAGES/org.laptop.Calculate.mo
+locale/yo/activity.linfo
+locale/ml/LC_MESSAGES/org.laptop.Calculate.mo
+locale/ml/activity.linfo
+locale/am/LC_MESSAGES/org.laptop.Calculate.mo
+locale/am/activity.linfo
+locale/de/LC_MESSAGES/org.laptop.Calculate.mo
+locale/de/activity.linfo
+locale/nb/LC_MESSAGES/org.laptop.Calculate.mo
+locale/nb/activity.linfo
+locale/rw/LC_MESSAGES/org.laptop.Calculate.mo
+locale/rw/activity.linfo
+locale/sl/LC_MESSAGES/org.laptop.Calculate.mo
+locale/sl/activity.linfo
+locale/pt_BR/LC_MESSAGES/org.laptop.Calculate.mo
+locale/pt_BR/activity.linfo
+locale/pl/LC_MESSAGES/org.laptop.Calculate.mo
+locale/pl/activity.linfo
+locale/af/LC_MESSAGES/org.laptop.Calculate.mo
+locale/af/activity.linfo
+locale/ha/LC_MESSAGES/org.laptop.Calculate.mo
+locale/ha/activity.linfo
+locale/ig/LC_MESSAGES/org.laptop.Calculate.mo
+locale/ig/activity.linfo
+locale/pis/LC_MESSAGES/org.laptop.Calculate.mo
+locale/pis/activity.linfo
+locale/fa_AF/LC_MESSAGES/org.laptop.Calculate.mo
+locale/fa_AF/activity.linfo
+locale/dz/LC_MESSAGES/org.laptop.Calculate.mo
+locale/dz/activity.linfo
+locale/ru/LC_MESSAGES/org.laptop.Calculate.mo
+locale/ru/activity.linfo
+locale/ca/LC_MESSAGES/org.laptop.Calculate.mo
+locale/ca/activity.linfo
+locale/ro/LC_MESSAGES/org.laptop.Calculate.mo
+locale/ro/activity.linfo
+locale/zh_TW/LC_MESSAGES/org.laptop.Calculate.mo
+locale/zh_TW/activity.linfo
+locale/ff/LC_MESSAGES/org.laptop.Calculate.mo
+locale/ff/activity.linfo
+locale/fa/LC_MESSAGES/org.laptop.Calculate.mo
+locale/fa/activity.linfo
+locale/zh_CN/LC_MESSAGES/org.laptop.Calculate.mo
+locale/zh_CN/activity.linfo
+locale/bn_IN/LC_MESSAGES/org.laptop.Calculate.mo
+locale/bn_IN/activity.linfo
+locale/pt/LC_MESSAGES/org.laptop.Calculate.mo
+locale/pt/activity.linfo
+locale/pap/LC_MESSAGES/org.laptop.Calculate.mo
+locale/pap/activity.linfo
+locale/ps/LC_MESSAGES/org.laptop.Calculate.mo
+locale/ps/activity.linfo
+locale/mvo/LC_MESSAGES/org.laptop.Calculate.mo
+locale/mvo/activity.linfo
+locale/qu/LC_MESSAGES/org.laptop.Calculate.mo
+locale/qu/activity.linfo
+locale/pa/LC_MESSAGES/org.laptop.Calculate.mo
+locale/pa/activity.linfo
+locale/km/LC_MESSAGES/org.laptop.Calculate.mo
+locale/km/activity.linfo
 po/af.po
 po/am.po
 po/ar.po
@@ -64,6 +184,7 @@ po/ml.po
 po/mn.po
 po/mr.po
 po/mvo.po
+po/nb.po
 po/ne.po
 po/nl.po
 po/pa.po
@@ -81,6 +202,7 @@ po/ru.po
 po/rw.po
 po/sd.po
 po/si.po
+po/sl.po
 po/te.po
 po/th.po
 po/tpi.po
diff --git a/NEWS b/NEWS
index bc2be05..ef4ff69 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+23
+
+* Add locale dir contents to MANIFEST
+
+22
+
+* Fix MANIFEST file with activity dir
+
+21
+
+* Updated translations
+
 20
 
 * Updated translations
diff --git a/activity/activity.info b/activity/activity.info
index a18bad2..9b1f4f4 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -3,5 +3,5 @@ name = Calculate
 service_name = org.laptop.Calculate
 class = calculate.Calculate
 icon = calculate
-activity_version = 20
+activity_version = 23
 show_launcher = yes
diff --git a/po/el.po b/po/el.po
index 1aa7949..c4adfac 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-05 00:30-0500\n"
+"POT-Creation-Date: 2008-06-23 00:30-0400\n"
 "PO-Revision-Date: 2008-03-29 04:17-0400\n"
 "Last-Translator: John Sarlis <sarlis@sch.gr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -351,7 +351,8 @@ msgid "tanh"
 msgstr "τοξυ"
 
 #: eqnparserhelp.py:107
-msgid "sinh(x), return the hyperbolic tangent of x. Given by sinh(x) / cosh(x)"
+#, fuzzy
+msgid "tanh(x), return the hyperbolic tangent of x. Given by sinh(x) / cosh(x)"
 msgstr ""
 "τοξυ(x), επιστρέφει την υπερβολική εφαπτόμενη του x. Δίνεται από τον τύπο "
 "συνυ(x) / ημυ(x)"
@@ -459,11 +460,11 @@ msgstr "συμβ_πολλ/σμού"
 msgid "div_sym"
 msgstr "συμβ_διαίρεσης"
 
-#: mathlib.py:132
+#: mathlib.py:134
 msgid "Undefined"
 msgstr "Ακαθόριστο"
 
-#: mathlib.py:142
+#: mathlib.py:144
 msgid "Error: unsupported type"
 msgstr "Σφάλμα: μη υποστηριζόμενος τύπος"
 
diff --git a/po/fr.po b/po/fr.po
index 3659ba3..cad61c4 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,97 +6,47 @@ 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-16 12:44+0000\n"
-"Last-Translator: samy boutayeb <s.boutayeb@free.fr>\n"
+"POT-Creation-Date: 2008-06-23 00:30-0400\n"
+"PO-Revision-Date: 2008-03-26 16:45-0400\n"
+"Last-Translator: Lionel Laské <llaske@c2s.fr>\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"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Pootle 1.0.2\n"
+"X-Generator: Pootle 1.1.0rc2\n"
 
 #: activity/activity.info:2
 msgid "Calculate"
 msgstr "Calculer"
 
+#: calculate.py:80
+#, python-format
+msgid "Equation.parse() string invalid (%s)"
+msgstr "Equation.parse() chaîne invalide (%s)"
+
 #: calculate.py:210
 msgid "Available functions:"
 msgstr "Fonctions disponibles :"
 
-# ----------------------------------------
-# 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 "aide_acos"
-
-#: eqnparserhelp.py:38
-msgid "help_asin"
-msgstr "aide_asin"
-
-#: eqnparserhelp.py:40
-msgid "help_exp"
-msgstr "aide_exp"
-
-#: eqnparserhelp.py:41
-msgid "help_functions"
-msgstr "aide_fonctions"
-
-#: eqnparserhelp.py:42
-msgid "help_operators"
-msgstr "aide_operateurs"
-
-#: eqnparserhelp.py:43
-msgid "help_plot"
-msgstr "aide_graphiques"
-
-#: eqnparserhelp.py:45
-msgid "help_sqrt"
-msgstr "aide_racinecarree"
-
-#: eqnparserhelp.py:46
-msgid "help_test"
-msgstr "aide_test"
-
-#: eqnparserhelp.py:47
-msgid "help_variables"
-msgstr "aide_variables"
-
-#: eqnparserhelp.py:58
-msgid "help_usage"
-msgstr "aide_utilisation"
-
-# Text assigned to the 'help' variable
-#: eqnparser.py:234
-msgid "help_var"
-msgstr "aide"
+#: calculate.py:504
+#, python-format
+msgid "Writing to journal (%s)"
+msgstr "Écriture dans le journal (%s)"
 
-#-----------------------------------------
-# End of help topics
-#-----------------------------------------
-# ----------------------------------------
-# The help system uses topic msgid's that should be translated here.
-# Text assigned to the 'help' variable
-# this is a programming data type (which is type de données) not a Typing error (Erreur de frappe)
+#: calculate.py:788
+msgid "button_pressed(): invalid type"
+msgstr "button_pressed() : type invalide"
 
-#: eqnparserhelp.py:52
-msgid "Topics: "
-msgstr "Sujets : "
+#: eqnparser.py:33
+msgid "Parse error"
+msgstr "Erreur de syntaxe"
 
-# aide(index) ou help(index) ?
-#: eqnparserhelp.py:143
+# ofs = offset?
+#: eqnparser.py:58
 #, python-format
-msgid "No help about '%s' available, use help(index) for the index"
-msgstr ""
-"L'aide sur '%s' n'est pas disponible, utilisez aide(index) pour afficher "
-"l'index"
-
-# this is a programming data type (which is type de données) not a Typing error (Erreur de frappe)
-#: eqnparser.py:87
-msgid "Type error"
-msgstr "Erreur de type"
+msgid "level: %d, ofs %d"
+msgstr "niveau : %d, ofs %d"
 
 # ligne %d ? caractère %d ?
 #: eqnparser.py:117
@@ -104,10 +54,11 @@ msgstr "Erreur de type"
 msgid "Error at %d"
 msgstr "Erreur à %d"
 
-#: eqnparser.py:299
-#, python-format
-msgid "variable %s not defined"
-msgstr "la variable %s n'est pas définie"
+#: eqnparser.py:249 eqnparserhelp.py:128
+msgid "Use help(test) for help about 'test', or help(index) for the index"
+msgstr ""
+"Utiliser help(test) où 'test' est la rubrique recherchée, ou help(index) "
+"pour accéder à l'index des rubriques"
 
 #: eqnparser.py:353 eqnparser.py:354
 #, python-format
@@ -136,16 +87,16 @@ msgstr "Erreur de syntaxe de l'argument %d: '%s'"
 msgid "Function error: %s"
 msgstr "Erreur de la fonction: %s"
 
-#: eqnparser.py:358
-#, python-format
-msgid "Function '%s' returned %s"
-msgstr "La fonction '%s' a retourné %s"
-
-#: eqnparser.py:457
+#: eqnparser.py:481
 #, python-format
-msgid "Variable '%s' undefined"
+msgid "Variable '%s' not defined"
 msgstr "La variable '%s' n'est pas définie"
 
+# inattendue... bof
+#: eqnparser.py:504
+msgid "Left parenthesis unexpected"
+msgstr "Parenthèse droite en trop"
+
 #: eqnparser.py:516
 msgid "Parse error (right parenthesis)"
 msgstr "Erreur de syntaxe (parenthèse droite)"
@@ -169,200 +120,10 @@ msgstr "Erreur de syntaxe (parenthèse droite en trop)"
 msgid "Number not expected"
 msgstr "Nombre inattendu"
 
-#: eqnparser.py:596
-msgid "Invalid operator"
-msgstr "Opérateur invalide"
-
-#: eqnparser.py:565
-msgid "Parse error: ')' expected"
-msgstr "Erreur de syntaxe : ')' attendu"
-
-# _parse() est une fonction None est un type spécial en Python - returning None veut dire que l'analyse syntaxique retourne None pour représebnter une valeur nulle
-#: eqnparser.py:616
-msgid "_parse(): returning None"
-msgstr "_parse(): None retourné"
-
-#: layout.py:46
-msgid "clear"
-msgstr "effacer"
-
-#: layout.py:55
-msgid "enter"
-msgstr "entrée"
-
-#: layout.py:60
-msgid "Edit"
-msgstr "Édition"
-
-#: layout.py:61
-msgid "Algebra"
-msgstr "Algèbre"
-
-#: layout.py:62
-msgid "Trigonometry"
-msgstr "Trigonométrie"
-
-# Boolean est renvoie généralement  à un type de donnée (vrai/faux, 1/0, etc)
-#: layout.py:63
-msgid "Boolean"
-msgstr "Valeur booléenne"
-
-#: layout.py:64
-msgid "Constants"
-msgstr "Constantes"
-
-#: layout.py:65
-msgid "Format"
-msgstr "Format"
-
-#: layout.py:86
-msgid "Label:"
-msgstr "Étiquette :"
-
-#: layout.py:118
-msgid "All equations"
-msgstr "Toutes les équations"
-
-#: layout.py:118
-msgid "My equations"
-msgstr "Mes équations"
-
-#: layout.py:120
-msgid "Show history"
-msgstr "Afficher l'historique"
-
-#: layout.py:120
-msgid "Show variables"
-msgstr "Afficher les variables"
-
-#: mathlib.py:86
-msgid "Error"
-msgstr "Erreur"
-
-#: mathlib.py:142
-msgid "Error: unsupported type"
-msgstr "Erreur : type non pris en charge"
-
-#: plotlib.py:134
-msgid "Unable to parse range"
-msgstr "Impossible d'analyser le domaine"
-
-#: toolbars.py:86
-msgid "Copy"
-msgstr "Copier"
-
-#: toolbars.py:89
-msgid "Paste"
-msgstr "Coller"
-
-#: toolbars.py:92
-msgid "Cut"
-msgstr "Couper"
-
-#: calculate.py:80
-#, python-format
-msgid "Equation.parse() string invalid (%s)"
-msgstr "Equation.parse() chaîne invalide (%s)"
-
-#: calculate.py:504
-#, python-format
-msgid "Writing to journal (%s)"
-msgstr "Écriture dans le journal (%s)"
-
-#: calculate.py:506
-#, python-format
-msgid "Reading from journal (%s)"
-msgstr "Lecture du journal (%s)"
-
-#: calculate.py:512
-msgid "Unable to determine version"
-msgstr "Impossible de déterminer la version"
-
-#: calculate.py:517
-#, python-format
-msgid "Reading journal entry (version %s)"
-msgstr "Lecture de l'entrée du journal (version %s)"
-
-#: calculate.py:522
-#, python-format
-msgid "State line invalid (%s)"
-msgstr "Ligne d'état invalide (%s)"
-
-#: calculate.py:539
-#, python-format
-msgid "Unable to read journal entry, unknown version (%s)"
-msgstr "Impossible de lire l'entrée du journal, version inconnue (%s)"
-
-#: calculate.py:788
-msgid "button_pressed(): invalid type"
-msgstr "button_pressed() : type invalide"
-
-# ofs = offset?
-#: eqnparser.py:58
-#, python-format
-msgid "level: %d, ofs %d"
-msgstr "niveau : %d, ofs %d"
-
-#: eqnparser.py:481
-#, python-format
-msgid "Variable '%s' not defined"
-msgstr "La variable '%s' n'est pas définie"
-
 #: eqnparser.py:550
 msgid "Operator not expected"
 msgstr "Opérateur inattendu"
 
-#: eqnparser.py:603
-msgid "Operator expected"
-msgstr "Opérateur attendu"
-
-#: eqnparserhelp.py:39
-msgid "help_cos"
-msgstr "aide_cos"
-
-#: eqnparserhelp.py:44
-msgid "help_sin"
-msgstr "aide_sin"
-
-#: eqnparserhelp.py:132
-msgid "Topics"
-msgstr "Rubriques"
-
-#. 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 "Erreur de syntaxe"
-
-#: eqnparser.py:249 eqnparserhelp.py:128
-msgid "Use help(test) for help about 'test', or help(index) for the index"
-msgstr ""
-
-# inattendue... bof
-#: eqnparser.py:504
-msgid "Left parenthesis unexpected"
-msgstr "Parenthèse droite en trop"
-
 #: eqnparser.py:566
 msgid "Parse error: number or variable expected"
 msgstr "Erreur de syntaxe : nombre ou variable attendu"
@@ -371,6 +132,22 @@ msgstr "Erreur de syntaxe : nombre ou variable attendu"
 msgid "Number or variable expected"
 msgstr "Nombre ou variable attendu"
 
+#: eqnparser.py:596
+msgid "Invalid operator"
+msgstr "Opérateur invalide"
+
+#: eqnparser.py:603
+msgid "Operator expected"
+msgstr "Opérateur attendu"
+
+# _parse() est une fonction None est un type spécial en Python - returning None veut dire que l'analyse syntaxique retourne None pour représebnter une valeur nulle
+#: eqnparser.py:616
+msgid "_parse(): returning None"
+msgstr "_parse(): None retourné"
+
+# 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.
 #. 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.
@@ -394,10 +171,12 @@ msgstr "and"
 msgid ""
 "and(x, y), logical and. Returns True if x and y are True, else returns False"
 msgstr ""
+"and(x, y), et logique. Renvoie True si x et y sont égal à Vrai, renvoie "
+"False sinon"
 
 #: eqnparserhelp.py:46
 msgid "asin"
-msgstr ""
+msgstr "asin"
 
 #: eqnparserhelp.py:47
 #, fuzzy
@@ -405,12 +184,12 @@ 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 ""
-"acos (x), renvoie l'arc cosinus de x. C'est l'angle pour lequel le cosinus "
-"est x. La valeur de x doit être comprise entre -1 et +1. "
+"asin (x), renvoie l'arc sinus de x. C'est l'angle pour lequel le sinus est "
+"x. La valeur de x doit être comprise entre -1 et +1. "
 
 #: eqnparserhelp.py:50
 msgid "atan"
-msgstr ""
+msgstr "atan"
 
 #: eqnparserhelp.py:51
 #, fuzzy
@@ -418,120 +197,137 @@ msgid ""
 "atan(x), return the arc tangent of x. This is the angle for which the "
 "tangent is x. Defined for all x"
 msgstr ""
-"acos (x), renvoie l'arc cosinus de x. C'est l'angle pour lequel le cosinus "
-"est x. La valeur de x doit être comprise entre -1 et +1. "
+"atan (x), renvoie l'arc tangente de x. C'est l'angle pour lequel la tangente "
+"est x. Défini pour toute valeur de x. "
 
 #: eqnparserhelp.py:54
-#, fuzzy
 msgid "cos"
-msgstr "acos"
+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), renvoie le cosinus de x. C'est la coordonnée de x pour le cercle "
+"d'angle 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), renvoie le cosinus hyperbolique de x. Donné par la formule (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), renvoie l'exponentiel naturel de x. Donné par 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), renvoie le factoriel de x. Donné par la formule x * (x - 1) * (x - "
+"2) * ..."
 
 #. TRANS: This command is descriptive, so can be translated
 #: eqnparserhelp.py:68
 msgid "functions"
-msgstr ""
+msgstr "functions"
 
 #: eqnparserhelp.py:69
 msgid "functions(), return a list of all the functions that are defined"
-msgstr ""
+msgstr "functions(), retourne une liste de toutes les fonctions définies"
 
 #: 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), renvoie le logarithme naturel de x. C'est la valeur pour laquelle "
+"l'exponentiel exp() égal x. Défini pour x >= 0."
 
 #. TRANS: This command is descriptive, so can be translated
 #: eqnparserhelp.py:76
 msgid "operators"
-msgstr ""
+msgstr "operators"
 
 #: eqnparserhelp.py:77
 msgid "operators(), return a list of the operators that are defined"
-msgstr ""
+msgstr "operators(), retourne une liste des opérateurs qui sont définis"
 
 #: 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), ou logique. Renvoie True si x et/ou y sont True, renvoie False "
+"sinon "
 
 #: 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), trace l'équation 'eqn' avec la variable 'var' dans "
+"l'intervalle de a à 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), renvoie le sinus de x. C'est la coordonnée y sur le cercle d'angle "
+"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), renvoie le sinus hyperbolique de x. Donné par la formule (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), renvoie la racine carrée de x. C'est la valeur pour laquelle le "
+"carré vaut x. Défini pour x >= 0."
 
 #: eqnparserhelp.py:97
 #, fuzzy
@@ -540,11 +336,11 @@ msgstr "Carré"
 
 #: eqnparserhelp.py:98
 msgid "square(x), return the square of x. Given by x * x"
-msgstr ""
+msgstr "square(x), renvoie la racine carrée de x. Donné par la formule x * x"
 
 #: eqnparserhelp.py:101
 msgid "tan"
-msgstr ""
+msgstr "tan"
 
 #: eqnparserhelp.py:102
 msgid ""
@@ -552,144 +348,345 @@ 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), renvoie la tangente de x. C'est la pente de la ligne partant de "
+"l'origine du cercle trigonométrique et allant au point du cercle défini par "
+"l'angle x. Donné par la formule 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)"
+#, fuzzy
+msgid "tanh(x), return the hyperbolic tangent of x. Given by sinh(x) / cosh(x)"
 msgstr ""
+"tanh(x), renvoie la tangente hyperbolique de x. Donné par la formule sinh(x) "
+"/ cosh(x)"
 
 #: eqnparserhelp.py:109
 msgid "test"
-msgstr ""
+msgstr "test"
 
 #: eqnparserhelp.py:110
 msgid "This is just a test topic, use help(index) for the index"
-msgstr ""
+msgstr "Ceci est juste un thème de test. Utiliser help(index) pour l'index"
 
 #. TRANS: This command is descriptive, so can be translated
 #: eqnparserhelp.py:113
 msgid "variables"
-msgstr ""
+msgstr "variables"
 
 #: eqnparserhelp.py:114
 msgid "variables(), return a list of the variables that are currently defined"
-msgstr ""
+msgstr "variables(), renvoie une liste de toutes les variables définies"
 
 #: 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), ou exclusif logique. Renvoie True si soit x égale True (et y "
+"égale False) ou y est Vraie (et x égale False), renvoie False sinon"
 
 #. TRANS: help(index), both 'index' and the translation  will work
 #: eqnparserhelp.py:131
 msgid "index"
+msgstr "index"
+
+#: eqnparserhelp.py:132
+msgid "Topics"
+msgstr "Rubriques"
+
+# aide(index) ou help(index) ?
+#: eqnparserhelp.py:143
+#, python-format
+msgid "No help about '%s' available, use help(index) for the index"
 msgstr ""
+"L'aide sur '%s' n'est pas disponible, utilisez aide(index) pour afficher "
+"l'index"
+
+#: layout.py:60
+msgid "Edit"
+msgstr "Édition"
+
+#: layout.py:61
+msgid "Algebra"
+msgstr "Algèbre"
+
+#: layout.py:62
+msgid "Trigonometry"
+msgstr "Trigonométrie"
+
+# Boolean est renvoie généralement  à un type de donnée (vrai/faux, 1/0, etc) - LLASKE: "Valeur Booléenne" ne tiens par sur l'affichage.
+#: layout.py:63
+msgid "Boolean"
+msgstr "Booléen"
+
+#: layout.py:64
+msgid "Constants"
+msgstr "Constantes"
+
+#: layout.py:65
+msgid "Format"
+msgstr "Format"
+
+#: layout.py:86
+msgid "Label:"
+msgstr "Étiquette :"
+
+#: layout.py:118
+msgid "All equations"
+msgstr "Toutes les équations"
+
+#: layout.py:118
+msgid "My equations"
+msgstr "Mes équations"
 
-#: mathlib.py:132
+#: layout.py:120
+msgid "Show history"
+msgstr "Afficher l'historique"
+
+#: layout.py:120
+msgid "Show variables"
+msgstr "Afficher les variables"
+
+#. 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 ""
+msgstr "Indéfini"
+
+#: mathlib.py:144
+msgid "Error: unsupported type"
+msgstr "Erreur : type non pris en charge"
 
-#: toolbars.py:36
+#: toolbars.py:53
 msgid "Help"
 msgstr "Aide"
 
-#: toolbars.py:99
+#: toolbars.py:111
+msgid "Copy"
+msgstr "Copier"
+
+#: toolbars.py:115
+msgid "Paste"
+msgstr "Coller"
+
+#: toolbars.py:119
+msgid "Cut"
+msgstr "Couper"
+
+#: toolbars.py:127
 msgid "Square"
 msgstr "Carré"
 
-#: toolbars.py:103
+#: toolbars.py:132
 msgid "Square root"
 msgstr "Racine carrée"
 
-#: toolbars.py:109
+#: toolbars.py:137
+msgid "Inverse"
+msgstr "Inverse"
+
+#: toolbars.py:144
 msgid "e to the power x"
 msgstr "e puissance x"
 
-#: toolbars.py:117
+#: toolbars.py:149
+#, fuzzy
+msgid "x to the power y"
+msgstr "e puissance x"
+
+#: toolbars.py:154
 msgid "Natural logarithm"
 msgstr "Logarithme naturel"
 
-#: toolbars.py:123
+#: toolbars.py:160
 msgid "Factorial"
 msgstr "Factoriel"
 
-#: toolbars.py:131
+#: toolbars.py:168
 msgid "Sine"
 msgstr "Sinus"
 
-#: toolbars.py:135
+#: toolbars.py:172
 msgid "Cosine"
 msgstr "Cosinus"
 
-#: toolbars.py:139
+#: toolbars.py:176
 msgid "Tangent"
 msgstr "Tangente"
 
-#: toolbars.py:145
+#: toolbars.py:182
 msgid "Arc sine"
-msgstr ""
+msgstr "Arcsinus"
 
-#: toolbars.py:149
+#: toolbars.py:186
 msgid "Arc cosine"
-msgstr ""
+msgstr "Arcosinus"
 
-#: toolbars.py:153
+#: toolbars.py:190
 msgid "Arc tangent"
-msgstr ""
+msgstr "Arctangente"
 
-#: toolbars.py:159
+#: toolbars.py:196
 msgid "Hyperbolic sine"
-msgstr ""
+msgstr "Sinus hyperbolique"
 
-#: toolbars.py:163
+#: toolbars.py:200
 msgid "Hyperbolic cosine"
-msgstr ""
+msgstr "Cosinus hyperbolique"
 
-#: toolbars.py:167
+#: toolbars.py:204
 msgid "Hyperbolic tangent"
-msgstr ""
+msgstr "Tangente hyperbolique"
 
-#: toolbars.py:175
+#: toolbars.py:212
 msgid "Logical and"
-msgstr ""
+msgstr "Et logique"
 
-#: toolbars.py:179
+#: toolbars.py:216
 msgid "Logical or"
-msgstr ""
+msgstr "Ou logique"
 
-#: toolbars.py:189
+#: toolbars.py:226
 msgid "Equals"
-msgstr ""
+msgstr "Egal"
 
-#: toolbars.py:192
+#: toolbars.py:229
 msgid "Not equals"
-msgstr ""
+msgstr "Différent"
 
-#: 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 "Degrés"
 
-#: toolbars.py:210
+#: toolbars.py:248
 msgid "Radians"
 msgstr "Radians"
 
-#: toolbars.py:113
-#, fuzzy
-msgid "x to the power y"
-msgstr "e puissance x"
+#: toolbars.py:252
+msgid "Degrees / radians"
+msgstr "Dégrés / radians"
+
+# ----------------------------------------
+# The help system uses topic msgid's that should be translated here.
+# ----------------------------------------
+#~ msgid "help_acos"
+#~ msgstr "aide_acos"
+
+#~ msgid "help_asin"
+#~ msgstr "aide_asin"
+
+#~ msgid "help_exp"
+#~ msgstr "aide_exp"
+
+#~ msgid "help_functions"
+#~ msgstr "aide_fonctions"
+
+#~ msgid "help_operators"
+#~ msgstr "aide_operateurs"
+
+#~ msgid "help_plot"
+#~ msgstr "aide_graphiques"
+
+#~ msgid "help_sqrt"
+#~ msgstr "aide_racinecarree"
+
+#~ msgid "help_test"
+#~ msgstr "aide_test"
+
+#~ msgid "help_variables"
+#~ msgstr "aide_variables"
+
+#~ msgid "help_usage"
+#~ msgstr "aide_utilisation"
+
+# Text assigned to the 'help' variable
+#~ msgid "help_var"
+#~ msgstr "aide"
+
+#~ msgid "Topics: "
+#~ msgstr "Sujets : "
+
+# this is a programming data type (which is type de données) not a Typing error (Erreur de frappe)
+#~ msgid "Type error"
+#~ msgstr "Erreur de type"
+
+#, python-format
+#~ msgid "variable %s not defined"
+#~ msgstr "la variable %s n'est pas définie"
+
+#, python-format
+#~ msgid "Function '%s' returned %s"
+#~ msgstr "La fonction '%s' a retourné %s"
+
+#, python-format
+#~ msgid "Variable '%s' undefined"
+#~ msgstr "La variable '%s' n'est pas définie"
+
+#~ msgid "Parse error: ')' expected"
+#~ msgstr "Erreur de syntaxe : ')' attendu"
+
+#~ msgid "clear"
+#~ msgstr "effacer"
+
+#~ msgid "enter"
+#~ msgstr "entrée"
+
+#~ msgid "Error"
+#~ msgstr "Erreur"
+
+#~ msgid "Unable to parse range"
+#~ msgstr "Impossible d'analyser le domaine"
+
+#, python-format
+#~ msgid "Reading from journal (%s)"
+#~ msgstr "Lecture du journal (%s)"
+
+#~ msgid "Unable to determine version"
+#~ msgstr "Impossible de déterminer la version"
+
+#, python-format
+#~ msgid "Reading journal entry (version %s)"
+#~ msgstr "Lecture de l'entrée du journal (version %s)"
+
+#, python-format
+#~ msgid "State line invalid (%s)"
+#~ msgstr "Ligne d'état invalide (%s)"
+
+#, python-format
+#~ msgid "Unable to read journal entry, unknown version (%s)"
+#~ msgstr "Impossible de lire l'entrée du journal, version inconnue (%s)"
+
+#~ msgid "help_cos"
+#~ msgstr "aide_cos"
+
+#~ msgid "help_sin"
+#~ msgstr "aide_sin"
+
+#~ msgid "thousand_sep"
+#~ msgstr "."
+
+#~ msgid "fraction_sep"
+#~ msgstr ","
diff --git a/po/mr.po b/po/mr.po
index e28b5ff..08722ea 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-05 00:30-0500\n"
+"POT-Creation-Date: 2008-06-23 00:30-0400\n"
 "PO-Revision-Date: 2008-05-10 03:25-0400\n"
 "Last-Translator: Rupali Sarode <rups23in@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -331,7 +331,8 @@ msgid "tanh"
 msgstr "tanh"
 
 #: eqnparserhelp.py:107
-msgid "sinh(x), return the hyperbolic tangent of x. Given by sinh(x) / cosh(x)"
+#, fuzzy
+msgid "tanh(x), return the hyperbolic tangent of x. Given by sinh(x) / cosh(x)"
 msgstr "sinh(x), x ची हाइपरबोलिक टॅनजेंट परत करतो. sinh(x) / cosh(x) चा कडून"
 
 #: eqnparserhelp.py:109
@@ -431,11 +432,11 @@ msgstr "mul_sym"
 msgid "div_sym"
 msgstr "div_sym"
 
-#: mathlib.py:132
+#: mathlib.py:134
 msgid "Undefined"
 msgstr "अपरिभाषित"
 
-#: mathlib.py:142
+#: mathlib.py:144
 msgid "Error: unsupported type"
 msgstr "चुक: अआधारित प्रकार"
 
diff --git a/po/nb.po b/po/nb.po
new file mode 100644
index 0000000..b7ec58e
--- /dev/null
+++ b/po/nb.po
@@ -0,0 +1,534 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#, fuzzy
+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: 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.1.1rc4\n"
+
+#: activity/activity.info:2
+msgid "Calculate"
+msgstr ""
+
+#: 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 ""
+
+#. 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 ""
+
+#: 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 ""
+
+#: eqnparserhelp.py:54
+msgid "cos"
+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 ""
+
+#: eqnparserhelp.py:58
+msgid "cosh"
+msgstr ""
+
+#: eqnparserhelp.py:59
+msgid ""
+"cosh(x), return the hyperbolic cosine of x. Given by (exp(x) + exp(-x)) / 2"
+msgstr ""
+
+#: eqnparserhelp.py:61
+msgid "exp"
+msgstr ""
+
+#: eqnparserhelp.py:62
+msgid "exp(x), return the natural exponent of x. Given by e^x"
+msgstr ""
+
+#: eqnparserhelp.py:64
+msgid "fac"
+msgstr ""
+
+#: eqnparserhelp.py:65
+msgid "fac(x), return the factorial of x. Given by x * (x - 1) * (x - 2) * ..."
+msgstr ""
+
+#. TRANS: This command is descriptive, so can be translated
+#: eqnparserhelp.py:68
+msgid "functions"
+msgstr ""
+
+#: eqnparserhelp.py:69
+msgid "functions(), return a list of all the functions that are defined"
+msgstr ""
+
+#: eqnparserhelp.py:71
+msgid "ln"
+msgstr ""
+
+#: 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 ""
+
+#. TRANS: This command is descriptive, so can be translated
+#: eqnparserhelp.py:76
+msgid "operators"
+msgstr ""
+
+#: eqnparserhelp.py:77
+msgid "operators(), return a list of the operators that are defined"
+msgstr ""
+
+#: eqnparserhelp.py:79
+msgid "or"
+msgstr ""
+
+#: eqnparserhelp.py:80
+msgid ""
+"or(x, y), logical or. Returns True if x and/or y are True, else return False"
+msgstr ""
+
+#: eqnparserhelp.py:82
+msgid "plot"
+msgstr ""
+
+#: 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 ""
+
+#: eqnparserhelp.py:86
+msgid "sin"
+msgstr ""
+
+#: 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 ""
+
+#: eqnparserhelp.py:90
+msgid "sinh"
+msgstr ""
+
+#: eqnparserhelp.py:91
+msgid ""
+"sinh(x), return the hyperbolic sine of x. Given by (exp(x) - exp(-x)) / 2"
+msgstr ""
+
+#: eqnparserhelp.py:93
+msgid "sqrt"
+msgstr ""
+
+#: 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 ""
+
+#: eqnparserhelp.py:97
+msgid "square"
+msgstr ""
+
+#: eqnparserhelp.py:98
+msgid "square(x), return the square of x. Given by x * x"
+msgstr ""
+
+#: eqnparserhelp.py:101
+msgid "tan"
+msgstr ""
+
+#: 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 ""
+
+#: eqnparserhelp.py:106
+msgid "tanh"
+msgstr ""
+
+#: eqnparserhelp.py:107
+msgid "tanh(x), return the hyperbolic tangent of x. Given by sinh(x) / cosh(x)"
+msgstr ""
+
+#: eqnparserhelp.py:109
+msgid "test"
+msgstr ""
+
+#: eqnparserhelp.py:110
+msgid "This is just a test topic, use help(index) for the index"
+msgstr ""
+
+#. TRANS: This command is descriptive, so can be translated
+#: eqnparserhelp.py:113
+msgid "variables"
+msgstr ""
+
+#: eqnparserhelp.py:114
+msgid "variables(), return a list of the variables that are currently defined"
+msgstr ""
+
+#: eqnparserhelp.py:116
+msgid "xor"
+msgstr ""
+
+#: 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 ""
+
+#. TRANS: help(index), both 'index' and the translation  will work
+#: eqnparserhelp.py:131
+msgid "index"
+msgstr ""
+
+#: eqnparserhelp.py:132
+msgid "Topics"
+msgstr ""
+
+#: eqnparserhelp.py:143
+#, python-format
+msgid "No help about '%s' available, use help(index) for the index"
+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 ""
+
+#. 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 ""
+
+#: mathlib.py:144
+msgid "Error: unsupported type"
+msgstr ""
+
+#: toolbars.py:53
+msgid "Help"
+msgstr ""
+
+#: toolbars.py:111
+msgid "Copy"
+msgstr ""
+
+#: toolbars.py:115
+msgid "Paste"
+msgstr ""
+
+#: toolbars.py:119
+msgid "Cut"
+msgstr ""
+
+#: toolbars.py:127
+msgid "Square"
+msgstr ""
+
+#: toolbars.py:132
+msgid "Square root"
+msgstr ""
+
+#: toolbars.py:137
+msgid "Inverse"
+msgstr ""
+
+#: toolbars.py:144
+msgid "e to the power x"
+msgstr ""
+
+#: toolbars.py:149
+msgid "x to the power y"
+msgstr ""
+
+#: toolbars.py:154
+msgid "Natural logarithm"
+msgstr ""
+
+#: toolbars.py:160
+msgid "Factorial"
+msgstr ""
+
+#: toolbars.py:168
+msgid "Sine"
+msgstr ""
+
+#: toolbars.py:172
+msgid "Cosine"
+msgstr ""
+
+#: toolbars.py:176
+msgid "Tangent"
+msgstr ""
+
+#: toolbars.py:182
+msgid "Arc sine"
+msgstr ""
+
+#: toolbars.py:186
+msgid "Arc cosine"
+msgstr ""
+
+#: toolbars.py:190
+msgid "Arc tangent"
+msgstr ""
+
+#: toolbars.py:196
+msgid "Hyperbolic sine"
+msgstr ""
+
+#: toolbars.py:200
+msgid "Hyperbolic cosine"
+msgstr ""
+
+#: toolbars.py:204
+msgid "Hyperbolic tangent"
+msgstr ""
+
+#: toolbars.py:212
+msgid "Logical and"
+msgstr ""
+
+#: toolbars.py:216
+msgid "Logical or"
+msgstr ""
+
+#: toolbars.py:226
+msgid "Equals"
+msgstr ""
+
+#: toolbars.py:229
+msgid "Not equals"
+msgstr ""
+
+#: toolbars.py:236
+msgid "Pi"
+msgstr ""
+
+#: toolbars.py:240
+msgid "e"
+msgstr ""
+
+#: toolbars.py:247
+msgid "Degrees"
+msgstr ""
+
+#: toolbars.py:248
+msgid "Radians"
+msgstr ""
+
+#: toolbars.py:252
+msgid "Degrees / radians"
+msgstr ""
diff --git a/po/ne.po b/po/ne.po
index 8644a14..ab2232e 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-01-26 11:55-0500\n"
+"POT-Creation-Date: 2008-06-23 00:30-0400\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"
@@ -18,505 +18,320 @@ msgstr ""
 
 #: activity/activity.info:2
 msgid "Calculate"
-msgstr ""
+msgstr "क्यालकुलेटर"
+
+#: calculate.py:80
+#, python-format
+msgid "Equation.parse() string invalid (%s)"
+msgstr "Equation.parse() %s वाक्याँश मिलेन"
 
 #: calculate.py:210
 msgid "Available functions:"
-msgstr ""
-
-#-----------------------------------------
-# 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 ""
+msgstr "उपलब्घ कार्यहरु"
 
-#: eqnparserhelp.py:46
-msgid "help_test"
-msgstr ""
-
-#: eqnparserhelp.py:47
-msgid "help_variables"
-msgstr ""
-
-#: eqnparserhelp.py:58
-msgid "help_usage"
-msgstr ""
-
-# Text assigned to the 'help' variable
-#: eqnparser.py:234
-msgid "help_var"
-msgstr ""
+#: calculate.py:504
+#, python-format
+msgid "Writing to journal (%s)"
+msgstr "खातामा लेखिंदैछ"
 
-#-----------------------------------------
-# End of help topics
-#-----------------------------------------
+#: calculate.py:788
+msgid "button_pressed(): invalid type"
+msgstr "थिचिएको_बटन(): प्रकार मिलेन"
 
-#: eqnparserhelp.py:52
-msgid "Topics: "
-msgstr ""
+#: eqnparser.py:33
+msgid "Parse error"
+msgstr "वाक्य त्रुटि "
 
-#: eqnparserhelp.py:143
+#: eqnparser.py:58
 #, python-format
-msgid "No help about '%s' available, use help(index) for the index"
-msgstr ""
-
-#: eqnparser.py:87
-msgid "Type error"
-msgstr ""
+msgid "level: %d, ofs %d"
+msgstr "तह: %d, मा %d"
 
 #: eqnparser.py:117
 #, python-format
 msgid "Error at %d"
-msgstr ""
+msgstr "%d मा त्रुटि"
 
-#: eqnparser.py:299
-#, python-format
-msgid "variable %s not defined"
+#: eqnparser.py:249 eqnparserhelp.py:128
+msgid "Use help(test) for help about 'test', or help(index) for the index"
 msgstr ""
+"'test' को मत्द्धतको लागि help(test), वा 'index' को मत्द्धतको लागि "
+"help'index' प्रयोग गर्नुहोस्"
 
 #: eqnparser.py:353 eqnparser.py:354
 #, python-format
 msgid "Function '%s' not defined"
-msgstr ""
+msgstr "'%s' कार्य व्याक्या गरिएको छैन्"
 
 #: eqnparser.py:359
 #, python-format
 msgid "Invalid number of arguments (%d instead of %d)"
-msgstr ""
+msgstr "दिइएको बुँदा संख्या मिलेन (%d हुनुपर्नेमा %d भयो"
 
 #: eqnparser.py:360
 #, python-format
 msgid "function takes %d args"
-msgstr ""
+msgstr "कार्यले %d बँदा लिन्छ"
 
 #: eqnparser.py:370 eqnparser.py:371
 #, python-format
 msgid "Unable to parse argument %d: '%s'"
-msgstr ""
+msgstr "%s: %d बुँदा वाक्यमा मिलेन"
 
 #: eqnparser.py:380
 #, python-format
 msgid "Function error: %s"
-msgstr ""
+msgstr "%s: कार्य त्रुटि"
 
-#: eqnparser.py:358
+#: eqnparser.py:481
 #, python-format
-msgid "Function '%s' returned %s"
-msgstr ""
+msgid "Variable '%s' not defined"
+msgstr "चर '%s' व्याक्या गरिएको छैन"
 
-#: eqnparser.py:457
-#, python-format
-msgid "Variable '%s' undefined"
-msgstr ""
+#: eqnparser.py:504
+msgid "Left parenthesis unexpected"
+msgstr "देब्रेमा घुसाईएको वाक्य अकल्पनीय छ"
 
 #: eqnparser.py:516
 msgid "Parse error (right parenthesis)"
-msgstr ""
+msgstr "वाक्यमा त्रुटि (दाईनेमा घुसाईएको बाक्य)"
 
 #: eqnparser.py:517 eqnparser.py:528 eqnparser.py:535 eqnparser.py:610
 msgid "Right parenthesis unexpected"
-msgstr ""
+msgstr "दाईनेमा घुसाईएको वाक्य अकल्पनीय छ"
 
 #: eqnparser.py:527
 msgid "Parse error (right parenthesis, no left_val)"
-msgstr ""
+msgstr "वाक्यमा त्रुटि (दाईनेमा घुसाईएको बाक्य, left_val छैन)"
 
 #: eqnparser.py:534
 msgid "Parse error (right parenthesis, no level to close)"
-msgstr ""
+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 ""
+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
-msgid "Topics"
-msgstr ""
-
-#. 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 ""
+msgstr "कारक अकल्पनीय"
 
 #: eqnparser.py:566
 msgid "Parse error: number or variable expected"
-msgstr ""
+msgstr "वाक्यमा त्रुटि: संख्या वा चर मान खाँचो "
 
 #: eqnparser.py:567
 msgid "Number or variable expected"
-msgstr ""
+msgstr "संख्या वा चर मान खाँचो"
+
+#: eqnparser.py:596
+msgid "Invalid operator"
+msgstr "कारक मिलेन"
+
+#: eqnparser.py:603
+msgid "Operator expected"
+msgstr "कारकको खाँचो "
+
+#: eqnparser.py:616
+msgid "_parse(): returning None"
+msgstr "_parse(): 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.
 #: 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 ""
+"\n"
+"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 ""
+msgstr "and"
 
 #: eqnparserhelp.py:44
 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
 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 ""
+"\n"
+"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 ""
+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 ""
+"\n"
+"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 ""
+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 ""
+"\n"
+"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 ""
+msgstr "cosh"
 
 #: eqnparserhelp.py:59
 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
 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), return the natural exponent of x. Given by 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 ""
+msgstr "fac(x), return the factorial of x. Given by x * (x - 1) * (x - 2) * ..."
 
 #. TRANS: This command is descriptive, so can be translated
 #: eqnparserhelp.py:68
 msgid "functions"
-msgstr ""
+msgstr "functions"
 
 #: eqnparserhelp.py:69
 msgid "functions(), return a list of all the functions that are defined"
-msgstr ""
+msgstr "functions(), return a list of all the functions that are defined"
 
 #: 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 ""
+"\n"
+"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
 msgid "operators"
-msgstr ""
+msgstr "कारकहरु"
 
 #: eqnparserhelp.py:77
 msgid "operators(), return a list of the operators that are defined"
-msgstr ""
+msgstr "operators(), return a list of the operators that are defined"
 
 #: 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 ""
+"\n"
+"or(x, y), logical or. Returns True if x and/or y are True, else return 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 ""
+"\n"
+"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 ""
+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 ""
+"\n"
+"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 ""
+msgstr "sinh"
 
 #: eqnparserhelp.py:91
 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
 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 ""
+"\n"
+"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"
-msgstr ""
+msgstr "square"
 
 #: eqnparserhelp.py:98
 msgid "square(x), return the square of x. Given by x * x"
-msgstr ""
+msgstr "square(x), return the square of x. Given by x * x"
 
 #: eqnparserhelp.py:101
 msgid "tan"
-msgstr ""
+msgstr "tan"
 
 #: eqnparserhelp.py:102
 msgid ""
@@ -524,143 +339,240 @@ 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)"
 
 #: 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 ""
+#, 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)"
 
 #: eqnparserhelp.py:109
 msgid "test"
-msgstr ""
+msgstr "test"
 
 #: eqnparserhelp.py:110
 msgid "This is just a test topic, use help(index) for the index"
-msgstr ""
+msgstr "This is just a test topic, use help(index) for the index"
 
 #. TRANS: This command is descriptive, so can be translated
 #: eqnparserhelp.py:113
 msgid "variables"
-msgstr ""
+msgstr "चर मान"
 
 #: eqnparserhelp.py:114
 msgid "variables(), return a list of the variables that are currently defined"
-msgstr ""
+msgstr "variables(), return a list of the variables that are currently defined"
 
 #: 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 ""
+"\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"
 
 #. TRANS: help(index), both 'index' and the translation  will work
 #: eqnparserhelp.py:131
 msgid "index"
+msgstr "सुचि"
+
+#: eqnparserhelp.py:132
+msgid "Topics"
+msgstr "शिर्षक"
+
+#: eqnparserhelp.py:143
+#, python-format
+msgid "No help about '%s' available, use help(index) for the index"
 msgstr ""
+"'%s' को बारेमा मत्द्धत पाईएन, index को बारेमा मत्द्धत लिन help(index) प्रयोग "
+"गर्नुहोस्"
+
+#: layout.py:60
+msgid "Edit"
+msgstr "सम्पादन"
+
+#: layout.py:61
+msgid "Algebra"
+msgstr "बिजगणित"
+
+#: layout.py:62
+msgid "Trigonometry"
+msgstr "त्रिकोणमिति"
 
-#: mathlib.py:132
+#: 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 "चर मानहरु देखाऊनुहोस्"
+
+#. 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 ""
+msgstr "वाक्या नगरिएको"
+
+#: mathlib.py:144
+msgid "Error: unsupported type"
+msgstr "त्रुति: असमर्थ प्रकार"
 
-#: toolbars.py:36
+#: toolbars.py:53
 msgid "Help"
-msgstr ""
+msgstr "मत्द्धत"
 
-#: toolbars.py:99
+#: toolbars.py:111
+msgid "Copy"
+msgstr "प्रतिलिपि"
+
+#: toolbars.py:115
+msgid "Paste"
+msgstr "टाँस्नु"
+
+#: toolbars.py:119
+msgid "Cut"
+msgstr "काट्नु"
+
+#: toolbars.py:127
 msgid "Square"
-msgstr ""
+msgstr "बर्ग"
 
-#: toolbars.py:103
+#: toolbars.py:132
 msgid "Square root"
-msgstr ""
+msgstr "बर्गमुल"
+
+#: toolbars.py:137
+msgid "Inverse"
+msgstr "बिपरित"
 
-#: toolbars.py:109
+#: toolbars.py:144
 msgid "e to the power x"
-msgstr ""
+msgstr "e to the power x "
+
+#: toolbars.py:149
+msgid "x to the power y"
+msgstr "x to the power y"
 
-#: toolbars.py:117
+#: toolbars.py:154
 msgid "Natural logarithm"
-msgstr ""
+msgstr "प्राकृतिक लधु गुणक"
 
-#: toolbars.py:123
+#: toolbars.py:160
 msgid "Factorial"
-msgstr ""
+msgstr "क्रम गुणित"
 
-#: toolbars.py:131
+#: toolbars.py:168
 msgid "Sine"
-msgstr ""
+msgstr "Sine"
 
-#: toolbars.py:135
+#: toolbars.py:172
 msgid "Cosine"
-msgstr ""
+msgstr "Cosine"
 
-#: toolbars.py:139
+#: toolbars.py:176
 msgid "Tangent"
-msgstr ""
+msgstr "Tangent"
 
-#: toolbars.py:145
+#: toolbars.py:182
 msgid "Arc sine"
-msgstr ""
+msgstr "Arc sine"
 
-#: toolbars.py:149
+#: toolbars.py:186
 msgid "Arc cosine"
-msgstr ""
+msgstr "Arc cosine"
 
-#: toolbars.py:153
+#: toolbars.py:190
 msgid "Arc tangent"
-msgstr ""
+msgstr "Arc tangent"
 
-#: toolbars.py:159
+#: toolbars.py:196
 msgid "Hyperbolic sine"
-msgstr ""
+msgstr "Hyperbolic sine"
 
-#: toolbars.py:163
+#: toolbars.py:200
 msgid "Hyperbolic cosine"
-msgstr ""
+msgstr "Hyperbolic cosine"
 
-#: toolbars.py:167
+#: toolbars.py:204
 msgid "Hyperbolic tangent"
-msgstr ""
+msgstr "Hyperbolic tangent"
 
-#: toolbars.py:175
+#: toolbars.py:212
 msgid "Logical and"
-msgstr ""
+msgstr "Logical and"
 
-#: toolbars.py:179
+#: toolbars.py:216
 msgid "Logical or"
-msgstr ""
+msgstr "Logical or"
 
-#: toolbars.py:189
+#: toolbars.py:226
 msgid "Equals"
-msgstr ""
+msgstr "बराबर"
 
-#: toolbars.py:192
+#: toolbars.py:229
 msgid "Not equals"
-msgstr ""
+msgstr "बराबर नभएको"
 
-#: toolbars.py:199
+#: toolbars.py:236
 msgid "Pi"
-msgstr ""
+msgstr "पाई"
 
-#: toolbars.py:202
+#: toolbars.py:240
 msgid "e"
-msgstr ""
+msgstr "e"
 
-#: toolbars.py:209
+#: toolbars.py:247
 msgid "Degrees"
-msgstr ""
+msgstr "डिग्रि"
 
-#: toolbars.py:210
+#: toolbars.py:248
 msgid "Radians"
-msgstr ""
+msgstr "रेडिएन"
 
-#: toolbars.py:113
-msgid "x to the power y"
-msgstr ""
+#: toolbars.py:252
+msgid "Degrees / radians"
+msgstr "डिग्रि / रेडिएन"
diff --git a/po/rw.po b/po/rw.po
index 8644a14..96da8ed 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -2,14 +2,13 @@
 # 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: 2008-01-26 11:55-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2008-06-23 00:30-0400\n"
+"PO-Revision-Date: 2008-07-16 01:33+0200\n"
+"Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,649 +17,500 @@ msgstr ""
 
 #: activity/activity.info:2
 msgid "Calculate"
-msgstr ""
+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 ""
-
-#-----------------------------------------
-# 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 ""
-
-#: eqnparserhelp.py:47
-msgid "help_variables"
-msgstr ""
-
-#: eqnparserhelp.py:58
-msgid "help_usage"
-msgstr ""
+msgstr "Akamaro kaboneka"
 
-# Text assigned to the 'help' variable
-#: eqnparser.py:234
-msgid "help_var"
-msgstr ""
+#: calculate.py:504
+#, python-format
+msgid "Writing to journal (%s)"
+msgstr "Kwandika kukinyamakuru (%s)"
 
-#-----------------------------------------
-# End of help topics
-#-----------------------------------------
+#: calculate.py:788
+msgid "button_pressed(): invalid type"
+msgstr "Ububuto_ bwakanzwe(): Ubwoko butemewe"
 
-#: eqnparserhelp.py:52
-msgid "Topics: "
-msgstr ""
+#: eqnparser.py:33
+msgid "Parse error"
+msgstr "Tambutsa ikosa"
 
-#: eqnparserhelp.py:143
+#: eqnparser.py:58
 #, python-format
-msgid "No help about '%s' available, use help(index) for the index"
-msgstr ""
-
-#: eqnparser.py:87
-msgid "Type error"
-msgstr ""
+msgid "level: %d, ofs %d"
+msgstr "Urwego: %d, ofs %d"
 
 #: eqnparser.py:117
 #, python-format
 msgid "Error at %d"
-msgstr ""
+msgstr "Ikosa riri %d"
 
-#: eqnparser.py:299
-#, python-format
-msgid "variable %s not defined"
-msgstr ""
+#: 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
+#: eqnparser.py:353
+#: eqnparser.py:354
 #, python-format
 msgid "Function '%s' not defined"
-msgstr ""
+msgstr "Akamaro '%s' kadasobanuwe"
 
 #: eqnparser.py:359
 #, python-format
 msgid "Invalid number of arguments (%d instead of %d)"
-msgstr ""
+msgstr "Umubare wibitekerezo  bitemewe"
 
 #: eqnparser.py:360
 #, python-format
 msgid "function takes %d args"
-msgstr ""
+msgstr "Akamaro kagyanye %d args"
 
-#: eqnparser.py:370 eqnparser.py:371
+#: eqnparser.py:370
+#: eqnparser.py:371
 #, python-format
 msgid "Unable to parse argument %d: '%s'"
-msgstr ""
+msgstr "Kuba udashobora gutambutsa igitekerezo %d: '%s'"
 
 #: eqnparser.py:380
 #, python-format
 msgid "Function error: %s"
-msgstr ""
+msgstr "Akamaro kikosa: %s"
 
-#: eqnparser.py:358
+#: eqnparser.py:481
 #, python-format
-msgid "Function '%s' returned %s"
-msgstr ""
+msgid "Variable '%s' not defined"
+msgstr "Variable '%s' Idasobanuye"
 
-#: eqnparser.py:457
-#, python-format
-msgid "Variable '%s' undefined"
-msgstr ""
+#: eqnparser.py:504
+msgid "Left parenthesis unexpected"
+msgstr "Agakubo k`ibumoso katari kiteguwe"
 
 #: eqnparser.py:516
 msgid "Parse error (right parenthesis)"
-msgstr ""
+msgstr "Tambutsa ikosa( agakubo k`iburyo)"
 
-#: eqnparser.py:517 eqnparser.py:528 eqnparser.py:535 eqnparser.py:610
+#: eqnparser.py:517
+#: eqnparser.py:528
+#: eqnparser.py:535
+#: eqnparser.py:610
 msgid "Right parenthesis unexpected"
-msgstr ""
+msgstr "Agakubo k`iburyo katari kiteguwe"
 
 #: eqnparser.py:527
 msgid "Parse error (right parenthesis, no left_val)"
-msgstr ""
+msgstr "Tambutsa ikosa (agakubo k`iburyo, no left_val)"
 
 #: eqnparser.py:534
 msgid "Parse error (right parenthesis, no level to close)"
-msgstr ""
+msgstr "Tambutsa  ikosa(ikuba ryiburyo,ntarwego rufunga)"
 
-#: eqnparser.py:541 eqnparser.py:542
+#: 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 ""
+msgstr "Umubare utatekerezwaga"
 
 #: 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
-msgid "Topics"
-msgstr ""
-
-#. 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 ""
+msgstr "Ikimenyetso kitatekerezwaga"
 
 #: eqnparser.py:566
 msgid "Parse error: number or variable expected"
-msgstr ""
+msgstr "Parse error: number or variable expected"
 
 #: eqnparser.py:567
 msgid "Number or variable expected"
-msgstr ""
+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.
 #: 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 ""
+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 ""
+msgstr "Na"
 
 #: eqnparserhelp.py:44
-msgid ""
-"and(x, y), logical and. Returns True if x and y are True, else returns False"
-msgstr ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+msgstr "cosh"
 
 #: eqnparserhelp.py:59
-msgid ""
-"cosh(x), return the hyperbolic cosine of x. Given by (exp(x) + exp(-x)) / 2"
-msgstr ""
+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"
-msgstr ""
+msgstr "exp"
 
 #: eqnparserhelp.py:62
 msgid "exp(x), return the natural exponent of x. Given by e^x"
-msgstr ""
+msgstr "exp(x), return the natural exponent of x. Given by 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 ""
+msgstr "fac(x), return the factorial of x. Given by x * (x - 1) * (x - 2) * ..."
 
 #. TRANS: This command is descriptive, so can be translated
 #: eqnparserhelp.py:68
 msgid "functions"
-msgstr ""
+msgstr "functions"
 
 #: eqnparserhelp.py:69
 msgid "functions(), return a list of all the functions that are defined"
-msgstr ""
+msgstr "functions(), return a list of all the functions that are defined"
 
 #: eqnparserhelp.py:71
 msgid "ln"
-msgstr ""
+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 ""
+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
 msgid "operators"
-msgstr ""
+msgstr "operators"
 
 #: eqnparserhelp.py:77
 msgid "operators(), return a list of the operators that are defined"
-msgstr ""
+msgstr "operators(), return a list of the operators that are defined"
 
 #: eqnparserhelp.py:79
 msgid "or"
-msgstr ""
+msgstr "cyangwa"
 
 #: eqnparserhelp.py:80
-msgid ""
-"or(x, y), logical or. Returns True if x and/or y are True, else return False"
-msgstr ""
+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 ""
+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 ""
+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 ""
+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 ""
+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 ""
+msgstr "sinh"
 
 #: eqnparserhelp.py:91
-msgid ""
-"sinh(x), return the hyperbolic sine of x. Given by (exp(x) - exp(-x)) / 2"
-msgstr ""
+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 ""
+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 ""
+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"
-msgstr ""
+msgstr "Igishushanyo kimpande enye zingana"
 
 #: eqnparserhelp.py:98
 msgid "square(x), return the square of x. Given by x * x"
-msgstr ""
+msgstr "square(x), return the square of x. Given by x * x"
 
 #: eqnparserhelp.py:101
 msgid "tan"
-msgstr ""
+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 ""
+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"
-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), return the hyperbolic tangent of x. Given by sinh(x) / cosh(x)"
 
 #: eqnparserhelp.py:109
 msgid "test"
-msgstr ""
+msgstr "Isuzuma bumenyi"
 
 #: eqnparserhelp.py:110
 msgid "This is just a test topic, use help(index) for the index"
-msgstr ""
+msgstr "uyunumutwe wisuzumabumenyi,koresha ubutabazi(index)for index"
 
 #. TRANS: This command is descriptive, so can be translated
 #: eqnparserhelp.py:113
 msgid "variables"
-msgstr ""
+msgstr "variables"
 
 #: eqnparserhelp.py:114
 msgid "variables(), return a list of the variables that are currently defined"
-msgstr ""
+msgstr "variables(), return a list of the variables that are currently defined"
 
 #: 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 ""
+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"
 
 #. TRANS: help(index), both 'index' and the translation  will work
 #: eqnparserhelp.py:131
 msgid "index"
-msgstr ""
+msgstr "index"
+
+#: eqnparserhelp.py:132
+msgid "Topics"
+msgstr "Imitwe yingenzi"
+
+#: eqnparserhelp.py:143
+#, python-format
+msgid "No help about '%s' available, use help(index) for the index"
+msgstr "No help about '%s' available, use help(index) for the index"
+
+#: layout.py:60
+msgid "Edit"
+msgstr "Hindura"
+
+#: layout.py:61
+msgid "Algebra"
+msgstr "Imihiriko"
+
+#: layout.py:62
+msgid "Trigonometry"
+msgstr "Trigonometry"
+
+#: layout.py:63
+msgid "Boolean"
+msgstr "Boolean"
+
+#: layout.py:64
+msgid "Constants"
+msgstr "Ibidahinduka"
+
+#: layout.py:65
+msgid "Format"
+msgstr "uburyo fatizo"
+
+#: layout.py:86
+msgid "Label:"
+msgstr "gukurikiranya ibimenyetso"
+
+#: layout.py:118
+msgid "All equations"
+msgstr "Amahurizo yose"
+
+#: layout.py:118
+msgid "My equations"
+msgstr "Amahurizo yangye"
+
+#: layout.py:120
+msgid "Show history"
+msgstr "Erekana amateka"
+
+#: layout.py:120
+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:132
+#: mathlib.py:134
 msgid "Undefined"
-msgstr ""
+msgstr "Ikidasobanuye"
+
+#: mathlib.py:144
+msgid "Error: unsupported type"
+msgstr "Ikosa:ubwoko budafashijwe"
 
-#: toolbars.py:36
+#: toolbars.py:53
 msgid "Help"
-msgstr ""
+msgstr "Gufasha"
+
+#: toolbars.py:111
+msgid "Copy"
+msgstr "Gukoporora"
+
+#: toolbars.py:115
+msgid "Paste"
+msgstr "Gushyira ibyo wakoporoye ahandi hantu"
 
-#: toolbars.py:99
+#: toolbars.py:119
+msgid "Cut"
+msgstr "Gutema"
+
+#: toolbars.py:127
 msgid "Square"
-msgstr ""
+msgstr "Umubare wikubye kabiri"
 
-#: toolbars.py:103
+#: toolbars.py:132
 msgid "Square root"
-msgstr ""
+msgstr " Ikimenyetso cy`umubare wikuba wawugabanya ukabya ra wamubare"
+
+#: toolbars.py:137
+msgid "Inverse"
+msgstr "Amacuri"
 
-#: toolbars.py:109
+#: toolbars.py:144
 msgid "e to the power x"
-msgstr ""
+msgstr "e igerekeranye kuri  x"
+
+#: toolbars.py:149
+msgid "x to the power y"
+msgstr "x igerekeranye kuri y"
 
-#: toolbars.py:117
+#: toolbars.py:154
 msgid "Natural logarithm"
-msgstr ""
+msgstr "logaritime  iri natureri"
 
-#: toolbars.py:123
+#: toolbars.py:160
 msgid "Factorial"
-msgstr ""
+msgstr "Factorial"
 
-#: toolbars.py:131
+#: toolbars.py:168
 msgid "Sine"
-msgstr ""
+msgstr "Sine"
 
-#: toolbars.py:135
+#: toolbars.py:172
 msgid "Cosine"
-msgstr ""
+msgstr "Cosine"
 
-#: toolbars.py:139
+#: toolbars.py:176
 msgid "Tangent"
-msgstr ""
+msgstr "Tangent"
 
-#: toolbars.py:145
+#: toolbars.py:182
 msgid "Arc sine"
-msgstr ""
+msgstr "Arc sine"
 
-#: toolbars.py:149
+#: toolbars.py:186
 msgid "Arc cosine"
-msgstr ""
+msgstr "Arc cosine"
 
-#: toolbars.py:153
+#: toolbars.py:190
 msgid "Arc tangent"
-msgstr ""
+msgstr "Arc tangent"
 
-#: toolbars.py:159
+#: toolbars.py:196
 msgid "Hyperbolic sine"
-msgstr ""
+msgstr "Hyperbolic sine"
 
-#: toolbars.py:163
+#: toolbars.py:200
 msgid "Hyperbolic cosine"
-msgstr ""
+msgstr "Hyperbolic cosine"
 
-#: toolbars.py:167
+#: toolbars.py:204
 msgid "Hyperbolic tangent"
-msgstr ""
+msgstr "Hyperbolic tangent"
 
-#: toolbars.py:175
+#: toolbars.py:212
 msgid "Logical and"
-msgstr ""
+msgstr "Logical and"
 
-#: toolbars.py:179
+#: toolbars.py:216
 msgid "Logical or"
-msgstr ""
+msgstr "Logical or"
 
-#: toolbars.py:189
+#: toolbars.py:226
 msgid "Equals"
-msgstr ""
+msgstr "Bingana"
 
-#: toolbars.py:192
+#: toolbars.py:229
 msgid "Not equals"
-msgstr ""
+msgstr "Ntago bingana"
 
-#: toolbars.py:199
+#: toolbars.py:236
 msgid "Pi"
-msgstr ""
+msgstr "Pi"
 
-#: toolbars.py:202
+#: toolbars.py:240
 msgid "e"
-msgstr ""
+msgstr "inyajwi "
 
-#: toolbars.py:209
+#: toolbars.py:247
 msgid "Degrees"
-msgstr ""
+msgstr "Ingano"
 
-#: toolbars.py:210
+#: toolbars.py:248
 msgid "Radians"
-msgstr ""
+msgstr "Radians"
+
+#: toolbars.py:252
+msgid "Degrees / radians"
+msgstr "Ingano/radians"
 
-#: toolbars.py:113
-msgid "x to the power y"
-msgstr ""
diff --git a/po/sl.po b/po/sl.po
new file mode 100644
index 0000000..a3dd0ba
--- /dev/null
+++ b/po/sl.po
@@ -0,0 +1,535 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+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-11 02:10-0400\n"
+"Last-Translator: Denis Oštir <denis.ostir@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.1.0rc2\n"
+
+#: activity/activity.info:2
+msgid "Calculate"
+msgstr "Računalnik"
+
+#: calculate.py:80
+#, python-format
+msgid "Equation.parse() string invalid (%s)"
+msgstr "Equation.parse() napačna formula (%s)"
+
+#: calculate.py:210
+msgid "Available functions:"
+msgstr "Funkcije na voljo:"
+
+#: calculate.py:504
+#, python-format
+msgid "Writing to journal (%s)"
+msgstr "Pisanje v dnevnik (%s)"
+
+#: calculate.py:788
+msgid "button_pressed(): invalid type"
+msgstr "button_pressed(): napačen tip"
+
+#: eqnparser.py:33
+msgid "Parse error"
+msgstr "Napaka pri analizi"
+
+#: eqnparser.py:58
+#, python-format
+msgid "level: %d, ofs %d"
+msgstr "stopnja: %d, od s%d"
+
+#: eqnparser.py:117
+#, python-format
+msgid "Error at %d"
+msgstr "Napaka v %d"
+
+#: eqnparser.py:249 eqnparserhelp.py:128
+#, fuzzy
+msgid "Use help(test) for help about 'test', or help(index) for the index"
+msgstr "Uporabi pomoč(test) za pomoč o 'test', ali pomoč(kazalo) za kazalo"
+
+#: eqnparser.py:353 eqnparser.py:354
+#, python-format
+msgid "Function '%s' not defined"
+msgstr "Funkcija '%s' ni definirana"
+
+#: eqnparser.py:359
+#, python-format
+msgid "Invalid number of arguments (%d instead of %d)"
+msgstr "Napačno število argumentov (%d namesto %d)"
+
+#: eqnparser.py:360
+#, python-format
+msgid "function takes %d args"
+msgstr "funkcija vzame %d argumente"
+
+#: eqnparser.py:370 eqnparser.py:371
+#, python-format
+msgid "Unable to parse argument %d: '%s'"
+msgstr "Analiza formule %d: '%s' ni možna"
+
+#: eqnparser.py:380
+#, python-format
+msgid "Function error: %s"
+msgstr "Napaka funkcije: %s"
+
+#: eqnparser.py:481
+#, python-format
+msgid "Variable '%s' not defined"
+msgstr "Spremenljivka '%s' ni definirana"
+
+#: eqnparser.py:504
+msgid "Left parenthesis unexpected"
+msgstr "Levi oklepaj ni pričakovan"
+
+#: eqnparser.py:516
+msgid "Parse error (right parenthesis)"
+msgstr "Napaka pri analizi (desni oklepaj)"
+
+#: eqnparser.py:517 eqnparser.py:528 eqnparser.py:535 eqnparser.py:610
+msgid "Right parenthesis unexpected"
+msgstr "Desni oklepaj ni pričakovan"
+
+#: eqnparser.py:527
+msgid "Parse error (right parenthesis, no left_val)"
+msgstr "Napaka pri analizi (desni oklepaj, brez left_val)"
+
+#: eqnparser.py:534
+#, fuzzy
+msgid "Parse error (right parenthesis, no level to close)"
+msgstr "Napaka pri analizi (desni oklepaj, brez ravni za zapiranje)"
+
+#: eqnparser.py:541 eqnparser.py:542
+msgid "Number not expected"
+msgstr "Številka ni pričakovana"
+
+#: eqnparser.py:550
+msgid "Operator not expected"
+msgstr "Operator ni pričakovan"
+
+#: eqnparser.py:566
+msgid "Parse error: number or variable expected"
+msgstr "Napaka pri analizi: pričakovana številka ali spremenljivka"
+
+#: eqnparser.py:567
+msgid "Number or variable expected"
+msgstr "Pričakovano je število ali spremenljivka"
+
+#: eqnparser.py:596
+msgid "Invalid operator"
+msgstr "Napačen operator"
+
+#: eqnparser.py:603
+msgid "Operator expected"
+msgstr "Pričakovan operator"
+
+#: eqnparser.py:616
+msgid "_parse(): returning None"
+msgstr "_parse(): rezultat nič"
+
+#. 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"
+
+#: 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 ""
+
+#: 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 ""
+
+#: eqnparserhelp.py:54
+msgid "cos"
+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 ""
+
+#: eqnparserhelp.py:58
+msgid "cosh"
+msgstr ""
+
+#: eqnparserhelp.py:59
+msgid ""
+"cosh(x), return the hyperbolic cosine of x. Given by (exp(x) + exp(-x)) / 2"
+msgstr ""
+
+#: eqnparserhelp.py:61
+msgid "exp"
+msgstr ""
+
+#: eqnparserhelp.py:62
+msgid "exp(x), return the natural exponent of x. Given by e^x"
+msgstr ""
+
+#: eqnparserhelp.py:64
+msgid "fac"
+msgstr ""
+
+#: eqnparserhelp.py:65
+msgid "fac(x), return the factorial of x. Given by x * (x - 1) * (x - 2) * ..."
+msgstr ""
+
+#. TRANS: This command is descriptive, so can be translated
+#: eqnparserhelp.py:68
+msgid "functions"
+msgstr ""
+
+#: eqnparserhelp.py:69
+msgid "functions(), return a list of all the functions that are defined"
+msgstr ""
+
+#: eqnparserhelp.py:71
+msgid "ln"
+msgstr ""
+
+#: 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 ""
+
+#. TRANS: This command is descriptive, so can be translated
+#: eqnparserhelp.py:76
+msgid "operators"
+msgstr ""
+
+#: eqnparserhelp.py:77
+msgid "operators(), return a list of the operators that are defined"
+msgstr ""
+
+#: eqnparserhelp.py:79
+msgid "or"
+msgstr ""
+
+#: eqnparserhelp.py:80
+msgid ""
+"or(x, y), logical or. Returns True if x and/or y are True, else return False"
+msgstr ""
+
+#: eqnparserhelp.py:82
+msgid "plot"
+msgstr ""
+
+#: 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 ""
+
+#: eqnparserhelp.py:86
+msgid "sin"
+msgstr ""
+
+#: 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 ""
+
+#: eqnparserhelp.py:90
+msgid "sinh"
+msgstr ""
+
+#: eqnparserhelp.py:91
+msgid ""
+"sinh(x), return the hyperbolic sine of x. Given by (exp(x) - exp(-x)) / 2"
+msgstr ""
+
+#: eqnparserhelp.py:93
+msgid "sqrt"
+msgstr ""
+
+#: 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 ""
+
+#: eqnparserhelp.py:97
+msgid "square"
+msgstr ""
+
+#: eqnparserhelp.py:98
+msgid "square(x), return the square of x. Given by x * x"
+msgstr ""
+
+#: eqnparserhelp.py:101
+msgid "tan"
+msgstr ""
+
+#: 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 ""
+
+#: eqnparserhelp.py:106
+msgid "tanh"
+msgstr ""
+
+#: eqnparserhelp.py:107
+msgid "tanh(x), return the hyperbolic tangent of x. Given by sinh(x) / cosh(x)"
+msgstr ""
+
+#: eqnparserhelp.py:109
+msgid "test"
+msgstr ""
+
+#: eqnparserhelp.py:110
+msgid "This is just a test topic, use help(index) for the index"
+msgstr ""
+
+#. TRANS: This command is descriptive, so can be translated
+#: eqnparserhelp.py:113
+msgid "variables"
+msgstr "spremenljivke"
+
+#: eqnparserhelp.py:114
+msgid "variables(), return a list of the variables that are currently defined"
+msgstr ""
+
+#: eqnparserhelp.py:116
+msgid "xor"
+msgstr ""
+
+#: 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 ""
+
+#. TRANS: help(index), both 'index' and the translation  will work
+#: eqnparserhelp.py:131
+msgid "index"
+msgstr ""
+
+#: eqnparserhelp.py:132
+msgid "Topics"
+msgstr "Poglavje"
+
+#: eqnparserhelp.py:143
+#, python-format
+msgid "No help about '%s' available, use help(index) for the index"
+msgstr "Pomoč za '%s' ni na voljo. Izberi index za seznam tem pomoči."
+
+#: layout.py:60
+msgid "Edit"
+msgstr "Uredi"
+
+#: layout.py:61
+msgid "Algebra"
+msgstr "Matematika"
+
+#: layout.py:62
+msgid "Trigonometry"
+msgstr "Trigonometrija"
+
+#: layout.py:63
+msgid "Boolean"
+msgstr ""
+
+#: layout.py:64
+msgid "Constants"
+msgstr "Konstante"
+
+#: layout.py:65
+msgid "Format"
+msgstr "Format"
+
+#: layout.py:86
+msgid "Label:"
+msgstr "Oznaka:"
+
+#: layout.py:118
+msgid "All equations"
+msgstr "Vse enačbe"
+
+#: layout.py:118
+msgid "My equations"
+msgstr "Moje enačbe"
+
+#: layout.py:120
+msgid "Show history"
+msgstr "Pokaži zgodovino"
+
+#: layout.py:120
+msgid "Show variables"
+msgstr "Pokaži spremenljivke"
+
+#. 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 "Nedefinirano"
+
+#: mathlib.py:144
+msgid "Error: unsupported type"
+msgstr "Napaka: nepodprt tip"
+
+#: toolbars.py:53
+msgid "Help"
+msgstr "Pomoč"
+
+#: toolbars.py:111
+msgid "Copy"
+msgstr "Kopiraj"
+
+#: toolbars.py:115
+msgid "Paste"
+msgstr "Prilepi"
+
+#: toolbars.py:119
+msgid "Cut"
+msgstr "Reži"
+
+#: toolbars.py:127
+msgid "Square"
+msgstr "Kvadrat"
+
+#: toolbars.py:132
+msgid "Square root"
+msgstr ""
+
+#: toolbars.py:137
+msgid "Inverse"
+msgstr ""
+
+#: toolbars.py:144
+msgid "e to the power x"
+msgstr "e na potenco x"
+
+#: toolbars.py:149
+msgid "x to the power y"
+msgstr "x na potenco y"
+
+#: toolbars.py:154
+msgid "Natural logarithm"
+msgstr "Naravni logaritem"
+
+#: toolbars.py:160
+msgid "Factorial"
+msgstr ""
+
+#: toolbars.py:168
+msgid "Sine"
+msgstr "Sinus"
+
+#: toolbars.py:172
+msgid "Cosine"
+msgstr "Kosinus"
+
+#: toolbars.py:176
+msgid "Tangent"
+msgstr ""
+
+#: toolbars.py:182
+msgid "Arc sine"
+msgstr ""
+
+#: toolbars.py:186
+msgid "Arc cosine"
+msgstr ""
+
+#: toolbars.py:190
+msgid "Arc tangent"
+msgstr ""
+
+#: toolbars.py:196
+msgid "Hyperbolic sine"
+msgstr ""
+
+#: toolbars.py:200
+msgid "Hyperbolic cosine"
+msgstr ""
+
+#: toolbars.py:204
+msgid "Hyperbolic tangent"
+msgstr ""
+
+#: toolbars.py:212
+msgid "Logical and"
+msgstr "Logično in"
+
+#: toolbars.py:216
+msgid "Logical or"
+msgstr "Logično ali"
+
+#: toolbars.py:226
+msgid "Equals"
+msgstr "Enako"
+
+#: toolbars.py:229
+msgid "Not equals"
+msgstr "Ni enako"
+
+#: toolbars.py:236
+msgid "Pi"
+msgstr "Pi"
+
+#: toolbars.py:240
+msgid "e"
+msgstr "e"
+
+#: toolbars.py:247
+msgid "Degrees"
+msgstr "Stopinje"
+
+#: toolbars.py:248
+msgid "Radians"
+msgstr ""
+
+#: toolbars.py:252
+msgid "Degrees / radians"
+msgstr ""
diff --git a/po/ur.po b/po/ur.po
index 348d6ab..d97fe21 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -6,137 +6,90 @@ 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: 2007-12-12 18:28+0000\n"
+"POT-Creation-Date: 2008-06-23 00:30-0400\n"
+"PO-Revision-Date: 2008-07-09 06:55-0400\n"
 "Last-Translator: salman minhas <sulmanminhas@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"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 1.0.2\n"
+"X-Generator: Pootle 1.1.0rc2\n"
 
 #: activity/activity.info:2
 msgid "Calculate"
-msgstr "شمار کريں"
+msgstr "جمع تفريق"
+
+#: calculate.py:80
+#, python-format
+msgid "Equation.parse() string invalid (%s)"
+msgstr "پارس کی عبارت() غلط سٹرنگ (%s)"
 
 #: calculate.py:210
 msgid "Available functions:"
-msgstr "موجود فنکشن"
-
-# ----------------------------------------
-# 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 "مدد کے فنکشن"
+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 "ٹيسٹ_ مدد"
-
-#: eqnparserhelp.py:47
-msgid "help_variables"
-msgstr "ويری ايبل_مدد"
-
-#: eqnparserhelp.py:58
-msgid "help_usage"
-msgstr "استعمال-مدد"
-
-# Text assigned to the 'help' variable
-#: eqnparser.py:234
-msgid "help_var"
-msgstr "وار-مدد"
+#: calculate.py:504
+#, python-format
+msgid "Writing to journal (%s)"
+msgstr "جريدہ ميں لکھنا(%s)"
 
-#-----------------------------------------
-# End of help topics
-#-----------------------------------------
-# ----------------------------------------
-# The help system uses topic msgid's that should be translated here.
-# Text assigned to the 'help' variable
+#: calculate.py:788
+msgid "button_pressed(): invalid type"
+msgstr "بٹن_دبا ديا():غلط قسم"
 
-#: eqnparserhelp.py:52
-msgid "Topics: "
-msgstr "عنوانات"
+#: eqnparser.py:33
+msgid "Parse error"
+msgstr "پارس کی غلطی"
 
-#: eqnparserhelp.py:143
+#: eqnparser.py:58
 #, python-format
-msgid "No help about '%s' available, use help(index) for the index"
-msgstr "کوئی مدد نہيں'%s' موجود، مدد استعمال کريں(فہرست) فہرست کے ليے"
-
-#: eqnparser.py:87
-msgid "Type error"
-msgstr "لکھنے کی غلطی"
+msgid "level: %d, ofs %d"
+msgstr "ليول: % , ofs %d"
 
 #: eqnparser.py:117
 #, python-format
 msgid "Error at %d"
-msgstr "%d ڈی پر غلطی"
+msgstr "%d پر غلطی"
 
-#: eqnparser.py:299
-#, python-format
-msgid "variable %s not defined"
-msgstr "ويری ايبل %s لکھيں نہيں ہيں"
+#: 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 "فنکشن '%s' لکھيں نہيں ہيں"
+msgstr "فنکشن '%s' لکھے ہوئے نہیں ہیں"
 
 #: eqnparser.py:359
 #, python-format
 msgid "Invalid number of arguments (%d instead of %d)"
-msgstr "دلائل غلط ہيں (%d کی جگہ %d)"
+msgstr "کافی دلائل غلطہ ہیں (%d کی جگہ %d)"
 
 #: eqnparser.py:360
 #, python-format
 msgid "function takes %d args"
-msgstr "فنکشن  %d اے آر جی ايس ليتے ہيں"
+msgstr "فنکشن %d آرگس ليے ہيں"
 
 #: eqnparser.py:370 eqnparser.py:371
 #, python-format
 msgid "Unable to parse argument %d: '%s'"
-msgstr "آرگيومينٹ کو پارس کرنے سے معزور %d \"%s\""
+msgstr "آرگيومينٹ کو پارس نہیں کر سکتا %d: '%'"
 
 #: eqnparser.py:380
 #, python-format
 msgid "Function error: %s"
 msgstr "فنکشن کی غلطی: %s"
 
-#: eqnparser.py:358
+#: eqnparser.py:481
 #, python-format
-msgid "Function '%s' returned %s"
-msgstr "فنکشن \"%s\" واپس آيا %s"
+msgid "Variable '%s' not defined"
+msgstr "ويری ايبل '%s' نہيں لکھا ہوا"
 
-#: eqnparser.py:457
-#, python-format
-msgid "Variable '%s' undefined"
-msgstr "ويری ايبل %s نہيں لکھا"
+#: eqnparser.py:504
+#, fuzzy
+msgid "Left parenthesis unexpected"
+msgstr "دايں غير متوقع بريکٹيں"
 
 #: eqnparser.py:516
 msgid "Parse error (right parenthesis)"
@@ -158,370 +111,220 @@ msgstr "پارس کی غلطی(دايں بريکٹ، حصہ بند نہ کريں
 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
-#, fuzzy
-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 "مساوات جبريہ۔پارس() غلط عبارت (%s)"
-
-#: calculate.py:504
-#, python-format
-msgid "Writing to journal (%s)"
-msgstr "روذنامچہ ميں لکھنا(%s)"
-
-#: calculate.py:506
-#, python-format
-msgid "Reading from journal (%s)"
-msgstr "روذنامچہ سے پڑھنا(%s)"
-
-#: calculate.py:512
-msgid "Unable to determine version"
-msgstr "ورژن سمجھنے ميں قاصر"
-
-#: calculate.py:517
-#, python-format
-msgid "Reading journal entry (version %s)"
-msgstr "روزنامچہ سے پڑھنا(ورژن %s)"
-
-#: calculate.py:522
-#, python-format
-msgid "State line invalid (%s)"
-msgstr "سيدھی لکير غلط ہے(%s)"
-
-#: calculate.py:539
-#, python-format
-msgid "Unable to read journal entry, unknown version (%s)"
-msgstr "روزنامچہ ميں سے پڑھنے سے قاصر، ورژن معلوم نہيں(%s)"
-
-#: calculate.py:788
-msgid "button_pressed(): invalid type"
-msgstr "بٹن_دبايا():غلط قسم"
-
-#: eqnparser.py:58
-#, python-format
-msgid "level: %d, ofs %d"
-msgstr "ليول: %d، او ايف ايس %d"
-
-#: eqnparser.py:481
-#, python-format
-msgid "Variable '%s' not defined"
-msgstr "ويری ايبل \"%s\" نہيں لکھا"
-
 #: 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
-msgid "Topics"
-msgstr "مضامين"
-
-#. 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
-#, fuzzy
-msgid "Left parenthesis unexpected"
-msgstr "دايں غير متوقع بريکٹيں"
-
 #: eqnparser.py:566
 msgid "Parse error: number or variable expected"
-msgstr ""
+msgstr "پارس کی غلطی: عدد متوقع ہے"
 
 #: eqnparser.py:567
 msgid "Number or variable expected"
-msgstr ""
+msgstr "متوقع عدد"
 
+#: eqnparser.py:596
+msgid "Invalid operator"
+msgstr "غلط اوپريٹر"
+
+#: eqnparser.py:603
+msgid "Operator expected"
+msgstr "متوقع اوپريٹر"
+
+#: eqnparser.py:616
+msgid "_parse(): returning None"
+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.
 #. 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 "قوس"
 
 #: 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 ""
+"قوس(x)، ايکس کا آرک قوسائين واپس لايئں۔ يہ قوسائين ايکس کا زاويہ ہے۔ لکھا "
+"ہوا 1<x=< -"
 
 #: eqnparserhelp.py:43
 msgid "and"
-msgstr ""
+msgstr "اور"
 
 #: eqnparserhelp.py:44
 msgid ""
 "and(x, y), logical and. Returns True if x and y are True, else returns False"
-msgstr ""
+msgstr "اور(ايکس،وائی)، لاجيکل اور۔ صحيح اگر ايکس اور وائی صحيح ہيں، ورنہ غلط"
 
 #: eqnparserhelp.py:46
 msgid "asin"
-msgstr ""
+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 ""
+"اسائين(x)، ايکس کا آرک اسائين واپس لايئں۔ يہ اسائين ايکس کا زاويہ ہے۔ لکھا "
+"ہوا 1<x=< -"
 
 #: eqnparserhelp.py:50
 msgid "atan"
-msgstr ""
+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 ""
+"اٹان(x)، ايکس کا آرک اٹان واپس لايئں۔ يہ اٹان ايکس کا زاويہ ہے۔ سب ايکس کے "
+"ليے لکھا ہوا"
 
 #: eqnparserhelp.py:54
 msgid "cos"
-msgstr ""
+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 ""
+msgstr "ر"
 
 #: eqnparserhelp.py:58
 msgid "cosh"
-msgstr ""
+msgstr "قوش"
 
 #: 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"
 
 #: 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), return the natural exponent of x. Given by 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 ""
+msgstr "fac(x), return the factorial of x. Given by x * (x - 1) * (x - 2) * ..."
 
 #. TRANS: This command is descriptive, so can be translated
 #: eqnparserhelp.py:68
 msgid "functions"
-msgstr ""
+msgstr "عوامل"
 
 #: eqnparserhelp.py:69
 msgid "functions(), return a list of all the functions that are defined"
-msgstr ""
+msgstr "فنکشن ()، ديے گئے تمام فنکشن کی لسٹ واپس کريں"
 
 #: eqnparserhelp.py:71
 msgid "ln"
-msgstr ""
+msgstr "ميں"
 
 #: eqnparserhelp.py:72
+#, fuzzy
 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
 msgid "operators"
-msgstr ""
+msgstr "اوپريٹر"
 
 #: eqnparserhelp.py:77
 msgid "operators(), return a list of the operators that are defined"
-msgstr ""
+msgstr "اوپريٹر()، ديےگيے اوپريٹر کی لسٹ واپس کريں"
 
 #: eqnparserhelp.py:79
 msgid "or"
-msgstr ""
+msgstr "اور"
 
 #: eqnparserhelp.py:80
+#, fuzzy
 msgid ""
 "or(x, y), logical or. Returns True if x and/or y are True, else return False"
-msgstr ""
+msgstr "اور(ايکس،وائی)، لاجيکل اور۔ صحيح اگر ايکس اور وائی صحيح ہيں، ورنہ غلط"
 
 #: eqnparserhelp.py:82
 msgid "plot"
-msgstr ""
+msgstr "پلاٹ"
 
 #: eqnparserhelp.py:83
+#, fuzzy
 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
+#, fuzzy
 msgid "sin"
-msgstr ""
+msgstr "اسائين"
 
 #: eqnparserhelp.py:87
+#, fuzzy
 msgid ""
 "sin(x), return the sine of x. This is the y-coordinate on the unit circle at "
 "the angle x"
-msgstr ""
+msgstr "ر"
 
 #: eqnparserhelp.py:90
+#, fuzzy
 msgid "sinh"
-msgstr ""
+msgstr "اسائين"
 
 #: eqnparserhelp.py:91
+#, fuzzy
 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 ""
+msgstr "sqrt"
 
 #: eqnparserhelp.py:94
+#, fuzzy
 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"
-msgstr ""
+msgstr "square"
 
 #: eqnparserhelp.py:98
 msgid "square(x), return the square of x. Given by x * x"
-msgstr ""
+msgstr "square(x), return the square of x. Given by x * x"
 
 #: eqnparserhelp.py:101
+#, fuzzy
 msgid "tan"
-msgstr ""
+msgstr "اٹان"
 
 #: eqnparserhelp.py:102
 msgid ""
@@ -529,27 +332,32 @@ 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), 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
+#, fuzzy
 msgid "tanh"
-msgstr ""
+msgstr "اٹان"
 
 #: eqnparserhelp.py:107
-msgid "sinh(x), return the hyperbolic tangent of x. Given by sinh(x) / cosh(x)"
-msgstr ""
+#, 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) / cosh(x)"
 
 #: eqnparserhelp.py:109
 msgid "test"
-msgstr ""
+msgstr "ٹيسٹ"
 
 #: eqnparserhelp.py:110
 msgid "This is just a test topic, use help(index) for the index"
-msgstr ""
+msgstr "یہ صرف ايک ٹيسٹ ٹاپک ہے، اينڈيکس کے ليے مدد اينڈيکس استعمال کريں"
 
 #. TRANS: This command is descriptive, so can be translated
 #: eqnparserhelp.py:113
 msgid "variables"
-msgstr ""
+msgstr "variables"
 
 #: eqnparserhelp.py:114
 msgid "variables(), return a list of the variables that are currently defined"
@@ -570,102 +378,292 @@ msgstr ""
 msgid "index"
 msgstr ""
 
-#: mathlib.py:132
+#: eqnparserhelp.py:132
+msgid "Topics"
+msgstr "مضامين"
+
+#: eqnparserhelp.py:143
+#, python-format
+msgid "No help about '%s' available, use help(index) for the index"
+msgstr "کوئی مدد نہيں'%s' موجود، مدد استعمال کريں(فہرست) فہرست کے ليے"
+
+#: 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
+#, fuzzy
+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 "ويری ايبل ديکھائيں"
+
+#. 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 ""
 
-#: toolbars.py:36
+#: mathlib.py:144
+msgid "Error: unsupported type"
+msgstr "غلطی: سپورٹڈ نمونہ ہے"
+
+#: toolbars.py:53
 msgid "Help"
 msgstr ""
 
-#: toolbars.py:99
+#: toolbars.py:111
+msgid "Copy"
+msgstr "نقل کريں"
+
+#: toolbars.py:115
+msgid "Paste"
+msgstr "جوڑيں"
+
+#: toolbars.py:119
+msgid "Cut"
+msgstr "کاٹيں"
+
+#: toolbars.py:127
+#, fuzzy
 msgid "Square"
-msgstr ""
+msgstr "square"
 
-#: toolbars.py:103
+#: toolbars.py:132
 msgid "Square root"
 msgstr ""
 
-#: toolbars.py:109
+#: toolbars.py:137
+msgid "Inverse"
+msgstr ""
+
+#: toolbars.py:144
 msgid "e to the power x"
 msgstr ""
 
-#: toolbars.py:117
+#: toolbars.py:149
+msgid "x to the power y"
+msgstr ""
+
+#: toolbars.py:154
 msgid "Natural logarithm"
 msgstr ""
 
-#: toolbars.py:123
+#: toolbars.py:160
 msgid "Factorial"
 msgstr ""
 
-#: toolbars.py:131
+#: toolbars.py:168
 msgid "Sine"
 msgstr ""
 
-#: toolbars.py:135
+#: toolbars.py:172
 msgid "Cosine"
-msgstr ""
+msgstr "جيب مستوی"
 
-#: toolbars.py:139
+#: toolbars.py:176
 msgid "Tangent"
-msgstr ""
+msgstr "مماس"
 
-#: toolbars.py:145
+#: toolbars.py:182
 msgid "Arc sine"
 msgstr ""
 
-#: toolbars.py:149
+#: toolbars.py:186
 msgid "Arc cosine"
 msgstr ""
 
-#: toolbars.py:153
+#: toolbars.py:190
 msgid "Arc tangent"
 msgstr ""
 
-#: toolbars.py:159
+#: toolbars.py:196
 msgid "Hyperbolic sine"
 msgstr ""
 
-#: toolbars.py:163
+#: toolbars.py:200
 msgid "Hyperbolic cosine"
 msgstr ""
 
-#: toolbars.py:167
+#: toolbars.py:204
 msgid "Hyperbolic tangent"
 msgstr ""
 
-#: toolbars.py:175
+#: toolbars.py:212
 msgid "Logical and"
 msgstr ""
 
-#: toolbars.py:179
+#: toolbars.py:216
 msgid "Logical or"
 msgstr ""
 
-#: toolbars.py:189
+#: toolbars.py:226
 msgid "Equals"
 msgstr ""
 
-#: toolbars.py:192
+#: toolbars.py:229
 msgid "Not equals"
 msgstr ""
 
-#: toolbars.py:199
+#: toolbars.py:236
 msgid "Pi"
 msgstr ""
 
-#: toolbars.py:202
+#: toolbars.py:240
 msgid "e"
 msgstr ""
 
-#: toolbars.py:209
+#: toolbars.py:247
 msgid "Degrees"
 msgstr ""
 
-#: toolbars.py:210
+#: toolbars.py:248
 msgid "Radians"
 msgstr ""
 
-#: toolbars.py:113
-msgid "x to the power y"
+#: toolbars.py:252
+msgid "Degrees / radians"
 msgstr ""
+
+# ----------------------------------------
+# The help system uses topic msgid's that should be translated here.
+# ----------------------------------------
+#~ msgid "help_acos"
+#~ msgstr "آ کوس کی مدد کے ليے"
+
+#~ msgid "help_asin"
+#~ msgstr "آ سائن کی مدد کے ليے"
+
+#~ msgid "help_exp"
+#~ msgstr "ای ايکس پی کی مدد کے ليے"
+
+#~ msgid "help_functions"
+#~ msgstr "مدد کے فنکشن"
+
+#~ msgid "help_operators"
+#~ msgstr "مدد والے آپريٹرز"
+
+#~ msgid "help_plot"
+#~ msgstr "پلاٹ کی مدد"
+
+#~ msgid "help_sqrt"
+#~ msgstr "سکوئر کی مدد کے ليے"
+
+#~ msgid "help_test"
+#~ msgstr "ٹيسٹ_ مدد"
+
+#~ msgid "help_variables"
+#~ msgstr "ويری ايبل_مدد"
+
+#~ msgid "help_usage"
+#~ msgstr "استعمال-مدد"
+
+# Text assigned to the 'help' variable
+#~ msgid "help_var"
+#~ msgstr "وار-مدد"
+
+#~ msgid "Topics: "
+#~ msgstr "عنوانات"
+
+#~ msgid "Type error"
+#~ msgstr "لکھنے کی غلطی"
+
+#, python-format
+#~ msgid "variable %s not defined"
+#~ msgstr "ويری ايبل %s لکھيں نہيں ہيں"
+
+#, python-format
+#~ msgid "Function '%s' returned %s"
+#~ msgstr "فنکشن '%s' واپس آيا %s"
+
+#, python-format
+#~ msgid "Variable '%s' undefined"
+#~ msgstr "ويری ايبل %s نہيں لکھا"
+
+#~ msgid "Parse error: ')' expected"
+#~ msgstr "پارس غلطی:')' متوقع"
+
+#~ msgid "clear"
+#~ msgstr "صاف کرنا"
+
+#~ msgid "enter"
+#~ msgstr "داخل کريں"
+
+#~ msgid "Error"
+#~ msgstr "غلطی"
+
+#~ msgid "Unable to parse range"
+#~ msgstr "پارس کی حد ظاہر کرنے سے قاصر"
+
+#, python-format
+#~ msgid "Reading from journal (%s)"
+#~ msgstr "روذنامچہ سے پڑھنا(%s)"
+
+#~ msgid "Unable to determine version"
+#~ msgstr "ورژن سمجھنے ميں قاصر"
+
+#, python-format
+#~ msgid "Reading journal entry (version %s)"
+#~ msgstr "روزنامچہ سے پڑھنا(ورژن %s)"
+
+#, python-format
+#~ msgid "State line invalid (%s)"
+#~ msgstr "سيدھی لکير غلط ہے(%s)"
+
+#, python-format
+#~ msgid "Unable to read journal entry, unknown version (%s)"
+#~ msgstr "روزنامچہ ميں سے پڑھنے سے قاصر، ورژن معلوم نہيں(%s)"
+
+#~ msgid "help_cos"
+#~ msgstr "قوس_مدد"
+
+#~ msgid "help_sin"
+#~ msgstr "سائن_مدد"
+
+#~ msgid "thousand_sep"
+#~ msgstr "ہزاروں_ايس ای پی"
+
+#~ msgid "fraction_sep"
+#~ msgstr "فريکشن_ايس ای پی"