From 5de91c2a7c924ac6067828a0e5bfbef5572c1f39 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Mon, 4 Jun 2012 08:08:45 +0200 Subject: API: Only repeat items if there is a content --- include/api.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/include/api.php b/include/api.php index 5697fbdbc..cd8526f89 100644 --- a/include/api.php +++ b/include/api.php @@ -898,7 +898,7 @@ // params $id = intval($a->argv[3]); - logger('API: api_statuses_repeat: '.$id); + logger('API: api_statuses_repeat: '.$id); //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false); @@ -915,13 +915,15 @@ intval($id) ); - $_REQUEST['body'] = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body']; - $_REQUEST['profile_uid'] = local_user(); - $_REQUEST['type'] = 'wall'; - $_REQUEST['api_source'] = true; + if ($r[0]['body'] != "") { + $_REQUEST['body'] = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8')."[url=".$r[0]['reply_url']."]".$r[0]['reply_author']."[/url] \n".$r[0]['body']; + $_REQUEST['profile_uid'] = local_user(); + $_REQUEST['type'] = 'wall'; + $_REQUEST['api_source'] = true; - require_once('mod/item.php'); - item_post($a); + require_once('mod/item.php'); + item_post($a); + } if ($type == 'xml') $ok = "true"; @@ -943,7 +945,7 @@ // params $id = intval($a->argv[3]); - logger('API: api_statuses_destroy: '.$id); + logger('API: api_statuses_destroy: '.$id); require_once('include/items.php'); drop_item($id, false); -- cgit v1.2.3 From fe1dc1bf98bf9af0704e063c1729bd2d51a5424b Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 4 Jun 2012 04:28:20 -0700 Subject: named anchors on display page --- view/search_item.tpl | 1 + view/wall_item.tpl | 1 + view/wallwall_item.tpl | 1 + 3 files changed, 3 insertions(+) diff --git a/view/search_item.tpl b/view/search_item.tpl index bfad1b7b7..22314d88a 100644 --- a/view/search_item.tpl +++ b/view/search_item.tpl @@ -1,3 +1,4 @@ +
diff --git a/view/wall_item.tpl b/view/wall_item.tpl index 9d1dd7d70..a3a79598e 100644 --- a/view/wall_item.tpl +++ b/view/wall_item.tpl @@ -1,3 +1,4 @@ +
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl index bad5680c7..1044f7ae4 100644 --- a/view/wallwall_item.tpl +++ b/view/wallwall_item.tpl @@ -1,3 +1,4 @@ +
-- cgit v1.2.3 From c7b1b4b752de738c7e1fa124b61ab73bdaca628c Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 5 Jun 2012 11:42:57 +0200 Subject: DE: update for the strings --- view/de/messages.po | 680 ++++++++++++++++++++++++++-------------------------- view/de/strings.php | 126 +++++----- 2 files changed, 408 insertions(+), 398 deletions(-) diff --git a/view/de/messages.po b/view/de/messages.po index 5bc060237..91abdc227 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -19,9 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-06-02 10:00-0700\n" -"PO-Revision-Date: 2012-06-03 15:30+0000\n" -"Last-Translator: bavatar \n" +"POT-Creation-Date: 2012-06-03 10:00-0700\n" +"PO-Revision-Date: 2012-06-05 08:08+0000\n" +"Last-Translator: zottel \n" "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -63,8 +63,8 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/profile_photo.php:163 ../../mod/message.php:44 #: ../../mod/message.php:96 ../../mod/allfriends.php:9 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 -#: ../../mod/follow.php:8 ../../mod/display.php:138 ../../mod/profiles.php:7 -#: ../../mod/profiles.php:382 ../../mod/delegate.php:6 +#: ../../mod/follow.php:9 ../../mod/display.php:138 ../../mod/profiles.php:7 +#: ../../mod/profiles.php:385 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:503 #: ../../include/items.php:3297 ../../index.php:306 @@ -103,7 +103,7 @@ msgstr "Name" #: ../../mod/crepair.php:149 msgid "Account Nickname" -msgstr "Account-Spitzname" +msgstr "Konto-Spitzname" #: ../../mod/crepair.php:150 msgid "@Tagname - overrides Name/Nickname" @@ -111,7 +111,7 @@ msgstr "@Tagname - überschreibt Name/Spitzname" #: ../../mod/crepair.php:151 msgid "Account URL" -msgstr "Account-URL" +msgstr "Konto-URL" #: ../../mod/crepair.php:152 msgid "Friend Request URL" @@ -143,7 +143,7 @@ msgstr "Neues Foto von dieser URL" #: ../../mod/settings.php:762 ../../mod/settings.php:969 #: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:417 #: ../../mod/admin.php:653 ../../mod/admin.php:789 ../../mod/admin.php:988 -#: ../../mod/admin.php:1075 ../../mod/profiles.php:551 +#: ../../mod/admin.php:1075 ../../mod/profiles.php:554 #: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:605 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 #: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158 @@ -174,7 +174,7 @@ msgstr "Neues Foto von dieser URL" #: ../../view/theme/diabook/theme.php:757 #: ../../view/theme/diabook/config.php:190 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70 -#: ../../include/conversation.php:574 +#: ../../include/conversation.php:580 msgid "Submit" msgstr "Senden" @@ -228,7 +228,7 @@ msgstr "l, F j" msgid "Edit event" msgstr "Veranstaltung bearbeiten" -#: ../../mod/events.php:300 ../../include/text.php:1064 +#: ../../mod/events.php:300 ../../include/text.php:1065 msgid "link to source" msgstr "Link zum Originalbeitrag" @@ -344,7 +344,7 @@ msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontak #: ../../mod/settings.php:956 ../../mod/settings.php:957 #: ../../mod/settings.php:958 ../../mod/settings.php:959 #: ../../mod/settings.php:960 ../../mod/register.php:234 -#: ../../mod/profiles.php:528 +#: ../../mod/profiles.php:531 msgid "Yes" msgstr "Ja" @@ -356,7 +356,7 @@ msgstr "Ja" #: ../../mod/settings.php:956 ../../mod/settings.php:957 #: ../../mod/settings.php:958 ../../mod/settings.php:959 #: ../../mod/settings.php:960 ../../mod/register.php:235 -#: ../../mod/profiles.php:529 +#: ../../mod/profiles.php:532 msgid "No" msgstr "Nein" @@ -413,7 +413,7 @@ msgstr "wurde getaggt in einem" #: ../../mod/photos.php:583 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1315 +#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1316 #: ../../include/diaspora.php:1662 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" @@ -503,7 +503,7 @@ msgstr "Foto bearbeiten" msgid "Use as profile photo" msgstr "Als Profilbild verwenden" -#: ../../mod/photos.php:1140 ../../include/conversation.php:484 +#: ../../mod/photos.php:1140 ../../include/conversation.php:490 msgid "Private Message" msgstr "Private Nachricht" @@ -540,44 +540,44 @@ msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: ../../mod/photos.php:1274 ../../include/conversation.php:548 +#: ../../mod/photos.php:1274 ../../include/conversation.php:554 msgid "I like this (toggle)" msgstr "Ich mag das (toggle)" -#: ../../mod/photos.php:1275 ../../include/conversation.php:549 +#: ../../mod/photos.php:1275 ../../include/conversation.php:555 msgid "I don't like this (toggle)" msgstr "Ich mag das nicht (toggle)" -#: ../../mod/photos.php:1276 ../../include/conversation.php:983 +#: ../../mod/photos.php:1276 ../../include/conversation.php:989 msgid "Share" msgstr "Teilen" #: ../../mod/photos.php:1277 ../../mod/editpost.php:104 #: ../../mod/wallmessage.php:145 ../../mod/message.php:214 -#: ../../mod/message.php:408 ../../include/conversation.php:365 -#: ../../include/conversation.php:725 ../../include/conversation.php:1002 +#: ../../mod/message.php:408 ../../include/conversation.php:371 +#: ../../include/conversation.php:731 ../../include/conversation.php:1008 msgid "Please wait" msgstr "Bitte warten" #: ../../mod/photos.php:1293 ../../mod/photos.php:1333 -#: ../../mod/photos.php:1364 ../../include/conversation.php:571 +#: ../../mod/photos.php:1364 ../../include/conversation.php:577 msgid "This is you" msgstr "Das bist du" #: ../../mod/photos.php:1295 ../../mod/photos.php:1335 -#: ../../mod/photos.php:1366 ../../include/conversation.php:573 +#: ../../mod/photos.php:1366 ../../include/conversation.php:579 #: ../../boot.php:514 msgid "Comment" msgstr "Kommentar" #: ../../mod/photos.php:1297 ../../mod/editpost.php:125 -#: ../../include/conversation.php:583 ../../include/conversation.php:1020 +#: ../../include/conversation.php:589 ../../include/conversation.php:1026 msgid "Preview" msgstr "Vorschau" #: ../../mod/photos.php:1394 ../../mod/settings.php:618 #: ../../mod/settings.php:699 ../../mod/group.php:168 ../../mod/admin.php:660 -#: ../../include/conversation.php:322 ../../include/conversation.php:603 +#: ../../include/conversation.php:328 ../../include/conversation.php:609 msgid "Delete" msgstr "Löschen" @@ -642,28 +642,28 @@ msgstr "Beitrag nicht gefunden" msgid "Edit post" msgstr "Beitrag bearbeiten" -#: ../../mod/editpost.php:80 ../../include/conversation.php:969 +#: ../../mod/editpost.php:80 ../../include/conversation.php:975 msgid "Post to Email" msgstr "An E-Mail senden" #: ../../mod/editpost.php:95 ../../mod/settings.php:617 -#: ../../include/conversation.php:590 +#: ../../include/conversation.php:596 msgid "Edit" msgstr "Bearbeiten" #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 #: ../../mod/message.php:212 ../../mod/message.php:406 -#: ../../include/conversation.php:984 +#: ../../include/conversation.php:990 msgid "Upload photo" msgstr "Foto hochladen" -#: ../../mod/editpost.php:97 ../../include/conversation.php:986 +#: ../../mod/editpost.php:97 ../../include/conversation.php:992 msgid "Attach file" msgstr "Datei anhängen" #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 #: ../../mod/message.php:213 ../../mod/message.php:407 -#: ../../include/conversation.php:988 +#: ../../include/conversation.php:994 msgid "Insert web link" msgstr "einen Link einfügen" @@ -679,35 +679,35 @@ msgstr "Vorbis [.ogg] Video einfügen" msgid "Insert Vorbis [.ogg] audio" msgstr "Vorbis [.ogg] Audio einfügen" -#: ../../mod/editpost.php:102 ../../include/conversation.php:994 +#: ../../mod/editpost.php:102 ../../include/conversation.php:1000 msgid "Set your location" msgstr "Deinen Standort festlegen" -#: ../../mod/editpost.php:103 ../../include/conversation.php:996 +#: ../../mod/editpost.php:103 ../../include/conversation.php:1002 msgid "Clear browser location" msgstr "Browser-Standort leeren" -#: ../../mod/editpost.php:105 ../../include/conversation.php:1003 +#: ../../mod/editpost.php:105 ../../include/conversation.php:1009 msgid "Permission settings" msgstr "Berechtigungseinstellungen" -#: ../../mod/editpost.php:113 ../../include/conversation.php:1012 +#: ../../mod/editpost.php:113 ../../include/conversation.php:1018 msgid "CC: email addresses" msgstr "Cc:-E-Mail-Addressen" -#: ../../mod/editpost.php:114 ../../include/conversation.php:1013 +#: ../../mod/editpost.php:114 ../../include/conversation.php:1019 msgid "Public post" msgstr "Öffentlicher Beitrag" -#: ../../mod/editpost.php:117 ../../include/conversation.php:999 +#: ../../mod/editpost.php:117 ../../include/conversation.php:1005 msgid "Set title" msgstr "Titel setzen" -#: ../../mod/editpost.php:119 ../../include/conversation.php:1001 +#: ../../mod/editpost.php:119 ../../include/conversation.php:1007 msgid "Categories (comma-separated list)" msgstr "Kategorien (kommasepariert)" -#: ../../mod/editpost.php:120 ../../include/conversation.php:1015 +#: ../../mod/editpost.php:120 ../../include/conversation.php:1021 msgid "Example: bob@example.com, mary@example.com" msgstr "Z.B.: bob@example.com, mary@example.com" @@ -769,7 +769,7 @@ msgstr "Ungültige E-Mail Adresse." #: ../../mod/dfrn_request.php:346 msgid "This account has not been configured for email. Request failed." -msgstr "Dieses Konto ist nicht für Email konfiguriert. Anfrage fehlgeschlagen." +msgstr "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen." #: ../../mod/dfrn_request.php:442 msgid "Unable to resolve your name at the provided location." @@ -788,7 +788,7 @@ msgstr "Es scheint so, als ob du bereits mit %s befreundet bist." msgid "Invalid profile URL." msgstr "Ungültige Profil-URL." -#: ../../mod/dfrn_request.php:486 ../../mod/follow.php:23 +#: ../../mod/dfrn_request.php:486 ../../include/follow.php:27 msgid "Disallowed profile URL." msgstr "Nicht erlaubte Profil-URL." @@ -1710,7 +1710,7 @@ msgstr "Finde" #: ../../mod/lostpass.php:16 msgid "No valid account found." -msgstr "Kein gültiger Account gefunden." +msgstr "Kein gültiges Konto gefunden." #: ../../mod/lostpass.php:32 msgid "Password reset request issued. Check your email." @@ -1784,7 +1784,7 @@ msgstr "Zurücksetzen" #: ../../mod/settings.php:50 ../../include/nav.php:137 msgid "Account settings" -msgstr "Account-Einstellungen" +msgstr "Kontoeinstellungen" #: ../../mod/settings.php:55 msgid "Display settings" @@ -1808,7 +1808,7 @@ msgstr "Persönliche Daten exportieren" #: ../../mod/settings.php:81 msgid "Remove account" -msgstr "Account entfernen" +msgstr "Konto löschen" #: ../../mod/settings.php:89 ../../mod/admin.php:748 ../../mod/admin.php:953 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:643 @@ -1826,7 +1826,7 @@ msgstr "Aktualisierungen" #: ../../mod/settings.php:241 msgid "Failed to connect with email account using the settings provided." -msgstr "Konnte das Email Konto mit den angegebenen Einstellungen nicht erreichen." +msgstr "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich." #: ../../mod/settings.php:246 msgid "Email settings updated." @@ -2048,15 +2048,15 @@ msgstr "Keine Smilies anzeigen" #: ../../mod/settings.php:840 msgid "Normal Account Page" -msgstr "Normale Account Seite" +msgstr "Normales Konto" #: ../../mod/settings.php:841 msgid "This account is a normal personal profile" -msgstr "Dieser Account ist ein normales persönliches Profil" +msgstr "Dieses Konto ist ein normales persönliches Profil" #: ../../mod/settings.php:844 msgid "Soapbox Page" -msgstr "Sandkasten Seite" +msgstr "Marktschreier-Konto" #: ../../mod/settings.php:845 msgid "Automatically approve all connection/friend requests as read-only fans" @@ -2064,7 +2064,7 @@ msgstr "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert" #: ../../mod/settings.php:848 msgid "Community Forum/Celebrity Account" -msgstr "Gemeinschafts Forum / Promi Konto" +msgstr "Forum/Promi-Konto" #: ../../mod/settings.php:849 msgid "" @@ -2085,7 +2085,7 @@ msgstr "Privates Forum [Versuchsstadium]" #: ../../mod/settings.php:857 msgid "Private forum - approved members only" -msgstr "Privates Forum - Ausschließlich für Mitglieder" +msgstr "Privates Forum, nur für Mitglieder" #: ../../mod/settings.php:869 msgid "OpenID:" @@ -2093,15 +2093,15 @@ msgstr "OpenID:" #: ../../mod/settings.php:869 msgid "(Optional) Allow this OpenID to login to this account." -msgstr "(Optional) Erlaube die Anmeldung für diesen Account mit dieser OpenID." +msgstr "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID." #: ../../mod/settings.php:879 msgid "Publish your default profile in your local site directory?" -msgstr "Veröffentliche dein Standardprofil im Verzeichnis der lokalen Seite?" +msgstr "Darf dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?" #: ../../mod/settings.php:885 msgid "Publish your default profile in the global social directory?" -msgstr "Veröffentliche dein Standardprofil im weltweiten Verzeichnis?" +msgstr "Darf dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?" #: ../../mod/settings.php:893 msgid "Hide your contact/friend list from viewers of your default profile?" @@ -2113,19 +2113,19 @@ msgstr "Profil-Details vor unbekannten Betrachtern verbergen?" #: ../../mod/settings.php:902 msgid "Allow friends to post to your profile page?" -msgstr "Deinen Kontakten erlauben, auf deine Pinnwand zu schreiben?" +msgstr "Dürfen deine Kontakte auf deine Pinnwand schreiben?" #: ../../mod/settings.php:908 msgid "Allow friends to tag your posts?" -msgstr "Deinen Kontakten erlauben, deine Beiträge mit Schlagwörtern zu versehen?" +msgstr "Dürfen deine Kontakte deine Beiträge mit Schlagwörtern versehen?" #: ../../mod/settings.php:914 msgid "Allow us to suggest you as a potential friend to new members?" -msgstr "Erlaube uns dich als potentiellen Kontakt für neue Mitglieder vorzuschlagen?" +msgstr "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?" #: ../../mod/settings.php:920 msgid "Permit unknown people to send you private mail?" -msgstr "Erlaube es Unbekannten dir private Nachrichten zu schicken?" +msgstr "Dürfen dir Unbekannte private Nachrichten schicken?" #: ../../mod/settings.php:931 msgid "Profile is not published." @@ -2177,7 +2177,7 @@ msgstr "Nur Beiträge anderer verfallen" #: ../../mod/settings.php:967 msgid "Account Settings" -msgstr "Account-Einstellungen" +msgstr "Kontoeinstellungen" #: ../../mod/settings.php:975 msgid "Password Settings" @@ -2205,7 +2205,7 @@ msgstr "Kompletter Name:" #: ../../mod/settings.php:983 msgid "Email Address:" -msgstr "Emailadresse:" +msgstr "E-Mail-Adresse:" #: ../../mod/settings.php:984 msgid "Your Timezone:" @@ -2241,7 +2241,7 @@ msgstr "(klicke zum öffnen/schließen)" #: ../../mod/settings.php:1010 msgid "Maximum private messages per day from unknown people:" -msgstr "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:" +msgstr "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:" #: ../../mod/settings.php:1013 msgid "Notification Settings" @@ -2289,19 +2289,19 @@ msgstr "– du eine private Nachricht erhältst" #: ../../mod/settings.php:1024 msgid "You receive a friend suggestion" -msgstr "- du eine Empfehlung erhältst" +msgstr "– du eine Empfehlung erhältst" #: ../../mod/settings.php:1025 msgid "You are tagged in a post" -msgstr "- du in einem Beitrag erwähnt wurdest" +msgstr "– du in einem Beitrag erwähnt wirst" #: ../../mod/settings.php:1028 msgid "Advanced Account/Page Type Settings" -msgstr "" +msgstr "Erweiterte Konto-/Seitentyp-Einstellungen" #: ../../mod/settings.php:1029 msgid "Change the behaviour of this account for special situations" -msgstr "Ändere das Verhalten deines Accounts für spezielle Situationen." +msgstr "Verhalten dieses Kontos in bestimmten Situationen:" #: ../../mod/manage.php:90 msgid "Manage Identities and/or Pages" @@ -2311,7 +2311,7 @@ msgstr "Verwalte Identitäten und/oder Seiten" msgid "" "Toggle between different identities or community/group pages which share " "your account details or which you have been granted \"manage\" permissions" -msgstr "Wechsle zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppen-Seiten, die deine Zugangsdetails teilen oder zu denen du \"Manage\" Befugnisse bekommen hast." +msgstr "Zwischen verschiedenen Identitäten oder Foren wechseln, die deine Zugangsdaten (E-Mail und Passwort) teilen oder zu denen du „Verwalten“-Befugnisse bekommen hast." #: ../../mod/manage.php:95 msgid "Select an identity to manage: " @@ -2454,7 +2454,7 @@ msgid "No recipient." msgstr "Kein Empfänger." #: ../../mod/wallmessage.php:124 ../../mod/message.php:171 -#: ../../include/conversation.php:937 +#: ../../include/conversation.php:943 msgid "Please enter a link URL:" msgstr "Bitte gib die URL des Links ein:" @@ -2533,7 +2533,7 @@ msgstr "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien habe msgid "" "Authorise the Facebook Connector if you currently have a Facebook account " "and we will (optionally) import all your Facebook friends and conversations." -msgstr "Richte die Verbindung zu Facebook ein, wenn du im Augenblick ein Facebook Konto hast und (optional) deine Facebook Freunde und Unterhaltungen importieren willst." +msgstr "Richte die Verbindung zu Facebook ein, wenn du im Augenblick ein Facebook-Konto hast, und (optional) deine Facebook-Freunde und -Unterhaltungen importieren willst." #: ../../mod/newmember.php:27 msgid "" @@ -2663,7 +2663,7 @@ msgid "Profile Visibility Editor" msgstr "Editor für die Profil-Sichtbarkeit" #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128 -#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:77 +#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:79 #: ../../include/nav.php:50 ../../boot.php:1505 msgid "Profile" msgstr "Profil" @@ -2821,7 +2821,7 @@ msgstr "Dateien" #: ../../mod/regmod.php:61 msgid "Account approved." -msgstr "Account freigegeben." +msgstr "Konto freigegeben." #: ../../mod/regmod.php:98 #, php-format @@ -2940,13 +2940,13 @@ msgstr "Kein Profil" #: ../../mod/removeme.php:45 ../../mod/removeme.php:48 msgid "Remove My Account" -msgstr "Account löschen" +msgstr "Konto löschen" #: ../../mod/removeme.php:46 msgid "" "This will completely remove your account. Once this has been done it is not " "recoverable." -msgstr "Dies wird deinen Account endgültig löschen. Es gibt keine Möglichkeit, ihn wiederherzustellen." +msgstr "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen." #: ../../mod/removeme.php:47 msgid "Please enter your password for verification:" @@ -3063,19 +3063,19 @@ msgstr "Nutzeranmeldungen die auf Bestätigung warten" #: ../../mod/admin.php:180 ../../mod/admin.php:634 msgid "Normal Account" -msgstr "Normaler Account" +msgstr "Normales Konto" #: ../../mod/admin.php:181 ../../mod/admin.php:635 msgid "Soapbox Account" -msgstr "Sandkasten-Account" +msgstr "Marktschreier-Konto" #: ../../mod/admin.php:182 ../../mod/admin.php:636 msgid "Community/Celebrity Account" -msgstr "Gemeinschafts-/Promi-Account" +msgstr "Forum/Promi-Konto" #: ../../mod/admin.php:183 ../../mod/admin.php:637 msgid "Automatic Friend Account" -msgstr "Automatischer Freundesaccount" +msgstr "Automatisches Freundekonto" #: ../../mod/admin.php:202 msgid "Message queues" @@ -3201,13 +3201,13 @@ msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt." #: ../../mod/admin.php:434 msgid "Accounts abandoned after x days" -msgstr "Accounts gelten nach x Tagen als unbenutzt" +msgstr "Nutzerkonten gelten nach x Tagen als unbenutzt" #: ../../mod/admin.php:434 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." -msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit." +msgstr "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Konten nicht mehr benutzt werden. 0 eingeben für kein Limit." #: ../../mod/admin.php:435 msgid "Allowed friend domains" @@ -3265,7 +3265,7 @@ msgstr "Unterbinde Mehrfachregistrierung" #: ../../mod/admin.php:441 msgid "Disallow users to register additional accounts for use as pages." -msgstr "Benutzern nicht erlauben, weitere Accounts als zusätzliche Profile anzulegen." +msgstr "Benutzern nicht erlauben, weitere Konten als zusätzliche Profile anzulegen." #: ../../mod/admin.php:442 msgid "OpenID support" @@ -3675,67 +3675,16 @@ msgstr "OpenID Protokollfehler. Keine ID zurückgegeben." #: ../../mod/openid.php:53 msgid "" "Account not found and OpenID registration is not permitted on this site." -msgstr "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet." +msgstr "Nutzerkonto wurde nicht gefunden, und OpenID-Registrierung ist auf diesem Server nicht gestattet." #: ../../mod/openid.php:93 ../../include/auth.php:99 #: ../../include/auth.php:162 msgid "Login failed." msgstr "Anmeldung fehlgeschlagen." -#: ../../mod/follow.php:30 -msgid "Connect URL missing." -msgstr "Connect-URL fehlt" - -#: ../../mod/follow.php:56 -msgid "" -"This site is not configured to allow communications with other networks." -msgstr "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann." - -#: ../../mod/follow.php:57 ../../mod/follow.php:72 -msgid "No compatible communication protocols or feeds were discovered." -msgstr "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden." - -#: ../../mod/follow.php:70 -msgid "The profile address specified does not provide adequate information." -msgstr "Die angegebene Profiladresse liefert unzureichende Informationen." - -#: ../../mod/follow.php:74 -msgid "An author or name was not found." -msgstr "Es wurde kein Autor oder Name gefunden." - -#: ../../mod/follow.php:76 -msgid "No browser URL could be matched to this address." -msgstr "Zu dieser Adresse konnte keine passende Browser URL gefunden werden." - -#: ../../mod/follow.php:78 -msgid "" -"Unable to match @-style Identity Address with a known protocol or email " -"contact." -msgstr "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen." - -#: ../../mod/follow.php:79 -msgid "Use mailto: in front of address to force email check." -msgstr "Verwende mailto: vor der Email Adresse um eine Überprüfung der Email Adresse zu erzwingen." - -#: ../../mod/follow.php:85 -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:90 -msgid "" -"Limited profile. This person will be unable to receive direct/personal " -"notifications from you." -msgstr "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von dir erhalten können." - -#: ../../mod/follow.php:161 -msgid "Unable to retrieve contact information." -msgstr "Konnte die Kontaktinformationen nicht empfangen." - -#: ../../mod/follow.php:216 -msgid "following" -msgstr "folgen" +#: ../../mod/follow.php:27 +msgid "Contact added" +msgstr "Kontakt hinzugefügt" #: ../../mod/common.php:42 msgid "Common Friends" @@ -3762,8 +3711,8 @@ msgstr "Keine Applikationen installiert." msgid "Search" msgstr "Suche" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:392 -#: ../../mod/profiles.php:506 ../../mod/dfrn_confirm.php:62 +#: ../../mod/profiles.php:21 ../../mod/profiles.php:395 +#: ../../mod/profiles.php:509 ../../mod/dfrn_confirm.php:62 msgid "Profile not found." msgstr "Profil nicht gefunden." @@ -3771,285 +3720,289 @@ msgstr "Profil nicht gefunden." msgid "Profile Name is required." msgstr "Profilname ist erforderlich." -#: ../../mod/profiles.php:151 +#: ../../mod/profiles.php:152 msgid "Marital Status" msgstr "Familienstand" -#: ../../mod/profiles.php:155 +#: ../../mod/profiles.php:156 msgid "Romantic Partner" msgstr "Romanze" -#: ../../mod/profiles.php:159 +#: ../../mod/profiles.php:160 msgid "Work/Employment" msgstr "Arbeit / Beschäftigung" -#: ../../mod/profiles.php:162 +#: ../../mod/profiles.php:163 msgid "Religion" msgstr "Religion" -#: ../../mod/profiles.php:166 +#: ../../mod/profiles.php:167 msgid "Political Views" msgstr "Politische Ansichten" -#: ../../mod/profiles.php:170 +#: ../../mod/profiles.php:171 msgid "Gender" msgstr "Geschlecht" -#: ../../mod/profiles.php:174 +#: ../../mod/profiles.php:175 msgid "Sexual Preference" msgstr "Sexuelle Vorlieben" -#: ../../mod/profiles.php:178 +#: ../../mod/profiles.php:179 msgid "Homepage" msgstr "Webseite" -#: ../../mod/profiles.php:182 +#: ../../mod/profiles.php:183 msgid "Interests" msgstr "Interessen" -#: ../../mod/profiles.php:186 +#: ../../mod/profiles.php:187 msgid "Address" msgstr "Adresse" -#: ../../mod/profiles.php:193 +#: ../../mod/profiles.php:194 msgid "Location" msgstr "Wohnort" -#: ../../mod/profiles.php:270 +#: ../../mod/profiles.php:273 msgid "Profile updated." msgstr "Profil aktualisiert." -#: ../../mod/profiles.php:337 +#: ../../mod/profiles.php:340 msgid " and " msgstr " und " -#: ../../mod/profiles.php:345 +#: ../../mod/profiles.php:348 msgid "public profile" msgstr "öffentliches Profil" -#: ../../mod/profiles.php:348 +#: ../../mod/profiles.php:351 #, php-format msgid "%1$s changed %2$s to “%3$s”" msgstr "%1$s hat %2$s geändert auf “%3$s”" -#: ../../mod/profiles.php:349 +#: ../../mod/profiles.php:352 #, php-format msgid " - Visit %1$s's %2$s" msgstr " – %1$ss %2$s besuchen" -#: ../../mod/profiles.php:352 +#: ../../mod/profiles.php:355 #, php-format msgid "%1$s has an updated %2$s, changing %3$s." msgstr "%1$s hat folgendes aktualisiert %2$s, verändert wurde %3$s." -#: ../../mod/profiles.php:411 +#: ../../mod/profiles.php:414 msgid "Profile deleted." msgstr "Profil gelöscht." -#: ../../mod/profiles.php:429 ../../mod/profiles.php:463 +#: ../../mod/profiles.php:432 ../../mod/profiles.php:466 msgid "Profile-" msgstr "Profil-" -#: ../../mod/profiles.php:448 ../../mod/profiles.php:490 +#: ../../mod/profiles.php:451 ../../mod/profiles.php:493 msgid "New profile created." msgstr "Neues Profil angelegt." -#: ../../mod/profiles.php:469 +#: ../../mod/profiles.php:472 msgid "Profile unavailable to clone." msgstr "Profil nicht zum Duplizieren verfügbar." -#: ../../mod/profiles.php:527 +#: ../../mod/profiles.php:530 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "Liste der Kontakte vor Betrachtern dieses Profils verbergen?" -#: ../../mod/profiles.php:550 +#: ../../mod/profiles.php:553 msgid "Edit Profile Details" msgstr "Profil bearbeiten" -#: ../../mod/profiles.php:552 +#: ../../mod/profiles.php:555 msgid "View this profile" msgstr "Dieses Profil anzeigen" -#: ../../mod/profiles.php:553 +#: ../../mod/profiles.php:556 msgid "Create a new profile using these settings" msgstr "Neues Profil anlegen und diese Einstellungen verwenden" -#: ../../mod/profiles.php:554 +#: ../../mod/profiles.php:557 msgid "Clone this profile" msgstr "Dieses Profil duplizieren" -#: ../../mod/profiles.php:555 +#: ../../mod/profiles.php:558 msgid "Delete this profile" msgstr "Dieses Profil löschen" -#: ../../mod/profiles.php:556 +#: ../../mod/profiles.php:559 msgid "Profile Name:" msgstr "Profilname:" -#: ../../mod/profiles.php:557 +#: ../../mod/profiles.php:560 msgid "Your Full Name:" msgstr "Dein kompletter Name:" -#: ../../mod/profiles.php:558 +#: ../../mod/profiles.php:561 msgid "Title/Description:" msgstr "Titel/Beschreibung:" -#: ../../mod/profiles.php:559 +#: ../../mod/profiles.php:562 msgid "Your Gender:" msgstr "Dein Geschlecht:" -#: ../../mod/profiles.php:560 +#: ../../mod/profiles.php:563 #, php-format msgid "Birthday (%s):" msgstr "Geburtstag (%s):" -#: ../../mod/profiles.php:561 +#: ../../mod/profiles.php:564 msgid "Street Address:" msgstr "Adresse:" -#: ../../mod/profiles.php:562 +#: ../../mod/profiles.php:565 msgid "Locality/City:" msgstr "Wohnort/Stadt:" -#: ../../mod/profiles.php:563 +#: ../../mod/profiles.php:566 msgid "Postal/Zip Code:" msgstr "Postleitzahl:" -#: ../../mod/profiles.php:564 +#: ../../mod/profiles.php:567 msgid "Country:" msgstr "Land:" -#: ../../mod/profiles.php:565 +#: ../../mod/profiles.php:568 msgid "Region/State:" msgstr "Region/Bundesstaat:" -#: ../../mod/profiles.php:566 +#: ../../mod/profiles.php:569 msgid " Marital Status:" msgstr " Beziehungsstatus:" -#: ../../mod/profiles.php:567 +#: ../../mod/profiles.php:570 msgid "Who: (if applicable)" msgstr "Wer: (falls anwendbar)" -#: ../../mod/profiles.php:568 +#: ../../mod/profiles.php:571 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "Beispiele: cathy123, Cathy Williams, cathy@example.com" -#: ../../mod/profiles.php:569 +#: ../../mod/profiles.php:572 msgid "Since [date]:" msgstr "Seit [Datum]:" -#: ../../mod/profiles.php:570 ../../include/profile_advanced.php:46 +#: ../../mod/profiles.php:573 ../../include/profile_advanced.php:46 msgid "Sexual Preference:" msgstr "Sexuelle Vorlieben:" -#: ../../mod/profiles.php:571 +#: ../../mod/profiles.php:574 msgid "Homepage URL:" msgstr "Adresse der Homepage:" -#: ../../mod/profiles.php:572 ../../include/profile_advanced.php:52 +#: ../../mod/profiles.php:575 ../../include/profile_advanced.php:50 +msgid "Hometown:" +msgstr "Wohnort:" + +#: ../../mod/profiles.php:576 ../../include/profile_advanced.php:54 msgid "Political Views:" msgstr "Politische Ansichten:" -#: ../../mod/profiles.php:573 +#: ../../mod/profiles.php:577 msgid "Religious Views:" msgstr "Religiöse Ansichten:" -#: ../../mod/profiles.php:574 +#: ../../mod/profiles.php:578 msgid "Public Keywords:" msgstr "Öffentliche Schlüsselwörter:" -#: ../../mod/profiles.php:575 +#: ../../mod/profiles.php:579 msgid "Private Keywords:" msgstr "Private Schlüsselwörter:" -#: ../../mod/profiles.php:576 +#: ../../mod/profiles.php:580 msgid "Example: fishing photography software" msgstr "Beispiel: Fischen Fotografie Software" -#: ../../mod/profiles.php:577 +#: ../../mod/profiles.php:581 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "(Wird verwendet, um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)" -#: ../../mod/profiles.php:578 +#: ../../mod/profiles.php:582 msgid "(Used for searching profiles, never shown to others)" msgstr "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)" -#: ../../mod/profiles.php:579 +#: ../../mod/profiles.php:583 msgid "Tell us about yourself..." msgstr "Erzähle uns ein bisschen von dir …" -#: ../../mod/profiles.php:580 +#: ../../mod/profiles.php:584 msgid "Hobbies/Interests" msgstr "Hobbies/Interessen" -#: ../../mod/profiles.php:581 +#: ../../mod/profiles.php:585 msgid "Contact information and Social Networks" msgstr "Kontaktinformationen und Soziale Netzwerke" -#: ../../mod/profiles.php:582 +#: ../../mod/profiles.php:586 msgid "Musical interests" msgstr "Musikalische Interessen" -#: ../../mod/profiles.php:583 +#: ../../mod/profiles.php:587 msgid "Books, literature" msgstr "Literatur/Bücher" -#: ../../mod/profiles.php:584 +#: ../../mod/profiles.php:588 msgid "Television" msgstr "Fernsehen" -#: ../../mod/profiles.php:585 +#: ../../mod/profiles.php:589 msgid "Film/dance/culture/entertainment" msgstr "Filme/Tänze/Kultur/Unterhaltung" -#: ../../mod/profiles.php:586 +#: ../../mod/profiles.php:590 msgid "Love/romance" msgstr "Liebesleben" -#: ../../mod/profiles.php:587 +#: ../../mod/profiles.php:591 msgid "Work/employment" msgstr "Arbeit/Beschäftigung" -#: ../../mod/profiles.php:588 +#: ../../mod/profiles.php:592 msgid "School/education" msgstr "Schule/Ausbildung" -#: ../../mod/profiles.php:593 +#: ../../mod/profiles.php:597 msgid "" "This is your public profile.
It may " "be visible to anybody using the internet." msgstr "Dies ist dein öffentliches Profil.
Es könnte für jeden Nutzer des Internets sichtbar sein." -#: ../../mod/profiles.php:603 ../../mod/directory.php:111 +#: ../../mod/profiles.php:607 ../../mod/directory.php:111 msgid "Age: " msgstr "Alter: " -#: ../../mod/profiles.php:639 +#: ../../mod/profiles.php:644 msgid "Edit/Manage Profiles" msgstr "Verwalte/Editiere Profile" -#: ../../mod/profiles.php:640 ../../boot.php:1066 +#: ../../mod/profiles.php:645 ../../boot.php:1066 msgid "Change profile photo" msgstr "Profilbild ändern" -#: ../../mod/profiles.php:641 ../../boot.php:1067 +#: ../../mod/profiles.php:646 ../../boot.php:1067 msgid "Create New Profile" msgstr "Neues Profil anlegen" -#: ../../mod/profiles.php:652 ../../boot.php:1077 +#: ../../mod/profiles.php:657 ../../boot.php:1077 msgid "Profile Image" msgstr "Profilbild" -#: ../../mod/profiles.php:654 ../../boot.php:1080 +#: ../../mod/profiles.php:659 ../../boot.php:1080 msgid "visible to everybody" msgstr "sichtbar für jeden" -#: ../../mod/profiles.php:655 ../../boot.php:1081 +#: ../../mod/profiles.php:660 ../../boot.php:1081 msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" -#: ../../mod/filer.php:29 ../../include/conversation.php:941 +#: ../../mod/filer.php:29 ../../include/conversation.php:947 msgid "Save to Folder:" msgstr "In diesen Ordner verschieben:" @@ -4075,7 +4028,7 @@ msgid "" "Delegates are able to manage all aspects of this account/page except for " "basic account settings. Please do not delegate your personal account to " "anybody that you do not trust completely." -msgstr "Bevollmächtigte sind in der Lage alle Aspekte dieses Accounts/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Accounts. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust." +msgstr "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust!" #: ../../mod/delegate.php:124 msgid "Existing Page Managers" @@ -4321,7 +4274,7 @@ msgstr "Mit Facebook verbinden" #: ../../addon/facebook/facebook.php:550 msgid "Install Facebook connector for this account." -msgstr "Facebook-Connector für diesen Account installieren." +msgstr "Facebook-Connector für dieses Konto installieren." #: ../../addon/facebook/facebook.php:557 msgid "Remove Facebook connector" @@ -4506,7 +4459,7 @@ msgid "" "Hi %1$s,\n" "\n" "The connection between your accounts on %2$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3$sre-authenticate the Facebook-connector%4$s." -msgstr "Hi %1$s,\n\ndie Verbindung von deinem Account auf %2$s und Facebook funktioniert derzeit nicht. Dies ist im Allgemeinen das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du %3$sden Facebook-Connector neu Authentifizieren%4$s." +msgstr "Hallo %1$s,\n\ndie Verbindung zwischen deinem Account auf %2$s und Facebook funktioniert derzeit nicht. Dies ist normalerweise das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du %3$sden Facebook-Connector neu authentifizieren%4$s." #: ../../addon/privacy_image_cache/privacy_image_cache.php:147 msgid "Lifetime of the cache (in hours)" @@ -4650,7 +4603,7 @@ msgid "Forums" msgstr "Foren" #: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87 -#: ../../include/contact_widgets.php:188 ../../include/conversation.php:470 +#: ../../include/contact_widgets.php:188 ../../include/conversation.php:476 #: ../../boot.php:515 msgid "show more" msgstr "mehr anzeigen" @@ -4695,7 +4648,7 @@ msgid "Latest likes" msgstr "Neueste Favoriten" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1313 +#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1314 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "Veranstaltung" @@ -4884,7 +4837,7 @@ msgstr "Dein Konto auf %s wird in ein paar Tagen verfallen." #: ../../addon/public_server/public_server.php:127 msgid "Your Friendica account is about to expire." -msgstr "Dein Friendica-Account wird in Kürze auslaufen." +msgstr "Dein Friendica-Konto wird in Kürze auslaufen." #: ../../addon/public_server/public_server.php:128 #, php-format @@ -5155,7 +5108,7 @@ msgstr "Gravatar Einstellungen aktualisiert." #: ../../addon/testdrive/testdrive.php:95 msgid "Your Friendica test account is about to expire." -msgstr "Dein Friendica Test Konto wird bald verfallen." +msgstr "Dein Friendica-Testkonto wird bald verfallen." #: ../../addon/testdrive/testdrive.php:96 #, php-format @@ -5163,7 +5116,7 @@ msgid "" "Hi %1$s,\n" "\n" "Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com." -msgstr "Hallo %1$s,\n\ndein Test-Konto auf %2$s wird in weniger als fünf Tagen verfallen. Wir hoffen, dass dir dieser Testlauf gefallen hat, so dass du die Gelegenheit nutzt und dir eine feste Friendica-Site für deine integrierte Social-Network-Kommunikation suchst. Eine Liste öffentlicher Sites findest du auf http://dir.friendica.com/siteinfo. Um mehr Information darüber zu bekommen, wie man einen eigenen Friendica-Server aufsetzt, kannst du auch einen Blick auf die Friendica Projektseite werfen: http://friendica.com" +msgstr "Hallo %1$s,\n\ndein Testkonto auf %2$s wird in weniger als fünf Tagen verfallen. Wir hoffen, dass dir dieser Testlauf gefallen hat, so dass du die Gelegenheit nutzt und dir einen normalen Friendica-Server für deine integrierte Social-Network-Kommunikation suchst. Eine Liste öffentlicher Server findest du auf http://dir.friendica.com/siteinfo . Um mehr Information darüber zu bekommen, wie man einen eigenen Friendica-Server aufsetzt, kannst du auch einen Blick auf die Friendica-Projektseite werfen: http://friendica.com" #: ../../addon/pageheader/pageheader.php:50 msgid "\"pageheader\" Settings" @@ -5265,7 +5218,7 @@ msgid "" "security code from StatusNet which you have to copy into the input box below" " and submit the form. Only your public posts will be posted" " to StatusNet." -msgstr "Um deinen Account mit einem StatusNet-Account zu verknüpfen, klicke den Button an, um einen Sicherheitscode von StatusNet zu erhalten, und kopiere diesen in das Eingabefeld weiter unten. Es werden ausschließlich deine öffentlichen Nachrichten an StatusNet gesendet." +msgstr "Um dein Konto mit einem StatusNet-Konto zu verknüpfen, klicke den Button an, um einen Sicherheitscode von StatusNet zu erhalten, und kopiere diesen in das Eingabefeld weiter unten. Es werden ausschließlich deine öffentlichen Nachrichten an StatusNet gesendet." #: ../../addon/statusnet/statusnet.php:311 msgid "Log in with StatusNet" @@ -5304,7 +5257,7 @@ msgid "" "details from unknown viewers?) the link potentially included in public " "postings relayed to StatusNet will lead the visitor to a blank page " "informing the visitor that the access to your profile has been restricted." -msgstr "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an deinen StatusNet Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde." +msgstr "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an deinen StatusNet-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde." #: ../../addon/statusnet/statusnet.php:339 msgid "Allow posting to StatusNet" @@ -5521,7 +5474,7 @@ msgid "" "details from unknown viewers?) the link potentially included in public " "postings relayed to Twitter will lead the visitor to a blank page informing " "the visitor that the access to your profile has been restricted." -msgstr "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an an deinen Twitter Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde." +msgstr "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an an deinen Twitter-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde." #: ../../addon/twitter/twitter.php:195 msgid "Allow posting to Twitter" @@ -5873,51 +5826,51 @@ msgstr "für %1$d %2$s" msgid "Homepage:" msgstr "Homepage:" -#: ../../include/profile_advanced.php:50 +#: ../../include/profile_advanced.php:52 msgid "Tags:" msgstr "Tags" -#: ../../include/profile_advanced.php:54 +#: ../../include/profile_advanced.php:56 msgid "Religion:" msgstr "Religion:" -#: ../../include/profile_advanced.php:56 +#: ../../include/profile_advanced.php:58 msgid "About:" msgstr "Über:" -#: ../../include/profile_advanced.php:58 +#: ../../include/profile_advanced.php:60 msgid "Hobbies/Interests:" msgstr "Hobbies/Interessen:" -#: ../../include/profile_advanced.php:60 +#: ../../include/profile_advanced.php:62 msgid "Contact information and Social Networks:" msgstr "Kontaktinformationen und Soziale Netzwerke:" -#: ../../include/profile_advanced.php:62 +#: ../../include/profile_advanced.php:64 msgid "Musical interests:" msgstr "Musikalische Interessen:" -#: ../../include/profile_advanced.php:64 +#: ../../include/profile_advanced.php:66 msgid "Books, literature:" msgstr "Literatur/Bücher:" -#: ../../include/profile_advanced.php:66 +#: ../../include/profile_advanced.php:68 msgid "Television:" msgstr "Fernsehen:" -#: ../../include/profile_advanced.php:68 +#: ../../include/profile_advanced.php:70 msgid "Film/dance/culture/entertainment:" msgstr "Filme/Tänze/Kultur/Unterhaltung:" -#: ../../include/profile_advanced.php:70 +#: ../../include/profile_advanced.php:72 msgid "Love/Romance:" msgstr "Liebesleben:" -#: ../../include/profile_advanced.php:72 +#: ../../include/profile_advanced.php:74 msgid "Work/employment:" msgstr "Arbeit/Beschäftigung:" -#: ../../include/profile_advanced.php:74 +#: ../../include/profile_advanced.php:76 msgid "School/education:" msgstr "Schule/Ausbildung:" @@ -6237,7 +6190,7 @@ msgstr "Endet:" msgid "(no subject)" msgstr "(kein Betreff)" -#: ../../include/delivery.php:462 ../../include/enotify.php:23 +#: ../../include/delivery.php:462 ../../include/enotify.php:26 #: ../../include/notifier.php:684 msgid "noreply" msgstr "noreply" @@ -6345,51 +6298,51 @@ msgstr "November" msgid "December" msgstr "Dezember" -#: ../../include/text.php:924 +#: ../../include/text.php:925 msgid "bytes" msgstr "Byte" -#: ../../include/text.php:944 ../../include/text.php:959 +#: ../../include/text.php:945 ../../include/text.php:960 msgid "remove" msgstr "löschen" -#: ../../include/text.php:944 ../../include/text.php:959 +#: ../../include/text.php:945 ../../include/text.php:960 msgid "[remove]" msgstr "[löschen]" -#: ../../include/text.php:947 +#: ../../include/text.php:948 msgid "Categories:" msgstr "Kategorien:" -#: ../../include/text.php:962 +#: ../../include/text.php:963 msgid "Filed under:" msgstr "Abgelegt unter:" -#: ../../include/text.php:978 ../../include/text.php:990 +#: ../../include/text.php:979 ../../include/text.php:991 msgid "Click to open/close" msgstr "Zum öffnen/schließen klicken" -#: ../../include/text.php:1095 ../../include/user.php:230 +#: ../../include/text.php:1096 ../../include/user.php:230 msgid "default" msgstr "standard" -#: ../../include/text.php:1107 +#: ../../include/text.php:1108 msgid "Select an alternate language" msgstr "Alternative Sprache auswählen" -#: ../../include/text.php:1317 +#: ../../include/text.php:1318 msgid "activity" msgstr "Aktivität" -#: ../../include/text.php:1319 +#: ../../include/text.php:1320 msgid "comment" msgstr "Kommentar" -#: ../../include/text.php:1320 +#: ../../include/text.php:1321 msgid "post" msgstr "Beitrag" -#: ../../include/text.php:1475 +#: ../../include/text.php:1476 msgid "Item filed" msgstr "Beitrag abgelegt" @@ -6475,7 +6428,7 @@ msgstr "Homepage" #: ../../include/nav.php:81 msgid "Create an account" -msgstr "Account erstellen" +msgstr "Nutzerkonto erstellen" #: ../../include/nav.php:86 msgid "Help and documentation" @@ -6715,11 +6668,11 @@ msgstr "%1$d %2$s her" msgid "From: " msgstr "Von: " -#: ../../include/bbcode.php:203 ../../include/bbcode.php:223 +#: ../../include/bbcode.php:210 ../../include/bbcode.php:230 msgid "$1 wrote:" msgstr "$1 hat geschrieben:" -#: ../../include/bbcode.php:238 ../../include/bbcode.php:307 +#: ../../include/bbcode.php:245 ../../include/bbcode.php:314 msgid "Image/photo" msgstr "Bild/Foto" @@ -6749,181 +6702,236 @@ msgstr "Danke," msgid "%s Administrator" msgstr "der Administrator von %s" -#: ../../include/enotify.php:35 +#: ../../include/enotify.php:38 #, php-format msgid "%s " msgstr "%s " -#: ../../include/enotify.php:39 +#: ../../include/enotify.php:42 #, php-format msgid "[Friendica:Notify] New mail received at %s" msgstr "[Friendica Meldung] Neue Nachricht erhalten von %s" -#: ../../include/enotify.php:41 +#: ../../include/enotify.php:44 #, php-format msgid "%s sent you a new private message at %s." msgstr "%s hat dir eine neue private Nachricht auf %s geschrieben." -#: ../../include/enotify.php:42 +#: ../../include/enotify.php:45 #, php-format msgid "%s sent you %s." msgstr "%s hat Dir %s geschickt" -#: ../../include/enotify.php:42 +#: ../../include/enotify.php:45 msgid "a private message" msgstr "eine private Nachricht" -#: ../../include/enotify.php:43 +#: ../../include/enotify.php:46 #, php-format msgid "Please visit %s to view and/or reply to your private messages." msgstr "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten." -#: ../../include/enotify.php:73 +#: ../../include/enotify.php:76 #, php-format msgid "%s's" msgstr "%s's" -#: ../../include/enotify.php:77 +#: ../../include/enotify.php:80 msgid "your" msgstr "Dein" -#: ../../include/enotify.php:84 +#: ../../include/enotify.php:87 #, php-format msgid "[Friendica:Notify] Comment to conversation #%d by %s" msgstr "[Friendica Meldung] Kommentar zum Beitrag #%d von %s" -#: ../../include/enotify.php:85 +#: ../../include/enotify.php:88 #, php-format msgid "%s commented on an item/conversation you have been following." msgstr "%s hat einen Beitrag kommentiert, dem du folgst." -#: ../../include/enotify.php:86 +#: ../../include/enotify.php:89 #, php-format msgid "%s commented on %s." msgstr "%s kommentierte %s." -#: ../../include/enotify.php:88 ../../include/enotify.php:101 -#: ../../include/enotify.php:112 ../../include/enotify.php:123 +#: ../../include/enotify.php:91 ../../include/enotify.php:104 +#: ../../include/enotify.php:115 ../../include/enotify.php:126 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren." -#: ../../include/enotify.php:95 +#: ../../include/enotify.php:98 #, php-format msgid "[Friendica:Notify] %s posted to your profile wall" msgstr "[Friendica Meldung] %s hat auf Deine Pinnwand geschrieben" -#: ../../include/enotify.php:97 +#: ../../include/enotify.php:100 #, php-format msgid "%s posted to your profile wall at %s" msgstr "%s hat auf deine Pinnwand bei %s gepostet" -#: ../../include/enotify.php:99 +#: ../../include/enotify.php:102 #, php-format msgid "%s posted to %s" msgstr "%s schrieb an %s" -#: ../../include/enotify.php:99 +#: ../../include/enotify.php:102 msgid "your profile wall." msgstr "Deine Pinnwand" -#: ../../include/enotify.php:108 +#: ../../include/enotify.php:111 #, php-format msgid "[Friendica:Notify] %s tagged you" msgstr "[Friendica Meldung] %s hat Dich erwähnt" -#: ../../include/enotify.php:109 +#: ../../include/enotify.php:112 #, php-format msgid "%s tagged you at %s" msgstr "%s hat dich auf %s erwähnt" -#: ../../include/enotify.php:110 +#: ../../include/enotify.php:113 #, php-format msgid "%s %s." msgstr "%s %s." -#: ../../include/enotify.php:110 +#: ../../include/enotify.php:113 msgid "tagged you" msgstr "erwähnte Dich" -#: ../../include/enotify.php:119 +#: ../../include/enotify.php:122 #, php-format msgid "[Friendica:Notify] %s tagged your post" msgstr "[Friendica Meldung] %s markierte Deinen Beitrag" -#: ../../include/enotify.php:120 +#: ../../include/enotify.php:123 #, php-format msgid "%s tagged your post at %s" msgstr "%s hat deinen Beitrag auf %s getaggt" -#: ../../include/enotify.php:121 +#: ../../include/enotify.php:124 #, php-format msgid "%s tagged %s" msgstr "%s markierte %s" -#: ../../include/enotify.php:121 +#: ../../include/enotify.php:124 msgid "your post" msgstr "deinen Beitrag" -#: ../../include/enotify.php:130 +#: ../../include/enotify.php:133 msgid "[Friendica:Notify] Introduction received" msgstr "[Friendica Meldung] Kontaktanfrage erhalten" -#: ../../include/enotify.php:131 +#: ../../include/enotify.php:134 #, php-format msgid "You've received an introduction from '%s' at %s" msgstr "Du hast eine Kontaktanfrage von '%s' auf %s erhalten" -#: ../../include/enotify.php:132 +#: ../../include/enotify.php:135 #, php-format msgid "You've received %s from %s." msgstr "Du hast %s von %s erhalten." -#: ../../include/enotify.php:132 +#: ../../include/enotify.php:135 msgid "an introduction" msgstr "eine Kontaktanfrage" -#: ../../include/enotify.php:133 ../../include/enotify.php:150 +#: ../../include/enotify.php:136 ../../include/enotify.php:153 #, php-format msgid "You may visit their profile at %s" msgstr "Hier kannst du das Profil betrachten: %s" -#: ../../include/enotify.php:135 +#: ../../include/enotify.php:138 #, php-format msgid "Please visit %s to approve or reject the introduction." msgstr "Bitte besuche %s, um die Kontaktanfrage anzunehmen oder abzulehnen." -#: ../../include/enotify.php:142 +#: ../../include/enotify.php:145 msgid "[Friendica:Notify] Friend suggestion received" msgstr "[Friendica Meldung] Kontaktvorschlag erhalten" -#: ../../include/enotify.php:143 +#: ../../include/enotify.php:146 #, php-format msgid "You've received a friend suggestion from '%s' at %s" msgstr "Du hast von '%s' einen Kontaktvorschlag erhalten auf %s" -#: ../../include/enotify.php:144 +#: ../../include/enotify.php:147 #, php-format msgid "You've received %s for %s from %s." msgstr "Du hast %s für %s von %s erhalten." -#: ../../include/enotify.php:145 +#: ../../include/enotify.php:148 msgid "a friend suggestion" msgstr "ein Freunde Vorschlag" -#: ../../include/enotify.php:148 +#: ../../include/enotify.php:151 msgid "Name:" msgstr "Name:" -#: ../../include/enotify.php:149 +#: ../../include/enotify.php:152 msgid "Photo:" msgstr "Foto:" -#: ../../include/enotify.php:152 +#: ../../include/enotify.php:155 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen." +#: ../../include/follow.php:32 +msgid "Connect URL missing." +msgstr "Connect-URL fehlt" + +#: ../../include/follow.php:59 +msgid "" +"This site is not configured to allow communications with other networks." +msgstr "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann." + +#: ../../include/follow.php:60 ../../include/follow.php:75 +msgid "No compatible communication protocols or feeds were discovered." +msgstr "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden." + +#: ../../include/follow.php:73 +msgid "The profile address specified does not provide adequate information." +msgstr "Die angegebene Profiladresse liefert unzureichende Informationen." + +#: ../../include/follow.php:77 +msgid "An author or name was not found." +msgstr "Es wurde kein Autor oder Name gefunden." + +#: ../../include/follow.php:79 +msgid "No browser URL could be matched to this address." +msgstr "Zu dieser Adresse konnte keine passende Browser URL gefunden werden." + +#: ../../include/follow.php:81 +msgid "" +"Unable to match @-style Identity Address with a known protocol or email " +"contact." +msgstr "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen." + +#: ../../include/follow.php:82 +msgid "Use mailto: in front of address to force email check." +msgstr "Verwende mailto: vor der Email Adresse um eine Überprüfung der Email Adresse zu erzwingen." + +#: ../../include/follow.php:88 +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." + +#: ../../include/follow.php:93 +msgid "" +"Limited profile. This person will be unable to receive direct/personal " +"notifications from you." +msgstr "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von dir erhalten können." + +#: ../../include/follow.php:164 +msgid "Unable to retrieve contact information." +msgstr "Konnte die Kontaktinformationen nicht empfangen." + +#: ../../include/follow.php:218 +msgid "following" +msgstr "folgen" + #: ../../include/items.php:2740 msgid "A new person is sharing with you at " msgstr "Eine neue Person teilt mit dir auf " @@ -7031,30 +7039,30 @@ msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das msgid "stopped following" msgstr "wird nicht mehr gefolgt" -#: ../../include/Contact.php:203 ../../include/conversation.php:836 +#: ../../include/Contact.php:203 ../../include/conversation.php:842 msgid "View Status" msgstr "Pinnwand anschauen" -#: ../../include/Contact.php:204 ../../include/conversation.php:837 +#: ../../include/Contact.php:204 ../../include/conversation.php:843 msgid "View Profile" msgstr "Profil anschauen" -#: ../../include/Contact.php:205 ../../include/conversation.php:838 +#: ../../include/Contact.php:205 ../../include/conversation.php:844 msgid "View Photos" msgstr "Bilder anschauen" #: ../../include/Contact.php:206 ../../include/Contact.php:219 -#: ../../include/conversation.php:839 +#: ../../include/conversation.php:845 msgid "Network Posts" msgstr "Netzwerkbeiträge" #: ../../include/Contact.php:207 ../../include/Contact.php:219 -#: ../../include/conversation.php:840 +#: ../../include/conversation.php:846 msgid "Edit Contact" msgstr "Kontakt bearbeiten" #: ../../include/Contact.php:208 ../../include/Contact.php:219 -#: ../../include/conversation.php:841 +#: ../../include/conversation.php:847 msgid "Send PM" msgstr "Private Nachricht senden" @@ -7067,216 +7075,216 @@ msgstr "Nachricht/Beitrag" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert" -#: ../../include/conversation.php:321 ../../include/conversation.php:602 +#: ../../include/conversation.php:327 ../../include/conversation.php:608 msgid "Select" msgstr "Auswählen" -#: ../../include/conversation.php:338 ../../include/conversation.php:695 -#: ../../include/conversation.php:696 +#: ../../include/conversation.php:344 ../../include/conversation.php:701 +#: ../../include/conversation.php:702 #, php-format msgid "View %s's profile @ %s" msgstr "Das Profil von %s auf %s betrachten." -#: ../../include/conversation.php:348 ../../include/conversation.php:707 +#: ../../include/conversation.php:354 ../../include/conversation.php:713 #, php-format msgid "%s from %s" msgstr "%s von %s" -#: ../../include/conversation.php:363 +#: ../../include/conversation.php:369 msgid "View in context" msgstr "Im Zusammenhang betrachten" -#: ../../include/conversation.php:469 +#: ../../include/conversation.php:475 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d Kommentar" msgstr[1] "%d Kommentare" -#: ../../include/conversation.php:548 +#: ../../include/conversation.php:554 msgid "like" msgstr "mag ich" -#: ../../include/conversation.php:549 +#: ../../include/conversation.php:555 msgid "dislike" msgstr "mag ich nicht" -#: ../../include/conversation.php:551 +#: ../../include/conversation.php:557 msgid "Share this" msgstr "Teile dieses" -#: ../../include/conversation.php:551 +#: ../../include/conversation.php:557 msgid "share" msgstr "Teilen" -#: ../../include/conversation.php:575 +#: ../../include/conversation.php:581 msgid "Bold" msgstr "Fett" -#: ../../include/conversation.php:576 +#: ../../include/conversation.php:582 msgid "Italic" msgstr "Kursiv" -#: ../../include/conversation.php:577 +#: ../../include/conversation.php:583 msgid "Underline" msgstr "Unterstrichen" -#: ../../include/conversation.php:578 +#: ../../include/conversation.php:584 msgid "Quote" msgstr "Zitat" -#: ../../include/conversation.php:579 +#: ../../include/conversation.php:585 msgid "Code" msgstr "Code" -#: ../../include/conversation.php:580 +#: ../../include/conversation.php:586 msgid "Image" msgstr "Bild" -#: ../../include/conversation.php:581 +#: ../../include/conversation.php:587 msgid "Link" msgstr "Verweis" -#: ../../include/conversation.php:582 +#: ../../include/conversation.php:588 msgid "Video" msgstr "Video" -#: ../../include/conversation.php:615 +#: ../../include/conversation.php:621 msgid "add star" msgstr "markieren" -#: ../../include/conversation.php:616 +#: ../../include/conversation.php:622 msgid "remove star" msgstr "Markierung entfernen" -#: ../../include/conversation.php:617 +#: ../../include/conversation.php:623 msgid "toggle star status" msgstr "Markierung umschalten" -#: ../../include/conversation.php:620 +#: ../../include/conversation.php:626 msgid "starred" msgstr "markiert" -#: ../../include/conversation.php:621 +#: ../../include/conversation.php:627 msgid "add tag" msgstr "Tag hinzufügen" -#: ../../include/conversation.php:625 +#: ../../include/conversation.php:631 msgid "save to folder" msgstr "In Ordner speichern" -#: ../../include/conversation.php:697 +#: ../../include/conversation.php:703 msgid "to" msgstr "zu" -#: ../../include/conversation.php:698 +#: ../../include/conversation.php:704 msgid "Wall-to-Wall" msgstr "Wall-to-Wall" -#: ../../include/conversation.php:699 +#: ../../include/conversation.php:705 msgid "via Wall-To-Wall:" msgstr "via Wall-To-Wall:" -#: ../../include/conversation.php:744 +#: ../../include/conversation.php:750 msgid "Delete Selected Items" msgstr "Lösche die markierten Beiträge" -#: ../../include/conversation.php:895 +#: ../../include/conversation.php:901 #, php-format msgid "%s likes this." msgstr "%s mag das." -#: ../../include/conversation.php:895 +#: ../../include/conversation.php:901 #, php-format msgid "%s doesn't like this." msgstr "%s mag das nicht." -#: ../../include/conversation.php:899 +#: ../../include/conversation.php:905 #, php-format msgid "%2$d people like this." msgstr "%2$d Leute mögen das." -#: ../../include/conversation.php:901 +#: ../../include/conversation.php:907 #, php-format msgid "%2$d people don't like this." msgstr "%2$d Leute mögen das nicht." -#: ../../include/conversation.php:907 +#: ../../include/conversation.php:913 msgid "and" msgstr "und" -#: ../../include/conversation.php:910 +#: ../../include/conversation.php:916 #, php-format msgid ", and %d other people" msgstr " und %d andere" -#: ../../include/conversation.php:911 +#: ../../include/conversation.php:917 #, php-format msgid "%s like this." msgstr "%s mögen das." -#: ../../include/conversation.php:911 +#: ../../include/conversation.php:917 #, php-format msgid "%s don't like this." msgstr "%s mögen das nicht." -#: ../../include/conversation.php:936 +#: ../../include/conversation.php:942 msgid "Visible to everybody" msgstr "Für jedermann sichtbar" -#: ../../include/conversation.php:938 +#: ../../include/conversation.php:944 msgid "Please enter a video link/URL:" msgstr "Bitte Link/URL zum Video einfügen:" -#: ../../include/conversation.php:939 +#: ../../include/conversation.php:945 msgid "Please enter an audio link/URL:" msgstr "Bitte Link/URL zum Audio einfügen:" -#: ../../include/conversation.php:940 +#: ../../include/conversation.php:946 msgid "Tag term:" msgstr "Tag:" -#: ../../include/conversation.php:942 +#: ../../include/conversation.php:948 msgid "Where are you right now?" msgstr "Wo hältst du dich jetzt gerade auf?" -#: ../../include/conversation.php:985 +#: ../../include/conversation.php:991 msgid "upload photo" msgstr "Bild hochladen" -#: ../../include/conversation.php:987 +#: ../../include/conversation.php:993 msgid "attach file" msgstr "Datei anhängen" -#: ../../include/conversation.php:989 +#: ../../include/conversation.php:995 msgid "web link" msgstr "Weblink" -#: ../../include/conversation.php:990 +#: ../../include/conversation.php:996 msgid "Insert video link" msgstr "Video-Adresse einfügen" -#: ../../include/conversation.php:991 +#: ../../include/conversation.php:997 msgid "video link" msgstr "Video-Link" -#: ../../include/conversation.php:992 +#: ../../include/conversation.php:998 msgid "Insert audio link" msgstr "Audio-Adresse einfügen" -#: ../../include/conversation.php:993 +#: ../../include/conversation.php:999 msgid "audio link" msgstr "Audio-Link" -#: ../../include/conversation.php:995 +#: ../../include/conversation.php:1001 msgid "set location" msgstr "Ort setzen" -#: ../../include/conversation.php:997 +#: ../../include/conversation.php:1003 msgid "clear location" msgstr "Ort löschen" -#: ../../include/conversation.php:1004 +#: ../../include/conversation.php:1010 msgid "permissions" msgstr "Zugriffsrechte" @@ -7300,7 +7308,7 @@ msgstr "Updatefehler bei %s" #: ../../boot.php:791 msgid "Create a New Account" -msgstr "Neuen Account erstellen" +msgstr "Neues Konto erstellen" #: ../../boot.php:815 msgid "Nickname or Email address: " diff --git a/view/de/strings.php b/view/de/strings.php index 1b0ef4b89..b49df0e80 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -15,9 +15,9 @@ $a->strings["WARNING: This is highly advanced and if you enter $a->strings["Please use your browser 'Back' button now if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button deines Browsers jetzt, wenn du dir unsicher bist, was du tun willst."; $a->strings["Return to contact editor"] = "Zurück zum Kontakteditor"; $a->strings["Name"] = "Name"; -$a->strings["Account Nickname"] = "Account-Spitzname"; +$a->strings["Account Nickname"] = "Konto-Spitzname"; $a->strings["@Tagname - overrides Name/Nickname"] = "@Tagname - überschreibt Name/Spitzname"; -$a->strings["Account URL"] = "Account-URL"; +$a->strings["Account URL"] = "Konto-URL"; $a->strings["Friend Request URL"] = "URL für Freundschaftsanfragen"; $a->strings["Friend Confirm URL"] = "URL für Bestätigungen von Freundschaftsanfragen"; $a->strings["Notification Endpoint URL"] = "URL-Endpunkt für Benachrichtigungen"; @@ -157,7 +157,7 @@ $a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spa $a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen."; $a->strings["Invalid locator"] = "Ungültiger Locator"; $a->strings["Invalid email address."] = "Ungültige E-Mail Adresse."; -$a->strings["This account has not been configured for email. Request failed."] = "Dieses Konto ist nicht für Email konfiguriert. Anfrage fehlgeschlagen."; +$a->strings["This account has not been configured for email. Request failed."] = "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen."; $a->strings["Unable to resolve your name at the provided location."] = "Konnte deinen Namen an der angegebenen Stelle nicht finden."; $a->strings["You have already introduced yourself here."] = "Du hast dich hier bereits vorgestellt."; $a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob du bereits mit %s befreundet bist."; @@ -371,7 +371,7 @@ $a->strings["Contacts"] = "Kontakte"; $a->strings["Search your contacts"] = "Suche in deinen Kontakten"; $a->strings["Finding: "] = "Funde: "; $a->strings["Find"] = "Finde"; -$a->strings["No valid account found."] = "Kein gültiger Account gefunden."; +$a->strings["No valid account found."] = "Kein gültiges Konto gefunden."; $a->strings["Password reset request issued. Check your email."] = "Zurücksetzen des Passworts eingeleitet. Bitte überprüfe deine E-Mail."; $a->strings["Password reset requested at %s"] = "Anfrage zum Zurücksetzen des Passworts auf %s erhalten"; $a->strings["Administrator"] = "Administrator"; @@ -386,17 +386,17 @@ $a->strings["Forgot your Password?"] = "Hast du dein Passwort vergessen?"; $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine Email-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet."; $a->strings["Nickname or Email: "] = "Spitzname oder Email:"; $a->strings["Reset"] = "Zurücksetzen"; -$a->strings["Account settings"] = "Account-Einstellungen"; +$a->strings["Account settings"] = "Kontoeinstellungen"; $a->strings["Display settings"] = "Anzeige-Einstellungen"; $a->strings["Connector settings"] = "Connector-Einstellungen"; $a->strings["Plugin settings"] = "Plugin-Einstellungen"; $a->strings["Connected apps"] = "Verbundene Programme"; $a->strings["Export personal data"] = "Persönliche Daten exportieren"; -$a->strings["Remove account"] = "Account entfernen"; +$a->strings["Remove account"] = "Konto löschen"; $a->strings["Settings"] = "Einstellungen"; $a->strings["Missing some important data!"] = "Wichtige Daten fehlen!"; $a->strings["Update"] = "Aktualisierungen"; -$a->strings["Failed to connect with email account using the settings provided."] = "Konnte das Email Konto mit den angegebenen Einstellungen nicht erreichen."; +$a->strings["Failed to connect with email account using the settings provided."] = "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich."; $a->strings["Email settings updated."] = "EMail Einstellungen bearbeitet."; $a->strings["Passwords do not match. Password unchanged."] = "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert."; $a->strings["Empty passwords are not allowed. Password unchanged."] = "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert."; @@ -449,26 +449,26 @@ $a->strings["Minimum of 10 seconds, no maximum"] = "Minimal 10 Sekunden, kein Ma $a->strings["Number of items to display on the network page:"] = "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: "; $a->strings["Maximum of 100 items"] = "Maximal 100 Beiträge"; $a->strings["Don't show emoticons"] = "Keine Smilies anzeigen"; -$a->strings["Normal Account Page"] = "Normale Account Seite"; -$a->strings["This account is a normal personal profile"] = "Dieser Account ist ein normales persönliches Profil"; -$a->strings["Soapbox Page"] = "Sandkasten Seite"; +$a->strings["Normal Account Page"] = "Normales Konto"; +$a->strings["This account is a normal personal profile"] = "Dieses Konto ist ein normales persönliches Profil"; +$a->strings["Soapbox Page"] = "Marktschreier-Konto"; $a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert"; -$a->strings["Community Forum/Celebrity Account"] = "Gemeinschafts Forum / Promi Konto"; +$a->strings["Community Forum/Celebrity Account"] = "Forum/Promi-Konto"; $a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Kontaktanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert"; $a->strings["Automatic Friend Page"] = "Automatische Freunde Seite"; $a->strings["Automatically approve all connection/friend requests as friends"] = "Kontaktanfragen werden automatisch als Freund akzeptiert"; $a->strings["Private Forum [Experimental]"] = "Privates Forum [Versuchsstadium]"; -$a->strings["Private forum - approved members only"] = "Privates Forum - Ausschließlich für Mitglieder"; +$a->strings["Private forum - approved members only"] = "Privates Forum, nur für Mitglieder"; $a->strings["OpenID:"] = "OpenID:"; -$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Optional) Erlaube die Anmeldung für diesen Account mit dieser OpenID."; -$a->strings["Publish your default profile in your local site directory?"] = "Veröffentliche dein Standardprofil im Verzeichnis der lokalen Seite?"; -$a->strings["Publish your default profile in the global social directory?"] = "Veröffentliche dein Standardprofil im weltweiten Verzeichnis?"; +$a->strings["(Optional) Allow this OpenID to login to this account."] = "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID."; +$a->strings["Publish your default profile in your local site directory?"] = "Darf dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?"; +$a->strings["Publish your default profile in the global social directory?"] = "Darf dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?"; $a->strings["Hide your contact/friend list from viewers of your default profile?"] = "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?"; $a->strings["Hide your profile details from unknown viewers?"] = "Profil-Details vor unbekannten Betrachtern verbergen?"; -$a->strings["Allow friends to post to your profile page?"] = "Deinen Kontakten erlauben, auf deine Pinnwand zu schreiben?"; -$a->strings["Allow friends to tag your posts?"] = "Deinen Kontakten erlauben, deine Beiträge mit Schlagwörtern zu versehen?"; -$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Erlaube uns dich als potentiellen Kontakt für neue Mitglieder vorzuschlagen?"; -$a->strings["Permit unknown people to send you private mail?"] = "Erlaube es Unbekannten dir private Nachrichten zu schicken?"; +$a->strings["Allow friends to post to your profile page?"] = "Dürfen deine Kontakte auf deine Pinnwand schreiben?"; +$a->strings["Allow friends to tag your posts?"] = "Dürfen deine Kontakte deine Beiträge mit Schlagwörtern versehen?"; +$a->strings["Allow us to suggest you as a potential friend to new members?"] = "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?"; +$a->strings["Permit unknown people to send you private mail?"] = "Dürfen dir Unbekannte private Nachrichten schicken?"; $a->strings["Profile is not published."] = "Profil ist nicht veröffentlicht."; $a->strings["or"] = "oder"; $a->strings["Your Identity Address is"] = "Die Adresse deines Profils lautet:"; @@ -481,14 +481,14 @@ $a->strings["Expire personal notes:"] = "Persönliche Notizen verfallen lassen:" $a->strings["Expire starred posts:"] = "Markierte Beiträge verfallen lassen:"; $a->strings["Expire photos:"] = "Fotos verfallen lassen:"; $a->strings["Only expire posts by others:"] = "Nur Beiträge anderer verfallen"; -$a->strings["Account Settings"] = "Account-Einstellungen"; +$a->strings["Account Settings"] = "Kontoeinstellungen"; $a->strings["Password Settings"] = "Passwort-Einstellungen"; $a->strings["New Password:"] = "Neues Passwort:"; $a->strings["Confirm:"] = "Bestätigen:"; $a->strings["Leave password fields blank unless changing"] = "Lass die Passwort-Felder leer, außer du willst das Passwort ändern"; $a->strings["Basic Settings"] = "Grundeinstellungen"; $a->strings["Full Name:"] = "Kompletter Name:"; -$a->strings["Email Address:"] = "Emailadresse:"; +$a->strings["Email Address:"] = "E-Mail-Adresse:"; $a->strings["Your Timezone:"] = "Deine Zeitzone:"; $a->strings["Default Post Location:"] = "Standardstandort:"; $a->strings["Use Browser Location:"] = "Verwende den Standort des Browsers:"; @@ -497,7 +497,7 @@ $a->strings["Maximum Friend Requests/Day:"] = "Maximale Anzahl von Freundschafts $a->strings["(to prevent spam abuse)"] = "(um SPAM zu vermeiden)"; $a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträge"; $a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)"; -$a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:"; +$a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:"; $a->strings["Notification Settings"] = "Benachrichtigungseinstellungen"; $a->strings["By default post a status message when:"] = "Standardmäßig eine Statusnachricht posten, wenn:"; $a->strings["accepting a friend request"] = "– du eine Kontaktanfrage akzeptierst"; @@ -509,12 +509,12 @@ $a->strings["Your introductions are confirmed"] = "– eine deiner Kontaktanfrag $a->strings["Someone writes on your profile wall"] = "– jemand etwas auf deine Pinnwand schreibt"; $a->strings["Someone writes a followup comment"] = "– jemand auch einen Kommentar verfasst"; $a->strings["You receive a private message"] = "– du eine private Nachricht erhältst"; -$a->strings["You receive a friend suggestion"] = "- du eine Empfehlung erhältst"; -$a->strings["You are tagged in a post"] = "- du in einem Beitrag erwähnt wurdest"; -$a->strings["Advanced Account/Page Type Settings"] = ""; -$a->strings["Change the behaviour of this account for special situations"] = "Ändere das Verhalten deines Accounts für spezielle Situationen."; +$a->strings["You receive a friend suggestion"] = "– du eine Empfehlung erhältst"; +$a->strings["You are tagged in a post"] = "– du in einem Beitrag erwähnt wirst"; +$a->strings["Advanced Account/Page Type Settings"] = "Erweiterte Konto-/Seitentyp-Einstellungen"; +$a->strings["Change the behaviour of this account for special situations"] = "Verhalten dieses Kontos in bestimmten Situationen:"; $a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten"; -$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Wechsle zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppen-Seiten, die deine Zugangsdetails teilen oder zu denen du \"Manage\" Befugnisse bekommen hast."; +$a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Zwischen verschiedenen Identitäten oder Foren wechseln, die deine Zugangsdaten (E-Mail und Passwort) teilen oder zu denen du „Verwalten“-Befugnisse bekommen hast."; $a->strings["Select an identity to manage: "] = "Wähle eine Identität zum Verwalten: "; $a->strings["Search Results For:"] = "Suchergebnisse für:"; $a->strings["Remove term"] = "Begriff entfernen"; @@ -564,7 +564,7 @@ $a->strings["On your Quick Start page - find a brief introduction to yo $a->strings["On your Settings page - change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web."] = "Ändere bitte unter Einstellungen Dein Passwort. Außerdem merke Dir Deine Indentifikations-Adresse. Diese sieht aus wie eine E-Mail-Adresse und wird benötigt, um Freundschaften mit anderen im Friendica Netzwerk zu schliessen."; $a->strings["Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you."] = "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen zur Privatsphäre. Wenn du dein Profil nicht veröffentlichst, ist das als wenn Du Deine Telefonnummer nicht ins Telefonbuch einträgst. Im Allgemeinen solltest du es veröffentlichen - außer all deine Freunde und potentiellen Freunde wissen genau, wie sie dich finden können."; $a->strings["Upload a profile photo if you have not done so already. Studies have shown that people with real photos of themselves are ten times more likely to make friends than people who do not."] = "Lade ein Profilbild hoch falls du es noch nicht getan hast. Studien haben gezeigt, dass es zehnmal wahrscheinlicher ist neue Freunde zu finden, wenn du ein Bild von dir selbst verwendest, als wenn du dies nicht tust."; -$a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Richte die Verbindung zu Facebook ein, wenn du im Augenblick ein Facebook Konto hast und (optional) deine Facebook Freunde und Unterhaltungen importieren willst."; +$a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Richte die Verbindung zu Facebook ein, wenn du im Augenblick ein Facebook-Konto hast, und (optional) deine Facebook-Freunde und -Unterhaltungen importieren willst."; $a->strings["If this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "Wenn dies dein privater Server ist, könnte die Installation des Facebook Connectors deinen Umzug ins freie soziale Netz angenehmer gestalten."; $a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Gib deine E-Mail-Zugangsinformationen auf der Connector-Einstellungsseite ein, falls du E-Mails aus deinem Posteingang importieren und mit Freunden und Mailinglisten interagieren willlst."; $a->strings["Edit your default profile to your liking. Review the settings for hiding your list of friends and hiding the profile from unknown visitors."] = "Editiere dein Standard Profil nach deinen Vorlieben. Überprüfe die Einstellungen zum Verbergen deiner Freundesliste vor unbekannten Betrachtern des Profils."; @@ -622,7 +622,7 @@ $a->strings["Item not found."] = "Beitrag nicht gefunden."; $a->strings["Access denied."] = "Zugriff verweigert."; $a->strings["Photos"] = "Bilder"; $a->strings["Files"] = "Dateien"; -$a->strings["Account approved."] = "Account freigegeben."; +$a->strings["Account approved."] = "Konto freigegeben."; $a->strings["Registration revoked for %s"] = "Registrierung für %s wurde zurückgezogen"; $a->strings["Please login."] = "Bitte melde dich an."; $a->strings["Unable to locate original post."] = "Konnte den Originalbeitrag nicht finden."; @@ -648,8 +648,8 @@ $a->strings["Please adjust the image cropping for optimum viewing."] = "Passe bi $a->strings["Done Editing"] = "Bearbeitung abgeschlossen"; $a->strings["Image uploaded successfully."] = "Bild erfolgreich auf den Server geladen."; $a->strings["No profile"] = "Kein Profil"; -$a->strings["Remove My Account"] = "Account löschen"; -$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Dies wird deinen Account endgültig löschen. Es gibt keine Möglichkeit, ihn wiederherzustellen."; +$a->strings["Remove My Account"] = "Konto löschen"; +$a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = "Dein Konto wird endgültig gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen."; $a->strings["Please enter your password for verification:"] = "Bitte gib dein Passwort zur Verifikation ein:"; $a->strings["New Message"] = "Neue Nachricht"; $a->strings["Unable to locate contact information."] = "Konnte die Kontaktinformationen nicht finden."; @@ -679,10 +679,10 @@ $a->strings["Themes"] = "Themen"; $a->strings["DB updates"] = "DB Updates"; $a->strings["Logs"] = "Protokolle"; $a->strings["User registrations waiting for confirmation"] = "Nutzeranmeldungen die auf Bestätigung warten"; -$a->strings["Normal Account"] = "Normaler Account"; -$a->strings["Soapbox Account"] = "Sandkasten-Account"; -$a->strings["Community/Celebrity Account"] = "Gemeinschafts-/Promi-Account"; -$a->strings["Automatic Friend Account"] = "Automatischer Freundesaccount"; +$a->strings["Normal Account"] = "Normales Konto"; +$a->strings["Soapbox Account"] = "Marktschreier-Konto"; +$a->strings["Community/Celebrity Account"] = "Forum/Promi-Konto"; +$a->strings["Automatic Friend Account"] = "Automatisches Freundekonto"; $a->strings["Message queues"] = "Nachrichten-Warteschlangen"; $a->strings["Administration"] = "Administration"; $a->strings["Summary"] = "Zusammenfassung"; @@ -712,8 +712,8 @@ $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means $a->strings["Register policy"] = "Registrierungsmethode"; $a->strings["Register text"] = "Registrierungstext"; $a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungsseite angezeigt."; -$a->strings["Accounts abandoned after x days"] = "Accounts gelten nach x Tagen als unbenutzt"; -$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit."; +$a->strings["Accounts abandoned after x days"] = "Nutzerkonten gelten nach x Tagen als unbenutzt"; +$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Konten nicht mehr benutzt werden. 0 eingeben für kein Limit."; $a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte"; $a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben."; $a->strings["Allowed email domains"] = "Erlaubte Domains für Emails"; @@ -725,7 +725,7 @@ $a->strings["Check to force all profiles on this site to be listed in the site d $a->strings["Global directory update URL"] = "URL für Updates beim weltweiten Verzeichnis"; $a->strings["URL to update the global directory. If this is not set, the global directory is completely unavailable to the application."] = "URL für Update des globalen Verzeichnisses. Wenn nichts eingetragen ist, bleibt das globale Verzeichnis unerreichbar."; $a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung"; -$a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Accounts als zusätzliche Profile anzulegen."; +$a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Konten als zusätzliche Profile anzulegen."; $a->strings["OpenID support"] = "OpenID Unterstützung"; $a->strings["OpenID support for registration and logins."] = "OpenID-Unterstützung für Registrierung und Login."; $a->strings["Fullname check"] = "Namen auf Vollständigkeit überprüfen"; @@ -822,20 +822,9 @@ $a->strings["{0} tagged %s's post with #%s"] = "{0} hat %ss Beitrag mit dem Schl $a->strings["{0} mentioned you in a post"] = "{0} hat dich in einem Beitrag erwähnt"; $a->strings["Contacts who are not members of a group"] = "Kontakte, die keiner Gruppe zugewiesen sind"; $a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben."; -$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet."; +$a->strings["Account not found and OpenID registration is not permitted on this site."] = "Nutzerkonto wurde nicht gefunden, und OpenID-Registrierung ist auf diesem Server nicht gestattet."; $a->strings["Login failed."] = "Anmeldung fehlgeschlagen."; -$a->strings["Connect URL missing."] = "Connect-URL fehlt"; -$a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann."; -$a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden."; -$a->strings["The profile address specified does not provide adequate information."] = "Die angegebene Profiladresse liefert unzureichende Informationen."; -$a->strings["An author or name was not found."] = "Es wurde kein Autor oder Name gefunden."; -$a->strings["No browser URL could be matched to this address."] = "Zu dieser Adresse konnte keine passende Browser URL gefunden werden."; -$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen."; -$a->strings["Use mailto: in front of address to force email check."] = "Verwende mailto: vor der Email Adresse um eine Überprüfung der Email Adresse zu erzwingen."; -$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde."; -$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von dir erhalten können."; -$a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen."; -$a->strings["following"] = "folgen"; +$a->strings["Contact added"] = "Kontakt hinzugefügt"; $a->strings["Common Friends"] = "Gemeinsame Freunde"; $a->strings["No contacts in common."] = "Keine gemeinsamen Kontakte."; $a->strings["Item has been removed."] = "Eintrag wurde entfernt."; @@ -887,6 +876,7 @@ $a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiel $a->strings["Since [date]:"] = "Seit [Datum]:"; $a->strings["Sexual Preference:"] = "Sexuelle Vorlieben:"; $a->strings["Homepage URL:"] = "Adresse der Homepage:"; +$a->strings["Hometown:"] = "Wohnort:"; $a->strings["Political Views:"] = "Politische Ansichten:"; $a->strings["Religious Views:"] = "Religiöse Ansichten:"; $a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:"; @@ -917,7 +907,7 @@ $a->strings["- select -"] = "- auswählen -"; $a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s hat %2\$ss %3\$s mit %4\$s getaggt"; $a->strings["No potential page delegates located."] = "Keine potentiellen Bevollmächtigten für die Seite gefunden."; $a->strings["Delegate Page Management"] = "Delegiere das Management für die Seite"; -$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Bevollmächtigte sind in der Lage alle Aspekte dieses Accounts/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Accounts. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust."; +$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = "Bevollmächtigte sind in der Lage, alle Aspekte dieses Kontos/dieser Seite zu verwalten, abgesehen von den Grundeinstellungen des Kontos. Bitte gib niemandem eine Bevollmächtigung für deinen privaten Account, dem du nicht absolut vertraust!"; $a->strings["Existing Page Managers"] = "Vorhandene Seiten Manager"; $a->strings["Existing Page Delegates"] = "Vorhandene Bevollmächtigte für die Seite"; $a->strings["Potential Delegates"] = "Potentielle Bevollmächtigte"; @@ -972,7 +962,7 @@ $a->strings["Facebook disabled"] = "Facebook deaktiviert"; $a->strings["Updating contacts"] = "Aktualisiere Kontakte"; $a->strings["Facebook API key is missing."] = "Facebook-API-Schlüssel nicht gefunden"; $a->strings["Facebook Connect"] = "Mit Facebook verbinden"; -$a->strings["Install Facebook connector for this account."] = "Facebook-Connector für diesen Account installieren."; +$a->strings["Install Facebook connector for this account."] = "Facebook-Connector für dieses Konto installieren."; $a->strings["Remove Facebook connector"] = "Facebook-Connector entfernen"; $a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]"; $a->strings["Post to Facebook by default"] = "Veröffentliche standardmäßig bei Facebook"; @@ -1010,7 +1000,7 @@ $a->strings["View on Friendica"] = "In Friendica betrachten"; $a->strings["Facebook post failed. Queued for retry."] = "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut."; $a->strings["Your Facebook connection became invalid. Please Re-authenticate."] = "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich."; $a->strings["Facebook connection became invalid"] = "Facebook Anmeldedaten sind ungültig geworden"; -$a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."] = "Hi %1\$s,\n\ndie Verbindung von deinem Account auf %2\$s und Facebook funktioniert derzeit nicht. Dies ist im Allgemeinen das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du %3\$sden Facebook-Connector neu Authentifizieren%4\$s."; +$a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."] = "Hallo %1\$s,\n\ndie Verbindung zwischen deinem Account auf %2\$s und Facebook funktioniert derzeit nicht. Dies ist normalerweise das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du %3\$sden Facebook-Connector neu authentifizieren%4\$s."; $a->strings["Lifetime of the cache (in hours)"] = "Lebenszeit des Caches (in Stunden)"; $a->strings["Cache Statistics"] = "Cache Statistik"; $a->strings["Number of items"] = "Anzahl der Einträge"; @@ -1101,7 +1091,7 @@ $a->strings["Geonames settings updated."] = "Geonames Einstellungen aktualisiert $a->strings["Geonames Settings"] = "Geonames Einstellungen"; $a->strings["Enable Geonames Plugin"] = "Geonames Plugin aktivieren"; $a->strings["Your account on %s will expire in a few days."] = "Dein Konto auf %s wird in ein paar Tagen verfallen."; -$a->strings["Your Friendica account is about to expire."] = "Dein Friendica-Account wird in Kürze auslaufen."; +$a->strings["Your Friendica account is about to expire."] = "Dein Friendica-Konto wird in Kürze auslaufen."; $a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "Hallo %1\$s,\n\ndein Account auf %2\$s wird in weniger als fünf Tagen auslaufen. Du kannst das verhindern, indem du dich mindestens einmal alle 30 Tage anmeldest."; $a->strings["Upload a file"] = "Datei hochladen"; $a->strings["Drop files here to upload"] = "Ziehe Dateien hierher, um sie hochzuladen"; @@ -1163,8 +1153,8 @@ $a->strings["Select default avatar image if none was found at Gravatar. See READ $a->strings["Rating of images"] = "Bildbewertung"; $a->strings["Select the appropriate avatar rating for your site. See README"] = "Wähle eine angemessene Bildbewertung für Deinen Server. Schaue auch sonst im README nach."; $a->strings["Gravatar settings updated."] = "Gravatar Einstellungen aktualisiert."; -$a->strings["Your Friendica test account is about to expire."] = "Dein Friendica Test Konto wird bald verfallen."; -$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Hallo %1\$s,\n\ndein Test-Konto auf %2\$s wird in weniger als fünf Tagen verfallen. Wir hoffen, dass dir dieser Testlauf gefallen hat, so dass du die Gelegenheit nutzt und dir eine feste Friendica-Site für deine integrierte Social-Network-Kommunikation suchst. Eine Liste öffentlicher Sites findest du auf http://dir.friendica.com/siteinfo. Um mehr Information darüber zu bekommen, wie man einen eigenen Friendica-Server aufsetzt, kannst du auch einen Blick auf die Friendica Projektseite werfen: http://friendica.com"; +$a->strings["Your Friendica test account is about to expire."] = "Dein Friendica-Testkonto wird bald verfallen."; +$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Hallo %1\$s,\n\ndein Testkonto auf %2\$s wird in weniger als fünf Tagen verfallen. Wir hoffen, dass dir dieser Testlauf gefallen hat, so dass du die Gelegenheit nutzt und dir einen normalen Friendica-Server für deine integrierte Social-Network-Kommunikation suchst. Eine Liste öffentlicher Server findest du auf http://dir.friendica.com/siteinfo . Um mehr Information darüber zu bekommen, wie man einen eigenen Friendica-Server aufsetzt, kannst du auch einen Blick auf die Friendica-Projektseite werfen: http://friendica.com"; $a->strings["\"pageheader\" Settings"] = "\"pageheader\"-Einstellungen"; $a->strings["pageheader Settings saved."] = "pageheader-Einstellungen gespeichert."; $a->strings["Post to Insanejournal"] = "Auf InsaneJournal posten."; @@ -1186,7 +1176,7 @@ $a->strings["No consumer key pair for StatusNet found. Register your Friendica A $a->strings["OAuth Consumer Key"] = "OAuth Consumer Key"; $a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret"; $a->strings["Base API Path (remember the trailing /)"] = "Basis-URL der StatusNet-API (vergiss den abschließenden / nicht)"; -$a->strings["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 and submit the form. Only your public posts will be posted to StatusNet."] = "Um deinen Account mit einem StatusNet-Account zu verknüpfen, klicke den Button an, um einen Sicherheitscode von StatusNet zu erhalten, und kopiere diesen in das Eingabefeld weiter unten. Es werden ausschließlich deine öffentlichen Nachrichten an StatusNet gesendet."; +$a->strings["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 and submit the form. Only your public posts will be posted to StatusNet."] = "Um dein Konto mit einem StatusNet-Konto zu verknüpfen, klicke den Button an, um einen Sicherheitscode von StatusNet zu erhalten, und kopiere diesen in das Eingabefeld weiter unten. Es werden ausschließlich deine öffentlichen Nachrichten an StatusNet gesendet."; $a->strings["Log in with StatusNet"] = "Bei StatusNet anmelden"; $a->strings["Copy the security code from StatusNet here"] = "Kopiere den Sicherheitscode von StatusNet hier hin"; $a->strings["Cancel Connection Process"] = "Verbindungsprozess abbrechen"; @@ -1194,7 +1184,7 @@ $a->strings["Current StatusNet API is"] = "Derzeitige StatusNet-API-URL lautet"; $a->strings["Cancel StatusNet Connection"] = "Verbindung zum StatusNet Server abbrechen"; $a->strings["Currently connected to: "] = "Momentan verbunden mit: "; $a->strings["If enabled all your public postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert, können all deine öffentlichen Einträge auf dem verbundenen StatusNet-Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an deinen StatusNet Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."; +$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an deinen StatusNet-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."; $a->strings["Allow posting to StatusNet"] = "Veröffentlichung bei StatusNet erlauben"; $a->strings["Send public postings to StatusNet by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet"; $a->strings["Send linked #-tags and @-names to StatusNet"] = "Sende verlinkte #-Tags und @-Namen nach StatusNet"; @@ -1242,7 +1232,7 @@ $a->strings["At this Friendica instance the Twitter plugin was enabled but you h $a->strings["Log in with Twitter"] = "bei Twitter anmelden"; $a->strings["Copy the PIN from Twitter here"] = "Kopiere die Twitter-PIN hier her"; $a->strings["If enabled all your public postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert, können all deine öffentlichen Einträge auf dem verbundenen Twitter-Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."; -$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an an deinen Twitter Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."; +$a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an an deinen Twitter-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."; $a->strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlauben"; $a->strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter"; $a->strings["Send linked #-tags and @-names to Twitter"] = "Sende verlinkte #-Tags und @-Namen nach Twitter"; @@ -1469,7 +1459,7 @@ $a->strings["End this session"] = "Diese Sitzung beenden"; $a->strings["Status"] = "Status"; $a->strings["Sign in"] = "Anmelden"; $a->strings["Home Page"] = "Homepage"; -$a->strings["Create an account"] = "Account erstellen"; +$a->strings["Create an account"] = "Nutzerkonto erstellen"; $a->strings["Help and documentation"] = "Hilfe und Dokumentation"; $a->strings["Apps"] = "Apps"; $a->strings["Addon applications, utilities, games"] = "Addon Anwendungen, Dienstprogramme, Spiele"; @@ -1576,6 +1566,18 @@ $a->strings["a friend suggestion"] = "ein Freunde Vorschlag"; $a->strings["Name:"] = "Name:"; $a->strings["Photo:"] = "Foto:"; $a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen."; +$a->strings["Connect URL missing."] = "Connect-URL fehlt"; +$a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann."; +$a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden."; +$a->strings["The profile address specified does not provide adequate information."] = "Die angegebene Profiladresse liefert unzureichende Informationen."; +$a->strings["An author or name was not found."] = "Es wurde kein Autor oder Name gefunden."; +$a->strings["No browser URL could be matched to this address."] = "Zu dieser Adresse konnte keine passende Browser URL gefunden werden."; +$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen."; +$a->strings["Use mailto: in front of address to force email check."] = "Verwende mailto: vor der Email Adresse um eine Überprüfung der Email Adresse zu erzwingen."; +$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde."; +$a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von dir erhalten können."; +$a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen."; +$a->strings["following"] = "folgen"; $a->strings["A new person is sharing with you at "] = "Eine neue Person teilt mit dir auf "; $a->strings["You have a new follower at "] = "Du hast einen neuen Kontakt auf "; $a->strings["image/photo"] = "Bild/Foto"; @@ -1666,7 +1668,7 @@ $a->strings["Delete this item?"] = "Diesen Beitrag löschen?"; $a->strings["show fewer"] = "weniger anzeigen"; $a->strings["Update %s failed. See error logs."] = "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen."; $a->strings["Update Error at %s"] = "Updatefehler bei %s"; -$a->strings["Create a New Account"] = "Neuen Account erstellen"; +$a->strings["Create a New Account"] = "Neues Konto erstellen"; $a->strings["Nickname or Email address: "] = "Spitzname oder Email-Adresse: "; $a->strings["Password: "] = "Passwort: "; $a->strings["Or login using OpenID: "] = "Oder melde dich mit deiner OpenID an: "; -- cgit v1.2.3 -- cgit v1.2.3 From 7cc7a143800c5a6b0360a3a46987580bbb00d639 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 5 Jun 2012 17:59:12 -0700 Subject: rev update --- boot.php | 2 +- util/messages.po | 77 ++++++++++++++++++++++++++------------------------------ 2 files changed, 37 insertions(+), 42 deletions(-) diff --git a/boot.php b/boot.php index 18313b4cd..01edbd390 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1363' ); +define ( 'FRIENDICA_VERSION', '3.0.1365' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1148 ); diff --git a/util/messages.po b/util/messages.po index 43368ced0..dbc54fb66 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1363\n" +"Project-Id-Version: 3.0.1365\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-03 10:00-0700\n" +"POT-Creation-Date: 2012-06-05 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -55,7 +55,7 @@ msgstr "" #: ../../mod/profiles.php:385 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:503 -#: ../../include/items.php:3297 ../../index.php:306 +#: ../../include/items.php:3332 ../../index.php:306 msgid "Permission denied." msgstr "" @@ -129,9 +129,9 @@ msgstr "" #: ../../mod/localtime.php:45 ../../mod/contacts.php:322 #: ../../mod/settings.php:555 ../../mod/settings.php:701 #: ../../mod/settings.php:762 ../../mod/settings.php:969 -#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:417 -#: ../../mod/admin.php:653 ../../mod/admin.php:789 ../../mod/admin.php:988 -#: ../../mod/admin.php:1075 ../../mod/profiles.php:554 +#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/message.php:215 +#: ../../mod/admin.php:417 ../../mod/admin.php:653 ../../mod/admin.php:789 +#: ../../mod/admin.php:988 ../../mod/admin.php:1075 ../../mod/profiles.php:554 #: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:605 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 #: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158 @@ -399,10 +399,10 @@ msgstr "" msgid "was tagged in a" msgstr "" -#: ../../mod/photos.php:583 ../../mod/like.php:127 ../../mod/tagger.php:70 +#: ../../mod/photos.php:583 ../../mod/like.php:185 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 #: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1316 -#: ../../include/diaspora.php:1662 ../../include/conversation.php:53 +#: ../../include/diaspora.php:1671 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" msgstr "" @@ -541,7 +541,7 @@ msgstr "" #: ../../mod/photos.php:1277 ../../mod/editpost.php:104 #: ../../mod/wallmessage.php:145 ../../mod/message.php:214 -#: ../../mod/message.php:408 ../../include/conversation.php:371 +#: ../../mod/message.php:409 ../../include/conversation.php:371 #: ../../include/conversation.php:731 ../../include/conversation.php:1008 msgid "Please wait" msgstr "" @@ -639,7 +639,7 @@ msgid "Edit" msgstr "" #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 -#: ../../mod/message.php:212 ../../mod/message.php:406 +#: ../../mod/message.php:212 ../../mod/message.php:407 #: ../../include/conversation.php:990 msgid "Upload photo" msgstr "" @@ -649,7 +649,7 @@ msgid "Attach file" msgstr "" #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 -#: ../../mod/message.php:213 ../../mod/message.php:407 +#: ../../mod/message.php:213 ../../mod/message.php:408 #: ../../include/conversation.php:994 msgid "Insert web link" msgstr "" @@ -2455,17 +2455,17 @@ msgid "" msgstr "" #: ../../mod/wallmessage.php:133 ../../mod/message.php:200 -#: ../../mod/message.php:397 +#: ../../mod/message.php:398 msgid "To:" msgstr "" #: ../../mod/wallmessage.php:134 ../../mod/message.php:205 -#: ../../mod/message.php:399 +#: ../../mod/message.php:400 msgid "Subject:" msgstr "" #: ../../mod/wallmessage.php:140 ../../mod/message.php:209 -#: ../../mod/message.php:402 ../../mod/invite.php:113 +#: ../../mod/message.php:403 ../../mod/invite.php:113 msgid "Your message:" msgstr "" @@ -2761,26 +2761,26 @@ msgstr "" msgid "People Search" msgstr "" -#: ../../mod/like.php:127 ../../mod/tagger.php:70 +#: ../../mod/like.php:185 ../../mod/like.php:259 ../../mod/tagger.php:70 #: ../../addon/facebook/facebook.php:1572 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 #: ../../view/theme/diabook/theme.php:565 -#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1662 +#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1671 #: ../../include/conversation.php:48 ../../include/conversation.php:57 #: ../../include/conversation.php:121 ../../include/conversation.php:130 msgid "status" msgstr "" -#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1576 +#: ../../mod/like.php:202 ../../addon/facebook/facebook.php:1576 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1678 +#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1687 #: ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../mod/like.php:146 ../../include/conversation.php:68 +#: ../../mod/like.php:204 ../../include/conversation.php:68 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" @@ -2952,55 +2952,55 @@ msgstr "" msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:245 +#: ../../mod/message.php:246 msgid "No messages." msgstr "" -#: ../../mod/message.php:252 +#: ../../mod/message.php:253 #, php-format msgid "Unknown sender - %s" msgstr "" -#: ../../mod/message.php:255 +#: ../../mod/message.php:256 #, php-format msgid "You and %s" msgstr "" -#: ../../mod/message.php:258 +#: ../../mod/message.php:259 #, php-format msgid "%s and You" msgstr "" -#: ../../mod/message.php:268 ../../mod/message.php:390 +#: ../../mod/message.php:269 ../../mod/message.php:391 msgid "Delete conversation" msgstr "" -#: ../../mod/message.php:271 +#: ../../mod/message.php:272 msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/message.php:273 +#: ../../mod/message.php:274 #, php-format msgid "%d message" msgid_plural "%d messages" msgstr[0] "" msgstr[1] "" -#: ../../mod/message.php:308 +#: ../../mod/message.php:309 msgid "Message not available." msgstr "" -#: ../../mod/message.php:373 +#: ../../mod/message.php:374 msgid "Delete message" msgstr "" -#: ../../mod/message.php:392 +#: ../../mod/message.php:393 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/message.php:396 +#: ../../mod/message.php:397 msgid "Send Reply" msgstr "" @@ -4188,7 +4188,7 @@ msgstr "" msgid "Unable to set contact photo." msgstr "" -#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507 +#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:510 #: ../../include/conversation.php:101 #, php-format msgid "%1$s is now friends with %2$s" @@ -6177,12 +6177,12 @@ msgstr "" msgid "Finishes:" msgstr "" -#: ../../include/delivery.php:455 ../../include/notifier.php:677 +#: ../../include/delivery.php:456 ../../include/notifier.php:678 msgid "(no subject)" msgstr "" -#: ../../include/delivery.php:462 ../../include/enotify.php:26 -#: ../../include/notifier.php:684 +#: ../../include/delivery.php:463 ../../include/enotify.php:26 +#: ../../include/notifier.php:685 msgid "noreply" msgstr "" @@ -6337,19 +6337,14 @@ msgstr "" msgid "Item filed" msgstr "" -#: ../../include/diaspora.php:590 +#: ../../include/diaspora.php:593 msgid "Sharing notification from Diaspora network" msgstr "" -#: ../../include/diaspora.php:1977 +#: ../../include/diaspora.php:2037 msgid "Attachments:" msgstr "" -#: ../../include/diaspora.php:2168 -#, php-format -msgid "[Relayed] Comment authored by %s from network %s" -msgstr "" - #: ../../include/network.php:824 msgid "view full size" msgstr "" -- cgit v1.2.3 From 5389efffa9c8d2da40bf6ea448562ae67538e0d4 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 5 Jun 2012 19:28:04 -0700 Subject: add email probe logging, limit typo check to main addon files and skip additional support files --- include/Scrape.php | 3 +++ util/typo.php | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/Scrape.php b/include/Scrape.php index 227252600..ca8f6e83a 100644 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -435,10 +435,13 @@ function probe_url($url, $mode = PROBE_NORMAL) { $password = ''; openssl_private_decrypt(hex2bin($r[0]['pass']),$password,$x[0]['prvkey']); $mbox = email_connect($mailbox,$r[0]['user'],$password); + if(! $mbox) + logger('probe_url: email_connect failed.'); unset($password); } if($mbox) { $msgs = email_poll($mbox,$orig_url); + logger('probe_url: searching ' . $orig_url . ', ' . count($msgs) . ' messages found.', LOGGER_DEBUG); if(count($msgs)) { $addr = $orig_url; $network = NETWORK_MAIL; diff --git a/util/typo.php b/util/typo.php index 7c275f3ca..bb2fc67c9 100644 --- a/util/typo.php +++ b/util/typo.php @@ -30,11 +30,10 @@ $dirs = glob('addon/*'); foreach($dirs as $dir) { - $files = glob($dir . '/*.php'); + $addon = basename($dir); + $files = glob($dir . '/' . $addon . '.php'); foreach($files as $file) { echo $file . "\n"; - if(stristr($file,'jappixmini/proxy.php')) - continue; include_once($file); } } -- cgit v1.2.3 From 49732114d71a5bdb57c19f2f938284fb6ac2edf9 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 5 Jun 2012 20:33:11 -0700 Subject: contacts search autocomplete --- mod/acl.php | 26 ++++++++++++++++++++++++-- mod/contacts.php | 19 +++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/mod/acl.php b/mod/acl.php index 1e8898ab6..f3e46efa5 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -1,5 +1,6 @@ page['aside'] .= findpeople_widget(); $a->page['aside'] .= networks_widget('contacts',$_GET['nets']); + $base = $a->get_baseurl(); + + $a->page['htmlhead'] .= ''; + $a->page['htmlhead'] .= <<< EOT + + +EOT; + + } function contacts_post(&$a) { -- cgit v1.2.3 From 6f415946348a4e88830b81aeba5afba5385b8a1e Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 5 Jun 2012 20:47:26 -0700 Subject: set minchars to 2 for contacts search --- mod/contacts.php | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/contacts.php b/mod/contacts.php index f5125a7fe..a3e3f409b 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -52,6 +52,7 @@ function contacts_init(&$a) { var a; a = $("#contacts-search").autocomplete({ serviceUrl: '$base/acl', + minChars: 2, width: 350, }); a.setOptions({ params: { type: 'a' }}); -- cgit v1.2.3 From 6c3ab225f72a01a67fab0d896a7ad20f77f7f2b2 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 5 Jun 2012 20:49:56 -0700 Subject: set minchars to 2 for PM lookups too --- mod/message.php | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/message.php b/mod/message.php index fb2241985..d5bb3dfe4 100644 --- a/mod/message.php +++ b/mod/message.php @@ -25,6 +25,7 @@ function message_init(&$a) { var a; a = $("#recip").autocomplete({ serviceUrl: '$base/acl', + minChars: 2, width: 350, onSelect: function(value,data) { $("#recip-complete").val(data); -- cgit v1.2.3 From dd001e32f43090171b39fb0fefc8e2f5a658b63d Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 6 Jun 2012 16:02:10 -0700 Subject: rev update --- boot.php | 2 +- util/messages.po | 456 ++++++++++++++++++++++++++++++++------------ view/theme/slackr/style.css | 4 + 3 files changed, 339 insertions(+), 123 deletions(-) diff --git a/boot.php b/boot.php index 01edbd390..7961efc4a 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1365' ); +define ( 'FRIENDICA_VERSION', '3.0.1366' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1148 ); diff --git a/util/messages.po b/util/messages.po index dbc54fb66..ba1f927cc 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1365\n" +"Project-Id-Version: 3.0.1366\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-05 10:00-0700\n" +"POT-Creation-Date: 2012-06-06 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -38,7 +38,7 @@ msgstr "" #: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:920 #: ../../mod/editpost.php:10 ../../mod/install.php:151 -#: ../../mod/notifications.php:66 ../../mod/contacts.php:125 +#: ../../mod/notifications.php:66 ../../mod/contacts.php:145 #: ../../mod/settings.php:106 ../../mod/settings.php:537 #: ../../mod/settings.php:542 ../../mod/manage.php:86 ../../mod/network.php:6 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 @@ -48,14 +48,15 @@ msgstr "" #: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:124 #: ../../mod/item.php:140 ../../mod/profile_photo.php:19 #: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150 -#: ../../mod/profile_photo.php:163 ../../mod/message.php:44 -#: ../../mod/message.php:96 ../../mod/allfriends.php:9 +#: ../../mod/profile_photo.php:163 ../../mod/message.php:45 +#: ../../mod/message.php:97 ../../mod/allfriends.php:9 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 #: ../../mod/follow.php:9 ../../mod/display.php:138 ../../mod/profiles.php:7 #: ../../mod/profiles.php:385 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:503 -#: ../../include/items.php:3332 ../../index.php:306 +#: ../../addon/dav/layout.fnk.php:387 ../../include/items.php:3332 +#: ../../index.php:306 msgid "Permission denied." msgstr "" @@ -126,10 +127,10 @@ msgstr "" #: ../../mod/photos.php:1256 ../../mod/photos.php:1296 #: ../../mod/photos.php:1336 ../../mod/photos.php:1367 #: ../../mod/install.php:246 ../../mod/install.php:284 -#: ../../mod/localtime.php:45 ../../mod/contacts.php:322 +#: ../../mod/localtime.php:45 ../../mod/contacts.php:342 #: ../../mod/settings.php:555 ../../mod/settings.php:701 #: ../../mod/settings.php:762 ../../mod/settings.php:969 -#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/message.php:215 +#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/message.php:216 #: ../../mod/admin.php:417 ../../mod/admin.php:653 ../../mod/admin.php:789 #: ../../mod/admin.php:988 ../../mod/admin.php:1075 ../../mod/profiles.php:554 #: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:605 @@ -142,8 +143,9 @@ msgstr "" #: ../../addon/impressum/impressum.php:82 ../../addon/blockem/blockem.php:57 #: ../../addon/qcomment/qcomment.php:61 #: ../../addon/openstreetmap/openstreetmap.php:70 -#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84 -#: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:86 +#: ../../addon/libertree/libertree.php:90 ../../addon/mathjax/mathjax.php:42 +#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:98 +#: ../../addon/gravatar/gravatar.php:86 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93 #: ../../addon/jappixmini/jappixmini.php:302 #: ../../addon/statusnet/statusnet.php:278 @@ -170,7 +172,8 @@ msgstr "" msgid "Help:" msgstr "" -#: ../../mod/help.php:34 ../../include/nav.php:86 +#: ../../mod/help.php:34 ../../addon/dav/layout.fnk.php:112 +#: ../../include/nav.php:86 msgid "Help" msgstr "" @@ -229,11 +232,12 @@ msgstr "" msgid "Create New Event" msgstr "" -#: ../../mod/events.php:326 +#: ../../mod/events.php:326 ../../addon/dav/layout.fnk.php:147 msgid "Previous" msgstr "" #: ../../mod/events.php:327 ../../mod/install.php:205 +#: ../../addon/dav/layout.fnk.php:150 msgid "Next" msgstr "" @@ -540,8 +544,8 @@ msgid "Share" msgstr "" #: ../../mod/photos.php:1277 ../../mod/editpost.php:104 -#: ../../mod/wallmessage.php:145 ../../mod/message.php:214 -#: ../../mod/message.php:409 ../../include/conversation.php:371 +#: ../../mod/wallmessage.php:145 ../../mod/message.php:215 +#: ../../mod/message.php:410 ../../include/conversation.php:371 #: ../../include/conversation.php:731 ../../include/conversation.php:1008 msgid "Please wait" msgstr "" @@ -639,7 +643,7 @@ msgid "Edit" msgstr "" #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 -#: ../../mod/message.php:212 ../../mod/message.php:407 +#: ../../mod/message.php:213 ../../mod/message.php:408 #: ../../include/conversation.php:990 msgid "Upload photo" msgstr "" @@ -649,7 +653,7 @@ msgid "Attach file" msgstr "" #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 -#: ../../mod/message.php:213 ../../mod/message.php:408 +#: ../../mod/message.php:214 ../../mod/message.php:409 #: ../../include/conversation.php:994 msgid "Insert web link" msgstr "" @@ -779,7 +783,7 @@ msgstr "" msgid "Disallowed profile URL." msgstr "" -#: ../../mod/dfrn_request.php:555 ../../mod/contacts.php:102 +#: ../../mod/dfrn_request.php:555 ../../mod/contacts.php:122 msgid "Failed to update contact record." msgstr "" @@ -1218,8 +1222,8 @@ msgid "Discard" msgstr "" #: ../../mod/notifications.php:51 ../../mod/notifications.php:160 -#: ../../mod/notifications.php:206 ../../mod/contacts.php:296 -#: ../../mod/contacts.php:348 +#: ../../mod/notifications.php:206 ../../mod/contacts.php:316 +#: ../../mod/contacts.php:368 msgid "Ignore" msgstr "" @@ -1244,7 +1248,7 @@ msgstr "" msgid "Introductions" msgstr "" -#: ../../mod/notifications.php:100 ../../mod/message.php:104 +#: ../../mod/notifications.php:100 ../../mod/message.php:105 #: ../../include/nav.php:128 msgid "Messages" msgstr "" @@ -1271,7 +1275,7 @@ msgid "suggested by %s" msgstr "" #: ../../mod/notifications.php:153 ../../mod/notifications.php:200 -#: ../../mod/contacts.php:354 +#: ../../mod/contacts.php:374 msgid "Hide this contact from others" msgstr "" @@ -1393,303 +1397,303 @@ msgstr "" msgid "Home Notifications" msgstr "" -#: ../../mod/contacts.php:63 ../../mod/contacts.php:143 +#: ../../mod/contacts.php:83 ../../mod/contacts.php:163 msgid "Could not access contact record." msgstr "" -#: ../../mod/contacts.php:77 +#: ../../mod/contacts.php:97 msgid "Could not locate selected profile." msgstr "" -#: ../../mod/contacts.php:100 +#: ../../mod/contacts.php:120 msgid "Contact updated." msgstr "" -#: ../../mod/contacts.php:165 +#: ../../mod/contacts.php:185 msgid "Contact has been blocked" msgstr "" -#: ../../mod/contacts.php:165 +#: ../../mod/contacts.php:185 msgid "Contact has been unblocked" msgstr "" -#: ../../mod/contacts.php:179 +#: ../../mod/contacts.php:199 msgid "Contact has been ignored" msgstr "" -#: ../../mod/contacts.php:179 +#: ../../mod/contacts.php:199 msgid "Contact has been unignored" msgstr "" -#: ../../mod/contacts.php:195 +#: ../../mod/contacts.php:215 msgid "Contact has been archived" msgstr "" -#: ../../mod/contacts.php:195 +#: ../../mod/contacts.php:215 msgid "Contact has been unarchived" msgstr "" -#: ../../mod/contacts.php:208 +#: ../../mod/contacts.php:228 msgid "Contact has been removed." msgstr "" -#: ../../mod/contacts.php:238 +#: ../../mod/contacts.php:258 #, php-format msgid "You are mutual friends with %s" msgstr "" -#: ../../mod/contacts.php:242 +#: ../../mod/contacts.php:262 #, php-format msgid "You are sharing with %s" msgstr "" -#: ../../mod/contacts.php:247 +#: ../../mod/contacts.php:267 #, php-format msgid "%s is sharing with you" msgstr "" -#: ../../mod/contacts.php:264 +#: ../../mod/contacts.php:284 msgid "Private communications are not available for this contact." msgstr "" -#: ../../mod/contacts.php:267 +#: ../../mod/contacts.php:287 msgid "Never" msgstr "" -#: ../../mod/contacts.php:271 +#: ../../mod/contacts.php:291 msgid "(Update was successful)" msgstr "" -#: ../../mod/contacts.php:271 +#: ../../mod/contacts.php:291 msgid "(Update was not successful)" msgstr "" -#: ../../mod/contacts.php:273 +#: ../../mod/contacts.php:293 msgid "Suggest friends" msgstr "" -#: ../../mod/contacts.php:277 +#: ../../mod/contacts.php:297 #, php-format msgid "Network type: %s" msgstr "" -#: ../../mod/contacts.php:280 ../../include/contact_widgets.php:183 +#: ../../mod/contacts.php:300 ../../include/contact_widgets.php:183 #, php-format msgid "%d contact in common" msgid_plural "%d contacts in common" msgstr[0] "" msgstr[1] "" -#: ../../mod/contacts.php:285 +#: ../../mod/contacts.php:305 msgid "View all contacts" msgstr "" -#: ../../mod/contacts.php:290 ../../mod/contacts.php:347 +#: ../../mod/contacts.php:310 ../../mod/contacts.php:367 #: ../../mod/admin.php:662 msgid "Unblock" msgstr "" -#: ../../mod/contacts.php:290 ../../mod/contacts.php:347 +#: ../../mod/contacts.php:310 ../../mod/contacts.php:367 #: ../../mod/admin.php:661 msgid "Block" msgstr "" -#: ../../mod/contacts.php:293 +#: ../../mod/contacts.php:313 msgid "Toggle Blocked status" msgstr "" -#: ../../mod/contacts.php:296 ../../mod/contacts.php:348 +#: ../../mod/contacts.php:316 ../../mod/contacts.php:368 msgid "Unignore" msgstr "" -#: ../../mod/contacts.php:299 +#: ../../mod/contacts.php:319 msgid "Toggle Ignored status" msgstr "" -#: ../../mod/contacts.php:303 +#: ../../mod/contacts.php:323 msgid "Unarchive" msgstr "" -#: ../../mod/contacts.php:303 +#: ../../mod/contacts.php:323 msgid "Archive" msgstr "" -#: ../../mod/contacts.php:306 +#: ../../mod/contacts.php:326 msgid "Toggle Archive status" msgstr "" -#: ../../mod/contacts.php:309 +#: ../../mod/contacts.php:329 msgid "Repair" msgstr "" -#: ../../mod/contacts.php:312 +#: ../../mod/contacts.php:332 msgid "Advanced Contact Settings" msgstr "" -#: ../../mod/contacts.php:320 +#: ../../mod/contacts.php:340 msgid "Contact Editor" msgstr "" -#: ../../mod/contacts.php:323 +#: ../../mod/contacts.php:343 msgid "Profile Visibility" msgstr "" -#: ../../mod/contacts.php:324 +#: ../../mod/contacts.php:344 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/contacts.php:325 +#: ../../mod/contacts.php:345 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/contacts.php:326 +#: ../../mod/contacts.php:346 msgid "Edit contact notes" msgstr "" -#: ../../mod/contacts.php:331 ../../mod/contacts.php:522 +#: ../../mod/contacts.php:351 ../../mod/contacts.php:542 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "" -#: ../../mod/contacts.php:332 +#: ../../mod/contacts.php:352 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/contacts.php:333 +#: ../../mod/contacts.php:353 msgid "Ignore contact" msgstr "" -#: ../../mod/contacts.php:334 +#: ../../mod/contacts.php:354 msgid "Repair URL settings" msgstr "" -#: ../../mod/contacts.php:335 +#: ../../mod/contacts.php:355 msgid "View conversations" msgstr "" -#: ../../mod/contacts.php:337 +#: ../../mod/contacts.php:357 msgid "Delete contact" msgstr "" -#: ../../mod/contacts.php:341 +#: ../../mod/contacts.php:361 msgid "Last update:" msgstr "" -#: ../../mod/contacts.php:342 +#: ../../mod/contacts.php:362 msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:344 ../../mod/admin.php:1133 +#: ../../mod/contacts.php:364 ../../mod/admin.php:1133 msgid "Update now" msgstr "" -#: ../../mod/contacts.php:351 +#: ../../mod/contacts.php:371 msgid "Currently blocked" msgstr "" -#: ../../mod/contacts.php:352 +#: ../../mod/contacts.php:372 msgid "Currently ignored" msgstr "" -#: ../../mod/contacts.php:353 +#: ../../mod/contacts.php:373 msgid "Currently archived" msgstr "" -#: ../../mod/contacts.php:354 +#: ../../mod/contacts.php:374 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/contacts.php:407 +#: ../../mod/contacts.php:427 msgid "Suggestions" msgstr "" -#: ../../mod/contacts.php:410 +#: ../../mod/contacts.php:430 msgid "Suggest potential friends" msgstr "" -#: ../../mod/contacts.php:413 ../../mod/group.php:191 +#: ../../mod/contacts.php:433 ../../mod/group.php:191 msgid "All Contacts" msgstr "" -#: ../../mod/contacts.php:416 +#: ../../mod/contacts.php:436 msgid "Show all contacts" msgstr "" -#: ../../mod/contacts.php:419 +#: ../../mod/contacts.php:439 msgid "Unblocked" msgstr "" -#: ../../mod/contacts.php:422 +#: ../../mod/contacts.php:442 msgid "Only show unblocked contacts" msgstr "" -#: ../../mod/contacts.php:426 +#: ../../mod/contacts.php:446 msgid "Blocked" msgstr "" -#: ../../mod/contacts.php:429 +#: ../../mod/contacts.php:449 msgid "Only show blocked contacts" msgstr "" -#: ../../mod/contacts.php:433 +#: ../../mod/contacts.php:453 msgid "Ignored" msgstr "" -#: ../../mod/contacts.php:436 +#: ../../mod/contacts.php:456 msgid "Only show ignored contacts" msgstr "" -#: ../../mod/contacts.php:440 +#: ../../mod/contacts.php:460 msgid "Archived" msgstr "" -#: ../../mod/contacts.php:443 +#: ../../mod/contacts.php:463 msgid "Only show archived contacts" msgstr "" -#: ../../mod/contacts.php:447 +#: ../../mod/contacts.php:467 msgid "Hidden" msgstr "" -#: ../../mod/contacts.php:450 +#: ../../mod/contacts.php:470 msgid "Only show hidden contacts" msgstr "" -#: ../../mod/contacts.php:498 +#: ../../mod/contacts.php:518 msgid "Mutual Friendship" msgstr "" -#: ../../mod/contacts.php:502 +#: ../../mod/contacts.php:522 msgid "is a fan of yours" msgstr "" -#: ../../mod/contacts.php:506 +#: ../../mod/contacts.php:526 msgid "you are a fan of" msgstr "" -#: ../../mod/contacts.php:523 ../../mod/nogroup.php:41 +#: ../../mod/contacts.php:543 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:129 +#: ../../mod/contacts.php:564 ../../view/theme/diabook/theme.php:129 #: ../../include/nav.php:139 msgid "Contacts" msgstr "" -#: ../../mod/contacts.php:548 +#: ../../mod/contacts.php:568 msgid "Search your contacts" msgstr "" -#: ../../mod/contacts.php:549 ../../mod/directory.php:57 +#: ../../mod/contacts.php:569 ../../mod/directory.php:57 msgid "Finding: " msgstr "" -#: ../../mod/contacts.php:550 ../../mod/directory.php:59 +#: ../../mod/contacts.php:570 ../../mod/directory.php:59 #: ../../include/contact_widgets.php:33 msgid "Find" msgstr "" @@ -1797,7 +1801,8 @@ msgid "Remove account" msgstr "" #: ../../mod/settings.php:89 ../../mod/admin.php:748 ../../mod/admin.php:953 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:643 +#: ../../addon/dav/layout.fnk.php:112 ../../addon/mathjax/mathjax.php:36 +#: ../../view/theme/diabook/theme.php:643 #: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137 msgid "Settings" msgstr "" @@ -2405,7 +2410,7 @@ msgstr "" #: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../addon/facebook/facebook.php:756 #: ../../addon/privacy_image_cache/privacy_image_cache.php:150 -#: ../../include/text.php:652 +#: ../../addon/dav/layout.fnk.php:418 ../../include/text.php:652 msgid "Save" msgstr "" @@ -2414,7 +2419,7 @@ msgstr "" msgid "Number of daily wall messages for %s exceeded. Message failed." msgstr "" -#: ../../mod/wallmessage.php:56 ../../mod/message.php:65 +#: ../../mod/wallmessage.php:56 ../../mod/message.php:66 msgid "No recipient selected." msgstr "" @@ -2422,15 +2427,15 @@ msgstr "" msgid "Unable to check your home location." msgstr "" -#: ../../mod/wallmessage.php:62 ../../mod/message.php:72 +#: ../../mod/wallmessage.php:62 ../../mod/message.php:73 msgid "Message could not be sent." msgstr "" -#: ../../mod/wallmessage.php:65 ../../mod/message.php:75 +#: ../../mod/wallmessage.php:65 ../../mod/message.php:76 msgid "Message collection failure." msgstr "" -#: ../../mod/wallmessage.php:68 ../../mod/message.php:78 +#: ../../mod/wallmessage.php:68 ../../mod/message.php:79 msgid "Message sent." msgstr "" @@ -2438,12 +2443,12 @@ msgstr "" msgid "No recipient." msgstr "" -#: ../../mod/wallmessage.php:124 ../../mod/message.php:171 +#: ../../mod/wallmessage.php:124 ../../mod/message.php:172 #: ../../include/conversation.php:943 msgid "Please enter a link URL:" msgstr "" -#: ../../mod/wallmessage.php:131 ../../mod/message.php:199 +#: ../../mod/wallmessage.php:131 ../../mod/message.php:200 msgid "Send Private Message" msgstr "" @@ -2454,18 +2459,18 @@ msgid "" "your site allow private mail from unknown senders." msgstr "" -#: ../../mod/wallmessage.php:133 ../../mod/message.php:200 -#: ../../mod/message.php:398 +#: ../../mod/wallmessage.php:133 ../../mod/message.php:201 +#: ../../mod/message.php:399 msgid "To:" msgstr "" -#: ../../mod/wallmessage.php:134 ../../mod/message.php:205 -#: ../../mod/message.php:400 +#: ../../mod/wallmessage.php:134 ../../mod/message.php:206 +#: ../../mod/message.php:401 msgid "Subject:" msgstr "" -#: ../../mod/wallmessage.php:140 ../../mod/message.php:209 -#: ../../mod/message.php:403 ../../mod/invite.php:113 +#: ../../mod/wallmessage.php:140 ../../mod/message.php:210 +#: ../../mod/message.php:404 ../../mod/invite.php:113 msgid "Your message:" msgstr "" @@ -2940,67 +2945,67 @@ msgstr "" msgid "New Message" msgstr "" -#: ../../mod/message.php:69 +#: ../../mod/message.php:70 msgid "Unable to locate contact information." msgstr "" -#: ../../mod/message.php:119 +#: ../../mod/message.php:120 msgid "Message deleted." msgstr "" -#: ../../mod/message.php:149 +#: ../../mod/message.php:150 msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:246 +#: ../../mod/message.php:247 msgid "No messages." msgstr "" -#: ../../mod/message.php:253 +#: ../../mod/message.php:254 #, php-format msgid "Unknown sender - %s" msgstr "" -#: ../../mod/message.php:256 +#: ../../mod/message.php:257 #, php-format msgid "You and %s" msgstr "" -#: ../../mod/message.php:259 +#: ../../mod/message.php:260 #, php-format msgid "%s and You" msgstr "" -#: ../../mod/message.php:269 ../../mod/message.php:391 +#: ../../mod/message.php:270 ../../mod/message.php:392 msgid "Delete conversation" msgstr "" -#: ../../mod/message.php:272 +#: ../../mod/message.php:273 msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/message.php:274 +#: ../../mod/message.php:275 #, php-format msgid "%d message" msgid_plural "%d messages" msgstr[0] "" msgstr[1] "" -#: ../../mod/message.php:309 +#: ../../mod/message.php:310 msgid "Message not available." msgstr "" -#: ../../mod/message.php:374 +#: ../../mod/message.php:375 msgid "Delete message" msgstr "" -#: ../../mod/message.php:393 +#: ../../mod/message.php:394 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/message.php:397 +#: ../../mod/message.php:398 msgid "Send Reply" msgstr "" @@ -4407,7 +4412,7 @@ msgstr "" msgid "Activate Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:785 +#: ../../addon/facebook/facebook.php:785 ../../addon/dav/layout.fnk.php:394 msgid "The new values have been saved." msgstr "" @@ -4639,6 +4644,185 @@ msgstr "" msgid "event" msgstr "" +#: ../../addon/dav/common/wdcal_configuration.php:126 +msgid "U.S. Time Format (mm/dd/YYYY)" +msgstr "" + +#: ../../addon/dav/common/wdcal_configuration.php:205 +msgid "German Time Format (dd.mm.YYYY)" +msgstr "" + +#: ../../addon/dav/common/calendar.fnk.php:507 +#: ../../addon/dav/common/calendar.fnk.php:576 +#: ../../addon/dav/common/calendar.fnk.php:603 +#: ../../addon/dav/layout.fnk.php:266 +msgid "No access" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:116 +msgid "Today" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:132 +msgid "Week" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:139 +msgid "Month" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:144 +msgid "Reload" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:155 +msgid "Date" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:193 ../../addon/dav/layout.fnk.php:237 +msgid "Error" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:259 +msgid "Not found" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:326 ../../addon/dav/layout.fnk.php:399 +msgid "Go back to the calendar" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:346 +msgid "Description" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:349 +msgid "Notification" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:358 +msgid "Minutes" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:361 +msgid "Hours" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:364 +msgid "Days" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:365 +msgid "before" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:401 +msgid "Calendar Settings" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:407 +msgid "Date format" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:416 +msgid "Time zone" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:421 +msgid "Limitations" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:425 +msgid "Warning" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:429 +msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:436 +msgid "Synchronizing this calendar with the iPhone" +msgstr "" + +#: ../../addon/dav/layout.fnk.php:447 +msgid "Synchronizing your Friendica-Contacts with the iPhone" +msgstr "" + +#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:37 +msgid "Friendica-Contacts" +msgstr "" + +#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:38 +msgid "Your Friendica-Contacts" +msgstr "" + +#: ../../addon/dav/main.php:223 +msgid "Calendar" +msgstr "" + +#: ../../addon/dav/main.php:226 +msgid "Extended calendar with CalDAV-support" +msgstr "" + +#: ../../addon/dav/main.php:242 +msgid "The database tables have been installed." +msgstr "" + +#: ../../addon/dav/main.php:243 +msgid "An error occurred during the installation." +msgstr "" + +#: ../../addon/dav/main.php:259 +msgid "No system-wide settings yet." +msgstr "" + +#: ../../addon/dav/main.php:262 +msgid "Database status" +msgstr "" + +#: ../../addon/dav/main.php:265 +msgid "Installed" +msgstr "" + +#: ../../addon/dav/main.php:268 +msgid "Upgrade needed" +msgstr "" + +#: ../../addon/dav/main.php:268 +msgid "Upgrade" +msgstr "" + +#: ../../addon/dav/main.php:271 +msgid "Not installed" +msgstr "" + +#: ../../addon/dav/main.php:271 +msgid "Install" +msgstr "" + +#: ../../addon/dav/main.php:276 +msgid "Troubleshooting" +msgstr "" + +#: ../../addon/dav/main.php:277 +msgid "Manual creation of the database tables:" +msgstr "" + +#: ../../addon/dav/main.php:278 +msgid "Show SQL-statements" +msgstr "" + +#: ../../addon/dav/calendar.friendica.fnk.php:128 +msgid "Private Calendar" +msgstr "" + +#: ../../addon/dav/calendar.friendica.fnk.php:135 +msgid "Friendica Events: Mine" +msgstr "" + +#: ../../addon/dav/calendar.friendica.fnk.php:138 +msgid "Friendica Events: Contacts" +msgstr "" + #: ../../addon/uhremotestorage/uhremotestorage.php:84 #, php-format msgid "" @@ -4786,7 +4970,7 @@ msgid "Post to Drupal by default" msgstr "" #: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:198 -#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:192 +#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:189 msgid "Post from Friendica" msgstr "" @@ -5019,6 +5203,30 @@ msgstr "" msgid "The default zoom level. (1:world, 18:highest)" msgstr "" +#: ../../addon/libertree/libertree.php:36 +msgid "Post to libertree" +msgstr "" + +#: ../../addon/libertree/libertree.php:67 +msgid "libertree Post Settings" +msgstr "" + +#: ../../addon/libertree/libertree.php:69 +msgid "Enable Libertree Post Plugin" +msgstr "" + +#: ../../addon/libertree/libertree.php:74 +msgid "Libertree API token" +msgstr "" + +#: ../../addon/libertree/libertree.php:79 +msgid "Libertree site URL" +msgstr "" + +#: ../../addon/libertree/libertree.php:84 +msgid "Post to Libertree by default" +msgstr "" + #: ../../addon/mathjax/mathjax.php:37 msgid "" "The MathJax addon renders mathematical formulae written using the LaTeX " @@ -5270,6 +5478,10 @@ msgstr "" msgid "API URL" msgstr "" +#: ../../addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:19 +msgid "Infinite Improbability Drive" +msgstr "" + #: ../../addon/tumblr/tumblr.php:36 msgid "Post to Tumblr" msgstr "" diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css index 39da7bb6c..479a8ec06 100644 --- a/view/theme/slackr/style.css +++ b/view/theme/slackr/style.css @@ -13,6 +13,10 @@ background: none; } +.widget { +/* box-shadow: 4px 4px 3px 0 #444444; */ +} + .comment-edit-text-empty, .comment-edit-text-full { border: none; border-left: 1px solid #EEE; -- cgit v1.2.3 From 6a95d483c701b5954ef5a12e710266a7d073aa5f Mon Sep 17 00:00:00 2001 From: zottel Date: Thu, 7 Jun 2012 01:43:32 +0200 Subject: A few corrections in German translations. --- view/de/messages.po | 89 +++++++++++++++++++++++++---------------------------- view/de/strings.php | 13 ++++---- 2 files changed, 48 insertions(+), 54 deletions(-) diff --git a/view/de/messages.po b/view/de/messages.po index 91abdc227..b784e615e 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-06-03 10:00-0700\n" -"PO-Revision-Date: 2012-06-05 08:08+0000\n" +"POT-Creation-Date: 2012-06-05 10:00-0700\n" +"PO-Revision-Date: 2012-06-06 23:32+0000\n" "Last-Translator: zottel \n" "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -67,7 +67,7 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/profiles.php:385 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:503 -#: ../../include/items.php:3297 ../../index.php:306 +#: ../../include/items.php:3332 ../../index.php:306 msgid "Permission denied." msgstr "Zugriff verweigert." @@ -141,9 +141,9 @@ msgstr "Neues Foto von dieser URL" #: ../../mod/localtime.php:45 ../../mod/contacts.php:322 #: ../../mod/settings.php:555 ../../mod/settings.php:701 #: ../../mod/settings.php:762 ../../mod/settings.php:969 -#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:417 -#: ../../mod/admin.php:653 ../../mod/admin.php:789 ../../mod/admin.php:988 -#: ../../mod/admin.php:1075 ../../mod/profiles.php:554 +#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/message.php:215 +#: ../../mod/admin.php:417 ../../mod/admin.php:653 ../../mod/admin.php:789 +#: ../../mod/admin.php:988 ../../mod/admin.php:1075 ../../mod/profiles.php:554 #: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:605 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 #: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158 @@ -411,10 +411,10 @@ msgstr "Foto löschen" msgid "was tagged in a" msgstr "wurde getaggt in einem" -#: ../../mod/photos.php:583 ../../mod/like.php:127 ../../mod/tagger.php:70 +#: ../../mod/photos.php:583 ../../mod/like.php:185 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 #: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1316 -#: ../../include/diaspora.php:1662 ../../include/conversation.php:53 +#: ../../include/diaspora.php:1671 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" msgstr "Foto" @@ -554,7 +554,7 @@ msgstr "Teilen" #: ../../mod/photos.php:1277 ../../mod/editpost.php:104 #: ../../mod/wallmessage.php:145 ../../mod/message.php:214 -#: ../../mod/message.php:408 ../../include/conversation.php:371 +#: ../../mod/message.php:409 ../../include/conversation.php:371 #: ../../include/conversation.php:731 ../../include/conversation.php:1008 msgid "Please wait" msgstr "Bitte warten" @@ -652,7 +652,7 @@ msgid "Edit" msgstr "Bearbeiten" #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 -#: ../../mod/message.php:212 ../../mod/message.php:406 +#: ../../mod/message.php:212 ../../mod/message.php:407 #: ../../include/conversation.php:990 msgid "Upload photo" msgstr "Foto hochladen" @@ -662,7 +662,7 @@ msgid "Attach file" msgstr "Datei anhängen" #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 -#: ../../mod/message.php:213 ../../mod/message.php:407 +#: ../../mod/message.php:213 ../../mod/message.php:408 #: ../../include/conversation.php:994 msgid "Insert web link" msgstr "einen Link einfügen" @@ -2141,7 +2141,7 @@ msgstr "Die Adresse deines Profils lautet:" #: ../../mod/settings.php:953 msgid "Automatically expire posts after this many days:" -msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen" +msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:" #: ../../mod/settings.php:953 msgid "If empty, posts will not expire. Expired posts will be deleted" @@ -2173,7 +2173,7 @@ msgstr "Fotos verfallen lassen:" #: ../../mod/settings.php:960 msgid "Only expire posts by others:" -msgstr "Nur Beiträge anderer verfallen" +msgstr "Nur Beiträge anderer verfallen:" #: ../../mod/settings.php:967 msgid "Account Settings" @@ -2217,7 +2217,7 @@ msgstr "Standardstandort:" #: ../../mod/settings.php:986 msgid "Use Browser Location:" -msgstr "Verwende den Standort des Browsers:" +msgstr "Standort des Browsers verwenden:" #: ../../mod/settings.php:989 msgid "Security and Privacy Settings" @@ -2470,17 +2470,17 @@ msgid "" msgstr "Wenn du möchtest, dass %s dir antworten kann, überprüfe deine Privatsphären-Einstellungen und erlaube private Nachrichten von unbekannten Absendern." #: ../../mod/wallmessage.php:133 ../../mod/message.php:200 -#: ../../mod/message.php:397 +#: ../../mod/message.php:398 msgid "To:" msgstr "An:" #: ../../mod/wallmessage.php:134 ../../mod/message.php:205 -#: ../../mod/message.php:399 +#: ../../mod/message.php:400 msgid "Subject:" msgstr "Betreff:" #: ../../mod/wallmessage.php:140 ../../mod/message.php:209 -#: ../../mod/message.php:402 ../../mod/invite.php:113 +#: ../../mod/message.php:403 ../../mod/invite.php:113 msgid "Your message:" msgstr "Deine Nachricht:" @@ -2776,26 +2776,26 @@ msgstr "Registrieren" msgid "People Search" msgstr "Personen Suche" -#: ../../mod/like.php:127 ../../mod/tagger.php:70 +#: ../../mod/like.php:185 ../../mod/like.php:259 ../../mod/tagger.php:70 #: ../../addon/facebook/facebook.php:1572 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 #: ../../view/theme/diabook/theme.php:565 -#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1662 +#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1671 #: ../../include/conversation.php:48 ../../include/conversation.php:57 #: ../../include/conversation.php:121 ../../include/conversation.php:130 msgid "status" msgstr "Status" -#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1576 +#: ../../mod/like.php:202 ../../addon/facebook/facebook.php:1576 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1678 +#: ../../view/theme/diabook/theme.php:579 ../../include/diaspora.php:1687 #: ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "%1$s mag %2$ss %3$s" -#: ../../mod/like.php:146 ../../include/conversation.php:68 +#: ../../mod/like.php:204 ../../include/conversation.php:68 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "%1$s mag %2$ss %3$s nicht" @@ -2968,55 +2968,55 @@ msgstr "Nachricht gelöscht." msgid "Conversation removed." msgstr "Unterhaltung gelöscht." -#: ../../mod/message.php:245 +#: ../../mod/message.php:246 msgid "No messages." msgstr "Keine Nachrichten." -#: ../../mod/message.php:252 +#: ../../mod/message.php:253 #, php-format msgid "Unknown sender - %s" msgstr "'Unbekannter Absender - %s" -#: ../../mod/message.php:255 +#: ../../mod/message.php:256 #, php-format msgid "You and %s" msgstr "Du und %s" -#: ../../mod/message.php:258 +#: ../../mod/message.php:259 #, php-format msgid "%s and You" msgstr "%s und Du" -#: ../../mod/message.php:268 ../../mod/message.php:390 +#: ../../mod/message.php:269 ../../mod/message.php:391 msgid "Delete conversation" msgstr "Unterhaltung löschen" -#: ../../mod/message.php:271 +#: ../../mod/message.php:272 msgid "D, d M Y - g:i A" msgstr "D, d. M Y - g:i A" -#: ../../mod/message.php:273 +#: ../../mod/message.php:274 #, php-format msgid "%d message" msgid_plural "%d messages" msgstr[0] "%d Nachricht" msgstr[1] "%d Nachrichten" -#: ../../mod/message.php:308 +#: ../../mod/message.php:309 msgid "Message not available." msgstr "Nachricht nicht verfügbar." -#: ../../mod/message.php:373 +#: ../../mod/message.php:374 msgid "Delete message" msgstr "Nachricht löschen" -#: ../../mod/message.php:392 +#: ../../mod/message.php:393 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "Sichere Kommunikation ist nicht verfügbar. Eventuell kannst du auf der Profilseite des Absenders antworten." -#: ../../mod/message.php:396 +#: ../../mod/message.php:397 msgid "Send Reply" msgstr "Antwort senden" @@ -3858,7 +3858,7 @@ msgstr "Adresse:" #: ../../mod/profiles.php:565 msgid "Locality/City:" -msgstr "Wohnort/Stadt:" +msgstr "Wohnort:" #: ../../mod/profiles.php:566 msgid "Postal/Zip Code:" @@ -3898,7 +3898,7 @@ msgstr "Adresse der Homepage:" #: ../../mod/profiles.php:575 ../../include/profile_advanced.php:50 msgid "Hometown:" -msgstr "Wohnort:" +msgstr "Heimatort:" #: ../../mod/profiles.php:576 ../../include/profile_advanced.php:54 msgid "Political Views:" @@ -4204,7 +4204,7 @@ msgstr "Kontaktanfrage schlug fehl oder wurde zurück gezogen." msgid "Unable to set contact photo." msgstr "Konnte das Bild des Kontakts nicht speichern." -#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:507 +#: ../../mod/dfrn_confirm.php:477 ../../include/diaspora.php:510 #: ../../include/conversation.php:101 #, php-format msgid "%1$s is now friends with %2$s" @@ -6186,12 +6186,12 @@ msgstr "Beginnt:" msgid "Finishes:" msgstr "Endet:" -#: ../../include/delivery.php:455 ../../include/notifier.php:677 +#: ../../include/delivery.php:456 ../../include/notifier.php:678 msgid "(no subject)" msgstr "(kein Betreff)" -#: ../../include/delivery.php:462 ../../include/enotify.php:26 -#: ../../include/notifier.php:684 +#: ../../include/delivery.php:463 ../../include/enotify.php:26 +#: ../../include/notifier.php:685 msgid "noreply" msgstr "noreply" @@ -6346,19 +6346,14 @@ msgstr "Beitrag" msgid "Item filed" msgstr "Beitrag abgelegt" -#: ../../include/diaspora.php:590 +#: ../../include/diaspora.php:593 msgid "Sharing notification from Diaspora network" msgstr "Freigabe-Benachrichtigung von Diaspora" -#: ../../include/diaspora.php:1977 +#: ../../include/diaspora.php:2037 msgid "Attachments:" msgstr "Anhänge:" -#: ../../include/diaspora.php:2168 -#, php-format -msgid "[Relayed] Comment authored by %s from network %s" -msgstr "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk" - #: ../../include/network.php:824 msgid "view full size" msgstr "Volle Größe anzeigen" @@ -7111,7 +7106,7 @@ msgstr "mag ich nicht" #: ../../include/conversation.php:557 msgid "Share this" -msgstr "Teile dieses" +msgstr "Weitersagen" #: ../../include/conversation.php:557 msgid "share" diff --git a/view/de/strings.php b/view/de/strings.php index b49df0e80..f3d1f23a7 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -472,7 +472,7 @@ $a->strings["Permit unknown people to send you private mail?"] = "Dürfen dir Un $a->strings["Profile is not published."] = "Profil ist nicht veröffentlicht."; $a->strings["or"] = "oder"; $a->strings["Your Identity Address is"] = "Die Adresse deines Profils lautet:"; -$a->strings["Automatically expire posts after this many days:"] = "Beiträge verfallen automatisch nach dieser Anzahl von Tagen"; +$a->strings["Automatically expire posts after this many days:"] = "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:"; $a->strings["If empty, posts will not expire. Expired posts will be deleted"] = "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht."; $a->strings["Advanced expiration settings"] = "Erweiterte Verfallseinstellungen"; $a->strings["Advanced Expiration"] = "Erweitertes Verfallen"; @@ -480,7 +480,7 @@ $a->strings["Expire posts:"] = "Beiträge verfallen lassen:"; $a->strings["Expire personal notes:"] = "Persönliche Notizen verfallen lassen:"; $a->strings["Expire starred posts:"] = "Markierte Beiträge verfallen lassen:"; $a->strings["Expire photos:"] = "Fotos verfallen lassen:"; -$a->strings["Only expire posts by others:"] = "Nur Beiträge anderer verfallen"; +$a->strings["Only expire posts by others:"] = "Nur Beiträge anderer verfallen:"; $a->strings["Account Settings"] = "Kontoeinstellungen"; $a->strings["Password Settings"] = "Passwort-Einstellungen"; $a->strings["New Password:"] = "Neues Passwort:"; @@ -491,7 +491,7 @@ $a->strings["Full Name:"] = "Kompletter Name:"; $a->strings["Email Address:"] = "E-Mail-Adresse:"; $a->strings["Your Timezone:"] = "Deine Zeitzone:"; $a->strings["Default Post Location:"] = "Standardstandort:"; -$a->strings["Use Browser Location:"] = "Verwende den Standort des Browsers:"; +$a->strings["Use Browser Location:"] = "Standort des Browsers verwenden:"; $a->strings["Security and Privacy Settings"] = "Sicherheits- und Privatsphäre-Einstellungen"; $a->strings["Maximum Friend Requests/Day:"] = "Maximale Anzahl von Freundschaftsanfragen/Tag:"; $a->strings["(to prevent spam abuse)"] = "(um SPAM zu vermeiden)"; @@ -866,7 +866,7 @@ $a->strings["Title/Description:"] = "Titel/Beschreibung:"; $a->strings["Your Gender:"] = "Dein Geschlecht:"; $a->strings["Birthday (%s):"] = "Geburtstag (%s):"; $a->strings["Street Address:"] = "Adresse:"; -$a->strings["Locality/City:"] = "Wohnort/Stadt:"; +$a->strings["Locality/City:"] = "Wohnort:"; $a->strings["Postal/Zip Code:"] = "Postleitzahl:"; $a->strings["Country:"] = "Land:"; $a->strings["Region/State:"] = "Region/Bundesstaat:"; @@ -876,7 +876,7 @@ $a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = "Beispiel $a->strings["Since [date]:"] = "Seit [Datum]:"; $a->strings["Sexual Preference:"] = "Sexuelle Vorlieben:"; $a->strings["Homepage URL:"] = "Adresse der Homepage:"; -$a->strings["Hometown:"] = "Wohnort:"; +$a->strings["Hometown:"] = "Heimatort:"; $a->strings["Political Views:"] = "Politische Ansichten:"; $a->strings["Religious Views:"] = "Religiöse Ansichten:"; $a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:"; @@ -1442,7 +1442,6 @@ $a->strings["post"] = "Beitrag"; $a->strings["Item filed"] = "Beitrag abgelegt"; $a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora"; $a->strings["Attachments:"] = "Anhänge:"; -$a->strings["[Relayed] Comment authored by %s from network %s"] = "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk"; $a->strings["view full size"] = "Volle Größe anzeigen"; $a->strings["Embedded content"] = "Eingebetteter Inhalt"; $a->strings["Embedding disabled"] = "Einbettungen deaktiviert"; @@ -1621,7 +1620,7 @@ $a->strings["%d comment"] = array( ); $a->strings["like"] = "mag ich"; $a->strings["dislike"] = "mag ich nicht"; -$a->strings["Share this"] = "Teile dieses"; +$a->strings["Share this"] = "Weitersagen"; $a->strings["share"] = "Teilen"; $a->strings["Bold"] = "Fett"; $a->strings["Italic"] = "Kursiv"; -- cgit v1.2.3 From 3b49035636a230f2b91d26686ba7c61a16df532f Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 6 Jun 2012 22:28:30 -0700 Subject: admin page untranslated strings, remove empty list element for update --- mod/admin.php | 3 +++ view/admin_aside.tpl | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 6b1a53a30..56f88a489 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -117,6 +117,9 @@ function admin_content(&$a) { $t = get_markup_template("admin_aside.tpl"); $a->page['aside'] .= replace_macros( $t, array( '$admin' => $aside, + '$admtxt' => t('Admin'), + '$plugadmtxt' => t('Plugin Features'), + '$logtxt' => t('Logs'), '$h_pending' => t('User registrations waiting for confirmation'), '$admurl'=> $a->get_baseurl(true)."/admin/" )); diff --git a/view/admin_aside.tpl b/view/admin_aside.tpl index f25a1eb4b..ca1f4985c 100644 --- a/view/admin_aside.tpl +++ b/view/admin_aside.tpl @@ -10,7 +10,7 @@ }); }); -

Admin

+

$admtxt

+{{ if $admin.update }} +{{ endif }} -{{ if $admin.plugins_admin }}

Plugins

{{ endif }} +{{ if $admin.plugins_admin }}

$plugadmtxt

{{ endif }} -

Logs

+

$logtxt

-- cgit v1.2.3 From 6477c24919eb969d80324cf29129213f2fb8a0ea Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 6 Jun 2012 23:10:32 -0700 Subject: more logging on subscribe_to_hub --- include/items.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 4513db1db..66e219ddf 100755 --- a/include/items.php +++ b/include/items.php @@ -2777,6 +2777,8 @@ function lose_sharer($importer,$contact,$datarray,$item) { function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') { + $a = get_app(); + if(is_array($importer)) { $r = q("SELECT `nickname` FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer['uid']) @@ -2807,7 +2809,10 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') { ); } - post_url($url,$params); + post_url($url,$params); + + logger('subscribe_to_hub: returns: ' . $a->get_curl_code(), LOGGER_DEBUG); + return; } -- cgit v1.2.3 From 757037c3bfe7c8f23a8dbda2f7be7b1dfaacf739 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Thu, 7 Jun 2012 08:28:10 -0400 Subject: events: fix select events query select events that starts before display start date and/or ends after display end date. --- mod/events.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 mod/events.php diff --git a/mod/events.php b/mod/events.php old mode 100644 new mode 100755 index 069046ff9..2a6fb692e --- a/mod/events.php +++ b/mod/events.php @@ -230,8 +230,8 @@ function events_content(&$a) { $r = q("SELECT `event`.*, `item`.`id` AS `itemid`,`item`.`plink`, `item`.`author-name`, `item`.`author-avatar`, `item`.`author-link` FROM `event` LEFT JOIN `item` ON `item`.`event-id` = `event`.`id` WHERE `event`.`uid` = %d - AND (( `adjust` = 0 AND `start` >= '%s' AND `start` <= '%s' ) - OR ( `adjust` = 1 AND `start` >= '%s' AND `start` <= '%s' )) ", + AND (( `adjust` = 0 AND `finish` >= '%s' AND `start` <= '%s' ) + OR ( `adjust` = 1 AND `finish` >= '%s' AND `start` <= '%s' )) ", intval(local_user()), dbesc($start), dbesc($finish), -- cgit v1.2.3 From 1d832618a4340526092fce9e49f4580f767e1526 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Thu, 7 Jun 2012 08:49:33 -0400 Subject: fix a random profile error message --- include/oembed.php | 4 +++- view/oembed_video.tpl | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) mode change 100644 => 100755 include/oembed.php mode change 100644 => 100755 view/oembed_video.tpl diff --git a/include/oembed.php b/include/oembed.php old mode 100644 new mode 100755 index 1f45d2814..e2504b7eb --- a/include/oembed.php +++ b/include/oembed.php @@ -65,7 +65,8 @@ function oembed_fetch_url($embedurl){ } function oembed_format_object($j){ - $embedurl = $j->embedurl; + $a = get_app(); + $embedurl = $j->embedurl; $jhtml = oembed_iframe($j->embedurl,(isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null) ); $ret=""; switch ($j->type) { @@ -78,6 +79,7 @@ function oembed_format_object($j){ $th=120; $tw = $th*$tr; $tpl=get_markup_template('oembed_video.tpl'); $ret.=replace_macros($tpl, array( + '$baseurl' => $a->get_baseurl(), '$embedurl'=>$embedurl, '$escapedhtml'=>base64_encode($jhtml), '$tw'=>$tw, diff --git a/view/oembed_video.tpl b/view/oembed_video.tpl old mode 100644 new mode 100755 index 5824d8d4e..d3a9a9311 --- a/view/oembed_video.tpl +++ b/view/oembed_video.tpl @@ -1,4 +1,4 @@ -
+
-- cgit v1.2.3 From 7cc8c369cb6a01cffb58215966844b53794f32f4 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 7 Jun 2012 17:42:13 +0200 Subject: Add support for PNG images with alpha --- boot.php | 7 ++- include/Photo.php | 129 +++++++++++++++++++++++++++++++++++++++++++------- include/items.php | 12 +++-- include/network.php | 5 +- include/user.php | 8 +++- mod/parse_url.php | 5 +- mod/photo.php | 18 +++++-- mod/photos.php | 51 ++++++++++++-------- mod/profile_photo.php | 10 ++-- mod/wall_upload.php | 34 ++++++------- update.php | 8 +++- 11 files changed, 216 insertions(+), 71 deletions(-) diff --git a/boot.php b/boot.php index 7961efc4a..0e8f017f4 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_VERSION', '3.0.1366' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1148 ); +define ( 'DB_UPDATE_VERSION', 1149 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -28,6 +28,11 @@ define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); */ define ( 'JPEG_QUALITY', 100 ); +/** + * $a->config['system']['png_quality'] from 0 (uncompressed) to 9 + */ +define ( 'PNG_QUALITY', 8 ); + /** * Not yet used diff --git a/include/Photo.php b/include/Photo.php index fce559999..ffefc37ec 100644 --- a/include/Photo.php +++ b/include/Photo.php @@ -7,14 +7,34 @@ class Photo { private $width; private $height; private $valid; + private $type; + private $types; + + /** + * supported mimetypes and corresponding file extensions + */ + static function supportedTypes() { + $t = array(); + $t['image/jpeg'] ='jpg'; + if (imagetypes() & IMG_PNG) $t['image/png'] = 'png'; + return $t; + } + + public function __construct($data, $type="image/jpeg") { - public function __construct($data) { + $this->types = $this->supportedTypes(); + if (!array_key_exists($type,$this->types)){ + $type='image/jpeg'; + } $this->valid = false; + $this->type = $type; $this->image = @imagecreatefromstring($data); if($this->image !== FALSE) { $this->width = imagesx($this->image); $this->height = imagesy($this->image); $this->valid = true; + imagealphablending($this->image, false); + imagesavealpha($this->image, true); } } @@ -38,6 +58,13 @@ class Photo { public function getImage() { return $this->image; } + + public function getType() { + return $this->type; + } + public function getExt() { + return $this->types[$this->type]; + } public function scaleImage($max) { @@ -78,6 +105,9 @@ class Photo { $dest = imagecreatetruecolor( $dest_width, $dest_height ); + imagealphablending($dest->image, false); + imagesavealpha($dest, true); + if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127));; // fill with alpha imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height); if($this->image) imagedestroy($this->image); @@ -134,6 +164,9 @@ class Photo { $dest = imagecreatetruecolor( $dest_width, $dest_height ); + imagealphablending($dest->image, false); + imagesavealpha($dest, true); + if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127));; // fill with alpha imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height); if($this->image) imagedestroy($this->image); @@ -148,6 +181,9 @@ class Photo { public function scaleImageSquare($dim) { $dest = imagecreatetruecolor( $dim, $dim ); + imagealphablending($dest->image, false); + imagesavealpha($dest, true); + if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127));; // fill with alpha imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dim, $dim, $this->width, $this->height); if($this->image) imagedestroy($this->image); @@ -159,6 +195,9 @@ class Photo { public function cropImage($max,$x,$y,$w,$h) { $dest = imagecreatetruecolor( $max, $max ); + imagealphablending($dest->image, false); + imagesavealpha($dest, true); + if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127));; // fill with alpha imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $max, $max, $w, $h); if($this->image) imagedestroy($this->image); @@ -168,20 +207,38 @@ class Photo { } public function saveImage($path) { - $quality = get_config('system','jpeg_quality'); - if((! $quality) || ($quality > 100)) - $quality = JPEG_QUALITY; - imagejpeg($this->image,$path,$quality); + switch($this->type){ + case "image/png": + $quality = get_config('system','png_quality'); + if((! $quality) || ($quality > 9)) + $quality = PNG_QUALITY; + imagepng($this->image, $path, $quality); + break; + default: + $quality = get_config('system','jpeg_quality'); + if((! $quality) || ($quality > 100)) + $quality = JPEG_QUALITY; + imagejpeg($this->image,$path,$quality); + } + } public function imageString() { ob_start(); - - $quality = get_config('system','jpeg_quality'); - if((! $quality) || ($quality > 100)) - $quality = JPEG_QUALITY; - - imagejpeg($this->image,NULL,$quality); + switch($this->type){ + case "image/png": + $quality = get_config('system','png_quality'); + if((! $quality) || ($quality > 9)) + $quality = PNG_QUALITY; + imagepng($this->image,NULL, $quality); + break; + default: + $quality = get_config('system','jpeg_quality'); + if((! $quality) || ($quality > 100)) + $quality = JPEG_QUALITY; + + imagejpeg($this->image,NULL,$quality); + } $s = ob_get_contents(); ob_end_clean(); return $s; @@ -200,8 +257,8 @@ class Photo { $guid = get_guid(); $r = q("INSERT INTO `photo` - ( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, `album`, `height`, `width`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` ) - VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )", + ( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` ) + VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )", intval($uid), intval($cid), dbesc($guid), @@ -209,6 +266,7 @@ class Photo { dbesc(datetime_convert()), dbesc(datetime_convert()), dbesc(basename($filename)), + dbesc($this->type), dbesc($album), intval($this->height), intval($this->width), @@ -230,6 +288,38 @@ class Photo { }} +/** + * Guess image mimetype from filename or from Content-Type header + * + * @arg $filename string Image filename + * @arg $fromcurl boolean Check Content-Type header from curl request + */ +function guess_image_type($filename, $fromcurl=false) { + $type = null; + if ($fromcurl) { + $a = get_app(); + $headers=array(); + $h = explode("\n",$a->get_curl_headers()); + foreach ($h as $l) { + list($k,$v) = array_map("trim", explode(":", trim($l), 2)); + $headers[$k] = $v; + } + if (array_key_exists('Content-Type', $headers)) + $type = $headers['Content-Type']; + } + if (is_null($type)){ + $ext = pathinfo($filename, PATHINFO_EXTENSION); + $types = Photo::supportedTypes(); + foreach ($types as $m=>$e){ + if ($ext==$e) return $m; + } + $type = "image/jpeg"; + } + + return $type; + +} + function import_profile_photo($photo,$uid,$cid) { $a = get_app(); @@ -238,7 +328,12 @@ function import_profile_photo($photo,$uid,$cid) { $filename = basename($photo); $img_str = fetch_url($photo,true); - $img = new Photo($img_str); + + // guess mimetype from headers or filename + $type = guess_image_type($photo,true); + + + $img = new Photo($img_str, $type); if($img->is_valid()) { $img->scaleImageSquare(175); @@ -266,9 +361,9 @@ function import_profile_photo($photo,$uid,$cid) { - $photo = $a->get_baseurl() . '/photo/' . $hash . '-4.jpg'; - $thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.jpg'; - $micro = $a->get_baseurl() . '/photo/' . $hash . '-6.jpg'; + $photo = $a->get_baseurl() . '/photo/' . $hash . '-4.' . $img->getExt(); + $thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.' . $img->getExt(); + $micro = $a->get_baseurl() . '/photo/' . $hash . '-6.' . $img->getExt(); } else $photo_failure = true; diff --git a/include/items.php b/include/items.php index 66e219ddf..15c043e92 100755 --- a/include/items.php +++ b/include/items.php @@ -1346,7 +1346,11 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) } $img_str = fetch_url($photo_url,true); - $img = new Photo($img_str); + // guess mimetype from headers or filename + $type = guess_image_type($photo_url,true); + + + $img = new Photo($img_str, $type); if($img->is_valid()) { if($have_photo) { q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `contact-id` = %d AND `uid` = %d", @@ -1372,9 +1376,9 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) q("UPDATE `contact` SET `avatar-date` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `uid` = %d AND `id` = %d LIMIT 1", dbesc(datetime_convert()), - dbesc($a->get_baseurl() . '/photo/' . $hash . '-4.jpg'), - dbesc($a->get_baseurl() . '/photo/' . $hash . '-5.jpg'), - dbesc($a->get_baseurl() . '/photo/' . $hash . '-6.jpg'), + dbesc($a->get_baseurl() . '/photo/' . $hash . '-4.'.$img->getExt()), + dbesc($a->get_baseurl() . '/photo/' . $hash . '-5.'.$img->getExt()), + dbesc($a->get_baseurl() . '/photo/' . $hash . '-6.'.$img->getExt()), intval($contact['uid']), intval($contact['id']) ); diff --git a/include/network.php b/include/network.php index eeb2460d1..446413cd8 100644 --- a/include/network.php +++ b/include/network.php @@ -807,8 +807,11 @@ function scale_external_images($s,$include_link = true) { if(stristr($mtch[1],$hostname)) continue; $i = fetch_url($mtch[1]); + // guess mimetype from headers or filename + $type = guess_image_type($mtch[1],true); + if($i) { - $ph = new Photo($i); + $ph = new Photo($i, $type); if($ph->is_valid()) { $orig_width = $ph->getWidth(); $orig_height = $ph->getHeight(); diff --git a/include/user.php b/include/user.php index af43a2b52..2477438bf 100644 --- a/include/user.php +++ b/include/user.php @@ -284,7 +284,11 @@ function create_user($arr) { $filename = basename($photo); $img_str = fetch_url($photo,true); - $img = new Photo($img_str); + // guess mimetype from headers or filename + $type = guess_image_type($photo,true); + + + $img = new Photo($img_str, $type); if($img->is_valid()) { $img->scaleImageSquare(175); @@ -324,4 +328,4 @@ function create_user($arr) { $result['user'] = $u; return $result; -} \ No newline at end of file +} diff --git a/mod/parse_url.php b/mod/parse_url.php index 27dac4d5d..cdf2223a8 100644 --- a/mod/parse_url.php +++ b/mod/parse_url.php @@ -215,8 +215,11 @@ function parse_url_content(&$a) { $i = fetch_url($image); if($i) { + // guess mimetype from headers or filename + $type = guess_image_type($image,true); + require_once('include/Photo.php'); - $ph = new Photo($i); + $ph = new Photo($i, $type); if($ph->is_valid()) { if($ph->getWidth() > 300 || $ph->getHeight() > 300) { $ph->scaleImage(300); diff --git a/mod/photo.php b/mod/photo.php index 3cd8250a9..e8e74cfde 100644 --- a/mod/photo.php +++ b/mod/photo.php @@ -1,6 +1,7 @@ $e){ + $photo = str_replace(".$e",'',$photo); + } if(substr($photo,-2,1) == '-') { $resolution = intval(substr($photo,-1,1)); @@ -119,6 +124,7 @@ function photo_init(&$a) { if(count($r)) { $data = $r[0]['data']; + $mimetype = $r[0]['type']; } else { @@ -136,6 +142,7 @@ function photo_init(&$a) { ); if(count($r)) { $data = file_get_contents('images/nosign.jpg'); + $mimetype = 'image/jpeg'; $prvcachecontrol = true; } } @@ -148,12 +155,15 @@ function photo_init(&$a) { case 4: $data = file_get_contents('images/person-175.jpg'); + $mimetype = 'image/jpeg'; break; case 5: $data = file_get_contents('images/person-80.jpg'); + $mimetype = 'image/jpeg'; break; case 6: $data = file_get_contents('images/person-48.jpg'); + $mimetype = 'image/jpeg'; break; default: killme(); @@ -164,11 +174,11 @@ function photo_init(&$a) { } if(isset($customres) && $customres > 0 && $customres < 500) { - require_once('include/Photo.php'); - $ph = new Photo($data); + $ph = new Photo($data, $mimetype); if($ph->is_valid()) { $ph->scaleImageSquare($customres); $data = $ph->imageString(); + $mimetype = $ph->getType(); } } @@ -181,7 +191,7 @@ function photo_init(&$a) { header_remove('pragma'); } - header("Content-type: image/jpeg"); + header("Content-type: ".$mimetype); if($prvcachecontrol) { diff --git a/mod/photos.php b/mod/photos.php index 3ce6f9934..072353587 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -5,6 +5,7 @@ require_once('include/acl_selectors.php'); require_once('include/bbcode.php'); require_once('include/security.php'); + function photos_init(&$a) { @@ -105,6 +106,8 @@ function photos_post(&$a) { logger('mod_photos: REQUEST ' . print_r($_REQUEST,true), LOGGER_DATA); logger('mod_photos: FILES ' . print_r($_FILES,true), LOGGER_DATA); + $phototypes = Photo::supportedTypes(); + $can_post = false; $visitor = 0; @@ -311,7 +314,7 @@ function photos_post(&$a) { intval($page_owner_uid) ); if(count($r)) { - $ph = new Photo($r[0]['data']); + $ph = new Photo($r[0]['data'], $r[0]['type']); if($ph->is_valid()) { $ph->rotate(270); @@ -362,6 +365,7 @@ function photos_post(&$a) { intval($page_owner_uid) ); if(count($p)) { + $ext = $phototypes[$p[0]['type']]; $r = q("UPDATE `photo` SET `desc` = '%s', `album` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource-id` = '%s' AND `uid` = %d", dbesc($desc), dbesc($albname), @@ -386,7 +390,7 @@ function photos_post(&$a) { $title = ''; $uri = item_new_uri($a->get_hostname(),$page_owner_uid); - + $arr = array(); $arr['uid'] = $page_owner_uid; @@ -412,7 +416,7 @@ function photos_post(&$a) { $arr['origin'] = 1; $arr['body'] = '[url=' . $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $p[0]['resource-id'] . ']' - . '[img]' . $a->get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.jpg' . '[/img]' + . '[img]' . $a->get_baseurl() . '/photo/' . $p[0]['resource-id'] . '-' . $p[0]['scale'] . '.'. $ext . '[/img]' . '[/url]'; $item_id = item_store($arr); @@ -581,17 +585,17 @@ function photos_post(&$a) { $arr['inform'] = $tagged[2]; $arr['origin'] = 1; $arr['body'] = '[url=' . $tagged[1] . ']' . $tagged[0] . '[/url]' . ' ' . t('was tagged in a') . ' ' . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . t('photo') . '[/url]' . ' ' . t('by') . ' ' . '[url=' . $owner_record['url'] . ']' . $owner_record['name'] . '[/url]' ; - $arr['body'] .= "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.jpg' . '[/img][/url]' . "\n" ; + $arr['body'] .= "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ']' . '[img]' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '[/img][/url]' . "\n" ; $arr['object'] = '' . ACTIVITY_OBJ_PERSON . '' . $tagged[0] . '' . $tagged[1] . '/' . $tagged[0] . ''; $arr['object'] .= '' . xmlify('' . "\n"); if($tagged[3]) - $arr['object'] .= xmlify('' . "\n"); + $arr['object'] .= xmlify('' . "\n"); $arr['object'] .= '' . "\n"; $arr['target'] = '' . ACTIVITY_OBJ_PHOTO . '' . $p[0]['desc'] . '' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . ''; - $arr['target'] .= '' . xmlify('' . "\n" . '') . ''; + $arr['target'] .= '' . xmlify('' . "\n" . '') . ''; $item_id = item_store($arr); if($item_id) { @@ -662,7 +666,7 @@ function photos_post(&$a) { $str_group_deny = perms2str(((is_array($_REQUEST['group_deny'])) ? $_REQUEST['group_deny'] : explode(',',$_REQUEST['group_deny']))); $str_contact_deny = perms2str(((is_array($_REQUEST['contact_deny'])) ? $_REQUEST['contact_deny'] : explode(',',$_REQUEST['contact_deny']))); - $ret = array('src' => '', 'filename' => '', 'filesize' => 0); + $ret = array('src' => '', 'filename' => '', 'filesize' => 0, 'type' => ''); call_hooks('photo_post_file',$ret); @@ -670,15 +674,17 @@ function photos_post(&$a) { $src = $ret['src']; $filename = $ret['filename']; $filesize = $ret['filesize']; + $type = $ret['type']; } else { $src = $_FILES['userfile']['tmp_name']; $filename = basename($_FILES['userfile']['name']); $filesize = intval($_FILES['userfile']['size']); + $type = $_FILES['userfile']['type']; } + - - logger('photos: upload: received file: ' . $filename . ' as ' . $src . ' ' . $filesize . ' bytes', LOGGER_DEBUG); + logger('photos: upload: received file: ' . $filename . ' as ' . $src . ' '. $type . ' ' . $filesize . ' bytes', LOGGER_DEBUG); $maximagesize = get_config('system','maximagesize'); @@ -701,7 +707,7 @@ function photos_post(&$a) { logger('mod/photos.php: photos_post(): loading the contents of ' . $src , LOGGER_DEBUG); $imagedata = @file_get_contents($src); - $ph = new Photo($imagedata); + $ph = new Photo($imagedata, $type); if(! $ph->is_valid()) { logger('mod/photos.php: photos_post(): unable to process image' , LOGGER_DEBUG); @@ -771,7 +777,7 @@ function photos_post(&$a) { $arr['origin'] = 1; $arr['body'] = '[url=' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $photo_hash . ']' - . '[img]' . $a->get_baseurl() . "/photo/{$photo_hash}-{$smallest}.jpg" . '[/img]' + . '[img]' . $a->get_baseurl() . "/photo/{$photo_hash}-{$smallest}.".$ph->getExt() . '[/img]' . '[/url]'; $item_id = item_store($arr); @@ -814,8 +820,8 @@ function photos_content(&$a) { notice( t('Public access denied.') . EOL); return; } - - + + require_once('include/bbcode.php'); require_once('include/security.php'); require_once('include/conversation.php'); @@ -825,6 +831,8 @@ function photos_content(&$a) { return; } + $phototypes = Photo::supportedTypes(); + $_SESSION['photo_return'] = $a->cmd; // @@ -991,7 +999,7 @@ function photos_content(&$a) { $a->set_pager_itemspage(20); } - $r = q("SELECT `resource-id`, `id`, `filename`, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s' + $r = q("SELECT `resource-id`, `id`, `filename`, type, max(`scale`) AS `scale`, `desc` FROM `photo` WHERE `uid` = %d AND `album` = '%s' AND `scale` <= 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d", intval($owner_uid), dbesc($album), @@ -1038,13 +1046,15 @@ function photos_content(&$a) { $twist = 'rotleft'; else $twist = 'rotright'; + + $ext = $phototypes[$rr['type']]; $o .= replace_macros($tpl,array( '$id' => $rr['id'], '$twist' => ' ' . $twist . rand(2,4), '$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'], '$phototitle' => t('View Photo'), - '$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.jpg', + '$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext, '$imgalt' => template_escape($rr['filename']), '$desc'=> template_escape($rr['desc']) )); @@ -1158,9 +1168,9 @@ function photos_content(&$a) { $prevlink = array($prevlink, '') ; $photo = array( - 'href' => $a->get_baseurl() . '/photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.jpg', + 'href' => $a->get_baseurl() . '/photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.' . $phototypes[$hires['type']], 'title'=> t('View Full Size'), - 'src' => $a->get_baseurl() . '/photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.jpg' . '?f=&_u=' . datetime_convert('','','','ymdhis') + 'src' => $a->get_baseurl() . '/photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.' . $phototypes[$lores['type']] . '?f=&_u=' . datetime_convert('','','','ymdhis') ); if($nextlink) @@ -1449,7 +1459,7 @@ function photos_content(&$a) { $a->set_pager_itemspage(20); } - $r = q("SELECT `resource-id`, `id`, `filename`, `album`, max(`scale`) AS `scale` FROM `photo` + $r = q("SELECT `resource-id`, `id`, `filename`, type, `album`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' $sql_extra GROUP BY `resource-id` ORDER BY `created` DESC LIMIT %d , %d", intval($a->data['user']['uid']), @@ -1469,13 +1479,14 @@ function photos_content(&$a) { $twist = 'rotleft'; else $twist = 'rotright'; - + $ext = $phototypes[$rr['type']]; + $photos[] = array( 'id' => $rr['id'], 'twist' => ' ' . $twist . rand(2,4), 'link' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'], 'title' => t('View Photo'), - 'src' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.jpg', + 'src' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.' . $ext, 'alt' => template_escape($rr['filename']), 'album' => array( 'link' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']), diff --git a/mod/profile_photo.php b/mod/profile_photo.php index ace8dadd4..2817f3942 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -53,7 +53,7 @@ function profile_photo_post(&$a) { $base_image = $r[0]; - $im = new Photo($base_image['data']); + $im = new Photo($base_image['data'], $base_image['type']); if($im->is_valid()) { $im->cropImage(175,$srcX,$srcY,$srcW,$srcH); @@ -108,6 +108,7 @@ function profile_photo_post(&$a) { $src = $_FILES['userfile']['tmp_name']; $filename = basename($_FILES['userfile']['name']); $filesize = intval($_FILES['userfile']['size']); + $filetype = $_FILES['userfile']['type']; $maximagesize = get_config('system','maximagesize'); @@ -118,7 +119,7 @@ function profile_photo_post(&$a) { } $imagedata = @file_get_contents($src); - $ph = new Photo($imagedata); + $ph = new Photo($imagedata, $filetype); if(! $ph->is_valid()) { notice( t('Unable to process image.') . EOL ); @@ -193,7 +194,7 @@ function profile_photo_content(&$a) { goaway($a->get_baseurl() . '/profiles'); return; // NOTREACHED } - $ph = new Photo($r[0]['data']); + $ph = new Photo($r[0]['data'], $r[0]['type']); profile_photo_crop_ui_head($a, $ph); // go ahead as we have jus uploaded a new photo to crop } @@ -214,7 +215,7 @@ function profile_photo_content(&$a) { return $o; } else { - $filename = $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'] . '.jpg'; + $filename = $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'] . '.'.$a->config['imagecrop_ext']; $resolution = $a->config['imagecrop_resolution']; $tpl = get_markup_template("cropbody.tpl"); $o .= replace_macros($tpl,array( @@ -268,6 +269,7 @@ function profile_photo_crop_ui_head(&$a, $ph){ $a->config['imagecrop'] = $hash; $a->config['imagecrop_resolution'] = $smallest; + $a->config['imagecrop_ext'] = $ph->getExt(); $a->page['htmlhead'] .= get_markup_template("crophead.tpl"); return; }} diff --git a/mod/wall_upload.php b/mod/wall_upload.php index fa66561e8..20666e0ef 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -57,16 +57,18 @@ function wall_upload_post(&$a) { if(! x($_FILES,'userfile') && ! x($_FILES,'media')) killme(); - if(x($_FILES,'userfile')) { - $src = $_FILES['userfile']['tmp_name']; - $filename = basename($_FILES['userfile']['name']); - $filesize = intval($_FILES['userfile']['size']); - } - elseif(x($_FILES,'media')) { - $src = $_FILES['media']['tmp_name']; - $filename = basename($_FILES['media']['name']); - $filesize = intval($_FILES['media']['size']); - } + if(x($_FILES,'userfile')) { + $src = $_FILES['userfile']['tmp_name']; + $filename = basename($_FILES['userfile']['name']); + $filesize = intval($_FILES['userfile']['size']); + $filetype = $_FILES['userfile']['type']; + } + elseif(x($_FILES,'media')) { + $src = $_FILES['media']['tmp_name']; + $filename = basename($_FILES['media']['name']); + $filesize = intval($_FILES['media']['size']); + $filetype = $_FILES['media']['type']; + } $maximagesize = get_config('system','maximagesize'); @@ -77,7 +79,7 @@ function wall_upload_post(&$a) { } $imagedata = @file_get_contents($src); - $ph = new Photo($imagedata); + $ph = new Photo($imagedata, $filetype); if(! $ph->is_valid()) { echo ( t('Unable to process image.') . EOL); @@ -123,19 +125,19 @@ function wall_upload_post(&$a) { /* mod Waitman Gobble NO WARRANTY */ //if we get the signal then return the image url info in BBCODE, otherwise this outputs the info and bails (for the ajax image uploader on wall post) - if ($_REQUEST['hush']!='yeah') { + if ($_REQUEST['hush']!='yeah') { /*existing code*/ if(local_user() && intval(get_pconfig(local_user(),'system','plaintext'))) - echo "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.jpg[/img][/url]\n\n"; + echo "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n"; else - echo '

\"$basename\"

"; + echo '

getExt()."\" alt=\"$basename\" />

"; /*existing code*/ } else { - $m = '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.jpg[/img][/url]"; + $m = '[url=' . $a->get_baseurl() . '/photos/' . $page_owner_nick . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]"; return($m); - } + } /* mod Waitman Gobble NO WARRANTY */ killme(); diff --git a/update.php b/update.php index 35a6771b0..0f7bf664d 100644 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ Date: Thu, 7 Jun 2012 20:17:31 +0200 Subject: png support: update database.sql, fix some typos, fix tinymce image browser --- database.sql | 1 + include/Photo.php | 24 +++++++++++++----------- mod/fbrowser.php | 18 ++++++++++++++---- mod/photos.php | 4 ++-- mod/profile_photo.php | 3 ++- mod/wall_upload.php | 3 ++- 6 files changed, 34 insertions(+), 19 deletions(-) diff --git a/database.sql b/database.sql index c1d1b27e4..53dc0c5b2 100644 --- a/database.sql +++ b/database.sql @@ -745,6 +745,7 @@ CREATE TABLE IF NOT EXISTS `photo` ( `desc` text NOT NULL, `album` char(255) NOT NULL, `filename` char(255) NOT NULL, + `type` CHAR(128) NOT NULL DEFAULT 'image/jpeg', `height` smallint(6) NOT NULL, `width` smallint(6) NOT NULL, `data` mediumblob NOT NULL, diff --git a/include/Photo.php b/include/Photo.php index ffefc37ec..f769a70a6 100644 --- a/include/Photo.php +++ b/include/Photo.php @@ -105,9 +105,9 @@ class Photo { $dest = imagecreatetruecolor( $dest_width, $dest_height ); - imagealphablending($dest->image, false); + imagealphablending($dest, false); imagesavealpha($dest, true); - if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127));; // fill with alpha + if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height); if($this->image) imagedestroy($this->image); @@ -164,9 +164,9 @@ class Photo { $dest = imagecreatetruecolor( $dest_width, $dest_height ); - imagealphablending($dest->image, false); + imagealphablending($dest, false); imagesavealpha($dest, true); - if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127));; // fill with alpha + if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dest_width, $dest_height, $width, $height); if($this->image) imagedestroy($this->image); @@ -181,9 +181,9 @@ class Photo { public function scaleImageSquare($dim) { $dest = imagecreatetruecolor( $dim, $dim ); - imagealphablending($dest->image, false); + imagealphablending($dest, false); imagesavealpha($dest, true); - if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127));; // fill with alpha + if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha imagecopyresampled($dest, $this->image, 0, 0, 0, 0, $dim, $dim, $this->width, $this->height); if($this->image) imagedestroy($this->image); @@ -195,9 +195,9 @@ class Photo { public function cropImage($max,$x,$y,$w,$h) { $dest = imagecreatetruecolor( $max, $max ); - imagealphablending($dest->image, false); + imagealphablending($dest, false); imagesavealpha($dest, true); - if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127));; // fill with alpha + if ($this->type=='image/png') imagefill($dest, 0, 0, imagecolorallocatealpha($dest, 0, 0, 0, 127)); // fill with alpha imagecopyresampled($dest, $this->image, 0, 0, $x, $y, $max, $max, $w, $h); if($this->image) imagedestroy($this->image); @@ -295,6 +295,7 @@ class Photo { * @arg $fromcurl boolean Check Content-Type header from curl request */ function guess_image_type($filename, $fromcurl=false) { + logger('Photo: guess_image_type: '.$filename . ($fromcurl?' from curl headers':''), LOGGER_DEBUG); $type = null; if ($fromcurl) { $a = get_app(); @@ -310,12 +311,13 @@ function guess_image_type($filename, $fromcurl=false) { if (is_null($type)){ $ext = pathinfo($filename, PATHINFO_EXTENSION); $types = Photo::supportedTypes(); + $type = "image/jpeg"; foreach ($types as $m=>$e){ - if ($ext==$e) return $m; + if ($ext==$e) $type = $m; } - $type = "image/jpeg"; - } + } + logger('Photo: guess_image_type: type='.$type, LOGGER_DEBUG); return $type; } diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 66ff9252e..3f034226e 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -4,7 +4,9 @@ * @subpackage FileBrowser * @author Fabio Comuni */ - + +require_once('include/Photo.php'); + /** * @param App $a */ @@ -43,14 +45,22 @@ function fbrowser_content($a){ $path[]=array($a->get_baseurl()."/fbrowser/image/".$a->argv[2]."/", $album); } - $r = q("SELECT `resource-id`, `id`, `filename`, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc` + $r = q("SELECT `resource-id`, `id`, `filename`, type, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc` FROM `photo` WHERE `uid` = %d $sql_extra GROUP BY `resource-id` $sql_extra2", intval(local_user()) ); - - function files1($rr){ global $a; return array( $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['hiq'] . '.jpg', template_escape($rr['filename']), $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['loq'] . '.jpg'); } + function files1($rr){ + global $a; + $types = Photo::supportedTypes(); + $ext = $types[$rr['type']]; + return array( + $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['hiq'] . '.' .$ext, + template_escape($rr['filename']), + $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['loq'] . '.'. $ext + ); + } $files = array_map("files1", $r); $tpl = get_markup_template("filebrowser.tpl"); diff --git a/mod/photos.php b/mod/photos.php index 072353587..efeab8fa3 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -682,9 +682,9 @@ function photos_post(&$a) { $filesize = intval($_FILES['userfile']['size']); $type = $_FILES['userfile']['type']; } - + if ($type=="") $type=guess_image_type($filename); - logger('photos: upload: received file: ' . $filename . ' as ' . $src . ' '. $type . ' ' . $filesize . ' bytes', LOGGER_DEBUG); + logger('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', LOGGER_DEBUG); $maximagesize = get_config('system','maximagesize'); diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 2817f3942..e44707f9b 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -109,7 +109,8 @@ function profile_photo_post(&$a) { $filename = basename($_FILES['userfile']['name']); $filesize = intval($_FILES['userfile']['size']); $filetype = $_FILES['userfile']['type']; - + if ($filetype=="") $filetype=guess_image_type($filename); + $maximagesize = get_config('system','maximagesize'); if(($maximagesize) && ($filesize > $maximagesize)) { diff --git a/mod/wall_upload.php b/mod/wall_upload.php index 20666e0ef..4b81f8d1c 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -69,7 +69,8 @@ function wall_upload_post(&$a) { $filesize = intval($_FILES['media']['size']); $filetype = $_FILES['media']['type']; } - + + if ($filetype=="") $filetype=guess_image_type($filename); $maximagesize = get_config('system','maximagesize'); if(($maximagesize) && ($filesize > $maximagesize)) { -- cgit v1.2.3 From c4aeb57fcda6253fd9ca91b5177a17b97e3c9b70 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 7 Jun 2012 15:46:07 -0700 Subject: rev update --- boot.php | 2 +- util/messages.po | 352 ++++++++++++++++++++++++++++--------------------------- 2 files changed, 179 insertions(+), 175 deletions(-) diff --git a/boot.php b/boot.php index 7961efc4a..9e72f73a7 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1366' ); +define ( 'FRIENDICA_VERSION', '3.0.1367' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1148 ); diff --git a/util/messages.po b/util/messages.po index ba1f927cc..96df551dd 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1366\n" +"Project-Id-Version: 3.0.1367\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-06 10:00-0700\n" +"POT-Creation-Date: 2012-06-07 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -55,7 +55,7 @@ msgstr "" #: ../../mod/profiles.php:385 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:503 -#: ../../addon/dav/layout.fnk.php:387 ../../include/items.php:3332 +#: ../../addon/dav/layout.fnk.php:387 ../../include/items.php:3337 #: ../../index.php:306 msgid "Permission denied." msgstr "" @@ -86,7 +86,7 @@ msgid "Return to contact editor" msgstr "" #: ../../mod/crepair.php:148 ../../mod/settings.php:557 -#: ../../mod/settings.php:583 ../../mod/admin.php:656 ../../mod/admin.php:665 +#: ../../mod/settings.php:583 ../../mod/admin.php:659 ../../mod/admin.php:668 msgid "Name" msgstr "" @@ -131,8 +131,8 @@ msgstr "" #: ../../mod/settings.php:555 ../../mod/settings.php:701 #: ../../mod/settings.php:762 ../../mod/settings.php:969 #: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/message.php:216 -#: ../../mod/admin.php:417 ../../mod/admin.php:653 ../../mod/admin.php:789 -#: ../../mod/admin.php:988 ../../mod/admin.php:1075 ../../mod/profiles.php:554 +#: ../../mod/admin.php:420 ../../mod/admin.php:656 ../../mod/admin.php:792 +#: ../../mod/admin.php:991 ../../mod/admin.php:1078 ../../mod/profiles.php:554 #: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:605 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 #: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158 @@ -155,7 +155,7 @@ msgstr "" #: ../../addon/statusnet/statusnet.php:353 #: ../../addon/statusnet/statusnet.php:561 ../../addon/tumblr/tumblr.php:90 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88 -#: ../../addon/wppost/wppost.php:109 ../../addon/showmore/showmore.php:48 +#: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:381 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 @@ -567,7 +567,7 @@ msgid "Preview" msgstr "" #: ../../mod/photos.php:1394 ../../mod/settings.php:618 -#: ../../mod/settings.php:699 ../../mod/group.php:168 ../../mod/admin.php:660 +#: ../../mod/settings.php:699 ../../mod/group.php:168 ../../mod/admin.php:663 #: ../../include/conversation.php:328 ../../include/conversation.php:609 msgid "Delete" msgstr "" @@ -1288,7 +1288,7 @@ msgid "if applicable" msgstr "" #: ../../mod/notifications.php:157 ../../mod/notifications.php:204 -#: ../../mod/admin.php:658 +#: ../../mod/admin.php:661 msgid "Approve" msgstr "" @@ -1489,12 +1489,12 @@ msgid "View all contacts" msgstr "" #: ../../mod/contacts.php:310 ../../mod/contacts.php:367 -#: ../../mod/admin.php:662 +#: ../../mod/admin.php:665 msgid "Unblock" msgstr "" #: ../../mod/contacts.php:310 ../../mod/contacts.php:367 -#: ../../mod/admin.php:661 +#: ../../mod/admin.php:664 msgid "Block" msgstr "" @@ -1587,7 +1587,7 @@ msgstr "" msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:364 ../../mod/admin.php:1133 +#: ../../mod/contacts.php:364 ../../mod/admin.php:1136 msgid "Update now" msgstr "" @@ -1800,7 +1800,7 @@ msgstr "" msgid "Remove account" msgstr "" -#: ../../mod/settings.php:89 ../../mod/admin.php:748 ../../mod/admin.php:953 +#: ../../mod/settings.php:89 ../../mod/admin.php:751 ../../mod/admin.php:956 #: ../../addon/dav/layout.fnk.php:112 ../../addon/mathjax/mathjax.php:36 #: ../../view/theme/diabook/theme.php:643 #: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137 @@ -2409,7 +2409,7 @@ msgstr "" #: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../addon/facebook/facebook.php:756 -#: ../../addon/privacy_image_cache/privacy_image_cache.php:150 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:178 #: ../../addon/dav/layout.fnk.php:418 ../../include/text.php:652 msgid "Save" msgstr "" @@ -2735,7 +2735,7 @@ msgstr "" msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:255 ../../mod/admin.php:418 +#: ../../mod/register.php:255 ../../mod/admin.php:421 msgid "Registration" msgstr "" @@ -2790,9 +2790,9 @@ msgstr "" msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:156 -#: ../../mod/admin.php:697 ../../mod/admin.php:896 ../../mod/display.php:37 -#: ../../mod/display.php:142 ../../include/items.php:3179 +#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 +#: ../../mod/admin.php:700 ../../mod/admin.php:899 ../../mod/display.php:37 +#: ../../mod/display.php:142 ../../include/items.php:3184 msgid "Item not found." msgstr "" @@ -3022,19 +3022,19 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: ../../mod/admin.php:96 ../../mod/admin.php:416 +#: ../../mod/admin.php:96 ../../mod/admin.php:419 msgid "Site" msgstr "" -#: ../../mod/admin.php:97 ../../mod/admin.php:652 ../../mod/admin.php:664 +#: ../../mod/admin.php:97 ../../mod/admin.php:655 ../../mod/admin.php:667 msgid "Users" msgstr "" -#: ../../mod/admin.php:98 ../../mod/admin.php:746 ../../mod/admin.php:788 +#: ../../mod/admin.php:98 ../../mod/admin.php:749 ../../mod/admin.php:791 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:99 ../../mod/admin.php:951 ../../mod/admin.php:987 +#: ../../mod/admin.php:99 ../../mod/admin.php:954 ../../mod/admin.php:990 msgid "Themes" msgstr "" @@ -3042,557 +3042,565 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../mod/admin.php:115 ../../mod/admin.php:1074 +#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1077 msgid "Logs" msgstr "" -#: ../../mod/admin.php:120 +#: ../../mod/admin.php:120 ../../include/nav.php:146 +msgid "Admin" +msgstr "" + +#: ../../mod/admin.php:121 +msgid "Plugin Features" +msgstr "" + +#: ../../mod/admin.php:123 msgid "User registrations waiting for confirmation" msgstr "" -#: ../../mod/admin.php:180 ../../mod/admin.php:634 +#: ../../mod/admin.php:183 ../../mod/admin.php:637 msgid "Normal Account" msgstr "" -#: ../../mod/admin.php:181 ../../mod/admin.php:635 +#: ../../mod/admin.php:184 ../../mod/admin.php:638 msgid "Soapbox Account" msgstr "" -#: ../../mod/admin.php:182 ../../mod/admin.php:636 +#: ../../mod/admin.php:185 ../../mod/admin.php:639 msgid "Community/Celebrity Account" msgstr "" -#: ../../mod/admin.php:183 ../../mod/admin.php:637 +#: ../../mod/admin.php:186 ../../mod/admin.php:640 msgid "Automatic Friend Account" msgstr "" -#: ../../mod/admin.php:202 +#: ../../mod/admin.php:205 msgid "Message queues" msgstr "" -#: ../../mod/admin.php:207 ../../mod/admin.php:415 ../../mod/admin.php:651 -#: ../../mod/admin.php:745 ../../mod/admin.php:787 ../../mod/admin.php:950 -#: ../../mod/admin.php:986 ../../mod/admin.php:1073 +#: ../../mod/admin.php:210 ../../mod/admin.php:418 ../../mod/admin.php:654 +#: ../../mod/admin.php:748 ../../mod/admin.php:790 ../../mod/admin.php:953 +#: ../../mod/admin.php:989 ../../mod/admin.php:1076 msgid "Administration" msgstr "" -#: ../../mod/admin.php:208 +#: ../../mod/admin.php:211 msgid "Summary" msgstr "" -#: ../../mod/admin.php:210 +#: ../../mod/admin.php:213 msgid "Registered users" msgstr "" -#: ../../mod/admin.php:212 +#: ../../mod/admin.php:215 msgid "Pending registrations" msgstr "" -#: ../../mod/admin.php:213 +#: ../../mod/admin.php:216 msgid "Version" msgstr "" -#: ../../mod/admin.php:215 +#: ../../mod/admin.php:218 msgid "Active plugins" msgstr "" -#: ../../mod/admin.php:354 +#: ../../mod/admin.php:357 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:402 +#: ../../mod/admin.php:405 msgid "Closed" msgstr "" -#: ../../mod/admin.php:403 +#: ../../mod/admin.php:406 msgid "Requires approval" msgstr "" -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:407 msgid "Open" msgstr "" -#: ../../mod/admin.php:408 +#: ../../mod/admin.php:411 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: ../../mod/admin.php:409 +#: ../../mod/admin.php:412 msgid "Force all links to use SSL" msgstr "" -#: ../../mod/admin.php:410 +#: ../../mod/admin.php:413 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: ../../mod/admin.php:419 +#: ../../mod/admin.php:422 msgid "File upload" msgstr "" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:423 msgid "Policies" msgstr "" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:424 msgid "Advanced" msgstr "" -#: ../../mod/admin.php:425 ../../addon/statusnet/statusnet.php:552 +#: ../../mod/admin.php:428 ../../addon/statusnet/statusnet.php:552 msgid "Site name" msgstr "" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:429 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:427 +#: ../../mod/admin.php:430 msgid "System language" msgstr "" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:431 msgid "System theme" msgstr "" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:431 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:432 msgid "SSL link policy" msgstr "" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:432 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:433 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:433 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:435 msgid "Register policy" msgstr "" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:436 msgid "Register text" msgstr "" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:436 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:437 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:437 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:438 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:438 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:439 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:439 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:440 msgid "Block public" msgstr "" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:440 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:441 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:441 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:442 msgid "Global directory update URL" msgstr "" -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:442 msgid "" "URL to update the global directory. If this is not set, the global directory " "is completely unavailable to the application." msgstr "" -#: ../../mod/admin.php:441 +#: ../../mod/admin.php:444 msgid "Block multiple registrations" msgstr "" -#: ../../mod/admin.php:441 +#: ../../mod/admin.php:444 msgid "Disallow users to register additional accounts for use as pages." msgstr "" -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:445 msgid "OpenID support" msgstr "" -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:445 msgid "OpenID support for registration and logins." msgstr "" -#: ../../mod/admin.php:443 +#: ../../mod/admin.php:446 msgid "Fullname check" msgstr "" -#: ../../mod/admin.php:443 +#: ../../mod/admin.php:446 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "" -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:447 msgid "UTF-8 Regular expressions" msgstr "" -#: ../../mod/admin.php:444 +#: ../../mod/admin.php:447 msgid "Use PHP UTF8 regular expressions" msgstr "" -#: ../../mod/admin.php:445 +#: ../../mod/admin.php:448 msgid "Show Community Page" msgstr "" -#: ../../mod/admin.php:445 +#: ../../mod/admin.php:448 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "" -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:449 msgid "Enable OStatus support" msgstr "" -#: ../../mod/admin.php:446 +#: ../../mod/admin.php:449 msgid "" "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "" -#: ../../mod/admin.php:447 +#: ../../mod/admin.php:450 msgid "Enable Diaspora support" msgstr "" -#: ../../mod/admin.php:447 +#: ../../mod/admin.php:450 msgid "Provide built-in Diaspora network compatibility." msgstr "" -#: ../../mod/admin.php:448 +#: ../../mod/admin.php:451 msgid "Only allow Friendica contacts" msgstr "" -#: ../../mod/admin.php:448 +#: ../../mod/admin.php:451 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "" -#: ../../mod/admin.php:449 +#: ../../mod/admin.php:452 msgid "Verify SSL" msgstr "" -#: ../../mod/admin.php:449 +#: ../../mod/admin.php:452 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you " "cannot connect (at all) to self-signed SSL sites." msgstr "" -#: ../../mod/admin.php:450 +#: ../../mod/admin.php:453 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:451 +#: ../../mod/admin.php:454 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:452 +#: ../../mod/admin.php:455 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:452 +#: ../../mod/admin.php:455 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:456 msgid "Delivery interval" msgstr "" -#: ../../mod/admin.php:453 +#: ../../mod/admin.php:456 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:457 msgid "Poll interval" msgstr "" -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:457 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:458 msgid "Maximum Load Average" msgstr "" -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:458 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:472 msgid "Update has been marked successful" msgstr "" -#: ../../mod/admin.php:479 +#: ../../mod/admin.php:482 #, php-format msgid "Executing %s failed. Check system logs." msgstr "" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:485 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: ../../mod/admin.php:486 +#: ../../mod/admin.php:489 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: ../../mod/admin.php:489 +#: ../../mod/admin.php:492 #, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../mod/admin.php:504 +#: ../../mod/admin.php:507 msgid "No failed updates." msgstr "" -#: ../../mod/admin.php:508 +#: ../../mod/admin.php:511 msgid "Failed Updates" msgstr "" -#: ../../mod/admin.php:509 +#: ../../mod/admin.php:512 msgid "" "This does not include updates prior to 1139, which did not return a status." msgstr "" -#: ../../mod/admin.php:510 +#: ../../mod/admin.php:513 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../mod/admin.php:511 +#: ../../mod/admin.php:514 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../mod/admin.php:536 +#: ../../mod/admin.php:539 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:543 +#: ../../mod/admin.php:546 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:582 +#: ../../mod/admin.php:585 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../mod/admin.php:590 +#: ../../mod/admin.php:593 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:590 +#: ../../mod/admin.php:593 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:654 +#: ../../mod/admin.php:657 msgid "select all" msgstr "" -#: ../../mod/admin.php:655 +#: ../../mod/admin.php:658 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:656 +#: ../../mod/admin.php:659 msgid "Request date" msgstr "" -#: ../../mod/admin.php:656 ../../mod/admin.php:665 +#: ../../mod/admin.php:659 ../../mod/admin.php:668 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "" -#: ../../mod/admin.php:657 +#: ../../mod/admin.php:660 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:659 +#: ../../mod/admin.php:662 msgid "Deny" msgstr "" -#: ../../mod/admin.php:665 +#: ../../mod/admin.php:668 msgid "Register date" msgstr "" -#: ../../mod/admin.php:665 +#: ../../mod/admin.php:668 msgid "Last login" msgstr "" -#: ../../mod/admin.php:665 +#: ../../mod/admin.php:668 msgid "Last item" msgstr "" -#: ../../mod/admin.php:665 +#: ../../mod/admin.php:668 msgid "Account" msgstr "" -#: ../../mod/admin.php:667 +#: ../../mod/admin.php:670 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:668 +#: ../../mod/admin.php:671 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:709 +#: ../../mod/admin.php:712 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:713 +#: ../../mod/admin.php:716 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:723 ../../mod/admin.php:921 +#: ../../mod/admin.php:726 ../../mod/admin.php:924 msgid "Disable" msgstr "" -#: ../../mod/admin.php:725 ../../mod/admin.php:923 +#: ../../mod/admin.php:728 ../../mod/admin.php:926 msgid "Enable" msgstr "" -#: ../../mod/admin.php:747 ../../mod/admin.php:952 +#: ../../mod/admin.php:750 ../../mod/admin.php:955 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:755 ../../mod/admin.php:962 +#: ../../mod/admin.php:758 ../../mod/admin.php:965 msgid "Author: " msgstr "" -#: ../../mod/admin.php:756 ../../mod/admin.php:963 +#: ../../mod/admin.php:759 ../../mod/admin.php:966 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:885 +#: ../../mod/admin.php:888 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:944 +#: ../../mod/admin.php:947 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:992 +#: ../../mod/admin.php:995 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:993 +#: ../../mod/admin.php:996 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1020 +#: ../../mod/admin.php:1023 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1076 +#: ../../mod/admin.php:1079 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1082 +#: ../../mod/admin.php:1085 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1083 +#: ../../mod/admin.php:1086 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1083 +#: ../../mod/admin.php:1086 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: ../../mod/admin.php:1084 +#: ../../mod/admin.php:1087 msgid "Log level" msgstr "" -#: ../../mod/admin.php:1134 +#: ../../mod/admin.php:1137 msgid "Close" msgstr "" -#: ../../mod/admin.php:1140 +#: ../../mod/admin.php:1143 msgid "FTP Host" msgstr "" -#: ../../mod/admin.php:1141 +#: ../../mod/admin.php:1144 msgid "FTP Path" msgstr "" -#: ../../mod/admin.php:1142 +#: ../../mod/admin.php:1145 msgid "FTP User" msgstr "" -#: ../../mod/admin.php:1143 +#: ../../mod/admin.php:1146 msgid "FTP Password" msgstr "" @@ -4452,23 +4460,23 @@ msgid "" "connection again, you have to %3$sre-authenticate the Facebook-connector%4$s." msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:147 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:175 msgid "Lifetime of the cache (in hours)" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:152 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:180 msgid "Cache Statistics" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:155 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:183 msgid "Number of items" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:157 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:185 msgid "Size of the cache" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:159 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:187 msgid "Delete the whole cache" msgstr "" @@ -4755,59 +4763,59 @@ msgstr "" msgid "Your Friendica-Contacts" msgstr "" -#: ../../addon/dav/main.php:223 +#: ../../addon/dav/main.php:229 msgid "Calendar" msgstr "" -#: ../../addon/dav/main.php:226 +#: ../../addon/dav/main.php:232 msgid "Extended calendar with CalDAV-support" msgstr "" -#: ../../addon/dav/main.php:242 +#: ../../addon/dav/main.php:248 msgid "The database tables have been installed." msgstr "" -#: ../../addon/dav/main.php:243 +#: ../../addon/dav/main.php:249 msgid "An error occurred during the installation." msgstr "" -#: ../../addon/dav/main.php:259 +#: ../../addon/dav/main.php:265 msgid "No system-wide settings yet." msgstr "" -#: ../../addon/dav/main.php:262 +#: ../../addon/dav/main.php:268 msgid "Database status" msgstr "" -#: ../../addon/dav/main.php:265 +#: ../../addon/dav/main.php:271 msgid "Installed" msgstr "" -#: ../../addon/dav/main.php:268 +#: ../../addon/dav/main.php:274 msgid "Upgrade needed" msgstr "" -#: ../../addon/dav/main.php:268 +#: ../../addon/dav/main.php:274 msgid "Upgrade" msgstr "" -#: ../../addon/dav/main.php:271 +#: ../../addon/dav/main.php:277 msgid "Not installed" msgstr "" -#: ../../addon/dav/main.php:271 +#: ../../addon/dav/main.php:277 msgid "Install" msgstr "" -#: ../../addon/dav/main.php:276 +#: ../../addon/dav/main.php:282 msgid "Troubleshooting" msgstr "" -#: ../../addon/dav/main.php:277 +#: ../../addon/dav/main.php:283 msgid "Manual creation of the database tables:" msgstr "" -#: ../../addon/dav/main.php:278 +#: ../../addon/dav/main.php:284 msgid "Show SQL-statements" msgstr "" @@ -4969,7 +4977,7 @@ msgstr "" msgid "Post to Drupal by default" msgstr "" -#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:198 +#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:199 #: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:189 msgid "Post from Friendica" msgstr "" @@ -5569,11 +5577,11 @@ msgstr "" msgid "Post to WordPress by default" msgstr "" -#: ../../addon/wppost/wppost.php:102 +#: ../../addon/wppost/wppost.php:103 msgid "Provide a backlink to the Friendica post" msgstr "" -#: ../../addon/wppost/wppost.php:204 +#: ../../addon/wppost/wppost.php:205 msgid "Read the original post and comment stream on Friendica" msgstr "" @@ -6704,10 +6712,6 @@ msgstr "" msgid "Manage/edit friends and contacts" msgstr "" -#: ../../include/nav.php:146 -msgid "Admin" -msgstr "" - #: ../../include/nav.php:146 msgid "Site setup and configuration" msgstr "" -- cgit v1.2.3 From ba2452a076c0635e94c6a0967b778df0df14eca7 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 7 Jun 2012 16:02:56 -0700 Subject: png support for embedded private photos --- include/items.php | 4 ++-- mod/msearch.php | 2 +- mod/photo.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/items.php b/include/items.php index 15c043e92..fc6819738 100755 --- a/include/items.php +++ b/include/items.php @@ -2952,7 +2952,7 @@ function fix_private_photos($s,$uid, $item = null, $cid = 0) { if(stristr($image , $site . '/photo/')) { $replace = false; $i = basename($image); - $i = str_replace('.jpg','',$i); + $i = str_replace(array('.jpg','.png'),array('',''),$i); $x = strpos($i,'-'); if($x) { $res = substr($i,$x+1); @@ -2994,7 +2994,7 @@ function fix_private_photos($s,$uid, $item = null, $cid = 0) { } if($replace) { logger('fix_private_photos: replacing photo', LOGGER_DEBUG); - $s = str_replace($image, 'data:image/jpg;base64,' . base64_encode($r[0]['data']), $s); + $s = str_replace($image, 'data:' . $r[0]['type'] . ';base64,' . base64_encode($r[0]['data']), $s); logger('fix_private_photos: replaced: ' . $s, LOGGER_DATA); } } diff --git a/mod/msearch.php b/mod/msearch.php index 94def7d89..89de5b705 100644 --- a/mod/msearch.php +++ b/mod/msearch.php @@ -28,7 +28,7 @@ function msearch_post(&$a) { $results[] = array( 'name' => $rr['name'], 'url' => $a->get_baseurl() . '/profile/' . $rr['nickname'], - 'photo' => $a->get_baseurl() . '/photo/avatar/' . $rr['uid'] . 'jpg', + 'photo' => $a->get_baseurl() . '/photo/avatar/' . $rr['uid'] . '.jpg', 'tags' => str_replace(array(',',' '),array(' ',' '),$rr['pub_keywords']) ); } diff --git a/mod/photo.php b/mod/photo.php index e8e74cfde..dee483d83 100644 --- a/mod/photo.php +++ b/mod/photo.php @@ -76,7 +76,7 @@ function photo_init(&$a) { break; } - $uid = str_replace('.jpg', '', $person); + $uid = str_replace(array('.jpg','.png'),array('',''), $person); $r = q("SELECT * FROM `photo` WHERE `scale` = %d AND `uid` = %d AND `profile` = 1 LIMIT 1", intval($resolution), -- cgit v1.2.3 From 52d90674ea5c35b95cff9b9fba1ac2b275ff3819 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 7 Jun 2012 18:08:15 -0700 Subject: better events-reminder theming --- view/theme/slackr/events_reminder.tpl | 2 +- view/theme/slackr/style.css | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/view/theme/slackr/events_reminder.tpl b/view/theme/slackr/events_reminder.tpl index 99407fc3e..bd1a57d18 100644 --- a/view/theme/slackr/events_reminder.tpl +++ b/view/theme/slackr/events_reminder.tpl @@ -35,5 +35,5 @@ }); }); -
+

diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css index 479a8ec06..aa4d4b800 100644 --- a/view/theme/slackr/style.css +++ b/view/theme/slackr/style.css @@ -54,14 +54,23 @@ nav #site-location { color: #000000; } -.fc { +#events-reminder { + border-radius: 3px; + -moz-border-radius: 3px; opacity: 0.3; filter:alpha(opacity=30); } -.fc:hover { +#events-reminder.birthday-today, #events-reminder.event-today { + opacity: 1.0; + filter:alpha(opacity=100); + box-shadow: 4px 4px 3px 0 #444444; +} + +#events-reminder:hover { opacity: 1.0; filter:alpha(opacity=100); + box-shadow: 4px 4px 3px 0 #444444; } .fc-event-skin { @@ -79,7 +88,7 @@ nav #site-location { box-shadow: 4px 4px 3px 0 #444444; } -.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .fc, .profile-jot-text, .group-selected, .nets-selected, .fileas-selected, #profile-jot-submit, .categories-selected { +.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .profile-jot-text, .group-selected, .nets-selected, .fileas-selected, #profile-jot-submit, .categories-selected { border-radius: 3px; -moz-border-radius: 3px; box-shadow: 4px 4px 3px 0 #444444; -- cgit v1.2.3 From da7773a259bfd40b1c2346fb7c3900f2b67e8fec Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 7 Jun 2012 19:53:39 -0700 Subject: ostatus hub subscription issues --- include/follow.php | 13 +++++++++---- include/items.php | 1 + include/onepoll.php | 3 +++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/include/follow.php b/include/follow.php index d92d7577d..22288a0da 100644 --- a/include/follow.php +++ b/include/follow.php @@ -94,6 +94,9 @@ function new_contact($uid,$url,$interactive = false) { } $writeable = ((($ret['network'] === NETWORK_OSTATUS) && ($ret['notify'])) ? 1 : 0); + + $subhub = (($ret['network'] === NETWORK_OSTATUS) ? true : false); + $hidden = (($ret['network'] === NETWORK_MAIL) ? 1 : 0); if($ret['network'] === NETWORK_MAIL) { @@ -116,8 +119,9 @@ function new_contact($uid,$url,$interactive = false) { if(count($r)) { // update contact if($r[0]['rel'] == CONTACT_IS_FOLLOWER || ($network === NETWORK_DIASPORA && $r[0]['rel'] == CONTACT_IS_SHARING)) { - q("UPDATE `contact` SET `rel` = %d , `readonly` = 0 WHERE `id` = %d AND `uid` = %d LIMIT 1", + q("UPDATE `contact` SET `rel` = %d , `subhub` = %d, `readonly` = 0 WHERE `id` = %d AND `uid` = %d LIMIT 1", intval(CONTACT_IS_FRIEND), + intval($subhub), intval($r[0]['id']), intval($uid) ); @@ -131,8 +135,8 @@ function new_contact($uid,$url,$interactive = false) { // create contact record $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`, - `writable`, `hidden`, `blocked`, `readonly`, `pending` ) - VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, 0, 0, 0 ) ", + `writable`, `hidden`, `blocked`, `readonly`, `pending`, `subhub` ) + VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, %d, 0, 0, 0, %d ) ", intval($uid), dbesc(datetime_convert()), dbesc($ret['url']), @@ -151,7 +155,8 @@ function new_contact($uid,$url,$interactive = false) { intval($new_relation), intval($ret['priority']), intval($writeable), - intval($hidden) + intval($hidden), + intval($subhub) ); } diff --git a/include/items.php b/include/items.php index fc6819738..ccc11d5be 100755 --- a/include/items.php +++ b/include/items.php @@ -1304,6 +1304,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) $birthday = ''; $hubs = $feed->get_links('hub'); + logger('consume_feed: hubs: ' . print_r($hubs,true), LOGGER_DATA); if(count($hubs)) $hub = implode(',', $hubs); diff --git a/include/onepoll.php b/include/onepoll.php index a64922aa3..ba7d5ebaf 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -477,6 +477,9 @@ function onepoll_run($argv, $argc){ if($contact['network'] === NETWORK_DFRN || $contact['blocked'] || $contact['readonly']) $hubmode = 'unsubscribe'; + if($contact['network'] === NETWORK_OSTATUS && (! $contact['hub-verify'])) + $hub_update = true; + if((strlen($hub)) && ($hub_update) && ($contact['rel'] != CONTACT_IS_FOLLOWER)) { logger('poller: hub ' . $hubmode . ' : ' . $hub . ' contact name : ' . $contact['name'] . ' local user : ' . $importer['name']); $hubs = explode(',', $hub); -- cgit v1.2.3 From 0820865265a6600491b4bfe5d458c33d54ba1409 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 7 Jun 2012 20:20:13 -0700 Subject: provide ability to autofriend ostatus accounts --- mod/salmon.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/mod/salmon.php b/mod/salmon.php index 6172d17a1..1e16f9d14 100644 --- a/mod/salmon.php +++ b/mod/salmon.php @@ -170,14 +170,28 @@ function salmon_post(&$a) { * */ - $r = q("SELECT * FROM `contact` WHERE `network` = 'stat' AND ( `url` = '%s' OR `alias` = '%s') + $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s' ) AND `uid` = %d LIMIT 1", + dbesc(NETWORK_OSTATUS), dbesc($author_link), dbesc($author_link), intval($importer['uid']) ); if(! count($r)) { logger('mod-salmon: Author unknown to us.'); + if(get_pconfig($importer['uid'],'system','ostatus_autofriend')) { + require_once('include/follow.php'); + $result = new_contact($importer['uid'],$author_link); + if($result['success']) { + $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s' ) + AND `uid` = %d LIMIT 1", + dbesc(NETWORK_OSTATUS), + dbesc($author_link), + dbesc($author_link), + intval($importer['uid']) + ); + } + } } // is this a follower? Or have we ignored the person? -- cgit v1.2.3 From ea4515aca9318429a0b859eb8b45584b382928b3 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 8 Jun 2012 01:15:53 -0700 Subject: more logging on pubsub callbacks --- mod/pubsub.php | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/mod/pubsub.php b/mod/pubsub.php index 93d50ef90..64fbda289 100644 --- a/mod/pubsub.php +++ b/mod/pubsub.php @@ -47,22 +47,30 @@ function pubsub_init(&$a) { $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `account_expired` = 0 LIMIT 1", dbesc($nick) ); - if(! count($r)) + if(! count($r)) { + logger('pubsub: local account not found: ' . $nick); hub_return(false, ''); + } $owner = $r[0]; $sql_extra = ((strlen($hub_verify)) ? sprintf(" AND `hub-verify` = '%s' ", dbesc($hub_verify)) : ''); - $r = q("SELECT * FROM `contact` WHERE `poll` = '%s' AND `id` = %d AND `uid` = %d + $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d AND `blocked` = 0 AND `pending` = 0 $sql_extra LIMIT 1", - dbesc($hub_topic), intval($contact_id), intval($owner['uid']) ); - if(! count($r)) + if(! count($r)) { + logger('pubsub: contact not found.'); hub_return(false, ''); + } + + if(! link_compare($hub_topic,$r[0]['poll'])) { + logger('pubsub: hub topic ' . $hub_topic . ' != ' . $r[0]['poll']); + // should abort but let's humour them. + } $contact = $r[0]; -- cgit v1.2.3 From 1605bcd901e47855c1a5670487030eb88173ec00 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sat, 9 Jun 2012 18:07:19 -0400 Subject: minor template update Signed-off-by: Simon L'nu --- view/theme/dispy/wall_item.tpl | 6 +++--- view/theme/dispy/wallwall_item.tpl | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index d2878d17d..6263eef51 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -1,3 +1,4 @@ +
@@ -82,7 +83,6 @@
$item.comment
-
- -
+
+
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl index 2705d3e68..e2a972790 100644 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -1,14 +1,17 @@ -
+ +
$item.wall
- $item.name + + $item.name menu
    @@ -88,7 +91,7 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick
    $item.comment
    -
+
-- cgit v1.2.3 From ff8d159698a74149f1799d94b9adfe5dd7c781bd Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 10 Jun 2012 00:59:36 -0700 Subject: rev update --- boot.php | 2 +- util/messages.po | 303 +++++++++++++++++++++++++++++-------------------------- 2 files changed, 159 insertions(+), 146 deletions(-) diff --git a/boot.php b/boot.php index 9fea12f04..24ab5da82 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1367' ); +define ( 'FRIENDICA_VERSION', '3.0.1369' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1149 ); diff --git a/util/messages.po b/util/messages.po index 96df551dd..c9d7877cf 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1367\n" +"Project-Id-Version: 3.0.1369\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-07 10:00-0700\n" +"POT-Creation-Date: 2012-06-09 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -36,7 +36,7 @@ msgstr "" #: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44 #: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:920 +#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:928 #: ../../mod/editpost.php:10 ../../mod/install.php:151 #: ../../mod/notifications.php:66 ../../mod/contacts.php:145 #: ../../mod/settings.php:106 ../../mod/settings.php:537 @@ -47,15 +47,15 @@ msgstr "" #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22 #: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:124 #: ../../mod/item.php:140 ../../mod/profile_photo.php:19 -#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150 -#: ../../mod/profile_photo.php:163 ../../mod/message.php:45 +#: ../../mod/profile_photo.php:141 ../../mod/profile_photo.php:152 +#: ../../mod/profile_photo.php:165 ../../mod/message.php:45 #: ../../mod/message.php:97 ../../mod/allfriends.php:9 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 #: ../../mod/follow.php:9 ../../mod/display.php:138 ../../mod/profiles.php:7 #: ../../mod/profiles.php:385 ../../mod/delegate.php:6 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:503 -#: ../../addon/dav/layout.fnk.php:387 ../../include/items.php:3337 +#: ../../addon/dav/layout.fnk.php:387 ../../include/items.php:3342 #: ../../index.php:306 msgid "Permission denied." msgstr "" @@ -123,9 +123,9 @@ msgid "New photo from this URL" msgstr "" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 -#: ../../mod/events.php:428 ../../mod/photos.php:955 ../../mod/photos.php:1013 -#: ../../mod/photos.php:1256 ../../mod/photos.php:1296 -#: ../../mod/photos.php:1336 ../../mod/photos.php:1367 +#: ../../mod/events.php:428 ../../mod/photos.php:963 ../../mod/photos.php:1021 +#: ../../mod/photos.php:1266 ../../mod/photos.php:1306 +#: ../../mod/photos.php:1346 ../../mod/photos.php:1377 #: ../../mod/install.php:246 ../../mod/install.php:284 #: ../../mod/localtime.php:45 ../../mod/contacts.php:342 #: ../../mod/settings.php:555 ../../mod/settings.php:701 @@ -134,6 +134,7 @@ msgstr "" #: ../../mod/admin.php:420 ../../mod/admin.php:656 ../../mod/admin.php:792 #: ../../mod/admin.php:991 ../../mod/admin.php:1078 ../../mod/profiles.php:554 #: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:605 +#: ../../addon/snautofollow/snautofollow.php:64 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 #: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 @@ -224,7 +225,7 @@ msgid "link to source" msgstr "" #: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:131 -#: ../../include/nav.php:52 ../../boot.php:1520 +#: ../../include/nav.php:52 ../../boot.php:1525 msgid "Events" msgstr "" @@ -275,7 +276,7 @@ msgid "Description:" msgstr "" #: ../../mod/events.php:423 ../../include/event.php:37 -#: ../../include/bb2diaspora.php:265 ../../boot.php:1100 +#: ../../include/bb2diaspora.php:265 ../../boot.php:1105 msgid "Location:" msgstr "" @@ -352,58 +353,58 @@ msgstr "" msgid "No" msgstr "" -#: ../../mod/photos.php:43 ../../boot.php:1514 +#: ../../mod/photos.php:44 ../../boot.php:1519 msgid "Photo Albums" msgstr "" -#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:934 -#: ../../mod/photos.php:1005 ../../mod/photos.php:1020 -#: ../../mod/photos.php:1445 ../../mod/photos.php:1457 +#: ../../mod/photos.php:52 ../../mod/photos.php:154 ../../mod/photos.php:942 +#: ../../mod/photos.php:1013 ../../mod/photos.php:1028 +#: ../../mod/photos.php:1455 ../../mod/photos.php:1467 #: ../../addon/communityhome/communityhome.php:110 #: ../../view/theme/diabook/theme.php:598 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:58 ../../mod/photos.php:1030 ../../mod/photos.php:1494 +#: ../../mod/photos.php:59 ../../mod/photos.php:1038 ../../mod/photos.php:1505 msgid "Upload New Photos" msgstr "" -#: ../../mod/photos.php:69 ../../mod/settings.php:21 +#: ../../mod/photos.php:70 ../../mod/settings.php:21 msgid "everybody" msgstr "" -#: ../../mod/photos.php:140 +#: ../../mod/photos.php:143 msgid "Contact information unavailable" msgstr "" -#: ../../mod/photos.php:151 ../../mod/photos.php:652 ../../mod/photos.php:1005 -#: ../../mod/photos.php:1020 ../../mod/profile_photo.php:60 +#: ../../mod/photos.php:154 ../../mod/photos.php:656 ../../mod/photos.php:1013 +#: ../../mod/photos.php:1028 ../../mod/profile_photo.php:60 #: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74 -#: ../../mod/profile_photo.php:174 ../../mod/profile_photo.php:252 -#: ../../mod/profile_photo.php:261 +#: ../../mod/profile_photo.php:176 ../../mod/profile_photo.php:254 +#: ../../mod/profile_photo.php:263 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:294 -#: ../../include/user.php:301 ../../include/user.php:308 +#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:298 +#: ../../include/user.php:305 ../../include/user.php:312 msgid "Profile Photos" msgstr "" -#: ../../mod/photos.php:161 +#: ../../mod/photos.php:164 msgid "Album not found." msgstr "" -#: ../../mod/photos.php:179 ../../mod/photos.php:1014 +#: ../../mod/photos.php:182 ../../mod/photos.php:1022 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:242 ../../mod/photos.php:1257 +#: ../../mod/photos.php:245 ../../mod/photos.php:1267 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:583 +#: ../../mod/photos.php:587 msgid "was tagged in a" msgstr "" -#: ../../mod/photos.php:583 ../../mod/like.php:185 ../../mod/tagger.php:70 +#: ../../mod/photos.php:587 ../../mod/like.php:185 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 #: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1316 #: ../../include/diaspora.php:1671 ../../include/conversation.php:53 @@ -411,172 +412,172 @@ msgstr "" msgid "photo" msgstr "" -#: ../../mod/photos.php:583 +#: ../../mod/photos.php:587 msgid "by" msgstr "" -#: ../../mod/photos.php:686 ../../addon/js_upload/js_upload.php:315 +#: ../../mod/photos.php:692 ../../addon/js_upload/js_upload.php:315 msgid "Image exceeds size limit of " msgstr "" -#: ../../mod/photos.php:694 +#: ../../mod/photos.php:700 msgid "Image file is empty." msgstr "" -#: ../../mod/photos.php:708 ../../mod/profile_photo.php:124 -#: ../../mod/wall_upload.php:83 +#: ../../mod/photos.php:714 ../../mod/profile_photo.php:126 +#: ../../mod/wall_upload.php:86 msgid "Unable to process image." msgstr "" -#: ../../mod/photos.php:728 ../../mod/profile_photo.php:257 -#: ../../mod/wall_upload.php:102 +#: ../../mod/photos.php:734 ../../mod/profile_photo.php:259 +#: ../../mod/wall_upload.php:105 msgid "Image upload failed." msgstr "" -#: ../../mod/photos.php:814 ../../mod/community.php:16 +#: ../../mod/photos.php:820 ../../mod/community.php:16 #: ../../mod/dfrn_request.php:744 ../../mod/viewcontacts.php:17 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29 msgid "Public access denied." msgstr "" -#: ../../mod/photos.php:824 +#: ../../mod/photos.php:830 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:901 +#: ../../mod/photos.php:909 msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:962 +#: ../../mod/photos.php:970 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:965 ../../mod/photos.php:1009 +#: ../../mod/photos.php:973 ../../mod/photos.php:1017 msgid "New album name: " msgstr "" -#: ../../mod/photos.php:966 +#: ../../mod/photos.php:974 msgid "or existing album name: " msgstr "" -#: ../../mod/photos.php:967 +#: ../../mod/photos.php:975 msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:969 ../../mod/photos.php:1252 +#: ../../mod/photos.php:977 ../../mod/photos.php:1262 msgid "Permissions" msgstr "" -#: ../../mod/photos.php:1024 +#: ../../mod/photos.php:1032 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:1046 ../../mod/photos.php:1477 +#: ../../mod/photos.php:1056 ../../mod/photos.php:1488 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:1081 +#: ../../mod/photos.php:1091 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:1083 +#: ../../mod/photos.php:1093 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:1133 +#: ../../mod/photos.php:1143 msgid "View photo" msgstr "" -#: ../../mod/photos.php:1133 +#: ../../mod/photos.php:1143 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:1134 +#: ../../mod/photos.php:1144 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:1140 ../../include/conversation.php:490 +#: ../../mod/photos.php:1150 ../../include/conversation.php:490 msgid "Private Message" msgstr "" -#: ../../mod/photos.php:1162 +#: ../../mod/photos.php:1172 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:1230 +#: ../../mod/photos.php:1240 msgid "Tags: " msgstr "" -#: ../../mod/photos.php:1233 +#: ../../mod/photos.php:1243 msgid "[Remove any tag]" msgstr "" -#: ../../mod/photos.php:1243 +#: ../../mod/photos.php:1253 msgid "Rotate CW" msgstr "" -#: ../../mod/photos.php:1245 +#: ../../mod/photos.php:1255 msgid "New album name" msgstr "" -#: ../../mod/photos.php:1248 +#: ../../mod/photos.php:1258 msgid "Caption" msgstr "" -#: ../../mod/photos.php:1250 +#: ../../mod/photos.php:1260 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1254 +#: ../../mod/photos.php:1264 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1274 ../../include/conversation.php:554 +#: ../../mod/photos.php:1284 ../../include/conversation.php:554 msgid "I like this (toggle)" msgstr "" -#: ../../mod/photos.php:1275 ../../include/conversation.php:555 +#: ../../mod/photos.php:1285 ../../include/conversation.php:555 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1276 ../../include/conversation.php:989 +#: ../../mod/photos.php:1286 ../../include/conversation.php:989 msgid "Share" msgstr "" -#: ../../mod/photos.php:1277 ../../mod/editpost.php:104 +#: ../../mod/photos.php:1287 ../../mod/editpost.php:104 #: ../../mod/wallmessage.php:145 ../../mod/message.php:215 #: ../../mod/message.php:410 ../../include/conversation.php:371 #: ../../include/conversation.php:731 ../../include/conversation.php:1008 msgid "Please wait" msgstr "" -#: ../../mod/photos.php:1293 ../../mod/photos.php:1333 -#: ../../mod/photos.php:1364 ../../include/conversation.php:577 +#: ../../mod/photos.php:1303 ../../mod/photos.php:1343 +#: ../../mod/photos.php:1374 ../../include/conversation.php:577 msgid "This is you" msgstr "" -#: ../../mod/photos.php:1295 ../../mod/photos.php:1335 -#: ../../mod/photos.php:1366 ../../include/conversation.php:579 -#: ../../boot.php:514 +#: ../../mod/photos.php:1305 ../../mod/photos.php:1345 +#: ../../mod/photos.php:1376 ../../include/conversation.php:579 +#: ../../boot.php:519 msgid "Comment" msgstr "" -#: ../../mod/photos.php:1297 ../../mod/editpost.php:125 +#: ../../mod/photos.php:1307 ../../mod/editpost.php:125 #: ../../include/conversation.php:589 ../../include/conversation.php:1026 msgid "Preview" msgstr "" -#: ../../mod/photos.php:1394 ../../mod/settings.php:618 +#: ../../mod/photos.php:1404 ../../mod/settings.php:618 #: ../../mod/settings.php:699 ../../mod/group.php:168 ../../mod/admin.php:663 #: ../../include/conversation.php:328 ../../include/conversation.php:609 msgid "Delete" msgstr "" -#: ../../mod/photos.php:1483 +#: ../../mod/photos.php:1494 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1492 +#: ../../mod/photos.php:1503 msgid "Recent Photos" msgstr "" @@ -819,7 +820,7 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:700 ../../include/items.php:2733 +#: ../../mod/dfrn_request.php:700 ../../include/items.php:2738 msgid "[Name Withheld]" msgstr "" @@ -1191,7 +1192,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1044 +#: ../../include/contact_widgets.php:9 ../../boot.php:1049 msgid "Connect" msgstr "" @@ -1717,8 +1718,8 @@ msgstr "" #: ../../addon/facebook/facebook.php:688 #: ../../addon/facebook/facebook.php:1178 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2742 -#: ../../boot.php:694 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2747 +#: ../../boot.php:699 msgid "Administrator" msgstr "" @@ -1728,7 +1729,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:826 +#: ../../mod/lostpass.php:83 ../../boot.php:831 msgid "Password Reset" msgstr "" @@ -2121,7 +2122,7 @@ msgstr "" msgid "Profile is not published." msgstr "" -#: ../../mod/settings.php:937 ../../mod/profile_photo.php:211 +#: ../../mod/settings.php:937 ../../mod/profile_photo.php:213 msgid "or" msgstr "" @@ -2403,7 +2404,7 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1526 +#: ../../mod/notes.php:44 ../../boot.php:1531 msgid "Personal Notes" msgstr "" @@ -2654,7 +2655,7 @@ msgstr "" #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:79 -#: ../../include/nav.php:50 ../../boot.php:1505 +#: ../../include/nav.php:50 ../../boot.php:1510 msgid "Profile" msgstr "" @@ -2758,7 +2759,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:792 +#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:797 msgid "Register" msgstr "" @@ -2792,7 +2793,7 @@ msgstr "" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 #: ../../mod/admin.php:700 ../../mod/admin.php:899 ../../mod/display.php:37 -#: ../../mod/display.php:142 ../../include/items.php:3184 +#: ../../mod/display.php:142 ../../include/items.php:3189 msgid "Item not found." msgstr "" @@ -2800,12 +2801,12 @@ msgstr "" msgid "Access denied." msgstr "" -#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:130 -#: ../../include/nav.php:51 ../../boot.php:1511 +#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130 +#: ../../include/nav.php:51 ../../boot.php:1516 msgid "Photos" msgstr "" -#: ../../mod/fbrowser.php:86 +#: ../../mod/fbrowser.php:96 msgid "Files" msgstr "" @@ -2830,8 +2831,8 @@ msgstr "" msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:379 ../../mod/wall_upload.php:99 -#: ../../mod/wall_upload.php:108 ../../mod/wall_upload.php:115 +#: ../../mod/item.php:379 ../../mod/wall_upload.php:102 +#: ../../mod/wall_upload.php:111 ../../mod/wall_upload.php:118 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "" @@ -2867,7 +2868,7 @@ msgid "Image uploaded but image cropping failed." msgstr "" #: ../../mod/profile_photo.php:63 ../../mod/profile_photo.php:70 -#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:264 +#: ../../mod/profile_photo.php:77 ../../mod/profile_photo.php:266 #, php-format msgid "Image size reduction [%s] failed." msgstr "" @@ -2882,44 +2883,44 @@ msgstr "" msgid "Unable to process image" msgstr "" -#: ../../mod/profile_photo.php:115 ../../mod/wall_upload.php:74 +#: ../../mod/profile_photo.php:117 ../../mod/wall_upload.php:77 #, php-format msgid "Image exceeds size limit of %d" msgstr "" -#: ../../mod/profile_photo.php:207 +#: ../../mod/profile_photo.php:209 msgid "Upload File:" msgstr "" -#: ../../mod/profile_photo.php:208 +#: ../../mod/profile_photo.php:210 msgid "Upload Profile Photo" msgstr "" -#: ../../mod/profile_photo.php:209 +#: ../../mod/profile_photo.php:211 msgid "Upload" msgstr "" -#: ../../mod/profile_photo.php:211 +#: ../../mod/profile_photo.php:213 msgid "skip this step" msgstr "" -#: ../../mod/profile_photo.php:211 +#: ../../mod/profile_photo.php:213 msgid "select a photo from your photo albums" msgstr "" -#: ../../mod/profile_photo.php:224 +#: ../../mod/profile_photo.php:226 msgid "Crop Image" msgstr "" -#: ../../mod/profile_photo.php:225 +#: ../../mod/profile_photo.php:227 msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../mod/profile_photo.php:227 +#: ../../mod/profile_photo.php:229 msgid "Done Editing" msgstr "" -#: ../../mod/profile_photo.php:255 +#: ../../mod/profile_photo.php:257 msgid "Image uploaded successfully." msgstr "" @@ -3604,7 +3605,7 @@ msgstr "" msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:957 +#: ../../mod/profile.php:21 ../../boot.php:962 msgid "Requested profile is not available." msgstr "" @@ -3979,23 +3980,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:645 ../../boot.php:1066 +#: ../../mod/profiles.php:645 ../../boot.php:1071 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:646 ../../boot.php:1067 +#: ../../mod/profiles.php:646 ../../boot.php:1072 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:657 ../../boot.php:1077 +#: ../../mod/profiles.php:657 ../../boot.php:1082 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:659 ../../boot.php:1080 +#: ../../mod/profiles.php:659 ../../boot.php:1085 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:660 ../../boot.php:1081 +#: ../../mod/profiles.php:660 ../../boot.php:1086 msgid "Edit visibility" msgstr "" @@ -4460,6 +4461,18 @@ msgid "" "connection again, you have to %3$sre-authenticate the Facebook-connector%4$s." msgstr "" +#: ../../addon/snautofollow/snautofollow.php:32 +msgid "StatusNet AutoFollow settings updated." +msgstr "" + +#: ../../addon/snautofollow/snautofollow.php:56 +msgid "StatusNet AutoFollow Settings" +msgstr "" + +#: ../../addon/snautofollow/snautofollow.php:58 +msgid "Automatically follow any StatusNet followers/mentioners" +msgstr "" + #: ../../addon/privacy_image_cache/privacy_image_cache.php:175 msgid "Lifetime of the cache (in hours)" msgstr "" @@ -4603,7 +4616,7 @@ msgstr "" #: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87 #: ../../include/contact_widgets.php:188 ../../include/conversation.php:476 -#: ../../boot.php:515 +#: ../../boot.php:520 msgid "show more" msgstr "" @@ -4619,7 +4632,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:813 +#: ../../include/nav.php:64 ../../boot.php:818 msgid "Login" msgstr "" @@ -6003,7 +6016,7 @@ msgstr "" msgid "Set colour scheme" msgstr "" -#: ../../include/profile_advanced.php:17 ../../boot.php:1102 +#: ../../include/profile_advanced.php:17 ../../boot.php:1107 msgid "Gender:" msgstr "" @@ -6016,7 +6029,7 @@ msgid "j F" msgstr "" #: ../../include/profile_advanced.php:30 ../../include/datetime.php:450 -#: ../../include/items.php:1423 +#: ../../include/items.php:1428 msgid "Birthday:" msgstr "" @@ -6024,7 +6037,7 @@ msgstr "" msgid "Age:" msgstr "" -#: ../../include/profile_advanced.php:37 ../../boot.php:1105 +#: ../../include/profile_advanced.php:37 ../../boot.php:1110 msgid "Status:" msgstr "" @@ -6033,7 +6046,7 @@ msgstr "" msgid "for %1$d %2$s" msgstr "" -#: ../../include/profile_advanced.php:48 ../../boot.php:1107 +#: ../../include/profile_advanced.php:48 ../../boot.php:1112 msgid "Homepage:" msgstr "" @@ -6565,15 +6578,15 @@ msgstr "" msgid "Attachments:" msgstr "" -#: ../../include/network.php:824 +#: ../../include/network.php:827 msgid "view full size" msgstr "" -#: ../../include/oembed.php:132 +#: ../../include/oembed.php:134 msgid "Embedded content" msgstr "" -#: ../../include/oembed.php:141 +#: ../../include/oembed.php:143 msgid "Embedding disabled" msgstr "" @@ -6612,7 +6625,7 @@ msgstr "" msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:812 +#: ../../include/nav.php:46 ../../boot.php:817 msgid "Logout" msgstr "" @@ -6620,7 +6633,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1499 +#: ../../include/nav.php:49 ../../boot.php:1504 msgid "Status" msgstr "" @@ -6700,11 +6713,11 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1060 +#: ../../include/nav.php:138 ../../boot.php:1065 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1060 +#: ../../include/nav.php:138 ../../boot.php:1065 msgid "Manage/edit profiles" msgstr "" @@ -7126,19 +7139,19 @@ msgid "" "notifications from you." msgstr "" -#: ../../include/follow.php:164 +#: ../../include/follow.php:169 msgid "Unable to retrieve contact information." msgstr "" -#: ../../include/follow.php:218 +#: ../../include/follow.php:223 msgid "following" msgstr "" -#: ../../include/items.php:2740 +#: ../../include/items.php:2745 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:2740 +#: ../../include/items.php:2745 msgid "You have a new follower at " msgstr "" @@ -7490,96 +7503,96 @@ msgstr "" msgid "permissions" msgstr "" -#: ../../boot.php:513 +#: ../../boot.php:518 msgid "Delete this item?" msgstr "" -#: ../../boot.php:516 +#: ../../boot.php:521 msgid "show fewer" msgstr "" -#: ../../boot.php:689 +#: ../../boot.php:694 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:691 +#: ../../boot.php:696 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:791 +#: ../../boot.php:796 msgid "Create a New Account" msgstr "" -#: ../../boot.php:815 +#: ../../boot.php:820 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:816 +#: ../../boot.php:821 msgid "Password: " msgstr "" -#: ../../boot.php:819 +#: ../../boot.php:824 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:825 +#: ../../boot.php:830 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:992 +#: ../../boot.php:997 msgid "Edit profile" msgstr "" -#: ../../boot.php:1052 +#: ../../boot.php:1057 msgid "Message" msgstr "" -#: ../../boot.php:1168 ../../boot.php:1244 +#: ../../boot.php:1173 ../../boot.php:1249 msgid "g A l F d" msgstr "" -#: ../../boot.php:1169 ../../boot.php:1245 +#: ../../boot.php:1174 ../../boot.php:1250 msgid "F d" msgstr "" -#: ../../boot.php:1214 ../../boot.php:1285 +#: ../../boot.php:1219 ../../boot.php:1290 msgid "[today]" msgstr "" -#: ../../boot.php:1226 +#: ../../boot.php:1231 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1227 +#: ../../boot.php:1232 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1278 +#: ../../boot.php:1283 msgid "[No description]" msgstr "" -#: ../../boot.php:1296 +#: ../../boot.php:1301 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1297 +#: ../../boot.php:1302 msgid "Events this week:" msgstr "" -#: ../../boot.php:1502 +#: ../../boot.php:1507 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1508 +#: ../../boot.php:1513 msgid "Profile Details" msgstr "" -#: ../../boot.php:1523 +#: ../../boot.php:1528 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1529 +#: ../../boot.php:1534 msgid "Only You Can See This" msgstr "" -- cgit v1.2.3 From 4f9fb37925c605426c0ec338a25bc8e5b2034f67 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 10 Jun 2012 16:31:00 -0700 Subject: rev update --- boot.php | 2 +- util/messages.po | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/boot.php b/boot.php index 24ab5da82..ada1ac525 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1369' ); +define ( 'FRIENDICA_VERSION', '3.0.1370' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1149 ); diff --git a/util/messages.po b/util/messages.po index c9d7877cf..1a30447b9 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1369\n" +"Project-Id-Version: 3.0.1370\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-06-09 10:00-0700\n" +"POT-Creation-Date: 2012-06-10 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2410,7 +2410,7 @@ msgstr "" #: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../addon/facebook/facebook.php:756 -#: ../../addon/privacy_image_cache/privacy_image_cache.php:178 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:185 #: ../../addon/dav/layout.fnk.php:418 ../../include/text.php:652 msgid "Save" msgstr "" @@ -4473,23 +4473,23 @@ msgstr "" msgid "Automatically follow any StatusNet followers/mentioners" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:175 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:182 msgid "Lifetime of the cache (in hours)" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:180 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:187 msgid "Cache Statistics" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:183 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:190 msgid "Number of items" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:185 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:192 msgid "Size of the cache" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:187 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:194 msgid "Delete the whole cache" msgstr "" -- cgit v1.2.3 From a21db51a58b52345814d5a5bf644ad6c0fe59ec8 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Mon, 11 Jun 2012 05:21:46 -0400 Subject: network view: rembember last tab selected by user --- mod/network.php | 112 +++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 83 insertions(+), 29 deletions(-) diff --git a/mod/network.php b/mod/network.php index b998a3107..bd5946619 100644 --- a/mod/network.php +++ b/mod/network.php @@ -6,7 +6,31 @@ function network_init(&$a) { notice( t('Permission denied.') . EOL); return; } - + + + // fetch last used tab and redirect if needed + $sel_tabs = network_query_get_sel_tab($a); + $last_sel_tabs = get_pconfig(local_user(), 'network.view','tab.selected'); + if (is_array($last_sel_tabs)){ + $tab_urls = array( + '/network?f=&order=comment', //all + '/network?f=&order=post', //postord + '/network?f=&conv=1', //conv + '/network/new', //new + '/network?f=&star=1', //starred + '/network?f=&bmark=1', //bookmarked + '/network?f=&spam=1', //spam + ); + + // redirect if current selected tab is 'no_active' and + // last selected tab is _not_ 'all_active'. + if ($sel_tabs[0] == 'active' && $last_sel_tabs[0]!='active') { + $k = array_search('active', $last_sel_tabs); + //echo "
"; var_dump($sel_tabs, $last_sel_tabs, $tab_urlsm, $k, $tab_urls[$k]); killme();
+			goaway($a->get_baseurl() . $tab_urls[$k]);
+		}
+	}
+	
 	$group_id = (($a->argc > 1 && intval($a->argv[1])) ? intval($a->argv[1]) : 0);
 		  
 	require_once('include/group.php');
@@ -98,26 +122,23 @@ function saved_searches($search) {
 
 }
 
-
-function network_content(&$a, $update = 0) {
-
-	require_once('include/conversation.php');
-
-	if(! local_user()) {
-		$_SESSION['return_url'] = $a->query_string;
-    	return login(false);
-	}
-
-	$arr = array('query' => $a->query_string);
-
-	call_hooks('network_content_init', $arr);
-
-	$o = '';
-
-	// item filter tabs
-	// TODO: fix this logic, reduce duplication
-	//$a->page['content'] .= '
'; - +/** + * Return selected tab from query + * + * urls -> returns + * '/network' => $no_active = 'active' + * '/network?f=&order=comment' => $comment_active = 'active' + * '/network?f=&order=post' => $postord_active = 'active' + * '/network?f=&conv=1', => $conv_active = 'active' + * '/network/new', => $new_active = 'active' + * '/network?f=&star=1', => $starred_active = 'active' + * '/network?f=&bmark=1', => $bookmarked_active = 'active' + * '/network?f=&spam=1', => $spam_active = 'active' + * + * @return Array ( $no_active, $comment_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active ); + */ +function network_query_get_sel_tab($a) { + $no_active=''; $starred_active = ''; $new_active = ''; $bookmarked_active = ''; @@ -125,6 +146,7 @@ function network_content(&$a, $update = 0) { $search_active = ''; $conv_active = ''; $spam_active = ''; + $postord_active = ''; if(($a->argc > 1 && $a->argv[1] === 'new') || ($a->argc > 2 && $a->argv[2] === 'new')) { @@ -152,28 +174,56 @@ function network_content(&$a, $update = 0) { } + if (($new_active == '') && ($starred_active == '') && ($bookmarked_active == '') && ($conv_active == '') && ($search_active == '') && ($spam_active == '')) { - $all_active = 'active'; + $no_active = 'active'; } + if ($no_active=='active' && x($_GET,'order')) { + switch($_GET['order']){ + case 'post': $postord_active = 'active'; $no_active=''; break; + case 'comment' : $all_active = 'active'; $no_active=''; break; + } + } - $postord_active = ''; + return array($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active); +} + + +function network_content(&$a, $update = 0) { - if($all_active && x($_GET,'order') && $_GET['order'] !== 'comment') { - $all_active = ''; - $postord_active = 'active'; + require_once('include/conversation.php'); + + if(! local_user()) { + $_SESSION['return_url'] = $a->query_string; + return login(false); } - + + $arr = array('query' => $a->query_string); + + call_hooks('network_content_init', $arr); + + $o = ''; + + // item filter tabs + // TODO: fix this logic, reduce duplication + //$a->page['content'] .= '
'; + + list($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) = network_query_get_sel_tab($a); + // if no tabs are selected, defaults to comments + if ($no_active=='active') $all_active='active'; + //echo "
"; var_dump($no_active, $all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active); killme();
+	
 	// tabs
 	$tabs = array(
 		array(
 			'label' => t('Commented Order'),
-			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '?f=&cid=' . $_GET['cid'] : ''), 
+			'url'=>$a->get_baseurl(true) . '/' . str_replace('/new', '', $a->cmd) . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : ''), 
 			'sel'=>$all_active,
 			'title'=> t('Sort by Comment Date'),
 		),
@@ -215,8 +265,12 @@ function network_content(&$a, $update = 0) {
 //			'title' => t('Posts flagged as SPAM'),
 //		),	
 
-
 	);
+	
+	// save selected tab, but only if not in search or file mode
+	if(!x($_GET,'search') && !x($_GET,'file')) {
+		set_pconfig( local_user(), 'network.view','tab.selected',array($all_active, $postord_active, $conv_active, $new_active, $starred_active, $bookmarked_active, $spam_active) );
+	}
 
 	$arr = array('tabs' => $tabs);
 	call_hooks('network_tabs', $arr);
-- 
cgit v1.2.3


From afa88154114d5632cb13e7c3f56143cccdfd7daa Mon Sep 17 00:00:00 2001
From: friendica 
Date: Mon, 11 Jun 2012 05:28:08 -0700
Subject: bug #447 - make followed feeds private

---
 include/items.php | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/include/items.php b/include/items.php
index ccc11d5be..95a885a1b 100755
--- a/include/items.php
+++ b/include/items.php
@@ -693,6 +693,8 @@ function encode_rel_links($links) {
 	return xmlify($o);
 }
 
+
+
 function item_store($arr,$force_parent = false) {
 
 	// If a Diaspora signature structure was passed in, pull it out of the 
@@ -806,6 +808,14 @@ function item_store($arr,$force_parent = false) {
 			$deny_cid       = $r[0]['deny_cid'];
 			$deny_gid       = $r[0]['deny_gid'];
 			$arr['wall']    = $r[0]['wall'];
+
+			// if the parent is private, force privacy for the entire conversation
+			// This differs from the above settings as it subtly allows comments from 
+			// email correspondents to be private even if the overall thread is not. 
+
+			if($r[0]['private'])
+				$arr['private'] = 1;
+
 		}
 		else {
 
@@ -1835,9 +1845,12 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 					$datarray['last-child'] = 1;
 				}
 
-				if(($contact['network'] === NETWORK_FEED) || (! strlen($contact['notify']))) {
-					// one way feed - no remote comment ability
-					$datarray['last-child'] = 0;
+				if($contact['network'] === NETWORK_FEED) {
+					if(! strlen($contact['notify'])) {
+						// one way feed - no remote comment ability
+						$datarray['last-child'] = 0;
+					}
+					$datarray['private'] = 1;
 				}
 
 				// This is my contact on another system, but it's really me.
-- 
cgit v1.2.3