Merge branch 'master' into newui

1 files changed, 219 insertions, 201 deletions

diff --git a/view/de/messages.po b/view/de/messages.po
index 98e8e6f22..aac565b21 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendika\n"
 "Report-Msgid-Bugs-To: http://bugs.friendika.com/\n"
-"POT-Creation-Date: 2011-08-07 04:50-0700\n"
-"PO-Revision-Date: 2011-08-09 13:51+0000\n"
+"POT-Creation-Date: 2011-08-14 21:17-0700\n"
+"PO-Revision-Date: 2011-08-18 08:02+0000\n"
 "Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/friendika/team/de/)\n"
 "MIME-Version: 1.0\n"
@@ -46,7 +46,7 @@ msgstr "Konnte den Kontakt nicht aktualisieren."
 #: ../../mod/display.php:108 ../../mod/profiles.php:7
 #: ../../mod/profiles.php:226 ../../mod/invite.php:13 ../../mod/invite.php:81
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:308
-#: ../../include/items.php:1916 ../../index.php:266
+#: ../../include/items.php:1930 ../../index.php:266
 msgid "Permission denied."
 msgstr "Zugriff verweigert."
 
@@ -116,14 +116,14 @@ msgstr "Pull/Feed URL"
 #: ../../mod/invite.php:106 ../../addon/facebook/facebook.php:366
 #: ../../addon/randplace/randplace.php:178
 #: ../../addon/impressum/impressum.php:69 ../../addon/oembed/oembed.php:41
-#: ../../addon/statusnet/statusnet.php:223
-#: ../../addon/statusnet/statusnet.php:237
-#: ../../addon/statusnet/statusnet.php:263
-#: ../../addon/statusnet/statusnet.php:270
-#: ../../addon/statusnet/statusnet.php:292
-#: ../../addon/statusnet/statusnet.php:414 ../../addon/piwik/piwik.php:76
+#: ../../addon/statusnet/statusnet.php:274
+#: ../../addon/statusnet/statusnet.php:288
+#: ../../addon/statusnet/statusnet.php:314
+#: ../../addon/statusnet/statusnet.php:321
+#: ../../addon/statusnet/statusnet.php:343
+#: ../../addon/statusnet/statusnet.php:468 ../../addon/piwik/piwik.php:76
 #: ../../addon/twitter/twitter.php:171 ../../addon/twitter/twitter.php:194
-#: ../../addon/twitter/twitter.php:276 ../../include/conversation.php:406
+#: ../../addon/twitter/twitter.php:280 ../../include/conversation.php:409
 msgid "Submit"
 msgstr "Senden"
 
@@ -203,7 +203,7 @@ msgstr "l, F j"
 msgid "Edit event"
 msgstr "Veranstaltung bearbeiten"
 
-#: ../../mod/events.php:237 ../../include/text.php:835
+#: ../../mod/events.php:237 ../../include/text.php:846
 msgid "link to source"
 msgstr "Link zum original Posting"
 
@@ -240,7 +240,7 @@ msgstr "An Zeitzone des Betrachters anpassen"
 msgid "Description:"
 msgstr "Beschreibung"
 
-#: ../../mod/events.php:328 ../../include/event.php:37 ../../boot.php:869
+#: ../../mod/events.php:328 ../../include/event.php:37 ../../boot.php:868
 msgid "Location:"
 msgstr "Ort:"
 
@@ -318,7 +318,7 @@ msgid "was tagged in a"
 msgstr "was tagged in a"
 
 #: ../../mod/photos.php:508 ../../mod/like.php:110
-#: ../../include/conversation.php:31
+#: ../../include/diaspora.php:446 ../../include/conversation.php:31
 msgid "photo"
 msgstr "Foto"
 
@@ -394,7 +394,7 @@ msgstr "Foto bearbeiten"
 msgid "Use as profile photo"
 msgstr "Als Profilbild verwenden"
 
-#: ../../mod/photos.php:1040 ../../include/conversation.php:339
+#: ../../mod/photos.php:1040 ../../include/conversation.php:342
 msgid "Private Message"
 msgstr "Private Nachricht"
 
@@ -428,38 +428,38 @@ msgid ""
 msgstr ""
 "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1162 ../../include/conversation.php:387
+#: ../../mod/photos.php:1162 ../../include/conversation.php:390
 msgid "I like this (toggle)"
 msgstr "Ich mag das (toggle)"
 
-#: ../../mod/photos.php:1163 ../../include/conversation.php:388
+#: ../../mod/photos.php:1163 ../../include/conversation.php:391
 msgid "I don't like this (toggle)"
 msgstr "Ich mag das nicht (toggle)"
 
-#: ../../mod/photos.php:1164 ../../include/conversation.php:389
-#: ../../include/conversation.php:743
+#: ../../mod/photos.php:1164 ../../include/conversation.php:392
+#: ../../include/conversation.php:746
 msgid "Share"
 msgstr "Teilen"
 
 #: ../../mod/photos.php:1165 ../../mod/editpost.php:99
 #: ../../mod/message.php:190 ../../mod/message.php:324
-#: ../../include/conversation.php:390 ../../include/conversation.php:753
+#: ../../include/conversation.php:393 ../../include/conversation.php:756
 msgid "Please wait"
 msgstr "Bitte warten"
 
 #: ../../mod/photos.php:1181 ../../mod/photos.php:1220
-#: ../../mod/photos.php:1251 ../../include/conversation.php:403
+#: ../../mod/photos.php:1251 ../../include/conversation.php:406
 msgid "This is you"
 msgstr "Das bist du"
 
 #: ../../mod/photos.php:1183 ../../mod/photos.php:1222
-#: ../../mod/photos.php:1253 ../../include/conversation.php:405
-#: ../../boot.php:412
+#: ../../mod/photos.php:1253 ../../include/conversation.php:408
+#: ../../boot.php:411
 msgid "Comment"
 msgstr "Kommentar"
 
 #: ../../mod/photos.php:1281 ../../mod/group.php:154 ../../mod/admin.php:468
-#: ../../include/conversation.php:424
+#: ../../include/conversation.php:427
 msgid "Delete"
 msgstr "Löschen"
 
@@ -507,62 +507,62 @@ msgstr "Beitrag nicht gefunden"
 msgid "Edit post"
 msgstr "Beitrag bearbeiten"
 
-#: ../../mod/editpost.php:75 ../../include/conversation.php:729
+#: ../../mod/editpost.php:75 ../../include/conversation.php:732
 msgid "Post to Email"
 msgstr "An Email senden"
 
 #: ../../mod/editpost.php:90 ../../include/group.php:171
-#: ../../include/group.php:172 ../../include/conversation.php:414
+#: ../../include/group.php:172 ../../include/conversation.php:417
 msgid "Edit"
 msgstr "Bearbeiten"
 
 #: ../../mod/editpost.php:91 ../../mod/message.php:188
-#: ../../mod/message.php:322 ../../include/conversation.php:744
+#: ../../mod/message.php:322 ../../include/conversation.php:747
 msgid "Upload photo"
 msgstr "Foto hochladen"
 
-#: ../../mod/editpost.php:92 ../../include/conversation.php:745
+#: ../../mod/editpost.php:92 ../../include/conversation.php:748
 msgid "Attach file"
 msgstr "Datei anhängen"
 
 #: ../../mod/editpost.php:93 ../../mod/message.php:189
-#: ../../mod/message.php:323 ../../include/conversation.php:746
+#: ../../mod/message.php:323 ../../include/conversation.php:749
 msgid "Insert web link"
 msgstr "Weblink einfügen"
 
-#: ../../mod/editpost.php:94 ../../include/conversation.php:747
+#: ../../mod/editpost.php:94 ../../include/conversation.php:750
 msgid "Insert YouTube video"
 msgstr "YouTube Video einfügen"
 
-#: ../../mod/editpost.php:95 ../../include/conversation.php:748
+#: ../../mod/editpost.php:95 ../../include/conversation.php:751
 msgid "Insert Vorbis [.ogg] video"
 msgstr "Vorbis [.ogg] Video einfügen"
 
-#: ../../mod/editpost.php:96 ../../include/conversation.php:749
+#: ../../mod/editpost.php:96 ../../include/conversation.php:752
 msgid "Insert Vorbis [.ogg] audio"
 msgstr "Vorbis [.ogg] Audio einfügen"
 
-#: ../../mod/editpost.php:97 ../../include/conversation.php:750
+#: ../../mod/editpost.php:97 ../../include/conversation.php:753
 msgid "Set your location"
 msgstr "Deinen Standort festlegen"
 
-#: ../../mod/editpost.php:98 ../../include/conversation.php:751
+#: ../../mod/editpost.php:98 ../../include/conversation.php:754
 msgid "Clear browser location"
 msgstr "Browser Standort leeren"
 
-#: ../../mod/editpost.php:100 ../../include/conversation.php:754
+#: ../../mod/editpost.php:100 ../../include/conversation.php:757
 msgid "Permission settings"
 msgstr "Berechtigungseinstellungen"
 
-#: ../../mod/editpost.php:108 ../../include/conversation.php:762
+#: ../../mod/editpost.php:108 ../../include/conversation.php:765
 msgid "CC: email addresses"
 msgstr "CC: EMail Addresse"
 
-#: ../../mod/editpost.php:109 ../../include/conversation.php:763
+#: ../../mod/editpost.php:109 ../../include/conversation.php:766
 msgid "Public post"
 msgstr "Öffentlicher Beitrag"
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:765
+#: ../../mod/editpost.php:111 ../../include/conversation.php:768
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Z.B.: bob@example.com, mary@example.com"
 
@@ -681,7 +681,7 @@ msgstr "Bitte bestätige deine Vorstellung/Verbindungs Anfrage bei %s."
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: ../../mod/dfrn_request.php:542 ../../include/items.php:1505
+#: ../../mod/dfrn_request.php:542 ../../include/items.php:1519
 msgid "[Name Withheld]"
 msgstr "[Name Zurückgehalten]"
 
@@ -693,7 +693,7 @@ msgstr "Vorstellung erhalten auf"
 #: ../../mod/lostpass.php:106 ../../mod/register.php:369
 #: ../../mod/register.php:423 ../../mod/regmod.php:54
 #: ../../mod/dfrn_notify.php:291 ../../mod/dfrn_notify.php:547
-#: ../../mod/dfrn_confirm.php:658 ../../include/items.php:1514
+#: ../../mod/dfrn_confirm.php:674 ../../include/items.php:1528
 msgid "Administrator"
 msgstr "Administrator"
 
@@ -1345,7 +1345,7 @@ msgstr "Funde: "
 msgid "Find"
 msgstr "Finde"
 
-#: ../../mod/contacts.php:422 ../../include/conversation.php:609
+#: ../../mod/contacts.php:422 ../../include/conversation.php:612
 msgid "Edit contact"
 msgstr "Kontakt bearbeiten"
 
@@ -1370,7 +1370,7 @@ msgstr ""
 "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits ähnliche"
 " Anfrage gestellt.) Zurücksetzen des Passworts gescheitert."
 
-#: ../../mod/lostpass.php:82 ../../boot.php:655
+#: ../../mod/lostpass.php:82 ../../boot.php:654
 msgid "Password Reset"
 msgstr "Passwort zurücksetzen"
 
@@ -1459,7 +1459,7 @@ msgstr " Cannot change to that email."
 
 #: ../../mod/settings.php:257 ../../addon/facebook/facebook.php:297
 #: ../../addon/impressum/impressum.php:64 ../../addon/piwik/piwik.php:89
-#: ../../addon/twitter/twitter.php:271
+#: ../../addon/twitter/twitter.php:275
 msgid "Settings updated."
 msgstr "Einstellungen aktualisiert."
 
@@ -2006,7 +2006,7 @@ msgstr "Sichtbar für"
 msgid "All Contacts (with secure profile access)"
 msgstr "Alle Kontakte (mit gesichertem Profil zugriff)"
 
-#: ../../mod/viewcontacts.php:25 ../../include/text.php:548
+#: ../../mod/viewcontacts.php:25 ../../include/text.php:555
 msgid "View Contacts"
 msgstr "Kontakte anzeigen"
 
@@ -2173,22 +2173,24 @@ msgstr ""
 msgid "Choose a nickname: "
 msgstr "Spitznamen wählen: "
 
-#: ../../mod/register.php:529 ../../include/nav.php:59 ../../boot.php:638
+#: ../../mod/register.php:529 ../../include/nav.php:59 ../../boot.php:637
 msgid "Register"
 msgstr "Registrieren"
 
-#: ../../mod/like.php:110 ../../addon/facebook/facebook.php:947
-#: ../../include/conversation.php:26 ../../include/conversation.php:35
+#: ../../mod/like.php:110 ../../addon/facebook/facebook.php:954
+#: ../../include/diaspora.php:446 ../../include/conversation.php:26
+#: ../../include/conversation.php:35
 msgid "status"
 msgstr "Status"
 
-#: ../../mod/like.php:127 ../../addon/facebook/facebook.php:951
-#: ../../include/conversation.php:43
+#: ../../mod/like.php:127 ../../addon/facebook/facebook.php:958
+#: ../../include/diaspora.php:463 ../../include/conversation.php:43
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s mag %2$s's %3$s"
 
-#: ../../mod/like.php:129 ../../include/conversation.php:46
+#: ../../mod/like.php:129 ../../include/diaspora.php:465
+#: ../../include/conversation.php:46
 #, php-format
 msgid "%1$s doesn't like %2$s's %3$s"
 msgstr "%1$s mag %2$s's %3$s nicht"
@@ -2258,43 +2260,43 @@ msgstr "Bitte melde dich an."
 msgid "Unable to locate original post."
 msgstr "Konnte das original Posting nicht finden."
 
-#: ../../mod/item.php:182
+#: ../../mod/item.php:196
 msgid "Empty post discarded."
 msgstr "Leere Nachricht wurde verworfen."
 
-#: ../../mod/item.php:282 ../../mod/message.php:93
+#: ../../mod/item.php:296 ../../mod/message.php:93
 #: ../../mod/wall_upload.php:81 ../../mod/wall_upload.php:90
 #: ../../mod/wall_upload.php:97
 msgid "Wall Photos"
 msgstr "Pinnwand Bilder"
 
-#: ../../mod/item.php:605 ../../mod/item.php:650 ../../mod/item.php:673
-#: ../../mod/item.php:716 ../../mod/dfrn_notify.php:293
+#: ../../mod/item.php:623 ../../mod/item.php:668 ../../mod/item.php:691
+#: ../../mod/item.php:734 ../../mod/dfrn_notify.php:293
 #: ../../mod/dfrn_notify.php:503 ../../mod/dfrn_notify.php:548
 #: ../../mod/dfrn_notify.php:634 ../../mod/dfrn_notify.php:677
 msgid "noreply"
 msgstr "noreply"
 
-#: ../../mod/item.php:649 ../../mod/item.php:715 ../../mod/dfrn_notify.php:676
+#: ../../mod/item.php:667 ../../mod/item.php:733 ../../mod/dfrn_notify.php:676
 msgid "Administrator@"
 msgstr "Administrator@"
 
-#: ../../mod/item.php:652 ../../mod/dfrn_notify.php:550
+#: ../../mod/item.php:670 ../../mod/dfrn_notify.php:550
 #: ../../mod/dfrn_notify.php:679
 #, php-format
 msgid "%s commented on an item at %s"
 msgstr "%s kommentierte einen Beitrag auf %s"
 
-#: ../../mod/item.php:718
+#: ../../mod/item.php:736
 #, php-format
 msgid "%s posted to your profile wall at %s"
 msgstr "%s hat auf deine Profilwand bei %s gepostet"
 
-#: ../../mod/item.php:747
+#: ../../mod/item.php:765
 msgid "System error. Post not saved."
 msgstr "Systemfehler. Nachricht konnte nicht gespeichert werden."
 
-#: ../../mod/item.php:766
+#: ../../mod/item.php:784
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendika social "
@@ -2303,12 +2305,12 @@ msgstr ""
 "Diese Nachricht wurde dir von %s gesendet, einem Mitglied des Sozialen "
 "Netzwerks Friendika"
 
-#: ../../mod/item.php:768
+#: ../../mod/item.php:786
 #, php-format
 msgid "You may visit them online at %s"
 msgstr "Du kannst sie online unter %s besuchen"
 
-#: ../../mod/item.php:769
+#: ../../mod/item.php:787
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
@@ -2316,7 +2318,7 @@ msgstr ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 
-#: ../../mod/item.php:771
+#: ../../mod/item.php:789
 #, php-format
 msgid "%s posted an update."
 msgstr "%s hat ein Update gepostet."
@@ -2378,6 +2380,10 @@ msgstr "Bearbeitung abgeschlossen"
 msgid "Image uploaded successfully."
 msgstr "Bild erfolgreich auf den Server geladen."
 
+#: ../../mod/hcard.php:11 ../../mod/profile.php:11 ../../boot.php:792
+msgid "No profile"
+msgstr "Kein Profil"
+
 #: ../../mod/removeme.php:42 ../../mod/removeme.php:45
 msgid "Remove My Account"
 msgstr "Account löschen"
@@ -2438,7 +2444,7 @@ msgstr "Nachricht gelöscht."
 msgid "Conversation removed."
 msgstr "Unterhaltung gelöscht."
 
-#: ../../mod/message.php:172 ../../include/conversation.php:696
+#: ../../mod/message.php:172 ../../include/conversation.php:699
 msgid "Please enter a link URL:"
 msgstr "Bitte gib die URL des Links ein:"
 
@@ -2508,7 +2514,7 @@ msgid "User registrations waiting for confirmation"
 msgstr "Nutzeranmeldungen die auf Bestätigung warten"
 
 #: ../../mod/admin.php:118 ../../mod/admin.php:502 ../../mod/display.php:25
-#: ../../mod/display.php:112 ../../include/items.php:1828
+#: ../../mod/display.php:112 ../../include/items.php:1842
 msgid "Item not found."
 msgstr "Beitrag nicht gefunden."
 
@@ -2565,7 +2571,7 @@ msgstr "Regeln"
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../../mod/admin.php:306
+#: ../../mod/admin.php:306 ../../addon/statusnet/statusnet.php:459
 msgid "Site name"
 msgstr "Seiten Name"
 
@@ -2827,10 +2833,6 @@ msgstr "FTP Nutzername"
 msgid "FTP Password"
 msgstr "FTP Passwort"
 
-#: ../../mod/profile.php:11 ../../boot.php:793
-msgid "No profile"
-msgstr "Kein Profil"
-
 #: ../../mod/profile.php:102 ../../mod/display.php:63
 msgid "Access to this profile has been restricted."
 msgstr "Der Zugriff zu diesem Profil wurde eingeschränkt."
@@ -2881,8 +2883,12 @@ msgid "No browser URL could be matched to this address."
 msgstr "Zu dieser Adresse konnte keine passende Browser URL gefunden werden."
 
 #: ../../mod/follow.php:61
-msgid "Communication options with this network have been restricted."
-msgstr "Kommunikations-Optionen mit diesem Netzwerk wurden eingeschränkt."
+msgid ""
+"The profile address specified belongs to a network which has been disabled "
+"on this site."
+msgstr ""
+"Die Adresse dieses Profils gehört zu einem Netzwerk mit dem die "
+"Kommunikation auf dieser Seite ausgeschaltet wurde."
 
 #: ../../mod/follow.php:66
 msgid ""
@@ -2892,11 +2898,11 @@ msgstr ""
 "Eingeschränktes Profil. Diese Person wird keine direkten/privaten "
 "Nachrichten von dir erhalten können."
 
-#: ../../mod/follow.php:121
+#: ../../mod/follow.php:122
 msgid "Unable to retrieve contact information."
 msgstr "Konnte die Kontaktinformationen nicht empfangen."
 
-#: ../../mod/follow.php:167
+#: ../../mod/follow.php:168
 msgid "following"
 msgstr "folgen"
 
@@ -2916,7 +2922,7 @@ msgstr "Anwendungen"
 msgid "No installed applications."
 msgstr "Keine Applikationen installiert."
 
-#: ../../mod/search.php:26 ../../include/text.php:603 ../../include/nav.php:69
+#: ../../mod/search.php:26 ../../include/text.php:610 ../../include/nav.php:69
 msgid "Search"
 msgstr "Suche"
 
@@ -3218,62 +3224,62 @@ msgid ""
 msgstr ""
 "Sobald du registriert bist kontaktiere mich bitte auf meiner Profilseite:"
 
-#: ../../mod/dfrn_confirm.php:231
+#: ../../mod/dfrn_confirm.php:233
 msgid "Response from remote site was not understood."
 msgstr "Antwort der entfernten Gegenstelle unverständlich."
 
-#: ../../mod/dfrn_confirm.php:240
+#: ../../mod/dfrn_confirm.php:242
 msgid "Unexpected response from remote site: "
 msgstr "Unerwartete Antwort der Gegenstelle: "
 
-#: ../../mod/dfrn_confirm.php:248
+#: ../../mod/dfrn_confirm.php:250
 msgid "Confirmation completed successfully."
 msgstr "Bestätigung erfolgreich abgeschlossen."
 
-#: ../../mod/dfrn_confirm.php:250 ../../mod/dfrn_confirm.php:264
-#: ../../mod/dfrn_confirm.php:271
+#: ../../mod/dfrn_confirm.php:252 ../../mod/dfrn_confirm.php:266
+#: ../../mod/dfrn_confirm.php:273
 msgid "Remote site reported: "
 msgstr "Entfernte Seite meldet: "
 
-#: ../../mod/dfrn_confirm.php:262
+#: ../../mod/dfrn_confirm.php:264
 msgid "Temporary failure. Please wait and try again."
 msgstr ""
 "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch "
 "einmal."
 
-#: ../../mod/dfrn_confirm.php:269
+#: ../../mod/dfrn_confirm.php:271
 msgid "Introduction failed or was revoked."
 msgstr "Vorstellung schlug fehl oder wurde zurück gezogen."
 
-#: ../../mod/dfrn_confirm.php:387
+#: ../../mod/dfrn_confirm.php:393
 msgid "Unable to set contact photo."
 msgstr "Konnte das Bild des Kontakts nicht speichern."
 
-#: ../../mod/dfrn_confirm.php:430 ../../include/conversation.php:79
+#: ../../mod/dfrn_confirm.php:436 ../../include/conversation.php:79
 #, php-format
 msgid "%1$s is now friends with %2$s"
 msgstr "%1$s ist nun mit %2$s befreundet"
 
-#: ../../mod/dfrn_confirm.php:501
+#: ../../mod/dfrn_confirm.php:507
 #, php-format
 msgid "No user record found for '%s' "
 msgstr "Für '%s' wurde kein Nutzer gefunden"
 
-#: ../../mod/dfrn_confirm.php:511
+#: ../../mod/dfrn_confirm.php:517
 msgid "Our site encryption key is apparently messed up."
 msgstr "Der Verschlüsslungsschlüssel unserer Seite ist anscheinend im Arsch."
 
-#: ../../mod/dfrn_confirm.php:522
+#: ../../mod/dfrn_confirm.php:528
 msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr ""
 "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt "
 "werden."
 
-#: ../../mod/dfrn_confirm.php:534
+#: ../../mod/dfrn_confirm.php:549
 msgid "Contact record was not found for you on our site."
 msgstr "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden."
 
-#: ../../mod/dfrn_confirm.php:562
+#: ../../mod/dfrn_confirm.php:578
 msgid ""
 "The ID provided by your system is a duplicate on our system. It should work "
 "if you try again."
@@ -3281,16 +3287,16 @@ msgstr ""
 "Die ID die uns dein System angeboten hat ist hier bereits vergeben. Bitte "
 "versuche es noch einmal."
 
-#: ../../mod/dfrn_confirm.php:573
+#: ../../mod/dfrn_confirm.php:589
 msgid "Unable to set your contact credentials on our system."
 msgstr ""
 "Deine Kontaktreferenzen konnten nicht in unserm System gespeichert werden."
 
-#: ../../mod/dfrn_confirm.php:626
+#: ../../mod/dfrn_confirm.php:642
 msgid "Unable to update your contact profile details on our system"
 msgstr "Die Updates für dein Profil konnten nicht gespeichert werden"
 
-#: ../../mod/dfrn_confirm.php:656
+#: ../../mod/dfrn_confirm.php:672
 #, php-format
 msgid "Connection accepted at %s"
 msgstr "Auf %s wurde die Verbindung akzeptiert"
@@ -3362,15 +3368,15 @@ msgstr ""
 "Das Senden nach Facebook wurde zurückgezogen da Konflikte bei den Multi-"
 "Netzwerks-Rechten vorliegen."
 
-#: ../../addon/facebook/facebook.php:573
+#: ../../addon/facebook/facebook.php:580
 msgid "Image: "
 msgstr "Bild"
 
-#: ../../addon/facebook/facebook.php:649
+#: ../../addon/facebook/facebook.php:656
 msgid "View on Friendika"
 msgstr "Auf Friendika ansehen"
 
-#: ../../addon/facebook/facebook.php:680
+#: ../../addon/facebook/facebook.php:687
 msgid "Facebook post failed. Queued for retry."
 msgstr "Senden an Facebook gescheitert. Wir versuchen es später erneut."
 
@@ -3479,10 +3485,6 @@ msgstr "Keine Dateien hochgeladen."
 msgid "Uploaded file is empty"
 msgstr "Hochgeladene Datei ist leer"
 
-#: ../../addon/js_upload/js_upload.php:303
-msgid "Uploaded file is too large"
-msgstr "Hochgeladene Datei ist zu groß"
-
 #: ../../addon/js_upload/js_upload.php:321
 msgid "File has an invalid extension, it should be one of "
 msgstr ""
@@ -3542,11 +3544,11 @@ msgstr "OEmbed für Youtube Videos verwenden"
 msgid "URL to embed:"
 msgstr "URL zum Einbetten:"
 
-#: ../../addon/statusnet/statusnet.php:82
+#: ../../addon/statusnet/statusnet.php:133
 msgid "Post to StatusNet"
 msgstr "Nach StatusNet senden"
 
-#: ../../addon/statusnet/statusnet.php:124
+#: ../../addon/statusnet/statusnet.php:175
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
@@ -3554,24 +3556,24 @@ msgstr ""
 "Bitte kontaktiere den Administrator der Seite.<br />Die gegebene API URL ist"
 " nicht gültig."
 
-#: ../../addon/statusnet/statusnet.php:152
+#: ../../addon/statusnet/statusnet.php:203
 msgid "We could not contact the StatusNet API with the Path you entered."
 msgstr ""
 "Die StatusNet API konnte mit dem angegebenen Pfad nicht erreicht werden."
 
-#: ../../addon/statusnet/statusnet.php:179
+#: ../../addon/statusnet/statusnet.php:230
 msgid "StatusNet settings updated."
 msgstr "StatusNet Einstellungen aktualisiert."
 
-#: ../../addon/statusnet/statusnet.php:202
+#: ../../addon/statusnet/statusnet.php:253
 msgid "StatusNet Posting Settings"
 msgstr "StatusNet Posting Einstellungen"
 
-#: ../../addon/statusnet/statusnet.php:216
+#: ../../addon/statusnet/statusnet.php:267
 msgid "Globally Available StatusNet OAuthKeys"
 msgstr "Verfügbare OAuth Schlüssel für StatusNet"
 
-#: ../../addon/statusnet/statusnet.php:217
+#: ../../addon/statusnet/statusnet.php:268
 msgid ""
 "There are preconfigured OAuth key pairs for some StatusNet servers "
 "available. If you are useing one of them, please use these credentials. If "
@@ -3581,11 +3583,11 @@ msgstr ""
 " einen dieser Server benutzen, dann verwende doch bitte diese Schlüssel. "
 "Falls nicht kannst du weiter unten deine eigenen OAuth Schlüssel eintragen."
 
-#: ../../addon/statusnet/statusnet.php:225
+#: ../../addon/statusnet/statusnet.php:276
 msgid "Provide your own OAuth Credentials"
 msgstr "Eigene OAuth Schlüssel eintragen"
 
-#: ../../addon/statusnet/statusnet.php:226
+#: ../../addon/statusnet/statusnet.php:277
 msgid ""
 "No consumer key pair for StatusNet found. Register your Friendika Account as"
 " an desktop client on your StatusNet account, copy the consumer key pair "
@@ -3600,19 +3602,19 @@ msgstr ""
 "deiner Friendika Seite fragen, ob es für deine bevorzugte StatusNet Instanz "
 "eventuell bereits ein OAuth Schlüsselpaar gibt."
 
-#: ../../addon/statusnet/statusnet.php:228
+#: ../../addon/statusnet/statusnet.php:279
 msgid "OAuth Consumer Key"
 msgstr "OAuth Consumer Schlüssel"
 
-#: ../../addon/statusnet/statusnet.php:231
+#: ../../addon/statusnet/statusnet.php:282
 msgid "OAuth Consumer Secret"
 msgstr "OAuth Consumer Geheimnis"
 
-#: ../../addon/statusnet/statusnet.php:234
+#: ../../addon/statusnet/statusnet.php:285
 msgid "Base API Path (remember the trailing /)"
 msgstr "Basis-URL der StatusNet API (vergiss den abschließenden / nicht)"
 
-#: ../../addon/statusnet/statusnet.php:255
+#: ../../addon/statusnet/statusnet.php:306
 msgid ""
 "To connect to your StatusNet account click the button below to get a "
 "security code from StatusNet which you have to copy into the input box below"
@@ -3624,31 +3626,31 @@ msgstr ""
 "diesen in die Eingabebox weiter unten. Es werden ausschließlich deine "
 "<strong>öffentlichen</strong> Nachrichten bei StatusNet veröffentllicht."
 
-#: ../../addon/statusnet/statusnet.php:256
+#: ../../addon/statusnet/statusnet.php:307
 msgid "Log in with StatusNet"
 msgstr "Bei StatusNet anmelden"
 
-#: ../../addon/statusnet/statusnet.php:258
+#: ../../addon/statusnet/statusnet.php:309
 msgid "Copy the security code from StatusNet here"
 msgstr "Kopiere den Sicherheitscode von StatusNet hier her"
 
-#: ../../addon/statusnet/statusnet.php:264
+#: ../../addon/statusnet/statusnet.php:315
 msgid "Cancel Connection Process"
 msgstr "Verbindungsprozess abbrechen"
 
-#: ../../addon/statusnet/statusnet.php:266
+#: ../../addon/statusnet/statusnet.php:317
 msgid "Current StatusNet API is"
 msgstr "Derzeitige StatusNet API URL lautet"
 
-#: ../../addon/statusnet/statusnet.php:267
+#: ../../addon/statusnet/statusnet.php:318
 msgid "Cancel StatusNet Connection"
 msgstr "Verbindung zum StatusNet Server abbrechen"
 
-#: ../../addon/statusnet/statusnet.php:278 ../../addon/twitter/twitter.php:180
+#: ../../addon/statusnet/statusnet.php:329 ../../addon/twitter/twitter.php:180
 msgid "Currently connected to: "
 msgstr "Momentan verbunden mit: "
 
-#: ../../addon/statusnet/statusnet.php:279
+#: ../../addon/statusnet/statusnet.php:330
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated StatusNet account. You can choose to do so by default (here) or "
@@ -3659,18 +3661,30 @@ msgstr ""
 " als Standartverhalten einstellen oder für jeden Eintrag separat in den "
 "Beitragsoptionen beim Schreiben des Eintrags festlegen."
 
-#: ../../addon/statusnet/statusnet.php:281
+#: ../../addon/statusnet/statusnet.php:332
 msgid "Allow posting to StatusNet"
 msgstr "Nach StatusNet senden erlauben"
 
-#: ../../addon/statusnet/statusnet.php:284
+#: ../../addon/statusnet/statusnet.php:335
 msgid "Send public postings to StatusNet by default"
 msgstr "Veröffentliche alle öffentlichen Beiträge auch bei StatusNet"
 
-#: ../../addon/statusnet/statusnet.php:289 ../../addon/twitter/twitter.php:191
+#: ../../addon/statusnet/statusnet.php:340 ../../addon/twitter/twitter.php:191
 msgid "Clear OAuth configuration"
 msgstr "OAuth Konfiguration löschen"
 
+#: ../../addon/statusnet/statusnet.php:460
+msgid "API URL"
+msgstr "API URL"
+
+#: ../../addon/statusnet/statusnet.php:461
+msgid "Consumer Secret"
+msgstr "Benutzer Geheimnis"
+
+#: ../../addon/statusnet/statusnet.php:462
+msgid "Consumer Key"
+msgstr "Benutzer Schlüssel"
+
 #: ../../addon/piwik/piwik.php:77
 msgid "Piwik Base URL"
 msgstr "Piwik Basis URL"
@@ -3744,19 +3758,19 @@ msgstr "Nach Twitter senden erlauben"
 msgid "Send public postings to Twitter by default"
 msgstr "Veröffentliche alle öffentlichen Beiträge auch bei Twitter"
 
-#: ../../addon/twitter/twitter.php:278
+#: ../../addon/twitter/twitter.php:282
 msgid "Consumer key"
 msgstr "Anwender Schlüssel"
 
-#: ../../addon/twitter/twitter.php:279
+#: ../../addon/twitter/twitter.php:283
 msgid "Consumer secret"
 msgstr "Anwender Geheimnis"
 
-#: ../../include/profile_advanced.php:23 ../../boot.php:881
+#: ../../include/profile_advanced.php:23 ../../boot.php:880
 msgid "Gender:"
 msgstr "Geschlecht:"
 
-#: ../../include/profile_advanced.php:36 ../../include/items.php:1123
+#: ../../include/profile_advanced.php:36 ../../include/items.php:1137
 msgid "Birthday:"
 msgstr "Geburtstag:"
 
@@ -3776,7 +3790,7 @@ msgstr "Alter:"
 msgid "<span class=\"heart\">&hearts;</span> Status:"
 msgstr "<span class=\"heart\">&hearts;</span> Bezieungsstatus:"
 
-#: ../../include/profile_advanced.php:103 ../../boot.php:887
+#: ../../include/profile_advanced.php:103 ../../boot.php:886
 msgid "Homepage:"
 msgstr "Homepage:"
 
@@ -4096,117 +4110,121 @@ msgstr "Beginnt:"
 msgid "Finishes:"
 msgstr "Endet:"
 
-#: ../../include/text.php:222
+#: ../../include/text.php:229
 msgid "prev"
 msgstr "vorige"
 
-#: ../../include/text.php:224
+#: ../../include/text.php:231
 msgid "first"
 msgstr "erste"
 
-#: ../../include/text.php:253
+#: ../../include/text.php:260
 msgid "last"
 msgstr "letzte"
 
-#: ../../include/text.php:256
+#: ../../include/text.php:263
 msgid "next"
 msgstr "nächste"
 
-#: ../../include/text.php:535
+#: ../../include/text.php:542
 msgid "No contacts"
 msgstr "Keine Kontakte"
 
-#: ../../include/text.php:543
+#: ../../include/text.php:550
 #, php-format
 msgid "%d Contact"
 msgid_plural "%d Contacts"
 msgstr[0] "%d Kontakt"
 msgstr[1] "%d Kontakte"
 
-#: ../../include/text.php:700
+#: ../../include/text.php:711
 msgid "Monday"
 msgstr "Montag"
 
-#: ../../include/text.php:700
+#: ../../include/text.php:711
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: ../../include/text.php:700
+#: ../../include/text.php:711
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: ../../include/text.php:700
+#: ../../include/text.php:711
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: ../../include/text.php:700
+#: ../../include/text.php:711
 msgid "Friday"
 msgstr "Freitag"
 
-#: ../../include/text.php:700
+#: ../../include/text.php:711
 msgid "Saturday"
 msgstr "Samstag"
 
-#: ../../include/text.php:700
+#: ../../include/text.php:711
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: ../../include/text.php:704
+#: ../../include/text.php:715
 msgid "January"
 msgstr "Januar"
 
-#: ../../include/text.php:704
+#: ../../include/text.php:715
 msgid "February"
 msgstr "Februar"
 
-#: ../../include/text.php:704
+#: ../../include/text.php:715
 msgid "March"
 msgstr "März"
 
-#: ../../include/text.php:704
+#: ../../include/text.php:715
 msgid "April"
 msgstr "April"
 
-#: ../../include/text.php:704
+#: ../../include/text.php:715
 msgid "May"
 msgstr "Mai"
 
-#: ../../include/text.php:704
+#: ../../include/text.php:715
 msgid "June"
 msgstr "Juni"
 
-#: ../../include/text.php:704
+#: ../../include/text.php:715
 msgid "July"
 msgstr "Juli"
 
-#: ../../include/text.php:704
+#: ../../include/text.php:715
 msgid "August"
 msgstr "August"
 
-#: ../../include/text.php:704
+#: ../../include/text.php:715
 msgid "September"
 msgstr "September"
 
-#: ../../include/text.php:704
+#: ../../include/text.php:715
 msgid "October"
 msgstr "Oktober"
 
-#: ../../include/text.php:704
+#: ../../include/text.php:715
 msgid "November"
 msgstr "November"
 
-#: ../../include/text.php:704
+#: ../../include/text.php:715
 msgid "December"
 msgstr "Dezember"
 
-#: ../../include/text.php:767
+#: ../../include/text.php:778
 msgid "bytes"
 msgstr "Byte"
 
-#: ../../include/text.php:850
+#: ../../include/text.php:861
 msgid "Select an alternate language"
 msgstr "Alternative Sprache auswählen"
 
+#: ../../include/diaspora.php:309
+msgid "Sharing notification from Diaspora network"
+msgstr "Freigabe Benachrichtigung von Diaspora"
+
 #: ../../include/oembed.php:95
 msgid "Embedding disabled"
 msgstr "Einbettungen deaktiviert"
@@ -4219,7 +4237,7 @@ msgstr "Neue Gruppe erstellen"
 msgid "Everybody"
 msgstr "Alle Kontakte"
 
-#: ../../include/nav.php:41 ../../boot.php:668
+#: ../../include/nav.php:41 ../../boot.php:667
 msgid "Logout"
 msgstr "Abmelden"
 
@@ -4227,7 +4245,7 @@ msgstr "Abmelden"
 msgid "End this session"
 msgstr "Diese Sitzung beenden"
 
-#: ../../include/nav.php:44 ../../boot.php:646 ../../boot.php:652
+#: ../../include/nav.php:44 ../../boot.php:645 ../../boot.php:651
 msgid "Login"
 msgstr "Anmeldung"
 
@@ -4425,11 +4443,11 @@ msgstr "anzeigen"
 msgid "don't show"
 msgstr "nicht anzeigen"
 
-#: ../../include/notifier.php:459
+#: ../../include/notifier.php:465
 msgid "(no subject)"
 msgstr "(kein Betreff)"
 
-#: ../../include/items.php:1512
+#: ../../include/items.php:1526
 msgid "You have a new follower at "
 msgstr "Du hast einen neuen Kontakt auf "
 
@@ -4437,13 +4455,13 @@ msgstr "Du hast einen neuen Kontakt auf "
 msgid "event"
 msgstr "Veranstaltung"
 
-#: ../../include/conversation.php:213 ../../include/conversation.php:485
-#: ../../include/conversation.php:486
+#: ../../include/conversation.php:213 ../../include/conversation.php:488
+#: ../../include/conversation.php:489
 #, php-format
 msgid "View %s's profile"
 msgstr "Betrachte %s's Profil"
 
-#: ../../include/conversation.php:222 ../../include/conversation.php:498
+#: ../../include/conversation.php:222 ../../include/conversation.php:501
 #, php-format
 msgid "%s from %s"
 msgstr "%s von %s"
@@ -4456,179 +4474,179 @@ msgstr "Im Zusammenhang betrachten"
 msgid "See more posts like this"
 msgstr "Mehr Beiträge wie diesen anzeigen"
 
-#: ../../include/conversation.php:326
+#: ../../include/conversation.php:329
 #, php-format
 msgid "See all %d comments"
 msgstr "Alle %d Kommentare anzeigen"
 
-#: ../../include/conversation.php:424
+#: ../../include/conversation.php:427
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../../include/conversation.php:426
+#: ../../include/conversation.php:429
 msgid "toggle star status"
 msgstr "Stern Status umschalten"
 
-#: ../../include/conversation.php:487
+#: ../../include/conversation.php:490
 msgid "to"
 msgstr "to"
 
-#: ../../include/conversation.php:488
+#: ../../include/conversation.php:491
 msgid "Wall-to-Wall"
 msgstr "Wall-to-Wall"
 
-#: ../../include/conversation.php:489
+#: ../../include/conversation.php:492
 msgid "via Wall-To-Wall:"
 msgstr "via Wall-To-Wall:"
 
-#: ../../include/conversation.php:531
+#: ../../include/conversation.php:534
 msgid "Delete Selected Items"
 msgstr "Lösche die markierten Beiträge"
 
-#: ../../include/conversation.php:605
+#: ../../include/conversation.php:608
 msgid "View status"
 msgstr "Status anzeigen"
 
-#: ../../include/conversation.php:606
+#: ../../include/conversation.php:609
 msgid "View profile"
 msgstr "Profil anzeigen"
 
-#: ../../include/conversation.php:607
+#: ../../include/conversation.php:610
 msgid "View photos"
 msgstr "Fotos ansehen"
 
-#: ../../include/conversation.php:608
+#: ../../include/conversation.php:611
 msgid "View recent"
 msgstr "Jüngste anzeigen"
 
-#: ../../include/conversation.php:610
+#: ../../include/conversation.php:613
 msgid "Send PM"
 msgstr "Private Nachricht senden"
 
-#: ../../include/conversation.php:660
+#: ../../include/conversation.php:663
 #, php-format
 msgid "%s likes this."
 msgstr "%s mag dies."
 
-#: ../../include/conversation.php:660
+#: ../../include/conversation.php:663
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s mag dies nicht."
 
-#: ../../include/conversation.php:664
+#: ../../include/conversation.php:667
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr "<span  %1$s>%2$d Personen</span> mögen dies."
 
-#: ../../include/conversation.php:666
+#: ../../include/conversation.php:669
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr "<span  %1$s>%2$d Personen</span> mögen dies nicht."
 
-#: ../../include/conversation.php:672
+#: ../../include/conversation.php:675
 msgid "and"
 msgstr "und"
 
-#: ../../include/conversation.php:675
+#: ../../include/conversation.php:678
 #, php-format
 msgid ", and %d other people"
 msgstr " und %d andere"
 
-#: ../../include/conversation.php:676
+#: ../../include/conversation.php:679
 #, php-format
 msgid "%s like this."
 msgstr "%s mag dies."
 
-#: ../../include/conversation.php:676
+#: ../../include/conversation.php:679
 #, php-format
 msgid "%s don't like this."
 msgstr "%s mag dies nicht."
 
-#: ../../include/conversation.php:695
+#: ../../include/conversation.php:698
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Für <strong>Jedermann</strong> sichtbar"
 
-#: ../../include/conversation.php:697
+#: ../../include/conversation.php:700
 msgid "Please enter a YouTube link:"
 msgstr "Bitte gebe den YouTube Link ein:"
 
-#: ../../include/conversation.php:698
+#: ../../include/conversation.php:701
 msgid "Please enter a video(.ogg) link/URL:"
 msgstr "Bitte gebe den Link zum Video(.ogg) an:"
 
-#: ../../include/conversation.php:699
+#: ../../include/conversation.php:702
 msgid "Please enter an audio(.ogg) link/URL:"
 msgstr "Bitte gebe den Link zum Audio(.ogg) an:"
 
-#: ../../include/conversation.php:700
+#: ../../include/conversation.php:703
 msgid "Where are you right now?"
 msgstr "Wo hälst du dich jetzt gerade auf?"
 
-#: ../../include/conversation.php:701
+#: ../../include/conversation.php:704
 msgid "Enter a title for this item"
 msgstr "Gib den Titel für diesen Beitrag ein"
 
-#: ../../include/conversation.php:752
+#: ../../include/conversation.php:755
 msgid "Set title"
 msgstr "Titel setzen"
 
-#: ../../boot.php:411
+#: ../../boot.php:410
 msgid "Delete this item?"
 msgstr "Diesen Beitrag löschen?"
 
-#: ../../boot.php:637
+#: ../../boot.php:636
 msgid "Create a New Account"
 msgstr "Neuen Account erstellen"
 
-#: ../../boot.php:644
+#: ../../boot.php:643
 msgid "Nickname or Email address: "
 msgstr "Spitzname oder Email-Adresse: "
 
-#: ../../boot.php:645
+#: ../../boot.php:644
 msgid "Password: "
 msgstr "Passwort: "
 
-#: ../../boot.php:650
+#: ../../boot.php:649
 msgid "Nickname/Email/OpenID: "
 msgstr "Spitzname/Email/OpenID: "
 
-#: ../../boot.php:651
+#: ../../boot.php:650
 msgid "Password (if not OpenID): "
 msgstr "Passwort (falls nicht OpenID): "
 
-#: ../../boot.php:654
+#: ../../boot.php:653
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
 
-#: ../../boot.php:854
+#: ../../boot.php:853
 msgid "Connect"
 msgstr "Verbinden"
 
-#: ../../boot.php:873
+#: ../../boot.php:872
 msgid ", "
 msgstr ", "
 
-#: ../../boot.php:885
+#: ../../boot.php:884
 msgid "Status:"
 msgstr "Status:"
 
-#: ../../boot.php:976
+#: ../../boot.php:975
 msgid "g A l F d"
 msgstr "g A l F d"
 
-#: ../../boot.php:994
+#: ../../boot.php:993
 msgid "Birthday Reminders"
 msgstr "Geburtstagserinnerungen"
 
-#: ../../boot.php:995
+#: ../../boot.php:994
 msgid "Birthdays this week:"
 msgstr "Geburtstage diese Woche:"
 
-#: ../../boot.php:996
+#: ../../boot.php:995
 msgid "(Adjusted for local time)"
 msgstr "(an die lokale Zeit angepasst)"
 
-#: ../../boot.php:1007
+#: ../../boot.php:1006
 msgid "[today]"
 msgstr "[heute]"