ubuntu-touch-coreapps-reviewers team mailing list archive

[Victor Thompson <victor.thompson@xxxxxxxxx>]

Victor Thompson has proposed merging lp:~vthompson/ubuntu-calculator-app/fix-1464463 into lp:ubuntu-calculator-app.

Commit message:
* Change favorites translatable string.

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

For more details, see:
https://code.launchpad.net/~vthompson/ubuntu-calculator-app/fix-1464463/+merge/261797

* Change favorites translatable string.
-- 
Your team Ubuntu Calculator Developers is requested to review the proposed merge of lp:~vthompson/ubuntu-calculator-app/fix-1464463 into lp:ubuntu-calculator-app.

=== modified file 'app/ui/FavouritePage.qml'
--- app/ui/FavouritePage.qml	2015-03-26 16:22:09 +0000
+++ app/ui/FavouritePage.qml	2015-06-12 01:56:56 +0000
@@ -39,8 +39,8 @@
     }
 
     EmptyState {
-        title: i18n.tr("No favourites")
-        subTitle: i18n.tr("Swipe calculations to the left\nto mark as favourites")
+        title: i18n.tr("No favorites")
+        subTitle: i18n.tr("Swipe calculations to the left\nto mark as favorites")
         iconName: "starred"
         anchors.centerIn: parent
         visible: calculationHistory.numberOfFavourites == 0;

=== modified file 'po/com.ubuntu.calculator.pot'
--- po/com.ubuntu.calculator.pot	2015-04-30 09:31:19 +0000
+++ po/com.ubuntu.calculator.pot	2015-06-12 01:56:56 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-04-30 11:30+0200\n"
+"POT-Creation-Date: 2015-06-11 20:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -65,13 +65,13 @@
 msgstr ""
 
 #: ../app/ui/FavouritePage.qml:42
-msgid "No favourites"
+msgid "No favorites"
 msgstr ""
 
 #: ../app/ui/FavouritePage.qml:43
 msgid ""
 "Swipe calculations to the left\n"
-"to mark as favourites"
+"to mark as favorites"
 msgstr ""
 
 #: ../app/ui/LandscapeKeyboard.qml:19 ../app/ui/PortraitKeyboard.qml:42