[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~dpm/sudoku-app/rm-pot into lp:sudoku-app

2016-02-09 Thread Alan Pope  
The proposal to merge lp:~dpm/sudoku-app/rm-pot into lp:sudoku-app has been 
updated.

Commit Message changed to:

The additional sudoku-app.pot file, dating from 2014, is getting Launchpad 
confused. Removing it to allow the only 1 valid .pot file to be imported

For more details, see:
https://code.launchpad.net/~dpm/sudoku-app/rm-pot/+merge/285397
-- 
Your team Sudoku Touch developers is requested to review the proposed merge of 
lp:~dpm/sudoku-app/rm-pot into lp:sudoku-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp

[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~dpm/sudoku-app/rm-pot into lp:sudoku-app

2016-02-08 Thread David Planella 
David Planella has proposed merging lp:~dpm/sudoku-app/rm-pot into 
lp:sudoku-app.

Requested reviews:
  Sudoku Touch developers (sudoku-touch-dev)

For more details, see:
https://code.launchpad.net/~dpm/sudoku-app/rm-pot/+merge/285397

The additional sudoku-app.pot file, dating from 2014, is getting Launchpad 
confused. Removing it to allow the only 1 valid .pot file to be imported.
-- 
Your team Sudoku Touch developers is requested to review the proposed merge of 
lp:~dpm/sudoku-app/rm-pot into lp:sudoku-app.
=== removed file 'po/sudoku-app.pot'
--- po/sudoku-app.pot	2014-06-12 11:38:44 +
+++ po/sudoku-app.pot	1970-01-01 00:00:00 +
@@ -1,296 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Canonical Ltd.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: sudoku-app\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-12 19:27+0800\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: components/HighscoresTab.qml:25 components/HighscoresTab.qml:73
-#: sudoku-app.qml:24 sudoku-app.qml:153 sudoku-app.qml:206 sudoku-app.qml:237
-msgid "Best scores for all players"
-msgstr ""
-
-#. TRANSLATORS: %1 is user's first name and %2 is last name
-#: components/HighscoresTab.qml:49 sudoku-app.qml:175
-#, qt-format
-msgid "Best scores for %1 %2"
-msgstr ""
-
-#: components/AddProfileDialog.qml:13
-msgid "Add new profile"
-msgstr ""
-
-#: components/AddProfileDialog.qml:31
-msgid "Lastname"
-msgstr ""
-
-#: components/AddProfileDialog.qml:49
-msgid "Firstname"
-msgstr ""
-
-#: components/AddProfileDialog.qml:66 components/ManageProfileDialog.qml:68
-#: sudoku-app.qml:339
-msgid "OK"
-msgstr ""
-
-#: components/AddProfileDialog.qml:82 components/AddProfileDialog.qml:87
-#: components/ManageProfileDialog.qml:94
-msgid "Warning"
-msgstr ""
-
-#: components/AddProfileDialog.qml:82
-msgid "User already exist."
-msgstr ""
-
-#: components/AddProfileDialog.qml:87 components/ManageProfileDialog.qml:94
-msgid "Lastname and firstname must not be empty."
-msgstr ""
-
-#: components/AddProfileDialog.qml:98 components/ManageProfileDialog.qml:126
-#: sudoku-app.qml:491 sudoku-app.qml:941 sudoku-app.qml:991
-#: components/SudokuBlocksGrid.qml:482
-msgid "Cancel"
-msgstr ""
-
-#: components/AboutTab.qml:101
-msgid "Author(s): "
-msgstr ""
-
-#: components/AboutTab.qml:111
-msgid "Contact: "
-msgstr ""
-
-#: components/AboutTab.qml:137
-msgid "Version: "
-msgstr ""
-
-#: components/ManageProfileDialog.qml:13
-msgid "Edit profile"
-msgstr ""
-
-#: components/ManageProfileDialog.qml:107
-msgid "Delete"
-msgstr ""
-
-#: sudoku-app.qml:50 sudoku-app.qml:51 sudoku-app.qml:736
-msgid "New game"
-msgstr ""
-
-#: sudoku-app.qml:58 sudoku-app.qml:59
-msgid "Reveal hint"
-msgstr ""
-
-#: sudoku-app.qml:67 sudoku-app.qml:68
-msgid "Show settings"
-msgstr ""
-
-#: sudoku-app.qml:75 sudoku-app.qml:76
-msgid "Change difficulty to Easy"
-msgstr ""
-
-#: sudoku-app.qml:88 sudoku-app.qml:89
-msgid "Change difficulty to Moderate"
-msgstr ""
-
-#: sudoku-app.qml:101 sudoku-app.qml:102
-msgid "Change difficulty to Hard"
-msgstr ""
-
-#: sudoku-app.qml:114 sudoku-app.qml:115
-msgid "Change difficulty to Ultra Hard"
-msgstr ""
-
-#: sudoku-app.qml:127 sudoku-app.qml:128
-msgid "Change theme to Simple"
-msgstr ""
-
-#: sudoku-app.qml:137 sudoku-app.qml:138
-msgid "Change theme to UbuntuColors"
-msgstr ""
-
-#: sudoku-app.qml:147 sudoku-app.qml:148
-msgid "Show scores for all users"
-msgstr ""
-
-#: sudoku-app.qml:167 sudoku-app.qml:168
-msgid "Show scores for current user"
-msgstr ""
-
-#: sudoku-app.qml:227
-msgid ""
-"You are a cheat... \n"
-"But we give you\n"
-msgstr ""
-
-#: sudoku-app.qml:229
-msgid "points."
-msgstr ""
-
-#: sudoku-app.qml:326
-msgid "Sudoku games played today"
-msgstr ""
-
-#: sudoku-app.qml:327
-msgid "No Sudoku games played today"
-msgstr ""
-
-#: sudoku-app.qml:355
-msgid "New Game"
-msgstr ""
-
-#: sudoku-app.qml:356
-msgid "Select difficulty level"
-msgstr ""
-
-#: sudoku-app.qml:420 sudoku-app.qml:1038
-msgid "Easy"
-msgstr ""
-
-#: sudoku-app.qml:439 sudoku-app.qml:1038
-msgid "Moderate"
-msgstr ""
-
-#: sudoku-app.qml:456 sudoku-app.qml:1038
-msgid "Hard"
-msgstr ""
-
-#: sudoku-app.qml:473
-msgid ""
-"Ultra\n"
-"Hard"
-msgstr ""
-
-#: sudoku-app.qml:665
-msgid "Sudoku"
-msgstr ""
-
-#: sudoku-app.qml:720
-msgid "You are a cheat..."
-msgstr ""
-
-#: sudoku-app.qml:720
-msgid "Congratulations!"
-msgstr ""
-
-#: sudoku-app.qml:754
-msgid "Show hint"
-msgstr ""
-
-#: sudoku-app.qml:817
-msgid "Not allowed"
-msgstr ""
-
-#: sudoku-app.qml:837
-msgid "Start blocks"
-msgstr ""
-
-#: sudoku-app.qml:858
-msgid "Hinted blocks"