Merge lp:~vthompson/ubuntu-calculator-app/fix-1290492-calculator into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[Victor Thompson]

* Fix po.pro file for desktop filename change
* Update translation strings

* Fix po.pro file for desktop filename change
* Update translation strings

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:231
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/166/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1687
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/165
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/165
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-trusty-amd64-ci/37

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/166/rebuild

review: Approve (continuous-integration)

[Mihir Soni (mihirsoni)]

Looks good , Thanks a lot Victor Thompson.

review: Approve

=== modified file 'po/po.pro'
--- po/po.pro	2013-09-26 06:18:50 +0000
+++ po/po.pro	2014-03-11 00:23:36 +0000
@@ -10,7 +10,7 @@
 PROJECTNAME = $$system(basename ../*.qmlproject)
 PROJECTNAME = $$replace(PROJECTNAME,.qmlproject,)
 
-DESKTOPFILE = ../$${PROJECTNAME}.desktop
+DESKTOPFILE = ../com.ubuntu.calculator_calculator.desktop.in
 
 SOURCECODE = ../*.qml \
              ../*.js \
@@ -18,7 +18,7 @@
              ../Scientific/*.qml
 
 BUILDDIR = ../.build
-DESKTOPFILETEMP = $${BUILDDIR}/$${PROJECTNAME}.desktop.js
+DESKTOPFILETEMP = $${BUILDDIR}/com.ubuntu.calculator_calculator.desktop.in
 
 message("")
 message(" Project Name: $$PROJECTNAME ")

=== modified file 'po/ubuntu-calculator-app.pot'
--- po/ubuntu-calculator-app.pot	2013-09-26 06:24:29 +0000
+++ po/ubuntu-calculator-app.pot	2014-03-11 00:23:36 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: ubuntu-calculator-app\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-26 08:24+0200\n"
+"POT-Creation-Date: 2014-03-10 19:22-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -19,40 +19,40 @@
 
 #. TRANSLATORS: this is a time formatting string,
 #. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
-#: ../Storage.qml:98 ../Simple/SimplePage.qml:167
+#: ../Storage.qml:99 ../Simple/SimplePage.qml:303
 msgid "dd MMM yy, hh:mm"
 msgstr ""
 
-#: ../Simple/CalcKeyboard.qml:32
+#: ../Simple/CalcKeyboard.qml:48
 msgid "Release to start new calculation"
 msgstr ""
 
-#: ../Simple/CalcKeyboard.qml:32
+#: ../Simple/CalcKeyboard.qml:48
 msgid "Pull to start new calculation"
 msgstr ""
 
 #. TRANSLATORS: Refers to Clear, keep the translation to 2 characters
-#: ../Simple/CalcKeyboard.qml:64
+#: ../Simple/CalcKeyboard.qml:80
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: Refers to All Clear, keep the translation to 2 characters
-#: ../Simple/CalcKeyboard.qml:275
+#: ../Simple/CalcKeyboard.qml:299
 msgid "AC"
 msgstr ""
 
-#: ../Simple/Screen.qml:117
+#: ../Simple/Screen.qml:116
 msgid "Delete this calculation?"
 msgstr ""
 
-#: ../Simple/Screen.qml:123
+#: ../Simple/Screen.qml:122
 msgid "Delete"
 msgstr ""
 
-#: ../Simple/Screen.qml:129
+#: ../Simple/Screen.qml:128
 msgid "Cancel"
 msgstr ""
 
-#: ../.build/ubuntu-calculator-app.desktop.js:1
+#: ../.build/com.ubuntu.calculator_calculator.desktop.in:1
 msgid "Calculator"
 msgstr ""