Merge lp:~mtrovo/pomodoro-indicator/translation into lp:pomodoro-indicator

Proposed by Moises Trovo
Status: Merged
Merged at revision: 18
Proposed branch: lp:~mtrovo/pomodoro-indicator/translation
Merge into: lp:pomodoro-indicator
Diff against target: 313 lines (+133/-133)
5 files modified
po/pomodoro-indicator.pot (+65/-0)
po/pt_BR.po (+66/-0)
pomodoro/po/messages.pot (+0/-65)
pomodoro/po/pt_BR.po (+0/-66)
setup.py (+2/-2)
To merge this branch: bzr merge lp:~mtrovo/pomodoro-indicator/translation
Reviewer Review Type Date Requested Status
Moises Trovo Approve
Review via email: mp+76863@code.launchpad.net

Description of the change

I needed to change the directory structure for the gettext feature.

To post a comment you must log in.
Revision history for this message
Moises Trovo (mtrovo) wrote :

Merged with success

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'po'
2=== added file 'po/pomodoro-indicator.pot'
3--- po/pomodoro-indicator.pot 1970-01-01 00:00:00 +0000
4+++ po/pomodoro-indicator.pot 2011-09-24 16:47:22 +0000
5@@ -0,0 +1,65 @@
6+# SOME DESCRIPTIVE TITLE.
7+# Copyright (C) YEAR ORGANIZATION
8+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
9+#
10+msgid ""
11+msgstr ""
12+"Project-Id-Version: PACKAGE VERSION\n"
13+"POT-Creation-Date: 2011-09-08 15:25+BRT\n"
14+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
15+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
16+"Language-Team: LANGUAGE <LL@li.org>\n"
17+"MIME-Version: 1.0\n"
18+"Content-Type: text/plain; charset=CHARSET\n"
19+"Content-Transfer-Encoding: ENCODING\n"
20+"Generated-By: pygettext.py 1.5\n"
21+
22+
23+#: ../visual.py:49 ../visual.py:106
24+msgid "Waiting"
25+msgstr ""
26+
27+#: ../visual.py:50
28+msgid "Working"
29+msgstr ""
30+
31+#: ../visual.py:51
32+msgid "Resting"
33+msgstr ""
34+
35+#: ../visual.py:52
36+msgid "Paused"
37+msgstr ""
38+
39+#: ../visual.py:67
40+msgid "Pomodoro"
41+msgstr ""
42+
43+#: ../visual.py:75
44+msgid "You should start working."
45+msgstr ""
46+
47+#: ../visual.py:77
48+msgid "You can take a break now."
49+msgstr ""
50+
51+#: ../visual.py:110
52+msgid "Start"
53+msgstr ""
54+
55+#: ../visual.py:111
56+msgid "Pause"
57+msgstr ""
58+
59+#: ../visual.py:112
60+msgid "Resume"
61+msgstr ""
62+
63+#: ../visual.py:113
64+msgid "Stop"
65+msgstr ""
66+
67+#: ../visual.py:114
68+msgid "Quit"
69+msgstr ""
70+
71
72=== added directory 'po/pt_BR'
73=== added file 'po/pt_BR.po'
74--- po/pt_BR.po 1970-01-01 00:00:00 +0000
75+++ po/pt_BR.po 2011-09-24 16:47:22 +0000
76@@ -0,0 +1,66 @@
77+# English translations for PACKAGE package.
78+# Copyright (C) 2011 ORGANIZATION
79+# Moises Trovo <moises.trovo@gmail.com>, 2011.
80+#
81+msgid ""
82+msgstr ""
83+"Project-Id-Version: PACKAGE VERSION\n"
84+"POT-Creation-Date: 2011-09-08 15:25+BRT\n"
85+"PO-Revision-Date: 2011-09-08 15:26-0300\n"
86+"Last-Translator: Moises Trovo <moises.trovo@gmail.com>\n"
87+"Language-Team: English\n"
88+"MIME-Version: 1.0\n"
89+"Content-Type: text/plain; charset=UTF-8\n"
90+"Content-Transfer-Encoding: 8bit\n"
91+"Generated-By: pygettext.py 1.5\n"
92+"Language: en_US\n"
93+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
94+
95+#: ../visual.py:49 ../visual.py:106
96+msgid "Waiting"
97+msgstr "Aguardando"
98+
99+#: ../visual.py:50
100+msgid "Working"
101+msgstr "Trabalhando"
102+
103+#: ../visual.py:51
104+msgid "Resting"
105+msgstr "Descansando"
106+
107+#: ../visual.py:52
108+msgid "Paused"
109+msgstr "Pausado"
110+
111+#: ../visual.py:67
112+msgid "Pomodoro"
113+msgstr "Pomodoro"
114+
115+#: ../visual.py:75
116+msgid "You should start working."
117+msgstr "Você deve voltar a trabalhar."
118+
119+#: ../visual.py:77
120+msgid "You can take a break now."
121+msgstr "Você pode dar um intervalo agora."
122+
123+#: ../visual.py:110
124+msgid "Start"
125+msgstr "Iniciar"
126+
127+#: ../visual.py:111
128+msgid "Pause"
129+msgstr "Pausar"
130+
131+#: ../visual.py:112
132+msgid "Resume"
133+msgstr "Continuar"
134+
135+#: ../visual.py:113
136+msgid "Stop"
137+msgstr "Parar"
138+
139+#: ../visual.py:114
140+msgid "Quit"
141+msgstr "Sair"
142+
143
144=== added directory 'po/pt_BR/LC_MESSAGES'
145=== added file 'po/pt_BR/LC_MESSAGES/pomodoro.mo'
146Binary files po/pt_BR/LC_MESSAGES/pomodoro.mo 1970-01-01 00:00:00 +0000 and po/pt_BR/LC_MESSAGES/pomodoro.mo 2011-09-24 16:47:22 +0000 differ
147=== removed directory 'pomodoro/po'
148=== removed file 'pomodoro/po/messages.pot'
149--- pomodoro/po/messages.pot 2011-09-08 18:57:19 +0000
150+++ pomodoro/po/messages.pot 1970-01-01 00:00:00 +0000
151@@ -1,65 +0,0 @@
152-# SOME DESCRIPTIVE TITLE.
153-# Copyright (C) YEAR ORGANIZATION
154-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
155-#
156-msgid ""
157-msgstr ""
158-"Project-Id-Version: PACKAGE VERSION\n"
159-"POT-Creation-Date: 2011-09-08 15:25+BRT\n"
160-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
161-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
162-"Language-Team: LANGUAGE <LL@li.org>\n"
163-"MIME-Version: 1.0\n"
164-"Content-Type: text/plain; charset=CHARSET\n"
165-"Content-Transfer-Encoding: ENCODING\n"
166-"Generated-By: pygettext.py 1.5\n"
167-
168-
169-#: ../visual.py:49 ../visual.py:106
170-msgid "Waiting"
171-msgstr ""
172-
173-#: ../visual.py:50
174-msgid "Working"
175-msgstr ""
176-
177-#: ../visual.py:51
178-msgid "Resting"
179-msgstr ""
180-
181-#: ../visual.py:52
182-msgid "Paused"
183-msgstr ""
184-
185-#: ../visual.py:67
186-msgid "Pomodoro"
187-msgstr ""
188-
189-#: ../visual.py:75
190-msgid "You should start working."
191-msgstr ""
192-
193-#: ../visual.py:77
194-msgid "You can take a break now."
195-msgstr ""
196-
197-#: ../visual.py:110
198-msgid "Start"
199-msgstr ""
200-
201-#: ../visual.py:111
202-msgid "Pause"
203-msgstr ""
204-
205-#: ../visual.py:112
206-msgid "Resume"
207-msgstr ""
208-
209-#: ../visual.py:113
210-msgid "Stop"
211-msgstr ""
212-
213-#: ../visual.py:114
214-msgid "Quit"
215-msgstr ""
216-
217
218=== removed directory 'pomodoro/po/pt_BR'
219=== removed file 'pomodoro/po/pt_BR.po'
220--- pomodoro/po/pt_BR.po 2011-09-08 18:57:19 +0000
221+++ pomodoro/po/pt_BR.po 1970-01-01 00:00:00 +0000
222@@ -1,66 +0,0 @@
223-# English translations for PACKAGE package.
224-# Copyright (C) 2011 ORGANIZATION
225-# Moises Trovo <moises.trovo@gmail.com>, 2011.
226-#
227-msgid ""
228-msgstr ""
229-"Project-Id-Version: PACKAGE VERSION\n"
230-"POT-Creation-Date: 2011-09-08 15:25+BRT\n"
231-"PO-Revision-Date: 2011-09-08 15:26-0300\n"
232-"Last-Translator: Moises Trovo <moises.trovo@gmail.com>\n"
233-"Language-Team: English\n"
234-"MIME-Version: 1.0\n"
235-"Content-Type: text/plain; charset=UTF-8\n"
236-"Content-Transfer-Encoding: 8bit\n"
237-"Generated-By: pygettext.py 1.5\n"
238-"Language: en_US\n"
239-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
240-
241-#: ../visual.py:49 ../visual.py:106
242-msgid "Waiting"
243-msgstr "Aguardando"
244-
245-#: ../visual.py:50
246-msgid "Working"
247-msgstr "Trabalhando"
248-
249-#: ../visual.py:51
250-msgid "Resting"
251-msgstr "Descansando"
252-
253-#: ../visual.py:52
254-msgid "Paused"
255-msgstr "Pausado"
256-
257-#: ../visual.py:67
258-msgid "Pomodoro"
259-msgstr "Pomodoro"
260-
261-#: ../visual.py:75
262-msgid "You should start working."
263-msgstr "Você deve voltar a trabalhar."
264-
265-#: ../visual.py:77
266-msgid "You can take a break now."
267-msgstr "Você pode dar um intervalo agora."
268-
269-#: ../visual.py:110
270-msgid "Start"
271-msgstr "Iniciar"
272-
273-#: ../visual.py:111
274-msgid "Pause"
275-msgstr "Pausar"
276-
277-#: ../visual.py:112
278-msgid "Resume"
279-msgstr "Continuar"
280-
281-#: ../visual.py:113
282-msgid "Stop"
283-msgstr "Parar"
284-
285-#: ../visual.py:114
286-msgid "Quit"
287-msgstr "Sair"
288-
289
290=== removed directory 'pomodoro/po/pt_BR/LC_MESSAGES'
291=== removed file 'pomodoro/po/pt_BR/LC_MESSAGES/pomodoro.mo'
292Binary files pomodoro/po/pt_BR/LC_MESSAGES/pomodoro.mo 2011-09-08 18:57:19 +0000 and pomodoro/po/pt_BR/LC_MESSAGES/pomodoro.mo 1970-01-01 00:00:00 +0000 differ
293=== modified file 'setup.py'
294--- setup.py 2011-09-08 20:49:03 +0000
295+++ setup.py 2011-09-24 16:47:22 +0000
296@@ -52,7 +52,7 @@
297
298 def list_message_files(suffix=".po"):
299 """Return list of all found message files and their intallation paths"""
300- _files = glob("pomodoro/po/*" + suffix)
301+ _files = glob("po/*" + suffix)
302 _list = []
303 for _file in _files:
304 # basename (without extension) is a locale name
305@@ -132,7 +132,7 @@
306 class BuildProject(build):
307
308 def build_message_files(self):
309- """For each pomodoro/po/*.po, build .mo file in target locale directory"""
310+ """For each po/*.po, build .mo file in target locale directory"""
311 for (_src, _dst) in list_message_files():
312 _build_dst = os.path.join("build", 'locale', _dst)
313 self.mkpath(os.path.dirname(_build_dst))

Subscribers

People subscribed via source and target branches

to all changes: