diff options
| -rw-r--r-- | include/diaspora.php | 35 | ||||
| -rw-r--r-- | include/notifier.php | 24 | ||||
| -rw-r--r-- | util/messages.po | 416 | ||||
| -rw-r--r-- | util/strings.php | 9 |
4 files changed, 274 insertions, 210 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index d8be2b2cc..38ee8c1e5 100644 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -540,3 +540,38 @@ function diaspora_share($me,$contact) { return $return_code; } +function diaspora_send_status($item,$owner,$contact) { + + $a = get_app(); + $myaddr = $owner['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3); + $theiraddr = $contact['addr']; + require_once('include/bbcode.php'); + + $body = xmlify(bbcode($item['body'])); + $public = (($item['private']) ? 'false' : 'true'); + + require_once('include/datetime.php'); + $created = datetime_convert('UTC','UTC',$item['created'],'Y-m-d h:i:s \U\T\C'); + + $tpl = get_markup_template('diaspora_post.tpl'); + $msg = replace_macros($tpl, array( + '$body' => $body, + '$guid' => $item['guid'], + '$handle' => xmlify($myaddr), + '$public' => $public, + '$created' => $created + )); + + logger('diaspora_send_status: base message: ' . $msg, LOGGER_DATA); + + $slap = diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey']); + + post_url($contact['notify'],$slap, array( + 'Content-type: application/magic-envelope+xml', + 'Content-length: ' . strlen($slap) + )); + $return_code = $a->get_curl_code(); + logger('diaspora_send_status: returns: ' . $return_code); + return $return_code; +} + diff --git a/include/notifier.php b/include/notifier.php index bd78d7560..332cd19e3 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -119,7 +119,8 @@ function notifier_run($argv, $argc){ $top_level = true; } - $r = q("SELECT `contact`.*, `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, + $r = q("SELECT `contact`.*, `user`.`pubkey` AS `upubkey`, `user`.`prvkey` AS `uprvkey`, + `user`.`timezone`, `user`.`nickname`, `user`.`sprvkey`, `user`.`spubkey`, `user`.`page-flags`, `user`.`prvnets` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` WHERE `contact`.`uid` = %d AND `contact`.`self` = 1 LIMIT 1", @@ -351,7 +352,7 @@ function notifier_run($argv, $argc){ $deliver_status = 0; switch($contact['network']) { - case 'dfrn': + case NETWORK_DFRN: logger('notifier: dfrndelivery: ' . $contact['name']); $deliver_status = dfrn_deliver($owner,$contact,$atom); @@ -369,7 +370,7 @@ function notifier_run($argv, $argc){ ); } break; - case 'stat': + case NETWORK_OSTATUS: // Do not send to otatus if we are not configured to send to public networks if($owner['prvnets']) @@ -419,7 +420,7 @@ function notifier_run($argv, $argc){ } break; - case 'mail': + case NETWORK_MAIL: if(get_config('system','dfrn_only')) break; @@ -496,9 +497,18 @@ function notifier_run($argv, $argc){ mail($addr, $subject, $message, $headers); } break; - case 'feed': - case 'face': - case 'dspr': + case NETWORK_DIASPORA: + if(get_config('system','dfrn_only') || (! get_config('diaspora_enabled'))) + break; + if($top_level) { + diaspora_send_status($parent_item,$owner,$contact); + break; + } + + break; + + case NETWORK_FEED: + case NETWORK_FACEBOOK: if(get_config('system','dfrn_only')) break; default: diff --git a/util/messages.po b/util/messages.po index 152743e7b..2be9ac595 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.2.1064\n" +"Project-Id-Version: 2.2.1072\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-07 04:50-0700\n" +"POT-Creation-Date: 2011-08-14 21:17-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -45,7 +45,7 @@ msgstr "" #: ../../mod/display.php:108 ../../mod/profiles.php:7 #: ../../mod/profiles.php:226 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:308 -#: ../../include/items.php:1916 ../../index.php:266 +#: ../../include/items.php:1930 ../../index.php:266 msgid "Permission denied." msgstr "" @@ -110,14 +110,14 @@ msgstr "" #: ../../mod/invite.php:106 ../../addon/facebook/facebook.php:366 #: ../../addon/randplace/randplace.php:178 #: ../../addon/impressum/impressum.php:69 ../../addon/oembed/oembed.php:41 -#: ../../addon/statusnet/statusnet.php:223 -#: ../../addon/statusnet/statusnet.php:237 -#: ../../addon/statusnet/statusnet.php:263 -#: ../../addon/statusnet/statusnet.php:270 -#: ../../addon/statusnet/statusnet.php:292 -#: ../../addon/statusnet/statusnet.php:414 ../../addon/piwik/piwik.php:76 +#: ../../addon/statusnet/statusnet.php:274 +#: ../../addon/statusnet/statusnet.php:288 +#: ../../addon/statusnet/statusnet.php:314 +#: ../../addon/statusnet/statusnet.php:321 +#: ../../addon/statusnet/statusnet.php:343 +#: ../../addon/statusnet/statusnet.php:468 ../../addon/piwik/piwik.php:76 #: ../../addon/twitter/twitter.php:171 ../../addon/twitter/twitter.php:194 -#: ../../addon/twitter/twitter.php:276 ../../include/conversation.php:406 +#: ../../addon/twitter/twitter.php:280 ../../include/conversation.php:409 msgid "Submit" msgstr "" @@ -197,7 +197,7 @@ msgstr "" msgid "Edit event" msgstr "" -#: ../../mod/events.php:237 ../../include/text.php:835 +#: ../../mod/events.php:237 ../../include/text.php:846 msgid "link to source" msgstr "" @@ -234,7 +234,7 @@ msgstr "" msgid "Description:" msgstr "" -#: ../../mod/events.php:328 ../../include/event.php:37 ../../boot.php:869 +#: ../../mod/events.php:328 ../../include/event.php:37 ../../boot.php:868 msgid "Location:" msgstr "" @@ -312,7 +312,7 @@ msgid "was tagged in a" msgstr "" #: ../../mod/photos.php:508 ../../mod/like.php:110 -#: ../../include/conversation.php:31 +#: ../../include/diaspora.php:446 ../../include/conversation.php:31 msgid "photo" msgstr "" @@ -388,7 +388,7 @@ msgstr "" msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:1040 ../../include/conversation.php:339 +#: ../../mod/photos.php:1040 ../../include/conversation.php:342 msgid "Private Message" msgstr "" @@ -420,38 +420,38 @@ msgstr "" msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1162 ../../include/conversation.php:387 +#: ../../mod/photos.php:1162 ../../include/conversation.php:390 msgid "I like this (toggle)" msgstr "" -#: ../../mod/photos.php:1163 ../../include/conversation.php:388 +#: ../../mod/photos.php:1163 ../../include/conversation.php:391 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1164 ../../include/conversation.php:389 -#: ../../include/conversation.php:743 +#: ../../mod/photos.php:1164 ../../include/conversation.php:392 +#: ../../include/conversation.php:746 msgid "Share" msgstr "" #: ../../mod/photos.php:1165 ../../mod/editpost.php:99 #: ../../mod/message.php:190 ../../mod/message.php:324 -#: ../../include/conversation.php:390 ../../include/conversation.php:753 +#: ../../include/conversation.php:393 ../../include/conversation.php:756 msgid "Please wait" msgstr "" #: ../../mod/photos.php:1181 ../../mod/photos.php:1220 -#: ../../mod/photos.php:1251 ../../include/conversation.php:403 +#: ../../mod/photos.php:1251 ../../include/conversation.php:406 msgid "This is you" msgstr "" #: ../../mod/photos.php:1183 ../../mod/photos.php:1222 -#: ../../mod/photos.php:1253 ../../include/conversation.php:405 -#: ../../boot.php:412 +#: ../../mod/photos.php:1253 ../../include/conversation.php:408 +#: ../../boot.php:411 msgid "Comment" msgstr "" #: ../../mod/photos.php:1281 ../../mod/group.php:154 ../../mod/admin.php:468 -#: ../../include/conversation.php:424 +#: ../../include/conversation.php:427 msgid "Delete" msgstr "" @@ -495,62 +495,62 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:75 ../../include/conversation.php:729 +#: ../../mod/editpost.php:75 ../../include/conversation.php:732 msgid "Post to Email" msgstr "" #: ../../mod/editpost.php:90 ../../include/group.php:171 -#: ../../include/group.php:172 ../../include/conversation.php:414 +#: ../../include/group.php:172 ../../include/conversation.php:417 msgid "Edit" msgstr "" #: ../../mod/editpost.php:91 ../../mod/message.php:188 -#: ../../mod/message.php:322 ../../include/conversation.php:744 +#: ../../mod/message.php:322 ../../include/conversation.php:747 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:92 ../../include/conversation.php:745 +#: ../../mod/editpost.php:92 ../../include/conversation.php:748 msgid "Attach file" msgstr "" #: ../../mod/editpost.php:93 ../../mod/message.php:189 -#: ../../mod/message.php:323 ../../include/conversation.php:746 +#: ../../mod/message.php:323 ../../include/conversation.php:749 msgid "Insert web link" msgstr "" -#: ../../mod/editpost.php:94 ../../include/conversation.php:747 +#: ../../mod/editpost.php:94 ../../include/conversation.php:750 msgid "Insert YouTube video" msgstr "" -#: ../../mod/editpost.php:95 ../../include/conversation.php:748 +#: ../../mod/editpost.php:95 ../../include/conversation.php:751 msgid "Insert Vorbis [.ogg] video" msgstr "" -#: ../../mod/editpost.php:96 ../../include/conversation.php:749 +#: ../../mod/editpost.php:96 ../../include/conversation.php:752 msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/editpost.php:97 ../../include/conversation.php:750 +#: ../../mod/editpost.php:97 ../../include/conversation.php:753 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:98 ../../include/conversation.php:751 +#: ../../mod/editpost.php:98 ../../include/conversation.php:754 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:100 ../../include/conversation.php:754 +#: ../../mod/editpost.php:100 ../../include/conversation.php:757 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:108 ../../include/conversation.php:762 +#: ../../mod/editpost.php:108 ../../include/conversation.php:765 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:109 ../../include/conversation.php:763 +#: ../../mod/editpost.php:109 ../../include/conversation.php:766 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:111 ../../include/conversation.php:765 +#: ../../mod/editpost.php:111 ../../include/conversation.php:768 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -659,7 +659,7 @@ msgstr "" msgid "Confirm" msgstr "" -#: ../../mod/dfrn_request.php:542 ../../include/items.php:1505 +#: ../../mod/dfrn_request.php:542 ../../include/items.php:1519 msgid "[Name Withheld]" msgstr "" @@ -671,7 +671,7 @@ msgstr "" #: ../../mod/lostpass.php:106 ../../mod/register.php:369 #: ../../mod/register.php:423 ../../mod/regmod.php:54 #: ../../mod/dfrn_notify.php:291 ../../mod/dfrn_notify.php:547 -#: ../../mod/dfrn_confirm.php:658 ../../include/items.php:1514 +#: ../../mod/dfrn_confirm.php:674 ../../include/items.php:1528 msgid "Administrator" msgstr "" @@ -1266,7 +1266,7 @@ msgstr "" msgid "Find" msgstr "" -#: ../../mod/contacts.php:422 ../../include/conversation.php:609 +#: ../../mod/contacts.php:422 ../../include/conversation.php:612 msgid "Edit contact" msgstr "" @@ -1289,7 +1289,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:82 ../../boot.php:655 +#: ../../mod/lostpass.php:82 ../../boot.php:654 msgid "Password Reset" msgstr "" @@ -1371,7 +1371,7 @@ msgstr "" #: ../../mod/settings.php:257 ../../addon/facebook/facebook.php:297 #: ../../addon/impressum/impressum.php:64 ../../addon/piwik/piwik.php:89 -#: ../../addon/twitter/twitter.php:271 +#: ../../addon/twitter/twitter.php:275 msgid "Settings updated." msgstr "" @@ -1864,7 +1864,7 @@ msgstr "" msgid "All Contacts (with secure profile access)" msgstr "" -#: ../../mod/viewcontacts.php:25 ../../include/text.php:548 +#: ../../mod/viewcontacts.php:25 ../../include/text.php:555 msgid "View Contacts" msgstr "" @@ -2012,22 +2012,24 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:529 ../../include/nav.php:59 ../../boot.php:638 +#: ../../mod/register.php:529 ../../include/nav.php:59 ../../boot.php:637 msgid "Register" msgstr "" -#: ../../mod/like.php:110 ../../addon/facebook/facebook.php:947 -#: ../../include/conversation.php:26 ../../include/conversation.php:35 +#: ../../mod/like.php:110 ../../addon/facebook/facebook.php:954 +#: ../../include/diaspora.php:446 ../../include/conversation.php:26 +#: ../../include/conversation.php:35 msgid "status" msgstr "" -#: ../../mod/like.php:127 ../../addon/facebook/facebook.php:951 -#: ../../include/conversation.php:43 +#: ../../mod/like.php:127 ../../addon/facebook/facebook.php:958 +#: ../../include/diaspora.php:463 ../../include/conversation.php:43 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../mod/like.php:129 ../../include/conversation.php:46 +#: ../../mod/like.php:129 ../../include/diaspora.php:465 +#: ../../include/conversation.php:46 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" @@ -2088,60 +2090,60 @@ msgstr "" msgid "Unable to locate original post." msgstr "" -#: ../../mod/item.php:182 +#: ../../mod/item.php:196 msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:282 ../../mod/message.php:93 +#: ../../mod/item.php:296 ../../mod/message.php:93 #: ../../mod/wall_upload.php:81 ../../mod/wall_upload.php:90 #: ../../mod/wall_upload.php:97 msgid "Wall Photos" msgstr "" -#: ../../mod/item.php:605 ../../mod/item.php:650 ../../mod/item.php:673 -#: ../../mod/item.php:716 ../../mod/dfrn_notify.php:293 +#: ../../mod/item.php:623 ../../mod/item.php:668 ../../mod/item.php:691 +#: ../../mod/item.php:734 ../../mod/dfrn_notify.php:293 #: ../../mod/dfrn_notify.php:503 ../../mod/dfrn_notify.php:548 #: ../../mod/dfrn_notify.php:634 ../../mod/dfrn_notify.php:677 msgid "noreply" msgstr "" -#: ../../mod/item.php:649 ../../mod/item.php:715 ../../mod/dfrn_notify.php:676 +#: ../../mod/item.php:667 ../../mod/item.php:733 ../../mod/dfrn_notify.php:676 msgid "Administrator@" msgstr "" -#: ../../mod/item.php:652 ../../mod/dfrn_notify.php:550 +#: ../../mod/item.php:670 ../../mod/dfrn_notify.php:550 #: ../../mod/dfrn_notify.php:679 #, php-format msgid "%s commented on an item at %s" msgstr "" -#: ../../mod/item.php:718 +#: ../../mod/item.php:736 #, php-format msgid "%s posted to your profile wall at %s" msgstr "" -#: ../../mod/item.php:747 +#: ../../mod/item.php:765 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:766 +#: ../../mod/item.php:784 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendika social network." msgstr "" -#: ../../mod/item.php:768 +#: ../../mod/item.php:786 #, php-format msgid "You may visit them online at %s" msgstr "" -#: ../../mod/item.php:769 +#: ../../mod/item.php:787 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "" -#: ../../mod/item.php:771 +#: ../../mod/item.php:789 #, php-format msgid "%s posted an update." msgstr "" @@ -2201,6 +2203,10 @@ msgstr "" msgid "Image uploaded successfully." msgstr "" +#: ../../mod/hcard.php:11 ../../mod/profile.php:11 ../../boot.php:792 +msgid "No profile" +msgstr "" + #: ../../mod/removeme.php:42 ../../mod/removeme.php:45 msgid "Remove My Account" msgstr "" @@ -2259,7 +2265,7 @@ msgstr "" msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:172 ../../include/conversation.php:696 +#: ../../mod/message.php:172 ../../include/conversation.php:699 msgid "Please enter a link URL:" msgstr "" @@ -2329,7 +2335,7 @@ msgid "User registrations waiting for confirmation" msgstr "" #: ../../mod/admin.php:118 ../../mod/admin.php:502 ../../mod/display.php:25 -#: ../../mod/display.php:112 ../../include/items.php:1828 +#: ../../mod/display.php:112 ../../include/items.php:1842 msgid "Item not found." msgstr "" @@ -2386,7 +2392,7 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../../mod/admin.php:306 +#: ../../mod/admin.php:306 ../../addon/statusnet/statusnet.php:459 msgid "Site name" msgstr "" @@ -2641,10 +2647,6 @@ msgstr "" msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:11 ../../boot.php:793 -msgid "No profile" -msgstr "" - #: ../../mod/profile.php:102 ../../mod/display.php:63 msgid "Access to this profile has been restricted." msgstr "" @@ -2692,7 +2694,9 @@ msgid "No browser URL could be matched to this address." msgstr "" #: ../../mod/follow.php:61 -msgid "Communication options with this network have been restricted." +msgid "" +"The profile address specified belongs to a network which has been disabled " +"on this site." msgstr "" #: ../../mod/follow.php:66 @@ -2701,11 +2705,11 @@ msgid "" "notifications from you." msgstr "" -#: ../../mod/follow.php:121 +#: ../../mod/follow.php:122 msgid "Unable to retrieve contact information." msgstr "" -#: ../../mod/follow.php:167 +#: ../../mod/follow.php:168 msgid "following" msgstr "" @@ -2725,7 +2729,7 @@ msgstr "" msgid "No installed applications." msgstr "" -#: ../../mod/search.php:26 ../../include/text.php:603 ../../include/nav.php:69 +#: ../../mod/search.php:26 ../../include/text.php:610 ../../include/nav.php:69 msgid "Search" msgstr "" @@ -3021,72 +3025,72 @@ msgid "" "Once you have registered, please connect with me via my profile page at:" msgstr "" -#: ../../mod/dfrn_confirm.php:231 +#: ../../mod/dfrn_confirm.php:233 msgid "Response from remote site was not understood." msgstr "" -#: ../../mod/dfrn_confirm.php:240 +#: ../../mod/dfrn_confirm.php:242 msgid "Unexpected response from remote site: " msgstr "" -#: ../../mod/dfrn_confirm.php:248 +#: ../../mod/dfrn_confirm.php:250 msgid "Confirmation completed successfully." msgstr "" -#: ../../mod/dfrn_confirm.php:250 ../../mod/dfrn_confirm.php:264 -#: ../../mod/dfrn_confirm.php:271 +#: ../../mod/dfrn_confirm.php:252 ../../mod/dfrn_confirm.php:266 +#: ../../mod/dfrn_confirm.php:273 msgid "Remote site reported: " msgstr "" -#: ../../mod/dfrn_confirm.php:262 +#: ../../mod/dfrn_confirm.php:264 msgid "Temporary failure. Please wait and try again." msgstr "" -#: ../../mod/dfrn_confirm.php:269 +#: ../../mod/dfrn_confirm.php:271 msgid "Introduction failed or was revoked." msgstr "" -#: ../../mod/dfrn_confirm.php:387 +#: ../../mod/dfrn_confirm.php:393 msgid "Unable to set contact photo." msgstr "" -#: ../../mod/dfrn_confirm.php:430 ../../include/conversation.php:79 +#: ../../mod/dfrn_confirm.php:436 ../../include/conversation.php:79 #, php-format msgid "%1$s is now friends with %2$s" msgstr "" -#: ../../mod/dfrn_confirm.php:501 +#: ../../mod/dfrn_confirm.php:507 #, php-format msgid "No user record found for '%s' " msgstr "" -#: ../../mod/dfrn_confirm.php:511 +#: ../../mod/dfrn_confirm.php:517 msgid "Our site encryption key is apparently messed up." msgstr "" -#: ../../mod/dfrn_confirm.php:522 +#: ../../mod/dfrn_confirm.php:528 msgid "Empty site URL was provided or URL could not be decrypted by us." msgstr "" -#: ../../mod/dfrn_confirm.php:534 +#: ../../mod/dfrn_confirm.php:549 msgid "Contact record was not found for you on our site." msgstr "" -#: ../../mod/dfrn_confirm.php:562 +#: ../../mod/dfrn_confirm.php:578 msgid "" "The ID provided by your system is a duplicate on our system. It should work " "if you try again." msgstr "" -#: ../../mod/dfrn_confirm.php:573 +#: ../../mod/dfrn_confirm.php:589 msgid "Unable to set your contact credentials on our system." msgstr "" -#: ../../mod/dfrn_confirm.php:626 +#: ../../mod/dfrn_confirm.php:642 msgid "Unable to update your contact profile details on our system" msgstr "" -#: ../../mod/dfrn_confirm.php:656 +#: ../../mod/dfrn_confirm.php:672 #, php-format msgid "Connection accepted at %s" msgstr "" @@ -3151,15 +3155,15 @@ msgid "" "conflict." msgstr "" -#: ../../addon/facebook/facebook.php:573 +#: ../../addon/facebook/facebook.php:580 msgid "Image: " msgstr "" -#: ../../addon/facebook/facebook.php:649 +#: ../../addon/facebook/facebook.php:656 msgid "View on Friendika" msgstr "" -#: ../../addon/facebook/facebook.php:680 +#: ../../addon/facebook/facebook.php:687 msgid "Facebook post failed. Queued for retry." msgstr "" @@ -3261,10 +3265,6 @@ msgstr "" msgid "Uploaded file is empty" msgstr "" -#: ../../addon/js_upload/js_upload.php:303 -msgid "Uploaded file is too large" -msgstr "" - #: ../../addon/js_upload/js_upload.php:321 msgid "File has an invalid extension, it should be one of " msgstr "" @@ -3320,44 +3320,44 @@ msgstr "" msgid "URL to embed:" msgstr "" -#: ../../addon/statusnet/statusnet.php:82 +#: ../../addon/statusnet/statusnet.php:133 msgid "Post to StatusNet" msgstr "" -#: ../../addon/statusnet/statusnet.php:124 +#: ../../addon/statusnet/statusnet.php:175 msgid "" "Please contact your site administrator.<br />The provided API URL is not " "valid." msgstr "" -#: ../../addon/statusnet/statusnet.php:152 +#: ../../addon/statusnet/statusnet.php:203 msgid "We could not contact the StatusNet API with the Path you entered." msgstr "" -#: ../../addon/statusnet/statusnet.php:179 +#: ../../addon/statusnet/statusnet.php:230 msgid "StatusNet settings updated." msgstr "" -#: ../../addon/statusnet/statusnet.php:202 +#: ../../addon/statusnet/statusnet.php:253 msgid "StatusNet Posting Settings" msgstr "" -#: ../../addon/statusnet/statusnet.php:216 +#: ../../addon/statusnet/statusnet.php:267 msgid "Globally Available StatusNet OAuthKeys" msgstr "" -#: ../../addon/statusnet/statusnet.php:217 +#: ../../addon/statusnet/statusnet.php:268 msgid "" "There are preconfigured OAuth key pairs for some StatusNet servers " "available. If you are useing one of them, please use these credentials. If " "not feel free to connect to any other StatusNet instance (see below)." msgstr "" -#: ../../addon/statusnet/statusnet.php:225 +#: ../../addon/statusnet/statusnet.php:276 msgid "Provide your own OAuth Credentials" msgstr "" -#: ../../addon/statusnet/statusnet.php:226 +#: ../../addon/statusnet/statusnet.php:277 msgid "" "No consumer key pair for StatusNet found. Register your Friendika Account as " "an desktop client on your StatusNet account, copy the consumer key pair here " @@ -3366,19 +3366,19 @@ msgid "" "installation at your favorited StatusNet installation." msgstr "" -#: ../../addon/statusnet/statusnet.php:228 +#: ../../addon/statusnet/statusnet.php:279 msgid "OAuth Consumer Key" msgstr "" -#: ../../addon/statusnet/statusnet.php:231 +#: ../../addon/statusnet/statusnet.php:282 msgid "OAuth Consumer Secret" msgstr "" -#: ../../addon/statusnet/statusnet.php:234 +#: ../../addon/statusnet/statusnet.php:285 msgid "Base API Path (remember the trailing /)" msgstr "" -#: ../../addon/statusnet/statusnet.php:255 +#: ../../addon/statusnet/statusnet.php:306 msgid "" "To connect to your StatusNet account click the button below to get a " "security code from StatusNet which you have to copy into the input box below " @@ -3386,49 +3386,61 @@ msgid "" "to StatusNet." msgstr "" -#: ../../addon/statusnet/statusnet.php:256 +#: ../../addon/statusnet/statusnet.php:307 msgid "Log in with StatusNet" msgstr "" -#: ../../addon/statusnet/statusnet.php:258 +#: ../../addon/statusnet/statusnet.php:309 msgid "Copy the security code from StatusNet here" msgstr "" -#: ../../addon/statusnet/statusnet.php:264 +#: ../../addon/statusnet/statusnet.php:315 msgid "Cancel Connection Process" msgstr "" -#: ../../addon/statusnet/statusnet.php:266 +#: ../../addon/statusnet/statusnet.php:317 msgid "Current StatusNet API is" msgstr "" -#: ../../addon/statusnet/statusnet.php:267 +#: ../../addon/statusnet/statusnet.php:318 msgid "Cancel StatusNet Connection" msgstr "" -#: ../../addon/statusnet/statusnet.php:278 ../../addon/twitter/twitter.php:180 +#: ../../addon/statusnet/statusnet.php:329 ../../addon/twitter/twitter.php:180 msgid "Currently connected to: " msgstr "" -#: ../../addon/statusnet/statusnet.php:279 +#: ../../addon/statusnet/statusnet.php:330 msgid "" "If enabled all your <strong>public</strong> postings can be posted to the " "associated StatusNet account. You can choose to do so by default (here) or " "for every posting separately in the posting options when writing the entry." msgstr "" -#: ../../addon/statusnet/statusnet.php:281 +#: ../../addon/statusnet/statusnet.php:332 msgid "Allow posting to StatusNet" msgstr "" -#: ../../addon/statusnet/statusnet.php:284 +#: ../../addon/statusnet/statusnet.php:335 msgid "Send public postings to StatusNet by default" msgstr "" -#: ../../addon/statusnet/statusnet.php:289 ../../addon/twitter/twitter.php:191 +#: ../../addon/statusnet/statusnet.php:340 ../../addon/twitter/twitter.php:191 msgid "Clear OAuth configuration" msgstr "" +#: ../../addon/statusnet/statusnet.php:460 +msgid "API URL" +msgstr "" + +#: ../../addon/statusnet/statusnet.php:461 +msgid "Consumer Secret" +msgstr "" + +#: ../../addon/statusnet/statusnet.php:462 +msgid "Consumer Key" +msgstr "" + #: ../../addon/piwik/piwik.php:77 msgid "Piwik Base URL" msgstr "" @@ -3491,19 +3503,19 @@ msgstr "" msgid "Send public postings to Twitter by default" msgstr "" -#: ../../addon/twitter/twitter.php:278 +#: ../../addon/twitter/twitter.php:282 msgid "Consumer key" msgstr "" -#: ../../addon/twitter/twitter.php:279 +#: ../../addon/twitter/twitter.php:283 msgid "Consumer secret" msgstr "" -#: ../../include/profile_advanced.php:23 ../../boot.php:881 +#: ../../include/profile_advanced.php:23 ../../boot.php:880 msgid "Gender:" msgstr "" -#: ../../include/profile_advanced.php:36 ../../include/items.php:1123 +#: ../../include/profile_advanced.php:36 ../../include/items.php:1137 msgid "Birthday:" msgstr "" @@ -3523,7 +3535,7 @@ msgstr "" msgid "<span class=\"heart\">♥</span> Status:" msgstr "" -#: ../../include/profile_advanced.php:103 ../../boot.php:887 +#: ../../include/profile_advanced.php:103 ../../boot.php:886 msgid "Homepage:" msgstr "" @@ -3843,117 +3855,121 @@ msgstr "" msgid "Finishes:" msgstr "" -#: ../../include/text.php:222 +#: ../../include/text.php:229 msgid "prev" msgstr "" -#: ../../include/text.php:224 +#: ../../include/text.php:231 msgid "first" msgstr "" -#: ../../include/text.php:253 +#: ../../include/text.php:260 msgid "last" msgstr "" -#: ../../include/text.php:256 +#: ../../include/text.php:263 msgid "next" msgstr "" -#: ../../include/text.php:535 +#: ../../include/text.php:542 msgid "No contacts" msgstr "" -#: ../../include/text.php:543 +#: ../../include/text.php:550 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:700 +#: ../../include/text.php:711 msgid "Monday" msgstr "" -#: ../../include/text.php:700 +#: ../../include/text.php:711 msgid "Tuesday" msgstr "" -#: ../../include/text.php:700 +#: ../../include/text.php:711 msgid "Wednesday" msgstr "" -#: ../../include/text.php:700 +#: ../../include/text.php:711 msgid "Thursday" msgstr "" -#: ../../include/text.php:700 +#: ../../include/text.php:711 msgid "Friday" msgstr "" -#: ../../include/text.php:700 +#: ../../include/text.php:711 msgid "Saturday" msgstr "" -#: ../../include/text.php:700 +#: ../../include/text.php:711 msgid "Sunday" msgstr "" -#: ../../include/text.php:704 +#: ../../include/text.php:715 msgid "January" msgstr "" -#: ../../include/text.php:704 +#: ../../include/text.php:715 msgid "February" msgstr "" -#: ../../include/text.php:704 +#: ../../include/text.php:715 msgid "March" msgstr "" -#: ../../include/text.php:704 +#: ../../include/text.php:715 msgid "April" msgstr "" -#: ../../include/text.php:704 +#: ../../include/text.php:715 msgid "May" msgstr "" -#: ../../include/text.php:704 +#: ../../include/text.php:715 msgid "June" msgstr "" -#: ../../include/text.php:704 +#: ../../include/text.php:715 msgid "July" msgstr "" -#: ../../include/text.php:704 +#: ../../include/text.php:715 msgid "August" msgstr "" -#: ../../include/text.php:704 +#: ../../include/text.php:715 msgid "September" msgstr "" -#: ../../include/text.php:704 +#: ../../include/text.php:715 msgid "October" msgstr "" -#: ../../include/text.php:704 +#: ../../include/text.php:715 msgid "November" msgstr "" -#: ../../include/text.php:704 +#: ../../include/text.php:715 msgid "December" msgstr "" -#: ../../include/text.php:767 +#: ../../include/text.php:778 msgid "bytes" msgstr "" -#: ../../include/text.php:850 +#: ../../include/text.php:861 msgid "Select an alternate language" msgstr "" +#: ../../include/diaspora.php:309 +msgid "Sharing notification from Diaspora network" +msgstr "" + #: ../../include/oembed.php:95 msgid "Embedding disabled" msgstr "" @@ -3966,7 +3982,7 @@ msgstr "" msgid "Everybody" msgstr "" -#: ../../include/nav.php:41 ../../boot.php:668 +#: ../../include/nav.php:41 ../../boot.php:667 msgid "Logout" msgstr "" @@ -3974,7 +3990,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:44 ../../boot.php:646 ../../boot.php:652 +#: ../../include/nav.php:44 ../../boot.php:645 ../../boot.php:651 msgid "Login" msgstr "" @@ -4171,11 +4187,11 @@ msgstr "" msgid "don't show" msgstr "" -#: ../../include/notifier.php:459 +#: ../../include/notifier.php:465 msgid "(no subject)" msgstr "" -#: ../../include/items.php:1512 +#: ../../include/items.php:1526 msgid "You have a new follower at " msgstr "" @@ -4183,13 +4199,13 @@ msgstr "" msgid "event" msgstr "" -#: ../../include/conversation.php:213 ../../include/conversation.php:485 -#: ../../include/conversation.php:486 +#: ../../include/conversation.php:213 ../../include/conversation.php:488 +#: ../../include/conversation.php:489 #, php-format msgid "View %s's profile" msgstr "" -#: ../../include/conversation.php:222 ../../include/conversation.php:498 +#: ../../include/conversation.php:222 ../../include/conversation.php:501 #, php-format msgid "%s from %s" msgstr "" @@ -4202,179 +4218,179 @@ msgstr "" msgid "See more posts like this" msgstr "" -#: ../../include/conversation.php:326 +#: ../../include/conversation.php:329 #, php-format msgid "See all %d comments" msgstr "" -#: ../../include/conversation.php:424 +#: ../../include/conversation.php:427 msgid "Select" msgstr "" -#: ../../include/conversation.php:426 +#: ../../include/conversation.php:429 msgid "toggle star status" msgstr "" -#: ../../include/conversation.php:487 +#: ../../include/conversation.php:490 msgid "to" msgstr "" -#: ../../include/conversation.php:488 +#: ../../include/conversation.php:491 msgid "Wall-to-Wall" msgstr "" -#: ../../include/conversation.php:489 +#: ../../include/conversation.php:492 msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/conversation.php:531 +#: ../../include/conversation.php:534 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:605 +#: ../../include/conversation.php:608 msgid "View status" msgstr "" -#: ../../include/conversation.php:606 +#: ../../include/conversation.php:609 msgid "View profile" msgstr "" -#: ../../include/conversation.php:607 +#: ../../include/conversation.php:610 msgid "View photos" msgstr "" -#: ../../include/conversation.php:608 +#: ../../include/conversation.php:611 msgid "View recent" msgstr "" -#: ../../include/conversation.php:610 +#: ../../include/conversation.php:613 msgid "Send PM" msgstr "" -#: ../../include/conversation.php:660 +#: ../../include/conversation.php:663 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:660 +#: ../../include/conversation.php:663 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:664 +#: ../../include/conversation.php:667 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgstr "" -#: ../../include/conversation.php:666 +#: ../../include/conversation.php:669 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgstr "" -#: ../../include/conversation.php:672 +#: ../../include/conversation.php:675 msgid "and" msgstr "" -#: ../../include/conversation.php:675 +#: ../../include/conversation.php:678 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:676 +#: ../../include/conversation.php:679 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:676 +#: ../../include/conversation.php:679 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:695 +#: ../../include/conversation.php:698 msgid "Visible to <strong>everybody</strong>" msgstr "" -#: ../../include/conversation.php:697 +#: ../../include/conversation.php:700 msgid "Please enter a YouTube link:" msgstr "" -#: ../../include/conversation.php:698 +#: ../../include/conversation.php:701 msgid "Please enter a video(.ogg) link/URL:" msgstr "" -#: ../../include/conversation.php:699 +#: ../../include/conversation.php:702 msgid "Please enter an audio(.ogg) link/URL:" msgstr "" -#: ../../include/conversation.php:700 +#: ../../include/conversation.php:703 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:701 +#: ../../include/conversation.php:704 msgid "Enter a title for this item" msgstr "" -#: ../../include/conversation.php:752 +#: ../../include/conversation.php:755 msgid "Set title" msgstr "" -#: ../../boot.php:411 +#: ../../boot.php:410 msgid "Delete this item?" msgstr "" -#: ../../boot.php:637 +#: ../../boot.php:636 msgid "Create a New Account" msgstr "" -#: ../../boot.php:644 +#: ../../boot.php:643 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:645 +#: ../../boot.php:644 msgid "Password: " msgstr "" -#: ../../boot.php:650 +#: ../../boot.php:649 msgid "Nickname/Email/OpenID: " msgstr "" -#: ../../boot.php:651 +#: ../../boot.php:650 msgid "Password (if not OpenID): " msgstr "" -#: ../../boot.php:654 +#: ../../boot.php:653 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:854 +#: ../../boot.php:853 msgid "Connect" msgstr "" -#: ../../boot.php:873 +#: ../../boot.php:872 msgid ", " msgstr "" -#: ../../boot.php:885 +#: ../../boot.php:884 msgid "Status:" msgstr "" -#: ../../boot.php:976 +#: ../../boot.php:975 msgid "g A l F d" msgstr "" -#: ../../boot.php:994 +#: ../../boot.php:993 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:995 +#: ../../boot.php:994 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:996 +#: ../../boot.php:995 msgid "(Adjusted for local time)" msgstr "" -#: ../../boot.php:1007 +#: ../../boot.php:1006 msgid "[today]" msgstr "" diff --git a/util/strings.php b/util/strings.php index ea4b56683..d0e36217b 100644 --- a/util/strings.php +++ b/util/strings.php @@ -495,6 +495,7 @@ $a->strings["Crop Image"] = ""; $a->strings["Please adjust the image cropping for optimum viewing."] = ""; $a->strings["Done Editing"] = ""; $a->strings["Image uploaded successfully."] = ""; +$a->strings["No profile"] = ""; $a->strings["Remove My Account"] = ""; $a->strings["This will completely remove your account. Once this has been done it is not recoverable."] = ""; $a->strings["Please enter your password for verification:"] = ""; @@ -606,7 +607,6 @@ $a->strings["FTP Host"] = ""; $a->strings["FTP Path"] = ""; $a->strings["FTP User"] = ""; $a->strings["FTP Password"] = ""; -$a->strings["No profile"] = ""; $a->strings["Access to this profile has been restricted."] = ""; $a->strings["Tips for New Members"] = ""; $a->strings["Login failed."] = ""; @@ -618,7 +618,7 @@ $a->strings["No compatible communication protocols or feeds were discovered."] = $a->strings["The profile address specified does not provide adequate information."] = ""; $a->strings["An author or name was not found."] = ""; $a->strings["No browser URL could be matched to this address."] = ""; -$a->strings["Communication options with this network have been restricted."] = ""; +$a->strings["The profile address specified belongs to a network which has been disabled on this site."] = ""; $a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = ""; $a->strings["Unable to retrieve contact information."] = ""; $a->strings["following"] = ""; @@ -756,7 +756,6 @@ $a->strings["Drop files here to upload"] = ""; $a->strings["Failed"] = ""; $a->strings["No files were uploaded."] = ""; $a->strings["Uploaded file is empty"] = ""; -$a->strings["Uploaded file is too large"] = ""; $a->strings["File has an invalid extension, it should be one of "] = ""; $a->strings["Upload was cancelled, or server error encountered"] = ""; $a->strings["Impressum"] = ""; @@ -792,6 +791,9 @@ $a->strings["If enabled all your <strong>public</strong> postings can be posted $a->strings["Allow posting to StatusNet"] = ""; $a->strings["Send public postings to StatusNet by default"] = ""; $a->strings["Clear OAuth configuration"] = ""; +$a->strings["API URL"] = ""; +$a->strings["Consumer Secret"] = ""; +$a->strings["Consumer Key"] = ""; $a->strings["Piwik Base URL"] = ""; $a->strings["Site ID"] = ""; $a->strings["Show opt-out cookie link?"] = ""; @@ -923,6 +925,7 @@ $a->strings["November"] = ""; $a->strings["December"] = ""; $a->strings["bytes"] = ""; $a->strings["Select an alternate language"] = ""; +$a->strings["Sharing notification from Diaspora network"] = ""; $a->strings["Embedding disabled"] = ""; $a->strings["Create a new group"] = ""; $a->strings["Everybody"] = ""; |