Merge lp:~joel-auterson/ubuntu/maverick/ibus/newmenuname into lp:ubuntu/maverick/ibus

Proposed by Joel Auterson
Status: Superseded
Proposed branch: lp:~joel-auterson/ubuntu/maverick/ibus/newmenuname
Merge into: lp:ubuntu/maverick/ibus
Diff against target: 456 lines (+53/-43)
31 files modified
po/ar.po (+1/-1)
po/as.po (+1/-1)
po/bn_IN.po (+1/-1)
po/ca.po (+1/-1)
po/da.po (+1/-1)
po/de.po (+1/-1)
po/es.po (+1/-1)
po/fr.po (+1/-1)
po/gu.po (+1/-1)
po/hi.po (+1/-1)
po/hu.po (+1/-1)
po/it.po (+1/-1)
po/ja.po (+1/-1)
po/kn.po (+1/-1)
po/ko.po (+1/-1)
po/ml.po (+1/-1)
po/mr.po (+1/-1)
po/or.po (+1/-1)
po/pa.po (+21/-11)
po/pl.po (+1/-1)
po/ru.po (+1/-1)
po/sr.po (+1/-1)
po/sr@latin.po (+1/-1)
po/ta.po (+1/-1)
po/te.po (+1/-1)
po/vi.po (+1/-1)
po/zh_CN.po (+1/-1)
po/zh_HK.po (+1/-1)
po/zh_TW.po (+1/-1)
setup/ibus-setup.desktop.in (+3/-3)
setup/main.py (+1/-1)
To merge this branch: bzr merge lp:~joel-auterson/ubuntu/maverick/ibus/newmenuname
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+28597@code.launchpad.net

This proposal has been superseded by a proposal from 2010-07-05.

Description of the change

Changed the main menu entry in Ubuntu from "Ibus Preferences" to "Keyboard Input Methods". Also changed description.

To post a comment you must log in.
Revision history for this message
Vish (vish) wrote :

Hi,
Could you also have a look at Bug #423525 , which is also about rewording the dialogue to:

"Keyboard Input Method support (IBus daemon) has not been started. Do you want to start it now? "

Revision history for this message
Vish (vish) wrote :

We can probably fix both the bugs in one merge.

Revision history for this message
Joel Auterson (joel-auterson) wrote :

I'll fix it once I've worked out what iBus actually does. :P

On 6/29/10, Vish <email address hidden> wrote:
> We can probably fix both the bugs in one merge.
> --
> https://code.launchpad.net/~joel-auterson/ubuntu/maverick/ibus/newmenuname/+merge/28597
> You are the owner of lp:~joel-auterson/ubuntu/maverick/ibus/newmenuname.
>

Revision history for this message
Vish (vish) wrote :

> I'll fix it once I've worked out what iBus actually does. :P

Heh yeah , I'v tried to understand it better too , but even in windows such a system is called "Input Method" .

Revision history for this message
Joel Auterson (joel-auterson) wrote :

To wikipedia, I suppose...shall I download my previous branch back to
my computer, fix the bug, then push both at once? We could make the
same merge.

Also, when assigning a bug to myself, do I assign it to 100 Papercuts,
the project, or both?

Thanks.

On 6/30/10, Vish <email address hidden> wrote:
>> I'll fix it once I've worked out what iBus actually does. :P
>
> Heh yeah , I'v tried to understand it better too , but even in windows such
> a system is called "Input Method" .
> --
> https://code.launchpad.net/~joel-auterson/ubuntu/maverick/ibus/newmenuname/+merge/28597
> You are the owner of lp:~joel-auterson/ubuntu/maverick/ibus/newmenuname.
>

Revision history for this message
Vish (vish) wrote :

> To wikipedia, I suppose...shall I download my previous branch back to
> my computer, fix the bug, then push both at once? We could make the
> same merge.
>
Hmm , looks like http://code.google.com/p/ibus/issues/list is upstream for IBus bugs. Not sure how they prefer , patches or merges. Could you forward the bug to upstream with your patch? Thanks in advance.

> Also, when assigning a bug to myself, do I assign it to 100 Papercuts,
> the project, or both?
>

You can leave the Papercuts tasks assigned. Looks like you are fixing quite a few bugs , so easier to keep track of the bugs you fixed. :)

Revision history for this message
Joel Auterson (joel-auterson) wrote :

I only know how to do merges, I don't really understand patches.

On 7/1/10, Vish <email address hidden> wrote:
>> To wikipedia, I suppose...shall I download my previous branch back to
>> my computer, fix the bug, then push both at once? We could make the
>> same merge.
>>
> Hmm , looks like http://code.google.com/p/ibus/issues/list is upstream for
> IBus bugs. Not sure how they prefer , patches or merges. Could you forward
> the bug to upstream with your patch? Thanks in advance.
>
>> Also, when assigning a bug to myself, do I assign it to 100 Papercuts,
>> the project, or both?
>>
>
> You can leave the Papercuts tasks assigned. Looks like you are fixing quite
> a few bugs , so easier to keep track of the bugs you fixed. :)
> --
> https://code.launchpad.net/~joel-auterson/ubuntu/maverick/ibus/newmenuname/+merge/28597
> You are the owner of lp:~joel-auterson/ubuntu/maverick/ibus/newmenuname.
>

23. By Joel Auterson <joel@auterson-study>

Changed message shown when IBus is not running.

24. By Joel Auterson <joel@auterson-study>

Made changes according to Arne Goetje's specifications:

reset .po files to normal
changed the string between lines 246 and 266

25. By Joel Auterson

Changed according to suggestions.

Unmerged revisions

25. By Joel Auterson

Changed according to suggestions.

24. By Joel Auterson <joel@auterson-study>

Made changes according to Arne Goetje's specifications:

reset .po files to normal
changed the string between lines 246 and 266

23. By Joel Auterson <joel@auterson-study>

Changed message shown when IBus is not running.

22. By Joel Auterson <joel@auterson-study>

Changed the name of the program in the menu to "Keyboard Input Methods" and the comment to "Allows you to adjust methods for keyboard input."

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'po/ar.po'
2--- po/ar.po 2009-12-17 19:43:32 +0000
3+++ po/ar.po 2010-07-05 16:04:27 +0000
4@@ -111,7 +111,7 @@
5 msgstr "طريقة الإدخال السابقة"
6
7 #: ../setup/main.py:240
8-msgid "IBus daemon is not started. Do you want to start it now?"
9+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
10 msgstr "خادم IBUS لم يبدأ من قبل. هل تريد تشغيله الآن؟"
11
12 #: ../setup/main.py:255
13
14=== modified file 'po/as.po'
15--- po/as.po 2009-12-17 19:43:32 +0000
16+++ po/as.po 2010-07-05 16:04:27 +0000
17@@ -110,7 +110,7 @@
18 msgstr "আগৰ নিবেশ পদ্ধতি"
19
20 #: ../setup/main.py:240
21-msgid "IBus daemon is not started. Do you want to start it now?"
22+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
23 msgstr "IBus ডেমন আৰম্ভ কৰা হোৱা নাই । আপুনি ইয়াক এতিয়া আৰম্ভ কৰিব বিচাৰে নেকি ?"
24
25 #: ../setup/main.py:255
26
27=== modified file 'po/bn_IN.po'
28--- po/bn_IN.po 2009-12-17 19:43:32 +0000
29+++ po/bn_IN.po 2010-07-05 16:04:27 +0000
30@@ -112,7 +112,7 @@
31 msgstr "পূর্ববর্তী ইনপুট পদ্ধতি"
32
33 #: ../setup/main.py:240
34-msgid "IBus daemon is not started. Do you want to start it now?"
35+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
36 msgstr "IBus ডেমন আরম্ভ করা হয়নি। এটি এখন আরম্ভ করা হবে কি?"
37
38 #: ../setup/main.py:255
39
40=== modified file 'po/ca.po'
41--- po/ca.po 2009-12-17 19:43:32 +0000
42+++ po/ca.po 2010-07-05 16:04:27 +0000
43@@ -125,7 +125,7 @@
44 msgstr "anterior mètode d'entrada"
45
46 #: ../setup/main.py:240
47-msgid "IBus daemon is not started. Do you want to start it now?"
48+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
49 msgstr "El dimoni IBus no està iniciat. Voleu iniciar-lo ara?"
50
51 #: ../setup/main.py:255
52
53=== modified file 'po/da.po'
54--- po/da.po 2009-12-17 19:43:32 +0000
55+++ po/da.po 2010-07-05 16:04:27 +0000
56@@ -114,7 +114,7 @@
57 msgstr "forrige inddatametode"
58
59 #: ../setup/main.py:240
60-msgid "IBus daemon is not started. Do you want to start it now?"
61+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
62 msgstr "IBus-dæmonen er ikke startet. Vil du starte den nu?"
63
64 #: ../setup/main.py:255
65
66=== modified file 'po/de.po'
67--- po/de.po 2009-12-17 19:43:32 +0000
68+++ po/de.po 2010-07-05 16:04:27 +0000
69@@ -115,7 +115,7 @@
70 msgstr "Vorherige Eingabemethode"
71
72 #: ../setup/main.py:240
73-msgid "IBus daemon is not started. Do you want to start it now?"
74+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
75 msgstr "IBus-Daemon wurde nicht gestartet. Möchten Sie ihn jetzt starten?"
76
77 #: ../setup/main.py:255
78
79=== modified file 'po/es.po'
80--- po/es.po 2009-12-17 19:43:32 +0000
81+++ po/es.po 2010-07-05 16:04:27 +0000
82@@ -110,7 +110,7 @@
83 msgstr "método de entrada anterior"
84
85 #: ../setup/main.py:240
86-msgid "IBus daemon is not started. Do you want to start it now?"
87+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
88 msgstr "El demonio IBUS no fue iniciado. ¿Desea iniciarlo ahora?"
89
90 #: ../setup/main.py:255
91
92=== modified file 'po/fr.po'
93--- po/fr.po 2009-12-17 19:43:32 +0000
94+++ po/fr.po 2010-07-05 16:04:27 +0000
95@@ -117,7 +117,7 @@
96 msgstr "passer à la méthode d'entrée précédente"
97
98 #: ../setup/main.py:240
99-msgid "IBus daemon is not started. Do you want to start it now?"
100+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
101 msgstr "Le démon IBus n'est pas démarré. Voulez-vous le démarrer maintenant ?"
102
103 #: ../setup/main.py:255
104
105=== modified file 'po/gu.po'
106--- po/gu.po 2009-12-17 19:43:32 +0000
107+++ po/gu.po 2010-07-05 16:04:27 +0000
108@@ -111,7 +111,7 @@
109 msgstr "પહેલાની ઇનપુટ પદ્દતિ"
110
111 #: ../setup/main.py:240
112-msgid "IBus daemon is not started. Do you want to start it now?"
113+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
114 msgstr "IBus ડિમન એ શરૂ થયેલ નથી. શું તમે હવે તેને શરૂ કરવા ઇચ્છો છો?"
115
116 #: ../setup/main.py:255
117
118=== modified file 'po/hi.po'
119--- po/hi.po 2009-12-17 19:43:32 +0000
120+++ po/hi.po 2010-07-05 16:04:27 +0000
121@@ -117,7 +117,7 @@
122 msgstr "पिछली इनपुट विधि"
123
124 #: ../setup/main.py:240
125-msgid "IBus daemon is not started. Do you want to start it now?"
126+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
127 msgstr "IBus अबतक आरंभ नहीं हुआ है. क्या आप इसे आरंभ करना चाहते हैं?"
128
129 #: ../setup/main.py:255
130
131=== modified file 'po/hu.po'
132--- po/hu.po 2009-12-17 19:43:32 +0000
133+++ po/hu.po 2010-07-05 16:04:27 +0000
134@@ -110,7 +110,7 @@
135 msgstr "előző bevitel eljárás"
136
137 #: ../setup/main.py:240
138-msgid "IBus daemon is not started. Do you want to start it now?"
139+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
140 msgstr "Az IBus szolgáltatás áll. Beindítja?"
141
142 #: ../setup/main.py:255
143
144=== modified file 'po/it.po'
145--- po/it.po 2009-12-17 19:43:32 +0000
146+++ po/it.po 2010-07-05 16:04:27 +0000
147@@ -116,7 +116,7 @@
148 msgstr "il metodo di input precedente"
149
150 #: ../setup/main.py:240
151-msgid "IBus daemon is not started. Do you want to start it now?"
152+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
153 msgstr "Il demone IBus non è in esecuzione. Avviarlo ora?"
154
155 #: ../setup/main.py:255
156
157=== modified file 'po/ja.po'
158--- po/ja.po 2009-12-17 19:43:32 +0000
159+++ po/ja.po 2010-07-05 16:04:27 +0000
160@@ -115,7 +115,7 @@
161 msgstr "ひとつ前のインプットメソッド"
162
163 #: ../setup/main.py:240
164-msgid "IBus daemon is not started. Do you want to start it now?"
165+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
166 msgstr "IBus デーモンが動いていません。起動しますか?"
167
168 #: ../setup/main.py:255
169
170=== modified file 'po/kn.po'
171--- po/kn.po 2009-12-17 19:43:32 +0000
172+++ po/kn.po 2010-07-05 16:04:27 +0000
173@@ -111,7 +111,7 @@
174 msgstr "ಹಿಂದಿನ ಇನ್‌ಪುಟ್ ವಿಧಾನ"
175
176 #: ../setup/main.py:240
177-msgid "IBus daemon is not started. Do you want to start it now?"
178+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
179 msgstr "IBus ಡೀಮನ್ ಇನ್ನೂ ಸಹ ಆರಂಭಗೊಂಡಿಲ್ಲ. ನೀವದನ್ನು ಈಗಲೆ ಆರಂಭಿಸಲು ಬಯಸುತ್ತೀರೆ?"
180
181 #: ../setup/main.py:255
182
183=== modified file 'po/ko.po'
184--- po/ko.po 2009-12-17 19:43:32 +0000
185+++ po/ko.po 2010-07-05 16:04:27 +0000
186@@ -110,7 +110,7 @@
187 msgstr "이전 입력 방식 "
188
189 #: ../setup/main.py:240
190-msgid "IBus daemon is not started. Do you want to start it now?"
191+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
192 msgstr "Bus 데몬이 시작되지 않았습니다. 지금 시작하시겠습니까? "
193
194 #: ../setup/main.py:255
195
196=== modified file 'po/ml.po'
197--- po/ml.po 2009-12-17 19:43:32 +0000
198+++ po/ml.po 2010-07-05 16:04:27 +0000
199@@ -111,7 +111,7 @@
200 msgstr "മുമ്പുള്ള ഇന്‍പുട്ട് മെഥേഡ്"
201
202 #: ../setup/main.py:240
203-msgid "IBus daemon is not started. Do you want to start it now?"
204+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
205 msgstr "IBus ഡെമണ്‍ ആരംഭിച്ചിട്ടില്ല. നിങ്ങള്‍ക്കിതു് ഉടന്‍ ആരംഭിക്കണമോ?"
206
207 #: ../setup/main.py:255
208
209=== modified file 'po/mr.po'
210--- po/mr.po 2009-12-17 19:43:32 +0000
211+++ po/mr.po 2010-07-05 16:04:27 +0000
212@@ -114,7 +114,7 @@
213 msgstr "मागील इंपुट पद्धत"
214
215 #: ../setup/main.py:240
216-msgid "IBus daemon is not started. Do you want to start it now?"
217+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
218 msgstr "IBus डिमन सुरू केले गेले नाही. तुम्हाला आता सुरू करायचे?"
219
220 #: ../setup/main.py:255
221
222=== modified file 'po/or.po'
223--- po/or.po 2009-12-17 19:43:32 +0000
224+++ po/or.po 2010-07-05 16:04:27 +0000
225@@ -121,7 +121,7 @@
226 msgstr "ପୂର୍ବ ନିବେଶ ପ୍ରଣାଳୀ"
227
228 #: ../setup/main.py:240
229-msgid "IBus daemon is not started. Do you want to start it now?"
230+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
231 msgstr "IBus ଡେମନଟି ଆରମ୍ଭ ହୋଇନାହିଁ। ଆପଣ ଏହାକୁ ବର୍ତ୍ତମାନ ଆରମ୍ଭ କରିବାକୁ ଚାହୁଁଛନ୍ତି କି?"
232
233 #: ../setup/main.py:255
234
235=== modified file 'po/pa.po'
236--- po/pa.po 2009-12-17 19:43:32 +0000
237+++ po/pa.po 2010-07-05 16:04:27 +0000
238@@ -114,7 +114,7 @@
239 msgstr "ਪਿਛਲਾ ਇੰਪੁੱਟ ਢੰਗ"
240
241 #: ../setup/main.py:240
242-msgid "IBus daemon is not started. Do you want to start it now?"
243+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
244 msgstr "IBus ਡੈਮਨ ਚੱਲਦੀ ਨਹੀਂ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
245
246 #: ../setup/main.py:255
247@@ -125,10 +125,14 @@
248 " export XMODIFIERS=@im=ibus\n"
249 " export QT_IM_MODULE=ibus"
250 msgstr ""
251-"IBus ਸ਼ੁਰੂ ਹੋ ਗਈ ਹੈ! ਜੇ ਤੁਹਾਨੂੰ IBus ਨਾ ਵੇਖਾਈ ਦੇਵੇ ਤਾਂ ਅੱਗੇ ਦਿੱਤੀਆਂ ਲਾਈਨਾਂ ਨੂੰ
252$HOME/.bashrc ਵਿੱਚ ਜੋੜੋ ਅਤੇ ਆਪਣੇ ਡੈਸਕਟਾਪ ਵਿੱਚ ਮੁੜ ਲਾਗਇਨ ਕਰੋ\n"
253-"
254 export GTK_IM_MODULE=ibus\n"
255-"
256 export XMODIFIERS=@im=ibus\n"
257-"
258 export QT_IM_MODULE=ibus"
259+"IBus ਸ਼ੁਰੂ ਹੋ ਗਈ ਹੈ! ਜੇ ਤੁਹਾਨੂੰ IBus ਨਾ ਵੇਖਾਈ ਦੇਵੇ ਤਾਂ ਅੱਗੇ ਦਿੱਤੀਆਂ ਲਾਈਨਾਂ ਨੂੰo
260+$HOME/.bashrc ਵਿੱਚ ਜੋੜੋ ਅਤੇ ਆਪਣੇ ਡੈਸਕਟਾਪ ਵਿੱਚ ਮੁੜ ਲਾਗਇਨ ਕਰੋ\n"
261+"
262+ export GTK_IM_MODULE=ibus\n"
263+"
264+ export XMODIFIERS=@im=ibus\n"
265+"
266+ export QT_IM_MODULE=ibus"
267
268 #: ../setup/main.py:270
269 #, python-format
270@@ -300,11 +304,16 @@
271 "\n"
272 msgstr ""
273 "<big><b>IBus</b></big>\n"
274-"
275<small>ਮਾਹਰ ਇੰਪੁੱਟ ਬੱਸ</small>\n"
276-"
277ਮੁੱਖ ਸਫ਼ਾ: http://code.google.com/p/ibus\n"
278-"
279\n"
280-"
281\n"
282-"
283\n"
284+"
285+<small>ਮਾਹਰ ਇੰਪੁੱਟ ਬੱਸ</small>\n"
286+"
287+ਮੁੱਖ ਸਫ਼ਾ: http://code.google.com/p/ibus\n"
288+"
289+\n"
290+"
291+\n"
292+"
293+\n"
294
295 #: ../setup/setup.ui.h:13
296 msgid ""
297@@ -612,7 +621,8 @@
298 #~ msgstr ""
299 #~ "IBus ਕੋਈ ਇੰਪੁੱਟ ਇੰਜਣ ਯੋਗ ਨਹੀਂ ਕਰ ਸਕਦੀ ਹੈ, ਕਿਉਂਕਿ ਆਈ-ਬੱਸ ਕਿਸੇ ਇੰਪੁੱਟ ਇੰਜਣ ਨੂੰ ਲੋਡ ਨਹੀਂ ਕਰ "
300 #~ "ਸਕਦੀ ਹੈ!\n"
301-#~ "
302ਕੁਝ ਇੰਪੁੱਟ ਇੰਜਣ ਨੂੰ ਲੋਡ ਕਰਨ ਵਾਸਤੇ ibus-setup ਪਰੋਗਰਾਮ ਵਰਤੋਂ।"
303+#~ "
304+ਕੁਝ ਇੰਪੁੱਟ ਇੰਜਣ ਨੂੰ ਲੋਡ ਕਰਨ ਵਾਸਤੇ ibus-setup ਪਰੋਗਰਾਮ ਵਰਤੋਂ।"
305
306 #~ msgid "Setup"
307 #~ msgstr "ਸੈੱਟਅੱਪ"
308
309=== modified file 'po/pl.po'
310--- po/pl.po 2009-12-17 19:43:32 +0000
311+++ po/pl.po 2010-07-05 16:04:27 +0000
312@@ -108,7 +108,7 @@
313 msgstr "poprzednia metoda wprowadzania"
314
315 #: ../setup/main.py:240
316-msgid "IBus daemon is not started. Do you want to start it now?"
317+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
318 msgstr "Demon iBus nie jest uruchomiony. Uruchomić go teraz?"
319
320 #: ../setup/main.py:255
321
322=== modified file 'po/ru.po'
323--- po/ru.po 2009-12-17 19:43:32 +0000
324+++ po/ru.po 2010-07-05 16:04:27 +0000
325@@ -110,7 +110,7 @@
326 msgstr "предыдущий метод ввода"
327
328 #: ../setup/main.py:240
329-msgid "IBus daemon is not started. Do you want to start it now?"
330+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
331 msgstr "Демон IBus не запущен. Хотите запустить его сейчас?"
332
333 #: ../setup/main.py:255
334
335=== modified file 'po/sr.po'
336--- po/sr.po 2009-12-17 19:43:32 +0000
337+++ po/sr.po 2010-07-05 16:04:27 +0000
338@@ -116,7 +116,7 @@
339 msgstr "Претходна метода уноса"
340
341 #: ../setup/main.py:240
342-msgid "IBus daemon is not started. Do you want to start it now?"
343+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
344 msgstr "IBus демон није покренут. Да ли желите да га сада покренете?"
345
346 #: ../setup/main.py:255
347
348=== modified file 'po/sr@latin.po'
349--- po/sr@latin.po 2009-12-17 19:43:32 +0000
350+++ po/sr@latin.po 2010-07-05 16:04:27 +0000
351@@ -116,7 +116,7 @@
352 msgstr "prethodna metoda unosa"
353
354 #: ../setup/main.py:240
355-msgid "IBus daemon is not started. Do you want to start it now?"
356+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
357 msgstr "IBus demon nije pokrenut. Da li želite da ga sada pokrenete?"
358
359 #: ../setup/main.py:255
360
361=== modified file 'po/ta.po'
362--- po/ta.po 2009-12-17 19:43:32 +0000
363+++ po/ta.po 2010-07-05 16:04:27 +0000
364@@ -111,7 +111,7 @@
365 msgstr "முந்தைய உள்ளீடு முறை"
366
367 #: ../setup/main.py:240
368-msgid "IBus daemon is not started. Do you want to start it now?"
369+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
370 msgstr "IBus daemon துவக்கப்படவில்லை. இப்போது துவக்க வேண்டுமா?"
371
372 #: ../setup/main.py:255
373
374=== modified file 'po/te.po'
375--- po/te.po 2009-12-17 19:43:32 +0000
376+++ po/te.po 2010-07-05 16:04:27 +0000
377@@ -117,7 +117,7 @@
378 msgstr "మునుపటి ఇన్పుట్ పద్దతి"
379
380 #: ../setup/main.py:240
381-msgid "IBus daemon is not started. Do you want to start it now?"
382+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
383 msgstr "IBus డెమోన్ ప్రారంభమవలేదు. మీరు దానిని ప్రారంభించాలని అనుకొనుచున్నారా?"
384
385 #: ../setup/main.py:255
386
387=== modified file 'po/vi.po'
388--- po/vi.po 2009-12-17 19:43:32 +0000
389+++ po/vi.po 2010-07-05 16:04:27 +0000
390@@ -110,7 +110,7 @@
391 msgstr "chuyển đến kiểu gõ trước"
392
393 #: ../setup/main.py:240
394-msgid "IBus daemon is not started. Do you want to start it now?"
395+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
396 msgstr ""
397 "Trình nền IBus chưa được khởi động. Bạn có muốn khởi động nó ngay bây giờ?"
398
399
400=== modified file 'po/zh_CN.po'
401--- po/zh_CN.po 2009-12-17 19:43:32 +0000
402+++ po/zh_CN.po 2010-07-05 16:04:27 +0000
403@@ -110,7 +110,7 @@
404 msgstr "前一入法"
405
406 #: ../setup/main.py:240
407-msgid "IBus daemon is not started. Do you want to start it now?"
408+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
409 msgstr "IBus 守护进程没有启动,您是否想现在启动它?"
410
411 #: ../setup/main.py:255
412
413=== modified file 'po/zh_HK.po'
414--- po/zh_HK.po 2009-12-17 19:43:32 +0000
415+++ po/zh_HK.po 2010-07-05 16:04:27 +0000
416@@ -111,7 +111,7 @@
417 msgstr "上一個輸入法"
418
419 #: ../setup/main.py:240
420-msgid "IBus daemon is not started. Do you want to start it now?"
421+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
422 msgstr "IBus daemon 没有啟動,您是否想現在啟動它?"
423
424 #: ../setup/main.py:255
425
426=== modified file 'po/zh_TW.po'
427--- po/zh_TW.po 2009-12-17 19:43:32 +0000
428+++ po/zh_TW.po 2010-07-05 16:04:27 +0000
429@@ -109,7 +109,7 @@
430 msgstr "前一輸入法"
431
432 #: ../setup/main.py:240
433-msgid "IBus daemon is not started. Do you want to start it now?"
434+msgid "The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?"
435 msgstr "IBus daemon 没有啟動,您是否想現在啟動它?"
436
437 #: ../setup/main.py:255
438
439=== modified file 'setup/ibus-setup.desktop.in'
440--- setup/ibus-setup.desktop.in 2009-10-26 18:55:02 +0000
441+++ setup/ibus-setup.desktop.in 2010-07-05 16:04:27 +0000
442@@ -1,8 +1,8 @@
443 [Desktop Entry]
444 Encoding=UTF-8
445-_Name=IBus Preferences
446-_GenericName=IBus Preferences
447-_Comment=IBus Preferences
448+_Name=Keyboard Input Methods
449+_GenericName=Keyboard Input Methods
450+_Comment=Allows you to adjust methods for keyboard input.
451 Exec=ibus-setup
452 Icon=ibus-setup
453 Terminal=false
454
455=== modified file 'setup/main.py'
456--- setup/main.py 2009-12-05 18:44:50 +0000
457+++ setup/main.py 2010-07-05 16:04:27 +0000
458@@ -237,7 +237,7 @@
459 # self.__bus.config_add_watch("/panel")
460 except:
461 while self.__bus == None:
462- message = _("IBus daemon is not started. Do you want to start it now?")
463+ message = _("The IBus daemon is not started. This is a program that runs in the background on your computer, and allows you to type characters from other languages, such as Chinese or Arabic.\nDo you want to start the IBus daemon now?")
464 dlg = gtk.MessageDialog(type = gtk.MESSAGE_QUESTION,
465 buttons = gtk.BUTTONS_YES_NO,
466 message_format = message)

Subscribers

People subscribed via source and target branches

to all changes: