Merge branch 'master' of gitorious@git.sugarlabs.org:calculate/mainline

2 files changed, 16 insertions, 16 deletions

diff --git a/po/fr.po b/po/fr.po
index c6d670f..cfa253f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,14 +7,15 @@ 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: 2009-02-14 06:07-0500\n"
+"PO-Revision-Date: 2009-05-29 18:28-0400\n"
 "Last-Translator: samy boutayeb <s.boutayeb@free.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\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.1.0rc2\n"
+"X-Generator: Pootle 1.2.1\n"
 
 #: activity/activity.info:2
 msgid "Calculate"
@@ -354,7 +355,6 @@ msgid "tanh"
 msgstr "tanh"
 
 #: eqnparserhelp.py:107
-#, fuzzy
 msgid "sinh(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) "
@@ -407,14 +407,12 @@ msgstr ""
 "l'index"
 
 #: layout.py:44
-#, fuzzy
 msgid "Clear"
-msgstr "effacer"
+msgstr "Effacer"
 
 #: layout.py:53
-#, fuzzy
 msgid "Enter"
-msgstr "entrée"
+msgstr "Entrée"
 
 #: layout.py:60
 msgid "Edit"
diff --git a/po/it.po b/po/it.po
index 6409d04..bb57ab2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,13 +7,15 @@ 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-10-20 04:40-0400\n"
+"PO-Revision-Date: 2009-05-08 11:45-0400\n"
 "Last-Translator: Carlo Falciola <cfalciola@yahoo.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 1.2.1\n"
 
 #: activity/activity.info:2
 msgid "Calculate"
@@ -44,7 +46,7 @@ msgstr "Errore di compilazione"
 #: eqnparser.py:58
 #, python-format
 msgid "level: %d, ofs %d"
-msgstr "livello: %d, ofs %d"
+msgstr "livello: %d, di %d"
 
 #: eqnparser.py:117
 #, python-format
@@ -182,8 +184,8 @@ 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), ritorna l'arcoseno di x. Che è l'angolo per cui il coseno vale x. "
-"Definito per -1 <= x < 1"
+"atan(x), ritorna l'arcotangente di x. Che è l'angolo per cui la tangente "
+"vale x. Definito per ogni x"
 
 #: eqnparserhelp.py:54
 msgid "cos"
@@ -247,11 +249,11 @@ msgstr ""
 #. TRANS: This command is descriptive, so can be translated
 #: eqnparserhelp.py:76
 msgid "operators"
-msgstr "operators"
+msgstr "operatori"
 
 #: eqnparserhelp.py:77
 msgid "operators(), return a list of the operators that are defined"
-msgstr "operators(), ritorna la lista degli operatori che risultano definiti"
+msgstr "operatori(), ritorna la lista degli operatori che risultano definiti"
 
 #: eqnparserhelp.py:79
 msgid "or"
@@ -441,14 +443,14 @@ msgstr "Mostra variabili"
 #. TRANS: multiplication symbol (default: '*')
 #: mathlib.py:74
 msgid "mul_sym"
-msgstr "'*'"
+msgstr "*"
 
 # Da verificare nel caso di layout italiano della tastiera
 # To be checked for the italian keyboard layout (cf 20/10/2008)
 #. TRANS: division symbol (default: '/')
 #: mathlib.py:79
 msgid "div_sym"
-msgstr "'/'"
+msgstr "÷"
 
 #: mathlib.py:132
 msgid "Undefined"