← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-translation-template-fix into lp:ubuntu-calculator-app

 

Bartosz Kosiorek has proposed merging lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-translation-template-fix into lp:ubuntu-calculator-app.

Commit message:
Add additional comments to logaritm and modulo to avoid confusion during translation.

Requested reviews:
  Ubuntu Calculator Developers (ubuntu-calculator-dev)

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-calculator-app/ubuntu-calculator-app-translation-template-fix/+merge/262064

Add additional comments to logaritm and modulo to avoid confusion during translation.
-- 
Your team Ubuntu Calculator Developers is requested to review the proposed merge of lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-translation-template-fix into lp:ubuntu-calculator-app.
=== modified file 'app/ui/PortraitKeyboard.qml'
--- app/ui/PortraitKeyboard.qml	2015-06-11 15:40:14 +0000
+++ app/ui/PortraitKeyboard.qml	2015-06-16 10:29:45 +0000
@@ -39,9 +39,11 @@
             { text: "xⁿ", name: "power", pushText: "^", kbdKeys: [Qt.Key_AsciiCircum, 16781906] }, //Number needed to make key work with the German keyboard layout as that character is normally typed by pressing the circumflex key twice but that does not work here
             { text: "x²", name: "square", pushText: "^2", kbdKeys: [Qt.Key_twosuperior] },
             { text: "x³", name: "cube", pushText: "^3", kbdKeys: [Qt.Key_threesuperior] },
+            // TRANSLATORS Natural logarithm symbol (logarithm to the base e)
             { text: i18n.tr("log"), name: "logarithm", pushText: "log(", kbdKeys: [Qt.Key_L] },
             { text: "ℯ", name: "eNumber", pushText: "E", kbdKeys: [Qt.Key_E] },
             { text: "π", name: "piNumber", pushText: "pi", kbdKeys: [Qt.Key_P] },
+            // TRANSLATORS Modulo operation: Finds the remainder after division of one number by another
             { text: i18n.tr("mod"), name: "modulo", pushText: "%", kbdKeys: [Qt.Key_Percent] },
             { text: "!", name: "factorialNumber", kbdKeys: [Qt.Key_Exclam] },
             { text: "ℯⁿ", name: "exp", pushText: "E^" },

=== modified file 'po/com.ubuntu.calculator.pot'
--- po/com.ubuntu.calculator.pot	2015-06-12 01:55:49 +0000
+++ po/com.ubuntu.calculator.pot	2015-06-16 10:29:45 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-11 20:53-0500\n"
+"POT-Creation-Date: 2015-06-16 12:23+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -74,11 +74,13 @@
 "to mark as favorites"
 msgstr ""
 
-#: ../app/ui/LandscapeKeyboard.qml:19 ../app/ui/PortraitKeyboard.qml:42
+#. TRANSLATORS Natural logarithm symbol (logarithm to the base e)
+#: ../app/ui/LandscapeKeyboard.qml:19 ../app/ui/PortraitKeyboard.qml:43
 msgid "log"
 msgstr ""
 
-#: ../app/ui/LandscapeKeyboard.qml:26 ../app/ui/PortraitKeyboard.qml:45
+#. TRANSLATORS Modulo operation: Finds the remainder after division of one number by another
+#: ../app/ui/LandscapeKeyboard.qml:26 ../app/ui/PortraitKeyboard.qml:47
 msgid "mod"
 msgstr ""
 
@@ -101,14 +103,14 @@
 msgid "Yesterday"
 msgstr ""
 
-#: /tmp/tmp.esBHnyUxUN/po/ubuntu-calculator-app.desktop.in.in.h:1
+#: /tmp/tmp.hsPh6As0kc/po/ubuntu-calculator-app.desktop.in.in.h:1
 msgid "Calculator"
 msgstr ""
 
-#: /tmp/tmp.esBHnyUxUN/po/ubuntu-calculator-app.desktop.in.in.h:2
+#: /tmp/tmp.hsPh6As0kc/po/ubuntu-calculator-app.desktop.in.in.h:2
 msgid "A calculator for Ubuntu."
 msgstr ""
 
-#: /tmp/tmp.esBHnyUxUN/po/ubuntu-calculator-app.desktop.in.in.h:3
+#: /tmp/tmp.hsPh6As0kc/po/ubuntu-calculator-app.desktop.in.in.h:3
 msgid "math;addition;subtraction;multiplication;division;"
 msgstr ""


Follow ups