X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=locale%2Fde%2FLC_MESSAGES%2Fstatusnet.po;h=b6889826f5655c7d8e81b31b356064402be95c86;hb=007866d340e9e011a547ef8726830ff00e6f0f41;hp=ab5c443404f18e9ac28dc4ffabae254b7c5c342b;hpb=503afc4422636b03545007485bd64a2d33e92d3e;p=quix0rs-gnu-social.git

diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index ab5c443404..b6889826f5 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -1,4 +1,4 @@
-# Translation of StatusNet to German (Deutsch)
+# Translation of StatusNet - Core to German (Deutsch)
 # Expored from translatewiki.net
 #
 # Author: Apmon
@@ -17,19 +17,19 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: StatusNet\n"
+"Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-14 19:53+0000\n"
-"PO-Revision-Date: 2010-09-14 19:53:47+0000\n"
+"POT-Creation-Date: 2010-10-04 22:30+0000\n"
+"PO-Revision-Date: 2010-10-04 22:32:14+0000\n"
 "Language-Team: German <http://translatewiki.net/wiki/Portal:de>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r73009); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r74276); Translate extension (2010-09-17)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
-"X-Message-Group: #out-statusnet\n"
+"X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-POT-Import-Date: 1284-49-16 34::+0000\n"
+"X-POT-Import-Date: 2010-10-03 20:54:28+0000\n"
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
@@ -51,7 +51,7 @@ msgstr "Registrieren"
 #: actions/accessadminpanel.php:165
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
-"Anonymen (nicht eingeloggten) Nutzern das Betrachten der Seite verbieten?"
+"Anonymen (nicht eingeloggten) Benutzern das Betrachten der Seite verbieten?"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 #: actions/accessadminpanel.php:167
@@ -90,7 +90,7 @@ msgstr "Zugangs-Einstellungen speichern"
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:203 actions/emailsettings.php:228
 #: actions/imsettings.php:187 actions/smssettings.php:209
-#: lib/applicationeditform.php:351
+#: lib/applicationeditform.php:355
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Speichern"
@@ -121,7 +121,7 @@ msgstr "Seite nicht vorhanden"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Unbekannter Benutzer."
@@ -308,7 +308,7 @@ msgstr "Konnte Benutzerdesign nicht aktualisieren."
 
 #: actions/apiblockcreate.php:106
 msgid "You cannot block yourself!"
-msgstr "Du kannst dich nicht selbst sperren!"
+msgstr "Du kannst dich nicht selbst blockieren!"
 
 #: actions/apiblockcreate.php:127
 msgid "Block user failed."
@@ -368,7 +368,7 @@ msgid "This status is already a favorite."
 msgstr "Diese Nachricht ist bereits ein Favorit!"
 
 #. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:294
 msgid "Could not create favorite."
 msgstr "Konnte keinen Favoriten erstellen."
 
@@ -382,12 +382,13 @@ msgstr "Konnte Favoriten nicht löschen."
 
 #: actions/apifriendshipscreate.php:110
 msgid "Could not follow user: profile not found."
-msgstr "Konnte Nutzer nicht folgen: Profil nicht gefunden"
+msgstr "Konnte Benutzer nicht folgen: Profil nicht gefunden"
 
 #: actions/apifriendshipscreate.php:119
 #, php-format
 msgid "Could not follow user: %s is already on your list."
-msgstr "Kann Nutzer %s nicht folgen: schon in deiner Kontaktliste eingetragen"
+msgstr ""
+"Kann Benutzer %s nicht folgen: schon in deiner Kontaktliste eingetragen"
 
 #: actions/apifriendshipsdestroy.php:110
 msgid "Could not unfollow user: User not found."
@@ -414,20 +415,20 @@ msgstr "Konnte keine Statusmeldungen finden."
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr ""
-"Der Nutzername darf nur aus Kleinbuchstaben und Ziffern bestehen. "
+"Der Benutzername darf nur aus Kleinbuchstaben und Zahlen bestehen. "
 "Leerzeichen sind nicht erlaubt."
 
 #: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
-msgstr "Nutzername wird bereits verwendet. Suche dir einen anderen aus."
+msgstr "Benutzername wird bereits verwendet. Suche dir einen anderen aus."
 
 #: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
-msgstr "Ungültiger Nutzername."
+msgstr "Ungültiger Benutzername."
 
 #: actions/apigroupcreate.php:200 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
@@ -484,18 +485,18 @@ msgid "Group not found."
 msgstr "Gruppe nicht gefunden!"
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:333
 msgid "You are already a member of that group."
 msgstr "Du bist bereits Mitglied dieser Gruppe"
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
 msgid "You have been blocked from that group by the admin."
-msgstr "Der Admin dieser Gruppe hat dich gesperrt."
+msgstr "Der Admin dieser Gruppe hat dich blockiert."
 
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:350
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Konnte Benutzer %1$s nicht der Gruppe %2$s hinzufügen."
@@ -507,7 +508,7 @@ msgstr "Du bist kein Mitglied dieser Gruppe."
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:126 actions/leavegroup.php:129
-#: lib/command.php:401
+#: lib/command.php:398
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Konnte Benutzer %1$s nicht aus der Gruppe %2$s entfernen."
@@ -576,7 +577,7 @@ msgstr "Datenbankfehler beim Löschen des OAuth Anwendungs Nutzers."
 
 #: actions/apioauthauthorize.php:185
 msgid "Database error inserting OAuth application user."
-msgstr "Datenbankfehler beim Einfügen des OAuth Programm Benutzers."
+msgstr "Datenbankfehler beim Einfügen des OAuth-Programm-Benutzers."
 
 #: actions/apioauthauthorize.php:214
 #, php-format
@@ -624,7 +625,7 @@ msgstr ""
 "vertrauenswürdigen Quellen Erlaubnis zu deinem %4$s Zugang geben."
 
 #. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:463
+#: actions/apioauthauthorize.php:310 lib/action.php:462
 msgid "Account"
 msgstr "Profil"
 
@@ -634,11 +635,11 @@ msgstr "Profil"
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:132
 msgid "Nickname"
-msgstr "Nutzername"
+msgstr "Benutzername"
 
 #. TRANS: Link description in user account settings menu.
 #: actions/apioauthauthorize.php:316 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:125
+#: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "Passwort"
 
@@ -668,12 +669,12 @@ msgid "No such notice."
 msgstr "Unbekannte Nachricht."
 
 #. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:84 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:535
 msgid "Cannot repeat your own notice."
 msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen."
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:541
 msgid "Already repeated that notice."
 msgstr "Nachricht bereits wiederholt"
 
@@ -709,7 +710,7 @@ msgstr ""
 "Die maximale Größe von Nachrichten ist %d Zeichen, inklusive der URL der "
 "Anhänge"
 
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
 msgid "Unsupported format."
 msgstr "Bildformat wird nicht unterstützt."
 
@@ -776,7 +777,7 @@ msgstr "Kein solcher Anhang."
 #: actions/grouplogo.php:86 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:121
 msgid "No nickname."
-msgstr "Kein Nutzername."
+msgstr "Kein Benutzername."
 
 #: actions/avatarbynickname.php:64
 msgid "No size."
@@ -788,7 +789,7 @@ msgstr "Ungültige Größe."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/avatarsettings.php:67 actions/showgroup.php:230
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:113
 msgid "Avatar"
 msgstr "Avatar"
 
@@ -820,7 +821,7 @@ msgid "Preview"
 msgstr "Vorschau"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:657
+#: lib/deleteuserform.php:66 lib/noticelist.php:667
 msgid "Delete"
 msgstr "Löschen"
 
@@ -906,9 +907,8 @@ msgid "Yes"
 msgstr "Ja"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
-#. TRANS: Submit button title.
 #. TRANS: Description of the form to block a user.
-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:79
 msgid "Block this user"
 msgstr "Diesen Benutzer blockieren"
 
@@ -927,8 +927,8 @@ msgstr "Konnte Blockierungsdaten nicht speichern."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
-#: lib/command.php:383
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:168
+#: lib/command.php:380
 msgid "No such group."
 msgstr "Keine derartige Gruppe."
 
@@ -948,7 +948,7 @@ msgstr "Liste der blockierten Benutzer in dieser Gruppe."
 
 #: actions/blockedfromgroup.php:288
 msgid "Unblock user from group"
-msgstr "Sperrung des Nutzers für die Gruppe aufheben."
+msgstr "Blockierung des Benutzers für die Gruppe aufheben."
 
 #. TRANS: Title for the form to unblock a user.
 #: actions/blockedfromgroup.php:320 lib/unblockform.php:70
@@ -1044,7 +1044,7 @@ msgstr "Du bist Besitzer dieses Programms"
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1315
+#: lib/action.php:1307
 msgid "There was a problem with your session token."
 msgstr "Es gab ein Problem mit deinem Sessiontoken."
 
@@ -1108,7 +1108,7 @@ msgid "Do not delete this notice"
 msgstr "Diese Nachricht nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:657
+#: actions/deletenotice.php:158 lib/noticelist.php:667
 msgid "Delete this notice"
 msgstr "Nachricht löschen"
 
@@ -1139,61 +1139,61 @@ msgstr "Diesen Benutzer löschen"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
+#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
 msgid "Design"
 msgstr "Design"
 
 #: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr "Design-Einstellungen für diese StatusNet-Website."
+msgid "Design settings for this StatusNet site"
+msgstr "Design-Einstellungen dieser StatusNet-Website"
 
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
 msgid "Invalid logo URL."
 msgstr "Ungültige URL für das Logo"
 
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
 #, php-format
 msgid "Theme not available: %s."
 msgstr "Theme nicht verfügbar: %s"
 
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
 msgid "Change logo"
 msgstr "Logo ändern"
 
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
 msgid "Site logo"
 msgstr "Seitenlogo"
 
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
 msgid "Change theme"
 msgstr "Theme ändern"
 
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
 msgid "Site theme"
 msgstr "Seitentheme"
 
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
 msgid "Theme for the site."
 msgstr "Theme dieser Seite."
 
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
 msgid "Custom theme"
 msgstr "Angepasster Skin"
 
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "Du kannst ein angepasstes StatusNet-Theme als .ZIP-Archiv hochladen."
 
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
 msgid "Change background image"
 msgstr "Hintergrundbild ändern"
 
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
 #: lib/designsettings.php:178
 msgid "Background"
 msgstr "Hintergrund"
 
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
@@ -1203,75 +1203,76 @@ msgstr ""
 "Dateigröße beträgt %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
 msgid "On"
 msgstr "An"
 
 #. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
 msgid "Off"
 msgstr "Aus"
 
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
 msgid "Turn background image on or off."
 msgstr "Hintergrundbild ein- oder ausschalten."
 
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
 msgid "Tile background image"
 msgstr "Hintergrundbild kacheln"
 
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
 msgid "Change colours"
 msgstr "Farben ändern"
 
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
 msgid "Content"
 msgstr "Inhalt"
 
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
 msgid "Sidebar"
 msgstr "Seitenleiste"
 
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
 msgid "Text"
 msgstr "Text"
 
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
 msgid "Links"
 msgstr "Links"
 
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
 msgid "Custom CSS"
 msgstr "Eigene CSS"
 
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
 msgid "Use defaults"
 msgstr "Standardeinstellungen benutzen"
 
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
 msgid "Restore default designs"
 msgstr "Standard-Design wiederherstellen"
 
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
 msgid "Reset back to default"
 msgstr "Standard wiederherstellen"
 
 #. TRANS: Submit button title.
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
+#: lib/groupeditform.php:202
 msgid "Save"
 msgstr "Speichern"
 
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
 msgid "Save design"
 msgstr "Design speichern"
 
@@ -1350,7 +1351,7 @@ msgstr "Antwort ist zu lang"
 msgid "Callback URL is not valid."
 msgstr "Antwort-URL ist nicht gültig"
 
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
 msgid "Could not update application."
 msgstr "Konnte Programm nicht aktualisieren."
 
@@ -1366,7 +1367,7 @@ msgstr "Du musst angemeldet sein, um eine Gruppe zu erstellen."
 #: actions/editgroup.php:107 actions/editgroup.php:172
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
 msgid "You must be an admin to edit the group."
-msgstr "Du musst ein Administrator sein, um die Gruppe zu bearbeiten"
+msgstr "Du musst ein Admin sein, um die Gruppe zu bearbeiten"
 
 #: actions/editgroup.php:158
 msgid "Use this form to edit the group."
@@ -1387,7 +1388,7 @@ msgid "Could not update group."
 msgstr "Konnte Gruppe nicht aktualisieren."
 
 #. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:264 classes/User_group.php:514
+#: actions/editgroup.php:264 classes/User_group.php:513
 msgid "Could not create aliases."
 msgstr "Konnte keinen Favoriten erstellen."
 
@@ -1443,7 +1444,7 @@ msgstr ""
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:347
+#: actions/smssettings.php:137 lib/applicationeditform.php:351
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -1564,7 +1565,7 @@ msgstr "Dies ist bereits deine E-Mail-Adresse."
 #. TRANS: Message given saving e-mail address that is already set for another user.
 #: actions/emailsettings.php:378
 msgid "That email address already belongs to another user."
-msgstr "Diese E-Mail-Adresse gehört einem anderen Nutzer."
+msgstr "Diese E-Mail-Adresse gehört bereits einem anderen Benutzer."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
@@ -1622,7 +1623,7 @@ msgstr "Keine Eingangs-E-Mail-Adresse."
 #: actions/emailsettings.php:508 actions/emailsettings.php:532
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
-msgstr "Konnte Nutzereintrag nicht schreiben"
+msgstr "Konnte Benutzereintrag nicht schreiben"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #: actions/emailsettings.php:512 actions/smssettings.php:581
@@ -1638,7 +1639,7 @@ msgstr "Neue Eingangs-E-Mail-Adresse hinzugefügt."
 msgid "This notice is already a favorite!"
 msgstr "Diese Nachricht ist bereits ein Favorit!"
 
-#: actions/favor.php:92 lib/disfavorform.php:140
+#: actions/favor.php:92 lib/disfavorform.php:144
 msgid "Disfavor favorite"
 msgstr "Aus Favoriten entfernen"
 
@@ -1727,7 +1728,7 @@ msgstr "Unerwartete Antwort!"
 
 #: actions/finishremotesubscribe.php:80
 msgid "User being listened to does not exist."
-msgstr "Aufgeführte Nutzer existiert nicht."
+msgstr "Aufgeführter Benutzer existiert nicht."
 
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
@@ -1775,7 +1776,7 @@ msgstr "Auf dieser Seite können keine Benutzerrollen gewährt werden."
 
 #: actions/grantrole.php:82
 msgid "User already has this role."
-msgstr "Nutzer hat bereits diese Aufgabe"
+msgstr "Benutzer hat bereits diese Aufgabe"
 
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1796,15 +1797,15 @@ msgstr "Keine Gruppe angegeben"
 
 #: actions/groupblock.php:91
 msgid "Only an admin can block group members."
-msgstr "Nur ein Administrator kann Mitglieder der Gruppe sperren."
+msgstr "Nur ein Admin kann Mitglieder der Gruppe blockieren."
 
 #: actions/groupblock.php:95
 msgid "User is already blocked from group."
-msgstr "Dieser Nutzer ist bereits von der Gruppe gesperrt"
+msgstr "Dieser Benutzer ist bereits von der Gruppe blockiert"
 
 #: actions/groupblock.php:100
 msgid "User is not a member of group."
-msgstr "Nutzer ist kein Mitglied dieser Gruppe."
+msgstr "Benutzer ist kein Mitglied dieser Gruppe."
 
 #: actions/groupblock.php:134 actions/groupmembers.php:364
 msgid "Block user from group"
@@ -1829,11 +1830,12 @@ msgstr "Diesen Benutzerzugang nicht für diese Gruppe blockieren."
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:189
 msgid "Block this user from this group"
-msgstr "Diesen Nutzer von der Gruppe sperren"
+msgstr "Diesen Benutzer von der Gruppe blockieren"
 
 #: actions/groupblock.php:206
 msgid "Database error blocking user from group."
-msgstr "Datenbankfehler beim Versuch den Nutzer aus der Gruppe zu blockieren."
+msgstr ""
+"Datenbankfehler beim Versuch den Benutzer aus der Gruppe zu blockieren."
 
 #: actions/groupbyid.php:74 actions/userbyid.php:70
 msgid "No ID."
@@ -1910,15 +1912,39 @@ msgstr "Liste der Benutzer in dieser Gruppe."
 msgid "Admin"
 msgstr "Admin"
 
+#. TRANS: Button text for the form that will block a user from a group.
+#: actions/groupmembers.php:399
+msgctxt "BUTTON"
+msgid "Block"
+msgstr "Blockieren"
+
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr "Diesen Benutzer blockieren"
+
 #: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "Benutzer zu einem Admin dieser Gruppe ernennen"
 
+#. TRANS: Button text for the form that will make a user administrator.
+#: actions/groupmembers.php:533
+msgctxt "BUTTON"
+msgid "Make Admin"
+msgstr "Zum Admin ernennen"
+
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:537
+msgctxt "TOOLTIP"
+msgid "Make this user an admin"
+msgstr "Diesen Benutzer zum Admin ernennen"
+
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
 #: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:68
 #, php-format
 msgid "%s timeline"
 msgstr "%s Zeitleiste"
@@ -1964,7 +1990,7 @@ msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"Durchsuche die Namen, Orte oder Interessen der Nutzer von %%site.name%%. "
+"Durchsuche die Namen, Orte oder Interessen der Benutzer von %%site.name%%. "
 "Trenne mehrere Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss aus "
 "mindestens 3 Zeichen bestehen."
 
@@ -1997,11 +2023,11 @@ msgstr ""
 
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
-msgstr "Nur Administratoren können Gruppenmitglieder entsperren."
+msgstr "Nur Admins können Blockierungen von Gruppenmitglieder aufheben."
 
 #: actions/groupunblock.php:95
 msgid "User is not blocked from group."
-msgstr "Dieser Nutzer ist nicht von der Gruppe gesperrt."
+msgstr "Dieser Benutzer ist nicht von der Gruppe blockiert."
 
 #: actions/groupunblock.php:128 actions/unblock.php:86
 msgid "Error removing the block."
@@ -2204,7 +2230,7 @@ msgstr "Du hast diese Benutzer bereits abonniert:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:426
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2213,7 +2239,7 @@ msgstr "%1$s (%2$s)"
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
-"Diese Leute sind bereits registrierte Benutzer und du hast Sie automatisch "
+"Diese Leute sind bereits registrierte Benutzer und du hast sie automatisch "
 "abonniert."
 
 #: actions/invite.php:144
@@ -2299,7 +2325,7 @@ msgid ""
 msgstr ""
 "%1$s hat dich eingeladen, auch bei %2$s mitzumachen. (%3$s).\n"
 "\n"
-"%2$s ist ein Microblogging-Service, der dich über deine Freunde auf dem "
+"%2$s ist ein Mikroblogging-Service, der dich über deine Freunde auf dem "
 "Laufenden hält und deine Freunde über dich informiert. \n"
 "\n"
 "Du kannst Neuigkeiten über dich und deine Gedanken verbreiten. Lerne neue "
@@ -2341,7 +2367,7 @@ msgid "You must be logged in to leave a group."
 msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten."
 
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:389
+#: actions/leavegroup.php:100 lib/command.php:386
 msgid "You are not a member of that group."
 msgstr "Du bist kein Mitglied dieser Gruppe."
 
@@ -2350,6 +2376,112 @@ msgstr "Du bist kein Mitglied dieser Gruppe."
 msgid "%1$s left group %2$s"
 msgstr "%1$s hat die Gruppe %2$s verlassen"
 
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr "Lizenz"
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr "Lizenz dieser StatusNet-Website"
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr "Ungültige Lizenzauswahl."
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr ""
+"Du musst den Besitzer des Inhalts angeben, wenn du „Alle Rechte vorbehalten“ "
+"wählst."
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr "Ungültiger Lizenztitel. Die maximale Länge liegt bei 255 Zeichen."
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr "Ungültige Lizenz-URL."
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr "Ungültige Lizenz-Bild-URL."
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr "Lizenz-URL muss leer oder eine gültige URL sein."
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr "Lizenz-Bild muss leer oder eine gültige URL sein."
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr "Lizenzauswahl"
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr "Privat"
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr "Alle Rechte vorbehalten"
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr "Creative Commons"
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr "Typ"
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr "Lizenz auswählen"
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr "Lizenz-Details"
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr "Besitzer"
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr "Name von dem Besitzer des Inhalts dieser Website (falls notwendig)"
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr "Lizenz-Titel"
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr "Der Titel der Lizenz."
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr "Lizenz-URL"
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr "URL mit weiteren Informationen über die Lizenz."
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr "Lizenz-Bild-URl"
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr "URL eines mit der Lizenz anzuzeigenden Bildes."
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr "Lizenz-Einstellungen speichern"
+
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Bereits angemeldet."
@@ -2393,24 +2525,24 @@ msgstr ""
 
 #: actions/login.php:292
 msgid "Login with your username and password."
-msgstr "Mit Nutzernamen und Passwort anmelden."
+msgstr "Mit Benutzernamen und Passwort anmelden."
 
 #: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
-"Du hast noch keinen Nutzernamen? [Registriere](%%action.register%%) ein "
+"Du hast noch keinen Benutzernamen? [Registriere](%%action.register%%) ein "
 "neues Konto."
 
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
-msgstr "Nur Administratoren können andere Nutzer zu Administratoren ernennen."
+msgstr "Nur Admins können andere Benutzer zu Admins ernennen."
 
 #: actions/makeadmin.php:96
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "%1$s ist bereits Administrator der Gruppe „%2$s“."
+msgstr "%1$s ist bereits Admin der Gruppe „%2$s“."
 
 #: actions/makeadmin.php:133
 #, php-format
@@ -2420,7 +2552,7 @@ msgstr "Konnte keinen Mitgliedseintrag für %1$s aus Gruppe %2$s empfangen."
 #: actions/makeadmin.php:146
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
-msgstr "Konnte %1$s nicht zum Administrator der Gruppe %2$s machen"
+msgstr "Konnte %1$s nicht zum Admin der Gruppe %2$s machen"
 
 #: actions/microsummary.php:69
 msgid "No current status."
@@ -2459,14 +2591,14 @@ msgid "New message"
 msgstr "Neue Nachricht"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:499
 msgid "You can't send a message to this user."
 msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
-#: lib/command.php:582
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:478
+#: lib/command.php:579
 msgid "No content!"
 msgstr "Kein Inhalt!"
 
@@ -2475,7 +2607,7 @@ msgid "No recipient specified."
 msgstr "Kein Empfänger angegeben."
 
 #. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:164 lib/command.php:506
+#: actions/newmessage.php:164 lib/command.php:503
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2487,12 +2619,12 @@ msgstr "Nachricht gesendet"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:185 lib/command.php:514
+#: actions/newmessage.php:185 lib/command.php:511
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direkte Nachricht an %s abgeschickt"
 
-#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261
 msgid "Ajax Error"
 msgstr "Ajax-Fehler"
 
@@ -2589,10 +2721,9 @@ msgid "Connected applications"
 msgstr "Verbundene Programme"
 
 #: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
+msgid "You have allowed the following applications to access your account."
 msgstr ""
-"Du hast das folgende Programm die Erlaubnis erteilt sich mit deinem Profil "
-"zu verbinden."
+"Du hast den folgenden Programmen erlaubt, auf dein Benutzerkonto zuzugreifen."
 
 #: actions/oauthconnectionssettings.php:175
 msgid "You are not a user of that application."
@@ -2606,7 +2737,7 @@ msgstr "Kann Zugang dieses Programm nicht entfernen: %s."
 #: actions/oauthconnectionssettings.php:198
 msgid "You have not authorized any applications to use your account."
 msgstr ""
-"Du hast noch keinem Programm die Erlaubnis gegeben dein Profil zu benutzen."
+"Du hast noch keinem Programm die Erlaubnis gegeben, dein Profil zu benutzen."
 
 #: actions/oauthconnectionssettings.php:211
 msgid "Developers can edit the registration settings for their applications "
@@ -2617,7 +2748,7 @@ msgstr ""
 msgid "Notice has no profile."
 msgstr "Nachricht hat kein Profil"
 
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "Status von %1$s auf %2$s"
@@ -2635,14 +2766,14 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Bitte nur %s URLs über einfaches HTTP."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1356
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
+#: lib/apiaction.php:1227 lib/apiaction.php:1350
 msgid "Not a supported data format."
 msgstr "Kein unterstütztes Datenformat."
 
 #: actions/opensearch.php:64
 msgid "People Search"
-msgstr "Suche nach Nutzern"
+msgstr "Suche nach Benutzern"
 
 #: actions/opensearch.php:67
 msgid "Notice Search"
@@ -2670,7 +2801,7 @@ msgstr "URL-Auto-Kürzungs-Dienst."
 
 #: actions/othersettings.php:122
 msgid "View profile designs"
-msgstr "Profil-Einstellungen ansehen"
+msgstr "Profil-Designs ansehen"
 
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
@@ -2682,7 +2813,7 @@ msgstr "URL-Auto-Kürzungs-Dienst ist zu lang (max. 50 Zeichen)."
 
 #: actions/otp.php:69
 msgid "No user ID specified."
-msgstr "Keine Benutzer ID angegeben"
+msgstr "Keine Benutzer-ID angegeben"
 
 #: actions/otp.php:83
 msgid "No login token specified."
@@ -2766,7 +2897,7 @@ msgstr "Altes Passwort falsch"
 
 #: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
-msgstr "Fehler beim Speichern des Nutzers, ungültig."
+msgstr "Fehler beim Speichern des Benutzers, ungültig."
 
 #: actions/passwordsettings.php:186 actions/recoverpassword.php:381
 msgid "Can't save new password."
@@ -2782,8 +2913,8 @@ msgid "Paths"
 msgstr "Pfad"
 
 #: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "Pfad- und Serverangaben für diese StatusNet-Website."
+msgid "Path and server settings for this StatusNet site"
+msgstr "Pfad- und Servereinstellungen dieser StatusNet-Website"
 
 #: actions/pathsadminpanel.php:157
 #, php-format
@@ -2935,13 +3066,13 @@ msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"Durchsuche die Namen, Orte oder Interessen der Nutzer von %%site.name%%. "
+"Durchsuche die Namen, Orte oder Interessen der Benutzer von %%site.name%%. "
 "Trenne mehrere Suchbegriffe durch Leerzeichen. Ein Suchbegriff muss aus "
 "mindestens 3 Zeichen bestehen."
 
 #: actions/peoplesearch.php:58
 msgid "People search"
-msgstr "Suche nach anderen Nutzern"
+msgstr "Suche nach anderen Benutzern"
 
 #: actions/peopletag.php:68
 #, php-format
@@ -2981,7 +3112,7 @@ msgstr "Profilinformation"
 
 #: actions/profilesettings.php:108 lib/groupeditform.php:154
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1-64 Kleinbuchstaben oder Ziffern, keine Sonder- oder Leerzeichen"
+msgstr "1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen"
 
 #: actions/profilesettings.php:111 actions/register.php:455
 #: actions/showgroup.php:256 actions/tagother.php:104
@@ -2991,14 +3122,15 @@ msgstr "Vollständiger Name"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:235 lib/groupeditform.php:161
+#: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "Homepage"
 
 #: actions/profilesettings.php:117 actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
-"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen Site"
+"URL deiner Homepage, deines Blogs, oder deines Profils auf einer anderen "
+"Website"
 
 #: actions/profilesettings.php:122 actions/register.php:468
 #, php-format
@@ -3175,8 +3307,8 @@ msgid ""
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool."
 msgstr ""
-"Dies ist %%site.name%%, ein [Mikro-blogging-Dienst](http://de.wikipedia.org/"
-"wiki/Mikro-blogging) basierend auf der freien Software [StatusNet](http://"
+"Dies ist %%site.name%%, ein [Mikroblogging](http://de.wikipedia.org/wiki/"
+"Mikroblogging)-Dienst basierend auf der freien Software [StatusNet](http://"
 "status.net/)."
 
 #: actions/publictagcloud.php:57
@@ -3226,7 +3358,7 @@ msgstr "Kein Wiederherstellungscode."
 
 #: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
-msgstr "Wiederherstellungscode für unbekannten Nutzer."
+msgstr "Wiederherstellungscode für unbekannten Benutzer."
 
 #: actions/recoverpassword.php:86
 msgid "Error with confirmation code."
@@ -3302,7 +3434,7 @@ msgstr "Kein Benutzer mit dieser E-Mail-Adresse oder mit diesem Nutzernamen."
 
 #: actions/recoverpassword.php:299
 msgid "No registered email address for that user."
-msgstr "Der Nutzer hat keine registrierte E-Mail-Adresse."
+msgstr "Der Benutzer hat keine registrierte E-Mail-Adresse."
 
 #: actions/recoverpassword.php:313
 msgid "Error saving address confirmation."
@@ -3330,7 +3462,7 @@ msgstr "Passwort und seine Bestätigung stimmen nicht überein."
 
 #: actions/recoverpassword.php:388 actions/register.php:255
 msgid "Error setting user."
-msgstr "Fehler bei den Nutzereinstellungen."
+msgstr "Fehler bei den Benutzereinstellungen."
 
 #: actions/recoverpassword.php:395
 msgid "New password successfully saved. You are now logged in."
@@ -3354,7 +3486,7 @@ msgstr "Registrieren"
 
 #: actions/register.php:142
 msgid "Registration not allowed."
-msgstr "Registrierung nicht gestattet"
+msgstr "Registrierung nicht erlaubt"
 
 #: actions/register.php:205
 msgid "You can't register if you don't agree to the license."
@@ -3380,8 +3512,7 @@ msgstr ""
 #: actions/register.php:432
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
-"1-64 kleingeschriebene Buchstaben oder Zahlen, keine Satz- oder Leerzeichen. "
-"Pflicht."
+"1-64 Kleinbuchstaben oder Zahlen, keine Satz- oder Leerzeichen. Pflicht."
 
 #: actions/register.php:437
 msgid "6 or more characters. Required."
@@ -3393,7 +3524,7 @@ msgstr "Gleiches Passwort wie zuvor. Pflichteingabe."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
 msgid "Email"
 msgstr "E-Mail"
 
@@ -3489,7 +3620,7 @@ msgid ""
 msgstr ""
 "Für ein Abonnement kannst du dich entweder [anmelden](%%action.login%%) oder "
 "ein neues Konto [registrieren](%%action.register%%). Wenn du schon ein Konto "
-"auf einer [kompatiblen Microbloggingsite](%%doc.openmublog%%) hast, dann gib "
+"auf einer [kompatiblen Mikrobloggingsite](%%doc.openmublog%%) hast, dann gib "
 "deine Profil-URL unten an."
 
 #: actions/remotesubscribe.php:112
@@ -3506,7 +3637,7 @@ msgstr "Benutzername"
 
 #: actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
-msgstr "Nutzername des Nutzers, dem du folgen möchtest"
+msgstr "Name des Benutzers, dem du folgen möchtest"
 
 #: actions/remotesubscribe.php:133
 msgid "Profile URL"
@@ -3514,7 +3645,7 @@ msgstr "Profil-URL"
 
 #: actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
-msgstr "Profil-URL bei einem anderen kompatiblen Microbloggingdienst"
+msgstr "Profil-URL bei einem anderen kompatiblen Mikrobloggingdienst"
 
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139
 #: lib/userprofile.php:406
@@ -3540,7 +3671,7 @@ msgstr "Konnte keinen Anfrage-Token bekommen."
 
 #: actions/repeat.php:57
 msgid "Only logged-in users can repeat notices."
-msgstr "Nur angemeldete Nutzer können Nachrichten wiederholen."
+msgstr "Nur angemeldete Benutzer können Nachrichten wiederholen."
 
 #: actions/repeat.php:64 actions/repeat.php:71
 msgid "No notice specified."
@@ -3554,7 +3685,7 @@ msgstr "Du kannst deine eigene Nachricht nicht wiederholen."
 msgid "You already repeated that notice."
 msgstr "Nachricht bereits wiederholt"
 
-#: actions/repeat.php:114 lib/noticelist.php:676
+#: actions/repeat.php:114 lib/noticelist.php:686
 msgid "Repeated"
 msgstr "Wiederholt"
 
@@ -3603,7 +3734,7 @@ msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
-"Du kannst andere Nutzer ansprechen, mehr Leuten folgen oder [Gruppen "
+"Du kannst andere Benutzer ansprechen, mehr Leuten folgen oder [Gruppen "
 "beitreten](%%action.groups%%)."
 
 #: actions/replies.php:206
@@ -3622,7 +3753,7 @@ msgstr "Antworten an %1$s auf %2$s!"
 
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
-msgstr "Du kannst die Rollen von Nutzern dieser Seite nicht widerrufen."
+msgstr "Du kannst die Rollen von Benutzern dieser Seite nicht widerrufen."
 
 #: actions/revokerole.php:82
 msgid "User doesn't have this role."
@@ -3647,8 +3778,8 @@ msgid "Sessions"
 msgstr "Sitzung"
 
 #: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "Sitzungs-Einstellungen für diese StatusNet-Website."
+msgid "Session settings for this StatusNet site"
+msgstr "Sitzungs-Einstellungen dieser StatusNet-Website"
 
 #: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
@@ -3667,9 +3798,8 @@ msgid "Turn on debugging output for sessions."
 msgstr "Fehleruntersuchung für Sitzungen aktivieren"
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
 msgid "Save site settings"
-msgstr "Site-Einstellungen speichern"
+msgstr "Website-Einstellungen speichern"
 
 #: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
@@ -3691,20 +3821,20 @@ msgid "Name"
 msgstr "Name"
 
 #. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:226
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
 msgid "Organization"
 msgstr "Organisation"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:207 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Beschreibung"
 
 #: actions/showapplication.php:192 actions/showgroup.php:436
 #: lib/profileaction.php:187
 msgid "Statistics"
-msgstr "Statistiken"
+msgstr "Statistik"
 
 #: actions/showapplication.php:203
 #, php-format
@@ -3815,7 +3945,7 @@ msgstr "Dies ist ein Weg, Dinge zu teilen, die dir gefallen."
 #: actions/showgroup.php:82
 #, php-format
 msgid "%s group"
-msgstr "%s Gruppe"
+msgstr "%s-Gruppe"
 
 #: actions/showgroup.php:84
 #, php-format
@@ -3891,8 +4021,8 @@ msgid ""
 "their life and interests. [Join now](%%%%action.register%%%%) to become part "
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
-"**%s** ist eine Gruppe auf %%%%site.name%%%%, einem [micro-blogging](http://"
-"en.wikipedia.org/wiki/Micro-blogging) Dienst auf Basis der freien Software "
+"**%s** ist eine Gruppe auf %%%%site.name%%%%, einem [Mikroblogging](http://"
+"de.wikipedia.org/wiki/Mikroblogging)-Dienst auf Basis der freien Software "
 "[StatusNet](http://status.net/). [Werde Mitglied](%%%%action.register%%%%) "
 "und werde Teil der Gruppe und vielen anderen! ([Mehr Informationen](%%%%doc."
 "help%%%%))"
@@ -3905,14 +4035,14 @@ msgid ""
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
 "their life and interests. "
 msgstr ""
-"**%s** ist eine Benutzergruppe auf %%%%site.name%%%%, einem [Mikro-blogging-"
-"Dienst](http://de.wikipedia.org/wiki/Mikro-blogging) basierend auf der "
-"freien Software [StatusNet](http://status.net/). Seine Mitglieder erstellen "
-"kurze Nachrichten über ihr Leben und Interessen. "
+"**%s** ist eine Benutzergruppe auf %%%%site.name%%%%, einem [Mikroblogging]"
+"(http://de.wikipedia.org/wiki/Mikroblogging)-Dienst basierend auf der freien "
+"Software [StatusNet](http://status.net/). Seine Mitglieder erstellen kurze "
+"Nachrichten über ihr Leben und Interessen. "
 
 #: actions/showgroup.php:489
 msgid "Admins"
-msgstr "Administratoren"
+msgstr "Admins"
 
 #: actions/showmessage.php:81
 msgid "No such message."
@@ -3995,7 +4125,7 @@ msgstr ""
 "Du kannst %1$s in seinem Profil einen Stups geben oder [ihm etwas posten](%%%"
 "%action.newnotice%%%%?status_textarea=%s)."
 
-#: actions/showstream.php:243
+#: actions/showstream.php:246
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -4003,35 +4133,35 @@ msgid ""
 "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
-"**%s** ist Mitglied bei %%%%site.name%%%%, einem [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) Dienst auf Basis der freien Software "
+"**%s** ist Mitglied bei %%%%site.name%%%%, einem [Mikroblogging](http://de."
+"wikipedia.org/wiki/Mikroblogging)-Dienst auf Basis der freien Software "
 "[StatusNet](http://status.net/). [Werde Mitglied](%%%%action.register%%%%) "
 "um **%s**'s und vielen anderen zu folgen! ([Mehr Informationen](%%%%doc.help%"
 "%%%))"
 
-#: actions/showstream.php:248
+#: actions/showstream.php:251
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
-"**%s** hat ein Konto auf %%%%site.name%%%%, einem [Mikro-blogging-Dienst]"
-"(http://de.wikipedia.org/wiki/Mikro-blogging) basierend auf der freien "
-"Software [StatusNet](http://status.net/). "
+"**%s** hat ein Konto auf %%%%site.name%%%%, einem [Mikroblogging](http://de."
+"wikipedia.org/wiki/Mikroblogging)-Dienst basierend auf der freien Software "
+"[StatusNet](http://status.net/). "
 
-#: actions/showstream.php:305
+#: actions/showstream.php:308
 #, php-format
 msgid "Repeat of %s"
 msgstr "Wiederholung von %s"
 
 #: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
-msgstr "Du kannst Nutzer dieser Seite nicht ruhig stellen."
+msgstr "Du kannst Benutzer dieser Seite nicht ruhig stellen."
 
 #: actions/silence.php:72
 msgid "User is already silenced."
-msgstr "Nutzer ist bereits ruhig gestellt."
+msgstr "Benutzer ist bereits ruhig gestellt."
 
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
@@ -4068,7 +4198,7 @@ msgstr "Seitenname"
 
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr "Der Name deiner Seite, sowas wie „DeinUnternehmen-Microblog“"
+msgstr "Der Name deiner Seite, sowas wie „DeinUnternehmen-Mikroblog“"
 
 #: actions/siteadminpanel.php:229
 msgid "Brought by"
@@ -4090,7 +4220,7 @@ msgstr ""
 
 #: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
-msgstr "Kontakt-E-Mail-Adresse für deine Site."
+msgstr "Kontakt-E-Mail-Adresse für deine Website."
 
 #: actions/siteadminpanel.php:245
 msgid "Local"
@@ -4486,7 +4616,7 @@ msgstr "%s hat niemanden abonniert."
 msgid "Jabber"
 msgstr "Jabber"
 
-#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222
 msgid "SMS"
 msgstr "SMS"
 
@@ -4590,73 +4720,77 @@ msgstr ""
 "$s“."
 
 #. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
 msgctxt "TITLE"
 msgid "User"
 msgstr "Benutzer"
 
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr "Nutzer-Einstellungen dieser StatusNet-Seite."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
+msgstr "Benutzer-Einstellungen dieser StatusNet-Website"
 
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
 msgid "Invalid bio limit. Must be numeric."
 msgstr "Das Zeichenlimit der Biografie muss numerisch sein!"
 
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
 msgid "Invalid welcome text. Max length is 255 characters."
 msgstr "Willkommens-Nachricht ungültig. Maximale Länge sind 255 Zeichen."
 
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
 #, php-format
 msgid "Invalid default subscripton: '%1$s' is not user."
 msgstr "Ungültiges Abonnement: „%1$s“ ist kein Benutzer"
 
 #. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "Profil"
 
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
 msgid "Bio Limit"
 msgstr "Bio-Limit"
 
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
 msgid "Maximum length of a profile bio in characters."
 msgstr "Maximale Länge in Zeichen der Profil-Bio."
 
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
 msgid "New users"
-msgstr "Neue Nutzer"
+msgstr "Neue Benutzer"
 
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
 msgid "New user welcome"
 msgstr "Neue Benutzer empfangen"
 
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
 msgid "Welcome text for new users (Max 255 chars)."
-msgstr "Willkommens-Nachricht für neue Nutzer (maximal 255 Zeichen)."
+msgstr "Willkommens-Nachricht für neue Benutzer (maximal 255 Zeichen)."
 
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
 msgid "Default subscription"
 msgstr "Standard-Abonnement"
 
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
 msgid "Automatically subscribe new users to this user."
-msgstr "Neue Nutzer abonnieren automatisch diesen Nutzer"
+msgstr "Neue Benutzer abonnieren automatisch diesen Benutzer"
 
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
 msgid "Invitations"
 msgstr "Einladungen"
 
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
 msgid "Invitations enabled"
 msgstr "Einladungen aktivieren"
 
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
 msgid "Whether to allow users to invite new users."
-msgstr "Ist es Nutzern erlaubt neue Nutzer einzuladen."
+msgstr "Ist es Benutzern erlaubt, neue Benutzer einzuladen."
+
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr "Benutzer-Einstellungen speichern"
 
 #: actions/userauthorization.php:105
 msgid "Authorize subscription"
@@ -4669,10 +4803,12 @@ msgid ""
 "click “Reject”."
 msgstr ""
 "Bitte überprüfe diese Angaben, um sicher zu gehen, dass du die Nachrichten "
-"dieses Nutzers abonnieren möchtest. Wenn du das nicht wolltest, klicke auf "
+"dieses Benutzers abonnieren möchtest. Wenn du das nicht wolltest, klicke auf "
 "„Abbrechen“."
 
+#. TRANS: Menu item for site administration
 #: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
 msgid "License"
 msgstr "Lizenz"
 
@@ -4803,7 +4939,7 @@ msgstr ""
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
 #: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:76
+#: lib/atomusernoticefeed.php:75
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "Aktualisierungen von %1$s auf %2$s!"
@@ -4864,7 +5000,7 @@ msgid "Plugins"
 msgstr "Erweiterungen"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:805
+#: actions/version.php:198 lib/action.php:802
 msgid "Version"
 msgstr "Version"
 
@@ -4872,20 +5008,32 @@ msgstr "Version"
 msgid "Author(s)"
 msgstr "Autor(en)"
 
+#. TRANS: Activity title when marking a notice as favorite.
+#: classes/Fave.php:148 lib/favorform.php:143
+msgid "Favor"
+msgstr "Zu Favoriten hinzufügen"
+
+#. TRANS: Ntofication given when a user marks a notice as favorite.
+#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
+#: classes/Fave.php:151
+#, fuzzy, php-format
+msgid "%1$s marked notice %2$s as a favorite."
+msgstr "%s (@%s) hat deine Nachricht als Favorit gespeichert"
+
 #. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:143
+#: classes/File.php:142
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "Die URL „%s“ konnte nicht verarbeitet werden"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:175
+#: classes/File.php:174
 msgid "Robin thinks something is impossible."
 msgstr "Robin denkt, dass etwas unmöglich ist."
 
 #. TRANS: Message given if an upload is larger than the configured maximum.
 #. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#: classes/File.php:190
+#: classes/File.php:189
 #, php-format
 msgid ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
@@ -4896,14 +5044,14 @@ msgstr ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.
-#: classes/File.php:202
+#: classes/File.php:201
 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
 msgstr "Eine Datei dieser Größe überschreitet deine User Quota von %d Byte."
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes.
-#: classes/File.php:211
+#: classes/File.php:210
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
@@ -4911,7 +5059,7 @@ msgstr ""
 "überschreiten."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
+#: classes/File.php:247 classes/File.php:262
 msgid "Invalid filename."
 msgstr "Ungültiger Dateiname."
 
@@ -4930,6 +5078,32 @@ msgstr "Nicht Mitglied der Gruppe"
 msgid "Group leave failed."
 msgstr "Konnte Gruppe nicht verlassen"
 
+#. TRANS: Exception thrown providing an invalid profile ID.
+#. TRANS: %s is the invalid profile ID.
+#: classes/Group_member.php:76
+#, php-format
+msgid "Profile ID %s is invalid."
+msgstr ""
+
+#. TRANS: Exception thrown providing an invalid group ID.
+#. TRANS: %s is the invalid group ID.
+#: classes/Group_member.php:89
+#, fuzzy, php-format
+msgid "Group ID %s is invalid."
+msgstr "Fehler beim Speichern des Benutzers, ungültig."
+
+#. TRANS: Activity title.
+#: classes/Group_member.php:113 lib/joinform.php:114
+msgid "Join"
+msgstr "Beitreten"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:117
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr "%1$s ist der Gruppe „%2$s“ beigetreten."
+
 #. TRANS: Server exception thrown when updating a local group fails.
 #: classes/Local_group.php:42
 msgid "Could not update local group."
@@ -4948,17 +5122,17 @@ msgid "No database name or DSN found anywhere."
 msgstr "Nirgendwo einen Datenbanknamen oder DSN gefunden."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:46
+#: classes/Message.php:45
 msgid "You are banned from sending direct messages."
 msgstr "Direktes Senden von Nachrichten wurde blockiert"
 
 #. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:63
+#: classes/Message.php:62
 msgid "Could not insert message."
 msgstr "Konnte Nachricht nicht einfügen."
 
 #. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:74
+#: classes/Message.php:73
 msgid "Could not update message with new URI."
 msgstr "Konnte Nachricht nicht mit neuer URI versehen."
 
@@ -5015,26 +5189,33 @@ msgid "Problem saving notice."
 msgstr "Problem bei Speichern der Nachricht."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:907
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 "Der Methode saveKnownGroups wurde ein schlechter Wert zur Verfügung gestellt"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1006
 msgid "Problem saving group inbox."
 msgstr "Problem bei Speichern der Nachricht."
 
+#. TRANS: Server exception thrown when a reply cannot be saved.
+#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
+#: classes/Notice.php:1120
+#, fuzzy, php-format
+msgid "Could not save reply for %1$d, %2$d."
+msgstr "Konnte die lokale Gruppen Information nicht speichern."
+
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1822
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:737
+#: classes/Profile.php:785
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr ""
@@ -5043,7 +5224,7 @@ msgstr ""
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:746
+#: classes/Profile.php:794
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
@@ -5056,7 +5237,7 @@ msgid "Missing profile."
 msgstr "Benutzer hat kein Profil."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
 msgid "Unable to save tag."
 msgstr "Konnte Seitenbenachrichtigung nicht speichern."
 
@@ -5075,6 +5256,12 @@ msgstr "Bereits abonniert!"
 msgid "User has blocked you."
 msgstr "Dieser Benutzer hat dich blockiert."
 
+#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
+#: classes/Subscription.php:171
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "Nicht abonniert!"
+
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
 msgid "Could not delete self-subscription."
@@ -5090,65 +5277,77 @@ msgstr "Konnte OMB-Abonnement-Token nicht löschen."
 msgid "Could not delete subscription."
 msgstr "Konnte Abonnement nicht löschen."
 
+#. TRANS: Activity tile when subscribing to another person.
+#: classes/Subscription.php:255
+msgid "Follow"
+msgstr "Folgen"
+
+#. TRANS: Notification given when one person starts following another.
+#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
+#: classes/Subscription.php:258
+#, fuzzy, php-format
+msgid "%1$s is now following %2$s."
+msgstr "%1$s ist der Gruppe „%2$s“ beigetreten."
+
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Herzlich willkommen bei %1$s, @%2$s!"
 
 #. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:496
+#: classes/User_group.php:495
 msgid "Could not create group."
 msgstr "Konnte Gruppe nicht erstellen."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:506
+#: classes/User_group.php:505
 msgid "Could not set group URI."
 msgstr "Konnte die Gruppen-URI nicht setzen."
 
 #. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:529
+#: classes/User_group.php:528
 msgid "Could not set group membership."
 msgstr "Konnte Gruppenmitgliedschaft nicht setzen."
 
 #. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:543
 msgid "Could not save local group info."
 msgstr "Konnte die lokale Gruppen Information nicht speichern."
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:109
+#: lib/accountsettingsaction.php:104
 msgid "Change your profile settings"
 msgstr "Ändern der Profileinstellungen"
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:116
+#: lib/accountsettingsaction.php:111
 msgid "Upload an avatar"
 msgstr "Avatar hochladen"
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:118
 msgid "Change your password"
 msgstr "Ändere dein Passwort"
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:130
+#: lib/accountsettingsaction.php:125
 msgid "Change email handling"
 msgstr "Ändere die E-Mail-Verarbeitung"
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:137
+#: lib/accountsettingsaction.php:132
 msgid "Design your profile"
 msgstr "Passe dein Profil an"
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:144
+#: lib/accountsettingsaction.php:139
 msgid "Other options"
 msgstr "Sonstige Optionen"
 
 #. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:146
+#: lib/accountsettingsaction.php:141
 msgid "Other"
 msgstr "Sonstige"
 
@@ -5164,184 +5363,185 @@ msgid "Untitled page"
 msgstr "Seite ohne Titel"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:449
+#: lib/action.php:448
 msgid "Primary site navigation"
 msgstr "Hauptnavigation"
 
 #. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:455
+#: lib/action.php:454
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "Persönliches Profil und Freundes-Zeitleiste"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:458
+#: lib/action.php:457
 msgctxt "MENU"
 msgid "Personal"
 msgstr "Eigene"
 
 #. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:460
+#: lib/action.php:459
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "Ändere deine E-Mail, Avatar, Passwort und Profil"
 
 #. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:465
+#: lib/action.php:464
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "Zum Dienst verbinden"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:468
+#: lib/action.php:467
 msgid "Connect"
 msgstr "Verbinden"
 
 #. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:471
+#: lib/action.php:470
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Seiteneinstellung ändern"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#: lib/action.php:474 lib/groupnav.php:117
+#: lib/action.php:473 lib/groupnav.php:117
 msgctxt "MENU"
 msgid "Admin"
-msgstr "Administrator"
+msgstr "Admin"
 
 #. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:478
+#: lib/action.php:477
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Lade Freunde und Kollegen ein dir auf %s zu folgen"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:481
+#: lib/action.php:480
 msgctxt "MENU"
 msgid "Invite"
 msgstr "Einladen"
 
 #. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:487
+#: lib/action.php:486
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "Von der Seite abmelden"
 
 #. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:490
+#: lib/action.php:489
 msgctxt "MENU"
 msgid "Logout"
 msgstr "Abmelden"
 
 #. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:495
+#: lib/action.php:494
 msgctxt "TOOLTIP"
 msgid "Create an account"
-msgstr "Neues Konto erstellen"
+msgstr "Neues Benutzerkonto erstellen"
 
 #. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:498
+#: lib/action.php:497
 msgctxt "MENU"
 msgid "Register"
 msgstr "Registrieren"
 
 #. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:501
+#: lib/action.php:500
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "Auf der Seite anmelden"
 
-#: lib/action.php:504
+#: lib/action.php:503
 msgctxt "MENU"
 msgid "Login"
 msgstr "Anmelden"
 
 #. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:507
+#: lib/action.php:506
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "Hilf mir!"
 
-#: lib/action.php:510
+#: lib/action.php:509
 msgctxt "MENU"
 msgid "Help"
 msgstr "Hilfe"
 
 #. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:513
+#: lib/action.php:512
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "Suche nach Leuten oder Text"
 
-#: lib/action.php:516
+#: lib/action.php:515
 msgctxt "MENU"
 msgid "Search"
 msgstr "Suchen"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:387
+#: lib/action.php:537 lib/adminpanelaction.php:387
 msgid "Site notice"
 msgstr "Seitennachricht"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:605
+#: lib/action.php:604
 msgid "Local views"
 msgstr "Lokale Ansichten"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:675
+#: lib/action.php:674
 msgid "Page notice"
 msgstr "Neue Nachricht"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:778
+#: lib/action.php:775
 msgid "Secondary site navigation"
 msgstr "Unternavigation"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:784
+#: lib/action.php:781
 msgid "Help"
 msgstr "Hilfe"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:787
+#: lib/action.php:784
 msgid "About"
 msgstr "Über"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:790
+#: lib/action.php:787
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:795
+#: lib/action.php:792
 msgid "TOS"
 msgstr "AGB"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:799
+#: lib/action.php:796
 msgid "Privacy"
 msgstr "Privatsphäre"
 
 #. TRANS: Secondary navigation menu option.
-#: lib/action.php:802
+#: lib/action.php:799
 msgid "Source"
 msgstr "Quellcode"
 
 #. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:808
+#: lib/action.php:805
 msgid "Contact"
 msgstr "Kontakt"
 
-#: lib/action.php:810
+#. TRANS: Secondary navigation menu option.
+#: lib/action.php:808
 msgid "Badge"
 msgstr "Plakette"
 
 #. TRANS: DT element for StatusNet software license.
-#: lib/action.php:839
+#: lib/action.php:837
 msgid "StatusNet software license"
 msgstr "StatusNet-Software-Lizenz"
 
@@ -5349,51 +5549,51 @@ msgstr "StatusNet-Software-Lizenz"
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
-#: lib/action.php:846
+#: lib/action.php:844
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"**%%site.name%%** ist ein Microbloggingdienst von [%%site.broughtby%%](%%"
+"**%%site.name%%** ist ein Mikrobloggingdienst von [%%site.broughtby%%](%%"
 "site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:849
+#: lib/action.php:847
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
-msgstr "**%%site.name%%** ist ein Microbloggingdienst."
+msgstr "**%%site.name%%** ist ein Mikrobloggingdienst."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
 #. TRANS: Make sure there is no whitespace between "]" and "(".
 #. TRANS: Text between [] is a link description, text between () is the link itself.
 #. TRANS: %s is the version of StatusNet that is being used.
-#: lib/action.php:856
+#: lib/action.php:854
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
 "s, available under the [GNU Affero General Public License](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"Es wird mit der Microbloggingsoftware [StatusNet](http://status.net/) "
+"Es wird mit der Mikrobloggingsoftware [StatusNet](http://status.net/) "
 "(Version %s) betrieben, die unter der [GNU Affero General Public License]"
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html) erhältlich ist."
 
 #. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:872
+#: lib/action.php:870
 msgid "Site content license"
 msgstr "StatusNet-Software-Lizenz"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
-#: lib/action.php:879
+#: lib/action.php:877
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "Inhalte und Daten von %1$s sind privat und vertraulich."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
-#: lib/action.php:886
+#: lib/action.php:884
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr ""
@@ -5401,7 +5601,7 @@ msgstr ""
 "vorbehalten."
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:890
+#: lib/action.php:888
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr ""
 "Urheberrecht von Inhalt und Daten liegt bei den Beteiligten. Alle Rechte "
@@ -5409,45 +5609,45 @@ msgstr ""
 
 #. TRANS: license message in footer.
 #. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:904
+#: lib/action.php:902
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "Alle Inhalte und Daten von %1$s sind unter der %2$s Lizenz verfügbar."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1243
+#: lib/action.php:1238
 msgid "Pagination"
 msgstr "Seitenerstellung"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
-#: lib/action.php:1254
+#: lib/action.php:1249
 msgid "After"
 msgstr "Später"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
-#: lib/action.php:1264
+#: lib/action.php:1259
 msgid "Before"
 msgstr "Vorher"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:122
+#: lib/activity.php:120
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "Root-Element eines Feeds erwartet, aber ganzes XML-Dokument erhalten."
 
 #. TRANS: Client exception thrown when there is no source attribute.
-#: lib/activityutils.php:203
+#: lib/activityutils.php:200
 msgid "Can't handle remote content yet."
 msgstr "Fremdinhalt kann noch nicht eingebunden werden."
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
-#: lib/activityutils.php:240
+#: lib/activityutils.php:237
 msgid "Can't handle embedded XML content yet."
 msgstr "Kann eingebundenen XML-Inhalt nicht verarbeiten."
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
-#: lib/activityutils.php:245
+#: lib/activityutils.php:242
 msgid "Can't handle embedded Base64 content yet."
 msgstr "Eingebundener Base64-Inhalt kann noch nicht verarbeitet werden."
 
@@ -5491,7 +5691,7 @@ msgstr "Seite"
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:345
 msgid "Design configuration"
-msgstr "Motiv-Konfiguration"
+msgstr "Design-Konfiguration"
 
 #. TRANS: Menu item for site administration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
@@ -5535,6 +5735,11 @@ msgstr "Seitennachricht bearbeiten"
 msgid "Snapshots configuration"
 msgstr "Snapshot-Konfiguration"
 
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr "Website-Lizenz einstellen"
+
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
@@ -5545,14 +5750,30 @@ msgstr "API-Ressource erfordert lesen/schreib Zugriff; du hast nur Leserechte."
 msgid "No application for that consumer key."
 msgstr ""
 
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr ""
+
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
 #: lib/apiauth.php:217
 msgid "No user for that token."
 msgstr ""
 
+#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
+#. TRANS: Client error thrown when authentication fails.
+#: lib/apiauth.php:258 lib/apiauth.php:290
+msgid "Could not authenticate you."
+msgstr ""
+
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
 #: lib/apioauthstore.php:178
-msgid "Tried to revoke unknown token"
+msgid "Tried to revoke unknown token."
+msgstr ""
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:183
+msgid "Failed to delete revoked token."
 msgstr ""
 
 #. TRANS: Form legend.
@@ -5566,188 +5787,208 @@ msgid "Icon for this application"
 msgstr "Programmsymbol"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:200
-#, php-format
-msgid "Describe your application in %d characters"
-msgstr "Beschreibe dein Programm in %d Zeichen"
+#. TRANS: %d is the number of available characters for the description.
+#: lib/applicationeditform.php:201
+#, fuzzy, php-format
+msgid "Describe your application in %d character"
+msgid_plural "Describe your application in %d characters"
+msgstr[0] "Beschreibe dein Programm in %d Zeichen"
+msgstr[1] "Beschreibe dein Programm in %d Zeichen"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:204
+#: lib/applicationeditform.php:205
 msgid "Describe your application"
 msgstr "Beschreibe dein Programm"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:215
+#: lib/applicationeditform.php:216
 msgid "URL of the homepage of this application"
 msgstr "Adresse der Homepage dieses Programms"
 
 #. TRANS: Form input field label.
-#: lib/applicationeditform.php:217
+#: lib/applicationeditform.php:218
 msgid "Source URL"
 msgstr "Quelladresse"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:225
 msgid "Organization responsible for this application"
 msgstr "Für diese Anwendung verantwortliche Organisation"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:234
 msgid "URL for the homepage of the organization"
 msgstr "Homepage der Gruppe oder des Themas"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:243
 msgid "URL to redirect to after authentication"
 msgstr "aufzurufende Adresse nach der Authentifizierung"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:271
 msgid "Browser"
 msgstr "Browser"
 
 #. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:288
 msgid "Desktop"
 msgstr "Arbeitsfläche"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:290
 msgid "Type of application, browser or desktop"
 msgstr "Typ der Anwendung, Browser oder Arbeitsfläche"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:314
 msgid "Read-only"
 msgstr "Schreibgeschützt"
 
 #. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:334
 msgid "Read-write"
 msgstr "Lese/Schreibzugriff"
 
 #. TRANS: Form guide.
-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:336
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Standardeinstellung dieses Programms: Schreibgeschützt oder Lese/"
 "Schreibzugriff"
 
 #. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
+#: lib/applicationeditform.php:353
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:135
+#: lib/applicationlist.php:134
 msgid "read-write"
 msgstr "Lese/Schreibzugriff"
 
 #. TRANS: Application access type
-#: lib/applicationlist.php:137
+#: lib/applicationlist.php:136
 msgid "read-only"
 msgstr "Schreibgeschützt"
 
-#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
-#: lib/applicationlist.php:143
+#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
+#: lib/applicationlist.php:142
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Genehmigte %1$s - „%2$s“ Zugriff."
 
 #. TRANS: Button label
-#: lib/applicationlist.php:158
+#: lib/applicationlist.php:157
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Widerrufen"
 
+#: lib/atom10feed.php:112
+msgid "author element must contain a name element."
+msgstr ""
+
 #. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
+#: lib/attachmentlist.php:85
 msgid "Attachments"
 msgstr "Anhänge"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:256
 msgid "Author"
 msgstr "Autor"
 
 #. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:279
+#: lib/attachmentlist.php:270
 msgid "Provider"
 msgstr "Anbieter"
 
 #. TRANS: Title.
-#: lib/attachmentnoticesection.php:68
+#: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "Nachrichten in denen dieser Anhang erscheint"
 
 #. TRANS: Title.
-#: lib/attachmenttagcloudsection.php:49
+#: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Stichworte für diesen Anhang"
 
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-msgid "Password changing failed"
+#. TRANS: Exception thrown when a password change fails.
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
+#, fuzzy
+msgid "Password changing failed."
 msgstr "Passwort konnte nicht geändert werden"
 
-#: lib/authenticationplugin.php:236
-msgid "Password changing is not allowed"
+#. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
+#: lib/authenticationplugin.php:238
+#, fuzzy
+msgid "Password changing is not allowed."
 msgstr "Passwort kann nicht geändert werden"
 
 #. TRANS: Title for the form to block a user.
-#: lib/blockform.php:70
+#: lib/blockform.php:68
 msgid "Block"
 msgstr "Blockieren"
 
-#: lib/channel.php:157 lib/channel.php:177
+#. TRANS: Title for command results.
+#: lib/channel.php:160 lib/channel.php:181
 msgid "Command results"
 msgstr "Befehl-Ergebnisse"
 
-#: lib/channel.php:229 lib/mailhandler.php:142
+#. TRANS: Title for command results.
+#: lib/channel.php:194
+#, fuzzy
+msgid "AJAX error"
+msgstr "Ajax-Fehler"
+
+#. TRANS: E-mail subject when a command has completed.
+#: lib/channel.php:233 lib/mailhandler.php:142
 msgid "Command complete"
 msgstr "Befehl ausgeführt"
 
-#: lib/channel.php:240
+#. TRANS: E-mail subject when a command has failed.
+#: lib/channel.php:244
 msgid "Command failed"
 msgstr "Befehl fehlgeschlagen"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:84 lib/command.php:108
+#: lib/command.php:82 lib/command.php:106
 msgid "Notice with that id does not exist."
 msgstr "Nachricht mit dieser ID existiert nicht"
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:101 lib/command.php:630
+#: lib/command.php:99 lib/command.php:626
 msgid "User has no last notice."
 msgstr "Benutzer hat keine letzte Nachricht"
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:130
+#: lib/command.php:128
 #, php-format
 msgid "Could not find a user with nickname %s."
-msgstr "Konnte keinen Nutzer mit dem Namen %s finden"
+msgstr "Konnte keinen Benutzer mit dem Namen %s finden"
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:150
+#: lib/command.php:148
 #, php-format
 msgid "Could not find a local user with nickname %s."
-msgstr "Konnte keinen lokalen Nutzer mit dem Nick %s finden"
+msgstr "Konnte keinen lokalen Benutzer mit dem Nick %s finden"
 
 #. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:185
+#: lib/command.php:183
 msgid "Sorry, this command is not yet implemented."
 msgstr "Leider ist dieser Befehl noch nicht implementiert."
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:231
+#: lib/command.php:229
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Es macht keinen Sinn dich selbst anzustupsen!"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:240
+#: lib/command.php:238
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "Stups an %s abgeschickt"
@@ -5756,7 +5997,7 @@ msgstr "Stups an %s abgeschickt"
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:270
+#: lib/command.php:268
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5768,88 +6009,89 @@ msgstr ""
 "Mitteilungen: %3$s"
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:314
+#: lib/command.php:312
 msgid "Notice marked as fave."
 msgstr "Nachricht als Favorit markiert."
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:360
+#: lib/command.php:357
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s ist der Gruppe %2$s beigetreten."
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:408
+#: lib/command.php:405
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s hat die Gruppe %2$s verlassen."
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:434
+#: lib/command.php:430
 #, php-format
 msgid "Fullname: %s"
 msgstr "Vollständiger Name: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:438 lib/mail.php:268
+#: lib/command.php:434 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Standort: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:442 lib/mail.php:271
+#: lib/command.php:438 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Homepage: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:446
+#: lib/command.php:442
 #, php-format
 msgid "About: %s"
 msgstr "Über: %s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
-#: lib/command.php:474
+#. TRANS: %s is a remote profile.
+#: lib/command.php:471
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
-"%s ist ein entferntes Profil; man kann direkte Nachrichten nur an Nutzer auf "
-"dem selben Server senden."
+"%s ist ein entferntes Profil; man kann direkte Nachrichten nur an Benutzer "
+"auf dem selben Server senden."
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:491 lib/xmppmanager.php:403
+#: lib/command.php:488 lib/xmppmanager.php:403
 #, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 "Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet."
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:517
+#: lib/command.php:514
 msgid "Error sending direct message."
 msgstr "Fehler beim Senden der Nachricht"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:554
+#: lib/command.php:551
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "Nachricht von %s wiederholt."
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:557
+#: lib/command.php:554
 msgid "Error repeating notice."
 msgstr "Fehler beim Wiederholen der Nachricht"
 
 #. TRANS: Message given if content of a notice for a reply is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:592
+#: lib/command.php:589
 #, php-format
 msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
@@ -5857,100 +6099,100 @@ msgstr ""
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:603
+#: lib/command.php:600
 #, php-format
 msgid "Reply to %s sent."
 msgstr "Antwort an %s gesendet"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:606
+#: lib/command.php:603
 msgid "Error saving notice."
 msgstr "Problem beim Speichern der Nachricht."
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:655
+#: lib/command.php:650
 msgid "Specify the name of the user to subscribe to."
 msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:664
+#: lib/command.php:659
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "OMB-Profile können nicht mit einem Kommando abonniert werden."
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:672
+#: lib/command.php:667
 #, php-format
 msgid "Subscribed to %s."
 msgstr "%s abboniert"
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:694 lib/command.php:804
+#: lib/command.php:688 lib/command.php:799
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:705
+#: lib/command.php:699
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "Abgemeldet von %s."
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:724 lib/command.php:750
+#: lib/command.php:719 lib/command.php:745
 msgid "Command not yet implemented."
 msgstr "Befehl noch nicht implementiert."
 
 #. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:728
+#: lib/command.php:723
 msgid "Notification off."
 msgstr "Benachrichtigung deaktiviert."
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:731
+#: lib/command.php:726
 msgid "Can't turn off notification."
 msgstr "Konnte Benachrichtigung nicht deaktivieren."
 
 #. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:754
+#: lib/command.php:749
 msgid "Notification on."
 msgstr "Benachrichtigung aktiviert."
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:757
+#: lib/command.php:752
 msgid "Can't turn on notification."
 msgstr "Konnte Benachrichtigung nicht aktivieren."
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:771
+#: lib/command.php:766
 msgid "Login command is disabled."
 msgstr "Die Anmeldung ist deaktiviert"
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
-#: lib/command.php:784
+#: lib/command.php:779
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "Der Link ist nur einmal und für eine Dauer von 2 Minuten gültig: %s"
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:813
+#: lib/command.php:808
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "%s nicht mehr abonniert"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:831
+#: lib/command.php:826
 msgid "You are not subscribed to anyone."
 msgstr "Du hast niemanden abonniert."
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:836
+#: lib/command.php:831
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Du hast diesen Benutzer bereits abonniert:"
@@ -5958,14 +6200,14 @@ msgstr[1] "Du hast diese Benutzer bereits abonniert:"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
-#: lib/command.php:858
+#: lib/command.php:853
 msgid "No one is subscribed to you."
 msgstr "Niemand hat dich abonniert."
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:863
+#: lib/command.php:858
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Die Gegenseite konnte dich nicht abonnieren."
@@ -5973,21 +6215,21 @@ msgstr[1] "Die Gegenseite konnte dich nicht abonnieren."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
-#: lib/command.php:885
+#: lib/command.php:880
 msgid "You are not a member of any groups."
 msgstr "Du bist in keiner Gruppe Mitglied."
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:890
+#: lib/command.php:885
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du bist Mitglied dieser Gruppe:"
 msgstr[1] "Du bist Mitglied dieser Gruppen:"
 
-#. TRANS: Help text for commands.
-#: lib/command.php:905
+#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
+#: lib/command.php:900
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6032,74 +6274,96 @@ msgstr ""
 "on - Benachrichtigung einschalten\n"
 "off - Benachrichtigung ausschalten\n"
 "help - diese Hilfe anzeigen\n"
-"follow <nickname> - einem Nutzer folgen\n"
+"follow <nickname> - einem Benutzer folgen\n"
 "groups - Gruppen auflisten in denen du Mitglied bist\n"
 "subscriptions - Leute auflisten denen du folgst\n"
 "subscribers - Leute auflisten die dir folgen\n"
-"leave <nickname> - einem Nutzer nicht mehr folgen\n"
-"d <nickname> <text> - Direkte Nachricht an einen Nutzer schicken\n"
-"get <nickname> - letzte Nachricht eines Nutzers abrufen\n"
-"whois <nickname> - Profil eines Nutzers abrufen\n"
-"lose <nickname> - Nutzer zwingen dir nicht mehr zu folgen\n"
-"fav <nickname> - letzte Nachricht eines Nutzers als Favorit markieren\n"
+"leave <nickname> - einem Benutzer nicht mehr folgen\n"
+"d <nickname> <text> - Direkte Nachricht an einen Benutzer schicken\n"
+"get <nickname> - letzte Nachricht eines Benutzers abrufen\n"
+"whois <nickname> - Profil eines Benutzers abrufen\n"
+"lose <nickname> - Benutzer zwingen dir nicht mehr zu folgen\n"
+"fav <nickname> - letzte Nachricht eines Benutzers als Favorit markieren\n"
 "fav #<notice_id> - Nachricht mit bestimmter ID als Favorit markieren\n"
 "repeat #<notice_id> - Nachricht mit bestimmter ID wiederholen\n"
-"repeat <nickname> - letzte Nachricht eines Nutzers wiederholen\n"
+"repeat <nickname> - letzte Nachricht eines Benutzers wiederholen\n"
 "reply #<notice_id> - Nachricht mit bestimmter ID beantworten\n"
-"reply <nickname> - letzte Nachricht eines Nutzers beantworten\n"
+"reply <nickname> - letzte Nachricht eines Benutzers beantworten\n"
 "join <group> - Gruppe beitreten\n"
 "login - Link zum Anmelden auf der Webseite anfordern\n"
 "drop <group> - Gruppe verlassen\n"
 "stats - deine Statistik abrufen\n"
-"stop - Äquivalent zu 'off'\n"
-"quit - Äquivalent zu 'off'\n"
-"sub <nickname> - same as 'follow'\n"
-"unsub <nickname> - same as 'leave'\n"
-"last <nickname> - same as 'get'\n"
-"on <nickname> - not yet implemented.\n"
-"off <nickname> - not yet implemented.\n"
-"nudge <nickname> - remind a user to update.\n"
-"invite <phone number> - not yet implemented.\n"
-"track <word> - not yet implemented.\n"
-"untrack <word> - not yet implemented.\n"
-"track off - not yet implemented.\n"
-"untrack all - not yet implemented.\n"
-"tracks - not yet implemented.\n"
-"tracking - not yet implemented.\n"
-
-#: lib/common.php:135
+"stop - Äquivalent zu „off“\n"
+"quit - Äquivalent zu „off“\n"
+"sub <nickname> - Äquivalent zu „follow“\n"
+"unsub <nickname> - Äquivalent zu „leave“\n"
+"last <nickname> - Äquivalent zu „get“\n"
+"on <nickname> - noch nicht implementiert\n"
+"off <nickname> - noch nicht implementiert\n"
+"nudge <nickname> - einen Benutzer ans Aktualisieren erinnern\n"
+"invite <phone number> - noch nicht implementiert\n"
+"track <word> - noch nicht implementiert\n"
+"untrack <word> - noch nicht implementiert\n"
+"track off - noch nicht implementiert\n"
+"untrack all - noch nicht implementiert\n"
+"tracks - noch nicht implementiert\n"
+"tracking - noch nicht implementiert\n"
+
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:136
 msgid "No configuration file found. "
 msgstr "Keine Konfigurationsdatei gefunden."
 
-#: lib/common.php:136
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: Is followed by a list of directories (separated by HTML breaks).
+#: lib/common.php:139
 msgid "I looked for configuration files in the following places: "
 msgstr "Ich habe an folgenden Stellen nach Konfigurationsdateien gesucht: "
 
-#: lib/common.php:138
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:142
 msgid "You may wish to run the installer to fix this."
 msgstr "Bitte die Installation erneut starten um das Problem zu beheben."
 
-#: lib/common.php:139
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: The text is link text that leads to the installer page.
+#: lib/common.php:146
 msgid "Go to the installer."
 msgstr "Zur Installation gehen."
 
-#: lib/connectsettingsaction.php:110
+#. TRANS: Menu item for Instant Messaging settings.
+#: lib/connectsettingsaction.php:106
+#, fuzzy
+msgctxt "MENU"
 msgid "IM"
 msgstr "IM"
 
-#: lib/connectsettingsaction.php:111
+#. TRANS: Tooltip for Instant Messaging menu item.
+#: lib/connectsettingsaction.php:108
 msgid "Updates by instant messenger (IM)"
 msgstr "Aktualisierungen via Instant Messenger (IM)"
 
-#: lib/connectsettingsaction.php:116
+#. TRANS: Menu item for Short Message Service settings.
+#: lib/connectsettingsaction.php:113
+#, fuzzy
+msgctxt "MENU"
+msgid "SMS"
+msgstr "SMS"
+
+#. TRANS: Tooltip for Short Message Service menu item.
+#: lib/connectsettingsaction.php:115
 msgid "Updates by SMS"
 msgstr "Aktualisierungen via SMS"
 
+#. TRANS: Menu item for OAth connection settings.
 #: lib/connectsettingsaction.php:120
+#, fuzzy
+msgctxt "MENU"
 msgid "Connections"
 msgstr "Verbindungen"
 
-#: lib/connectsettingsaction.php:121
+#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#: lib/connectsettingsaction.php:122
 msgid "Authorized connected applications"
 msgstr "Programme mit Zugriffserlaubnis"
 
@@ -6122,18 +6386,14 @@ msgstr ""
 msgid "Design defaults restored."
 msgstr "Standard-Design wieder hergestellt."
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#: lib/disfavorform.php:114 lib/disfavorform.php:144
 msgid "Disfavor this notice"
 msgstr "Aus Favoriten entfernen"
 
-#: lib/favorform.php:114 lib/favorform.php:140
+#: lib/favorform.php:114 lib/favorform.php:143
 msgid "Favor this notice"
 msgstr "Zu den Favoriten hinzufügen"
 
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "Zu Favoriten hinzufügen"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -6150,9 +6410,9 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "Daten exportieren"
+#: lib/feedlist.php:66
+msgid "Feeds"
+msgstr "Feeds"
 
 #: lib/galleryaction.php:121
 msgid "Filter tags"
@@ -6208,6 +6468,78 @@ msgstr ""
 "Zusätzliche Spitznamen für die Gruppe, Komma oder Leerzeichen getrennt, max %"
 "d"
 
+#. TRANS: Menu item in the group navigation page.
+#: lib/groupnav.php:86
+msgctxt "MENU"
+msgid "Group"
+msgstr "Gruppe"
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:89
+#, php-format
+msgctxt "TOOLTIP"
+msgid "%s group"
+msgstr "%s-Gruppe"
+
+#. TRANS: Menu item in the group navigation page.
+#: lib/groupnav.php:95
+msgctxt "MENU"
+msgid "Members"
+msgstr "Mitglieder"
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:98
+#, php-format
+msgctxt "TOOLTIP"
+msgid "%s group members"
+msgstr "%s-Gruppen-Mitglieder"
+
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:108
+msgctxt "MENU"
+msgid "Blocked"
+msgstr "Blockiert"
+
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:111
+#, php-format
+msgctxt "TOOLTIP"
+msgid "%s blocked users"
+msgstr "Blockierte Benutzer der Gruppe „%s“"
+
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:120
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Edit %s group properties"
+msgstr "%s-Gruppen-Einstellungen bearbeiten"
+
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:126
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logo"
+
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:129
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Add or edit %s logo"
+msgstr "%s-Logo hinzufügen oder bearbeiten"
+
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:138
+#, php-format
+msgctxt "TOOLTIP"
+msgid "Add or edit %s design"
+msgstr "%s-Design hinzufügen oder bearbeiten"
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Gruppen mit den meisten Mitgliedern"
@@ -6274,21 +6606,17 @@ msgstr "[%s]"
 msgid "Unknown inbox source %d."
 msgstr "Unbekannte inbox-Quelle %d."
 
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "Beitreten"
-
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Verlassen"
 
 #: lib/logingroupnav.php:80
 msgid "Login with a username and password"
-msgstr "Mit Nutzernamen und Passwort anmelden"
+msgstr "Mit Benutzernamen und Passwort anmelden"
 
 #: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
-msgstr "Registriere ein neues Nutzerkonto"
+msgstr "Registriere ein neues Benutzerkonto"
 
 #. TRANS: Subject for address confirmation email
 #: lib/mail.php:174
@@ -6616,7 +6944,7 @@ msgstr ""
 "schicken, um sie in eine Konversation zu verwickeln. Andere Leute können Dir "
 "Nachrichten schicken, die nur du sehen kannst."
 
-#: lib/mailbox.php:228 lib/noticelist.php:506
+#: lib/mailbox.php:228 lib/noticelist.php:516
 msgid "from"
 msgstr "von"
 
@@ -6626,7 +6954,7 @@ msgstr "Konnte Nachricht nicht parsen."
 
 #: lib/mailhandler.php:42
 msgid "Not a registered user."
-msgstr "Kein registrierter Nutzer."
+msgstr "Kein registrierter Benutzer."
 
 #: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
@@ -6701,6 +7029,25 @@ msgstr "Datei konnte nicht in das Zielverzeichnis verschoben werden."
 msgid "Could not determine file's MIME type."
 msgstr "Konnte den MIME-Typ nicht feststellen."
 
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
+#, php-format
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
+msgstr ""
+"„%1$s“ ist kein unterstütztes Dateiformat auf diesem Server. Versuche es mit "
+"einem anderen %2$s-Format."
+
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
+#, php-format
+msgid "\"%s\" is not a supported file type on this server."
+msgstr "„%s“ ist kein unterstütztes Dateiformat auf diesem Server."
+
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 msgstr "Versende eine direkte Nachricht"
@@ -6752,55 +7099,55 @@ msgstr ""
 "Bitte versuche es später wieder."
 
 #. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:436
+#: lib/noticelist.php:446
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:438
+#: lib/noticelist.php:448
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:440
+#: lib/noticelist.php:450
 msgid "E"
 msgstr "O"
 
 #. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:442
+#: lib/noticelist.php:452
 msgid "W"
 msgstr "W"
 
-#: lib/noticelist.php:444
+#: lib/noticelist.php:454
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
-#: lib/noticelist.php:453
+#: lib/noticelist.php:463
 msgid "at"
 msgstr "in"
 
-#: lib/noticelist.php:502
+#: lib/noticelist.php:512
 msgid "web"
 msgstr "Web"
 
-#: lib/noticelist.php:568
+#: lib/noticelist.php:578
 msgid "in context"
 msgstr "im Zusammenhang"
 
-#: lib/noticelist.php:603
+#: lib/noticelist.php:613
 msgid "Repeated by"
 msgstr "Wiederholt von"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:640
 msgid "Reply to this notice"
 msgstr "Auf diese Nachricht antworten"
 
-#: lib/noticelist.php:631
+#: lib/noticelist.php:641
 msgid "Reply"
 msgstr "Antworten"
 
-#: lib/noticelist.php:675
+#: lib/noticelist.php:685
 msgid "Notice repeated"
 msgstr "Nachricht wiederholt"
 
@@ -6816,6 +7163,23 @@ msgstr "Stups"
 msgid "Send a nudge to this user"
 msgstr "Sende diesem Benutzer einen Stups"
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile."
+msgstr "Neues Profil konnte nicht angelegt werden."
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar."
+msgstr "Fehler beim Einfügen des Avatars."
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile."
+msgstr "Fehler beim Einfügen des entfernten Profils."
+
+#. TRANS: Exception thrown when a notice is denied because it has been sent before.
+#: lib/oauthstore.php:346
+msgid "Duplicate notice."
+msgstr "Doppelte Nachricht."
+
 #: lib/oauthstore.php:491
 msgid "Couldn't insert new subscription."
 msgstr "Konnte neues Abonnement nicht eintragen."
@@ -6854,7 +7218,7 @@ msgid "Tags in %s's notices"
 msgstr "Stichworte in %ss Nachrichten"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:116
+#: lib/plugin.php:121
 msgid "Unknown"
 msgstr "Unbekannter Befehl"
 
@@ -6876,7 +7240,7 @@ msgstr "Alle Abonnenten"
 
 #: lib/profileaction.php:191
 msgid "User ID"
-msgstr "Nutzer ID"
+msgstr "Benutzer-ID"
 
 #: lib/profileaction.php:196
 msgid "Member since"
@@ -6936,9 +7300,9 @@ msgstr "Diese Nachricht wiederholen"
 msgid "Revoke the \"%s\" role from this user"
 msgstr "Widerrufe die „%s“-Rolle von diesem Benutzer"
 
-#: lib/router.php:709
+#: lib/router.php:711
 msgid "No single user defined for single-user mode."
-msgstr "Kein einzelner Nutzer für den Ein-Benutzer-Modus ausgewählt."
+msgstr "Kein einzelner Benutzer für den Ein-Benutzer-Modus ausgewählt."
 
 #: lib/sandboxform.php:67
 msgid "Sandbox"
@@ -6946,12 +7310,12 @@ msgstr "Spielwiese"
 
 #: lib/sandboxform.php:78
 msgid "Sandbox this user"
-msgstr "Diesen Nutzer auf die Spielwiese setzen"
+msgstr "Diesen Benutzer auf die Spielwiese setzen"
 
 #. TRANS: Fieldset legend for the search form.
 #: lib/searchaction.php:121
 msgid "Search site"
-msgstr "Site durchsuchen"
+msgstr "Website durchsuchen"
 
 #. TRANS: Used as a field label for the field where one or more keywords
 #. TRANS: for searching can be entered.
@@ -6959,6 +7323,11 @@ msgstr "Site durchsuchen"
 msgid "Keyword(s)"
 msgstr "Suchbegriff"
 
+#: lib/searchaction.php:130
+msgctxt "BUTTON"
+msgid "Search"
+msgstr "Suchen"
+
 #. TRANS: Definition list item with instructions on how to get (better) search results.
 #: lib/searchaction.php:170
 msgid "Search help"
@@ -6994,7 +7363,7 @@ msgstr "Stummschalten"
 
 #: lib/silenceform.php:78
 msgid "Silence this user"
-msgstr "Nutzer verstummen lassen"
+msgstr "Benutzer verstummen lassen"
 
 #: lib/subgroupnav.php:83
 #, php-format
@@ -7110,6 +7479,13 @@ msgstr "Lösche dein Abonnement von diesem Benutzer"
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
+#. TRANS: Exception text shown when no profile can be found for a user.
+#. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
+#: lib/usernoprofileexception.php:60
+#, fuzzy, php-format
+msgid "User %1$s (%2$d) has no profile record."
+msgstr "Benutzer hat kein Profil."
+
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Avatar bearbeiten"
@@ -7120,7 +7496,7 @@ msgstr "Benutzeraktionen"
 
 #: lib/userprofile.php:237
 msgid "User deletion in progress..."
-msgstr "Löschung des Nutzers in Arbeit …"
+msgstr "Löschung des Benutzers in Arbeit …"
 
 #: lib/userprofile.php:263
 msgid "Edit profile settings"
@@ -7157,32 +7533,64 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1126
 msgid "a few seconds ago"
 msgstr "vor wenigen Sekunden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1106
+#: lib/util.php:1129
 msgid "about a minute ago"
 msgstr "vor einer Minute"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1112
+#: lib/util.php:1133
+#, php-format
+msgid "about one minute ago"
+msgid_plural "about %d minutes ago"
+msgstr[0] "vor ca. einer Minute"
+msgstr[1] "vor ca. %d Minuten"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1136
 msgid "about an hour ago"
 msgstr "vor einer Stunde"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1118
+#: lib/util.php:1140
+#, php-format
+msgid "about one hour ago"
+msgid_plural "about %d hours ago"
+msgstr[0] "vor ca. einer Stunde"
+msgstr[1] "vor ca. %d Stunden"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1143
 msgid "about a day ago"
 msgstr "vor einem Tag"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1147
+#, php-format
+msgid "about one day ago"
+msgid_plural "about %d days ago"
+msgstr[0] "vor ca. einem Tag"
+msgstr[1] "vor ca. %d Tagen"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1150
 msgid "about a month ago"
 msgstr "vor einem Monat"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1130
+#: lib/util.php:1154
+#, php-format
+msgid "about one month ago"
+msgid_plural "about %d months ago"
+msgstr[0] "vor ca. einem Monat"
+msgstr[1] "vor ca. %d Monaten"
+
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1157
 msgid "about a year ago"
 msgstr "vor einem Jahr"
 
@@ -7195,3 +7603,17 @@ msgstr "%s ist keine gültige Farbe!"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s ist keine gültige Farbe! Verwenden Sie 3 oder 6 Hex-Zeichen."
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)"
+msgstr ""
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user."
+msgstr "Keine Benutzer-ID angegeben"
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup."
+msgstr ""