~ubuntu-multiseat/ubuntu/saucy/unity-greeter/bug1201122
» Revision
64
: debian/patches/convert-format-1-to-3.0_quilt.patch
« back to all changes in this revision
Viewing changes to debian/patches/convert-format-1-to-3.0_quilt.patch
- browse files at revision 64
- compare with another revision
- download diff
- download tarball
- view history from revision 64
- Committer: a7x
- Date: 2013-08-14 22:07:20 UTC
- Revision ID: ubuntu-a7x@scientician.org-20130814220720-hae80f26gjx70vhs
revert to direct patching
trying to have a separate 3.0 (quilt) patch makes it hard to merge
upstream changes
trying to have a separate 3.0 (quilt) patch makes it hard to merge
upstream changes
- files added:
- po/crh.po
- files removed:
- debian/patches
- files modified:
- configure.ac
added
removed
debian/patches/convert-format-1-to-3.0_quilt.patch
1
Description: <short summary of the patch>
2
TODO: Put a short summary on the line above and replace this paragraph
3
with a longer explanation of this change. Complete the meta-information
4
with other relevant fields (see below for details). To make it easier, the
5
information below has been extracted from the changelog. Adjust it or drop
6
it.
7
.
8
unity-greeter (13.10.1-0ubuntu4) saucy; urgency=low
9
.
10
* Really add the ido build-depends, that got dropped while dealing with
11
the lack of quilt to apply the patch in this source
12
Author: Sebastien Bacher <seb128@ubuntu.com>
13
14
---
15
The information above should follow the Patch Tagging Guidelines, please
16
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
17
are templates for supplementary fields that you might want to add:
18
19
Origin: <vendor|upstream|other>, <url of original patch>
20
Bug: <url in upstream bugtracker>
21
Bug-Debian: http://bugs.debian.org/<bugnumber>
22
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
23
Forwarded: <no|not-needed|url proving that it has been forwarded>
24
Reviewed-By: <name and email of someone who approved the patch>
25
Last-Update: <YYYY-MM-DD>
26
27
--- unity-greeter-13.10.1.orig/configure.ac
28
+++ unity-greeter-13.10.1/configure.ac
29
@@ -21,6 +21,7 @@ PKG_CHECK_MODULES(UNITY_GREETER, [
30
gtk+-3.0
31
gdk-x11-3.0
32
indicator3-0.4
33
+ libido3-0.1 >= 13.10.0
34
liblightdm-gobject-1 >= 1.4.0
35
freetype2
36
cairo-ft
37
@@ -28,6 +29,8 @@ PKG_CHECK_MODULES(UNITY_GREETER, [
38
x11
39
])
40
41
+AC_DEFINE_UNQUOTED([INDICATOR_FILE_DIR], ["${prefix}/share/unity/indicators"], [Indicator files are searched for in this directory])
42
+
43
INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
44
AC_SUBST(INDICATORDIR)
45
46
--- /dev/null
47
+++ unity-greeter-13.10.1/po/crh.po
48
@@ -0,0 +1,199 @@
49
+# Crimean Turkish; Crimean Tatar translation for unity-greeter
50
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
51
+# This file is distributed under the same license as the unity-greeter package.
52
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
53
+#
54
+msgid ""
55
+msgstr ""
56
+"Project-Id-Version: unity-greeter\n"
57
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
58
+"POT-Creation-Date: 2013-06-19 20:42+0000\n"
59
+"PO-Revision-Date: 2013-04-16 05:44+0000\n"
60
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
61
+"Language-Team: Crimean Turkish; Crimean Tatar <crh@li.org>\n"
62
+"MIME-Version: 1.0\n"
63
+"Content-Type: text/plain; charset=UTF-8\n"
64
+"Content-Transfer-Encoding: 8bit\n"
65
+"X-Launchpad-Export-Date: 2013-06-20 05:44+0000\n"
66
+"X-Generator: Launchpad (build 16673)\n"
67
+
68
+#: ../src/greeter-list.vala:285
69
+#, c-format
70
+msgid "Enter password for %s"
71
+msgstr "%s içün sır-söz kirsetiñiz"
72
+
73
+#: ../src/greeter-list.vala:783 ../src/user-list.vala:650
74
+#: ../src/user-list.vala:1412 ../src/user-list.vala:1506
75
+#: ../src/user-list.vala:1529 ../src/user-list.vala:1533
76
+#: ../src/user-list.vala:1537 ../src/user-list.vala:1543
77
+#: ../src/user-list.vala:1547 ../src/user-list.vala:1550
78
+msgid "Password:"
79
+msgstr "Parol:"
80
+
81
+#: ../src/greeter-list.vala:785 ../src/user-list.vala:644
82
+#: ../src/user-list.vala:1509
83
+msgid "Username:"
84
+msgstr "Qullanıcı adı:"
85
+
86
+#: ../src/greeter-list.vala:837
87
+msgid "Invalid password, please try again"
88
+msgstr "Keçersiz parol, lütfen yañıdan deñeñiz"
89
+
90
+#: ../src/greeter-list.vala:848
91
+msgid "Failed to authenticate"
92
+msgstr "Sahihlenim muvaffaqiyetsiz"
93
+
94
+#: ../src/greeter-list.vala:903
95
+msgid "Logging in..."
96
+msgstr "İçeri imzalanıla..."
97
+
98
+#: ../src/main-window.vala:47
99
+msgid "Login Screen"
100
+msgstr "İçeri İmzalanım Ekranı"
101
+
102
+#: ../src/menubar.vala:236
103
+msgid "Onscreen keyboard"
104
+msgstr "Ekran-üstü klavye"
105
+
106
+#: ../src/menubar.vala:241
107
+msgid "High Contrast"
108
+msgstr "Yüksek Tezat"
109
+
110
+#: ../src/menubar.vala:247
111
+msgid "Screen Reader"
112
+msgstr "Ekran Oquyıcı"
113
+
114
+#: ../src/prompt-box.vala:211
115
+msgid "Session Options"
116
+msgstr "Oturım Seçenekleri"
117
+
118
+#: ../src/session-list.vala:34
119
+msgid "Select desktop environment"
120
+msgstr "Masaüstü çevresini saylañız"
121
+
122
+#. Translators: %s is a session name like KDE or Ubuntu
123
+#: ../src/toggle-box.vala:93
124
+#, c-format
125
+msgid "%s (Default)"
126
+msgstr "%s (Ögbelgilengen)"
127
+
128
+#. Help string for command line --version flag
129
+#: ../src/unity-greeter.vala:451
130
+msgid "Show release version"
131
+msgstr "Çıqarılış sürümini köster"
132
+
133
+# tüklü
134
+#. Help string for command line --test-mode flag
135
+#: ../src/unity-greeter.vala:454
136
+msgid "Run in test mode"
137
+msgstr "Sınama kipinde çaptır"
138
+
139
+# tüklü
140
+#. Arguments and description for --help text
141
+#: ../src/unity-greeter.vala:460
142
+msgid "- Unity Greeter"
143
+msgstr "- Unity Qarşılayıcısı"
144
+
145
+#. Text printed out when an unknown command-line argument provided
146
+#: ../src/unity-greeter.vala:471
147
+#, c-format
148
+msgid "Run '%s --help' to see a full list of available command line options."
149
+msgstr ""
150
+"Faydalanışlı emir satrı seçenekleriniñ tam bir listesini körmek içün '%s --"
151
+"help' çaptırıñız."
152
+
153
+#: ../src/user-list.vala:45
154
+msgid "Guest Session"
155
+msgstr "Musafir Oturımı"
156
+
157
+#: ../src/user-list.vala:387
158
+msgid "Please enter a complete e-mail address"
159
+msgstr "Lütfen tam bir e-poşta adresi kirsetiñiz"
160
+
161
+#: ../src/user-list.vala:467
162
+msgid "Incorrect e-mail address or password"
163
+msgstr "Yañlış e-poçta yaki sır-söz"
164
+
165
+#: ../src/user-list.vala:498
166
+msgid ""
167
+"If you have an account on an RDP or Citrix server, Remote Login lets you run "
168
+"applications from that server."
169
+msgstr ""
170
+"Eger bir RDP ya da Citrix sunucısı üzerinde bir hesabıñız bar ise, Uzaqtan "
171
+"İçeri İmzalanım sizge o sunucıdan uyğulamalarnı çaptırmağa imkân berir."
172
+
173
+#. For 12.10 we still don't support Citrix
174
+#: ../src/user-list.vala:500
175
+msgid ""
176
+"If you have an account on an RDP server, Remote Login lets you run "
177
+"applications from that server."
178
+msgstr ""
179
+"Eger bir RDP sunucısı üzerinde bir hesabıñız bar ise, Uzaqtan İçeri "
180
+"İmzalanım sizge o sunucıdan uyğulamalarnı çalıştırmağa imkân berir."
181
+
182
+#: ../src/user-list.vala:503
183
+msgid "Cancel"
184
+msgstr "Vazgeç"
185
+
186
+#: ../src/user-list.vala:504
187
+msgid "Set Up…"
188
+msgstr "Ayarlama…"
189
+
190
+#: ../src/user-list.vala:506
191
+msgid ""
192
+"You need an Ubuntu Remote Login account to use this service. Would you like "
193
+"to set up an account now?"
194
+msgstr ""
195
+"Bu hızmetni qullanmaq içün bir Ubuntu Uzaqtan İçeri İmzalanım hesabına "
196
+"ihtiyacıñız bar. Şimdi bir hesapnı ayarlamağa ister ediñizmi?"
197
+
198
+#: ../src/user-list.vala:510
199
+msgid "OK"
200
+msgstr "Tamam"
201
+
202
+#: ../src/user-list.vala:511
203
+msgid ""
204
+"You need an Ubuntu Remote Login account to use this service. Visit "
205
+"uccs.canonical.com to set up an account."
206
+msgstr ""
207
+"Bu hızmetni qullanmaq içün bir Ubuntu Uzaqtan İçeri İmzalanım hesabına "
208
+"muhtacsıñız. Bir hesapnı ayarlamaq içün uccs.canonical.com ziyaret etiñiz."
209
+
210
+#: ../src/user-list.vala:628
211
+msgid "Server type not supported."
212
+msgstr "Sunucı türü desteklenmey."
213
+
214
+#: ../src/user-list.vala:669
215
+msgid "Domain:"
216
+msgstr "Saha:"
217
+
218
+#: ../src/user-list.vala:730
219
+msgid "Email address:"
220
+msgstr "E-poçta adresi:"
221
+
222
+#. 'Log In' here is the button for logging in.
223
+#: ../src/user-list.vala:774
224
+msgid "Log In"
225
+msgstr "İçeri İmzalan"
226
+
227
+#: ../src/user-list.vala:775
228
+#, c-format
229
+msgid "Login as %s"
230
+msgstr "%s olaraq içeri imzalan"
231
+
232
+#: ../src/user-list.vala:779
233
+msgid "Retry"
234
+msgstr "Kene deñe"
235
+
236
+#: ../src/user-list.vala:780
237
+#, c-format
238
+msgid "Retry as %s"
239
+msgstr "%s olaraq kene deñe"
240
+
241
+#: ../src/user-list.vala:819
242
+msgid "Login"
243
+msgstr "İçeri İmzalanım"
244
+
245
+#: ../src/user-list.vala:1546
246
+msgid "Favorite Color (blue):"
247
+msgstr "Közde Tüs (kök):"
248
--- /dev/null
249
+++ unity-greeter-13.10.1/po/tg.po
250
@@ -0,0 +1,197 @@
251
+# Tajik translation for unity-greeter
252
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
253
+# This file is distributed under the same license as the unity-greeter package.
254
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
255
+#
256
+msgid ""
257
+msgstr ""
258
+"Project-Id-Version: unity-greeter\n"
259
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
260
+"POT-Creation-Date: 2013-06-19 20:42+0000\n"
261
+"PO-Revision-Date: 2013-04-15 09:13+0000\n"
262
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
263
+"Language-Team: Tajik <tg@li.org>\n"
264
+"MIME-Version: 1.0\n"
265
+"Content-Type: text/plain; charset=UTF-8\n"
266
+"Content-Transfer-Encoding: 8bit\n"
267
+"X-Launchpad-Export-Date: 2013-06-20 05:44+0000\n"
268
+"X-Generator: Launchpad (build 16673)\n"
269
+
270
+#: ../src/greeter-list.vala:285
271
+#, c-format
272
+msgid "Enter password for %s"
273
+msgstr "Паролро барои %s ворид кунед"
274
+
275
+#: ../src/greeter-list.vala:783 ../src/user-list.vala:650
276
+#: ../src/user-list.vala:1412 ../src/user-list.vala:1506
277
+#: ../src/user-list.vala:1529 ../src/user-list.vala:1533
278
+#: ../src/user-list.vala:1537 ../src/user-list.vala:1543
279
+#: ../src/user-list.vala:1547 ../src/user-list.vala:1550
280
+msgid "Password:"
281
+msgstr "Парол:"
282
+
283
+#: ../src/greeter-list.vala:785 ../src/user-list.vala:644
284
+#: ../src/user-list.vala:1509
285
+msgid "Username:"
286
+msgstr "Номи корбар:"
287
+
288
+#: ../src/greeter-list.vala:837
289
+msgid "Invalid password, please try again"
290
+msgstr "Пароли беэътибор, лутфан, амалро такрор кунед"
291
+
292
+#: ../src/greeter-list.vala:848
293
+msgid "Failed to authenticate"
294
+msgstr "Санҷиши эътибор ба анҷом нарасид"
295
+
296
+#: ../src/greeter-list.vala:903
297
+msgid "Logging in..."
298
+msgstr "Воридшавӣ рафта истодааст..."
299
+
300
+#: ../src/main-window.vala:47
301
+msgid "Login Screen"
302
+msgstr "Экрани воридшавӣ"
303
+
304
+#: ../src/menubar.vala:236
305
+msgid "Onscreen keyboard"
306
+msgstr "Клавиатураи экранӣ"
307
+
308
+#: ../src/menubar.vala:241
309
+msgid "High Contrast"
310
+msgstr "Контрасти баланд"
311
+
312
+#: ../src/menubar.vala:247
313
+msgid "Screen Reader"
314
+msgstr "Хонандаи экран"
315
+
316
+#: ../src/prompt-box.vala:211
317
+msgid "Session Options"
318
+msgstr "Имконоти ҷаласа"
319
+
320
+#: ../src/session-list.vala:34
321
+msgid "Select desktop environment"
322
+msgstr "Муҳити мизи кориро интихоб кунед"
323
+
324
+#. Translators: %s is a session name like KDE or Ubuntu
325
+#: ../src/toggle-box.vala:93
326
+#, c-format
327
+msgid "%s (Default)"
328
+msgstr "%s (Пешфарз)"
329
+
330
+#. Help string for command line --version flag
331
+#: ../src/unity-greeter.vala:451
332
+msgid "Show release version"
333
+msgstr "Намоиш додани ҷаласаи релиз"
334
+
335
+#. Help string for command line --test-mode flag
336
+#: ../src/unity-greeter.vala:454
337
+msgid "Run in test mode"
338
+msgstr "Иҷро кардан дар ҳолати санҷишӣ"
339
+
340
+#. Arguments and description for --help text
341
+#: ../src/unity-greeter.vala:460
342
+msgid "- Unity Greeter"
343
+msgstr "- Unity Greeter"
344
+
345
+#. Text printed out when an unknown command-line argument provided
346
+#: ../src/unity-greeter.vala:471
347
+#, c-format
348
+msgid "Run '%s --help' to see a full list of available command line options."
349
+msgstr ""
350
+"Барои дидани рӯйхати пурраи имконоти дастрасӣ сатри фармон, фармони \"%s --"
351
+"help\"-ро иҷро кунед."
352
+
353
+#: ../src/user-list.vala:45
354
+msgid "Guest Session"
355
+msgstr "Ҷаласаи меҳмон"
356
+
357
+#: ../src/user-list.vala:387
358
+msgid "Please enter a complete e-mail address"
359
+msgstr "Лутфан, суроғаи пурраи почтаи электрониро ворид кунед"
360
+
361
+#: ../src/user-list.vala:467
362
+msgid "Incorrect e-mail address or password"
363
+msgstr "Суроғаи почтаи электронӣ ё пароли нодуруст"
364
+
365
+#: ../src/user-list.vala:498
366
+msgid ""
367
+"If you have an account on an RDP or Citrix server, Remote Login lets you run "
368
+"applications from that server."
369
+msgstr ""
370
+"Агар шумо дар сервери RDP ё Citrix ҳисоб дошта бошед, Воридшавии дурдаст ба "
371
+"шумо имконият медиҳад, ки барномаҳоро аз он сервер иҷро кунед."
372
+
373
+#. For 12.10 we still don't support Citrix
374
+#: ../src/user-list.vala:500
375
+msgid ""
376
+"If you have an account on an RDP server, Remote Login lets you run "
377
+"applications from that server."
378
+msgstr ""
379
+"Агар шумо дар сервери RDP ҳисоб дошта бошед, Воридшавии дурдаст ба шумо "
380
+"имконият медиҳад, ки барномаҳоро аз он сервер иҷро кунед."
381
+
382
+#: ../src/user-list.vala:503
383
+msgid "Cancel"
384
+msgstr "Бекор кардан"
385
+
386
+#: ../src/user-list.vala:504
387
+msgid "Set Up…"
388
+msgstr "Танзим кардан..."
389
+
390
+#: ../src/user-list.vala:506
391
+msgid ""
392
+"You need an Ubuntu Remote Login account to use this service. Would you like "
393
+"to set up an account now?"
394
+msgstr ""
395
+"Барои истифодаи ин хидмат ба шумо ҳисоби Воридшавии дурдасти Ubuntu лозим "
396
+"аст. Шумо мехоҳед, ки ҳисобро ҳозир танзим кунед?"
397
+
398
+#: ../src/user-list.vala:510
399
+msgid "OK"
400
+msgstr "OK"
401
+
402
+#: ../src/user-list.vala:511
403
+msgid ""
404
+"You need an Ubuntu Remote Login account to use this service. Visit "
405
+"uccs.canonical.com to set up an account."
406
+msgstr ""
407
+"Барои истифодаи ин хидмат ба шумо ҳисоби Воридшавии дурдасти Ubuntu лозим "
408
+"аст. Барои танзим кардани ҳисоб, ба uccs.canonical.com ташриф оред."
409
+
410
+#: ../src/user-list.vala:628
411
+msgid "Server type not supported."
412
+msgstr "Намуди сервер дастгирӣ намешавад."
413
+
414
+#: ../src/user-list.vala:669
415
+msgid "Domain:"
416
+msgstr "Домен:"
417
+
418
+#: ../src/user-list.vala:730
419
+msgid "Email address:"
420
+msgstr "Суроғаи почтаи электронӣ:"
421
+
422
+#. 'Log In' here is the button for logging in.
423
+#: ../src/user-list.vala:774
424
+msgid "Log In"
425
+msgstr "Ворид шудан"
426
+
427
+#: ../src/user-list.vala:775
428
+#, c-format
429
+msgid "Login as %s"
430
+msgstr "Ворид шудан ҳамчун %s"
431
+
432
+#: ../src/user-list.vala:779
433
+msgid "Retry"
434
+msgstr "Такрор кардан"
435
+
436
+#: ../src/user-list.vala:780
437
+#, c-format
438
+msgid "Retry as %s"
439
+msgstr "Такрор кардан ҳамчун %s"
440
+
441
+#: ../src/user-list.vala:819
442
+msgid "Login"
443
+msgstr "Ворид шудан"
444
+
445
+#: ../src/user-list.vala:1546
446
+msgid "Favorite Color (blue):"
447
+msgstr "Ранги дӯстдошта (кабуд):"
448
--- /dev/null
449
+++ unity-greeter-13.10.1/po/frp.po
450
@@ -0,0 +1,187 @@
451
+# Franco-Provençal translation for unity-greeter
452
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
453
+# This file is distributed under the same license as the unity-greeter package.
454
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
455
+#
456
+msgid ""
457
+msgstr ""
458
+"Project-Id-Version: unity-greeter\n"
459
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
460
+"POT-Creation-Date: 2013-06-19 20:42+0000\n"
461
+"PO-Revision-Date: 2013-04-28 19:14+0000\n"
462
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
463
+"Language-Team: Franco-Provençal <frp@li.org>\n"
464
+"MIME-Version: 1.0\n"
465
+"Content-Type: text/plain; charset=UTF-8\n"
466
+"Content-Transfer-Encoding: 8bit\n"
467
+"X-Launchpad-Export-Date: 2013-06-20 05:44+0000\n"
468
+"X-Generator: Launchpad (build 16673)\n"
469
+
470
+#: ../src/greeter-list.vala:285
471
+#, c-format
472
+msgid "Enter password for %s"
473
+msgstr ""
474
+
475
+#: ../src/greeter-list.vala:783 ../src/user-list.vala:650
476
+#: ../src/user-list.vala:1412 ../src/user-list.vala:1506
477
+#: ../src/user-list.vala:1529 ../src/user-list.vala:1533
478
+#: ../src/user-list.vala:1537 ../src/user-list.vala:1543
479
+#: ../src/user-list.vala:1547 ../src/user-list.vala:1550
480
+msgid "Password:"
481
+msgstr "Contrasényi"
482
+
483
+#: ../src/greeter-list.vala:785 ../src/user-list.vala:644
484
+#: ../src/user-list.vala:1509
485
+msgid "Username:"
486
+msgstr "Sobriquèt"
487
+
488
+#: ../src/greeter-list.vala:837
489
+msgid "Invalid password, please try again"
490
+msgstr "Contrasényi invalîda"
491
+
492
+#: ../src/greeter-list.vala:848
493
+msgid "Failed to authenticate"
494
+msgstr "Èrròr d'autentificacion"
495
+
496
+#: ../src/greeter-list.vala:903
497
+msgid "Logging in..."
498
+msgstr "Conèccion…"
499
+
500
+#: ../src/main-window.vala:47
501
+msgid "Login Screen"
502
+msgstr "Ècran de conèccion"
503
+
504
+#: ../src/menubar.vala:236
505
+msgid "Onscreen keyboard"
506
+msgstr "Cllâvo sur l’ ècran"
507
+
508
+#: ../src/menubar.vala:241
509
+msgid "High Contrast"
510
+msgstr "Yaut contrasto"
511
+
512
+#: ../src/menubar.vala:247
513
+msgid "Screen Reader"
514
+msgstr "Lectòr d’ ècran"
515
+
516
+#: ../src/prompt-box.vala:211
517
+msgid "Session Options"
518
+msgstr "Opcions de sèssion"
519
+
520
+#: ../src/session-list.vala:34
521
+msgid "Select desktop environment"
522
+msgstr "Opcion d’ enviromamènt"
523
+
524
+#. Translators: %s is a session name like KDE or Ubuntu
525
+#: ../src/toggle-box.vala:93
526
+#, c-format
527
+msgid "%s (Default)"
528
+msgstr ""
529
+
530
+#. Help string for command line --version flag
531
+#: ../src/unity-greeter.vala:451
532
+msgid "Show release version"
533
+msgstr ""
534
+
535
+#. Help string for command line --test-mode flag
536
+#: ../src/unity-greeter.vala:454
537
+msgid "Run in test mode"
538
+msgstr ""
539
+
540
+#. Arguments and description for --help text
541
+#: ../src/unity-greeter.vala:460
542
+msgid "- Unity Greeter"
543
+msgstr ""
544
+
545
+#. Text printed out when an unknown command-line argument provided
546
+#: ../src/unity-greeter.vala:471
547
+#, c-format
548
+msgid "Run '%s --help' to see a full list of available command line options."
549
+msgstr ""
550
+
551
+#: ../src/user-list.vala:45
552
+msgid "Guest Session"
553
+msgstr "Sèssion d’ invitâ"
554
+
555
+#: ../src/user-list.vala:387
556
+msgid "Please enter a complete e-mail address"
557
+msgstr ""
558
+
559
+#: ../src/user-list.vala:467
560
+msgid "Incorrect e-mail address or password"
561
+msgstr ""
562
+
563
+#: ../src/user-list.vala:498
564
+msgid ""
565
+"If you have an account on an RDP or Citrix server, Remote Login lets you run "
566
+"applications from that server."
567
+msgstr ""
568
+
569
+#. For 12.10 we still don't support Citrix
570
+#: ../src/user-list.vala:500
571
+msgid ""
572
+"If you have an account on an RDP server, Remote Login lets you run "
573
+"applications from that server."
574
+msgstr ""
575
+
576
+#: ../src/user-list.vala:503
577
+msgid "Cancel"
578
+msgstr ""
579
+
580
+#: ../src/user-list.vala:504
581
+msgid "Set Up…"
582
+msgstr ""
583
+
584
+#: ../src/user-list.vala:506
585
+msgid ""
586
+"You need an Ubuntu Remote Login account to use this service. Would you like "
587
+"to set up an account now?"
588
+msgstr ""
589
+
590
+#: ../src/user-list.vala:510
591
+msgid "OK"
592
+msgstr ""
593
+
594
+#: ../src/user-list.vala:511
595
+msgid ""
596
+"You need an Ubuntu Remote Login account to use this service. Visit "
597
+"uccs.canonical.com to set up an account."
598
+msgstr ""
599
+
600
+#: ../src/user-list.vala:628
601
+msgid "Server type not supported."
602
+msgstr ""
603
+
604
+#: ../src/user-list.vala:669
605
+msgid "Domain:"
606
+msgstr ""
607
+
608
+#: ../src/user-list.vala:730
609
+msgid "Email address:"
610
+msgstr ""
611
+
612
+#. 'Log In' here is the button for logging in.
613
+#: ../src/user-list.vala:774
614
+msgid "Log In"
615
+msgstr ""
616
+
617
+#: ../src/user-list.vala:775
618
+#, c-format
619
+msgid "Login as %s"
620
+msgstr ""
621
+
622
+#: ../src/user-list.vala:779
623
+msgid "Retry"
624
+msgstr ""
625
+
626
+#: ../src/user-list.vala:780
627
+#, c-format
628
+msgid "Retry as %s"
629
+msgstr ""
630
+
631
+#: ../src/user-list.vala:819
632
+msgid "Login"
633
+msgstr ""
634
+
635
+#: ../src/user-list.vala:1546
636
+msgid "Favorite Color (blue):"
637
+msgstr ""
638
--- unity-greeter-13.10.1.orig/src/indicator.vapi
639
+++ unity-greeter-13.10.1/src/indicator.vapi
640
@@ -1,5 +1,3 @@
641
-/* indicator3.vapi generated by vapigen, do not modify. */
642
-
643
[CCode (cprefix = "Indicator", lower_case_cprefix = "indicator_")]
644
namespace Indicator {
645
[CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
646
@@ -38,6 +36,7 @@ namespace Indicator {
647
[NoWrapper]
648
public virtual unowned string get_name_hint ();
649
public virtual bool get_show_now (Indicator.ObjectEntry entry);
650
+ public virtual int get_position ();
651
[NoWrapper]
652
public virtual void reserved1 ();
653
[NoWrapper]
654
@@ -48,8 +47,6 @@ namespace Indicator {
655
public virtual void reserved4 ();
656
[NoWrapper]
657
public virtual void reserved5 ();
658
- [NoWrapper]
659
- public virtual void reserved6 ();
660
public void set_environment (string[] env);
661
public virtual signal void accessible_desc_update (Indicator.ObjectEntry entry);
662
public virtual signal void entry_added (Indicator.ObjectEntry entry);
663
@@ -59,6 +56,11 @@ namespace Indicator {
664
public virtual signal void menu_show (Indicator.ObjectEntry entry, uint timestamp);
665
public virtual signal void show_now_changed (Indicator.ObjectEntry entry, bool show_now_state);
666
}
667
+ [CCode (cheader_filename = "libindicator/indicator-ng.h")]
668
+ public class Ng : Object {
669
+ [CCode (has_construct_function = false)]
670
+ public Ng.for_profile (string filename, string profile) throws GLib.Error;
671
+ }
672
[Compact]
673
[CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
674
public class ObjectEntry {
675
@@ -156,3 +158,8 @@ namespace Indicator {
676
[CCode (cheader_filename = "gtk/gtk.h,libindicator/indicator.h,libindicator/indicator-desktop-shortcuts.h,libindicator/indicator-image-helper.h,libindicator/indicator-object.h,libindicator/indicator-service.h,libindicator/indicator-service-manager.h")]
677
public static void image_helper_update (Gtk.Image image, string name);
678
}
679
+
680
+[CCode (cheader_filename="libido/libido.h", lower_case_cprefix = "ido_")]
681
+namespace Ido {
682
+ public void init ();
683
+}
684
--- unity-greeter-13.10.1.orig/src/unity-greeter.vala
685
+++ unity-greeter-13.10.1/src/unity-greeter.vala
686
@@ -434,6 +434,7 @@ public class UnityGreeter
687
}
688
689
Gtk.init (ref args);
690
+ Ido.init ();
691
692
log_timer = new Timer ();
693
Log.set_default_handler (log_cb);
694
--- unity-greeter-13.10.1.orig/src/config.vapi
695
+++ unity-greeter-13.10.1/src/config.vapi
696
@@ -5,6 +5,7 @@ namespace Config
697
public const string LOCALEDIR;
698
public const string VERSION;
699
public const string CONFIG_FILE;
700
+ public const string INDICATOR_FILE_DIR;
701
public const string PKGDATADIR;
702
public const string INDICATORDIR;
703
public const string GSD_BINARY;
704
--- unity-greeter-13.10.1.orig/src/menubar.vala
705
+++ unity-greeter-13.10.1/src/menubar.vala
706
@@ -322,6 +322,53 @@ public class MenuBar : Gtk.MenuBar
707
return keyboard_item;
708
}
709
710
+ private Indicator.Object? load_indicator_file (string indicator_name)
711
+ {
712
+ string dir = Config.INDICATOR_FILE_DIR;
713
+ string path;
714
+ Indicator.Object io;
715
+
716
+ /* To stay backwards compatible, use com.canonical.indicator as the default prefix */
717
+ if (indicator_name.index_of_char ('.') < 0)
718
+ path = @"$dir/com.canonical.indicator.$indicator_name";
719
+ else
720
+ path = @"$dir/$indicator_name";
721
+
722
+ try
723
+ {
724
+ io = new Indicator.Ng.for_profile (path, "desktop_greeter");
725
+ }
726
+ catch (FileError error)
727
+ {
728
+ /* the calling code handles file-not-found; don't warn here */
729
+ return null;
730
+ }
731
+ catch (Error error)
732
+ {
733
+ warning ("unable to load %s: %s", indicator_name, error.message);
734
+ return null;
735
+ }
736
+
737
+ return io;
738
+ }
739
+
740
+ private Indicator.Object? load_indicator_library (string indicator_name)
741
+ {
742
+ // Find file, if it exists
743
+ string[] names_to_try = {"lib" + indicator_name + ".so",
744
+ indicator_name + ".so",
745
+ indicator_name};
746
+ foreach (var filename in names_to_try)
747
+ {
748
+ var full_path = Path.build_filename (Config.INDICATORDIR, filename);
749
+ var io = new Indicator.Object.from_file (full_path);
750
+ if (io != null)
751
+ return io;
752
+ }
753
+
754
+ return null;
755
+ }
756
+
757
private void load_indicator (string indicator_name)
758
{
759
if (indicator_name == "ug-keyboard")
760
@@ -336,24 +383,18 @@ public class MenuBar : Gtk.MenuBar
761
}
762
else
763
{
764
- // Find file, if it exists
765
- string[] names_to_try = {"lib" + indicator_name + ".so",
766
- indicator_name + ".so",
767
- indicator_name};
768
- foreach (var filename in names_to_try)
769
- {
770
- var full_path = Path.build_filename (Config.INDICATORDIR, filename);
771
- var io = new Indicator.Object.from_file (full_path);
772
- if (io == null)
773
- continue;
774
+ var io = load_indicator_file (indicator_name);
775
+
776
+ if (io == null)
777
+ io = load_indicator_library (indicator_name);
778
779
+ if (io != null)
780
+ {
781
indicator_objects.append (io);
782
io.entry_added.connect (indicator_added_cb);
783
io.entry_removed.connect (indicator_removed_cb);
784
foreach (var entry in io.get_entries ())
785
indicator_added_cb (io, entry);
786
-
787
- break;
788
}
789
}
790
}
791
@@ -387,6 +428,18 @@ public class MenuBar : Gtk.MenuBar
792
foreach (var indicator in indicator_list)
793
load_indicator(indicator);
794
795
+ indicator_objects.sort((a, b) => {
796
+ int pos_a = a.get_position ();
797
+ int pos_b = b.get_position ();
798
+
799
+ if (pos_a < 0)
800
+ pos_a = 1000;
801
+ if (pos_b < 0)
802
+ pos_b = 1000;
803
+
804
+ return pos_a - pos_b;
805
+ });
806
+
807
debug ("LANG=%s LANGUAGE=%s", Environment.get_variable ("LANG"), Environment.get_variable ("LANGUAGE"));
808
}
809
Loggerhead is a web-based interface for Breezy
Version: 2.0.1