Merge lp:~dpm/ubuntu-calculator-app/fix-desktop-l10n-1325626 into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

[David Planella]

Remove the x-Ubuntu-Gettext-Domain from the .desktop file, which causes the click scope not to load the inline translations.

Remove the x-Ubuntu-Gettext-Domain from the .desktop file, which causes the click scope not to load the inline translations.

[Mihir Soni (mihirsoni)]

Looks good to me.
Thanks :)

review: Approve

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

PASSED: Continuous integration, rev:278
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/216/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2904
        deb: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2904/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/433
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/433/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-trusty-amd64-ci/87
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-utopic-amd64-ci/11

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'com.ubuntu.calculator_calculator.desktop.in.in'
--- com.ubuntu.calculator_calculator.desktop.in.in	2014-05-16 20:21:54 +0000
+++ com.ubuntu.calculator_calculator.desktop.in.in	2014-06-06 07:34:41 +0000
@@ -8,4 +8,3 @@
 Icon=@ICON@
 X-Ubuntu-Touch=true
 X-Ubuntu-StageHint=SideStage
-X-Ubuntu-Gettext-Domain=@PROJECT_NAME@

=== modified file 'ubuntu-calculator-app.qmlproject'
--- ubuntu-calculator-app.qmlproject	2014-05-09 15:13:20 +0000
+++ ubuntu-calculator-app.qmlproject	2014-06-06 07:34:41 +0000
@@ -19,13 +19,17 @@
     Files {
         filter: "README*"
     }
-    /* Shows the translation files and the .pro file used to generate the .pot template */
+    /* Shows the translation files and the .pot template */
     Files {
         filter: "*.po*"
     }
     Files {
         filter: "CMakeLists.txt"
     }
+    /* Shows the desktop file in the project view */
+    Files {
+        filter: "*.desktop*"
+    }
     /* List of plugin directories passed to QML runtime */
     importPaths: [ "." ,"/usr/lib/x86_64-linux-gnu/qt5/qml" ]
 }