Merge. Remove admin links from sidebar. They are in the footer now

Merge branch 'master' of disposed.de:scattport

Conflicts:
	application/views/header.php

application/language/locale/de_DE/LC_MESSAGES/lang.po

@@ -0,0 +1,74 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-08-10 21:25+0200\n"
+"PO-Revision-Date: 2011-08-10 22:00+0200\n"
+"Last-Translator: Karsten Heiken <karsten@disposed.de>\n"
+"Language-Team: German <>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+
+msgid "Users"
+msgstr "Benutzer"
+
+msgid "Available users"
+msgstr "Alle verfügbaren Benutzer"
+
+msgid "Username"
+msgstr "Benutzername"
+
+msgid "Full name"
+msgstr "Vollständiger Name"
+
+msgid "Actions"
+msgstr "Aktionen"
+
+msgid "Edit"
+msgstr "Bearbeiten"
+
+msgid "Delete"
+msgstr "Löschen"
+
+msgid "Create new user"
+msgstr "Neuen Benutzer erstellen"
+
+msgid "Edit user '%s'"
+msgstr "Benutzer »%s« bearbeiten"
+
+msgid "Required information"
+msgstr "Erforderliche Angaben"
+
+msgid "Optional information"
+msgstr "Optionale Angaben"
+
+msgid "Email address"
+msgstr "E-Mail-Adresse"
+
+msgid "First name"
+msgstr "Vorname"
+
+msgid "Last name"
+msgstr "Nachname"
+
+msgid "Institution"
+msgstr "Institution"
+
+msgid "Phone number"
+msgstr "Telefonnummer"
+
+msgid "Language"
+msgstr "Sprache"
+
+msgid "Example"
+msgstr "Beispiel"
+
+msgid "Save"
+msgstr "Speichern"
+
+msgid "Cancel"
+msgstr "Abbrechen"
+

application/language/locale/en_US/LC_MESSAGES/lang.po

@@ -0,0 +1,67 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-08-10 21:25+0200\n"
+"PO-Revision-Date: 2011-08-10 22:00+0200\n"
+"Last-Translator: Karsten Heiken <karsten@disposed.de>\n"
+"Language-Team: English <>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+
+msgid "users"
+msgstr "Users"
+
+msgid "available_users"
+msgstr "Available users"
+
+msgid "username"
+msgstr "Username"
+
+msgid "realname"
+msgstr "Name"
+
+msgid "options"
+msgstr "Options"
+
+msgid "user_edit"
+msgstr "Edit"
+
+msgid "user_create"
+msgstr "Create new user"
+
+msgid "user_delete"
+msgstr "Delete"
+
+msgid "create_user"
+msgstr "Create a new user"
+
+msgid "edit_user"
+msgstr "Edit user"
+
+msgid "field_username"
+msgstr "Username"
+
+msgid "field_password"
+msgstr "Password"
+
+msgid "field_password_confirm"
+msgstr "Confirm password"
+
+msgid "field_firstname"
+msgstr "First name"
+
+msgid "field_lastname"
+msgstr "Last name"
+
+msgid "field_email"
+msgstr "Email address"
+
+msgid "field_institution"
+msgstr "Institution"
+
+msgid "field_phone"
+msgstr "Phone number"