Merge lp:~dpm/sudoku-app/rm-pot into lp:sudoku-app

Proposed by David Planella on 2016-02-08
Status: Needs review
Proposed branch: lp:~dpm/sudoku-app/rm-pot
Merge into: lp:sudoku-app
Diff against target: 300 lines (+0/-296)
1 file modified
po/sudoku-app.pot (+0/-296)
To merge this branch: bzr merge lp:~dpm/sudoku-app/rm-pot
Reviewer Review Type Date Requested Status
Sudoku Touch developers 2016-02-08 Pending
Review via email: mp+285397@code.launchpad.net

Commit message

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

Description of the change

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.

To post a comment you must log in.

Unmerged revisions

401. By David Planella on 2016-02-08

Removed additional .pot file template

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'po/sudoku-app.pot'
2--- po/sudoku-app.pot 2014-06-12 11:38:44 +0000
3+++ po/sudoku-app.pot 1970-01-01 00:00:00 +0000
4@@ -1,296 +0,0 @@
5-# SOME DESCRIPTIVE TITLE.
6-# Copyright (C) YEAR Canonical Ltd.
7-# This file is distributed under the same license as the PACKAGE package.
8-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
9-#
10-#, fuzzy
11-msgid ""
12-msgstr ""
13-"Project-Id-Version: sudoku-app\n"
14-"Report-Msgid-Bugs-To: \n"
15-"POT-Creation-Date: 2014-06-12 19:27+0800\n"
16-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
17-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
18-"Language-Team: LANGUAGE <LL@li.org>\n"
19-"Language: \n"
20-"MIME-Version: 1.0\n"
21-"Content-Type: text/plain; charset=CHARSET\n"
22-"Content-Transfer-Encoding: 8bit\n"
23-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
24-
25-#: components/HighscoresTab.qml:25 components/HighscoresTab.qml:73
26-#: sudoku-app.qml:24 sudoku-app.qml:153 sudoku-app.qml:206 sudoku-app.qml:237
27-msgid "<b>Best scores for all players</b>"
28-msgstr ""
29-
30-#. TRANSLATORS: %1 is user's first name and %2 is last name
31-#: components/HighscoresTab.qml:49 sudoku-app.qml:175
32-#, qt-format
33-msgid "Best scores for %1 %2"
34-msgstr ""
35-
36-#: components/AddProfileDialog.qml:13
37-msgid "Add new profile"
38-msgstr ""
39-
40-#: components/AddProfileDialog.qml:31
41-msgid "Lastname"
42-msgstr ""
43-
44-#: components/AddProfileDialog.qml:49
45-msgid "Firstname"
46-msgstr ""
47-
48-#: components/AddProfileDialog.qml:66 components/ManageProfileDialog.qml:68
49-#: sudoku-app.qml:339
50-msgid "OK"
51-msgstr ""
52-
53-#: components/AddProfileDialog.qml:82 components/AddProfileDialog.qml:87
54-#: components/ManageProfileDialog.qml:94
55-msgid "Warning"
56-msgstr ""
57-
58-#: components/AddProfileDialog.qml:82
59-msgid "User already exist."
60-msgstr ""
61-
62-#: components/AddProfileDialog.qml:87 components/ManageProfileDialog.qml:94
63-msgid "Lastname and firstname must not be empty."
64-msgstr ""
65-
66-#: components/AddProfileDialog.qml:98 components/ManageProfileDialog.qml:126
67-#: sudoku-app.qml:491 sudoku-app.qml:941 sudoku-app.qml:991
68-#: components/SudokuBlocksGrid.qml:482
69-msgid "Cancel"
70-msgstr ""
71-
72-#: components/AboutTab.qml:101
73-msgid "Author(s): "
74-msgstr ""
75-
76-#: components/AboutTab.qml:111
77-msgid "Contact: "
78-msgstr ""
79-
80-#: components/AboutTab.qml:137
81-msgid "Version: "
82-msgstr ""
83-
84-#: components/ManageProfileDialog.qml:13
85-msgid "Edit profile"
86-msgstr ""
87-
88-#: components/ManageProfileDialog.qml:107
89-msgid "Delete"
90-msgstr ""
91-
92-#: sudoku-app.qml:50 sudoku-app.qml:51 sudoku-app.qml:736
93-msgid "New game"
94-msgstr ""
95-
96-#: sudoku-app.qml:58 sudoku-app.qml:59
97-msgid "Reveal hint"
98-msgstr ""
99-
100-#: sudoku-app.qml:67 sudoku-app.qml:68
101-msgid "Show settings"
102-msgstr ""
103-
104-#: sudoku-app.qml:75 sudoku-app.qml:76
105-msgid "Change difficulty to Easy"
106-msgstr ""
107-
108-#: sudoku-app.qml:88 sudoku-app.qml:89
109-msgid "Change difficulty to Moderate"
110-msgstr ""
111-
112-#: sudoku-app.qml:101 sudoku-app.qml:102
113-msgid "Change difficulty to Hard"
114-msgstr ""
115-
116-#: sudoku-app.qml:114 sudoku-app.qml:115
117-msgid "Change difficulty to Ultra Hard"
118-msgstr ""
119-
120-#: sudoku-app.qml:127 sudoku-app.qml:128
121-msgid "Change theme to Simple"
122-msgstr ""
123-
124-#: sudoku-app.qml:137 sudoku-app.qml:138
125-msgid "Change theme to UbuntuColors"
126-msgstr ""
127-
128-#: sudoku-app.qml:147 sudoku-app.qml:148
129-msgid "Show scores for all users"
130-msgstr ""
131-
132-#: sudoku-app.qml:167 sudoku-app.qml:168
133-msgid "Show scores for current user"
134-msgstr ""
135-
136-#: sudoku-app.qml:227
137-msgid ""
138-"You are a cheat... \n"
139-"But we give you\n"
140-msgstr ""
141-
142-#: sudoku-app.qml:229
143-msgid "points."
144-msgstr ""
145-
146-#: sudoku-app.qml:326
147-msgid "Sudoku games played today"
148-msgstr ""
149-
150-#: sudoku-app.qml:327
151-msgid "No Sudoku games played today"
152-msgstr ""
153-
154-#: sudoku-app.qml:355
155-msgid "New Game"
156-msgstr ""
157-
158-#: sudoku-app.qml:356
159-msgid "Select difficulty level"
160-msgstr ""
161-
162-#: sudoku-app.qml:420 sudoku-app.qml:1038
163-msgid "Easy"
164-msgstr ""
165-
166-#: sudoku-app.qml:439 sudoku-app.qml:1038
167-msgid "Moderate"
168-msgstr ""
169-
170-#: sudoku-app.qml:456 sudoku-app.qml:1038
171-msgid "Hard"
172-msgstr ""
173-
174-#: sudoku-app.qml:473
175-msgid ""
176-"Ultra\n"
177-"Hard"
178-msgstr ""
179-
180-#: sudoku-app.qml:665
181-msgid "Sudoku"
182-msgstr ""
183-
184-#: sudoku-app.qml:720
185-msgid "You are a cheat..."
186-msgstr ""
187-
188-#: sudoku-app.qml:720
189-msgid "Congratulations!"
190-msgstr ""
191-
192-#: sudoku-app.qml:754
193-msgid "Show hint"
194-msgstr ""
195-
196-#: sudoku-app.qml:817
197-msgid "Not allowed"
198-msgstr ""
199-
200-#: sudoku-app.qml:837
201-msgid "Start blocks"
202-msgstr ""
203-
204-#: sudoku-app.qml:858
205-msgid "Hinted blocks"
206-msgstr ""
207-
208-#: sudoku-app.qml:881
209-msgid "Scores"
210-msgstr ""
211-
212-#: sudoku-app.qml:890
213-msgid "Settings"
214-msgstr ""
215-
216-#: sudoku-app.qml:909 sudoku-app.qml:959
217-msgid "Select profile"
218-msgstr ""
219-
220-#: sudoku-app.qml:1031
221-msgid "<b>Sudoku settings</b>"
222-msgstr ""
223-
224-#: sudoku-app.qml:1037
225-msgid "Default Difficulty"
226-msgstr ""
227-
228-#: sudoku-app.qml:1038
229-msgid "Ultra Hard"
230-msgstr ""
231-
232-#: sudoku-app.qml:1038
233-msgid "Always ask"
234-msgstr ""
235-
236-#: sudoku-app.qml:1076
237-msgid "Theme"
238-msgstr ""
239-
240-#: sudoku-app.qml:1100
241-msgid "Hints"
242-msgstr ""
243-
244-#: sudoku-app.qml:1116
245-msgid "Vibration Alerts"
246-msgstr ""
247-
248-#: sudoku-app.qml:1131
249-msgid "<b>Profiles settings</b>"
250-msgstr ""
251-
252-#: sudoku-app.qml:1139
253-msgid "None"
254-msgstr ""
255-
256-#: sudoku-app.qml:1172
257-msgid "Add profile"
258-msgstr ""
259-
260-#: sudoku-app.qml:1181
261-msgid "Manage profiles"
262-msgstr ""
263-
264-#: sudoku-app.qml:1213
265-msgid "About"
266-msgstr ""
267-
268-#: components/SudokuBlocksGrid.qml:327
269-msgid "Please pick a number"
270-msgstr ""
271-
272-#: components/SudokuBlocksGrid.qml:388
273-msgid "Clear"
274-msgstr ""
275-
276-#: components/SudokuBlocksGrid.qml:455
277-#, qt-format
278-msgid ""
279-"You are a cheat...\n"
280-"But we give you\n"
281-"%1 point."
282-msgid_plural ""
283-"You are a cheat...\n"
284-"But we give you\n"
285-"%1 points."
286-msgstr[0] ""
287-msgstr[1] ""
288-
289-#: components/SudokuBlocksGrid.qml:462
290-#, qt-format
291-msgid ""
292-"Congratulations!\n"
293-"We give you\n"
294-"%1 point."
295-msgid_plural ""
296-"Congratulations!\n"
297-"We give you\n"
298-"%1 points."
299-msgstr[0] ""
300-msgstr[1] ""

Subscribers

People subscribed via source and target branches