Merge lp:~dangarner/xibo/translate-xibo into lp:~xibo-maintainers/xibo/encke

[Dan Garner]

[Dan Garner (dangarner)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2009-03-07 23:21:15 +0000
+++ .bzrignore	2009-05-14 19:20:44 +0000
@@ -1,3 +1,4 @@
 server/settings.php
 .project
 server/.project
+Thumbs.db

=== modified file 'default.mo'
Binary files default.mo	2009-05-13 18:27:42 +0000 and default.mo	2009-05-17 17:32:16 +0000 differ
=== modified file 'default.pot'
--- default.pot	2009-05-13 18:27:42 +0000
+++ default.pot	2009-05-17 17:32:16 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: Xibo Digital Signage\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-13 19:27-0000\n"
+"POT-Creation-Date: 2009-05-17 18:31-0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Dan Garner <[e-mail]>\n"
 "Language-Team:  <[e-mail]>\n"
@@ -17,314 +17,314 @@
 "X-Poedit-SearchPath-1: server/lib/pages\n"
 "X-Poedit-SearchPath-2: server/lib/app\n"
 
-#: server/install.php:44
+#: server/install.php:45
 msgid "Welcome to the Xibo Installer!"
 msgstr ""
 
-#: server/install.php:45
+#: server/install.php:46
 msgid "The installer will take you through setting up Xibo one step at a time."
 msgstr ""
 
-#: server/install.php:46
+#: server/install.php:47
 #: server/upgrade.php:92
 msgid "Lets get started!"
 msgstr ""
 
-#: server/install.php:49
-#: server/install.php:78
-#: server/install.php:86
-#: server/install.php:318
-#: server/install.php:334
-#: server/install.php:373
-#: server/install.php:402
-#: server/install.php:505
+#: server/install.php:50
+#: server/install.php:79
+#: server/install.php:87
+#: server/install.php:319
+#: server/install.php:335
+#: server/install.php:374
+#: server/install.php:403
+#: server/install.php:506
 #: server/upgrade.php:98
-#: server/upgrade.php:152
-#: server/upgrade.php:159
-#: server/upgrade.php:220
+#: server/upgrade.php:158
+#: server/upgrade.php:168
+#: server/upgrade.php:229
 msgid "Next"
 msgstr ""
 
-#: server/install.php:58
+#: server/install.php:59
 #: server/upgrade.php:131
 msgid "First we need to check if your server meets Xibo's requirements."
 msgstr ""
 
-#: server/install.php:66
-#: server/install.php:74
+#: server/install.php:67
+#: server/install.php:75
 #: server/upgrade.php:141
-#: server/upgrade.php:149
+#: server/upgrade.php:150
 msgid "Retest"
 msgstr ""
 
-#: server/install.php:97
+#: server/install.php:98
 msgid "Xibo needs to setup a new database."
 msgstr ""
 
-#: server/install.php:98
+#: server/install.php:99
 msgid "If you have not yet created an empty database and database user for Xibo to use, and know the username/password of a MySQL administrator, click the \"Create New\" button, otherwise click \"Use Existing\"."
 msgstr ""
 
-#: server/install.php:99
+#: server/install.php:100
 msgid "Note that any existing database must be empty"
 msgstr ""
 
-#: server/install.php:103
+#: server/install.php:104
 msgid "Create New"
 msgstr ""
 
-#: server/install.php:107
+#: server/install.php:108
 msgid "Use Existing"
 msgstr ""
 
-#: server/install.php:115
+#: server/install.php:116
 msgid "Since no empty database has been created for Xibo to use, we need the username and password of a MySQL administrator to create a new database, and database user for Xibo."
 msgstr ""
 
-#: server/install.php:116
+#: server/install.php:117
 msgid "Additionally, please give us a new username and password to create in MySQL for Xibo to use. Xibo will create this automatically for you."
 msgstr ""
 
-#: server/install.php:121
-#: server/install.php:142
+#: server/install.php:122
+#: server/install.php:143
 msgid "Host:"
 msgstr ""
 
-#: server/install.php:122
+#: server/install.php:123
 msgid "Admin Username:"
 msgstr ""
 
-#: server/install.php:123
+#: server/install.php:124
 msgid "Admin Password:"
 msgstr ""
 
-#: server/install.php:124
-#: server/install.php:143
-msgid "Xibo Database Name:"
-msgstr ""
-
 #: server/install.php:125
 #: server/install.php:144
-msgid "Xibo Database Username:"
+msgid "Xibo Database Name:"
 msgstr ""
 
 #: server/install.php:126
 #: server/install.php:145
+msgid "Xibo Database Username:"
+msgstr ""
+
+#: server/install.php:127
+#: server/install.php:146
 msgid "Xibo Database Password:"
 msgstr ""
 
-#: server/install.php:129
-#: server/install.php:148
+#: server/install.php:130
+#: server/install.php:149
 msgid "Create"
 msgstr ""
 
-#: server/install.php:137
+#: server/install.php:138
 msgid "Please enter the details of the database and user you have created for Xibo."
 msgstr ""
 
-#: server/install.php:157
+#: server/install.php:158
 msgid "Something went wrong"
 msgstr ""
 
-#: server/install.php:174
-#: server/install.php:232
+#: server/install.php:175
+#: server/install.php:233
 msgid "A field was blank. Please fill in all fields."
 msgstr ""
 
-#: server/install.php:180
+#: server/install.php:181
 msgid "Could not connect to MySQL with the administrator details. Please check and try again."
 msgstr ""
 
-#: server/install.php:180
-#: server/install.php:220
-#: server/install.php:240
-#: server/install.php:284
-#: server/install.php:354
-#: server/install.php:362
-#: server/install.php:464
-#: server/install.php:472
-#: server/install.php:478
-#: server/install.php:484
-#: server/install.php:490
-#: server/install.php:494
+#: server/install.php:181
+#: server/install.php:221
+#: server/install.php:241
+#: server/install.php:285
+#: server/install.php:355
+#: server/install.php:363
+#: server/install.php:465
+#: server/install.php:473
+#: server/install.php:479
+#: server/install.php:485
+#: server/install.php:491
+#: server/install.php:495
 #: server/upgrade.php:68
 #: server/upgrade.php:69
 #: server/upgrade.php:115
-#: server/upgrade.php:276
+#: server/upgrade.php:287
 msgid "MySQL Error:"
 msgstr ""
 
-#: server/install.php:184
+#: server/install.php:185
 msgid "Creating new database."
 msgstr ""
 
-#: server/install.php:192
+#: server/install.php:193
 msgid "Could not create a new database with the administrator details. Please check and try again."
 msgstr ""
 
-#: server/install.php:202
+#: server/install.php:203
 msgid "Creating new user"
 msgstr ""
 
-#: server/install.php:220
+#: server/install.php:221
 msgid "Could not create a new user with the administrator details. Please check and try again."
 msgstr ""
 
-#: server/install.php:240
+#: server/install.php:241
 msgid "Could not connect to MySQL with the Xibo User account details. Please check and try again."
 msgstr ""
 
-#: server/install.php:284
-#: server/upgrade.php:276
+#: server/install.php:285
+#: server/upgrade.php:287
 msgid "An error occured populating the database."
 msgstr ""
 
-#: server/install.php:295
-#: server/install.php:307
+#: server/install.php:296
+#: server/install.php:308
 msgid "Unable to write to settings.php. We already checked this was possible earlier, so something changed."
 msgstr ""
 
-#: server/install.php:326
+#: server/install.php:327
 msgid "Xibo needs to set the \"xibo_admin\" user password. Please enter a password for this account below."
 msgstr ""
 
-#: server/install.php:331
+#: server/install.php:332
 msgid "Password:"
 msgstr ""
 
-#: server/install.php:332
+#: server/install.php:333
 msgid "Retype Password:"
 msgstr ""
 
-#: server/install.php:344
+#: server/install.php:345
 msgid "Please input a new password. Ensure both password fields are identical."
 msgstr ""
 
-#: server/install.php:354
-#: server/install.php:464
+#: server/install.php:355
+#: server/install.php:465
 msgid "Could not connect to MySQL with the Xibo User account details saved in settings.php. Please check and try again."
 msgstr ""
 
-#: server/install.php:362
+#: server/install.php:363
 msgid "An error occured changing the xibo_admin password."
 msgstr ""
 
-#: server/install.php:369
+#: server/install.php:370
 msgid "Successfully changed the xibo_admin password. We're nearly there now. Just a couple more steps!"
 msgstr ""
 
-#: server/install.php:384
+#: server/install.php:385
 msgid "Library Location"
 msgstr ""
 
-#: server/install.php:385
+#: server/install.php:386
 msgid "Xibo needs somewhere to store the things you upload to be shown. Ideally, this should be somewhere outside the root of your webserver - that is such that is not accessible by a web browser. Please input the full path to this folder. If the folder does not already exist, Xibo will attempt to create it for you."
 msgstr ""
 
-#: server/install.php:388
+#: server/install.php:389
 msgid "Library Location:"
 msgstr ""
 
-#: server/install.php:390
+#: server/install.php:391
 msgid "Server Key"
 msgstr ""
 
-#: server/install.php:391
+#: server/install.php:392
 msgid "Xibo needs you to choose a \"key\". This will be required each time you setup a new client. It should be complicated, and hard to remember. It is visible in the admin interface, so it need not be written down separately."
 msgstr ""
 
-#: server/install.php:393
+#: server/install.php:394
 msgid "Server Key:"
 msgstr ""
 
-#: server/install.php:395
+#: server/install.php:396
 msgid "Statistics"
 msgstr ""
 
-#: server/install.php:396
+#: server/install.php:397
 msgid "We'd love to know you're running Xibo. If you're happy for us to collect anonymous statistics (version number, number of displays) then please leave the box ticked. Please untick the box if your server does not have direct access to the internet."
 msgstr ""
 
-#: server/install.php:398
+#: server/install.php:399
 msgid "Anonymous Statistics:"
 msgstr ""
 
-#: server/install.php:417
+#: server/install.php:418
 msgid "A field was blank. Please make sure you complete all fields"
 msgstr ""
 
-#: server/install.php:430
+#: server/install.php:431
 msgid "A file exists with the name you gave for the Library Location. Please choose another location"
 msgstr ""
 
-#: server/install.php:437
+#: server/install.php:438
 msgid "Could not create the Library Location directory for you. Please ensure the webserver has permission to create a folder in this location, or create the folder manually and grant permission for the webserver to write to the folder."
 msgstr ""
 
-#: server/install.php:445
+#: server/install.php:446
 msgid "The Library Location you gave is not writable by the webserver. Please fix the permissions and try again."
 msgstr ""
 
-#: server/install.php:450
+#: server/install.php:451
 msgid "The Library Location you gave is not empty. Please give the location of an empty folder"
 msgstr ""
 
-#: server/install.php:472
+#: server/install.php:473
 msgid "An error occured changing the library location."
 msgstr ""
 
-#: server/install.php:478
+#: server/install.php:479
 msgid "An error occured changing the server key."
 msgstr ""
 
-#: server/install.php:484
+#: server/install.php:485
 msgid "An error occured setting the default timezone."
 msgstr ""
 
-#: server/install.php:490
-#: server/install.php:494
+#: server/install.php:491
+#: server/install.php:495
 msgid "An error occured setting anonymous statistics."
 msgstr ""
 
-#: server/install.php:501
+#: server/install.php:502
 msgid "Successfully set library location and server key."
 msgstr ""
 
-#: server/install.php:513
+#: server/install.php:514
 msgid "Unable to delete install.php. Please ensure the webserver has permission to unlink this file and retry"
 msgstr ""
 
-#: server/install.php:513
-#: server/install.php:516
+#: server/install.php:514
+#: server/install.php:517
 msgid "Retry"
 msgstr ""
 
-#: server/install.php:516
+#: server/install.php:517
 msgid "Unable to delete upgrade.php. Please ensure the webserver has permission to unlink this file and retry"
 msgstr ""
 
-#: server/install.php:520
+#: server/install.php:521
 msgid "Xibo was successfully installed."
 msgstr ""
 
-#: server/install.php:521
+#: server/install.php:522
 msgid "Please click"
 msgstr ""
 
-#: server/install.php:521
+#: server/install.php:522
 msgid "here"
 msgstr ""
 
-#: server/install.php:521
+#: server/install.php:522
 msgid "to logon to Xibo as \"xibo_admin\" with the password you chose earlier."
 msgstr ""
 
-#: server/install.php:526
-#: server/upgrade.php:312
+#: server/install.php:527
+#: server/upgrade.php:323
 msgid "A required parameter was missing. Please go through the installer sequentially!"
 msgstr ""
 
-#: server/install.php:526
+#: server/install.php:527
 msgid "Start Again"
 msgstr ""
 
@@ -356,131 +356,131 @@
 msgid "Password incorrect. Please try again."
 msgstr ""
 
-#: server/upgrade.php:190
+#: server/upgrade.php:199
 msgid "Unable to calculate the upgradeTo value. Check for non-numeric SQL and PHP files in the 'install/database' directory."
 msgstr ""
 
-#: server/upgrade.php:213
+#: server/upgrade.php:222
 msgid "Warning: We included "
 msgstr ""
 
-#: server/upgrade.php:213
+#: server/upgrade.php:222
 msgid "but it did not include a class of appropriate name."
 msgstr ""
 
-#: server/upgrade.php:252
+#: server/upgrade.php:261
 msgid "FAIL:"
 msgstr ""
 
-#: server/upgrade.php:257
+#: server/upgrade.php:267
 msgid "Backing up your database"
 msgstr ""
 
-#: server/upgrade.php:282
+#: server/upgrade.php:293
 msgid "Step"
 msgstr ""
 
-#: server/upgrade.php:294
+#: server/upgrade.php:305
 msgid "Unable to delete install.php. Please remove this file manually."
 msgstr ""
 
-#: server/upgrade.php:297
+#: server/upgrade.php:308
 msgid "Unable to delete upgrade.php. Please remove this file manually."
 msgstr ""
 
-#: server/upgrade.php:300
+#: server/upgrade.php:311
 msgid "Upgrade is complete!"
 msgstr ""
 
-#: server/upgrade.php:302
+#: server/upgrade.php:313
 msgid "Login"
 msgstr ""
 
-#: server/upgrade.php:306
+#: server/upgrade.php:317
 msgid "There was an error during the upgrade. Please take a screenshot of this page and seek help!"
 msgstr ""
 
-#: server/upgrade.php:365
+#: server/upgrade.php:370
 msgid "You must authenticate to run the upgrade."
 msgstr ""
 
 #: server/config/config.class.php:128
-msgid "PHP Version 5.0.2 or later"
-msgstr ""
-
-#: server/config/config.class.php:139
-msgid "Xibo requires PHP version 5.0.2 or later."
-msgstr ""
-
-#: server/config/config.class.php:143
+msgid "PHP Version 5.2.4 or later"
+msgstr ""
+
+#: server/config/config.class.php:149
+msgid "Xibo requires PHP version 5.2.4 or later."
+msgstr ""
+
+#: server/config/config.class.php:153
 msgid "Filesystem Permissions"
 msgstr ""
 
-#: server/config/config.class.php:154
+#: server/config/config.class.php:164
 msgid "Xibo needs to be able to write to the following:"
 msgstr ""
 
-#: server/config/config.class.php:162
+#: server/config/config.class.php:172
 msgid "Please fix this, and retest."
 msgstr ""
 
-#: server/config/config.class.php:166
+#: server/config/config.class.php:176
 msgid "MySQL Extension"
 msgstr ""
 
-#: server/config/config.class.php:177
+#: server/config/config.class.php:187
 msgid "Xibo requires a MySQL database. Ensure PHP MySQL client extension is installed"
 msgstr ""
 
-#: server/config/config.class.php:181
+#: server/config/config.class.php:191
 msgid "JSON Extension"
 msgstr ""
 
-#: server/config/config.class.php:192
+#: server/config/config.class.php:202
 msgid "Xibo needs the PHP JSON extension to function."
 msgstr ""
 
-#: server/config/config.class.php:196
+#: server/config/config.class.php:206
 msgid "GD Extension"
 msgstr ""
 
-#: server/config/config.class.php:207
+#: server/config/config.class.php:217
 msgid "Xibo needs the PHP GD extension to function."
 msgstr ""
 
-#: server/config/config.class.php:212
+#: server/config/config.class.php:222
 msgid "Calendar Extension"
 msgstr ""
 
-#: server/config/config.class.php:223
+#: server/config/config.class.php:233
 msgid "Xibo needs the PHP Calendar extension to function."
 msgstr ""
 
-#: server/config/config.class.php:227
+#: server/config/config.class.php:237
 msgid "DOM Extension"
 msgstr ""
 
-#: server/config/config.class.php:238
+#: server/config/config.class.php:248
 msgid "Xibo needs the PHP DOM core functionality enabled."
 msgstr ""
 
-#: server/config/config.class.php:242
+#: server/config/config.class.php:252
 msgid "DOM XML Extension"
 msgstr ""
 
-#: server/config/config.class.php:253
+#: server/config/config.class.php:263
 msgid "Xibo needs the PHP DOM XML extension to function."
 msgstr ""
 
-#: server/config/config.class.php:257
+#: server/config/config.class.php:267
 msgid "Allow PHP to open external URLs"
 msgstr ""
 
-#: server/config/config.class.php:268
+#: server/config/config.class.php:278
 msgid "You must have allow_url_fopen = On in your PHP.ini file for anonymous statistics gathering to function."
 msgstr ""
 
-#: server/config/config.class.php:269
+#: server/config/config.class.php:279
 msgid "If you do not intend to enable anonymous statistics gathering you need not worry about this problem."
 msgstr ""
 
@@ -492,6 +492,10 @@
 msgid "No selections available"
 msgstr ""
 
+#: server/lib/app/helpmanager.class.php:54
+msgid "Help"
+msgstr ""
+
 #: server/lib/app/menumanager.class.php:49
 msgid "No menu provided"
 msgstr ""
@@ -508,65 +512,65 @@
 msgid "Update of settings failed"
 msgstr ""
 
-#: server/lib/modules/module.class.php:96
+#: server/lib/modules/module.class.php:98
 msgid "Unable to create Module [No type given] - please refer to the Module Documentation."
 msgstr ""
 
-#: server/lib/modules/module.class.php:104
+#: server/lib/modules/module.class.php:106
 msgid "Unable to create Module [Cannot find type in the database] - please refer to the Module Documentation."
 msgstr ""
 
-#: server/lib/modules/module.class.php:110
+#: server/lib/modules/module.class.php:112
 msgid "Unable to create Module [No registered modules of this type] - please refer to the Module Documentation."
 msgstr ""
 
-#: server/lib/modules/module.class.php:161
+#: server/lib/modules/module.class.php:163
 msgid "Cannot find this media item. Please refresh the region options."
 msgstr ""
 
-#: server/lib/modules/module.class.php:381
+#: server/lib/modules/module.class.php:384
 msgid "Unable to Remove this media from the Layout"
 msgstr ""
 
-#: server/lib/modules/module.class.php:392
+#: server/lib/modules/module.class.php:395
 msgid "Unable to assign to the Region"
 msgstr ""
 
-#: server/lib/modules/module.class.php:401
+#: server/lib/modules/module.class.php:404
 msgid "Error adding this media to the library"
 msgstr ""
 
-#: server/lib/modules/module.class.php:424
+#: server/lib/modules/module.class.php:427
 msgid "Return to the Region Options"
 msgstr ""
 
-#: server/lib/modules/module.class.php:425
+#: server/lib/modules/module.class.php:428
 msgid "Are you sure you want to remove this item from Xibo?"
 msgstr ""
 
-#: server/lib/modules/module.class.php:426
+#: server/lib/modules/module.class.php:429
 msgid "It will be lost"
 msgstr ""
 
-#: server/lib/modules/module.class.php:441
+#: server/lib/modules/module.class.php:444
 msgid "Delete Item"
 msgstr ""
 
-#: server/lib/modules/module.class.php:478
-#: server/lib/modules/module.class.php:496
+#: server/lib/modules/module.class.php:481
+#: server/lib/modules/module.class.php:499
 msgid "Not yet implemented by this module."
 msgstr ""
 
-#: server/lib/modules/module.class.php:482
-#: server/lib/modules/module.class.php:499
+#: server/lib/modules/module.class.php:485
+#: server/lib/modules/module.class.php:502
 msgid "Add Item"
 msgstr ""
 
-#: server/lib/modules/module.class.php:514
+#: server/lib/modules/module.class.php:517
 msgid "Add Media has not been implemented for this module."
 msgstr ""
 
-#: server/lib/modules/module.class.php:526
+#: server/lib/modules/module.class.php:529
 msgid "Edit Media has not been implemented for this module."
 msgstr ""
 
@@ -585,6 +589,7 @@
 msgstr ""
 
 #: server/lib/pages/admin.class.php:112
+#: server/lib/pages/content.class.php:638
 msgid "The Library Location you have picked is not writable to the Xibo Server."
 msgstr ""
 
@@ -601,6 +606,10 @@
 msgstr ""
 
 #: server/lib/pages/admin.class.php:172
+#: server/lib/pages/display.class.php:262
+#: server/lib/pages/display.class.php:365
+#: server/lib/pages/layout.class.php:771
+#: server/lib/pages/layout.class.php:887
 msgid "Save"
 msgstr ""
 
@@ -615,8 +624,32 @@
 msgid "Test Email"
 msgstr ""
 
+#: server/lib/pages/clock.class.php:60
+msgid "System Information"
+msgstr ""
+
+#: server/lib/pages/clock.class.php:62
+msgid "Local Time"
+msgstr ""
+
+#: server/lib/pages/clock.class.php:63
+msgid "System Time"
+msgstr ""
+
+#: server/lib/pages/clock.class.php:64
+msgid "Local Date"
+msgstr ""
+
+#: server/lib/pages/clock.class.php:65
+msgid "System Date"
+msgstr ""
+
+#: server/lib/pages/clock.class.php:68
+msgid "Date / Time Information"
+msgstr ""
+
 #: server/lib/pages/content.class.php:68
-#: server/lib/pages/layout.class.php:1500
+#: server/lib/pages/layout.class.php:1511
 msgid "Library"
 msgstr ""
 
@@ -630,7 +663,7 @@
 #: server/lib/pages/group.class.php:314
 #: server/lib/pages/layout.class.php:161
 #: server/lib/pages/layout.class.php:762
-#: server/lib/pages/layout.class.php:1429
+#: server/lib/pages/layout.class.php:1435
 msgid "Name"
 msgstr ""
 
@@ -638,8 +671,8 @@
 #: server/lib/pages/content.class.php:237
 #: server/lib/pages/content.class.php:440
 #: server/lib/pages/content.class.php:532
-#: server/lib/pages/layout.class.php:1428
-#: server/lib/pages/layout.class.php:1689
+#: server/lib/pages/layout.class.php:1434
+#: server/lib/pages/layout.class.php:1700
 #: server/lib/pages/report.class.php:88
 msgid "Type"
 msgstr ""
@@ -691,7 +724,7 @@
 #: server/lib/pages/display.class.php:371
 #: server/lib/pages/group.class.php:171
 #: server/lib/pages/layout.class.php:1246
-#: server/lib/pages/layout.class.php:1427
+#: server/lib/pages/layout.class.php:1433
 msgid "Delete"
 msgstr ""
 
@@ -718,8 +751,8 @@
 msgstr ""
 
 #: server/lib/pages/content.class.php:533
-#: server/lib/pages/layout.class.php:1430
-#: server/lib/pages/layout.class.php:1690
+#: server/lib/pages/layout.class.php:1436
+#: server/lib/pages/layout.class.php:1701
 msgid "Duration"
 msgstr ""
 
@@ -919,83 +952,91 @@
 msgid "Report a Fault"
 msgstr ""
 
-#: server/lib/pages/fault.class.php:63
+#: server/lib/pages/fault.class.php:61
+msgid "Report a fault with Xibo"
+msgstr ""
+
+#: server/lib/pages/fault.class.php:62
+msgid "Before reporting a fault it would be appreciated if you follow the below steps."
+msgstr ""
+
+#: server/lib/pages/fault.class.php:66
 msgid "Check that the Environment passes all the Xibo Environment checks."
 msgstr ""
 
-#: server/lib/pages/fault.class.php:67
+#: server/lib/pages/fault.class.php:70
 msgid "Turn ON full auditing and debugging."
 msgstr ""
 
-#: server/lib/pages/fault.class.php:70
+#: server/lib/pages/fault.class.php:73
 msgid "Turn ON Debugging"
 msgstr ""
 
-#: server/lib/pages/fault.class.php:74
+#: server/lib/pages/fault.class.php:77
 msgid "Recreate the Problem in a new window."
 msgstr ""
 
-#: server/lib/pages/fault.class.php:77
+#: server/lib/pages/fault.class.php:80
 msgid "Automatically collect and export relevant information into a text file."
 msgstr ""
 
-#: server/lib/pages/fault.class.php:77
+#: server/lib/pages/fault.class.php:80
 msgid "Please save this file to your PC."
 msgstr ""
 
-#: server/lib/pages/fault.class.php:78
+#: server/lib/pages/fault.class.php:81
 msgid "Collect and Save Data"
 msgstr ""
 
-#: server/lib/pages/fault.class.php:81
+#: server/lib/pages/fault.class.php:84
 msgid "Turn full auditing and debugging OFF."
 msgstr ""
 
-#: server/lib/pages/fault.class.php:84
+#: server/lib/pages/fault.class.php:87
 msgid "Turn OFF Debugging"
 msgstr ""
 
-#: server/lib/pages/fault.class.php:88
+#: server/lib/pages/fault.class.php:91
 msgid "Click on the below link to open the bug report page for this Xibo release."
 msgstr ""
 
-#: server/lib/pages/fault.class.php:88
+#: server/lib/pages/fault.class.php:91
 msgid "Describe the problem and upload the file you obtained earlier."
 msgstr ""
 
-#: server/lib/pages/fault.class.php:89
+#: server/lib/pages/fault.class.php:92
 msgid "File a bug report in Launchpad"
 msgstr ""
 
-#: server/lib/pages/fault.class.php:97
+#: server/lib/pages/fault.class.php:100
 msgid "We will do our best to use the information collected above to solve your issue."
 msgstr ""
 
-#: server/lib/pages/fault.class.php:98
+#: server/lib/pages/fault.class.php:101
 msgid "However sometimes this will not be enough and you will be asked to put your Xibo installation into \"Test\" mode."
 msgstr ""
 
-#: server/lib/pages/fault.class.php:102
+#: server/lib/pages/fault.class.php:105
 msgid "Switch to Test Mode."
 msgstr ""
 
-#: server/lib/pages/fault.class.php:105
+#: server/lib/pages/fault.class.php:108
 msgid "Switch to Test Mode"
 msgstr ""
 
-#: server/lib/pages/fault.class.php:109
+#: server/lib/pages/fault.class.php:112
 msgid "Recreate the Problem in a new window and Capture a screenshot."
 msgstr ""
 
-#: server/lib/pages/fault.class.php:109
+#: server/lib/pages/fault.class.php:112
 msgid "You should send your screenshot to [e-mail] with a reference to the Launchpad Question/Bug you have created previously."
 msgstr ""
 
-#: server/lib/pages/fault.class.php:112
+#: server/lib/pages/fault.class.php:115
 msgid "Switch to Production Mode."
 msgstr ""
 
-#: server/lib/pages/fault.class.php:115
+#: server/lib/pages/fault.class.php:118
 msgid "Switch to Production Mode"
 msgstr ""
 
@@ -1129,6 +1170,18 @@
 msgid "Edited the MenuItem Group Security"
 msgstr ""
 
+#: server/lib/pages/help.class.php:50
+msgid "Error getting Help Link"
+msgstr ""
+
+#: server/lib/pages/help.class.php:63
+msgid "No such help file found"
+msgstr ""
+
+#: server/lib/pages/help.class.php:68
+msgid "You must specify a help page."
+msgstr ""
+
 #: server/lib/pages/index.class.php:80
 msgid "Incorrect Login Information."
 msgstr ""
@@ -1398,23 +1451,23 @@
 msgid "Save Template"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:1390
+#: server/lib/pages/layout.class.php:1396
 msgid "Media Controlled"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:1525
+#: server/lib/pages/layout.class.php:1536
 msgid "Region Options"
 msgstr ""
 
-#: server/lib/pages/layout.class.php:1576
+#: server/lib/pages/layout.class.php:1587
 msgid "Error getting type from a media item."
 msgstr ""
 
-#: server/lib/pages/layout.class.php:1595
+#: server/lib/pages/layout.class.php:1606
 msgid "Cannot set region information."
 msgstr ""
 
-#: server/lib/pages/layout.class.php:1674
+#: server/lib/pages/layout.class.php:1685
 msgid "Empty Region"
 msgstr ""
 
@@ -1518,3 +1571,39 @@
 msgid "Message"
 msgstr ""
 
+#: server/template/header.php:99
+msgid "Click to show more time information"
+msgstr ""
+
+#: server/template/pages/content_view.php:23
+msgid "Add Media"
+msgstr ""
+
+#: server/template/pages/content_view.php:24
+msgid "Add media to the Library"
+msgstr ""
+
+#: server/template/pages/content_view.php:25
+msgid "Filter"
+msgstr ""
+
+#: server/template/pages/content_view.php:26
+msgid "Show Filter"
+msgstr ""
+
+#: server/template/pages/group_view.php:23
+msgid "Add Group"
+msgstr ""
+
+#: server/template/pages/layout_view.php:23
+msgid "Add Layout"
+msgstr ""
+
+#: server/template/pages/log_view.php:23
+msgid "Refresh"
+msgstr ""
+
+#: server/template/pages/user_view.php:23
+msgid "Add User"
+msgstr ""
+

=== modified file 'server/img/Thumbs.db'
Binary files server/img/Thumbs.db	2008-12-14 14:42:52 +0000 and server/img/Thumbs.db	2009-05-14 19:20:44 +0000 differ
=== modified file 'server/img/bodys/Thumbs.db'
Binary files server/img/bodys/Thumbs.db	2008-12-10 23:48:58 +0000 and server/img/bodys/Thumbs.db	2009-05-14 19:20:44 +0000 differ
=== modified file 'server/img/dashboard/Thumbs.db'
Binary files server/img/dashboard/Thumbs.db	2008-12-10 23:48:58 +0000 and server/img/dashboard/Thumbs.db	2009-05-14 19:20:44 +0000 differ
=== modified file 'server/img/dialogs/Thumbs.db'
Binary files server/img/dialogs/Thumbs.db	2008-12-10 23:48:58 +0000 and server/img/dialogs/Thumbs.db	2009-05-14 19:20:44 +0000 differ
=== modified file 'server/img/fades/Thumbs.db'
Binary files server/img/fades/Thumbs.db	2008-12-10 23:48:58 +0000 and server/img/fades/Thumbs.db	2009-05-14 19:20:44 +0000 differ
=== modified file 'server/img/filterform/Thumbs.db'
Binary files server/img/filterform/Thumbs.db	2008-12-14 14:42:52 +0000 and server/img/filterform/Thumbs.db	2009-05-14 19:20:44 +0000 differ
=== modified file 'server/img/forms/Thumbs.db'
Binary files server/img/forms/Thumbs.db	2008-12-10 23:48:58 +0000 and server/img/forms/Thumbs.db	2009-05-14 19:20:44 +0000 differ
=== added file 'server/img/help.png'
Binary files server/img/help.png	1970-01-01 00:00:00 +0000 and server/img/help.png	2009-05-14 19:20:44 +0000 differ
=== modified file 'server/img/login/Thumbs.db'
Binary files server/img/login/Thumbs.db	2008-12-10 23:48:58 +0000 and server/img/login/Thumbs.db	2009-05-14 19:20:44 +0000 differ
=== modified file 'server/img/logos/Thumbs.db'
Binary files server/img/logos/Thumbs.db	2008-12-10 23:48:58 +0000 and server/img/logos/Thumbs.db	2009-05-14 19:20:44 +0000 differ
=== added file 'server/img/logout.gif'
Binary files server/img/logout.gif	1970-01-01 00:00:00 +0000 and server/img/logout.gif	2009-05-14 19:20:44 +0000 differ
=== modified file 'server/img/tables/Thumbs.db'
Binary files server/img/tables/Thumbs.db	2008-12-10 23:48:58 +0000 and server/img/tables/Thumbs.db	2009-05-14 19:20:44 +0000 differ
=== modified file 'server/img/tabs/Thumbs.db'
Binary files server/img/tabs/Thumbs.db	2008-12-10 23:48:58 +0000 and server/img/tabs/Thumbs.db	2009-05-14 19:20:44 +0000 differ
=== modified file 'server/img/titles/Thumbs.db'
Binary files server/img/titles/Thumbs.db	2008-12-10 23:48:58 +0000 and server/img/titles/Thumbs.db	2009-05-14 19:20:44 +0000 differ
=== modified file 'server/img/weather_rss/Thumbs.db'
Binary files server/img/weather_rss/Thumbs.db	2008-12-10 23:48:58 +0000 and server/img/weather_rss/Thumbs.db	2009-05-14 19:20:44 +0000 differ
=== modified file 'server/install.php'
--- server/install.php	2009-05-13 18:57:27 +0000
+++ server/install.php	2009-05-18 21:29:47 +0000
@@ -29,10 +29,30 @@
 include('install/header.inc');
 include('config/config.class.php');
 include('config/db_config.php');
-
-// Setup the translations for gettext
-require_once("lib/app/translationengine.class.php");
-TranslationEngine::InitLocale($db);
+
+// Setup for the Translations using Gettext.
+// There is normally a class that will do this for us - but it requires a DB object (which we do not have at install time)
+// Would be nice to include a method on the TranslationEngine that did this for us - but without the debugging
+// The actual translation function __() is included later in this file.
+$langs 		= Kit::GetParam('HTTP_ACCEPT_LANGUAGE', $_SERVER, _STRING);
+$lang		= 'en-gb'; 		// Default language
+$encoding 	= '';			// We do not seem to need an encoding, but I read somewhere that we might - left as a reminder of this.
+
+if ($langs != '') 
+{
+	$langs 	= explode(',', $langs);
+	$lang 	= $langs[0];
+}
+
+// For windows
+putenv('LANG='.$lang.'.'.$encoding);
+putenv('LANGUAGE='.$lang.'.'.$encoding); 
+putenv('LC_ALL='.$lang.'.'.$encoding); 
+
+// Set local
+setlocale(LC_ALL, $lang.'.'.$encoding);
+
+// Translations have been setup.
 
 $fault = false;
 
@@ -535,11 +555,6 @@
   return ((is_writable("install.php") && (is_writable("settings.php")) && (is_writable("upgrade.php")) || is_writable(".")));
 }
 
-function checkPHP() {
-  # Check PHP version > 5
-  return (version_compare("5",phpversion(), "<="));
-}
-
 function checkMySQL() {
   # Check PHP has MySQL module installed
   return extension_loaded("mysql");
@@ -686,6 +701,29 @@
   return $key;
 }
 
+function checkPHP() 
+{
+	return (version_compare("5.2.4",phpversion(), "<="));
+}
+
+function CheckGettext() 
+{
+	return extension_loaded("gettext");
+}
+
+// Setup the translations for gettext
+function __($string)
+{
+	if (CheckGettext())
+	{
+		return _($string);
+	}
+	else
+	{
+		return $string;
+	}
+}
+
 function settings_strings() {
 global $settings_header;
 global $settings_footer;
@@ -717,8 +755,4 @@
 
   return;
 }
-
-function checkPHP() {
-  return (version_compare("5.2.4",phpversion(), "<="));
-}
-?>
+?>
\ No newline at end of file

=== added file 'server/install/database/100.sql'
--- server/install/database/100.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/100.sql	2009-05-14 19:20:44 +0000
@@ -0,0 +1,15 @@
+INSERT INTO `pages` (
+`pageID` ,
+`name` ,
+`pagegroupID`
+)
+VALUES (
+NULL , 'help', '2'
+);
+
+CREATE TABLE `help` (
+`HelpID` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`Topic` VARCHAR( 254 ) NOT NULL ,
+`Category` VARCHAR( 254 ) NOT NULL DEFAULT 'General',
+`Link` VARCHAR( 254 ) NOT NULL
+) ENGINE = InnoDB CHARACTER SET utf8 COLLATE utf8_general_ci 
\ No newline at end of file

=== modified file 'server/lib/app/app_functions.php'
--- server/lib/app/app_functions.php	2009-02-21 17:52:52 +0000
+++ server/lib/app/app_functions.php	2009-05-17 17:05:42 +0000
@@ -37,7 +37,7 @@
  */
 function setMessage($message) {
 	if (!isset($_SESSION['message'])) $_SESSION['message'] = "";
-	$_SESSION['message'] .= "$message<br />";
+	$_SESSION['message'] .= $message . ' | ';
 }
 
 function displayMessage($mode = MSG_MODE_AUTO, $msg="", $show_back = true, $template = "template/pages/message_page.php") 
@@ -48,7 +48,7 @@
 		case MSG_MODE_AUTO:
 			if (isset($_SESSION['message'])) 
 			{
-				echo "<div class=\"highlight\">" . $_SESSION['message'] . "</div>";
+				echo $_SESSION['message'];
 				unset($_SESSION['message']);
 			}
 		break;
@@ -259,39 +259,6 @@
 	return true;
 }
 
-/**
- * Depricate
- * @return 
- * @param $var Object
- * @param $purpose Object
- * @param $db Object[optional]
- */
-function clean_input($var, $purpose, $db = false) 
-{
-	/*Cleans the $var depending on the $purpose*/
-	
-	switch ($purpose) 
-	{
-	
-	case VAR_FOR_SQL:
-		if (!$db) 
-		{
-			trigger_error("Trying to clean a var for SQL, but no DB passed", E_USER_ERROR);
-		}
-		
-		if (!get_magic_quotes_gpc())
-		{
-			$var = $db->escape_string($var);	
-		}
-		
-		break;
-	
-	}
-	
-	return $var;
-}
-
-
 function sec2hms($sec, $padHours = false) 
 {
 	// holds formatted string
@@ -606,66 +573,6 @@
 }
 
 /**
- * Cleans a file name
- * @return 
- * @param $filename String
- */
-function cleanFilename($name)
-{
-	$name = strtolower($name); 
-	$code_entities_match = array( '&quot;' ,'!' ,'@' ,'#' ,'$' ,'%' ,'^' ,'&' ,'*' ,'(' ,')' ,'+' ,'{' ,'}' ,'|' ,':' ,'"' ,'<' ,'>' ,'?' ,'[' ,']' ,'' ,';' ,"'" ,',' ,'_' ,'/' ,'*' ,'+' ,'~' ,'`' ,'=' ,' ' ,'---' ,'--','--'); 
-	$code_entities_replace = array('' ,'-' ,'-' ,'' ,'' ,'' ,'-' ,'-' ,'' ,'' ,'' ,'' ,'' ,'' ,'' ,'-' ,'' ,'' ,'' ,'' ,'' ,'' ,'' ,'' ,'' ,'-' ,'-' ,'-' ,'' ,'' ,'' ,'' ,'' ,'-' ,'-' ,'-','-'); 
-	
-	$name = str_replace($code_entities_match, $code_entities_replace, $name); 
-	return $name;
-}
-
-/**
- * Depricate
- * @return 
- * @param $number Object
- */
-function CleanNumber($number)
-{
-	if (!is_numeric($number))
-	{
-		header("HTTP/1.1 404 Not Found");
-		// How do I send the default apache 404 message
-		// instead of the message below?
-		print("<html><body>HTTP 404 - Possible Hack.</body></html>");
-		exit;
-	}
-	return $number;
-}
-
-/**
- * Depricate
- * @return 
- * @param $var Object
- */
-function validate($var)
-{
-	$valid = true;
-	
-	// Validate against XSS
-	if (strstr($var, "http")) $valid = false;
-	if (strstr($var, "www")) $valid = false;
-	
-	if (eregi('[^A-Za-z0-9_]', $var)) $valid = false;
-	
-	if (!$valid) 
-	{
-		header("HTTP/1.1 404 Not Found");
-		// How do I send the default apache 404 message
-		// instead of the message below?
-		print("<html><body>HTTP 404 - Possible Hack.</body></html>");
-		exit;
-	}
-	
-	return $var;
-}
-
-/**
 * Creates a form token
 * @return 
 */

=== added file 'server/lib/app/datemanager.class.php'
--- server/lib/app/datemanager.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/app/datemanager.class.php	2009-05-16 18:40:19 +0000
@@ -0,0 +1,70 @@
+<?php
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+
+class DateManager
+{
+	private $db;
+	
+	public function __construct(database $db)
+	{
+		$this->db 	=& $db;
+	}
+	
+	public function GetClock()
+	{
+		return date("H:i T");
+	}
+	
+	public function GetSystemClock()
+	{
+		return gmdate("H:i T");
+	}
+	
+	public function GetLocalDate($format = 'Y-m-d H:i:s', $timestamp = '')
+	{
+		$db	=& $this->db;
+		
+		if ($timestamp == '')
+		{
+			$timestamp = time();
+		}
+		
+		Debug::LogEntry($db, 'audit', 'Converting ' . $timestamp . ' to a Local Date');
+		
+		return date($format, $timestamp);
+	}
+	
+	public function GetSystemDate($format = 'Y-m-d H:i:s', $timestamp = '')
+	{
+		$db	=& $this->db;
+				
+		if ($timestamp == '')
+		{
+			$timestamp = time();
+		}
+		
+		Debug::LogEntry($db, 'audit', 'Converting ' . $timestamp . ' to a System Date');
+		
+		return gmdate($format, $timestamp);
+	}
+} 
+?>
\ No newline at end of file

=== modified file 'server/lib/app/debug.class.php'
--- server/lib/app/debug.class.php	2009-02-21 17:52:52 +0000
+++ server/lib/app/debug.class.php	2009-05-18 21:37:32 +0000
@@ -22,7 +22,6 @@
 
 class Debug
 {
-
 	public function __construct()
 	{
 		global $db;

=== modified file 'server/lib/app/helpmanager.class.php'
--- server/lib/app/helpmanager.class.php	2009-03-07 23:21:15 +0000
+++ server/lib/app/helpmanager.class.php	2009-05-14 19:43:42 +0000
@@ -45,15 +45,15 @@
 	 */
 	public function HelpButton($location, $return = false) 
 	{
-		$db 	=& $this->db;
-		
-		$helpBase = Config::GetSetting($db, 'HELP_BASE');
-		
-		$link = $helpBase . "?p=$location";
-		
-		$button = <<<END
-		<input type="button" onclick="window.open('$link')" value="Help" />
-END;
+		$db 		=& $this->db;
+		
+		$location	= split('/', $location);
+		$topic		= ucfirst($location[0]);
+		$category	= ucfirst($location[1]);
+		
+		$msgHelp	= __('Help');
+		
+		$button = '<input type="button" class="XiboHelpButton" href="' . 'index.php?p=help&q=Display&Topic=' . $topic . '&Category=' . $category . '" value="'. $msgHelp .'" />';
 	
 		if ($return)
 		{
@@ -90,5 +90,25 @@
 			return true;
 		}
 	}
+	
+	/**
+	 * Outputs a help link
+	 * @return 
+	 * @param $topic Object[optional]
+	 * @param $category Object[optional]
+	 */
+	public function Link($topic = "", $category = "General")
+	{
+		$db 		=& $this->db;		
+		$user 		=& $this->user;		
+		
+		// if topic is empty use the page name
+		$topic	= Kit::GetParam('p', _REQUEST, _WORD, $topic);
+		$topic	= ucfirst($topic);
+		
+		$link	= 'index.php?p=help&q=Display&Topic=' . $topic . '&Category=' . $category . '';
+		
+		return $link;		
+	}
 }
 ?>

=== modified file 'server/lib/app/translationengine.class.php'
--- server/lib/app/translationengine.class.php	2009-04-25 12:05:59 +0000
+++ server/lib/app/translationengine.class.php	2009-05-18 21:29:47 +0000
@@ -29,7 +29,7 @@
 	public static function InitLocale(database $db)
 	{
 		$domain		= 'default';
-		$encoding	= 'UTF8';
+		$encoding	= ''; // We dont seem to need an encoding
 		$config 	= new Config($db);
 		
 		Debug::LogEntry($db, 'audit', 'IN', 'TranslationEngine', 'InitLocal');
@@ -69,8 +69,6 @@
 				}
 			}
 			
-			//$lang = 'fr';
-			
 			// For windows
 			putenv('LANG='.$lang.'.'.$encoding);
 			putenv('LANGUAGE='.$lang.'.'.$encoding); 

=== modified file 'server/lib/include.php'
--- server/lib/include.php	2009-04-05 13:22:21 +0000
+++ server/lib/include.php	2009-05-16 18:40:19 +0000
@@ -35,6 +35,7 @@
 require_once("lib/app/formmanager.class.php");
 require_once("lib/app/helpmanager.class.php");
 require_once("lib/app/responsemanager.class.php");
+require_once("lib/app/datemanager.class.php");
 require_once("lib/app/app_functions.php");
 require_once("lib/modules/module.interface.php");
 require_once("lib/modules/module.class.php");

=== modified file 'server/lib/js/core.js'
--- server/lib/js/core.js	2009-02-23 19:48:15 +0000
+++ server/lib/js/core.js	2009-05-14 19:43:42 +0000
@@ -30,6 +30,17 @@
         bgiframe: true,
 		autoOpen: false
     }).parent().parent().css("z-index", "300");
+	
+	// Setup the dialogs
+    $('#help_dialog').dialog({
+        title: "Xibo Help",
+        width: "500px",
+        height: "240px",
+        draggable: true,
+        resizable: false,
+        bgiframe: true,
+		autoOpen: false
+    }).parent().parent().css("z-index", "300");
 	
     $('#system_message').dialog({
         title: "Application Message",
@@ -117,6 +128,16 @@
         
         return false;
     });
+	
+	// Search for any help enabled elements
+	$(scope + " .XiboHelpButton").click(function(){
+		
+		var formUrl = $(this).attr("href");
+		
+		XiboHelpRender(formUrl);
+		
+		return false;
+	});
 }
 
 /**
@@ -343,6 +364,80 @@
 }
 
 /**
+ * Renders the formid provided
+ * @param {String} formId
+ */
+function XiboHelpRender(formUrl) {
+	
+	// Prepare the Dialog
+	$('#help_dialog').dialog("close");
+	$('#help_dialog').html("");
+	
+	// Call with AJAX
+    $.ajax({
+        type: "get",
+        url: formUrl + "&ajax=true",
+        cache: false,
+        dataType: "json",
+        success: function(response){
+        
+			// Was the Call successful
+            if (response.success) {
+				// Set the dialog HTML to be the response HTML
+                $('#help_dialog').html(response.html);
+				
+				// Is there a title for the dialog?
+				if (response.dialogTitle != undefined && response.dialogTitle != "") {
+					// Set the dialog title
+					$('#help_dialog').parent().children().each(function(){
+						$(".ui-dialog-title", this).html(response.dialogTitle);
+					});
+				}
+				
+				// Do we need to alter the dialog size?
+				if (response.dialogSize) {
+					$('#help_dialog').parent().parent().width(response.dialogWidth).height(response.dialogHeight);
+				}
+				
+                // Do we have to call any functions due to this success?
+                if (response.callBack != "" && response.callBack != undefined) {
+                    eval(response.callBack)(name);
+                }
+
+				$('#help_dialog').dialog("open");
+                             
+                // Focus in the first form element
+                $('input[@type=text]', '#help_dialog').eq(0).focus();
+				
+				// Call Xibo Init for this form
+				XiboInitialise("#help_dialog");
+            }
+			else {
+				// Login Form needed?
+	            if (response.login) {
+	                LoginBox(response.message);
+	                return false;
+	            }
+	            else {
+	                // Just an error we dont know about
+					if (response.message == undefined) {
+						SystemMessage(response);
+					}
+					else {
+		                SystemMessage(response.message);
+					}
+	            }
+			}
+            
+            return false;
+        }
+    });
+	
+	// Dont then submit the link/button	
+	return false;
+}
+
+/**
  * Display a login box
  * @param {String} message
  */

=== added file 'server/lib/pages/clock.class.php'
--- server/lib/pages/clock.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/pages/clock.class.php	2009-05-17 17:05:42 +0000
@@ -0,0 +1,72 @@
+<?php
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */ 
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+
+class clockDAO
+{
+	private $db;
+	private $user;
+
+	function __construct(database $db, user $user) 
+	{
+		$this->db 	=& $db;
+		$this->user =& $user;
+		
+	}
+	
+	function displayPage() 
+	{		
+		return false;
+	}
+	
+	function on_page_load() 
+	{
+		return '';
+	}
+	
+	function echo_page_heading() 
+	{
+		return true;
+	}
+	
+	/**
+	 * Shows the Time Information
+	 * @return 
+	 */
+	function ShowTimeInfo()
+	{
+		$db				=& $this->db;
+		$response		= new ResponseManager();
+		$datemanager 	= new DateManager($db);
+				
+		$output  = '<h3>' . __('System Information') . '</h3>';
+		$output .= '<ul>';
+		$output .= '<li>' . __('Local Time') . ': ' . $datemanager->GetClock() . '</li>';
+		$output .= '<li>' . __('System Time') . ': ' . $datemanager->GetSystemClock() . '</li>';
+		$output .= '<li>' . __('Local Date') . ': ' . $datemanager->GetLocalDate('Y-m-d H:i:s') . '</li>';
+		$output .= '<li>' . __('System Date') . ': ' . $datemanager->GetSystemDate('Y-m-d H:i:s') . '</li>';
+		$output .= '</ul>';
+		
+		$response->SetFormRequestResponse($output, __('Date / Time Information'), '480px', '240px');
+		$response->Respond();
+	}
+}
+?>
\ No newline at end of file

=== modified file 'server/lib/pages/fault.class.php'
--- server/lib/pages/fault.class.php	2009-04-29 19:31:19 +0000
+++ server/lib/pages/fault.class.php	2009-05-17 17:05:42 +0000
@@ -57,6 +57,9 @@
 		$output = '';
 		
 		$config = new Config($db);
+		
+		$output .= '<h2>' . __('Report a fault with Xibo') . '</h2>';
+		$output .= '<p>' . __('Before reporting a fault it would be appreciated if you follow the below steps.') . '</p>';
 
 		$output .= '<div class="ReportFault">';		
 		$output .= '<ol>';		

=== added file 'server/lib/pages/help.class.php'
--- server/lib/pages/help.class.php	1970-01-01 00:00:00 +0000
+++ server/lib/pages/help.class.php	2009-05-14 19:20:44 +0000
@@ -0,0 +1,118 @@
+<?php
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2009 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+
+class helpDAO
+{
+	private $db;
+	private $user;
+	private $helpLink;
+	
+	function __construct(database $db, user $user) 
+	{
+		$this->db 	=& $db;
+		$this->user =& $user;
+		
+		$topic	 	= Kit::GetParam('Topic', _REQUEST, _WORD);
+		$category 	= Kit::GetParam('Category', _REQUEST, _WORD, 'General');
+		
+		if ($topic != '') 
+		{
+			Debug::LogEntry($db, 'audit', 'Help requested for Topic = ' . $topic);
+			
+			// Look up this help topic / category in the db
+			$SQL = "SELECT Link FROM help WHERE Topic = '%s' and Category = '%s'";
+			$SQL = sprintf($SQL, $db->escape_string($topic), $db->escape_string($category));
+			
+			Debug::LogEntry($db, 'audit', $SQL);
+	
+			if(!$results = $db->query($SQL)) 
+			{
+				trigger_error($db->error());
+				trigger_error(__('Error getting Help Link'), E_USER_ERROR);
+			}
+			
+			if ($db->num_rows($results) != 0)
+			{
+				$row 	= $db->get_row($results);
+				$link 	= $row[0];
+				
+				// Store the link for the requested help page
+				$this->helpLink = $link;
+			}
+			else 
+			{
+				trigger_error(__('No such help file found'), E_USER_ERROR);
+			}
+		}
+		else
+		{
+			trigger_error(__('You must specify a help page.'), E_USER_ERROR);
+		}
+		
+		return true;
+	}
+	
+	/**
+	 * Displays the particular help subject / page
+	 * @return 
+	 */
+	function Display()
+	{
+		$response	= new ResponseManager();
+		$helpLink 	= $this->helpLink;
+		
+		$out 		= '<iframe src="' . $helpLink . '" width="770" height="600"></iframe>';
+		
+		$response->SetFormRequestResponse($out, __('Help'), '800px', '650px');
+		$response->Respond();
+		
+		return true;
+	}
+	
+	/**
+	 * No display page functionaility
+	 * @return 
+	 */
+	function displayPage() 
+	{
+		return false;
+	}
+	
+	/**
+	 * No onload
+	 * @return 
+	 */
+	function on_page_load() 
+	{
+		return '';
+	}
+	
+	/**
+	 * No page heading
+	 * @return 
+	 */
+	function echo_page_heading() 
+	{
+		return true;
+	}
+} 
+?>
\ No newline at end of file

=== modified file 'server/lib/pages/module.class.php'
--- server/lib/pages/module.class.php	2009-04-26 17:28:25 +0000
+++ server/lib/pages/module.class.php	2009-05-14 19:20:44 +0000
@@ -113,7 +113,7 @@
 	 */
 	function GetImage()
 	{
-		$db =& $this->db;
+		$db 		=& $this->db;
 		
 		$file 		= Kit::GetParam('file', _REQUEST, _STRING);
 		$dynamic	= isset($_REQUEST['dynamic']);

=== modified file 'server/template/css/presentation.css'
--- server/template/css/presentation.css	2009-01-04 12:59:11 +0000
+++ server/template/css/presentation.css	2009-05-14 19:20:44 +0000
@@ -287,7 +287,7 @@
 }
 
 #headerback {
-	float: left;
+	float: right;
 }
 
 #contentwrap {

=== modified file 'server/template/css/xibo.css'
--- server/template/css/xibo.css	2009-03-22 17:58:21 +0000
+++ server/template/css/xibo.css	2009-05-17 17:05:42 +0000
@@ -34,6 +34,10 @@
 	padding-right: 15px;
 }
 
+#headerback, #headerback a {
+	color: #003399;
+}
+
 .FilterDiv {
 	display: none;
 }
@@ -41,3 +45,12 @@
 .ReportFault ol li {
 	display: list-item;
 }
+
+.HelpLink {
+	float:right;
+}
+
+.HelpLink a {
+	padding-left: 10px;
+	padding-right: 10px;
+}

=== modified file 'server/template/footer.php'
--- server/template/footer.php	2009-01-24 18:54:42 +0000
+++ server/template/footer.php	2009-05-14 19:43:42 +0000
@@ -32,6 +32,7 @@
 </div>
 
 <div id="div_dialog"></div>
+<div id="help_dialog"></div>
 
 </div> <!-- Ends the content div -->
 </div> <!-- Ends contentwrap div -->

=== modified file 'server/template/header.php'
--- server/template/header.php	2009-02-22 19:13:38 +0000
+++ server/template/header.php	2009-05-17 17:05:42 +0000
@@ -36,6 +36,11 @@
 {
 	$homepageName = substr($homepage, 0, strpos($homepage, '&'));	
 }
+
+$help 		= new HelpManager($db, $user);
+$helpLink 	= $help->Link();
+
+$datemanager	= new DateManager($db);
  
 ?>
 <!DOCTYPE html PUBLIC "-//W3C/DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -87,10 +92,15 @@
 	<div id="container">
 		<div id="headercontainer">
 	  		<div id="header"></div>
-			<div id="headerback">
-				<h5>Welcome back <?php echo $username; ?>.</h5>
+			<div class="SecondNav" id="headerback">
+				<ul>
+					<?php displayMessage(); ?>
+					<li><?php echo $username; ?></li>
+					<li><a class="XiboFormButton" href="index.php?p=clock&q=ShowTimeInfo" title="<?php echo __('Click to show more time information'); ?>"><?php echo $datemanager->GetClock(); ?></a></li>
+					<li><a title="Show <?php echo ucfirst($p); ?> Help" class="XiboHelpButton" href="<?php echo $helpLink; ?>">Help</a></li>
+					<li><a title="Logout" href="index.php?q=logout">Logout</a></li>
+				</ul>
 			</div>
-			<?php displayMessage(); ?>
 		</div>
 		<div id="navigation">
 			<ul id="nav">
@@ -146,7 +156,6 @@
 						}
 					}
 				?>
-				<li><a href="index.php?q=logout">Log out</a></li>
 			</ul>
 		</div>
 		<div id="contentwrap">

=== modified file 'server/template/pages/content_view.php'
--- server/template/pages/content_view.php	2009-01-25 20:08:32 +0000
+++ server/template/pages/content_view.php	2009-05-17 17:05:42 +0000
@@ -20,6 +20,11 @@
  */ 
 defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
 
+$msgMedia		= __('Add Media');
+$msgMediaDet	= __('Add media to the Library');
+$msgFilter		= __('Filter');
+$msgShowFilter	= __('Show Filter');
+
 ?>
 <div id="form_container">
 	<div id="form_header">
@@ -33,61 +38,10 @@
 		<div class="SecondNav">
 			<!-- Maybe at a later date we could have these buttons generated from the DB - and therefore passed through the security system ? -->
 			<ul>
-				<li><a title="Add media to the Library" class="XiboFormButton" href="index.php?p=content&q=displayForms&sp=add" ><span>Add Media</span></a></li>
-				<li><a title="Show User Help" href="#" onclick="toggle_div_view('notes')"><span>Help</span></a></li>
-				<li><a title="Show Filter" href="#" onclick="ToggleFilterView('LibraryFilter')"><span>Filter</span></a></li>
+				<li><a title="<?php echo $msgMediaDet; ?>" class="XiboFormButton" href="index.php?p=content&q=displayForms&sp=add" ><span><?php echo $msgMedia; ?></span></a></li>
+				<li><a title="<?php echo $msgShowFilter; ?>" href="#" onclick="ToggleFilterView('LibraryFilter')"><span><?php echo $msgFilter; ?></span></a></li>
 			</ul>
 		</div>
-		<div id="notes" style="display:none;">
-			<h4>Content Help <a href="http://www.xibo.org.uk/manual/index.php?p=content/content/overview" target="_blank" alt="The Manual">(Click for Manual)</a></h4>
-			<div id="helptabs">
-				<ul id="help" class="tabs-nav"><!-- the class on this element has to remain the same -->
-					<li><a href="#add_help_div" class="help_tab"><span>Add/Edit</span></a></li>	
-					<li><a href="#tips_div" class="help_tab"><span>Tips</span></a></li>
-					<li><a href="#terms_div" class="help_tab"><span>Terms</span></a></li>	
-				</ul>
-
-				<div id="add_help_div">
-					<h5>What is content?</h5>
-					<p>Xibo uses content to on layotus. The content library is a store of all the content that
-					has been used on layouts in the past, and content to be used on new layouts.</p>
-
-					<h5>When should content be added?</h5>
-					<p>From this content library page, content should be added before it is needed. However
-					content can also be added when creating layouts using the layout designer.</p>
-					
-					<h5>To add content</h5>
-					<p>Click on the top left hand "Add Content" button. The form presented has 5 content options as
-					tabs across the top. To select the appropriate type of content click on the tab required. Enter the details 
-					in this form. All required fields are marked with a *.</p>
-					
-					<h5>To edit content</h5>
-					<p>Click on the "Edit" button in the action column.<br />
-					<strong>Note:</strong> If there is no edit button then you do not
-					have permission to edit that content.</p>
-					
-				</div>
-				<div id="tips_div">
-					<p>A content item is piece of media that you wish to display. This can be may different types of media, such as Videos, Flash animations, RSS feeds, Pictures and more.</p>
-					<p>The table comprises of all the content items that you have uploaded or created. You can also see any other content items that a user has shared within this table</p>
-					<p>You can use the filter form to search for the content item that you would like to modify.</p>
-					<p>Xibo does it's best to auto complete items information, but depending on the source this information may not be available.</p>
-					<p>Xibo's media support will be constantly expanding to cater for more functionality.<p>
-				</div>
-				<div id="terms_div">
-					<p><strong>Content</strong> is used to define the different items that can be added to the database. This can be in the form of media files, websites, RSS files etc..</p>
-					<p><strong>WMV</strong> stands for Windows Media Video files. These files allow full motion video to be shown on your display</p>
-					<p><strong>JPG</strong> is the common type of file used for still photos</p>
-					<p><strong>PPT</strong> Powerpoint files can also be media types. If you wish to set an automated powerpoint presentation to display all your slides you must configure this prior to upload. Powerpoint
-					support is only available under Internet Explorer and with client machines that have MS Office installed.</p>
-					<p><strong>SWF</strong> these are flash animation files.</p>
-					<p><strong>RSS</strong> you can set an RSS news feed to be displayed. You can also add styling so your information has extra visual impact.</p>
-					<p><strong>URL</strong> this will take a live website and display it on the screen</p>
-					<p><strong>Text</strong> text can be used to add information or notes to your display. These can have a style associated with them.</p>
-				</div>
-			</div>
-		</div>
-		
 		<?php $this->LibraryFilter(); ?>
 
 	</div>	

=== modified file 'server/template/pages/fault_view.php'
--- server/template/pages/fault_view.php	2009-03-22 12:06:30 +0000
+++ server/template/pages/fault_view.php	2009-05-17 17:05:42 +0000
@@ -30,8 +30,6 @@
 		<div class="SecondNav">
 			
 		</div>
-		<h2>Report a fault with Xibo</h2>
-		<p>Before reporting a fault it would be appreciated if you follow the below steps.</p>
 		<?php $this->ReportForm(); ?>
 	</div>
 		

=== modified file 'server/template/pages/group_view.php'
--- server/template/pages/group_view.php	2009-01-24 19:11:18 +0000
+++ server/template/pages/group_view.php	2009-05-17 17:05:42 +0000
@@ -19,6 +19,11 @@
  * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
  */ 
 defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+
+$msgGroup		= __('Add Group');
+$msgFilter		= __('Filter');
+$msgShowFilter	= __('Show Filter');
+
 ?>
 
 <div id="form_container">
@@ -33,46 +38,10 @@
 		<div class="SecondNav">
 			<!-- Maybe at a later date we could have these buttons generated from the DB - and therefore passed through the security system ? -->
 			<ul>
-				<li><a title="Add a new Group" class="XiboFormButton" href="index.php?p=group&q=GroupForm" ><span>Add Group</span></a></li>
-				<li><a title="Show Layout Help" href="#" onclick="toggle_div_view('notes')"><span>Help</span></a></li>
-				<li><a title="Show Filter" href="#" onclick="ToggleFilterView('GroupFilter')"><span>Filter</span></a></li>
+				<li><a title="<?php echo $msgGroup; ?>" class="XiboFormButton" href="index.php?p=group&q=GroupForm" ><span><?php echo $msgGroup; ?></span></a></li>
+				<li><a title="<?php echo $msgShowFilter; ?>" href="#" onclick="ToggleFilterView('GroupFilter')"><span><?php echo $msgFilter; ?></span></a></li>
 			</ul>
 		</div>
-		<div id="notes" style="display:none;">
-			<h4>Group Help <a alt="The Manual" target="_blank" href="manual/index.php?p=content/users/groups">(Click for Manual)</a></h4>
-			<div id="helptabs">
-				<ul id="help" class="tabs-nav"><!-- the class on this element has to remain the same -->
-					<li><a href="#add_div" class="help_tab"><span>Adding</span></a></li>
-					<li><a href="#edit_div" class="help_tab"><span>Edit</span></a></li>
-					<li><a href="#tips_div" class="help_tab"><span>Tips</span></a></li>
-					<li><a href="#terms_div" class="help_tab"><span>Terms</span></a></li>	
-				</ul>
-				<div id="add_div">
-					<h5>Adding a Group</h5>
-					<p>To add a group click on the "Add Group" button found at the top left of this page.</p>
-					
-					<h5>When should a group be added?</h5>
-					<p>A group should be added when there is a new set of components required for a particular group of users.
-					It could be that you want certain users to only have access to certain components or that certain users 
-					shouldnt be able to share their content, playlists and schedules with each other.</p>
-				</div>
-				<div id="edit_div">
-					<h5>Edit a Group</h5>
-					<p>To edit a group click on the edit button on the row belonging to the group you wish to edit.</p>
-					
-					<h5>Group / Component Security</h5>
-					<p>When editing a group the components that are assigned / unassigned to that group are show. These
-					determine the permissions of the users belonging to that group.</p>
-				</div>
-				<div id="tips_div">
-					<p>You should always have at least one group.</p>
-				</div>
-				<div id="terms_div">
-					<p><strong>Name</strong> is a unique identifier for a group.</p>
-					<p><strong>Components</strong> refer to parts of Xibo, e.g. Content, or Playlists.</p>
-				</div>
-			</div>
-		</div>	
 		<?php $this->GroupGrid(); ?>
 </div>
 	

=== modified file 'server/template/pages/layout_view.php'
--- server/template/pages/layout_view.php	2009-01-24 18:54:42 +0000
+++ server/template/pages/layout_view.php	2009-05-17 17:05:42 +0000
@@ -17,7 +17,13 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
- */ 
+ */
+defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+
+$msgLayout		= __('Add Layout');
+$msgFilter		= __('Filter');
+$msgShowFilter	= __('Show Filter');
+
 ?>
 <div id="form_container">
 	<div id="form_header">
@@ -29,84 +35,10 @@
 		<div class="SecondNav">
 			<!-- Maybe at a later date we could have these buttons generated from the DB - and therefore passed through the security system ? -->
 			<ul>
-				<li><a title="Add a new Layout" class="XiboFormButton" href="index.php?p=layout&q=displayForm" ><span>Add Layout</span></a></li>
-				<li><a title="Show Layout Help" href="#" onclick="toggle_div_view('notes')"><span>Help</span></a></li>
-				<li><a title="Show Filter" href="#" onclick="ToggleFilterView('LayoutFilter')"><span>Filter</span></a></li>
+				<li><a title="<?php echo $msgLayout; ?>" class="XiboFormButton" href="index.php?p=layout&q=displayForm" ><span><?php echo $msgLayout; ?></span></a></li>
+				<li><a title="<?php echo $msgShowFilter; ?>" href="#" onclick="ToggleFilterView('LayoutFilter')"><span><?php echo $msgFilter; ?></span></a></li>
 			</ul>
 		</div>
-		<div id="notes" style="display:none;">
-			<h4>Layout Help <a href="http://www.xibo.org.uk/manual/index.php?p=content/layout/overview" target="_blank" alt="The Manual">(Click for Manual)</a></h4>
-			<div id="helptabs">
-				<ul id="help" class="tabs-nav"><!-- the class on this element has to remain the same -->
-					<li><a href="#add_div" class="help_tab"><span>Add/Edit</span></a></li>	
-					<li><a href="#design_div" class="help_tab"><span>Design</span></a></li>	
-					<li><a href="#tips_div" class="help_tab"><span>Tips</span></a></li>
-					<li><a href="#terms_div" class="help_tab"><span>Terms</span></a></li>	
-				</ul>
-
-				<div id="add_div">
-					<h5>When to add a layout, and when to design an existing one?</h5>
-					<p>A Layout should be added when you have some <strong>new</strong> content you want shown together on a different background
-					or for a different screen type.<br />
-					To add to content that is already on a layout and being shown together on the display network you should design the layout.</p>
-					
-					<h5>To add a Layout</h5>
-					<p>To add a layout click on the Add Layout button (green plus sign). A form will appear - enter the details 
-					in this form. All required fields are marked with a *.</p>
-					
-					<h5>To edit a Layout</h5>
-					<p>To edit a layout use the fitler or page navigation buttons to find it in the table list and then click the
-					edit button found in the action column. <br />
-					<strong>Note:</strong> If there is no edit button then you do not
-					have permission to edit that layout.</p>
-					
-					<h5>For adding and editing</h5>
-					<p>The layout name be unique - you cannot have two layouts with the same name. <br />
-					The description field is for any more information.<br />
-					The Shared option determines which other Xibo users can use this layout.</p>
-				</div>
-				<div id="design_div">
-					<h5>Designing a Layout</h5>
-					<p>Designing a layout involves adding regions and content to it. Layouts can have many types of content -
-					 content from the library (media, text, rss, etc) or content specific to the layout (tickers, text, webpages).</p>
-					
-					<h5>When should I design a layout?</h5>
-					<p>Layouts should be designed either just after they have been created, or whenever content needs to
-					be added or changed.</p>
-				</div>
-				<div id="tips_div">
-					<h5>What is a layout?</h5>
-					<p>A layout is the concept used to group together content items into a visual style so that they can be 
-					scheduled for a display to show. A layout allows you to create slides which display your content. 
-					A layout can be made up of multiple regions, holding your media items. The table below shows you all the 
-					layouts that you have created along with any others that have been shared by other users on the system.</p>
-					
-					<h5>The other buttons</h5>
-					<p>The action buttons allow you to edit that layout and media.</p>
-					
-					<h5>Filter Form and Data table</h5>
-					<p>You can use the filter form to search for the layout that you would like to work on. Altering values
-					in the filter form will alter the layouts shown in the data table below.</p>
-					<p>The table headings can be used to sort the data table. Clicking on a heading will sort the table by that
-					heading. This can be done in conjunction with a filtered search. Holding down the shift key while 
-					sorting on headings will progressively sort the data table.</p>
-					<p><strong>E.g.</strong> Select Shared "Public" from the filter form, and then click on the description data
-					table heading. The data table is now only showing the "Public" playlists sorted by description.</p>
-				</div>
-				<div id="terms_div">
-					<p><strong>Name</strong> is the name of the layout that was assigned when it was created. This can be edited by clicking 
-					on the edit action button in the table</p>
-					<p><strong>Description</strong> provides information about the layout. This can be edited by clicking on the edit action 
-					button in the table</p>
-					<p><strong># Slides</strong> indicates the number of slides on the layout.</p>
-					<p><strong>h:mi:ss</strong> this gives you the runtime of the playlist.</p>
-					<p><strong>Shared</strong> this states whether a playlist has been made public or private. Public layouts are 
-					accesible for all users to schedule where as private playlists can only be scheduled by yourself or an administrator</p>
-					<p><strong>Ownership</strong> states the user who has created the layout</p>
-					<p><strong>Action</strong> provides buttons for the actions that are available to you for each layout you own.</p>
-				</div>
-			</div>
-		</div>
 		<?php $this->LayoutFilter(); ?>	
 	</div>	
 		
@@ -116,5 +48,4 @@
 		<div id="form_footer_right">
 		</div>
 	</div>
-</div>	
-			
\ No newline at end of file
+</div>
\ No newline at end of file

=== modified file 'server/template/pages/log_view.php'
--- server/template/pages/log_view.php	2009-02-08 12:49:24 +0000
+++ server/template/pages/log_view.php	2009-05-17 17:05:42 +0000
@@ -19,6 +19,10 @@
  * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
  */
 defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
+
+$msgRefresh		= __('Refresh');
+$msgFilter		= __('Filter');
+$msgShowFilter	= __('Show Filter');
 ?>
 <div id="form_container">
 	<div id="form_header">
@@ -32,36 +36,10 @@
 		<div class="SecondNav">
 			<!-- Maybe at a later date we could have these buttons generated from the DB - and therefore passed through the security system ? -->
 			<ul>
-				<li><a title="Show Sessions Help" href="#" onclick="toggle_div_view('notes')"><span>Help</span></a></li>
-				<li><a title="Show Filter" href="#" onclick="ToggleFilterView('LogFilter')"><span>Filter</span></a></li>
-				<li><a title="Refresh the Results" href='#' onclick="XiboGridRender('LogGridId')"><span>Refresh</span></a></li>
+				<li><a title="<?php echo $msgRefresh; ?>" href='#' onclick="XiboGridRender('LogGridId')"><span><?php echo $msgRefresh; ?></span></a></li>
+				<li><a title="<?php echo $msgShowFilter; ?>" href="#" onclick="ToggleFilterView('LogFilter')"><span><?php echo $msgFilter; ?></span></a></li>
 			</ul>
 		</div>
-		
-		<div id="notes" style="display:none;">
-			<h4>Error Log Help</h4>
-			<div id="helptabs">
-			
-				<ul id="help" class="tabs-nav">
-					<li><a href="#tips_div" class="help_tab"><span>Tips</span></a></li>
-					<li><a href="#terms_div" class="help_tab"><span>Terms</span></a></li>	
-				</ul>
-
-				<div id="tips_div">
-					<p>The error log is used to help troubleshoot problems with Xibo. When you encounter an error it will be logged
-					and listed in the system here. These error messages can help the xstreamedia team solve your problem.</p>
-					<p>Truncating the log helps you to troubleshoot a problem by clearing the current error messages</p>
-					<p>The page and sub page items helps locate where the error has been generated from.</p>
-				</div>
-
-				<div id="terms_div">
-					<p><strong>Log Date</strong> states the date and time the error message was logged.</p>
-					<p><strong>Page</strong> states the page that the error has been generated from.</p>
-					<p><strong>Sub Page</strong> states the sub page that the error message has been generated from.</p>
-					<p><strong>Message</strong> gives details of what error has occurred in the system.</p>
-				</div>
-			</div>
-		</div>
 		<?php $this->LogFilter(); ?>	
 	</div>
 	

=== modified file 'server/template/pages/schedule_month_view.php'
--- server/template/pages/schedule_month_view.php	2009-02-15 12:54:04 +0000
+++ server/template/pages/schedule_month_view.php	2009-05-14 19:36:36 +0000
@@ -32,95 +32,6 @@
 			<div class="leftbuttons">
 				<div class="buttons">
 					<a id="whatson_button" class="XiboFormButton" href="index.php?p=schedule&q=WhatsOn"><div class="button_text">Broadcasting</div></a>
-					<a id="help_button"  href="#" onclick="toggle_div_view('notes')"><div class="button_text">Help</div></a>
-				</div>	
-					
-				<div id="notes" style="display:none;">
-					<h4>Schedule Help <a href="http://www.xibo.org.uk/manual/index.php?p=content/schedule/overview" target="_blank" alt="The Manual">(Click for Manual)</a></h4>
-					<div id="helptabs">
-						<ul id="help" class="tabs-nav"><!-- the class on this element has to remain the same -->
-							<li><a href="#cal_div" class="help_tab"><span>Calendar</span></a></li>
-							<li><a href="#dayview_div" class="help_tab"><span>Add/Edit</span></a></li>
-							<li><a href="#tips_div" class="help_tab"><span>Tips</span></a></li>
-							<li><a href="#terms_div" class="help_tab"><span>Terms</span></a></li>	
-						</ul>
-
-						<div id="cal_div">
-							<h5>Xibo Calendar</h5>
-							<p>All scheduling in Xibo can be viewed through the calendar. It shows when playlists are scheduled and on which displays.</p>
-							
-							<h5>Navigating</h5>
-							<p><strong>Dates</strong>: The calendar months can be navigated using the Prev and Next links. They are either side of
-							the current month/year indicator and the top of the calendar.</p>
-							
-							<p><strong>Add</strong>: Events can be added by either <br />
-								a) Clicking the heading for a particular day <br />
-								b) Double clicking within the day cell <br />
-							Either method will open the Add Event form
-							</p>
-							<p>
-								<strong>Edit</strong>: Events can be edited by clicking on the event. This will open up the Edit Event form
-							</p>
-							
-							<h5>Deleting</h5>
-							<p>To delete an event first click on the event, and then press the delete button on the "Edit Event" form that opened.</p>
-							
-							<h5>Changing Displays</h5>
-							<p>To change displays click on the required display screen above the calendar.</p>
-							
-						</div>
-						<div id="dayview_div">
-							<h5>Opening the Add/Edit form</h5>
-							<p>See the "Calendar" section on Navigating for how to open the add/edit form</p>
-							
-							<h5>Event Details</h5>
-							<p>The event details part of this form is found on the upper section. It features start and end dates, 
-							playlist selections and display selections.</p>
-							
-							<p>To pick the correct date and time for start and end time click on the calendar icon next to the field and
-							and calendar selector will open.</p>
-							
-							<p>If you selected the hours from the day page these will have been autopoulated for you to adjust.</p>
-							
-							<p>You can choose the playlist that you wish to display in this slot from the dropdown menu. This
-							list provides you with all the playlists that you have created or have permission to add to the schedule.</p>
-							
-							<p>The "Save" button will save this event to Xibo with the data entered on the form.</p>
-							
-							<p>If editing an event the delete button will also be present, allowing the event to be deleted.</p>
-							
-							<h5>Recurrence</h5>
-							<p>The Xibo scheduler features the ability to create recurring events, for example Playlist 1 shown between 10 and 11
-							every day for the next two weeks.</p>
-							
-							<p>To set recurrence for events select the required "Repeats" value from the list and the appropriate additional fields
-							will be revealed. Select as appropriate.</p>
-							
-							<h5>Day View</h5>
-							<p>The day view allows you to see everything that is happening on a display for that day. It gives a far
-							greater degree of information than the calendar month view. This visualisation makes it easy to see when 
-							events will overlap and share time on the screen.</p>
-							
-							<p>There are a number of additional features for the day view.<br />
-							Firstly events shown on the day view can be loaded into the form for editing by clicking on the blocked out time.<br />
-							Secondly new events can be added by clicking on start and end times in the last row - and then add new. The start and end
-							times will be preloaded in the form that appears.</p>
-						</div>
-						<div id="tips_div">
-							<p>The month view allows you to see all the playlists that have been scheduled on the screen that is highlighted.</p>
-							<p>Double clicking in day items section allows you to schedule an event for the whole day quickly.</p>
-							<p>You can change which display you are looking at by clicking the relevent display at the top of the page.</p>
-							<p>You can edit a specific event directly by clicking on it.</p>
-						</div>
-						<div id="terms_div">
-							<p><strong>Day View</strong> provides a table of the hours within that day for the display specified.</p>
-							<p><strong>Start time</strong> states the time at which the content has been scheduled</p>
-							<p><strong>End time</strong> states the time at whcih the content will cease being shown</p>
-							<p><strong>Day Tab</strong> refers to the blue section of each day on the view.</p>
-							<p><strong>Day Items</strong> refers to the area of the day that lists what's being shown</p>
-							<p><strong>What's On</strong> provides full details of the playlists being displayed on each display on the system.</p>						
-						</div>
-					</div>
 				</div>	
 			</div>
 			<div id="displaybuttons">

=== modified file 'server/template/pages/sessions_view.php'
--- server/template/pages/sessions_view.php	2009-02-08 12:49:24 +0000
+++ server/template/pages/sessions_view.php	2009-05-17 17:05:42 +0000
@@ -20,6 +20,8 @@
  */
 defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
 
+$msgFilter		= __('Filter');
+$msgShowFilter	= __('Show Filter');
 ?>
 <div id="form_container">
 	<div id="form_header">
@@ -33,23 +35,9 @@
 		<div class="SecondNav">
 			<!-- Maybe at a later date we could have these buttons generated from the DB - and therefore passed through the security system ? -->
 			<ul>
-				<li><a title="Show Sessions Help" href="#" onclick="toggle_div_view('notes')"><span>Help</span></a></li>
-				<li><a title="Show Filter" href="#" onclick="ToggleFilterView('SessionFilter')"><span>Filter</span></a></li>
+				<li><a title="<?php echo $msgShowFilter; ?>" href="#" onclick="ToggleFilterView('SessionFilter')"><span><?php echo $msgFilter; ?></span></a></li>
 			</ul>
 		</div>
-		<div id="notes" style="display:none;">
-			<h4>Sessions Help</h4>
-			<div id="helptabs">
-				<ul id="help" class="tabs-nav">
-					<li><a href="#tips_div" class="help_tab"><span>Tips</span></a></li>
-					<li><a href="#terms_div" class="help_tab"><span>Terms</span></a></li>	
-				</ul>
-				<div id="tips_div">
-					<p>Reports provide details of users that are currently on the system.</p>
-				</div>
-				<div id="terms_div"></div>
-			</div>
-		</div>
 		<?php $this->SessionFilter(); ?>
 	</div>
 	

=== modified file 'server/template/pages/settings_view.php'
--- server/template/pages/settings_view.php	2008-12-13 13:44:03 +0000
+++ server/template/pages/settings_view.php	2009-05-14 19:36:36 +0000
@@ -29,44 +29,7 @@
 	</div>
 	
 	<div id="form_body">
-		<div class="leftbuttons">
-				<div class="buttons">
-					<a id="help_button"  href="#" onclick="toggle_div_view('notes')"><div class="button_text">Help</div></a>
-				</div>	
-					
-				<div id="notes" style="display:none;">
-					<h4>Settings Help <a href="http://www.xibo.org.uk/manual/index.php?p=content/config/settings" target="_blank" alt="The Manual">(Click for Manual)</a></h4>
-					<div id="helptabs">
-						<ul id="help" class="tabs-nav"><!-- the class on this element has to remain the same -->
-							<li><a href="#tips_div" class="help_tab"><span>Tips</span></a></li>
-							<li><a href="#terms_div" class="help_tab"><span>Tabs</span></a></li>	
-						</ul>
-
-						<div id="tips_div">
-							<p>This page provides you with all the settings options to configure Xibo to your environment. Each tab provides a set of forms
-							where you can alter default settings and paths.</p>
-							<p>The items in the boxes provide you with details of your PHP settings on the server with Xibo installed.</p>
-							<p>Settings should only be modified by the administrator of the system, as incorrect settings could cause system
-							stablility issues.</p>
-						</div>
-						<div id="terms_div">
-							<p><strong>Content</strong> this tab allows you to set default content item settings, such as a default lenght and ratio. This
-							helps Xibo if the file does not contain duration information.</p>
-							<p><strong>Default</strong> settings sets the default options on some forms to always appear and be applied unless altered. You can also change
-							your time zone in this section.</p>
-							<p><strong>Error</strong> tab allows you to alter how Xibo handles errors. You can assign a mailbox to send errors and turn the error and audit 
-							lgos on and off.</p>
-							<p><strong>General</strong> settings provides details of your current settings in your PHP.ini file on your server. It also allows you to setup
-							whether you are collecting statics off your Xibo displays.</p>
-							<p><strong>Path</strong> settings allows you to specify particular directory locations for where Xibo will store and look for items. It also allows
-							you to specify where you have downloaded additional plugins like openflash charts.</p>
-							<p><strong>User</strong> this section is important if you intent to use a different authentication module to allow your users to log in to the system
-							you will only need this section if you are familiar with an Ldap authentication module.</p>
-							<p><strong>Install Issues</strong> highlights some settings issues that stop some Xibo functions from functioning correctly on your network.</p>
-						</div>
-					</div>
-				</div>
-			</div>	
+		<div class="leftbuttons"></div>	
 		<div id="settings">
 			<?php $this->display_settings(); ?>
 		</div>

=== removed file 'server/template/pages/template_edit.php'
--- server/template/pages/template_edit.php	2008-12-10 23:48:34 +0000
+++ server/template/pages/template_edit.php	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-<?php
-/*
- * Xibo - Digitial Signage - http://www.xibo.org.uk
- * Copyright (C) 2006,2007,2008 Daniel Garner and James Packer
- *
- * This file is part of Xibo.
- *
- * Xibo is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * any later version. 
- *
- * Xibo is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
- */ 
-?>
-<div id="form_container">
-	<div id="form_header">
-		<div id="form_header_left">
-		</div>
-		<div id="form_header_right">
-		</div>
-	</div>
-
-	<div id="form_body">
-		
-		<div class="filter_form_container">
-			<div class="leftbuttons">
-				<div class="buttons">
-					<a id="help_button" onclick="toggle_div_view('notes')"><div class="button_text">Help</div></a>
-				</div>	
-		<div id="notes" style="display:none;">
-					<h4>Layout Help</h4>
-					<div id="helptabs">
-						<ul id="help" class="tabs-nav"><!-- the class on this element has to remain the same -->
-							<li><a href="#tips_div" class="help_tab"><span>Tips</span></a></li>
-							<li><a href="#terms_div" class="help_tab"><span>Tags</span></a></li>	
-						</ul>
-
-						<div id="tips_div">
-							<p>Editing a Layout gives you complete control over the code used to generate it on screen. </p>
-							<p>You can use a combination of HTML and CSS to generate your display layout. These follow all the stand rules used for building a website.</p>
-							<p>It is recommended that you use a text editor to construct your code and then copy and paste it into the tables on the page.</p>
-							<p>The preview player allows you to navigate the presentations available to you and the slides available in each presentation. The preview window autosizes to your screen resolution. For true representation
-							of how a presentation will appear on a screen, it is wise to set the resolution as close to the Display resolution as possible.</p>
-						</div>
-						<div id="terms_div">
-							<p>Layouts use some designated tags that Xibo uses to identify certain custom elements. These are specified below</p>
-							<p><strong>Name</strong> identifies the layout so that people can add it to a presentation.</p>
-							<p><strong>Number of Positions</strong> identifies how many pieces of content can be added to this layout.</p>
-							<p><strong>&lt;position name="1"&gt;</strong> is the tag that is used to define a position on the layout, where the number corresponds to
-							one of the layout positions. So if you have 4 positions, you can have 4 of these tags, each with it's own position number 1,2,3 or 4.</p>
-						
-						</div>
-					</div>
-				</div>	
-				</div>
-			<?php $this->layout_form("index.php?p=layout&q=edit", "index.php?p=layout&sp=view", "index.php?p=layout&sp=edit", ""); ?>
-		</div>
-
-	</div>
-	
-	<div id="form_footer">
-		<div id="form_footer_left">
-		</div>
-		<div id="form_footer_right">
-		</div>
-	</div>
-</div>	
\ No newline at end of file

=== modified file 'server/template/pages/template_view.php'
--- server/template/pages/template_view.php	2009-02-08 12:19:45 +0000
+++ server/template/pages/template_view.php	2009-05-17 17:05:42 +0000
@@ -20,6 +20,8 @@
  */
 defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
 
+$msgFilter		= __('Filter');
+$msgShowFilter	= __('Show Filter');
 ?>
 <div id="form_container">
 	<div id="form_header">
@@ -33,24 +35,9 @@
 		<div class="SecondNav">
 			<!-- Maybe at a later date we could have these buttons generated from the DB - and therefore passed through the security system ? -->
 			<ul>
-				<li><a title="Show Template Help" href="#" onclick="toggle_div_view('notes')"><span>Help</span></a></li>
-				<li><a title="Show Filter" href="#" onclick="ToggleFilterView('TemplateFilter')"><span>Filter</span></a></li>
+				<li><a title="<?php echo $msgShowFilter; ?>" href="#" onclick="ToggleFilterView('TemplateFilter')"><span><?php echo $msgFilter; ?></span></a></li>
 			</ul>
 		</div>
-		<div id="notes" style="display:none;">
-			<h4>Template Help <a href="manual/index.html" target="_blank" alt="The Manual">(Click for Manual)</a></h4>
-			<div id="helptabs">
-				<ul id="help" class="tabs-nav"><!-- the class on this element has to remain the same -->
-					<li><a href="#tips_div" class="help_tab"><span>Tips</span></a></li>
-				</ul>
-
-				<div id="tips_div">
-					<p>A template is a stored layout without any media assigned to it. It is used when creating a new layout.</p>
-					<p>Templates can be created from the Layout Designer.</p>
-					<p>Templates are for a particular screen resolution.</p>
-				</div>
-			</div>
-		</div>
 		<?php $this->TemplateFilter(); ?>
 	</div>
 	

=== modified file 'server/template/pages/user_view.php'
--- server/template/pages/user_view.php	2009-01-25 20:08:32 +0000
+++ server/template/pages/user_view.php	2009-05-17 17:05:42 +0000
@@ -19,7 +19,10 @@
  * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
  */
 defined('XIBO') or die("Sorry, you are not allowed to directly access this page.<br /> Please press the back button in your browser.");
- 
+
+$msgUser		= __('Add User');
+$msgFilter		= __('Filter');
+$msgShowFilter	= __('Show Filter');
 ?>
 <div id="form_container">
 	<div id="form_header">
@@ -36,33 +39,12 @@
 				<?php
 					if ($_SESSION['usertype']==1)
 					{
-						echo '<li><a title="Add User" class="XiboFormButton" href="index.php?p=user&q=DisplayForm"><span>Add User</span></a></li>';
+						echo '<li><a title="' . $msgUser . '" class="XiboFormButton" href="index.php?p=user&q=DisplayForm"><span>' . $msgUser . '</span></a></li>';
 					}
 				?>
-				<li><a title="Show User Help" href="#" onclick="toggle_div_view('notes')"><span>Help</span></a></li>
-				<li><a title="Show Filter" href="#" onclick="ToggleFilterView('UserFilter')"><span>Filter</span></a></li>
+				<li><a title="<?php echo $msgShowFilter; ?>" href="#" onclick="ToggleFilterView('UserFilter')"><span><?php echo $msgFilter; ?></span></a></li>
 			</ul>
 		</div>
-		<div id="notes" style="display:none;">
-			<h4>User Help <a href="http://www.xibo.org.uk/manual/index.php?p=content/users/overview" target="_blank" alt="The Manual">(Click for Manual)</a></h4>
-			<div id="helptabs">
-				<ul id="help" class="tabs-nav"><!-- the class on this element has to remain the same -->
-					<li><a href="#tips_div" class="help_tab"><span>Tips</span></a></li>
-					<li><a href="#terms_div" class="help_tab"><span>Terms</span></a></li>	
-				</ul>
-
-				<div id="tips_div">
-					<p>Xibo has it's own User module that you can use to allow access to the system. Xibo allows you to manage indvidual
-					users priveleges and basic registered details.</p>
-					<p>The action buttons allow you to edit to edit a persons login details and override their password.</p>
-					<p>Users is only available to administrators of the system.</p>
-				</div>
-				<div id="terms_div">
-					<p><strong>Name</strong> is the username of the profile/</p>
-					<p><strong>Email</strong> provides a contact point for forgotten passwords, and any Xibo notifications.</p>
-				</div>
-			</div>
-		</div>
 		<?php $this->UserFilter(); ?>
 	</div>
 

=== modified file 'server/upgrade.php'
--- server/upgrade.php	2009-05-13 18:57:27 +0000
+++ server/upgrade.php	2009-05-18 21:37:32 +0000
@@ -18,21 +18,20 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
  */ 
-DEFINE('XIBO', true);
+DEFINE('XIBO', true);
 
+
 if (! checkPHP()) {
   die("Xibo requires PHP 5.0.2 or later");
-}
-
+}
+
 include('lib/app/kit.class.php');
+include('lib/app/debug.class.php');
 include('config/db_config.php');
 include('config/config.class.php');
-require('settings.php');
 
-// Setup the translations for gettext
+// Setup the translations for gettext
 require_once("lib/app/translationengine.class.php");
-TranslationEngine::InitLocale($db);
-
 
 // Once we've calculated the upgrade in step 2 below, we need
 // to have included the appropriate upgrade php files
@@ -62,12 +61,19 @@
 define('_INPUTBOX', "inputbox");
 define('_PASSWORDBOX', "password");
 
+Config::Load();
+
 // create a database class instance
 $db = new database();
 
 if (!$db->connect_db($dbhost, $dbuser, $dbpass)) reportError(0, __("Unable to connect to the MySQL database using the settings stored in settings.php.") . "<br /><br />" . __("MySQL Error:") . "<br />" . $db->error());
 if (!$db->select_db($dbname)) reportError(0, __("Unable to select the MySQL database using the settings stored in settings.php.") . "<br /><br />" . __("MySQL Error:") . "<br />" . $db->error());
 
+// Initialise the Translations
+set_error_handler(array(new Debug(), "ErrorHandler"));
+
+TranslationEngine::InitLocale($db);
+
 include('install/header_upgrade.inc');
 
 if (! $_SESSION['step']) {