Xibo

Merge lp:~dangarner/xibo/110-translations-part2 into lp:~xibo-maintainers/xibo/encke

  1. 110-translations-part2
  2. Merge into encke
Proposed by Dan Garner
Status: Merged
Merged at revision: not available
Proposed branch: lp:~dangarner/xibo/110-translations-part2
Merge into: lp:~xibo-maintainers/xibo/encke
Diff against target: 1572 lines (+518/-280)
8 files modified
default.pot (+432/-263)
server/lib/app/debug.class.php (+1/-1)
server/lib/app/helpmanager.class.php (+3/-3)
server/lib/pages/admin.class.php (+10/-10)
server/locale/dbtranslate.php (+67/-0)
server/template/header.php (+2/-0)
server/template/pages/dashboard.php (+2/-2)
server/template/pages/login_box.php (+1/-1)
To merge this branch: bzr merge lp:~dangarner/xibo/110-translations-part2
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'default.mo'
2Binary files default.mo 2009-09-22 19:32:22 +0000 and default.mo 2009-11-26 18:55:20 +0000 differ
3=== modified file 'default.pot'
4--- default.pot 2009-09-22 19:32:22 +0000
5+++ default.pot 2009-11-26 18:55:20 +0000
6@@ -2,20 +2,23 @@
7 msgstr ""
8 "Project-Id-Version: Xibo Digital Signage\n"
9 "Report-Msgid-Bugs-To: \n"
10-"POT-Creation-Date: 2009-09-22 20:31-0000\n"
11+"POT-Creation-Date: 2009-11-26 18:52-0000\n"
12 "PO-Revision-Date: \n"
13-"Last-Translator: Dan Garner <mail@dangarner.co.uk>\n"
14+"Last-Translator: Dan Garner <dan@xibo.org.uk>\n"
15 "Language-Team: <info@xibo.org.uk>\n"
16 "MIME-Version: 1.0\n"
17 "Content-Type: text/plain; charset=UTF-8\n"
18 "Content-Transfer-Encoding: 8bit\n"
19 "X-Poedit-Language: English\n"
20 "X-Poedit-Country: UNITED KINGDOM\n"
21-"X-Poedit-Basepath: C:\\Intranet\\htdocs\\1.1\n"
22+"X-Poedit-Basepath: C:\\wamp\\www\\Series 1.1\\110-translations-part2\\\n"
23 "X-Poedit-KeywordsList: __\n"
24 "X-Poedit-SearchPath-0: server\n"
25 "X-Poedit-SearchPath-1: server/lib/pages\n"
26 "X-Poedit-SearchPath-2: server/lib/app\n"
27+"X-Poedit-SearchPath-3: server/template\n"
28+"X-Poedit-SearchPath-4: server/template/pages\n"
29+"X-Poedit-SearchPath-5: server/modules\n"
30
31 #: server/install.php:65
32 msgid "Welcome to the Xibo Installer!"
33@@ -26,7 +29,7 @@
34 msgstr ""
35
36 #: server/install.php:67
37-#: server/upgrade.php:98
38+#: server/upgrade.php:91
39 msgid "Lets get started!"
40 msgstr ""
41
42@@ -38,22 +41,22 @@
43 #: server/install.php:396
44 #: server/install.php:425
45 #: server/install.php:528
46-#: server/upgrade.php:104
47-#: server/upgrade.php:158
48-#: server/upgrade.php:165
49+#: server/upgrade.php:97
50+#: server/upgrade.php:150
51+#: server/upgrade.php:157
52 #: server/upgrade.php:226
53 msgid "Next"
54 msgstr ""
55
56 #: server/install.php:79
57-#: server/upgrade.php:137
58+#: server/upgrade.php:129
59 msgid "First we need to check if your server meets Xibo's requirements."
60 msgstr ""
61
62 #: server/install.php:87
63 #: server/install.php:95
64+#: server/upgrade.php:139
65 #: server/upgrade.php:147
66-#: server/upgrade.php:155
67 msgid "Retest"
68 msgstr ""
69
70@@ -147,10 +150,10 @@
71 #: server/install.php:507
72 #: server/install.php:513
73 #: server/install.php:517
74-#: server/upgrade.php:69
75-#: server/upgrade.php:70
76-#: server/upgrade.php:121
77-#: server/upgrade.php:287
78+#: server/upgrade.php:62
79+#: server/upgrade.php:63
80+#: server/upgrade.php:114
81+#: server/upgrade.php:294
82 msgid "MySQL Error:"
83 msgstr ""
84
85@@ -175,7 +178,7 @@
86 msgstr ""
87
88 #: server/install.php:307
89-#: server/upgrade.php:287
90+#: server/upgrade.php:294
91 msgid "An error occured populating the database."
92 msgstr ""
93
94@@ -320,7 +323,7 @@
95 msgstr ""
96
97 #: server/install.php:549
98-#: server/upgrade.php:323
99+#: server/upgrade.php:330
100 msgid "A required parameter was missing. Please go through the installer sequentially!"
101 msgstr ""
102
103@@ -328,79 +331,95 @@
104 msgid "Start Again"
105 msgstr ""
106
107-#: server/upgrade.php:69
108+#: server/settings.php:11
109+msgid "Sorry, you are not allowed to directly access this page."
110+msgstr ""
111+
112+#: server/settings.php:11
113+msgid "Please press the back button in your browser."
114+msgstr ""
115+
116+#: server/upgrade.php:62
117 msgid "Unable to connect to the MySQL database using the settings stored in settings.php."
118 msgstr ""
119
120-#: server/upgrade.php:70
121+#: server/upgrade.php:63
122 msgid "Unable to select the MySQL database using the settings stored in settings.php."
123 msgstr ""
124
125-#: server/upgrade.php:96
126+#: server/upgrade.php:89
127 msgid "Welcome to the Xibo Upgrade!"
128 msgstr ""
129
130-#: server/upgrade.php:97
131+#: server/upgrade.php:90
132 msgid "The upgrade program will take you through the process one step at a time."
133 msgstr ""
134
135-#: server/upgrade.php:99
136+#: server/upgrade.php:92
137 msgid "Please enter your xibo_admin password:"
138 msgstr ""
139
140-#: server/upgrade.php:121
141+#: server/upgrade.php:114
142 msgid "An error occured checking your password."
143 msgstr ""
144
145-#: server/upgrade.php:126
146+#: server/upgrade.php:119
147 msgid "Password incorrect. Please try again."
148 msgstr ""
149
150-#: server/upgrade.php:196
151+#: server/upgrade.php:188
152 msgid "Unable to calculate the upgradeTo value. Check for non-numeric SQL and PHP files in the 'install/database' directory."
153 msgstr ""
154
155-#: server/upgrade.php:219
156+#: server/upgrade.php:211
157 msgid "Warning: We included "
158 msgstr ""
159
160-#: server/upgrade.php:219
161+#: server/upgrade.php:211
162 msgid "but it did not include a class of appropriate name."
163 msgstr ""
164
165+#: server/upgrade.php:217
166+msgid "Perform automatic database backup?"
167+msgstr ""
168+
169 #: server/upgrade.php:258
170 msgid "FAIL:"
171 msgstr ""
172
173-#: server/upgrade.php:265
174+#: server/upgrade.php:268
175 msgid "Backing up your database"
176 msgstr ""
177
178-#: server/upgrade.php:293
179+#: server/upgrade.php:272
180+msgid "Skipping database backup"
181+msgstr ""
182+
183+#: server/upgrade.php:300
184 msgid "Step"
185 msgstr ""
186
187-#: server/upgrade.php:305
188+#: server/upgrade.php:312
189 msgid "Unable to delete install.php. Please remove this file manually."
190 msgstr ""
191
192-#: server/upgrade.php:308
193+#: server/upgrade.php:315
194 msgid "Unable to delete upgrade.php. Please remove this file manually."
195 msgstr ""
196
197-#: server/upgrade.php:311
198+#: server/upgrade.php:318
199 msgid "Upgrade is complete!"
200 msgstr ""
201
202-#: server/upgrade.php:313
203+#: server/upgrade.php:320
204 msgid "Login"
205 msgstr ""
206
207-#: server/upgrade.php:317
208+#: server/upgrade.php:324
209 msgid "There was an error during the upgrade. Please take a screenshot of this page and seek help!"
210 msgstr ""
211
212-#: server/upgrade.php:370
213+#: server/upgrade.php:377
214 msgid "You must authenticate to run the upgrade."
215 msgstr ""
216
217@@ -444,39 +463,59 @@
218 msgid "Xibo needs the PHP GD extension to function."
219 msgstr ""
220
221-#: server/config/config.class.php:226
222+#: server/config/config.class.php:225
223+msgid "Session"
224+msgstr ""
225+
226+#: server/config/config.class.php:236
227+msgid "Xibo needs the PHP session support to function."
228+msgstr ""
229+
230+#: server/config/config.class.php:240
231+msgid "PCRE"
232+msgstr ""
233+
234+#: server/config/config.class.php:251
235+msgid "Xibo needs PHP PCRE support to function."
236+msgstr ""
237+
238+#: server/config/config.class.php:255
239+msgid "Gettext"
240+msgstr ""
241+
242+#: server/config/config.class.php:273
243 msgid "Calendar Extension"
244 msgstr ""
245
246-#: server/config/config.class.php:237
247+#: server/config/config.class.php:284
248 msgid "Xibo needs the PHP Calendar extension to function."
249 msgstr ""
250
251-#: server/config/config.class.php:241
252+#: server/config/config.class.php:288
253 msgid "DOM Extension"
254 msgstr ""
255
256-#: server/config/config.class.php:252
257+#: server/config/config.class.php:299
258 msgid "Xibo needs the PHP DOM core functionality enabled."
259 msgstr ""
260
261-#: server/config/config.class.php:256
262+#: server/config/config.class.php:303
263 msgid "DOM XML Extension"
264 msgstr ""
265
266-#: server/config/config.class.php:267
267+#: server/config/config.class.php:314
268 msgid "Xibo needs the PHP DOM XML extension to function."
269 msgstr ""
270
271-#: server/config/config.class.php:271
272+#: server/config/config.class.php:318
273 msgid "Allow PHP to open external URLs"
274 msgstr ""
275
276-#: server/config/config.class.php:282
277+#: server/config/config.class.php:329
278 msgid "You must have allow_url_fopen = On in your PHP.ini file for anonymous statistics gathering to function."
279 msgstr ""
280
281-#: server/config/config.class.php:283
282+#: server/config/config.class.php:330
283 msgid "If you do not intend to enable anonymous statistics gathering you need not worry about this problem."
284 msgstr ""
285
286@@ -536,20 +575,20 @@
287 msgstr ""
288
289 #: server/lib/data/display.data.class.php:150
290-#: server/lib/data/display.data.class.php:240
291+#: server/lib/data/display.data.class.php:242
292 msgid "Could not update this display with a new name."
293 msgstr ""
294
295-#: server/lib/data/display.data.class.php:186
296+#: server/lib/data/display.data.class.php:188
297 msgid "Could not delete this display."
298 msgstr ""
299
300-#: server/lib/data/display.data.class.php:202
301+#: server/lib/data/display.data.class.php:204
302 msgid "Unable to delete display record. However it is no longer usable."
303 msgstr ""
304
305-#: server/lib/data/display.data.class.php:229
306-#: server/lib/data/display.data.class.php:269
307+#: server/lib/data/display.data.class.php:231
308+#: server/lib/data/display.data.class.php:271
309 msgid "Error updating this displays last accessed information."
310 msgstr ""
311
312@@ -644,112 +683,111 @@
313 msgid "Update of settings failed"
314 msgstr ""
315
316-#: server/lib/modules/module.class.php:98
317+#: server/lib/modules/module.class.php:100
318 msgid "Unable to create Module [No type given] - please refer to the Module Documentation."
319 msgstr ""
320
321-#: server/lib/modules/module.class.php:106
322+#: server/lib/modules/module.class.php:108
323 msgid "Unable to create Module [Cannot find type in the database] - please refer to the Module Documentation."
324 msgstr ""
325
326-#: server/lib/modules/module.class.php:112
327+#: server/lib/modules/module.class.php:114
328 msgid "Unable to create Module [No registered modules of this type] - please refer to the Module Documentation."
329 msgstr ""
330
331-#: server/lib/modules/module.class.php:163
332+#: server/lib/modules/module.class.php:168
333 msgid "Cannot find this media item. Please refresh the region options."
334 msgstr ""
335
336-#: server/lib/modules/module.class.php:390
337+#: server/lib/modules/module.class.php:395
338 msgid "Unable to Remove this media from the Layout"
339 msgstr ""
340
341-#: server/lib/modules/module.class.php:401
342+#: server/lib/modules/module.class.php:406
343 msgid "Unable to assign to the Region"
344 msgstr ""
345
346-#: server/lib/modules/module.class.php:410
347+#: server/lib/modules/module.class.php:415
348 msgid "Error adding this media to the library"
349 msgstr ""
350
351-#: server/lib/modules/module.class.php:433
352+#: server/lib/modules/module.class.php:447
353 msgid "Return to the Region Options"
354 msgstr ""
355
356-#: server/lib/modules/module.class.php:434
357+#: server/lib/modules/module.class.php:448
358 msgid "Are you sure you want to remove this item from Xibo?"
359 msgstr ""
360
361-#: server/lib/modules/module.class.php:435
362+#: server/lib/modules/module.class.php:449
363 msgid "It will be lost"
364 msgstr ""
365
366-#: server/lib/modules/module.class.php:450
367+#: server/lib/modules/module.class.php:464
368 msgid "Delete Item"
369 msgstr ""
370
371-#: server/lib/modules/module.class.php:487
372+#: server/lib/modules/module.class.php:501
373+#: server/lib/modules/module.class.php:519
374+msgid "Not yet implemented by this module."
375+msgstr ""
376+
377 #: server/lib/modules/module.class.php:505
378-msgid "Not yet implemented by this module."
379-msgstr ""
380-
381-#: server/lib/modules/module.class.php:491
382-#: server/lib/modules/module.class.php:508
383+#: server/lib/modules/module.class.php:522
384 msgid "Add Item"
385 msgstr ""
386
387-#: server/lib/modules/module.class.php:523
388+#: server/lib/modules/module.class.php:537
389 msgid "Add Media has not been implemented for this module."
390 msgstr ""
391
392-#: server/lib/modules/module.class.php:535
393+#: server/lib/modules/module.class.php:549
394 msgid "Edit Media has not been implemented for this module."
395 msgstr ""
396
397-#: server/lib/pages/admin.class.php:52
398-#: server/lib/pages/admin.class.php:203
399+#: server/lib/pages/admin.class.php:51
400+#: server/lib/pages/admin.class.php:202
401 msgid "Settings"
402 msgstr ""
403
404-#: server/lib/pages/admin.class.php:70
405+#: server/lib/pages/admin.class.php:69
406 msgid "Only admin users are allowed to modify settings"
407 msgstr ""
408
409-#: server/lib/pages/admin.class.php:80
410-#: server/lib/pages/admin.class.php:85
411+#: server/lib/pages/admin.class.php:79
412+#: server/lib/pages/admin.class.php:84
413 msgid "Cannot find the Library Location Setting - this is serious."
414 msgstr ""
415
416-#: server/lib/pages/admin.class.php:112
417-#: server/lib/pages/content.class.php:639
418+#: server/lib/pages/admin.class.php:111
419+#: server/lib/pages/content.class.php:646
420 msgid "The Library Location you have picked is not writable to the Xibo Server."
421 msgstr ""
422
423-#: server/lib/pages/admin.class.php:121
424+#: server/lib/pages/admin.class.php:120
425 msgid "Update of settings failed."
426 msgstr ""
427
428-#: server/lib/pages/admin.class.php:125
429+#: server/lib/pages/admin.class.php:124
430 msgid "Settings changed"
431 msgstr ""
432
433-#: server/lib/pages/admin.class.php:150
434+#: server/lib/pages/admin.class.php:149
435 msgid "Can't get the setting catagories"
436 msgstr ""
437
438-#: server/lib/pages/admin.class.php:172
439-#: server/lib/pages/display.class.php:209
440-#: server/lib/pages/display.class.php:316
441+#: server/lib/pages/admin.class.php:171
442+#: server/lib/pages/display.class.php:237
443+#: server/lib/pages/display.class.php:307
444 #: server/lib/pages/displaygroup.class.php:109
445 #: server/lib/pages/displaygroup.class.php:183
446 #: server/lib/pages/displaygroup.class.php:249
447 #: server/lib/pages/displaygroup.class.php:377
448 #: server/lib/pages/displaygroup.class.php:459
449-#: server/lib/pages/group.class.php:292
450 msgid "Save"
451 msgstr ""
452
453-#: server/lib/pages/admin.class.php:217
454+#: server/lib/pages/admin.class.php:216
455 #: server/lib/pages/admin.class.php:262
456 #: server/lib/pages/admin.class.php:295
457 #: server/lib/pages/admin.class.php:336
458@@ -826,82 +864,75 @@
459 msgid "Library"
460 msgstr ""
461
462-#: server/lib/pages/content.class.php:116
463-#: server/lib/pages/content.class.php:236
464-#: server/lib/pages/content.class.php:440
465-#: server/lib/pages/content.class.php:532
466+#: server/lib/pages/content.class.php:114
467+#: server/lib/pages/content.class.php:234
468+#: server/lib/pages/content.class.php:444
469+#: server/lib/pages/content.class.php:541
470 #: server/lib/pages/displaygroup.class.php:181
471 #: server/lib/pages/displaygroup.class.php:247
472-#: server/lib/pages/group.class.php:100
473-#: server/lib/pages/group.class.php:166
474-#: server/lib/pages/group.class.php:274
475-#: server/lib/pages/group.class.php:306
476 msgid "Name"
477 msgstr ""
478
479+#: server/lib/pages/content.class.php:115
480+#: server/lib/pages/content.class.php:235
481+#: server/lib/pages/content.class.php:445
482+#: server/lib/pages/content.class.php:542
483+msgid "Type"
484+msgstr ""
485+
486+#: server/lib/pages/content.class.php:116
487+#: server/lib/pages/content.class.php:236
488+msgid "Retired"
489+msgstr ""
490+
491 #: server/lib/pages/content.class.php:117
492 #: server/lib/pages/content.class.php:237
493-#: server/lib/pages/content.class.php:441
494-#: server/lib/pages/content.class.php:533
495-msgid "Type"
496+#: server/lib/pages/content.class.php:544
497+msgid "Owner"
498 msgstr ""
499
500 #: server/lib/pages/content.class.php:118
501 #: server/lib/pages/content.class.php:238
502-msgid "Retired"
503-msgstr ""
504-
505-#: server/lib/pages/content.class.php:119
506-#: server/lib/pages/content.class.php:239
507-#: server/lib/pages/content.class.php:535
508-msgid "Owner"
509-msgstr ""
510-
511-#: server/lib/pages/content.class.php:120
512-#: server/lib/pages/content.class.php:240
513-#: server/lib/pages/content.class.php:536
514+#: server/lib/pages/content.class.php:545
515 msgid "Shared"
516 msgstr ""
517
518-#: server/lib/pages/content.class.php:232
519-#: server/lib/pages/content.class.php:528
520+#: server/lib/pages/content.class.php:230
521+#: server/lib/pages/content.class.php:537
522 msgid "Cant get content list"
523 msgstr ""
524
525-#: server/lib/pages/content.class.php:241
526-#: server/lib/pages/display.class.php:318
527+#: server/lib/pages/content.class.php:239
528+#: server/lib/pages/display.class.php:309
529 #: server/lib/pages/displaygroup.class.php:111
530-#: server/lib/pages/group.class.php:167
531 msgid "Action"
532 msgstr ""
533
534-#: server/lib/pages/content.class.php:288
535+#: server/lib/pages/content.class.php:286
536 msgid "You do not have permission to edit this media"
537 msgstr ""
538
539-#: server/lib/pages/content.class.php:300
540-#: server/lib/pages/display.class.php:321
541+#: server/lib/pages/content.class.php:298
542+#: server/lib/pages/display.class.php:312
543 #: server/lib/pages/displaygroup.class.php:112
544-#: server/lib/pages/group.class.php:168
545 msgid "Edit"
546 msgstr ""
547
548-#: server/lib/pages/content.class.php:301
549-#: server/lib/pages/display.class.php:322
550+#: server/lib/pages/content.class.php:299
551+#: server/lib/pages/display.class.php:313
552 #: server/lib/pages/displaygroup.class.php:113
553-#: server/lib/pages/group.class.php:172
554 msgid "Delete"
555 msgstr ""
556
557-#: server/lib/pages/content.class.php:308
558+#: server/lib/pages/content.class.php:306
559 msgid "No available actions."
560 msgstr ""
561
562-#: server/lib/pages/content.class.php:350
563+#: server/lib/pages/content.class.php:349
564 msgid "Add"
565 msgstr ""
566
567-#: server/lib/pages/content.class.php:375
568+#: server/lib/pages/content.class.php:374
569 msgid "Add Media to the Library"
570 msgstr ""
571
572@@ -910,175 +941,177 @@
573 msgstr ""
574
575 #: server/lib/pages/content.class.php:395
576-#: server/lib/pages/display.class.php:387
577+#: server/lib/pages/display.class.php:378
578 msgid "You do not have permissions to access this page"
579 msgstr ""
580
581-#: server/lib/pages/content.class.php:479
582+#: server/lib/pages/content.class.php:483
583 msgid "Assign an item from the Library"
584 msgstr ""
585
586-#: server/lib/pages/content.class.php:534
587+#: server/lib/pages/content.class.php:486
588+#: server/lib/pages/display.class.php:236
589+#: server/lib/pages/display.class.php:308
590+#: server/lib/pages/displaygroup.class.php:110
591+#: server/lib/pages/displaygroup.class.php:184
592+#: server/lib/pages/displaygroup.class.php:250
593+#: server/lib/pages/displaygroup.class.php:376
594+#: server/lib/pages/displaygroup.class.php:458
595+msgid "Cancel"
596+msgstr ""
597+
598+#: server/lib/pages/content.class.php:487
599+msgid "Assign"
600+msgstr ""
601+
602+#: server/lib/pages/content.class.php:543
603 msgid "Duration"
604 msgstr ""
605
606-#: server/lib/pages/content.class.php:537
607+#: server/lib/pages/content.class.php:546
608 msgid "Select"
609 msgstr ""
610
611-#: server/lib/pages/content.class.php:538
612-msgid "Assign"
613-msgstr ""
614-
615 #: server/lib/pages/dashboard.class.php:47
616 msgid "Dashboard"
617 msgstr ""
618
619-#: server/lib/pages/display.class.php:62
620+#: server/lib/pages/display.class.php:59
621 msgid "You do not have permissions to edit this display"
622 msgstr ""
623
624-#: server/lib/pages/display.class.php:84
625+#: server/lib/pages/display.class.php:81
626 msgid "Can not get the display information for display"
627 msgstr ""
628
629-#: server/lib/pages/display.class.php:109
630+#: server/lib/pages/display.class.php:106
631 msgid "Display Administration"
632 msgstr ""
633
634-#: server/lib/pages/display.class.php:141
635+#: server/lib/pages/display.class.php:138
636 msgid "Can not have a display without a name"
637 msgstr ""
638
639+#: server/lib/pages/display.class.php:145
640+msgid "Cannot Edit this Display"
641+msgstr ""
642+
643 #: server/lib/pages/display.class.php:148
644-msgid "Cannot Edit this Display"
645-msgstr ""
646-
647-#: server/lib/pages/display.class.php:151
648 msgid "Display Saved."
649 msgstr ""
650
651-#: server/lib/pages/display.class.php:177
652+#: server/lib/pages/display.class.php:174
653 msgid "The Name of the Display - (1 - 50 characters)."
654 msgstr ""
655
656-#: server/lib/pages/display.class.php:178
657+#: server/lib/pages/display.class.php:175
658 msgid "The Default Layout to Display where there is no other content."
659 msgstr ""
660
661-#: server/lib/pages/display.class.php:179
662+#: server/lib/pages/display.class.php:176
663 msgid "Whether to always put the default into the cycle."
664 msgstr ""
665
666-#: server/lib/pages/display.class.php:180
667+#: server/lib/pages/display.class.php:177
668 msgid "Control the licensing on this display."
669 msgstr ""
670
671-#: server/lib/pages/display.class.php:181
672+#: server/lib/pages/display.class.php:178
673 msgid "Collect auditing from this client. Should only be used if there is a problem with the display."
674 msgstr ""
675
676-#: server/lib/pages/display.class.php:193
677+#: server/lib/pages/display.class.php:190
678 msgid "Will use one of the available licenses for this display"
679 msgstr ""
680
681-#: server/lib/pages/display.class.php:193
682+#: server/lib/pages/display.class.php:190
683 msgid "License Display"
684 msgstr ""
685
686-#: server/lib/pages/display.class.php:199
687+#: server/lib/pages/display.class.php:196
688 msgid "Revoke License"
689 msgstr ""
690
691-#: server/lib/pages/display.class.php:199
692+#: server/lib/pages/display.class.php:196
693 msgid "Make the license available for another display."
694 msgstr ""
695
696-#: server/lib/pages/display.class.php:204
697-#: server/lib/pages/display.class.php:311
698+#: server/lib/pages/display.class.php:201
699+#: server/lib/pages/display.class.php:302
700 msgid "Display"
701 msgstr ""
702
703-#: server/lib/pages/display.class.php:205
704-#: server/lib/pages/display.class.php:312
705+#: server/lib/pages/display.class.php:202
706+#: server/lib/pages/display.class.php:303
707 msgid "Default Layout"
708 msgstr ""
709
710-#: server/lib/pages/display.class.php:206
711-#: server/lib/pages/display.class.php:313
712+#: server/lib/pages/display.class.php:203
713+#: server/lib/pages/display.class.php:304
714 msgid "Interleave Default"
715 msgstr ""
716
717-#: server/lib/pages/display.class.php:207
718-#: server/lib/pages/display.class.php:314
719+#: server/lib/pages/display.class.php:204
720+#: server/lib/pages/display.class.php:305
721 msgid "Auditing"
722 msgstr ""
723
724-#: server/lib/pages/display.class.php:208
725-#: server/lib/pages/display.class.php:315
726+#: server/lib/pages/display.class.php:205
727+#: server/lib/pages/display.class.php:306
728 msgid "License"
729 msgstr ""
730
731-#: server/lib/pages/display.class.php:210
732-#: server/lib/pages/display.class.php:317
733-#: server/lib/pages/displaygroup.class.php:110
734-#: server/lib/pages/displaygroup.class.php:184
735-#: server/lib/pages/displaygroup.class.php:250
736-#: server/lib/pages/displaygroup.class.php:376
737-#: server/lib/pages/displaygroup.class.php:458
738-#: server/lib/pages/group.class.php:291
739-#: server/lib/pages/group.class.php:338
740-#: server/lib/pages/group.class.php:670
741-msgid "Cancel"
742-msgstr ""
743-
744-#: server/lib/pages/display.class.php:246
745+#: server/lib/pages/display.class.php:234
746 msgid "Edit a Display"
747 msgstr ""
748
749-#: server/lib/pages/display.class.php:307
750-#: server/lib/pages/display.class.php:427
751+#: server/lib/pages/display.class.php:298
752+#: server/lib/pages/display.class.php:418
753 msgid "Can not list displays"
754 msgstr ""
755
756-#: server/lib/pages/display.class.php:319
757+#: server/lib/pages/display.class.php:310
758 msgid "Last Accessed"
759 msgstr ""
760
761-#: server/lib/pages/display.class.php:320
762+#: server/lib/pages/display.class.php:311
763 msgid "Logged In"
764 msgstr ""
765
766-#: server/lib/pages/display.class.php:323
767+#: server/lib/pages/display.class.php:314
768 #: server/lib/pages/displaygroup.class.php:116
769 msgid "Group Security"
770 msgstr ""
771
772-#: server/lib/pages/display.class.php:461
773+#: server/lib/pages/display.class.php:452
774 msgid "Currently Playing"
775 msgstr ""
776
777-#: server/lib/pages/display.class.php:497
778+#: server/lib/pages/display.class.php:488
779 msgid "Nothing"
780 msgstr ""
781
782-#: server/lib/pages/display.class.php:549
783+#: server/lib/pages/display.class.php:525
784+msgid "Unable to access displays"
785+msgstr ""
786+
787+#: server/lib/pages/display.class.php:551
788 msgid "You will only be able to delete this display if there is no associated information contained in Xibo."
789 msgstr ""
790
791-#: server/lib/pages/display.class.php:550
792+#: server/lib/pages/display.class.php:552
793 msgid "Are you sure you want to delete this display?"
794 msgstr ""
795
796-#: server/lib/pages/display.class.php:551
797+#: server/lib/pages/display.class.php:553
798+#: server/lib/pages/display.class.php:567
799 #: server/lib/pages/displaygroup.class.php:298
800-#: server/lib/pages/group.class.php:462
801 msgid "Yes"
802 msgstr ""
803
804-#: server/lib/pages/display.class.php:552
805+#: server/lib/pages/display.class.php:554
806+#: server/lib/pages/display.class.php:566
807 #: server/lib/pages/displaygroup.class.php:297
808-#: server/lib/pages/group.class.php:461
809 msgid "No"
810 msgstr ""
811
812@@ -1086,15 +1119,15 @@
813 msgid "Delete this Display?"
814 msgstr ""
815
816-#: server/lib/pages/display.class.php:576
817+#: server/lib/pages/display.class.php:579
818 msgid "No Display selected for Deletion."
819 msgstr ""
820
821-#: server/lib/pages/display.class.php:584
822+#: server/lib/pages/display.class.php:587
823 msgid "Cannot delete this display. You may unlicense it to hide it from view."
824 msgstr ""
825
826-#: server/lib/pages/display.class.php:587
827+#: server/lib/pages/display.class.php:590
828 msgid "The Display has been Deleted"
829 msgstr ""
830
831@@ -1115,13 +1148,11 @@
832 msgstr ""
833
834 #: server/lib/pages/displaygroup.class.php:139
835-#: server/lib/pages/group.class.php:197
836 msgid "No available Actions"
837 msgstr ""
838
839 #: server/lib/pages/displaygroup.class.php:178
840 #: server/lib/pages/displaygroup.class.php:244
841-#: server/lib/pages/group.class.php:272
842 msgid "The Name of this Group."
843 msgstr ""
844
845@@ -1456,7 +1487,8 @@
846 msgstr ""
847
848 #: server/lib/pages/help.class.php:63
849-msgid "No such help file found"
850+#, php-format
851+msgid "No help file found for Topic %s and Category %s."
852 msgstr ""
853
854 #: server/lib/pages/help.class.php:68
855@@ -1488,11 +1520,12 @@
856 msgstr ""
857
858 #: server/lib/pages/layout.class.php:113
859+#: server/locale/dbtranslate.php:37
860 msgid "Layouts"
861 msgstr ""
862
863 #: server/lib/pages/layout.class.php:167
864-#: server/lib/pages/layout.class.php:793
865+#: server/lib/pages/layout.class.php:790
866 msgid "Tags"
867 msgstr ""
868
869@@ -1509,7 +1542,7 @@
870 #: server/lib/pages/layout.class.php:254
871 #: server/lib/pages/layout.class.php:385
872 #, php-format
873-msgid "You already own a layout called '%s'."
874+msgid "You already own a layout called '%s'. Please choose another."
875 msgstr ""
876
877 #: server/lib/pages/layout.class.php:281
878@@ -1522,7 +1555,7 @@
879
880 #: server/lib/pages/layout.class.php:308
881 #: server/lib/pages/layout.class.php:430
882-#: server/lib/pages/layout.class.php:1023
883+#: server/lib/pages/layout.class.php:1001
884 msgid "Layout Details Changed."
885 msgstr ""
886
887@@ -1588,157 +1621,157 @@
888 msgid "None"
889 msgstr ""
890
891-#: server/lib/pages/layout.class.php:739
892-#: server/lib/pages/layout.class.php:790
893+#: server/lib/pages/layout.class.php:735
894+#: server/lib/pages/layout.class.php:787
895 msgid "The Name of the Layout - (1 - 50 characters)"
896 msgstr ""
897
898-#: server/lib/pages/layout.class.php:740
899-#: server/lib/pages/layout.class.php:792
900+#: server/lib/pages/layout.class.php:736
901+#: server/lib/pages/layout.class.php:789
902 msgid "An optional description of the Layout. (1 - 250 characters)"
903 msgstr ""
904
905-#: server/lib/pages/layout.class.php:741
906-#: server/lib/pages/layout.class.php:794
907+#: server/lib/pages/layout.class.php:737
908+#: server/lib/pages/layout.class.php:791
909 msgid "Tags for this layout - used when searching for it. Space delimited. (1 - 250 characters)"
910 msgstr ""
911
912-#: server/lib/pages/layout.class.php:742
913-#: server/lib/pages/layout.class.php:796
914+#: server/lib/pages/layout.class.php:738
915+#: server/lib/pages/layout.class.php:793
916 msgid "The permissions to associate with this Layout"
917 msgstr ""
918
919-#: server/lib/pages/layout.class.php:743
920+#: server/lib/pages/layout.class.php:739
921 msgid "Retire this layout or not? It will no longer be visible in lists"
922 msgstr ""
923
924-#: server/lib/pages/layout.class.php:744
925+#: server/lib/pages/layout.class.php:740
926 msgid "Template to create this layout with."
927 msgstr ""
928
929-#: server/lib/pages/layout.class.php:836
930+#: server/lib/pages/layout.class.php:821
931 msgid "Add/Edit a Layout."
932 msgstr ""
933
934-#: server/lib/pages/layout.class.php:890
935-#: server/lib/pages/layout.class.php:981
936+#: server/lib/pages/layout.class.php:878
937+#: server/lib/pages/layout.class.php:959
938 msgid "Unable to get the Resolution information"
939 msgstr ""
940
941-#: server/lib/pages/layout.class.php:900
942-#: server/lib/pages/layout.class.php:912
943+#: server/lib/pages/layout.class.php:888
944+#: server/lib/pages/layout.class.php:899
945 msgid "Pick the resolution"
946 msgstr ""
947
948-#: server/lib/pages/layout.class.php:901
949+#: server/lib/pages/layout.class.php:889
950 msgid "Select the background image from the library."
951 msgstr ""
952
953-#: server/lib/pages/layout.class.php:902
954+#: server/lib/pages/layout.class.php:890
955 msgid "Use the color picker to select the background color."
956 msgstr ""
957
958-#: server/lib/pages/layout.class.php:907
959+#: server/lib/pages/layout.class.php:894
960 msgid "Background Color"
961 msgstr ""
962
963-#: server/lib/pages/layout.class.php:908
964+#: server/lib/pages/layout.class.php:895
965 msgid "Use the color picker to select the background color"
966 msgstr ""
967
968-#: server/lib/pages/layout.class.php:909
969+#: server/lib/pages/layout.class.php:896
970 msgid "Background Image"
971 msgstr ""
972
973-#: server/lib/pages/layout.class.php:910
974+#: server/lib/pages/layout.class.php:897
975 msgid "Select the background image from the library"
976 msgstr ""
977
978-#: server/lib/pages/layout.class.php:911
979+#: server/lib/pages/layout.class.php:898
980 msgid "Resolution"
981 msgstr ""
982
983-#: server/lib/pages/layout.class.php:952
984+#: server/lib/pages/layout.class.php:927
985 msgid "Change the Background Properties"
986 msgstr ""
987
988-#: server/lib/pages/layout.class.php:1019
989+#: server/lib/pages/layout.class.php:997
990 msgid "Unable to update background information"
991 msgstr ""
992
993-#: server/lib/pages/layout.class.php:1043
994+#: server/lib/pages/layout.class.php:1021
995 msgid "No layout information available, please refresh the page."
996 msgstr ""
997
998-#: server/lib/pages/layout.class.php:1056
999+#: server/lib/pages/layout.class.php:1034
1000 msgid "Region Added."
1001 msgstr ""
1002
1003-#: server/lib/pages/layout.class.php:1075
1004+#: server/lib/pages/layout.class.php:1053
1005 msgid "No layout/region information available, please refresh the page and try again."
1006 msgstr ""
1007
1008-#: server/lib/pages/layout.class.php:1090
1009+#: server/lib/pages/layout.class.php:1068
1010 msgid "Region Deleted."
1011 msgstr ""
1012
1013-#: server/lib/pages/layout.class.php:1174
1014+#: server/lib/pages/layout.class.php:1152
1015 msgid "Order Changed"
1016 msgstr ""
1017
1018-#: server/lib/pages/layout.class.php:1190
1019+#: server/lib/pages/layout.class.php:1168
1020 msgid "Are you sure you want to remove this region?"
1021 msgstr ""
1022
1023-#: server/lib/pages/layout.class.php:1191
1024+#: server/lib/pages/layout.class.php:1169
1025 msgid "All media files will be unassigned and any context saved to the region itself (such as Text, Tickers) will be lost permanently."
1026 msgstr ""
1027
1028-#: server/lib/pages/layout.class.php:1206
1029+#: server/lib/pages/layout.class.php:1184
1030 msgid "Delete this region?"
1031 msgstr ""
1032
1033-#: server/lib/pages/layout.class.php:1276
1034+#: server/lib/pages/layout.class.php:1254
1035 msgid "Options"
1036 msgstr ""
1037
1038-#: server/lib/pages/layout.class.php:1278
1039+#: server/lib/pages/layout.class.php:1256
1040 msgid "Set as Home"
1041 msgstr ""
1042
1043-#: server/lib/pages/layout.class.php:1280
1044+#: server/lib/pages/layout.class.php:1258
1045 msgid "Add Region"
1046 msgstr ""
1047
1048-#: server/lib/pages/layout.class.php:1281
1049+#: server/lib/pages/layout.class.php:1259
1050 msgid "Edit Background"
1051 msgstr ""
1052
1053-#: server/lib/pages/layout.class.php:1282
1054+#: server/lib/pages/layout.class.php:1260
1055 msgid "Properties"
1056 msgstr ""
1057
1058-#: server/lib/pages/layout.class.php:1283
1059+#: server/lib/pages/layout.class.php:1261
1060 msgid "Save Template"
1061 msgstr ""
1062
1063-#: server/lib/pages/layout.class.php:1431
1064+#: server/lib/pages/layout.class.php:1410
1065 msgid "Media Controlled"
1066 msgstr ""
1067
1068-#: server/lib/pages/layout.class.php:1571
1069+#: server/lib/pages/layout.class.php:1550
1070 msgid "Region Options"
1071 msgstr ""
1072
1073+#: server/lib/pages/layout.class.php:1603
1074+msgid "Error getting type from a media item."
1075+msgstr ""
1076+
1077 #: server/lib/pages/layout.class.php:1622
1078-msgid "Error getting type from a media item."
1079-msgstr ""
1080-
1081-#: server/lib/pages/layout.class.php:1641
1082 msgid "Cannot set region information."
1083 msgstr ""
1084
1085-#: server/lib/pages/layout.class.php:1720
1086+#: server/lib/pages/layout.class.php:1701
1087 msgid "Empty Region"
1088 msgstr ""
1089
1090@@ -1842,82 +1875,221 @@
1091 msgid "Message"
1092 msgstr ""
1093
1094-#: server/lib/pages/schedule.class.php:91
1095+#: server/lib/pages/schedule.class.php:92
1096 msgid "The Calendar doesnt support this view."
1097 msgstr ""
1098
1099-#: server/lib/pages/schedule.class.php:441
1100-#: server/lib/pages/schedule.class.php:629
1101-#: server/lib/pages/schedule.class.php:719
1102+#: server/lib/pages/schedule.class.php:278
1103+#, php-format
1104+msgid "+ %d more"
1105+msgstr ""
1106+
1107+#: server/lib/pages/schedule.class.php:387
1108+msgid "Events for Day"
1109+msgstr ""
1110+
1111+#: server/lib/pages/schedule.class.php:509
1112+#: server/lib/pages/schedule.class.php:703
1113+#: server/lib/pages/schedule.class.php:803
1114+#: server/lib/pages/schedule.class.php:896
1115 msgid "Error getting events for date."
1116 msgstr ""
1117
1118-#: server/lib/pages/schedule.class.php:653
1119-#: server/lib/pages/schedule.class.php:743
1120+#: server/lib/pages/schedule.class.php:727
1121+#: server/lib/pages/schedule.class.php:920
1122 msgid "Edit Event"
1123 msgstr ""
1124
1125-#: server/lib/pages/schedule.class.php:850
1126+#: server/lib/pages/schedule.class.php:1026
1127 msgid "No Display Groups"
1128 msgstr ""
1129
1130-#: server/lib/pages/schedule.class.php:986
1131+#: server/lib/pages/schedule.class.php:1157
1132 msgid "Schedule an Event"
1133 msgstr ""
1134
1135-#: server/lib/pages/schedule.class.php:1034
1136+#: server/lib/pages/schedule.class.php:1205
1137 msgid "Error getting details for this event."
1138 msgstr ""
1139
1140-#: server/lib/pages/schedule.class.php:1067
1141+#: server/lib/pages/schedule.class.php:1238
1142 msgid "You do not have permission to edit this event."
1143 msgstr ""
1144
1145-#: server/lib/pages/schedule.class.php:1149
1146+#: server/lib/pages/schedule.class.php:1320
1147 msgid "Edit Scheduled Event"
1148 msgstr ""
1149
1150-#: server/lib/pages/schedule.class.php:1190
1151-#: server/lib/pages/schedule.class.php:1267
1152+#: server/lib/pages/schedule.class.php:1361
1153+#: server/lib/pages/schedule.class.php:1438
1154 msgid "Times must be in the format 00:00"
1155 msgstr ""
1156
1157-#: server/lib/pages/schedule.class.php:1200
1158-#: server/lib/pages/schedule.class.php:1277
1159+#: server/lib/pages/schedule.class.php:1371
1160+#: server/lib/pages/schedule.class.php:1448
1161 msgid "No layout selected"
1162 msgstr ""
1163
1164-#: server/lib/pages/schedule.class.php:1206
1165-#: server/lib/pages/schedule.class.php:1283
1166+#: server/lib/pages/schedule.class.php:1377
1167+#: server/lib/pages/schedule.class.php:1454
1168 msgid "No displays selected"
1169 msgstr ""
1170
1171-#: server/lib/pages/schedule.class.php:1212
1172-#: server/lib/pages/schedule.class.php:1289
1173+#: server/lib/pages/schedule.class.php:1383
1174+#: server/lib/pages/schedule.class.php:1460
1175 msgid "Can not have an end time earlier than your start time"
1176 msgstr ""
1177
1178-#: server/lib/pages/schedule.class.php:1216
1179-#: server/lib/pages/schedule.class.php:1293
1180+#: server/lib/pages/schedule.class.php:1387
1181+#: server/lib/pages/schedule.class.php:1464
1182 msgid "Your start time is in the past. Cannot schedule events in the past"
1183 msgstr ""
1184
1185-#: server/lib/pages/schedule.class.php:1227
1186+#: server/lib/pages/schedule.class.php:1398
1187 msgid "The Event has been Added."
1188 msgstr ""
1189
1190-#: server/lib/pages/schedule.class.php:1304
1191+#: server/lib/pages/schedule.class.php:1475
1192 msgid "The Event has been Modified."
1193 msgstr ""
1194
1195-#: server/lib/pages/schedule.class.php:1344
1196+#: server/lib/pages/schedule.class.php:1515
1197 msgid "Delete Event."
1198 msgstr ""
1199
1200-#: server/lib/pages/schedule.class.php:1422
1201+#: server/lib/pages/schedule.class.php:1593
1202 msgid "The Event has been Deleted."
1203 msgstr ""
1204
1205+#: server/lib/pages/user.class.php:615
1206+msgid "Delete this User?"
1207+msgstr ""
1208+
1209+#: server/locale/dbtranslate.php:25
1210+#: server/locale/dbtranslate.php:36
1211+msgid "Schedule"
1212+msgstr ""
1213+
1214+#: server/locale/dbtranslate.php:26
1215+msgid "Layout"
1216+msgstr ""
1217+
1218+#: server/locale/dbtranslate.php:28
1219+msgid "Management"
1220+msgstr ""
1221+
1222+#: server/locale/dbtranslate.php:29
1223+msgid "Displays"
1224+msgstr ""
1225+
1226+#: server/locale/dbtranslate.php:30
1227+msgid "Groups"
1228+msgstr ""
1229+
1230+#: server/locale/dbtranslate.php:31
1231+msgid "Users"
1232+msgstr ""
1233+
1234+#: server/locale/dbtranslate.php:32
1235+msgid "Log"
1236+msgstr ""
1237+
1238+#: server/locale/dbtranslate.php:34
1239+msgid "Sessions"
1240+msgstr ""
1241+
1242+#: server/locale/dbtranslate.php:39
1243+msgid "Templates"
1244+msgstr ""
1245+
1246+#: server/locale/dbtranslate.php:41
1247+msgid "Edit your Display"
1248+msgstr ""
1249+
1250+#: server/locale/dbtranslate.php:42
1251+msgid "Report Fault"
1252+msgstr ""
1253+
1254+#: server/locale/dbtranslate.php:44
1255+msgid "Display Groups"
1256+msgstr ""
1257+
1258+#: server/locale/dbtranslate.php:45
1259+msgid "Content"
1260+msgstr ""
1261+
1262+#: server/locale/dbtranslate.php:46
1263+msgid "Default"
1264+msgstr ""
1265+
1266+#: server/locale/dbtranslate.php:47
1267+msgid "Error"
1268+msgstr ""
1269+
1270+#: server/locale/dbtranslate.php:48
1271+msgid "General"
1272+msgstr ""
1273+
1274+#: server/locale/dbtranslate.php:49
1275+msgid "Path"
1276+msgstr ""
1277+
1278+#: server/locale/dbtranslate.php:52
1279+msgid "jpg_length"
1280+msgstr ""
1281+
1282+#: server/locale/dbtranslate.php:53
1283+msgid "ppt_length"
1284+msgstr ""
1285+
1286+#: server/locale/dbtranslate.php:54
1287+msgid "swf_length"
1288+msgstr ""
1289+
1290+#: server/locale/dbtranslate.php:55
1291+msgid "defaultMedia"
1292+msgstr ""
1293+
1294+#: server/locale/dbtranslate.php:56
1295+msgid "defaultPlaylist"
1296+msgstr ""
1297+
1298+#: server/locale/dbtranslate.php:57
1299+msgid "defaultUsertype"
1300+msgstr ""
1301+
1302+#: server/locale/dbtranslate.php:58
1303+msgid "defaultTimezone"
1304+msgstr ""
1305+
1306+#: server/locale/dbtranslate.php:59
1307+msgid "debug"
1308+msgstr ""
1309+
1310+#: server/locale/dbtranslate.php:60
1311+msgid "audit"
1312+msgstr ""
1313+
1314+#: server/locale/dbtranslate.php:61
1315+msgid "SERVER_MODE"
1316+msgstr ""
1317+
1318+#: server/locale/dbtranslate.php:62
1319+msgid "SERVER_KEY"
1320+msgstr ""
1321+
1322+#: server/locale/dbtranslate.php:63
1323+msgid "PHONE_HOME"
1324+msgstr ""
1325+
1326+#: server/locale/dbtranslate.php:64
1327+msgid "NUSOAP_PATH"
1328+msgstr ""
1329+
1330+#: server/locale/dbtranslate.php:65
1331+msgid "LIBRARY_LOCATION"
1332+msgstr ""
1333+
1334 #: server/template/header.php:102
1335 msgid "Click to show more time information"
1336 msgstr ""
1337@@ -1935,17 +2107,14 @@
1338 msgstr ""
1339
1340 #: server/template/pages/content_view.php:25
1341-#: server/template/pages/group_view.php:24
1342 msgid "Filter"
1343 msgstr ""
1344
1345 #: server/template/pages/content_view.php:26
1346-#: server/template/pages/group_view.php:25
1347 msgid "Show Filter"
1348 msgstr ""
1349
1350 #: server/template/pages/displaygroup_view.php:23
1351-#: server/template/pages/group_view.php:23
1352 msgid "Add Group"
1353 msgstr ""
1354
1355
1356=== modified file 'server/lib/app/debug.class.php'
1357--- server/lib/app/debug.class.php 2009-05-18 21:37:32 +0000
1358+++ server/lib/app/debug.class.php 2009-11-26 18:55:20 +0000
1359@@ -56,7 +56,7 @@
1360 E_CORE_WARNING => 'Core Warning', E_COMPILE_ERROR => 'Compile Error',
1361 E_COMPILE_WARNING => 'Compile Warning', E_USER_ERROR => 'User Error',
1362 E_USER_WARNING => 'User Warning', E_USER_NOTICE => 'User Notice', E_STRICT =>
1363- 'Runtime Notice', E_RECOVERABLE_ERROR => 'Recoverable Error');
1364+ 'Runtime Notice', E_RECOVERABLE_ERROR => 'Recoverable Error', 8192 => 'Deprecated Call');
1365
1366 // set of errors for which a var trace will be saved
1367 $user_errors_halt = array(E_USER_ERROR);
1368
1369=== modified file 'server/lib/app/helpmanager.class.php'
1370--- server/lib/app/helpmanager.class.php 2009-05-14 19:43:42 +0000
1371+++ server/lib/app/helpmanager.class.php 2009-11-26 18:55:21 +0000
1372@@ -33,8 +33,8 @@
1373 */
1374 public function __construct(database $db, User $user)
1375 {
1376- $this->db =& $db;
1377- $this->user =& $user;
1378+ $this->db =& $db;
1379+ $this->user =& $user;
1380 }
1381
1382 /**
1383@@ -47,7 +47,7 @@
1384 {
1385 $db =& $this->db;
1386
1387- $location = split('/', $location);
1388+ $location = explode('/', $location);
1389 $topic = ucfirst($location[0]);
1390 $category = ucfirst($location[1]);
1391
1392
1393=== modified file 'server/lib/pages/admin.class.php'
1394--- server/lib/pages/admin.class.php 2009-05-25 10:46:39 +0000
1395+++ server/lib/pages/admin.class.php 2009-11-26 18:55:21 +0000
1396@@ -24,7 +24,6 @@
1397 {
1398 private $db;
1399 private $user;
1400- private $display_page = true;
1401
1402 function __construct(database $db, user $user)
1403 {
1404@@ -200,7 +199,7 @@
1405 $output = "";
1406
1407 $title = ucfirst($cat);
1408- $output .= '<h3>' . $title . __('Settings') . '</h3>';
1409+ $output .= '<h3>' . __($title) . ' ' . __('Settings') . '</h3>';
1410
1411 /*
1412 Firstly we want to individually get the user module
1413@@ -220,6 +219,7 @@
1414 $row = $db->get_row($results);
1415 $settingid = Kit::ValidateParam($row[0], _INT);
1416 $setting = Kit::ValidateParam($row[1], _STRING);
1417+ $setting = __($setting);
1418 $value = Kit::ValidateParam($row[2], _STRING);
1419 $helptext = Kit::ValidateParam($row[3], _HTMLSTRING);
1420
1421@@ -234,14 +234,14 @@
1422
1423 foreach ($files as $file)
1424 {
1425- $selected = "";
1426- if($file == $value) $selected = "selected";
1427-
1428- if(preg_match("^module_user^", $file))
1429- {
1430- //var for drop down
1431- $select.= "<option value='$file' $selected>$file</option>";
1432- }
1433+ $selected = "";
1434+ if($file == $value) $selected = "selected";
1435+
1436+ if(preg_match("^module_user^", $file))
1437+ {
1438+ //var for drop down
1439+ $select.= "<option value='$file' $selected>$file</option>";
1440+ }
1441 }
1442
1443 $output .= <<<END
1444
1445=== added file 'server/locale/dbtranslate.php'
1446--- server/locale/dbtranslate.php 1970-01-01 00:00:00 +0000
1447+++ server/locale/dbtranslate.php 2009-11-26 18:55:21 +0000
1448@@ -0,0 +1,67 @@
1449+<?php
1450+/*
1451+ * Xibo - Digitial Signage - http://www.xibo.org.uk
1452+ * Copyright (C) 2009 Daniel Garner
1453+ *
1454+ * This file is part of Xibo.
1455+ *
1456+ * Xibo is free software: you can redistribute it and/or modify
1457+ * it under the terms of the GNU Affero General Public License as published by
1458+ * the Free Software Foundation, either version 3 of the License, or
1459+ * any later version.
1460+ *
1461+ * Xibo is distributed in the hope that it will be useful,
1462+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
1463+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1464+ * GNU Affero General Public License for more details.
1465+ *
1466+ * You should have received a copy of the GNU Affero General Public License
1467+ * along with Xibo. If not, see <http://www.gnu.org/licenses/>.
1468+ */
1469+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
1470+
1471+/* Translations from the Database that need to be registered with Gettext */
1472+
1473+echo __('Schedule');
1474+echo __('Layout');
1475+echo __('Library');
1476+echo __('Management');
1477+echo __('Displays');
1478+echo __('Groups');
1479+echo __('Users');
1480+echo __('Log');
1481+echo __('License');
1482+echo __('Sessions');
1483+echo __('Settings');
1484+echo __('Schedule');
1485+echo __('Layouts');
1486+echo __('Library');
1487+echo __('Templates');
1488+echo __('Settings');
1489+echo __('Edit your Display');
1490+echo __('Report Fault');
1491+echo __('Statistics');
1492+echo __('Display Groups');
1493+echo __('Content');
1494+echo __('Default');
1495+echo __('Error');
1496+echo __('General');
1497+echo __('Path');
1498+
1499+// Settings translations
1500+echo __('jpg_length');
1501+echo __('ppt_length');
1502+echo __('swf_length');
1503+echo __('defaultMedia');
1504+echo __('defaultPlaylist');
1505+echo __('defaultUsertype');
1506+echo __('defaultTimezone');
1507+echo __('debug');
1508+echo __('audit');
1509+echo __('SERVER_MODE');
1510+echo __('SERVER_KEY');
1511+echo __('PHONE_HOME');
1512+echo __('NUSOAP_PATH');
1513+echo __('LIBRARY_LOCATION');
1514+
1515+?>
1516
1517=== modified file 'server/template/header.php'
1518--- server/template/header.php 2009-07-19 16:35:08 +0000
1519+++ server/template/header.php 2009-11-26 18:55:21 +0000
1520@@ -121,6 +121,7 @@
1521 $args = Kit::ValidateParam($menuItem['Args'], _STRING);
1522 $class = Kit::ValidateParam($menuItem['Class'], _WORD);
1523 $title = Kit::ValidateParam($menuItem['Text'], _STRING);
1524+ $title = __($title);
1525
1526 // Extra style for the current one
1527 if ($p == $uri) $class = 'current ' . $class;
1528@@ -141,6 +142,7 @@
1529 $args = Kit::ValidateParam($menuItem['Args'], _STRING);
1530 $class = Kit::ValidateParam($menuItem['Class'], _WORD);
1531 $title = Kit::ValidateParam($menuItem['Text'], _STRING);
1532+ $title = __($title);
1533
1534 // Extra style for the current one
1535 if ($p == $uri) $class = 'current ' . $class;
1536
1537=== modified file 'server/template/pages/dashboard.php'
1538--- server/template/pages/dashboard.php 2009-10-04 19:55:16 +0000
1539+++ server/template/pages/dashboard.php 2009-11-26 18:55:21 +0000
1540@@ -40,9 +40,9 @@
1541 $args = Kit::ValidateParam($menuItem['Args'], _STRING);
1542 $class = Kit::ValidateParam($menuItem['Class'], _WORD);
1543 $title = Kit::ValidateParam($menuItem['Text'], _STRING);
1544+ $title = __($title);
1545 $img = Kit::ValidateParam($menuItem['Img'], _STRING);
1546
1547-
1548 $href = 'index.php?p=' . $uri . '&' . $args;
1549
1550 $out = <<<END
1551@@ -57,7 +57,7 @@
1552 ?>
1553 <div class="dashicons">
1554 <a id="help_button" target="_blank" alt="The Manual" href="http://wiki.xibo.org.uk/wiki/Manual:TOC">
1555- <img class="dash_button" src="img/dashboard/help.png"/>
1556+ <img class="dash_button" src="img/dashboard/help.png" alt="Manual"/>
1557 <span class="dash_text">Manual</span></a>
1558 </div>
1559 </div>
1560
1561=== modified file 'server/template/pages/login_box.php'
1562--- server/template/pages/login_box.php 2009-06-02 22:23:30 +0000
1563+++ server/template/pages/login_box.php 2009-11-26 18:55:21 +0000
1564@@ -85,7 +85,7 @@
1565 <?php displayMessage(); ?>
1566 <br />
1567 <p><a href="http://www.xibo.org.uk"><img src='img/login/complogo.png'></a></p>
1568- <p><a href="https://code.launchpad.net/xibo/1.0.0">Source</a> | <a class="XiboFormButton" href="index.php?p=index&q=About" title="<?php echo __('About Xibo'); ?>"><?php echo __('About'); ?></a></p>
1569+ <p><a href="https://code.launchpad.net/~xibo-maintainers/xibo/encke">Source</a> | <a class="XiboFormButton" href="index.php?p=index&q=About" title="<?php echo __('About Xibo'); ?>"><?php echo __('About'); ?></a></p>
1570 </div>
1571
1572 <div class="login_foot">

Subscribers

People subscribed via source and target branches