diff --git a/boot.php b/boot.php index 25c7fd14d0..79e520150a 100644 --- a/boot.php +++ b/boot.php @@ -4,7 +4,7 @@ set_time_limit(0); ini_set('pcre.backtrack_limit', 250000); -define ( 'FRIENDIKA_VERSION', '2.2.990' ); +define ( 'FRIENDIKA_VERSION', '2.2.991' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1058 ); diff --git a/doc/Connectors.md b/doc/Connectors.md index 45bce8d9a4..d9ad0e9b05 100644 --- a/doc/Connectors.md +++ b/doc/Connectors.md @@ -26,6 +26,8 @@ These are described as the "federated social web" or OStatus contacts. Please note that there are **no** privacy provisions on the OStatus network. Any message which is delivered to **any** OStatus member is visible to anybody in the world and will negate any privacy settings that you have in effect. These messages will also turn up in public searches. +Since OStatus communications do not use authentication, if you select the profile privacy option to hide your profile and messages from unknown viewers, OStatus members will **not** be able to recieve your communications. + To connect with an OStatus member insert their profile URL or Identity address into the Connect box on your [Contacts](contacts) page. The StatusNet connector may be used if you wish posts to appear on an OStatus site using an existing OStatus account. diff --git a/images/content-types.png b/images/content-types.png new file mode 100644 index 0000000000..be2ccbf011 Binary files /dev/null and b/images/content-types.png differ diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php index 65fd29eb3c..5d6f2c3717 100644 --- a/mod/dfrn_notify.php +++ b/mod/dfrn_notify.php @@ -419,7 +419,7 @@ function dfrn_notify_post(&$a) { '$email' => $importer['email'], // email address to send to '$url' => $datarray['author-link'], // full url for the site '$from' => $from, // name of the person sending the message - '$body' => 'q1' .$msg['htmlversion'], // html version of the message + '$body' => $msg['htmlversion'], // html version of the message '$display' => $a->get_baseurl() . '/display/' . $importer['nick'] . '/' . $posted_id, )); @@ -440,10 +440,10 @@ function dfrn_notify_post(&$a) { require_once("include/EmailNotification.php"); EmailNotification::sendTextHtmlEmail( $msg['notificationfromname'], - t("Administrator@") . $a->get_hostname(), + t("Administrator") . '@' . $a->get_hostname(), t("noreply") . '@' . $a->get_hostname(), $importer['email'], - $from . t(" commented on an item at ") . $a->config['sitename'], + sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']), $email_html_body_tpl, $email_text_body_tpl ); @@ -504,7 +504,7 @@ function dfrn_notify_post(&$a) { $datarray['type'] = 'activity'; $datarray['gravity'] = GRAVITY_LIKE; } - $r = item_store($datarray); + $posted_id = item_store($datarray); // find out if our user is involved in this conversation and wants to be notified. @@ -544,11 +544,11 @@ function dfrn_notify_post(&$a) { $email_html_body_tpl = replace_macros($tpl,array( '$sitename' => $a->config['sitename'], // name of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site - '$thumb' => $conv['author-avatar'], // thumbnail url for sender icon - '$url' => $conv['author-link'], // full url for the site + '$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon + '$url' => $datarray['author-link'], // full url for the site '$from' => $from, // name of the person sending the message '$body' => $msg['htmlversion'], // html version of the message - '$display' => $a->get_baseurl() . '/display/' . $importer['nick'] . '/' . $posted_id, + '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id, )); // load the template for private message notifications @@ -556,11 +556,11 @@ function dfrn_notify_post(&$a) { $email_text_body_tpl = replace_macros($tpl,array( '$sitename' => $a->config['sitename'], // name of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site - '$thumb' => $conv['author-avatar'], // thumbnail url for sender icon - '$url' => $conv['author-link'], // full url for the site + '$thumb' => $datarray['author-avatar'], // thumbnail url for sender icon + '$url' => $datarray['author-link'], // full url for the site '$from' => $from, // name of the person sending the message '$body' => $msg['textversion'], // text version of the message - '$display' => $a->get_baseurl() . '/display/' . $importer['nick'] . '/' . $posted_id, + '$display' => $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id, )); // use the EmailNotification library to send the message @@ -570,7 +570,7 @@ function dfrn_notify_post(&$a) { t("Administrator@") . $a->get_hostname(), t("noreply") . '@' . $a->get_hostname(), $importer['email'], - $from . t(" commented on an item at ") . $a->config['sitename'], + sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']), $email_html_body_tpl, $email_text_body_tpl ); diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index ef8469523d..7d8568188e 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -31,6 +31,12 @@ function dfrn_poll_init(&$a) { killme(); } + $r = q("SELECT `hidewall` FROM `profile` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid` WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 LIMIT 1", + dbesc($a->argv[1]) + ); + if(count($r) && $r[0]['hidewall']) + killme(); + logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] ); header("Content-type: application/atom+xml"); $o = get_feed_for($a, '', $a->argv[1],$last_update); diff --git a/mod/item.php b/mod/item.php index 6120b140bf..82f33eaebd 100644 --- a/mod/item.php +++ b/mod/item.php @@ -443,7 +443,7 @@ function item_post(&$a) { else $post_id = 0; -dbg(1); + $r = q("INSERT INTO `item` (`uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, `author-name`, `author-link`, `author-avatar`, `created`, `edited`, `changed`, `uri`, `title`, `body`, `location`, `coord`, `tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach` ) @@ -533,10 +533,10 @@ dbg(1); '$siteurl' => $a->get_baseurl(), // descriptive url of this site '$thumb' => $author['thumb'], // thumbnail url for sender icon '$email' => $importer['email'], // email address to send to - '$url' => $author['url'], // full url for the site - '$from' => $from, // name of the person sending the message + '$url' => $author['url'], // full url for the site + '$from' => $from, // name of the person sending the message '$body' => $msg['htmlversion'], // html version of the message - '$display' => $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id, + '$display' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id, )); // load the template for private message notifications @@ -546,10 +546,10 @@ dbg(1); '$siteurl' => $a->get_baseurl(), // descriptive url of this site '$thumb' => $author['thumb'], // thumbnail url for sender icon '$email' => $importer['email'], // email address to send to - '$url' => $author['url'], // full url for the site - '$from' => $from, // name of the person sending the message + '$url' => $author['url'], // profile url for the author + '$from' => $from, // name of the person sending the message '$body' => $msg['textversion'], // text version of the message - '$display' => $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id, + '$display' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id, )); // use the EmailNotification library to send the message @@ -559,7 +559,7 @@ dbg(1); t("Administrator@") . $a->get_hostname(), t("noreply") . '@' . $a->get_hostname(), $user['email'], - $from . t(" commented on an item at ") . $a->config['sitename'], + sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']), $email_html_body_tpl, $email_text_body_tpl ); @@ -598,10 +598,10 @@ dbg(1); '$sitename' => $a->config['sitename'], // name of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site '$thumb' => $author['thumb'], // thumbnail url for sender icon - '$url' => $author['url'], // full url for the site - '$from' => $from, // name of the person sending the message + '$url' => $author['url'], // full url for the site + '$from' => $from, // name of the person sending the message '$body' => $msg['htmlversion'], // html version of the message - '$display' => $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id, + '$display' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id, )); // load the template for private message notifications @@ -610,10 +610,10 @@ dbg(1); '$sitename' => $a->config['sitename'], // name of this site '$siteurl' => $a->get_baseurl(), // descriptive url of this site '$thumb' => $author['thumb'], // thumbnail url for sender icon - '$url' => $author['url'], // full url for the site - '$from' => $from, // name of the person sending the message + '$url' => $author['url'], // full url for the site + '$from' => $from, // name of the person sending the message '$body' => $msg['textversion'], // text version of the message - '$display' => $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id, + '$display' => $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id, )); // use the EmailNotification library to send the message @@ -623,7 +623,7 @@ dbg(1); t("Administrator@") . $a->get_hostname(), t("noreply") . '@' . $a->get_hostname(), $user['email'], - $from . t(" commented on an item at ") . $a->config['sitename'], + sprintf( t('%s posted to your profile wall at %s') , $from , $a->config['sitename']), $email_html_body_tpl, $email_text_body_tpl ); diff --git a/mod/profiles.php b/mod/profiles.php index b64c1294e3..f0821a4f87 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -363,7 +363,7 @@ function profiles_content(&$a) { $opt_tpl = get_markup_template("profile-hide-wall.tpl"); $hide_wall = replace_macros($opt_tpl,array( - '$desc' => t('Hide your messages from unknown viewers of this profile?'), + '$desc' => t('Hide profile details and all your messages from unknown viewers?'), '$yes_str' => t('Yes'), '$no_str' => t('No'), '$yes_selected' => (($r[0]['hidewall']) ? " checked=\"checked\" " : ""), diff --git a/util/messages.po b/util/messages.po index 32d2e7770b..19c39b2491 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,981 +6,156 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.2.988\n" +"Project-Id-Version: 2.2.991\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-23 12:00+0200\n" +"POT-Creation-Date: 2011-05-25 17:11-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../../index.php:213 -msgid "Not Found" +#: ../../mod/oexchange.php:27 +msgid "Post successful." msgstr "" -#: ../../index.php:214 -msgid "Page not found." +#: ../../mod/crepair.php:42 +msgid "Contact settings applied." msgstr "" -#: ../../index.php:269 ../../mod/profperm.php:19 ../../mod/group.php:67 -msgid "Permission denied" +#: ../../mod/crepair.php:44 +msgid "Contact update failed." msgstr "" -#: ../../index.php:270 ../../mod/manage.php:75 ../../mod/wall_upload.php:42 -#: ../../mod/follow.php:8 ../../mod/profile_photo.php:19 -#: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:144 -#: ../../mod/profile_photo.php:155 ../../mod/regmod.php:16 -#: ../../mod/profiles.php:7 ../../mod/profiles.php:227 -#: ../../mod/settings.php:15 ../../mod/settings.php:20 -#: ../../mod/settings.php:251 ../../mod/photos.php:89 ../../mod/photos.php:802 -#: ../../mod/display.php:138 ../../mod/editpost.php:10 ../../mod/invite.php:13 -#: ../../mod/invite.php:54 ../../mod/contacts.php:106 -#: ../../mod/register.php:25 ../../mod/install.php:93 ../../mod/network.php:6 -#: ../../mod/notifications.php:56 ../../mod/crepair.php:54 -#: ../../mod/notes.php:20 ../../mod/item.php:57 ../../mod/item.php:751 +#: ../../mod/crepair.php:54 ../../mod/wall_attach.php:43 +#: ../../mod/photos.php:89 ../../mod/photos.php:802 ../../mod/editpost.php:10 +#: ../../mod/install.php:93 ../../mod/notifications.php:56 +#: ../../mod/contacts.php:106 ../../mod/settings.php:15 +#: ../../mod/settings.php:20 ../../mod/settings.php:251 +#: ../../mod/manage.php:75 ../../mod/network.php:6 ../../mod/notes.php:20 +#: ../../mod/attach.php:64 ../../mod/group.php:19 +#: ../../mod/viewcontacts.php:21 ../../mod/register.php:27 +#: ../../mod/regmod.php:18 ../../mod/item.php:57 ../../mod/item.php:801 +#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:133 +#: ../../mod/profile_photo.php:144 ../../mod/profile_photo.php:155 #: ../../mod/message.php:8 ../../mod/message.php:116 -#: ../../mod/dfrn_confirm.php:53 ../../mod/viewcontacts.php:21 -#: ../../mod/group.php:19 ../../addon/facebook/facebook.php:242 +#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 +#: ../../mod/display.php:138 ../../mod/profiles.php:7 +#: ../../mod/profiles.php:230 ../../mod/invite.php:13 ../../mod/invite.php:54 +#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:242 +#: ../../index.php:256 msgid "Permission denied." msgstr "" -#: ../../boot.php:385 -msgid "Delete this item?" +#: ../../mod/crepair.php:68 ../../mod/contacts.php:214 +#: ../../mod/dfrn_confirm.php:114 +msgid "Contact not found." msgstr "" -#: ../../boot.php:386 ../../mod/photos.php:1134 ../../mod/photos.php:1173 -#: ../../mod/photos.php:1204 ../../include/conversation.php:380 -msgid "Comment" +#: ../../mod/crepair.php:74 +msgid "Repair Contact Settings" msgstr "" -#: ../../boot.php:834 -msgid "Create a New Account" -msgstr "" - -#: ../../boot.php:835 ../../mod/register.php:471 ../../include/nav.php:59 -msgid "Register" -msgstr "" - -#: ../../boot.php:841 -msgid "Nickname or Email address: " -msgstr "" - -#: ../../boot.php:842 -msgid "Password: " -msgstr "" - -#: ../../boot.php:843 ../../boot.php:849 ../../include/nav.php:44 -msgid "Login" -msgstr "" - -#: ../../boot.php:847 -msgid "Nickname/Email/OpenID: " -msgstr "" - -#: ../../boot.php:848 -msgid "Password (if not OpenID): " -msgstr "" - -#: ../../boot.php:851 -msgid "Forgot your password?" -msgstr "" - -#: ../../boot.php:852 ../../mod/lostpass.php:78 -msgid "Password Reset" -msgstr "" - -#: ../../boot.php:865 ../../include/nav.php:41 -msgid "Logout" -msgstr "" - -#: ../../boot.php:1113 -msgid "prev" -msgstr "" - -#: ../../boot.php:1115 -msgid "first" -msgstr "" - -#: ../../boot.php:1144 -msgid "last" -msgstr "" - -#: ../../boot.php:1147 -msgid "next" -msgstr "" - -#: ../../boot.php:2046 -msgid "No contacts" -msgstr "" - -#: ../../boot.php:2054 -#, php-format -msgid "%d Contact" -msgid_plural "%d Contacts" -msgstr[0] "" -msgstr[1] "" - -#: ../../boot.php:2059 ../../mod/viewcontacts.php:25 -msgid "View Contacts" -msgstr "" - -#: ../../boot.php:2114 ../../mod/search.php:26 ../../include/nav.php:70 -msgid "Search" -msgstr "" - -#: ../../boot.php:2270 ../../mod/profile.php:11 -msgid "No profile" -msgstr "" - -#: ../../boot.php:2329 -msgid "Connect" -msgstr "" - -#: ../../boot.php:2344 -msgid "Location:" -msgstr "" - -#: ../../boot.php:2348 -msgid ", " -msgstr "" - -#: ../../boot.php:2356 ../../include/profile_advanced.php:23 -msgid "Gender:" -msgstr "" - -#: ../../boot.php:2360 -msgid "Status:" -msgstr "" - -#: ../../boot.php:2362 ../../include/profile_advanced.php:103 -msgid "Homepage:" -msgstr "" - -#: ../../boot.php:2453 -msgid "Monday" -msgstr "" - -#: ../../boot.php:2453 -msgid "Tuesday" -msgstr "" - -#: ../../boot.php:2453 -msgid "Wednesday" -msgstr "" - -#: ../../boot.php:2453 -msgid "Thursday" -msgstr "" - -#: ../../boot.php:2453 -msgid "Friday" -msgstr "" - -#: ../../boot.php:2453 -msgid "Saturday" -msgstr "" - -#: ../../boot.php:2453 -msgid "Sunday" -msgstr "" - -#: ../../boot.php:2457 -msgid "January" -msgstr "" - -#: ../../boot.php:2457 -msgid "February" -msgstr "" - -#: ../../boot.php:2457 -msgid "March" -msgstr "" - -#: ../../boot.php:2457 -msgid "April" -msgstr "" - -#: ../../boot.php:2457 -msgid "May" -msgstr "" - -#: ../../boot.php:2457 -msgid "June" -msgstr "" - -#: ../../boot.php:2457 -msgid "July" -msgstr "" - -#: ../../boot.php:2457 -msgid "August" -msgstr "" - -#: ../../boot.php:2457 -msgid "September" -msgstr "" - -#: ../../boot.php:2457 -msgid "October" -msgstr "" - -#: ../../boot.php:2457 -msgid "November" -msgstr "" - -#: ../../boot.php:2457 -msgid "December" -msgstr "" - -#: ../../boot.php:2472 -msgid "g A l F d" -msgstr "" - -#: ../../boot.php:2490 -msgid "Birthday Reminders" -msgstr "" - -#: ../../boot.php:2491 -msgid "Birthdays this week:" -msgstr "" - -#: ../../boot.php:2492 -msgid "(Adjusted for local time)" -msgstr "" - -#: ../../boot.php:2503 -msgid "[today]" -msgstr "" - -#: ../../boot.php:2707 -msgid "link to source" -msgstr "" - -#: ../../mod/manage.php:37 -#, php-format -msgid "Welcome back %s" -msgstr "" - -#: ../../mod/manage.php:87 -msgid "Manage Identities and/or Pages" -msgstr "" - -#: ../../mod/manage.php:90 +#: ../../mod/crepair.php:76 msgid "" -"(Toggle between different identities or community/group pages which share " -"your account details.)" +"WARNING: This is highly advanced and if you enter incorrect " +"information your communications with this contact will stop working." msgstr "" -#: ../../mod/manage.php:92 -msgid "Select an identity to manage: " +#: ../../mod/crepair.php:77 +msgid "" +"Please use your browser 'Back' button now if you are " +"uncertain what to do on this page." msgstr "" -#: ../../mod/manage.php:106 ../../mod/profiles.php:370 -#: ../../mod/settings.php:426 ../../mod/photos.php:830 -#: ../../mod/photos.php:887 ../../mod/photos.php:1095 -#: ../../mod/photos.php:1135 ../../mod/photos.php:1174 -#: ../../mod/photos.php:1205 ../../mod/invite.php:68 -#: ../../mod/contacts.php:264 ../../mod/install.php:133 -#: ../../mod/crepair.php:100 ../../mod/group.php:76 ../../mod/group.php:159 -#: ../../addon/twitter/twitter.php:156 ../../addon/twitter/twitter.php:175 +#: ../../mod/crepair.php:85 +msgid "Name" +msgstr "" + +#: ../../mod/crepair.php:86 +msgid "Account Nickname" +msgstr "" + +#: ../../mod/crepair.php:87 +msgid "Account URL" +msgstr "" + +#: ../../mod/crepair.php:88 +msgid "Friend Request URL" +msgstr "" + +#: ../../mod/crepair.php:89 +msgid "Friend Confirm URL" +msgstr "" + +#: ../../mod/crepair.php:90 +msgid "Notification Endpoint URL" +msgstr "" + +#: ../../mod/crepair.php:91 +msgid "Poll/Feed URL" +msgstr "" + +#: ../../mod/crepair.php:100 ../../mod/photos.php:830 ../../mod/photos.php:887 +#: ../../mod/photos.php:1095 ../../mod/photos.php:1135 +#: ../../mod/photos.php:1174 ../../mod/photos.php:1205 +#: ../../mod/install.php:133 ../../mod/contacts.php:264 +#: ../../mod/settings.php:426 ../../mod/manage.php:106 ../../mod/group.php:76 +#: ../../mod/group.php:159 ../../mod/profiles.php:383 ../../mod/invite.php:68 +#: ../../addon/facebook/facebook.php:289 +#: ../../addon/randplace/randplace.php:179 ../../addon/oembed/oembed.php:49 #: ../../addon/statusnet/statusnet.php:216 #: ../../addon/statusnet/statusnet.php:230 #: ../../addon/statusnet/statusnet.php:256 #: ../../addon/statusnet/statusnet.php:263 -#: ../../addon/statusnet/statusnet.php:285 -#: ../../addon/facebook/facebook.php:289 -#: ../../addon/randplace/randplace.php:179 ../../include/conversation.php:381 +#: ../../addon/statusnet/statusnet.php:285 ../../addon/twitter/twitter.php:156 +#: ../../addon/twitter/twitter.php:175 ../../include/conversation.php:383 msgid "Submit" msgstr "" -#: ../../mod/wall_upload.php:56 ../../mod/profile_photo.php:109 +#: ../../mod/help.php:27 +msgid "Help:" +msgstr "" + +#: ../../mod/help.php:31 ../../include/nav.php:64 +msgid "Help" +msgstr "" + +#: ../../mod/wall_attach.php:57 #, php-format -msgid "Image exceeds size limit of %d" +msgid "File exceeds size limit of %d" msgstr "" -#: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118 -#: ../../mod/photos.php:577 -msgid "Unable to process image." +#: ../../mod/wall_attach.php:87 ../../mod/wall_attach.php:98 +msgid "File upload failed." msgstr "" -#: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88 -#: ../../mod/wall_upload.php:95 ../../mod/item.php:214 -#: ../../mod/message.php:93 -msgid "Wall Photos" +#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 +#: ../../mod/dfrn_request.php:644 ../../addon/js_upload/js_upload.php:41 +msgid "Cancel" msgstr "" -#: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:241 -#: ../../mod/photos.php:597 -msgid "Image upload failed." +#: ../../mod/tagrm.php:41 +msgid "Tag removed" msgstr "" -#: ../../mod/dfrn_notify.php:189 ../../mod/regmod.php:94 -#: ../../mod/register.php:333 ../../mod/register.php:373 -#: ../../mod/dfrn_request.php:551 ../../mod/lostpass.php:40 -#: ../../mod/lostpass.php:102 ../../mod/dfrn_confirm.php:657 -#: ../../include/items.php:1449 -msgid "Administrator" +#: ../../mod/tagrm.php:79 +msgid "Remove Item Tag" msgstr "" -#: ../../mod/dfrn_notify.php:191 ../../mod/dfrn_notify.php:396 -#: ../../mod/dfrn_notify.php:439 ../../mod/dfrn_notify.php:523 -#: ../../mod/dfrn_notify.php:564 ../../mod/item.php:471 ../../mod/item.php:514 -#: ../../mod/item.php:534 ../../mod/item.php:575 -msgid "noreply" +#: ../../mod/tagrm.php:81 +msgid "Select a tag to remove: " msgstr "" -#: ../../mod/dfrn_notify.php:249 -msgid "New mail received at " +#: ../../mod/tagrm.php:93 +msgid "Remove" msgstr "" -#: ../../mod/dfrn_notify.php:438 ../../mod/dfrn_notify.php:563 -#: ../../mod/item.php:513 ../../mod/item.php:574 -msgid "Administrator@" -msgstr "" - -#: ../../mod/dfrn_notify.php:441 ../../mod/dfrn_notify.php:566 -#: ../../mod/item.php:516 ../../mod/item.php:577 -msgid " commented on an item at " -msgstr "" - -#: ../../mod/profile.php:112 -msgid "Status" -msgstr "" - -#: ../../mod/profile.php:113 ../../mod/profperm.php:94 -#: ../../include/profile_advanced.php:7 -msgid "Profile" -msgstr "" - -#: ../../mod/profile.php:114 -msgid "Photos" -msgstr "" - -#: ../../mod/profile.php:262 ../../mod/display.php:147 -#: ../../mod/register.php:450 ../../mod/network.php:262 -msgid "" -"Shared content is covered by the Creative Commons Attribution 3.0 license." -msgstr "" - -#: ../../mod/follow.php:20 ../../mod/dfrn_request.php:340 -msgid "Disallowed profile URL." -msgstr "" - -#: ../../mod/follow.php:43 -msgid "The profile address specified does not provide adequate information." -msgstr "" - -#: ../../mod/follow.php:45 -msgid "No compatible communication protocols or feeds were discovered." -msgstr "" - -#: ../../mod/follow.php:47 -msgid "An author or name was not found." -msgstr "" - -#: ../../mod/follow.php:49 -msgid "No browser URL could be matched to this address." -msgstr "" - -#: ../../mod/follow.php:57 -msgid "" -"Limited profile. This person will be unable to receive direct/personal " -"notifications from you." -msgstr "" - -#: ../../mod/follow.php:112 -msgid "Unable to retrieve contact information." -msgstr "" - -#: ../../mod/follow.php:158 -msgid "following" -msgstr "" - -#: ../../mod/profile_photo.php:28 -msgid "Image uploaded but image cropping failed." -msgstr "" - -#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65 -#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:160 -#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:245 -#: ../../mod/photos.php:110 ../../mod/photos.php:535 ../../mod/photos.php:879 -#: ../../mod/photos.php:894 ../../mod/register.php:288 -#: ../../mod/register.php:295 ../../mod/register.php:302 -msgid "Profile Photos" -msgstr "" - -#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68 -#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:248 +#: ../../mod/dfrn_poll.php:90 ../../mod/dfrn_poll.php:516 #, php-format -msgid "Image size reduction [%s] failed." -msgstr "" - -#: ../../mod/profile_photo.php:95 -msgid "Unable to process image" -msgstr "" - -#: ../../mod/profile_photo.php:193 -msgid "Upload File:" -msgstr "" - -#: ../../mod/profile_photo.php:194 -msgid "Upload Profile Photo" -msgstr "" - -#: ../../mod/profile_photo.php:195 -msgid "Upload" -msgstr "" - -#: ../../mod/profile_photo.php:196 ../../mod/settings.php:398 -msgid "or" -msgstr "" - -#: ../../mod/profile_photo.php:196 -msgid "skip this step" -msgstr "" - -#: ../../mod/profile_photo.php:196 -msgid "select a photo from your photo albums" -msgstr "" - -#: ../../mod/profile_photo.php:209 -msgid "Crop Image" -msgstr "" - -#: ../../mod/profile_photo.php:210 -msgid "Please adjust the image cropping for optimum viewing." -msgstr "" - -#: ../../mod/profile_photo.php:211 -msgid "Done Editing" -msgstr "" - -#: ../../mod/profile_photo.php:239 -msgid "Image uploaded successfully." -msgstr "" - -#: ../../mod/home.php:23 -#, php-format -msgid "Welcome to %s" -msgstr "" - -#: ../../mod/regmod.php:10 -msgid "Please login." -msgstr "" - -#: ../../mod/regmod.php:54 -#, php-format -msgid "Registration revoked for %s" -msgstr "" - -#: ../../mod/regmod.php:92 ../../mod/register.php:331 -#, php-format -msgid "Registration details for %s" -msgstr "" - -#: ../../mod/regmod.php:99 -msgid "Account approved." -msgstr "" - -#: ../../mod/profiles.php:21 ../../mod/profiles.php:237 -#: ../../mod/profiles.php:342 ../../mod/dfrn_confirm.php:62 -msgid "Profile not found." -msgstr "" - -#: ../../mod/profiles.php:28 -msgid "Profile Name is required." -msgstr "" - -#: ../../mod/profiles.php:199 -msgid "Profile updated." -msgstr "" - -#: ../../mod/profiles.php:254 -msgid "Profile deleted." -msgstr "" - -#: ../../mod/profiles.php:270 ../../mod/profiles.php:301 -msgid "Profile-" -msgstr "" - -#: ../../mod/profiles.php:289 ../../mod/profiles.php:328 -msgid "New profile created." -msgstr "" - -#: ../../mod/profiles.php:307 -msgid "Profile unavailable to clone." -msgstr "" - -#: ../../mod/profiles.php:354 -msgid "Hide my contact/friend list from viewers of this profile?" -msgstr "" - -#: ../../mod/profiles.php:355 ../../mod/settings.php:350 -#: ../../mod/settings.php:362 ../../mod/register.php:444 -#: ../../mod/dfrn_request.php:634 -msgid "Yes" -msgstr "" - -#: ../../mod/profiles.php:356 ../../mod/settings.php:351 -#: ../../mod/settings.php:363 ../../mod/register.php:445 -#: ../../mod/dfrn_request.php:635 -msgid "No" -msgstr "" - -#: ../../mod/profiles.php:369 -msgid "Edit Profile Details" -msgstr "" - -#: ../../mod/profiles.php:371 -msgid "View this profile" -msgstr "" - -#: ../../mod/profiles.php:372 -msgid "Create a new profile using these settings" -msgstr "" - -#: ../../mod/profiles.php:373 -msgid "Clone this profile" -msgstr "" - -#: ../../mod/profiles.php:374 -msgid "Delete this profile" -msgstr "" - -#: ../../mod/profiles.php:375 -msgid "Profile Name:" -msgstr "" - -#: ../../mod/profiles.php:376 -msgid "Your Full Name:" -msgstr "" - -#: ../../mod/profiles.php:377 -msgid "Title/Description:" -msgstr "" - -#: ../../mod/profiles.php:378 -msgid "Your Gender:" -msgstr "" - -#: ../../mod/profiles.php:379 -msgid "Birthday (y/m/d):" -msgstr "" - -#: ../../mod/profiles.php:380 -msgid "Street Address:" -msgstr "" - -#: ../../mod/profiles.php:381 -msgid "Locality/City:" -msgstr "" - -#: ../../mod/profiles.php:382 -msgid "Postal/Zip Code:" -msgstr "" - -#: ../../mod/profiles.php:383 -msgid "Country:" -msgstr "" - -#: ../../mod/profiles.php:384 -msgid "Region/State:" -msgstr "" - -#: ../../mod/profiles.php:385 -msgid "♥ Marital Status:" -msgstr "" - -#: ../../mod/profiles.php:386 -msgid "Who: (if applicable)" -msgstr "" - -#: ../../mod/profiles.php:387 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" -msgstr "" - -#: ../../mod/profiles.php:388 ../../include/profile_advanced.php:90 -msgid "Sexual Preference:" -msgstr "" - -#: ../../mod/profiles.php:389 -msgid "Homepage URL:" -msgstr "" - -#: ../../mod/profiles.php:390 ../../include/profile_advanced.php:115 -msgid "Political Views:" -msgstr "" - -#: ../../mod/profiles.php:391 -msgid "Religious Views:" -msgstr "" - -#: ../../mod/profiles.php:392 -msgid "Public Keywords:" -msgstr "" - -#: ../../mod/profiles.php:393 -msgid "Private Keywords:" -msgstr "" - -#: ../../mod/profiles.php:394 -msgid "Example: fishing photography software" -msgstr "" - -#: ../../mod/profiles.php:395 -msgid "(Used for suggesting potential friends, can be seen by others)" -msgstr "" - -#: ../../mod/profiles.php:396 -msgid "(Used for searching profiles, never shown to others)" -msgstr "" - -#: ../../mod/profiles.php:397 -msgid "Tell us about yourself..." -msgstr "" - -#: ../../mod/profiles.php:398 -msgid "Hobbies/Interests" -msgstr "" - -#: ../../mod/profiles.php:399 -msgid "Contact information and Social Networks" -msgstr "" - -#: ../../mod/profiles.php:400 -msgid "Musical interests" -msgstr "" - -#: ../../mod/profiles.php:401 -msgid "Books, literature" -msgstr "" - -#: ../../mod/profiles.php:402 -msgid "Television" -msgstr "" - -#: ../../mod/profiles.php:403 -msgid "Film/dance/culture/entertainment" -msgstr "" - -#: ../../mod/profiles.php:404 -msgid "Love/romance" -msgstr "" - -#: ../../mod/profiles.php:405 -msgid "Work/employment" -msgstr "" - -#: ../../mod/profiles.php:406 -msgid "School/education" -msgstr "" - -#: ../../mod/profiles.php:411 -msgid "" -"This is your public profile.
It may " -"be visible to anybody using the internet." -msgstr "" - -#: ../../mod/profiles.php:421 ../../mod/directory.php:112 -msgid "Age: " -msgstr "" - -#: ../../mod/profiles.php:456 ../../include/nav.php:108 -msgid "Profiles" -msgstr "" - -#: ../../mod/profiles.php:457 -msgid "Change profile photo" -msgstr "" - -#: ../../mod/profiles.php:458 -msgid "Create New Profile" -msgstr "" - -#: ../../mod/profiles.php:468 -msgid "Profile Image" -msgstr "" - -#: ../../mod/profiles.php:470 -msgid "Visible to everybody" -msgstr "" - -#: ../../mod/profiles.php:471 -msgid "Edit visibility" -msgstr "" - -#: ../../mod/settings.php:38 -msgid "Passwords do not match. Password unchanged." -msgstr "" - -#: ../../mod/settings.php:43 -msgid "Empty passwords are not allowed. Password unchanged." -msgstr "" - -#: ../../mod/settings.php:54 -msgid "Password changed." -msgstr "" - -#: ../../mod/settings.php:56 -msgid "Password update failed. Please try again." -msgstr "" - -#: ../../mod/settings.php:138 -msgid " Please use a shorter name." -msgstr "" - -#: ../../mod/settings.php:140 -msgid " Name too short." -msgstr "" - -#: ../../mod/settings.php:146 -msgid " Not valid email." -msgstr "" - -#: ../../mod/settings.php:148 -msgid " Cannot change to that email." -msgstr "" - -#: ../../mod/settings.php:206 -msgid "Settings updated." -msgstr "" - -#: ../../mod/settings.php:256 ../../mod/settings.php:418 -#: ../../addon/widgets/widgets.php:120 -msgid "Plugin Settings" -msgstr "" - -#: ../../mod/settings.php:257 ../../mod/settings.php:417 -msgid "Account Settings" -msgstr "" - -#: ../../mod/settings.php:263 -msgid "No Plugin settings configured" -msgstr "" - -#: ../../mod/settings.php:323 -msgid "Normal Account" -msgstr "" - -#: ../../mod/settings.php:324 -msgid "This account is a normal personal profile" -msgstr "" - -#: ../../mod/settings.php:325 -msgid "Soapbox Account" -msgstr "" - -#: ../../mod/settings.php:326 -msgid "Automatically approve all connection/friend requests as read-only fans" -msgstr "" - -#: ../../mod/settings.php:327 -msgid "Community/Celebrity Account" -msgstr "" - -#: ../../mod/settings.php:328 -msgid "Automatically approve all connection/friend requests as read-write fans" -msgstr "" - -#: ../../mod/settings.php:329 -msgid "Automatic Friend Account" -msgstr "" - -#: ../../mod/settings.php:330 -msgid "Automatically approve all connection/friend requests as friends" -msgstr "" - -#: ../../mod/settings.php:339 -msgid "OpenID: " -msgstr "" - -#: ../../mod/settings.php:339 -msgid " (Optional) Allow this OpenID to login to this account." -msgstr "" - -#: ../../mod/settings.php:349 -msgid "Publish your default profile in site directory?" -msgstr "" - -#: ../../mod/settings.php:361 -msgid "Publish your default profile in global social directory?" -msgstr "" - -#: ../../mod/settings.php:377 -msgid "Profile is not published." -msgstr "" - -#: ../../mod/settings.php:403 -msgid "Your Identity Address is" -msgstr "" - -#: ../../mod/settings.php:413 -msgid "Export Personal Data" -msgstr "" - -#: ../../mod/settings.php:419 -msgid "Basic Settings" -msgstr "" - -#: ../../mod/settings.php:420 ../../include/profile_advanced.php:10 -msgid "Full Name:" -msgstr "" - -#: ../../mod/settings.php:421 -msgid "Email Address:" -msgstr "" - -#: ../../mod/settings.php:422 -msgid "Your Timezone:" -msgstr "" - -#: ../../mod/settings.php:423 -msgid "Default Post Location:" -msgstr "" - -#: ../../mod/settings.php:424 -msgid "Use Browser Location:" -msgstr "" - -#: ../../mod/settings.php:425 -msgid "Display Theme:" -msgstr "" - -#: ../../mod/settings.php:427 -msgid "Security and Privacy Settings" -msgstr "" - -#: ../../mod/settings.php:428 -msgid "Maximum Friend Requests/Day:" -msgstr "" - -#: ../../mod/settings.php:429 -msgid "(to prevent spam abuse)" -msgstr "" - -#: ../../mod/settings.php:430 -msgid "Allow friends to post to your profile page:" -msgstr "" - -#: ../../mod/settings.php:431 -msgid "Automatically expire (delete) posts older than" -msgstr "" - -#: ../../mod/settings.php:432 ../../include/datetime.php:154 -msgid "days" -msgstr "" - -#: ../../mod/settings.php:433 -msgid "Notification Settings" -msgstr "" - -#: ../../mod/settings.php:434 -msgid "Send a notification email when:" -msgstr "" - -#: ../../mod/settings.php:435 -msgid "You receive an introduction" -msgstr "" - -#: ../../mod/settings.php:436 -msgid "Your introductions are confirmed" -msgstr "" - -#: ../../mod/settings.php:437 -msgid "Someone writes on your profile wall" -msgstr "" - -#: ../../mod/settings.php:438 -msgid "Someone writes a followup comment" -msgstr "" - -#: ../../mod/settings.php:439 -msgid "You receive a private message" -msgstr "" - -#: ../../mod/settings.php:440 -msgid "Password Settings" -msgstr "" - -#: ../../mod/settings.php:441 -msgid "Leave password fields blank unless changing" -msgstr "" - -#: ../../mod/settings.php:442 -msgid "New Password:" -msgstr "" - -#: ../../mod/settings.php:443 -msgid "Confirm:" -msgstr "" - -#: ../../mod/settings.php:444 -msgid "Advanced Page Settings" -msgstr "" - -#: ../../mod/settings.php:459 -msgid "Default Post Permissions" -msgstr "" - -#: ../../mod/settings.php:460 -msgid "(click to open/close)" -msgstr "" - -#: ../../mod/settings.php:473 -msgid "Email/Mailbox Setup" -msgstr "" - -#: ../../mod/settings.php:474 -msgid "" -"If you wish to communicate with email contacts using this service " -"(optional), please specify how to connect to your mailbox." -msgstr "" - -#: ../../mod/settings.php:475 -msgid "IMAP server name:" -msgstr "" - -#: ../../mod/settings.php:477 -msgid "IMAP port:" -msgstr "" - -#: ../../mod/settings.php:479 -msgid "Security (TLS or SSL):" -msgstr "" - -#: ../../mod/settings.php:481 -msgid "Email login name:" -msgstr "" - -#: ../../mod/settings.php:483 -msgid "Email password:" -msgstr "" - -#: ../../mod/settings.php:484 -msgid "Reply-to address (Optional):" -msgstr "" - -#: ../../mod/settings.php:486 -msgid "Send public posts to all email contacts:" -msgstr "" - -#: ../../mod/settings.php:488 -msgid "Email access is disabled on this site." -msgstr "" - -#: ../../mod/search.php:13 ../../mod/photos.php:680 ../../mod/display.php:7 -#: ../../mod/dfrn_request.php:591 ../../mod/directory.php:20 -#: ../../mod/viewcontacts.php:16 -msgid "Public access denied." -msgstr "" - -#: ../../mod/search.php:69 -msgid "No results." +msgid "%s welcomes %s" msgstr "" #: ../../mod/photos.php:34 @@ -1000,6 +175,15 @@ msgstr "" msgid "Contact information unavailable" msgstr "" +#: ../../mod/photos.php:110 ../../mod/photos.php:535 ../../mod/photos.php:879 +#: ../../mod/photos.php:894 ../../mod/register.php:290 +#: ../../mod/register.php:297 ../../mod/register.php:304 +#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65 +#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:160 +#: ../../mod/profile_photo.php:236 ../../mod/profile_photo.php:245 +msgid "Profile Photos" +msgstr "" + #: ../../mod/photos.php:120 msgid "Album not found." msgstr "" @@ -1029,6 +213,22 @@ msgstr "" msgid "Image exceeds size limit of " msgstr "" +#: ../../mod/photos.php:577 ../../mod/profile_photo.php:118 +#: ../../mod/wall_upload.php:65 +msgid "Unable to process image." +msgstr "" + +#: ../../mod/photos.php:597 ../../mod/profile_photo.php:241 +#: ../../mod/wall_upload.php:82 +msgid "Image upload failed." +msgstr "" + +#: ../../mod/photos.php:680 ../../mod/dfrn_request.php:591 +#: ../../mod/viewcontacts.php:16 ../../mod/display.php:7 +#: ../../mod/search.php:13 ../../mod/directory.php:20 +msgid "Public access denied." +msgstr "" + #: ../../mod/photos.php:690 msgid "No photos selected" msgstr "" @@ -1069,7 +269,7 @@ msgstr "" msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:993 ../../include/conversation.php:314 +#: ../../mod/photos.php:993 ../../include/conversation.php:316 msgid "Private Message" msgstr "" @@ -1109,32 +309,38 @@ msgstr "" msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1113 ../../include/conversation.php:362 +#: ../../mod/photos.php:1113 ../../include/conversation.php:364 msgid "I like this (toggle)" msgstr "" -#: ../../mod/photos.php:1114 ../../include/conversation.php:363 +#: ../../mod/photos.php:1114 ../../include/conversation.php:365 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1115 ../../include/conversation.php:364 -#: ../../include/conversation.php:726 +#: ../../mod/photos.php:1115 ../../include/conversation.php:366 +#: ../../include/conversation.php:731 msgid "Share" msgstr "" -#: ../../mod/photos.php:1116 ../../mod/editpost.php:96 +#: ../../mod/photos.php:1116 ../../mod/editpost.php:97 #: ../../mod/message.php:190 ../../mod/message.php:324 -#: ../../include/conversation.php:365 ../../include/conversation.php:735 +#: ../../include/conversation.php:367 ../../include/conversation.php:741 msgid "Please wait" msgstr "" #: ../../mod/photos.php:1132 ../../mod/photos.php:1171 -#: ../../mod/photos.php:1202 ../../include/conversation.php:378 +#: ../../mod/photos.php:1202 ../../include/conversation.php:380 msgid "This is you" msgstr "" +#: ../../mod/photos.php:1134 ../../mod/photos.php:1173 +#: ../../mod/photos.php:1204 ../../include/conversation.php:382 +#: ../../boot.php:386 +msgid "Comment" +msgstr "" + #: ../../mod/photos.php:1232 ../../mod/group.php:146 -#: ../../include/conversation.php:179 ../../include/conversation.php:391 +#: ../../include/conversation.php:179 ../../include/conversation.php:393 msgid "Delete" msgstr "" @@ -1150,14 +356,6 @@ msgstr "" msgid "View Album" msgstr "" -#: ../../mod/display.php:25 ../../mod/display.php:142 ../../mod/item.php:680 -msgid "Item not found." -msgstr "" - -#: ../../mod/display.php:135 -msgid "Item has been removed." -msgstr "" - #: ../../mod/editpost.php:17 ../../mod/editpost.php:27 msgid "Item not found" msgstr "" @@ -1166,481 +364,248 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:75 ../../include/conversation.php:712 +#: ../../mod/editpost.php:75 ../../include/conversation.php:717 msgid "Post to Email" msgstr "" -#: ../../mod/editpost.php:88 ../../include/conversation.php:389 -#: ../../include/group.php:169 +#: ../../mod/editpost.php:88 ../../include/group.php:169 +#: ../../include/conversation.php:391 msgid "Edit" msgstr "" #: ../../mod/editpost.php:89 ../../mod/message.php:188 -#: ../../mod/message.php:322 ../../include/conversation.php:727 +#: ../../mod/message.php:322 ../../include/conversation.php:732 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:90 ../../mod/message.php:189 -#: ../../mod/message.php:323 ../../include/conversation.php:728 +#: ../../mod/editpost.php:90 ../../include/conversation.php:733 +msgid "Attach file" +msgstr "" + +#: ../../mod/editpost.php:91 ../../mod/message.php:189 +#: ../../mod/message.php:323 ../../include/conversation.php:734 msgid "Insert web link" msgstr "" -#: ../../mod/editpost.php:91 ../../include/conversation.php:729 +#: ../../mod/editpost.php:92 ../../include/conversation.php:735 msgid "Insert YouTube video" msgstr "" -#: ../../mod/editpost.php:92 ../../include/conversation.php:730 +#: ../../mod/editpost.php:93 ../../include/conversation.php:736 msgid "Insert Vorbis [.ogg] video" msgstr "" -#: ../../mod/editpost.php:93 ../../include/conversation.php:731 +#: ../../mod/editpost.php:94 ../../include/conversation.php:737 msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/editpost.php:94 ../../include/conversation.php:732 +#: ../../mod/editpost.php:95 ../../include/conversation.php:738 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:95 ../../include/conversation.php:733 +#: ../../mod/editpost.php:96 ../../include/conversation.php:739 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:97 ../../include/conversation.php:736 +#: ../../mod/editpost.php:98 ../../include/conversation.php:742 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:105 ../../include/conversation.php:744 +#: ../../mod/editpost.php:106 ../../include/conversation.php:750 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:106 ../../include/conversation.php:745 +#: ../../mod/editpost.php:107 ../../include/conversation.php:751 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:108 ../../include/conversation.php:747 +#: ../../mod/editpost.php:109 ../../include/conversation.php:753 msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../mod/update_network.php:22 ../../mod/update_profile.php:41 -msgid "[Embedded content - reload page to view]" +#: ../../mod/dfrn_request.php:96 +msgid "This introduction has already been accepted." msgstr "" -#: ../../mod/invite.php:28 -#, php-format -msgid "%s : Not a valid email address." +#: ../../mod/dfrn_request.php:120 ../../mod/dfrn_request.php:351 +msgid "Profile location is not valid or does not contain profile information." msgstr "" -#: ../../mod/invite.php:32 -#, php-format -msgid "Please join my network on %s" +#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:356 +msgid "Warning: profile location has no identifiable owner name." msgstr "" -#: ../../mod/invite.php:42 -#, php-format -msgid "%s : Message delivery failed." +#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:358 +msgid "Warning: profile location has no profile photo." msgstr "" -#: ../../mod/invite.php:46 +#: ../../mod/dfrn_request.php:130 ../../mod/dfrn_request.php:361 #, php-format -msgid "%d message sent." -msgid_plural "%d messages sent." +msgid "%d required parameter was not found at the given location" +msgid_plural "%d required parameters were not found at the given location" msgstr[0] "" msgstr[1] "" -#: ../../mod/invite.php:61 -msgid "Send invitations" +#: ../../mod/dfrn_request.php:168 +msgid "Introduction complete." msgstr "" -#: ../../mod/invite.php:62 -msgid "Enter email addresses, one per line:" +#: ../../mod/dfrn_request.php:192 +msgid "Unrecoverable protocol error." msgstr "" -#: ../../mod/invite.php:63 ../../mod/message.php:185 ../../mod/message.php:319 -msgid "Your message:" +#: ../../mod/dfrn_request.php:220 +msgid "Profile unavailable." msgstr "" -#: ../../mod/invite.php:64 +#: ../../mod/dfrn_request.php:245 #, php-format -msgid "Please join my social network on %s" +msgid "%s has received too many connection requests today." msgstr "" -#: ../../mod/invite.php:65 -msgid "To accept this invitation, please visit:" +#: ../../mod/dfrn_request.php:246 +msgid "Spam protection measures have been invoked." msgstr "" -#: ../../mod/invite.php:66 -msgid "" -"Once you have registered, please connect with me via my profile page at:" +#: ../../mod/dfrn_request.php:247 +msgid "Friends are advised to please try again in 24 hours." msgstr "" -#: ../../mod/contacts.php:12 -msgid "Invite Friends" +#: ../../mod/dfrn_request.php:277 +msgid "Invalid locator" msgstr "" -#: ../../mod/contacts.php:15 -msgid "Find People With Shared Interests" +#: ../../mod/dfrn_request.php:296 +msgid "Unable to resolve your name at the provided location." msgstr "" -#: ../../mod/contacts.php:19 -msgid "Connect/Follow" +#: ../../mod/dfrn_request.php:309 +msgid "You have already introduced yourself here." msgstr "" -#: ../../mod/contacts.php:20 -msgid "Example: bob@example.com, http://example.com/barbara" +#: ../../mod/dfrn_request.php:313 +#, php-format +msgid "Apparently you are already friends with %s." msgstr "" -#: ../../mod/contacts.php:21 -msgid "Follow" +#: ../../mod/dfrn_request.php:334 +msgid "Invalid profile URL." msgstr "" -#: ../../mod/contacts.php:43 ../../mod/contacts.php:124 -msgid "Could not access contact record." +#: ../../mod/dfrn_request.php:340 ../../mod/follow.php:20 +msgid "Disallowed profile URL." msgstr "" -#: ../../mod/contacts.php:57 -msgid "Could not locate selected profile." -msgstr "" - -#: ../../mod/contacts.php:88 -msgid "Contact updated." -msgstr "" - -#: ../../mod/contacts.php:90 ../../mod/dfrn_request.php:406 +#: ../../mod/dfrn_request.php:406 ../../mod/contacts.php:90 msgid "Failed to update contact record." msgstr "" -#: ../../mod/contacts.php:146 -msgid "Contact has been blocked" +#: ../../mod/dfrn_request.php:427 +msgid "Your introduction has been sent." msgstr "" -#: ../../mod/contacts.php:146 -msgid "Contact has been unblocked" +#: ../../mod/dfrn_request.php:481 +msgid "Please login to confirm introduction." msgstr "" -#: ../../mod/contacts.php:160 -msgid "Contact has been ignored" +#: ../../mod/dfrn_request.php:495 +msgid "" +"Incorrect identity currently logged in. Please login to this profile." msgstr "" -#: ../../mod/contacts.php:160 -msgid "Contact has been unignored" -msgstr "" - -#: ../../mod/contacts.php:181 -msgid "stopped following" -msgstr "" - -#: ../../mod/contacts.php:200 -msgid "Contact has been removed." -msgstr "" - -#: ../../mod/contacts.php:214 ../../mod/crepair.php:68 -#: ../../mod/dfrn_confirm.php:114 -msgid "Contact not found." -msgstr "" - -#: ../../mod/contacts.php:228 ../../mod/contacts.php:363 -msgid "Mutual Friendship" -msgstr "" - -#: ../../mod/contacts.php:232 ../../mod/contacts.php:367 -msgid "is a fan of yours" -msgstr "" - -#: ../../mod/contacts.php:237 ../../mod/contacts.php:371 -msgid "you are a fan of" -msgstr "" - -#: ../../mod/contacts.php:252 -msgid "Privacy Unavailable" -msgstr "" - -#: ../../mod/contacts.php:253 -msgid "Private communications are not available for this contact." -msgstr "" - -#: ../../mod/contacts.php:256 -msgid "Never" -msgstr "" - -#: ../../mod/contacts.php:260 -msgid "(Update was successful)" -msgstr "" - -#: ../../mod/contacts.php:260 -msgid "(Update was not successful)" -msgstr "" - -#: ../../mod/contacts.php:263 -msgid "Contact Editor" -msgstr "" - -#: ../../mod/contacts.php:265 -msgid "Profile Visibility" -msgstr "" - -#: ../../mod/contacts.php:266 +#: ../../mod/dfrn_request.php:507 #, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." +msgid "Welcome home %s." msgstr "" -#: ../../mod/contacts.php:267 -msgid "Contact Information / Notes" -msgstr "" - -#: ../../mod/contacts.php:268 -msgid "Online Reputation" -msgstr "" - -#: ../../mod/contacts.php:269 -msgid "" -"Occasionally your friends may wish to inquire about this person's online " -"legitimacy." -msgstr "" - -#: ../../mod/contacts.php:270 -msgid "" -"You may help them choose whether or not to interact with this person by " -"providing a reputation to guide them." -msgstr "" - -#: ../../mod/contacts.php:271 -msgid "" -"Please take a moment to elaborate on this selection if you feel it could be " -"helpful to others." -msgstr "" - -#: ../../mod/contacts.php:272 -msgid "Visit $name's profile" -msgstr "" - -#: ../../mod/contacts.php:273 -msgid "Block/Unblock contact" -msgstr "" - -#: ../../mod/contacts.php:274 -msgid "Ignore contact" -msgstr "" - -#: ../../mod/contacts.php:275 -msgid "Repair contact URL settings" -msgstr "" - -#: ../../mod/contacts.php:276 -msgid "Repair contact URL settings (WARNING: Advanced)" -msgstr "" - -#: ../../mod/contacts.php:277 -msgid "View conversations" -msgstr "" - -#: ../../mod/contacts.php:278 -msgid "Delete contact" -msgstr "" - -#: ../../mod/contacts.php:280 -msgid "Last updated: " -msgstr "" - -#: ../../mod/contacts.php:281 -msgid "Update public posts: " -msgstr "" - -#: ../../mod/contacts.php:283 -msgid "Update now" -msgstr "" - -#: ../../mod/contacts.php:286 -msgid "Unblock this contact" -msgstr "" - -#: ../../mod/contacts.php:286 -msgid "Block this contact" -msgstr "" - -#: ../../mod/contacts.php:287 -msgid "Unignore this contact" -msgstr "" - -#: ../../mod/contacts.php:287 -msgid "Ignore this contact" -msgstr "" - -#: ../../mod/contacts.php:290 -msgid "Currently blocked" -msgstr "" - -#: ../../mod/contacts.php:291 -msgid "Currently ignored" -msgstr "" - -#: ../../mod/contacts.php:322 ../../include/acl_selectors.php:141 -#: ../../include/acl_selectors.php:156 ../../include/nav.php:109 -msgid "Contacts" -msgstr "" - -#: ../../mod/contacts.php:324 -msgid "Show Blocked Connections" -msgstr "" - -#: ../../mod/contacts.php:324 -msgid "Hide Blocked Connections" -msgstr "" - -#: ../../mod/contacts.php:326 ../../mod/directory.php:55 -msgid "Finding: " -msgstr "" - -#: ../../mod/contacts.php:327 ../../mod/directory.php:57 -msgid "Find" -msgstr "" - -#: ../../mod/contacts.php:387 ../../mod/viewcontacts.php:52 -msgid "Visit $username's profile" -msgstr "" - -#: ../../mod/contacts.php:388 ../../include/conversation.php:592 -msgid "Edit contact" -msgstr "" - -#: ../../mod/lockview.php:39 -msgid "Remote privacy information not available." -msgstr "" - -#: ../../mod/lockview.php:43 -msgid "Visible to:" -msgstr "" - -#: ../../mod/register.php:47 -msgid "Invalid OpenID url" -msgstr "" - -#: ../../mod/register.php:62 -msgid "Please enter the required information." -msgstr "" - -#: ../../mod/register.php:74 -msgid "Please use a shorter name." -msgstr "" - -#: ../../mod/register.php:76 -msgid "Name too short." -msgstr "" - -#: ../../mod/register.php:91 -msgid "That doesn't appear to be your full (First Last) name." -msgstr "" - -#: ../../mod/register.php:95 -msgid "Your email domain is not among those allowed on this site." -msgstr "" - -#: ../../mod/register.php:98 -msgid "Not a valid email address." -msgstr "" - -#: ../../mod/register.php:104 -msgid "Cannot use that email." -msgstr "" - -#: ../../mod/register.php:109 -msgid "" -"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and " -"must also begin with a letter." -msgstr "" - -#: ../../mod/register.php:115 ../../mod/register.php:215 -msgid "Nickname is already registered. Please choose another." -msgstr "" - -#: ../../mod/register.php:134 -msgid "SERIOUS ERROR: Generation of security keys failed." -msgstr "" - -#: ../../mod/register.php:201 -msgid "An error occurred during registration. Please try again." -msgstr "" - -#: ../../mod/register.php:237 -msgid "An error occurred creating your default profile. Please try again." -msgstr "" - -#: ../../mod/register.php:339 -msgid "" -"Registration successful. Please check your email for further instructions." -msgstr "" - -#: ../../mod/register.php:343 -msgid "Failed to send email message. Here is the message that failed." -msgstr "" - -#: ../../mod/register.php:348 -msgid "Your registration can not be processed." -msgstr "" - -#: ../../mod/register.php:371 +#: ../../mod/dfrn_request.php:508 #, php-format -msgid "Registration request at %s" +msgid "Please confirm your introduction/connection request to %s." msgstr "" -#: ../../mod/register.php:377 -msgid "Your registration is pending approval by the site owner." +#: ../../mod/dfrn_request.php:509 +msgid "Confirm" msgstr "" -#: ../../mod/register.php:425 +#: ../../mod/dfrn_request.php:542 ../../include/items.php:1440 +msgid "[Name Withheld]" +msgstr "" + +#: ../../mod/dfrn_request.php:549 +msgid "Introduction received at " +msgstr "" + +#: ../../mod/dfrn_request.php:551 ../../mod/lostpass.php:40 +#: ../../mod/lostpass.php:102 ../../mod/register.php:335 +#: ../../mod/register.php:385 ../../mod/regmod.php:98 +#: ../../mod/dfrn_notify.php:191 ../../mod/dfrn_notify.php:443 +#: ../../mod/dfrn_confirm.php:658 ../../include/items.php:1449 +msgid "Administrator" +msgstr "" + +#: ../../mod/dfrn_request.php:630 +msgid "Friend/Connection Request" +msgstr "" + +#: ../../mod/dfrn_request.php:631 msgid "" -"You may (optionally) fill in this form via OpenID by supplying your OpenID " -"and clicking 'Register'." +"Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, " +"testuser@identi.ca" msgstr "" -#: ../../mod/register.php:426 +#: ../../mod/dfrn_request.php:632 +msgid "Please answer the following:" +msgstr "" + +#: ../../mod/dfrn_request.php:633 +msgid "Does $name know you?" +msgstr "" + +#: ../../mod/dfrn_request.php:634 ../../mod/settings.php:350 +#: ../../mod/settings.php:362 ../../mod/register.php:459 +#: ../../mod/profiles.php:358 ../../mod/profiles.php:367 +msgid "Yes" +msgstr "" + +#: ../../mod/dfrn_request.php:635 ../../mod/settings.php:351 +#: ../../mod/settings.php:363 ../../mod/register.php:460 +#: ../../mod/profiles.php:359 ../../mod/profiles.php:368 +msgid "No" +msgstr "" + +#: ../../mod/dfrn_request.php:636 +msgid "Add a personal note:" +msgstr "" + +#: ../../mod/dfrn_request.php:637 msgid "" -"If you are not familiar with OpenID, please leave that field blank and fill " -"in the rest of the items." +"Please enter your 'Identity Address' from one of the following supported " +"social networks:" msgstr "" -#: ../../mod/register.php:427 -msgid "Your OpenID (optional): " +#: ../../mod/dfrn_request.php:638 +msgid "Friendika" msgstr "" -#: ../../mod/register.php:441 -msgid "Include your profile in member directory?" +#: ../../mod/dfrn_request.php:639 +msgid "StatusNet/Federated Social Web" msgstr "" -#: ../../mod/register.php:457 -msgid "Registration" +#: ../../mod/dfrn_request.php:640 +msgid "Private (secure) network" msgstr "" -#: ../../mod/register.php:465 -msgid "Your Full Name (e.g. Joe Smith): " +#: ../../mod/dfrn_request.php:641 +msgid "Public (insecure) network" msgstr "" -#: ../../mod/register.php:466 -msgid "Your Email Address: " +#: ../../mod/dfrn_request.php:642 +msgid "Your Identity Address:" msgstr "" -#: ../../mod/register.php:467 -msgid "" -"Choose a profile nickname. This must begin with a text character. Your " -"profile address on this site will then be 'nickname@$sitename'." -msgstr "" - -#: ../../mod/register.php:468 -msgid "Choose a nickname: " -msgstr "" - -#: ../../mod/oexchange.php:27 -msgid "Post successful." -msgstr "" - -#: ../../mod/help.php:27 -msgid "Help:" -msgstr "" - -#: ../../mod/help.php:31 ../../include/nav.php:64 -msgid "Help" +#: ../../mod/dfrn_request.php:643 +msgid "Submit Request" msgstr "" #: ../../mod/install.php:33 @@ -1820,68 +785,25 @@ msgstr "" msgid "Errors encountered creating database tables." msgstr "" -#: ../../mod/network.php:18 -msgid "Normal View" +#: ../../mod/match.php:10 +msgid "Profile Match" msgstr "" -#: ../../mod/network.php:20 -msgid "New Item View" +#: ../../mod/match.php:50 +msgid "No matches" msgstr "" -#: ../../mod/network.php:64 +#: ../../mod/lockview.php:39 +msgid "Remote privacy information not available." +msgstr "" + +#: ../../mod/lockview.php:43 +msgid "Visible to:" +msgstr "" + +#: ../../mod/home.php:23 #, php-format -msgid "Warning: This group contains %s member from an insecure network." -msgid_plural "" -"Warning: This group contains %s members from an insecure network." -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/network.php:67 -msgid "Private messages to this group are at risk of public disclosure." -msgstr "" - -#: ../../mod/network.php:129 -msgid "No such group" -msgstr "" - -#: ../../mod/network.php:140 -msgid "Group is empty" -msgstr "" - -#: ../../mod/network.php:144 -msgid "Group: " -msgstr "" - -#: ../../mod/network.php:154 -msgid "Contact: " -msgstr "" - -#: ../../mod/network.php:156 -msgid "Private messages to this person are at risk of public disclosure." -msgstr "" - -#: ../../mod/network.php:161 -msgid "Invalid contact." -msgstr "" - -#: ../../mod/profperm.php:25 ../../mod/profperm.php:46 -msgid "Invalid profile identifier." -msgstr "" - -#: ../../mod/profperm.php:92 -msgid "Profile Visibility Editor" -msgstr "" - -#: ../../mod/profperm.php:96 ../../mod/group.php:156 -msgid "Click on a contact to add or remove." -msgstr "" - -#: ../../mod/profperm.php:105 -msgid "Visible To" -msgstr "" - -#: ../../mod/profperm.php:116 -msgid "All Contacts (with secure profile access)" +msgid "Welcome to %s" msgstr "" #: ../../mod/notifications.php:28 @@ -1964,234 +886,226 @@ msgstr "" msgid "No registrations." msgstr "" -#: ../../mod/crepair.php:42 -msgid "Contact settings applied." +#: ../../mod/contacts.php:12 +msgid "Invite Friends" msgstr "" -#: ../../mod/crepair.php:44 -msgid "Contact update failed." +#: ../../mod/contacts.php:15 +msgid "Find People With Shared Interests" msgstr "" -#: ../../mod/crepair.php:74 -msgid "Repair Contact Settings" +#: ../../mod/contacts.php:19 +msgid "Connect/Follow" msgstr "" -#: ../../mod/crepair.php:76 +#: ../../mod/contacts.php:20 +msgid "Example: bob@example.com, http://example.com/barbara" +msgstr "" + +#: ../../mod/contacts.php:21 +msgid "Follow" +msgstr "" + +#: ../../mod/contacts.php:43 ../../mod/contacts.php:124 +msgid "Could not access contact record." +msgstr "" + +#: ../../mod/contacts.php:57 +msgid "Could not locate selected profile." +msgstr "" + +#: ../../mod/contacts.php:88 +msgid "Contact updated." +msgstr "" + +#: ../../mod/contacts.php:146 +msgid "Contact has been blocked" +msgstr "" + +#: ../../mod/contacts.php:146 +msgid "Contact has been unblocked" +msgstr "" + +#: ../../mod/contacts.php:160 +msgid "Contact has been ignored" +msgstr "" + +#: ../../mod/contacts.php:160 +msgid "Contact has been unignored" +msgstr "" + +#: ../../mod/contacts.php:181 +msgid "stopped following" +msgstr "" + +#: ../../mod/contacts.php:200 +msgid "Contact has been removed." +msgstr "" + +#: ../../mod/contacts.php:228 ../../mod/contacts.php:363 +msgid "Mutual Friendship" +msgstr "" + +#: ../../mod/contacts.php:232 ../../mod/contacts.php:367 +msgid "is a fan of yours" +msgstr "" + +#: ../../mod/contacts.php:237 ../../mod/contacts.php:371 +msgid "you are a fan of" +msgstr "" + +#: ../../mod/contacts.php:252 +msgid "Privacy Unavailable" +msgstr "" + +#: ../../mod/contacts.php:253 +msgid "Private communications are not available for this contact." +msgstr "" + +#: ../../mod/contacts.php:256 +msgid "Never" +msgstr "" + +#: ../../mod/contacts.php:260 +msgid "(Update was successful)" +msgstr "" + +#: ../../mod/contacts.php:260 +msgid "(Update was not successful)" +msgstr "" + +#: ../../mod/contacts.php:263 +msgid "Contact Editor" +msgstr "" + +#: ../../mod/contacts.php:265 +msgid "Profile Visibility" +msgstr "" + +#: ../../mod/contacts.php:266 +#, php-format msgid "" -"WARNING: This is highly advanced and if you enter incorrect " -"information your communications with this contact will stop working." +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." msgstr "" -#: ../../mod/crepair.php:77 +#: ../../mod/contacts.php:267 +msgid "Contact Information / Notes" +msgstr "" + +#: ../../mod/contacts.php:268 +msgid "Online Reputation" +msgstr "" + +#: ../../mod/contacts.php:269 msgid "" -"Please use your browser 'Back' button now if you are " -"uncertain what to do on this page." +"Occasionally your friends may wish to inquire about this person's online " +"legitimacy." msgstr "" -#: ../../mod/crepair.php:85 -msgid "Name" -msgstr "" - -#: ../../mod/crepair.php:86 -msgid "Account Nickname" -msgstr "" - -#: ../../mod/crepair.php:87 -msgid "Account URL" -msgstr "" - -#: ../../mod/crepair.php:88 -msgid "Friend Request URL" -msgstr "" - -#: ../../mod/crepair.php:89 -msgid "Friend Confirm URL" -msgstr "" - -#: ../../mod/crepair.php:90 -msgid "Notification Endpoint URL" -msgstr "" - -#: ../../mod/crepair.php:91 -msgid "Poll/Feed URL" -msgstr "" - -#: ../../mod/dfrn_request.php:96 -msgid "This introduction has already been accepted." -msgstr "" - -#: ../../mod/dfrn_request.php:120 ../../mod/dfrn_request.php:351 -msgid "Profile location is not valid or does not contain profile information." -msgstr "" - -#: ../../mod/dfrn_request.php:125 ../../mod/dfrn_request.php:356 -msgid "Warning: profile location has no identifiable owner name." -msgstr "" - -#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:358 -msgid "Warning: profile location has no profile photo." -msgstr "" - -#: ../../mod/dfrn_request.php:130 ../../mod/dfrn_request.php:361 -#, php-format -msgid "%d required parameter was not found at the given location" -msgid_plural "%d required parameters were not found at the given location" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/dfrn_request.php:168 -msgid "Introduction complete." -msgstr "" - -#: ../../mod/dfrn_request.php:192 -msgid "Unrecoverable protocol error." -msgstr "" - -#: ../../mod/dfrn_request.php:220 -msgid "Profile unavailable." -msgstr "" - -#: ../../mod/dfrn_request.php:245 -#, php-format -msgid "%s has received too many connection requests today." -msgstr "" - -#: ../../mod/dfrn_request.php:246 -msgid "Spam protection measures have been invoked." -msgstr "" - -#: ../../mod/dfrn_request.php:247 -msgid "Friends are advised to please try again in 24 hours." -msgstr "" - -#: ../../mod/dfrn_request.php:277 -msgid "Invalid locator" -msgstr "" - -#: ../../mod/dfrn_request.php:296 -msgid "Unable to resolve your name at the provided location." -msgstr "" - -#: ../../mod/dfrn_request.php:309 -msgid "You have already introduced yourself here." -msgstr "" - -#: ../../mod/dfrn_request.php:313 -#, php-format -msgid "Apparently you are already friends with %s." -msgstr "" - -#: ../../mod/dfrn_request.php:334 -msgid "Invalid profile URL." -msgstr "" - -#: ../../mod/dfrn_request.php:427 -msgid "Your introduction has been sent." -msgstr "" - -#: ../../mod/dfrn_request.php:481 -msgid "Please login to confirm introduction." -msgstr "" - -#: ../../mod/dfrn_request.php:495 +#: ../../mod/contacts.php:270 msgid "" -"Incorrect identity currently logged in. Please login to this profile." +"You may help them choose whether or not to interact with this person by " +"providing a reputation to guide them." msgstr "" -#: ../../mod/dfrn_request.php:507 -#, php-format -msgid "Welcome home %s." -msgstr "" - -#: ../../mod/dfrn_request.php:508 -#, php-format -msgid "Please confirm your introduction/connection request to %s." -msgstr "" - -#: ../../mod/dfrn_request.php:509 -msgid "Confirm" -msgstr "" - -#: ../../mod/dfrn_request.php:542 ../../include/items.php:1440 -msgid "[Name Withheld]" -msgstr "" - -#: ../../mod/dfrn_request.php:549 -msgid "Introduction received at " -msgstr "" - -#: ../../mod/dfrn_request.php:630 -msgid "Friend/Connection Request" -msgstr "" - -#: ../../mod/dfrn_request.php:631 +#: ../../mod/contacts.php:271 msgid "" -"Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, " -"testuser@identi.ca" +"Please take a moment to elaborate on this selection if you feel it could be " +"helpful to others." msgstr "" -#: ../../mod/dfrn_request.php:632 -msgid "Please answer the following:" +#: ../../mod/contacts.php:272 +msgid "Visit $name's profile" msgstr "" -#: ../../mod/dfrn_request.php:633 -msgid "Does $name know you?" +#: ../../mod/contacts.php:273 +msgid "Block/Unblock contact" msgstr "" -#: ../../mod/dfrn_request.php:636 -msgid "Add a personal note:" +#: ../../mod/contacts.php:274 +msgid "Ignore contact" msgstr "" -#: ../../mod/dfrn_request.php:637 -msgid "" -"Please enter your 'Identity Address' from one of the following supported " -"social networks:" +#: ../../mod/contacts.php:275 +msgid "Repair contact URL settings" msgstr "" -#: ../../mod/dfrn_request.php:638 -msgid "Friendika" +#: ../../mod/contacts.php:276 +msgid "Repair contact URL settings (WARNING: Advanced)" msgstr "" -#: ../../mod/dfrn_request.php:639 -msgid "StatusNet/Federated Social Web" +#: ../../mod/contacts.php:277 +msgid "View conversations" msgstr "" -#: ../../mod/dfrn_request.php:640 -msgid "Private (secure) network" +#: ../../mod/contacts.php:278 +msgid "Delete contact" msgstr "" -#: ../../mod/dfrn_request.php:641 -msgid "Public (insecure) network" +#: ../../mod/contacts.php:280 +msgid "Last updated: " msgstr "" -#: ../../mod/dfrn_request.php:642 -msgid "Your Identity Address:" +#: ../../mod/contacts.php:281 +msgid "Update public posts: " msgstr "" -#: ../../mod/dfrn_request.php:643 -msgid "Submit Request" +#: ../../mod/contacts.php:283 +msgid "Update now" msgstr "" -#: ../../mod/dfrn_request.php:644 ../../mod/tagrm.php:11 -#: ../../mod/tagrm.php:94 ../../addon/js_upload/js_upload.php:41 -msgid "Cancel" +#: ../../mod/contacts.php:286 +msgid "Unblock this contact" msgstr "" -#: ../../mod/like.php:110 ../../addon/facebook/facebook.php:759 -#: ../../include/conversation.php:20 -msgid "status" +#: ../../mod/contacts.php:286 +msgid "Block this contact" msgstr "" -#: ../../mod/like.php:127 ../../addon/facebook/facebook.php:763 -#: ../../include/conversation.php:25 -#, php-format -msgid "%1$s likes %2$s's %3$s" +#: ../../mod/contacts.php:287 +msgid "Unignore this contact" msgstr "" -#: ../../mod/like.php:129 ../../include/conversation.php:28 -#, php-format -msgid "%1$s doesn't like %2$s's %3$s" +#: ../../mod/contacts.php:287 +msgid "Ignore this contact" +msgstr "" + +#: ../../mod/contacts.php:290 +msgid "Currently blocked" +msgstr "" + +#: ../../mod/contacts.php:291 +msgid "Currently ignored" +msgstr "" + +#: ../../mod/contacts.php:322 ../../include/nav.php:109 +#: ../../include/acl_selectors.php:141 ../../include/acl_selectors.php:156 +msgid "Contacts" +msgstr "" + +#: ../../mod/contacts.php:324 +msgid "Show Blocked Connections" +msgstr "" + +#: ../../mod/contacts.php:324 +msgid "Hide Blocked Connections" +msgstr "" + +#: ../../mod/contacts.php:326 ../../mod/directory.php:55 +msgid "Finding: " +msgstr "" + +#: ../../mod/contacts.php:327 ../../mod/directory.php:57 +msgid "Find" +msgstr "" + +#: ../../mod/contacts.php:387 ../../mod/viewcontacts.php:52 +msgid "Visit $username's profile" +msgstr "" + +#: ../../mod/contacts.php:388 ../../include/conversation.php:597 +msgid "Edit contact" msgstr "" #: ../../mod/lostpass.php:27 @@ -2209,6 +1123,10 @@ msgid "" "Password reset failed." msgstr "" +#: ../../mod/lostpass.php:78 ../../boot.php:852 +msgid "Password Reset" +msgstr "" + #: ../../mod/lostpass.php:79 msgid "Your password has been reset as requested." msgstr "" @@ -2249,25 +1167,340 @@ msgstr "" msgid "Reset" msgstr "" -#: ../../mod/removeme.php:42 ../../mod/removeme.php:45 -msgid "Remove My Account" +#: ../../mod/settings.php:38 +msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../mod/removeme.php:43 +#: ../../mod/settings.php:43 +msgid "Empty passwords are not allowed. Password unchanged." +msgstr "" + +#: ../../mod/settings.php:54 +msgid "Password changed." +msgstr "" + +#: ../../mod/settings.php:56 +msgid "Password update failed. Please try again." +msgstr "" + +#: ../../mod/settings.php:138 +msgid " Please use a shorter name." +msgstr "" + +#: ../../mod/settings.php:140 +msgid " Name too short." +msgstr "" + +#: ../../mod/settings.php:146 +msgid " Not valid email." +msgstr "" + +#: ../../mod/settings.php:148 +msgid " Cannot change to that email." +msgstr "" + +#: ../../mod/settings.php:206 +msgid "Settings updated." +msgstr "" + +#: ../../mod/settings.php:256 ../../mod/settings.php:418 +#: ../../addon/widgets/widgets.php:123 +msgid "Plugin Settings" +msgstr "" + +#: ../../mod/settings.php:257 ../../mod/settings.php:417 +msgid "Account Settings" +msgstr "" + +#: ../../mod/settings.php:263 +msgid "No Plugin settings configured" +msgstr "" + +#: ../../mod/settings.php:323 +msgid "Normal Account" +msgstr "" + +#: ../../mod/settings.php:324 +msgid "This account is a normal personal profile" +msgstr "" + +#: ../../mod/settings.php:325 +msgid "Soapbox Account" +msgstr "" + +#: ../../mod/settings.php:326 +msgid "Automatically approve all connection/friend requests as read-only fans" +msgstr "" + +#: ../../mod/settings.php:327 +msgid "Community/Celebrity Account" +msgstr "" + +#: ../../mod/settings.php:328 +msgid "Automatically approve all connection/friend requests as read-write fans" +msgstr "" + +#: ../../mod/settings.php:329 +msgid "Automatic Friend Account" +msgstr "" + +#: ../../mod/settings.php:330 +msgid "Automatically approve all connection/friend requests as friends" +msgstr "" + +#: ../../mod/settings.php:339 +msgid "OpenID: " +msgstr "" + +#: ../../mod/settings.php:339 +msgid " (Optional) Allow this OpenID to login to this account." +msgstr "" + +#: ../../mod/settings.php:349 +msgid "Publish your default profile in site directory?" +msgstr "" + +#: ../../mod/settings.php:361 +msgid "Publish your default profile in global social directory?" +msgstr "" + +#: ../../mod/settings.php:377 +msgid "Profile is not published." +msgstr "" + +#: ../../mod/settings.php:398 ../../mod/profile_photo.php:196 +msgid "or" +msgstr "" + +#: ../../mod/settings.php:403 +msgid "Your Identity Address is" +msgstr "" + +#: ../../mod/settings.php:413 +msgid "Export Personal Data" +msgstr "" + +#: ../../mod/settings.php:419 +msgid "Basic Settings" +msgstr "" + +#: ../../mod/settings.php:420 ../../include/profile_advanced.php:10 +msgid "Full Name:" +msgstr "" + +#: ../../mod/settings.php:421 +msgid "Email Address:" +msgstr "" + +#: ../../mod/settings.php:422 +msgid "Your Timezone:" +msgstr "" + +#: ../../mod/settings.php:423 +msgid "Default Post Location:" +msgstr "" + +#: ../../mod/settings.php:424 +msgid "Use Browser Location:" +msgstr "" + +#: ../../mod/settings.php:425 +msgid "Display Theme:" +msgstr "" + +#: ../../mod/settings.php:427 +msgid "Security and Privacy Settings" +msgstr "" + +#: ../../mod/settings.php:428 +msgid "Maximum Friend Requests/Day:" +msgstr "" + +#: ../../mod/settings.php:429 +msgid "(to prevent spam abuse)" +msgstr "" + +#: ../../mod/settings.php:430 +msgid "Allow friends to post to your profile page:" +msgstr "" + +#: ../../mod/settings.php:431 +msgid "Automatically expire (delete) posts older than" +msgstr "" + +#: ../../mod/settings.php:432 ../../include/datetime.php:154 +msgid "days" +msgstr "" + +#: ../../mod/settings.php:433 +msgid "Notification Settings" +msgstr "" + +#: ../../mod/settings.php:434 +msgid "Send a notification email when:" +msgstr "" + +#: ../../mod/settings.php:435 +msgid "You receive an introduction" +msgstr "" + +#: ../../mod/settings.php:436 +msgid "Your introductions are confirmed" +msgstr "" + +#: ../../mod/settings.php:437 +msgid "Someone writes on your profile wall" +msgstr "" + +#: ../../mod/settings.php:438 +msgid "Someone writes a followup comment" +msgstr "" + +#: ../../mod/settings.php:439 +msgid "You receive a private message" +msgstr "" + +#: ../../mod/settings.php:440 +msgid "Password Settings" +msgstr "" + +#: ../../mod/settings.php:441 +msgid "Leave password fields blank unless changing" +msgstr "" + +#: ../../mod/settings.php:442 +msgid "New Password:" +msgstr "" + +#: ../../mod/settings.php:443 +msgid "Confirm:" +msgstr "" + +#: ../../mod/settings.php:444 +msgid "Advanced Page Settings" +msgstr "" + +#: ../../mod/settings.php:459 +msgid "Default Post Permissions" +msgstr "" + +#: ../../mod/settings.php:460 +msgid "(click to open/close)" +msgstr "" + +#: ../../mod/settings.php:473 +msgid "Email/Mailbox Setup" +msgstr "" + +#: ../../mod/settings.php:474 msgid "" -"This will completely remove your account. Once this has been done it is not " -"recoverable." +"If you wish to communicate with email contacts using this service " +"(optional), please specify how to connect to your mailbox." msgstr "" -#: ../../mod/removeme.php:44 -msgid "Please enter your password for verification:" +#: ../../mod/settings.php:475 +msgid "IMAP server name:" msgstr "" -#: ../../mod/apps.php:6 -msgid "Applications" +#: ../../mod/settings.php:477 +msgid "IMAP port:" msgstr "" -#: ../../mod/apps.php:8 ../../mod/notes.php:41 +#: ../../mod/settings.php:479 +msgid "Security (TLS or SSL):" +msgstr "" + +#: ../../mod/settings.php:481 +msgid "Email login name:" +msgstr "" + +#: ../../mod/settings.php:483 +msgid "Email password:" +msgstr "" + +#: ../../mod/settings.php:484 +msgid "Reply-to address (Optional):" +msgstr "" + +#: ../../mod/settings.php:486 +msgid "Send public posts to all email contacts:" +msgstr "" + +#: ../../mod/settings.php:488 +msgid "Email access is disabled on this site." +msgstr "" + +#: ../../mod/manage.php:37 +#, php-format +msgid "Welcome back %s" +msgstr "" + +#: ../../mod/manage.php:87 +msgid "Manage Identities and/or Pages" +msgstr "" + +#: ../../mod/manage.php:90 +msgid "" +"(Toggle between different identities or community/group pages which share " +"your account details.)" +msgstr "" + +#: ../../mod/manage.php:92 +msgid "Select an identity to manage: " +msgstr "" + +#: ../../mod/network.php:18 +msgid "Normal View" +msgstr "" + +#: ../../mod/network.php:20 +msgid "New Item View" +msgstr "" + +#: ../../mod/network.php:64 +#, php-format +msgid "Warning: This group contains %s member from an insecure network." +msgid_plural "" +"Warning: This group contains %s members from an insecure network." +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/network.php:67 +msgid "Private messages to this group are at risk of public disclosure." +msgstr "" + +#: ../../mod/network.php:129 +msgid "No such group" +msgstr "" + +#: ../../mod/network.php:140 +msgid "Group is empty" +msgstr "" + +#: ../../mod/network.php:144 +msgid "Group: " +msgstr "" + +#: ../../mod/network.php:154 +msgid "Contact: " +msgstr "" + +#: ../../mod/network.php:156 +msgid "Private messages to this person are at risk of public disclosure." +msgstr "" + +#: ../../mod/network.php:161 +msgid "Invalid contact." +msgstr "" + +#: ../../mod/network.php:262 ../../mod/register.php:465 +#: ../../mod/profile.php:265 ../../mod/display.php:147 +msgid "" +"Shared content is covered by the Creative Commons Attribution 3.0 license." +msgstr "" + +#: ../../mod/notes.php:41 ../../mod/apps.php:8 msgid "Private Notes" msgstr "" @@ -2275,28 +1508,237 @@ msgstr "" msgid "Save" msgstr "" -#: ../../mod/directory.php:40 -msgid "Global Directory" +#: ../../mod/attach.php:6 +msgid "Item not available." msgstr "" -#: ../../mod/directory.php:46 -msgid "Normal site view" +#: ../../mod/attach.php:16 +msgid "Item was not found." msgstr "" -#: ../../mod/directory.php:48 -msgid "View all site entries" +#: ../../mod/group.php:27 +msgid "Group created." msgstr "" -#: ../../mod/directory.php:56 -msgid "Site Directory" +#: ../../mod/group.php:33 +msgid "Could not create group." msgstr "" -#: ../../mod/directory.php:115 -msgid "Gender: " +#: ../../mod/group.php:43 ../../mod/group.php:115 +msgid "Group not found." msgstr "" -#: ../../mod/directory.php:141 -msgid "No entries (some entries may be hidden)." +#: ../../mod/group.php:56 +msgid "Group name changed." +msgstr "" + +#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../index.php:255 +msgid "Permission denied" +msgstr "" + +#: ../../mod/group.php:74 +msgid "Create a group of contacts/friends." +msgstr "" + +#: ../../mod/group.php:75 ../../mod/group.php:158 +msgid "Group Name: " +msgstr "" + +#: ../../mod/group.php:90 +msgid "Group removed." +msgstr "" + +#: ../../mod/group.php:92 +msgid "Unable to remove group." +msgstr "" + +#: ../../mod/group.php:156 ../../mod/profperm.php:96 +msgid "Click on a contact to add or remove." +msgstr "" + +#: ../../mod/group.php:157 +msgid "Group Editor" +msgstr "" + +#: ../../mod/group.php:172 +msgid "Members" +msgstr "" + +#: ../../mod/group.php:186 +msgid "All Contacts" +msgstr "" + +#: ../../mod/profperm.php:25 ../../mod/profperm.php:46 +msgid "Invalid profile identifier." +msgstr "" + +#: ../../mod/profperm.php:92 +msgid "Profile Visibility Editor" +msgstr "" + +#: ../../mod/profperm.php:94 ../../mod/profile.php:116 +#: ../../include/profile_advanced.php:7 +msgid "Profile" +msgstr "" + +#: ../../mod/profperm.php:105 +msgid "Visible To" +msgstr "" + +#: ../../mod/profperm.php:116 +msgid "All Contacts (with secure profile access)" +msgstr "" + +#: ../../mod/viewcontacts.php:25 ../../boot.php:2059 +msgid "View Contacts" +msgstr "" + +#: ../../mod/viewcontacts.php:40 +msgid "No contacts." +msgstr "" + +#: ../../mod/register.php:49 +msgid "Invalid OpenID url" +msgstr "" + +#: ../../mod/register.php:64 +msgid "Please enter the required information." +msgstr "" + +#: ../../mod/register.php:76 +msgid "Please use a shorter name." +msgstr "" + +#: ../../mod/register.php:78 +msgid "Name too short." +msgstr "" + +#: ../../mod/register.php:93 +msgid "That doesn't appear to be your full (First Last) name." +msgstr "" + +#: ../../mod/register.php:97 +msgid "Your email domain is not among those allowed on this site." +msgstr "" + +#: ../../mod/register.php:100 +msgid "Not a valid email address." +msgstr "" + +#: ../../mod/register.php:106 +msgid "Cannot use that email." +msgstr "" + +#: ../../mod/register.php:111 +msgid "" +"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and " +"must also begin with a letter." +msgstr "" + +#: ../../mod/register.php:117 ../../mod/register.php:217 +msgid "Nickname is already registered. Please choose another." +msgstr "" + +#: ../../mod/register.php:136 +msgid "SERIOUS ERROR: Generation of security keys failed." +msgstr "" + +#: ../../mod/register.php:203 +msgid "An error occurred during registration. Please try again." +msgstr "" + +#: ../../mod/register.php:239 +msgid "An error occurred creating your default profile. Please try again." +msgstr "" + +#: ../../mod/register.php:333 ../../mod/regmod.php:96 +#, php-format +msgid "Registration details for %s" +msgstr "" + +#: ../../mod/register.php:341 +msgid "" +"Registration successful. Please check your email for further instructions." +msgstr "" + +#: ../../mod/register.php:345 +msgid "Failed to send email message. Here is the message that failed." +msgstr "" + +#: ../../mod/register.php:350 +msgid "Your registration can not be processed." +msgstr "" + +#: ../../mod/register.php:383 +#, php-format +msgid "Registration request at %s" +msgstr "" + +#: ../../mod/register.php:392 +msgid "Your registration is pending approval by the site owner." +msgstr "" + +#: ../../mod/register.php:440 +msgid "" +"You may (optionally) fill in this form via OpenID by supplying your OpenID " +"and clicking 'Register'." +msgstr "" + +#: ../../mod/register.php:441 +msgid "" +"If you are not familiar with OpenID, please leave that field blank and fill " +"in the rest of the items." +msgstr "" + +#: ../../mod/register.php:442 +msgid "Your OpenID (optional): " +msgstr "" + +#: ../../mod/register.php:456 +msgid "Include your profile in member directory?" +msgstr "" + +#: ../../mod/register.php:472 +msgid "Registration" +msgstr "" + +#: ../../mod/register.php:480 +msgid "Your Full Name (e.g. Joe Smith): " +msgstr "" + +#: ../../mod/register.php:481 +msgid "Your Email Address: " +msgstr "" + +#: ../../mod/register.php:482 +msgid "" +"Choose a profile nickname. This must begin with a text character. Your " +"profile address on this site will then be 'nickname@$sitename'." +msgstr "" + +#: ../../mod/register.php:483 +msgid "Choose a nickname: " +msgstr "" + +#: ../../mod/register.php:486 ../../include/nav.php:59 ../../boot.php:835 +msgid "Register" +msgstr "" + +#: ../../mod/like.php:110 ../../addon/facebook/facebook.php:759 +#: ../../include/conversation.php:20 +msgid "status" +msgstr "" + +#: ../../mod/like.php:127 ../../addon/facebook/facebook.php:763 +#: ../../include/conversation.php:25 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "" + +#: ../../mod/like.php:129 ../../include/conversation.php:28 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" msgstr "" #: ../../mod/friendika.php:43 @@ -2338,6 +1780,23 @@ msgstr "" msgid "No installed plugins/addons/apps" msgstr "" +#: ../../mod/regmod.php:12 +msgid "Please login." +msgstr "" + +#: ../../mod/regmod.php:56 +#, php-format +msgid "Registration revoked for %s" +msgstr "" + +#: ../../mod/regmod.php:105 +msgid "Account approved." +msgstr "" + +#: ../../mod/update_network.php:22 ../../mod/update_profile.php:41 +msgid "[Embedded content - reload page to view]" +msgstr "" + #: ../../mod/item.php:37 msgid "Unable to locate original post." msgstr "" @@ -2346,46 +1805,124 @@ msgstr "" msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:605 +#: ../../mod/item.php:214 ../../mod/message.php:93 +#: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88 +#: ../../mod/wall_upload.php:95 +msgid "Wall Photos" +msgstr "" + +#: ../../mod/item.php:517 ../../mod/item.php:560 ../../mod/item.php:583 +#: ../../mod/item.php:624 ../../mod/dfrn_notify.php:193 +#: ../../mod/dfrn_notify.php:401 ../../mod/dfrn_notify.php:444 +#: ../../mod/dfrn_notify.php:530 ../../mod/dfrn_notify.php:571 +msgid "noreply" +msgstr "" + +#: ../../mod/item.php:559 ../../mod/item.php:623 ../../mod/dfrn_notify.php:570 +msgid "Administrator@" +msgstr "" + +#: ../../mod/item.php:562 ../../mod/item.php:626 ../../mod/dfrn_notify.php:573 +msgid " commented on an item at " +msgstr "" + +#: ../../mod/item.php:655 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:624 +#: ../../mod/item.php:674 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendika social network." msgstr "" -#: ../../mod/item.php:626 +#: ../../mod/item.php:676 #, php-format msgid "You may visit them online at %s" msgstr "" -#: ../../mod/item.php:627 +#: ../../mod/item.php:677 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "" -#: ../../mod/item.php:629 +#: ../../mod/item.php:679 #, php-format msgid "%s posted an update." msgstr "" -#: ../../mod/tagrm.php:41 -msgid "Tag removed" +#: ../../mod/item.php:730 ../../mod/display.php:25 ../../mod/display.php:142 +msgid "Item not found." msgstr "" -#: ../../mod/tagrm.php:79 -msgid "Remove Item Tag" +#: ../../mod/profile_photo.php:28 +msgid "Image uploaded but image cropping failed." msgstr "" -#: ../../mod/tagrm.php:81 -msgid "Select a tag to remove: " +#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68 +#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:248 +#, php-format +msgid "Image size reduction [%s] failed." msgstr "" -#: ../../mod/tagrm.php:93 -msgid "Remove" +#: ../../mod/profile_photo.php:95 +msgid "Unable to process image" +msgstr "" + +#: ../../mod/profile_photo.php:109 ../../mod/wall_upload.php:56 +#, php-format +msgid "Image exceeds size limit of %d" +msgstr "" + +#: ../../mod/profile_photo.php:193 +msgid "Upload File:" +msgstr "" + +#: ../../mod/profile_photo.php:194 +msgid "Upload Profile Photo" +msgstr "" + +#: ../../mod/profile_photo.php:195 +msgid "Upload" +msgstr "" + +#: ../../mod/profile_photo.php:196 +msgid "skip this step" +msgstr "" + +#: ../../mod/profile_photo.php:196 +msgid "select a photo from your photo albums" +msgstr "" + +#: ../../mod/profile_photo.php:209 +msgid "Crop Image" +msgstr "" + +#: ../../mod/profile_photo.php:210 +msgid "Please adjust the image cropping for optimum viewing." +msgstr "" + +#: ../../mod/profile_photo.php:211 +msgid "Done Editing" +msgstr "" + +#: ../../mod/profile_photo.php:239 +msgid "Image uploaded successfully." +msgstr "" + +#: ../../mod/removeme.php:42 ../../mod/removeme.php:45 +msgid "Remove My Account" +msgstr "" + +#: ../../mod/removeme.php:43 +msgid "" +"This will completely remove your account. Once this has been done it is not " +"recoverable." +msgstr "" + +#: ../../mod/removeme.php:44 +msgid "Please enter your password for verification:" msgstr "" #: ../../mod/message.php:18 @@ -2432,7 +1969,7 @@ msgstr "" msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:172 ../../include/conversation.php:679 +#: ../../mod/message.php:172 ../../include/conversation.php:684 msgid "Please enter a link URL:" msgstr "" @@ -2448,6 +1985,10 @@ msgstr "" msgid "Subject:" msgstr "" +#: ../../mod/message.php:185 ../../mod/message.php:319 ../../mod/invite.php:63 +msgid "Your message:" +msgstr "" + #: ../../mod/message.php:224 msgid "No messages." msgstr "" @@ -2472,6 +2013,381 @@ msgstr "" msgid "Send Reply" msgstr "" +#: ../../mod/profile.php:11 ../../boot.php:2270 +msgid "No profile" +msgstr "" + +#: ../../mod/profile.php:59 +msgid "Access to this profile has been restricted." +msgstr "" + +#: ../../mod/profile.php:115 +msgid "Status" +msgstr "" + +#: ../../mod/profile.php:117 +msgid "Photos" +msgstr "" + +#: ../../mod/openid.php:62 ../../mod/openid.php:122 ../../include/auth.php:114 +#: ../../include/auth.php:139 ../../include/auth.php:192 +msgid "Login failed." +msgstr "" + +#: ../../mod/openid.php:78 ../../include/auth.php:208 +msgid "Welcome " +msgstr "" + +#: ../../mod/openid.php:79 ../../include/auth.php:209 +msgid "Please upload a profile photo." +msgstr "" + +#: ../../mod/openid.php:82 ../../include/auth.php:212 +msgid "Welcome back " +msgstr "" + +#: ../../mod/follow.php:43 +msgid "The profile address specified does not provide adequate information." +msgstr "" + +#: ../../mod/follow.php:45 +msgid "No compatible communication protocols or feeds were discovered." +msgstr "" + +#: ../../mod/follow.php:47 +msgid "An author or name was not found." +msgstr "" + +#: ../../mod/follow.php:49 +msgid "No browser URL could be matched to this address." +msgstr "" + +#: ../../mod/follow.php:57 +msgid "" +"Limited profile. This person will be unable to receive direct/personal " +"notifications from you." +msgstr "" + +#: ../../mod/follow.php:112 +msgid "Unable to retrieve contact information." +msgstr "" + +#: ../../mod/follow.php:158 +msgid "following" +msgstr "" + +#: ../../mod/display.php:135 +msgid "Item has been removed." +msgstr "" + +#: ../../mod/dfrn_notify.php:251 +msgid "New mail received at " +msgstr "" + +#: ../../mod/dfrn_notify.php:446 +#, php-format +msgid "%s commented on an item at %s" +msgstr "" + +#: ../../mod/apps.php:6 +msgid "Applications" +msgstr "" + +#: ../../mod/search.php:26 ../../include/nav.php:70 ../../boot.php:2114 +msgid "Search" +msgstr "" + +#: ../../mod/search.php:69 +msgid "No results." +msgstr "" + +#: ../../mod/profiles.php:21 ../../mod/profiles.php:240 +#: ../../mod/profiles.php:345 ../../mod/dfrn_confirm.php:62 +msgid "Profile not found." +msgstr "" + +#: ../../mod/profiles.php:28 +msgid "Profile Name is required." +msgstr "" + +#: ../../mod/profiles.php:202 +msgid "Profile updated." +msgstr "" + +#: ../../mod/profiles.php:257 +msgid "Profile deleted." +msgstr "" + +#: ../../mod/profiles.php:273 ../../mod/profiles.php:304 +msgid "Profile-" +msgstr "" + +#: ../../mod/profiles.php:292 ../../mod/profiles.php:331 +msgid "New profile created." +msgstr "" + +#: ../../mod/profiles.php:310 +msgid "Profile unavailable to clone." +msgstr "" + +#: ../../mod/profiles.php:357 +msgid "Hide your contact/friend list from viewers of this profile?" +msgstr "" + +#: ../../mod/profiles.php:366 +msgid "Hide profile details and all your messages from unknown viewers?" +msgstr "" + +#: ../../mod/profiles.php:382 +msgid "Edit Profile Details" +msgstr "" + +#: ../../mod/profiles.php:384 +msgid "View this profile" +msgstr "" + +#: ../../mod/profiles.php:385 +msgid "Create a new profile using these settings" +msgstr "" + +#: ../../mod/profiles.php:386 +msgid "Clone this profile" +msgstr "" + +#: ../../mod/profiles.php:387 +msgid "Delete this profile" +msgstr "" + +#: ../../mod/profiles.php:388 +msgid "Profile Name:" +msgstr "" + +#: ../../mod/profiles.php:389 +msgid "Your Full Name:" +msgstr "" + +#: ../../mod/profiles.php:390 +msgid "Title/Description:" +msgstr "" + +#: ../../mod/profiles.php:391 +msgid "Your Gender:" +msgstr "" + +#: ../../mod/profiles.php:392 +msgid "Birthday (y/m/d):" +msgstr "" + +#: ../../mod/profiles.php:393 +msgid "Street Address:" +msgstr "" + +#: ../../mod/profiles.php:394 +msgid "Locality/City:" +msgstr "" + +#: ../../mod/profiles.php:395 +msgid "Postal/Zip Code:" +msgstr "" + +#: ../../mod/profiles.php:396 +msgid "Country:" +msgstr "" + +#: ../../mod/profiles.php:397 +msgid "Region/State:" +msgstr "" + +#: ../../mod/profiles.php:398 +msgid "♥ Marital Status:" +msgstr "" + +#: ../../mod/profiles.php:399 +msgid "Who: (if applicable)" +msgstr "" + +#: ../../mod/profiles.php:400 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +msgstr "" + +#: ../../mod/profiles.php:401 ../../include/profile_advanced.php:90 +msgid "Sexual Preference:" +msgstr "" + +#: ../../mod/profiles.php:402 +msgid "Homepage URL:" +msgstr "" + +#: ../../mod/profiles.php:403 ../../include/profile_advanced.php:115 +msgid "Political Views:" +msgstr "" + +#: ../../mod/profiles.php:404 +msgid "Religious Views:" +msgstr "" + +#: ../../mod/profiles.php:405 +msgid "Public Keywords:" +msgstr "" + +#: ../../mod/profiles.php:406 +msgid "Private Keywords:" +msgstr "" + +#: ../../mod/profiles.php:407 +msgid "Example: fishing photography software" +msgstr "" + +#: ../../mod/profiles.php:408 +msgid "(Used for suggesting potential friends, can be seen by others)" +msgstr "" + +#: ../../mod/profiles.php:409 +msgid "(Used for searching profiles, never shown to others)" +msgstr "" + +#: ../../mod/profiles.php:410 +msgid "Tell us about yourself..." +msgstr "" + +#: ../../mod/profiles.php:411 +msgid "Hobbies/Interests" +msgstr "" + +#: ../../mod/profiles.php:412 +msgid "Contact information and Social Networks" +msgstr "" + +#: ../../mod/profiles.php:413 +msgid "Musical interests" +msgstr "" + +#: ../../mod/profiles.php:414 +msgid "Books, literature" +msgstr "" + +#: ../../mod/profiles.php:415 +msgid "Television" +msgstr "" + +#: ../../mod/profiles.php:416 +msgid "Film/dance/culture/entertainment" +msgstr "" + +#: ../../mod/profiles.php:417 +msgid "Love/romance" +msgstr "" + +#: ../../mod/profiles.php:418 +msgid "Work/employment" +msgstr "" + +#: ../../mod/profiles.php:419 +msgid "School/education" +msgstr "" + +#: ../../mod/profiles.php:424 +msgid "" +"This is your public profile.
It may " +"be visible to anybody using the internet." +msgstr "" + +#: ../../mod/profiles.php:435 ../../mod/directory.php:112 +msgid "Age: " +msgstr "" + +#: ../../mod/profiles.php:470 ../../include/nav.php:108 +msgid "Profiles" +msgstr "" + +#: ../../mod/profiles.php:471 +msgid "Change profile photo" +msgstr "" + +#: ../../mod/profiles.php:472 +msgid "Create New Profile" +msgstr "" + +#: ../../mod/profiles.php:482 +msgid "Profile Image" +msgstr "" + +#: ../../mod/profiles.php:484 +msgid "Visible to everybody" +msgstr "" + +#: ../../mod/profiles.php:485 +msgid "Edit visibility" +msgstr "" + +#: ../../mod/directory.php:40 +msgid "Global Directory" +msgstr "" + +#: ../../mod/directory.php:46 +msgid "Normal site view" +msgstr "" + +#: ../../mod/directory.php:48 +msgid "View all site entries" +msgstr "" + +#: ../../mod/directory.php:56 +msgid "Site Directory" +msgstr "" + +#: ../../mod/directory.php:115 +msgid "Gender: " +msgstr "" + +#: ../../mod/directory.php:141 +msgid "No entries (some entries may be hidden)." +msgstr "" + +#: ../../mod/invite.php:28 +#, php-format +msgid "%s : Not a valid email address." +msgstr "" + +#: ../../mod/invite.php:32 +#, php-format +msgid "Please join my network on %s" +msgstr "" + +#: ../../mod/invite.php:42 +#, php-format +msgid "%s : Message delivery failed." +msgstr "" + +#: ../../mod/invite.php:46 +#, php-format +msgid "%d message sent." +msgid_plural "%d messages sent." +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/invite.php:61 +msgid "Send invitations" +msgstr "" + +#: ../../mod/invite.php:62 +msgid "Enter email addresses, one per line:" +msgstr "" + +#: ../../mod/invite.php:64 +#, php-format +msgid "Please join my social network on %s" +msgstr "" + +#: ../../mod/invite.php:65 +msgid "To accept this invitation, please visit:" +msgstr "" + +#: ../../mod/invite.php:66 +msgid "" +"Once you have registered, please connect with me via my profile page at:" +msgstr "" + #: ../../mod/dfrn_confirm.php:231 msgid "Response from remote site was not understood." msgstr "" @@ -2537,136 +2453,190 @@ msgstr "" msgid "Unable to update your contact profile details on our system" msgstr "" -#: ../../mod/dfrn_confirm.php:655 +#: ../../mod/dfrn_confirm.php:656 #, php-format msgid "Connection accepted at %s" msgstr "" -#: ../../mod/openid.php:62 ../../mod/openid.php:118 ../../include/auth.php:114 -#: ../../include/auth.php:139 ../../include/auth.php:192 -msgid "Login failed." +#: ../../addon/facebook/facebook.php:248 +msgid "Facebook disabled" msgstr "" -#: ../../mod/openid.php:78 ../../include/auth.php:208 -msgid "Welcome " +#: ../../addon/facebook/facebook.php:253 +msgid "Updating contacts" msgstr "" -#: ../../mod/openid.php:79 ../../include/auth.php:209 -msgid "Please upload a profile photo." +#: ../../addon/facebook/facebook.php:262 +msgid "Facebook API key is missing." msgstr "" -#: ../../mod/openid.php:82 ../../include/auth.php:212 -msgid "Welcome back " +#: ../../addon/facebook/facebook.php:269 +msgid "Facebook Connect" msgstr "" -#: ../../mod/dfrn_poll.php:84 ../../mod/dfrn_poll.php:510 -#, php-format -msgid "%s welcomes %s" +#: ../../addon/facebook/facebook.php:275 +msgid "Install Facebook connector for this account." msgstr "" -#: ../../mod/viewcontacts.php:40 -msgid "No contacts." +#: ../../addon/facebook/facebook.php:282 +msgid "Remove Facebook connector" msgstr "" -#: ../../mod/group.php:27 -msgid "Group created." +#: ../../addon/facebook/facebook.php:288 +msgid "Post to Facebook by default" msgstr "" -#: ../../mod/group.php:33 -msgid "Could not create group." +#: ../../addon/facebook/facebook.php:350 +msgid "Facebook" msgstr "" -#: ../../mod/group.php:43 ../../mod/group.php:115 -msgid "Group not found." +#: ../../addon/facebook/facebook.php:351 +msgid "Facebook Connector Settings" msgstr "" -#: ../../mod/group.php:56 -msgid "Group name changed." +#: ../../addon/facebook/facebook.php:365 +msgid "Post to Facebook" msgstr "" -#: ../../mod/group.php:74 -msgid "Create a group of contacts/friends." -msgstr "" - -#: ../../mod/group.php:75 ../../mod/group.php:158 -msgid "Group Name: " -msgstr "" - -#: ../../mod/group.php:90 -msgid "Group removed." -msgstr "" - -#: ../../mod/group.php:92 -msgid "Unable to remove group." -msgstr "" - -#: ../../mod/group.php:157 -msgid "Group Editor" -msgstr "" - -#: ../../mod/group.php:172 -msgid "Members" -msgstr "" - -#: ../../mod/group.php:186 -msgid "All Contacts" -msgstr "" - -#: ../../mod/match.php:10 -msgid "Profile Match" -msgstr "" - -#: ../../mod/match.php:50 -msgid "No matches" -msgstr "" - -#: ../../addon/twitter/twitter.php:64 -msgid "Post to Twitter" -msgstr "" - -#: ../../addon/twitter/twitter.php:122 -msgid "Twitter Posting Settings" -msgstr "" - -#: ../../addon/twitter/twitter.php:129 +#: ../../addon/facebook/facebook.php:434 msgid "" -"No consumer key pair for Twitter found. Please contact your site " -"administrator." +"Post to Facebook cancelled because of multi-network access permission " +"conflict." msgstr "" -#: ../../addon/twitter/twitter.php:148 +#: ../../addon/facebook/facebook.php:500 +msgid "Image: " +msgstr "" + +#: ../../addon/facebook/facebook.php:561 +msgid "View on Friendika" +msgstr "" + +#: ../../addon/widgets/widgets.php:41 +msgid "Widgets key: " +msgstr "" + +#: ../../addon/widgets/widgets.php:45 +msgid "Generate new key" +msgstr "" + +#: ../../addon/widgets/widget_friends.php:30 +msgid "Connect on Friendika!" +msgstr "" + +#: ../../addon/tictac/tictac.php:14 +msgid "Three Dimensional Tic-Tac-Toe" +msgstr "" + +#: ../../addon/tictac/tictac.php:47 +msgid "3D Tic-Tac-Toe" +msgstr "" + +#: ../../addon/tictac/tictac.php:52 +msgid "New game" +msgstr "" + +#: ../../addon/tictac/tictac.php:53 +msgid "New game with handicap" +msgstr "" + +#: ../../addon/tictac/tictac.php:54 msgid "" -"At this Friendika instance the Twitter plugin was enabled but you have not " -"yet connected your account to your Twitter account. To do so click the " -"button below to get a PIN from Twitter which you have to copy into the input " -"box below and submit the form. Only your public posts will " -"be posted to Twitter." +"Three dimensional tic-tac-toe is just like the traditional game except that " +"it is played on multiple levels simultaneously. " msgstr "" -#: ../../addon/twitter/twitter.php:149 -msgid "Log in with Twitter" -msgstr "" - -#: ../../addon/twitter/twitter.php:151 -msgid "Copy the PIN from Twitter here" -msgstr "" - -#: ../../addon/twitter/twitter.php:165 ../../addon/statusnet/statusnet.php:271 -msgid "Currently connected to: " -msgstr "" - -#: ../../addon/twitter/twitter.php:166 +#: ../../addon/tictac/tictac.php:55 msgid "" -"If enabled all your public postings will be posted to the " -"associated Twitter account as well." +"In this case there are three levels. You win by getting three in a row on " +"any level, as well as up, down, and diagonally across the different levels." msgstr "" -#: ../../addon/twitter/twitter.php:168 -msgid "Send public postings to Twitter" +#: ../../addon/tictac/tictac.php:57 +msgid "" +"The handicap game disables the center position on the middle level because " +"the player claiming this square often has an unfair advantage." msgstr "" -#: ../../addon/twitter/twitter.php:172 ../../addon/statusnet/statusnet.php:282 -msgid "Clear OAuth configuration" +#: ../../addon/tictac/tictac.php:176 +msgid "You go first..." +msgstr "" + +#: ../../addon/tictac/tictac.php:181 +msgid "I'm going first this time..." +msgstr "" + +#: ../../addon/tictac/tictac.php:187 +msgid "You won!" +msgstr "" + +#: ../../addon/tictac/tictac.php:193 ../../addon/tictac/tictac.php:218 +msgid "\"Cat\" game!" +msgstr "" + +#: ../../addon/tictac/tictac.php:216 +msgid "I won!" +msgstr "" + +#: ../../addon/randplace/randplace.php:171 +msgid "Randplace Settings" +msgstr "" + +#: ../../addon/randplace/randplace.php:173 +msgid "Enable Randplace Plugin" +msgstr "" + +#: ../../addon/java_upload/java_upload.php:33 +msgid "Select files to upload: " +msgstr "" + +#: ../../addon/java_upload/java_upload.php:35 +msgid "" +"Use the following controls only if the Java uploader [above] fails to launch." +msgstr "" + +#: ../../addon/js_upload/js_upload.php:39 +msgid "Upload a file" +msgstr "" + +#: ../../addon/js_upload/js_upload.php:40 +msgid "Drop files here to upload" +msgstr "" + +#: ../../addon/js_upload/js_upload.php:42 +msgid "Failed" +msgstr "" + +#: ../../addon/js_upload/js_upload.php:288 +msgid "No files were uploaded." +msgstr "" + +#: ../../addon/js_upload/js_upload.php:294 +msgid "Uploaded file is empty" +msgstr "" + +#: ../../addon/js_upload/js_upload.php:299 +msgid "Uploaded file is too large" +msgstr "" + +#: ../../addon/js_upload/js_upload.php:317 +msgid "File has an invalid extension, it should be one of " +msgstr "" + +#: ../../addon/js_upload/js_upload.php:328 +msgid "Upload was cancelled, or server error encountered" +msgstr "" + +#: ../../addon/oembed/oembed.php:29 +msgid "OEmbed settings updated" +msgstr "" + +#: ../../addon/oembed/oembed.php:42 +msgid "Use OEmbed for YouTube videos: " +msgstr "" + +#: ../../addon/oembed/oembed.php:76 +msgid "URL to embed:" msgstr "" #: ../../addon/statusnet/statusnet.php:78 @@ -2755,6 +2725,10 @@ msgstr "" msgid "Cancel StatusNet Connection" msgstr "" +#: ../../addon/statusnet/statusnet.php:271 ../../addon/twitter/twitter.php:165 +msgid "Currently connected to: " +msgstr "" + #: ../../addon/statusnet/statusnet.php:272 msgid "" "If enabled all your public postings will be posted to the " @@ -2769,177 +2743,121 @@ msgstr "" msgid "Send public postings to StatusNet by default" msgstr "" -#: ../../addon/tictac/tictac.php:14 -msgid "Three Dimensional Tic-Tac-Toe" +#: ../../addon/statusnet/statusnet.php:282 ../../addon/twitter/twitter.php:172 +msgid "Clear OAuth configuration" msgstr "" -#: ../../addon/tictac/tictac.php:47 -msgid "3D Tic-Tac-Toe" +#: ../../addon/twitter/twitter.php:64 +msgid "Post to Twitter" msgstr "" -#: ../../addon/tictac/tictac.php:52 -msgid "New game" +#: ../../addon/twitter/twitter.php:122 +msgid "Twitter Posting Settings" msgstr "" -#: ../../addon/tictac/tictac.php:53 -msgid "New game with handicap" -msgstr "" - -#: ../../addon/tictac/tictac.php:54 +#: ../../addon/twitter/twitter.php:129 msgid "" -"Three dimensional tic-tac-toe is just like the traditional game except that " -"it is played on multiple levels simultaneously. " +"No consumer key pair for Twitter found. Please contact your site " +"administrator." msgstr "" -#: ../../addon/tictac/tictac.php:55 +#: ../../addon/twitter/twitter.php:148 msgid "" -"In this case there are three levels. You win by getting three in a row on " -"any level, as well as up, down, and diagonally across the different levels." +"At this Friendika instance the Twitter plugin was enabled but you have not " +"yet connected your account to your Twitter account. To do so click the " +"button below to get a PIN from Twitter which you have to copy into the input " +"box below and submit the form. Only your public posts will " +"be posted to Twitter." msgstr "" -#: ../../addon/tictac/tictac.php:57 +#: ../../addon/twitter/twitter.php:149 +msgid "Log in with Twitter" +msgstr "" + +#: ../../addon/twitter/twitter.php:151 +msgid "Copy the PIN from Twitter here" +msgstr "" + +#: ../../addon/twitter/twitter.php:166 msgid "" -"The handicap game disables the center position on the middle level because " -"the player claiming this square often has an unfair advantage." +"If enabled all your public postings will be posted to the " +"associated Twitter account as well." msgstr "" -#: ../../addon/tictac/tictac.php:176 -msgid "You go first..." +#: ../../addon/twitter/twitter.php:168 +msgid "Send public postings to Twitter" msgstr "" -#: ../../addon/tictac/tictac.php:181 -msgid "I'm going first this time..." +#: ../../include/profile_advanced.php:23 ../../boot.php:2356 +msgid "Gender:" msgstr "" -#: ../../addon/tictac/tictac.php:187 -msgid "You won!" +#: ../../include/profile_advanced.php:36 ../../include/items.php:1086 +msgid "Birthday:" msgstr "" -#: ../../addon/tictac/tictac.php:193 ../../addon/tictac/tictac.php:218 -msgid "\"Cat\" game!" +#: ../../include/profile_advanced.php:45 +msgid "j F, Y" msgstr "" -#: ../../addon/tictac/tictac.php:216 -msgid "I won!" +#: ../../include/profile_advanced.php:46 +msgid "j F" msgstr "" -#: ../../addon/java_upload/java_upload.php:33 -msgid "Select files to upload: " +#: ../../include/profile_advanced.php:59 +msgid "Age:" msgstr "" -#: ../../addon/java_upload/java_upload.php:35 -msgid "" -"Use the following controls only if the Java uploader [above] fails to launch." +#: ../../include/profile_advanced.php:70 +msgid "♥ Status:" msgstr "" -#: ../../addon/facebook/facebook.php:248 -msgid "Facebook disabled" +#: ../../include/profile_advanced.php:103 ../../boot.php:2362 +msgid "Homepage:" msgstr "" -#: ../../addon/facebook/facebook.php:253 -msgid "Updating contacts" +#: ../../include/profile_advanced.php:127 +msgid "Religion:" msgstr "" -#: ../../addon/facebook/facebook.php:262 -msgid "Facebook API key is missing." +#: ../../include/profile_advanced.php:138 +msgid "About:" msgstr "" -#: ../../addon/facebook/facebook.php:269 -msgid "Facebook Connect" +#: ../../include/profile_advanced.php:150 +msgid "Hobbies/Interests:" msgstr "" -#: ../../addon/facebook/facebook.php:275 -msgid "Install Facebook connector for this account." +#: ../../include/profile_advanced.php:162 +msgid "Contact information and Social Networks:" msgstr "" -#: ../../addon/facebook/facebook.php:282 -msgid "Remove Facebook connector" +#: ../../include/profile_advanced.php:174 +msgid "Musical interests:" msgstr "" -#: ../../addon/facebook/facebook.php:288 -msgid "Post to Facebook by default" +#: ../../include/profile_advanced.php:186 +msgid "Books, literature:" msgstr "" -#: ../../addon/facebook/facebook.php:350 -msgid "Facebook" +#: ../../include/profile_advanced.php:198 +msgid "Television:" msgstr "" -#: ../../addon/facebook/facebook.php:351 -msgid "Facebook Connector Settings" +#: ../../include/profile_advanced.php:210 +msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../addon/facebook/facebook.php:365 -msgid "Post to Facebook" +#: ../../include/profile_advanced.php:222 +msgid "Love/Romance:" msgstr "" -#: ../../addon/facebook/facebook.php:434 -msgid "" -"Post to Facebook cancelled because of multi-network access permission " -"conflict." +#: ../../include/profile_advanced.php:234 +msgid "Work/employment:" msgstr "" -#: ../../addon/facebook/facebook.php:500 -msgid "Image: " -msgstr "" - -#: ../../addon/facebook/facebook.php:561 -msgid "View on Friendika" -msgstr "" - -#: ../../addon/widgets/widgets.php:38 -msgid "Widgets key: " -msgstr "" - -#: ../../addon/widgets/widgets.php:42 -msgid "Generate new key" -msgstr "" - -#: ../../addon/widgets/widget_friends.php:30 -msgid "Connect on Friendika!" -msgstr "" - -#: ../../addon/randplace/randplace.php:171 -msgid "Randplace Settings" -msgstr "" - -#: ../../addon/randplace/randplace.php:173 -msgid "Enable Randplace Plugin" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:39 -msgid "Upload a file" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:40 -msgid "Drop files here to upload" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:42 -msgid "Failed" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:288 -msgid "No files were uploaded." -msgstr "" - -#: ../../addon/js_upload/js_upload.php:294 -msgid "Uploaded file is empty" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:299 -msgid "Uploaded file is too large" -msgstr "" - -#: ../../addon/js_upload/js_upload.php:317 -msgid "File has an invalid extension, it should be one of " -msgstr "" - -#: ../../addon/js_upload/js_upload.php:328 -msgid "Upload was cancelled, or server error encountered" -msgstr "" - -#: ../../include/notifier.php:414 -msgid "(no subject)" +#: ../../include/profile_advanced.php:246 +msgid "School/education:" msgstr "" #: ../../include/contact_selectors.php:32 @@ -3202,34 +3120,58 @@ msgstr "" msgid "Ask me" msgstr "" -#: ../../include/acl_selectors.php:133 -msgid "Visible To:" +#: ../../include/oembed.php:95 +msgid "Embedding disabled" msgstr "" -#: ../../include/acl_selectors.php:133 -msgid "everybody" +#: ../../include/group.php:146 +msgid "Create a new group" msgstr "" -#: ../../include/acl_selectors.php:137 ../../include/acl_selectors.php:152 -msgid "Groups" +#: ../../include/group.php:147 +msgid "Everybody" msgstr "" -#: ../../include/acl_selectors.php:148 -msgid "Except For:" +#: ../../include/nav.php:41 ../../boot.php:865 +msgid "Logout" +msgstr "" + +#: ../../include/nav.php:44 ../../boot.php:843 ../../boot.php:849 +msgid "Login" +msgstr "" + +#: ../../include/nav.php:55 ../../include/nav.php:92 +msgid "Home" +msgstr "" + +#: ../../include/nav.php:68 +msgid "Apps" +msgstr "" + +#: ../../include/nav.php:80 +msgid "Directory" +msgstr "" + +#: ../../include/nav.php:90 +msgid "Network" +msgstr "" + +#: ../../include/nav.php:98 +msgid "Notifications" +msgstr "" + +#: ../../include/nav.php:104 +msgid "Manage" +msgstr "" + +#: ../../include/nav.php:107 +msgid "Settings" msgstr "" #: ../../include/auth.php:27 msgid "Logged out." msgstr "" -#: ../../include/bbcode.php:83 -msgid "Image/photo" -msgstr "" - -#: ../../include/poller.php:380 -msgid "From: " -msgstr "" - #: ../../include/datetime.php:44 ../../include/datetime.php:46 msgid "Miscellaneous" msgstr "" @@ -3294,214 +3236,12 @@ msgstr "" msgid " ago" msgstr "" -#: ../../include/profile_advanced.php:36 ../../include/items.php:1086 -msgid "Birthday:" +#: ../../include/poller.php:380 +msgid "From: " msgstr "" -#: ../../include/profile_advanced.php:45 -msgid "j F, Y" -msgstr "" - -#: ../../include/profile_advanced.php:46 -msgid "j F" -msgstr "" - -#: ../../include/profile_advanced.php:59 -msgid "Age:" -msgstr "" - -#: ../../include/profile_advanced.php:70 -msgid "♥ Status:" -msgstr "" - -#: ../../include/profile_advanced.php:127 -msgid "Religion:" -msgstr "" - -#: ../../include/profile_advanced.php:138 -msgid "About:" -msgstr "" - -#: ../../include/profile_advanced.php:150 -msgid "Hobbies/Interests:" -msgstr "" - -#: ../../include/profile_advanced.php:162 -msgid "Contact information and Social Networks:" -msgstr "" - -#: ../../include/profile_advanced.php:174 -msgid "Musical interests:" -msgstr "" - -#: ../../include/profile_advanced.php:186 -msgid "Books, literature:" -msgstr "" - -#: ../../include/profile_advanced.php:198 -msgid "Television:" -msgstr "" - -#: ../../include/profile_advanced.php:210 -msgid "Film/dance/culture/entertainment:" -msgstr "" - -#: ../../include/profile_advanced.php:222 -msgid "Love/Romance:" -msgstr "" - -#: ../../include/profile_advanced.php:234 -msgid "Work/employment:" -msgstr "" - -#: ../../include/profile_advanced.php:246 -msgid "School/education:" -msgstr "" - -#: ../../include/nav.php:55 ../../include/nav.php:92 -msgid "Home" -msgstr "" - -#: ../../include/nav.php:68 -msgid "Apps" -msgstr "" - -#: ../../include/nav.php:80 -msgid "Directory" -msgstr "" - -#: ../../include/nav.php:90 -msgid "Network" -msgstr "" - -#: ../../include/nav.php:98 -msgid "Notifications" -msgstr "" - -#: ../../include/nav.php:104 -msgid "Manage" -msgstr "" - -#: ../../include/nav.php:107 -msgid "Settings" -msgstr "" - -#: ../../include/conversation.php:189 ../../include/conversation.php:446 -#: ../../include/conversation.php:447 -#, php-format -msgid "View %s's profile" -msgstr "" - -#: ../../include/conversation.php:205 -msgid "View in context" -msgstr "" - -#: ../../include/conversation.php:276 -msgid "See more posts like this" -msgstr "" - -#: ../../include/conversation.php:301 -#, php-format -msgid "See all %d comments" -msgstr "" - -#: ../../include/conversation.php:448 -msgid "to" -msgstr "" - -#: ../../include/conversation.php:449 -msgid "Wall-to-Wall" -msgstr "" - -#: ../../include/conversation.php:450 -msgid "via Wall-To-Wall:" -msgstr "" - -#: ../../include/conversation.php:588 -msgid "View status" -msgstr "" - -#: ../../include/conversation.php:589 -msgid "View profile" -msgstr "" - -#: ../../include/conversation.php:590 -msgid "View photos" -msgstr "" - -#: ../../include/conversation.php:591 -msgid "View recent" -msgstr "" - -#: ../../include/conversation.php:593 -msgid "Send PM" -msgstr "" - -#: ../../include/conversation.php:643 -#, php-format -msgid "%s likes this." -msgstr "" - -#: ../../include/conversation.php:643 -#, php-format -msgid "%s doesn't like this." -msgstr "" - -#: ../../include/conversation.php:647 -#, php-format -msgid "%2$d people like this." -msgstr "" - -#: ../../include/conversation.php:649 -#, php-format -msgid "%2$d people don't like this." -msgstr "" - -#: ../../include/conversation.php:655 -msgid "and" -msgstr "" - -#: ../../include/conversation.php:658 -#, php-format -msgid ", and %d other people" -msgstr "" - -#: ../../include/conversation.php:659 -#, php-format -msgid "%s like this." -msgstr "" - -#: ../../include/conversation.php:659 -#, php-format -msgid "%s don't like this." -msgstr "" - -#: ../../include/conversation.php:678 -msgid "Visible to everybody" -msgstr "" - -#: ../../include/conversation.php:680 -msgid "Please enter a YouTube link:" -msgstr "" - -#: ../../include/conversation.php:681 -msgid "Please enter a video(.ogg) link/URL:" -msgstr "" - -#: ../../include/conversation.php:682 -msgid "Please enter an audio(.ogg) link/URL:" -msgstr "" - -#: ../../include/conversation.php:683 -msgid "Where are you right now?" -msgstr "" - -#: ../../include/conversation.php:684 -msgid "Enter a title for this item" -msgstr "" - -#: ../../include/conversation.php:734 -msgid "Set title" +#: ../../include/bbcode.php:83 +msgid "Image/photo" msgstr "" #: ../../include/dba.php:31 @@ -3509,18 +3249,327 @@ msgstr "" msgid "Cannot locate DNS info for database server '%s'" msgstr "" +#: ../../include/acl_selectors.php:133 +msgid "Visible To:" +msgstr "" + +#: ../../include/acl_selectors.php:133 +msgid "everybody" +msgstr "" + +#: ../../include/acl_selectors.php:137 ../../include/acl_selectors.php:152 +msgid "Groups" +msgstr "" + +#: ../../include/acl_selectors.php:148 +msgid "Except For:" +msgstr "" + +#: ../../include/notifier.php:414 +msgid "(no subject)" +msgstr "" + #: ../../include/items.php:1447 msgid "You have a new follower at " msgstr "" -#: ../../include/group.php:146 -msgid "Create a new group" +#: ../../include/conversation.php:191 ../../include/conversation.php:451 +#: ../../include/conversation.php:452 +#, php-format +msgid "View %s's profile" msgstr "" -#: ../../include/group.php:147 -msgid "Everybody" +#: ../../include/conversation.php:207 +msgid "View in context" msgstr "" -#: ../../include/oembed.php:57 -msgid "Embedding disabled" +#: ../../include/conversation.php:278 +msgid "See more posts like this" +msgstr "" + +#: ../../include/conversation.php:303 +#, php-format +msgid "See all %d comments" +msgstr "" + +#: ../../include/conversation.php:453 +msgid "to" +msgstr "" + +#: ../../include/conversation.php:454 +msgid "Wall-to-Wall" +msgstr "" + +#: ../../include/conversation.php:455 +msgid "via Wall-To-Wall:" +msgstr "" + +#: ../../include/conversation.php:593 +msgid "View status" +msgstr "" + +#: ../../include/conversation.php:594 +msgid "View profile" +msgstr "" + +#: ../../include/conversation.php:595 +msgid "View photos" +msgstr "" + +#: ../../include/conversation.php:596 +msgid "View recent" +msgstr "" + +#: ../../include/conversation.php:598 +msgid "Send PM" +msgstr "" + +#: ../../include/conversation.php:648 +#, php-format +msgid "%s likes this." +msgstr "" + +#: ../../include/conversation.php:648 +#, php-format +msgid "%s doesn't like this." +msgstr "" + +#: ../../include/conversation.php:652 +#, php-format +msgid "%2$d people like this." +msgstr "" + +#: ../../include/conversation.php:654 +#, php-format +msgid "%2$d people don't like this." +msgstr "" + +#: ../../include/conversation.php:660 +msgid "and" +msgstr "" + +#: ../../include/conversation.php:663 +#, php-format +msgid ", and %d other people" +msgstr "" + +#: ../../include/conversation.php:664 +#, php-format +msgid "%s like this." +msgstr "" + +#: ../../include/conversation.php:664 +#, php-format +msgid "%s don't like this." +msgstr "" + +#: ../../include/conversation.php:683 +msgid "Visible to everybody" +msgstr "" + +#: ../../include/conversation.php:685 +msgid "Please enter a YouTube link:" +msgstr "" + +#: ../../include/conversation.php:686 +msgid "Please enter a video(.ogg) link/URL:" +msgstr "" + +#: ../../include/conversation.php:687 +msgid "Please enter an audio(.ogg) link/URL:" +msgstr "" + +#: ../../include/conversation.php:688 +msgid "Where are you right now?" +msgstr "" + +#: ../../include/conversation.php:689 +msgid "Enter a title for this item" +msgstr "" + +#: ../../include/conversation.php:740 +msgid "Set title" +msgstr "" + +#: ../../boot.php:385 +msgid "Delete this item?" +msgstr "" + +#: ../../boot.php:834 +msgid "Create a New Account" +msgstr "" + +#: ../../boot.php:841 +msgid "Nickname or Email address: " +msgstr "" + +#: ../../boot.php:842 +msgid "Password: " +msgstr "" + +#: ../../boot.php:847 +msgid "Nickname/Email/OpenID: " +msgstr "" + +#: ../../boot.php:848 +msgid "Password (if not OpenID): " +msgstr "" + +#: ../../boot.php:851 +msgid "Forgot your password?" +msgstr "" + +#: ../../boot.php:1113 +msgid "prev" +msgstr "" + +#: ../../boot.php:1115 +msgid "first" +msgstr "" + +#: ../../boot.php:1144 +msgid "last" +msgstr "" + +#: ../../boot.php:1147 +msgid "next" +msgstr "" + +#: ../../boot.php:2046 +msgid "No contacts" +msgstr "" + +#: ../../boot.php:2054 +#, php-format +msgid "%d Contact" +msgid_plural "%d Contacts" +msgstr[0] "" +msgstr[1] "" + +#: ../../boot.php:2329 +msgid "Connect" +msgstr "" + +#: ../../boot.php:2344 +msgid "Location:" +msgstr "" + +#: ../../boot.php:2348 +msgid ", " +msgstr "" + +#: ../../boot.php:2360 +msgid "Status:" +msgstr "" + +#: ../../boot.php:2457 +msgid "Monday" +msgstr "" + +#: ../../boot.php:2457 +msgid "Tuesday" +msgstr "" + +#: ../../boot.php:2457 +msgid "Wednesday" +msgstr "" + +#: ../../boot.php:2457 +msgid "Thursday" +msgstr "" + +#: ../../boot.php:2457 +msgid "Friday" +msgstr "" + +#: ../../boot.php:2457 +msgid "Saturday" +msgstr "" + +#: ../../boot.php:2457 +msgid "Sunday" +msgstr "" + +#: ../../boot.php:2461 +msgid "January" +msgstr "" + +#: ../../boot.php:2461 +msgid "February" +msgstr "" + +#: ../../boot.php:2461 +msgid "March" +msgstr "" + +#: ../../boot.php:2461 +msgid "April" +msgstr "" + +#: ../../boot.php:2461 +msgid "May" +msgstr "" + +#: ../../boot.php:2461 +msgid "June" +msgstr "" + +#: ../../boot.php:2461 +msgid "July" +msgstr "" + +#: ../../boot.php:2461 +msgid "August" +msgstr "" + +#: ../../boot.php:2461 +msgid "September" +msgstr "" + +#: ../../boot.php:2461 +msgid "October" +msgstr "" + +#: ../../boot.php:2461 +msgid "November" +msgstr "" + +#: ../../boot.php:2461 +msgid "December" +msgstr "" + +#: ../../boot.php:2476 +msgid "g A l F d" +msgstr "" + +#: ../../boot.php:2494 +msgid "Birthday Reminders" +msgstr "" + +#: ../../boot.php:2495 +msgid "Birthdays this week:" +msgstr "" + +#: ../../boot.php:2496 +msgid "(Adjusted for local time)" +msgstr "" + +#: ../../boot.php:2507 +msgid "[today]" +msgstr "" + +#: ../../boot.php:2570 +msgid "bytes" +msgstr "" + +#: ../../boot.php:2744 +msgid "link to source" +msgstr "" + +#: ../../index.php:199 +msgid "Not Found" +msgstr "" + +#: ../../index.php:200 +msgid "Page not found." msgstr "" diff --git a/util/strings.php b/util/strings.php index 0000e30f6a..659b0a2df1 100644 --- a/util/strings.php +++ b/util/strings.php @@ -58,12 +58,16 @@ $a->strings['Birthday Reminders'] = 'Birthday Reminders'; $a->strings['Birthdays this week:'] = 'Birthdays this week:'; $a->strings["\x28Adjusted for local time\x29"] = "\x28Adjusted for local time\x29"; $a->strings['[today]'] = '[today]'; +$a->strings['bytes'] = 'bytes'; $a->strings['link to source'] = 'link to source'; $a->strings['%d Contact'] = array( 0 => '%d Contact', 1 => '%d Contacts', ); $a->strings['Applications'] = 'Applications'; +$a->strings['Private Notes'] = 'Private Notes'; +$a->strings['Item not available.'] = 'Item not available.'; +$a->strings['Item was not found.'] = 'Item was not found.'; $a->strings["Invite Friends"] = "Invite Friends"; $a->strings['Find People With Shared Interests'] = 'Find People With Shared Interests'; $a->strings['Connect/Follow'] = 'Connect/Follow'; @@ -153,7 +157,8 @@ $a->strings['Unable to update your contact profile details on our system'] = 'Un $a->strings["Connection accepted at %s"] = "Connection accepted at %s"; $a->strings['Administrator'] = 'Administrator'; $a->strings['noreply'] = 'noreply'; -$a->strings["%s commented on an item at %s"] = "%s commented on an item at %s"; +$a->strings['%s commented on an item at %s'] = '%s commented on an item at %s'; +$a->strings[" commented on an item at "] = " commented on an item at "; $a->strings["This introduction has already been accepted."] = "This introduction has already been accepted."; $a->strings['Profile location is not valid or does not contain profile information.'] = 'Profile location is not valid or does not contain profile information.'; $a->strings['Warning: profile location has no identifiable owner name.'] = 'Warning: profile location has no identifiable owner name.'; @@ -199,6 +204,8 @@ $a->strings["%d required parameter was not found at the given location"] = array 1 => "%d required parameters were not found at the given location", ); $a->strings['Global Directory'] = 'Global Directory'; +$a->strings['Normal site view'] = 'Normal site view'; +$a->strings['View all site entries'] = 'View all site entries'; $a->strings['Site Directory'] = 'Site Directory'; $a->strings['Age: '] = 'Age: '; $a->strings['Gender: '] = 'Gender: '; @@ -208,9 +215,11 @@ $a->strings['Item has been removed.'] = 'Item has been removed.'; $a->strings['Shared content is covered by the Creative Commons Attribution 3.0 license.'] = 'Shared content is covered by the Creative Commons Attribution 3.0 license.'; $a->strings['Item not found'] = 'Item not found'; $a->strings['Edit post'] = 'Edit post'; +$a->strings['Visible to everybody'] = 'Visible to everybody'; $a->strings["Post to Email"] = "Post to Email"; $a->strings['Edit'] = 'Edit'; $a->strings['Upload photo'] = 'Upload photo'; +$a->strings['Attach file'] = 'Attach file'; $a->strings['Insert web link'] = 'Insert web link'; $a->strings['Insert YouTube video'] = 'Insert YouTube video'; $a->strings['Insert Vorbis [.ogg] video'] = 'Insert Vorbis [.ogg] video'; @@ -220,8 +229,12 @@ $a->strings['Clear browser location'] = 'Clear browser location'; $a->strings['Please wait'] = 'Please wait'; $a->strings['Permission settings'] = 'Permission settings'; $a->strings['CC: email addresses'] = 'CC: email addresses'; +$a->strings['Public post'] = 'Public post'; $a->strings['Example: bob@example.com, mary@example.com'] = 'Example: bob@example.com, mary@example.com'; $a->strings['The profile address specified does not provide adequate information.'] = 'The profile address specified does not provide adequate information.'; +$a->strings['No compatible communication protocols or feeds were discovered.'] = 'No compatible communication protocols or feeds were discovered.'; +$a->strings['An author or name was not found.'] = 'An author or name was not found.'; +$a->strings['No browser URL could be matched to this address.'] = 'No browser URL could be matched to this address.'; $a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Limited profile. This person will be unable to receive direct/personal notifications from you.'; $a->strings['Unable to retrieve contact information.'] = 'Unable to retrieve contact information.'; $a->strings['following'] = 'following'; @@ -287,6 +300,7 @@ $a->strings['If not, you may be required to perform a manual installation. Pleas $a->strings['The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'] = 'The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'; $a->strings['Errors encountered creating database tables.'] = 'Errors encountered creating database tables.'; $a->strings['%s : Not a valid email address.'] = '%s : Not a valid email address.'; +$a->strings['Please join my network on %s'] = 'Please join my network on %s'; $a->strings['%s : Message delivery failed.'] = '%s : Message delivery failed.'; $a->strings['Send invitations'] = 'Send invitations'; $a->strings['Enter email addresses, one per line:'] = 'Enter email addresses, one per line:'; @@ -300,8 +314,6 @@ $a->strings["%d message sent."] = array( $a->strings['Unable to locate original post.'] = 'Unable to locate original post.'; $a->strings['Empty post discarded.'] = 'Empty post discarded.'; $a->strings['Wall Photos'] = 'Wall Photos'; -$a->strings["%s commented on your item at %s"] = "%s commented on your item at %s"; -$a->strings["%s posted on your profile wall at %s"] = "%s posted on your profile wall at %s"; $a->strings['System error. Post not saved.'] = 'System error. Post not saved.'; $a->strings['This message was sent to you by %s, a member of the Friendika social network.'] = 'This message was sent to you by %s, a member of the Friendika social network.'; $a->strings['You may visit them online at %s'] = 'You may visit them online at %s'; @@ -354,7 +366,6 @@ $a->strings['Delete message'] = 'Delete message'; $a->strings['Send Reply'] = 'Send Reply'; $a->strings['Normal View'] = 'Normal View'; $a->strings['New Item View'] = 'New Item View'; -$a->strings['Warning: This group contains %s from an insecure network.'] = 'Warning: This group contains %s from an insecure network.'; $a->strings['Private messages to this group are at risk of public disclosure.'] = 'Private messages to this group are at risk of public disclosure.'; $a->strings['No such group'] = 'No such group'; $a->strings['Group is empty'] = 'Group is empty'; @@ -362,10 +373,11 @@ $a->strings['Group: '] = 'Group: '; $a->strings['Contact: '] = 'Contact: '; $a->strings['Private messages to this person are at risk of public disclosure.'] = 'Private messages to this person are at risk of public disclosure.'; $a->strings['Invalid contact.'] = 'Invalid contact.'; -$a->strings['%d member'] = array( - 0 => '%d member', - 1 => '%d members', +$a->strings['Warning: This group contains %s member from an insecure network.'] = array( + 0 => 'Warning: This group contains %s member from an insecure network.', + 1 => 'Warning: This group contains %s members from an insecure network.', ); +$a->strings['Save'] = 'Save'; $a->strings['Invalid request identifier.'] = 'Invalid request identifier.'; $a->strings['Discard'] = 'Discard'; $a->strings['Ignore'] = 'Ignore'; @@ -412,11 +424,11 @@ $a->strings['Edit Album'] = 'Edit Album'; $a->strings['View Photo'] = 'View Photo'; $a->strings['Photo not available'] = 'Photo not available'; $a->strings['Edit photo'] = 'Edit photo'; +$a->strings['Use as profile photo'] = 'Use as profile photo'; $a->strings['Private Message'] = 'Private Message'; $a->strings['<< Prev'] = '<< Prev'; $a->strings['View Full Size'] = 'View Full Size'; $a->strings['Next >>'] = 'Next >>'; -$a->strings['Tags: '] = 'Tags: '; $a->strings['[Remove any tag]'] = '[Remove any tag]'; $a->strings['New album name'] = 'New album name'; $a->strings['Caption'] = 'Caption'; @@ -429,6 +441,7 @@ $a->strings['This is you'] = 'This is you'; $a->strings['Recent Photos'] = 'Recent Photos'; $a->strings['Upload New Photos'] = 'Upload New Photos'; $a->strings['View Album'] = 'View Album'; +$a->strings['Access to this profile has been restricted.'] = 'Access to this profile has been restricted.'; $a->strings['Status'] = 'Status'; $a->strings['Profile'] = 'Profile'; $a->strings['Photos'] = 'Photos'; @@ -450,7 +463,8 @@ $a->strings['Profile deleted.'] = 'Profile deleted.'; $a->strings['Profile-'] = 'Profile-'; $a->strings['New profile created.'] = 'New profile created.'; $a->strings['Profile unavailable to clone.'] = 'Profile unavailable to clone.'; -$a->strings['Hide my contact/friend list from viewers of this profile?'] = 'Hide my contact/friend list from viewers of this profile?'; +$a->strings['Hide your contact/friend list from viewers of this profile?'] = 'Hide your contact/friend list from viewers of this profile?'; +$a->strings['Hide profile details and all your messages from unknown viewers?'] = 'Hide profile details and all your messages from unknown viewers?'; $a->strings['Edit Profile Details'] = 'Edit Profile Details'; $a->strings['View this profile'] = 'View this profile'; $a->strings['Create a new profile using these settings'] = 'Create a new profile using these settings'; @@ -600,8 +614,12 @@ $a->strings['Tag removed'] = 'Tag removed'; $a->strings['Remove Item Tag'] = 'Remove Item Tag'; $a->strings['Select a tag to remove: '] = 'Select a tag to remove: '; $a->strings['Remove'] = 'Remove'; +$a->strings['[Embedded content - reload page to view]'] = '[Embedded content - reload page to view]'; $a->strings['No contacts.'] = 'No contacts.'; +$a->strings['File upload failed.'] = 'File upload failed.'; +$a->strings['Image exceeds size limit of %d'] = 'Image exceeds size limit of %d'; $a->strings['Visible To:'] = 'Visible To:'; +$a->strings['everybody'] = 'everybody'; $a->strings['Groups'] = 'Groups'; $a->strings['Except For:'] = 'Except For:'; $a->strings['Logged out.'] = 'Logged out.'; @@ -633,7 +651,6 @@ $a->strings['and'] = 'and'; $a->strings[', and %d other people'] = ', and %d other people'; $a->strings['%s like this.'] = '%s like this.'; $a->strings['%s don\'t like this.'] = '%s don\'t like this.'; -$a->strings['Visible to everybody'] = 'Visible to everybody'; $a->strings['Please enter a YouTube link:'] = 'Please enter a YouTube link:'; $a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Please enter a video\x28.ogg\x29 link/URL:"; $a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Please enter an audio\x28.ogg\x29 link/URL:"; @@ -668,6 +685,7 @@ $a->strings['Manage'] = 'Manage'; $a->strings['Settings'] = 'Settings'; $a->strings["\x28no subject\x29"] = "\x28no subject\x29"; $a->strings['Embedding disabled'] = 'Embedding disabled'; +$a->strings['From: '] = 'From: '; $a->strings['j F, Y'] = 'j F, Y'; $a->strings['j F'] = 'j F'; $a->strings['Age:'] = 'Age:'; @@ -759,10 +777,18 @@ $a->strings['Uploaded file is empty'] = 'Uploaded file is empty'; $a->strings['Uploaded file is too large'] = 'Uploaded file is too large'; $a->strings['File has an invalid extension, it should be one of '] = 'File has an invalid extension, it should be one of '; $a->strings['Upload was cancelled, or server error encountered'] = 'Upload was cancelled, or server error encountered'; +$a->strings['OEmbed settings updated'] = 'OEmbed settings updated'; +$a->strings['URL to embed:'] = 'URL to embed:'; $a->strings['Randplace Settings'] = 'Randplace Settings'; $a->strings['Enable Randplace Plugin'] = 'Enable Randplace Plugin'; $a->strings['Post to StatusNet'] = 'Post to StatusNet'; +$a->strings['Please contact your site administrator.
The provided API URL is not valid.'] = 'Please contact your site administrator.
The provided API URL is not valid.'; +$a->strings['We could not contact the StatusNet API with the Path you entered.'] = 'We could not contact the StatusNet API with the Path you entered.'; +$a->strings['StatusNet settings updated.'] = 'StatusNet settings updated.'; $a->strings['StatusNet Posting Settings'] = 'StatusNet Posting Settings'; +$a->strings['Globally Available StatusNet OAuthKeys'] = 'Globally Available StatusNet OAuthKeys'; +$a->strings['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] = '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; +$a->strings['Provide your own OAuth Credentials'] = 'Provide your own OAuth Credentials'; $a->strings['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 and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.'] = '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 and enter the API base root.
Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.'; $a->strings['OAuth Consumer Key'] = 'OAuth Consumer Key'; $a->strings['OAuth Consumer Secret'] = 'OAuth Consumer Secret'; @@ -770,9 +796,11 @@ $a->strings["Base API Path \x28remember the trailing /\x29"] = "Base API Path \x $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.'] = '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.'; $a->strings['Log in with StatusNet'] = 'Log in with StatusNet'; $a->strings['Copy the security code from StatusNet here'] = 'Copy the security code from StatusNet here'; +$a->strings['Cancel StatusNet Connection'] = 'Cancel StatusNet Connection'; $a->strings['Currently connected to: '] = 'Currently connected to: '; -$a->strings['If enabled all your public postings will be posted to the associated StatusNet account as well.'] = 'If enabled all your public postings will be posted to the associated StatusNet account as well.'; -$a->strings['Send public postings to StatusNet'] = 'Send public postings to StatusNet'; +$a->strings['If enabled all your public postings will be posted to the associated StatusNet account.'] = 'If enabled all your public postings will be posted to the associated StatusNet account.'; +$a->strings['Allow posting to StatusNet'] = 'Allow posting to StatusNet'; +$a->strings['Send public postings to StatusNet by default'] = 'Send public postings to StatusNet by default'; $a->strings['Clear OAuth configuration'] = 'Clear OAuth configuration'; $a->strings['Three Dimensional Tic-Tac-Toe'] = 'Three Dimensional Tic-Tac-Toe'; $a->strings['3D Tic-Tac-Toe'] = '3D Tic-Tac-Toe'; @@ -793,6 +821,9 @@ $a->strings['At this Friendika instance the Twitter plugin was enabled but you h $a->strings['Copy the PIN from Twitter here'] = 'Copy the PIN from Twitter here'; $a->strings['If enabled all your public postings will be posted to the associated Twitter account as well.'] = 'If enabled all your public postings will be posted to the associated Twitter account as well.'; $a->strings['Send public postings to Twitter'] = 'Send public postings to Twitter'; +$a->strings['Connect on Friendika!'] = 'Connect on Friendika!'; +$a->strings['Widgets key: '] = 'Widgets key: '; +$a->strings["Plugin Settings"] = "Plugin Settings"; $a->strings['Africa/Abidjan'] = 'Africa/Abidjan'; $a->strings['Africa/Accra'] = 'Africa/Accra'; $a->strings['Africa/Addis_Ababa'] = 'Africa/Addis_Ababa'; diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 9ef5df0ce9..51cb6dd4a1 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -336,6 +336,9 @@ aside #viewcontacts { text-align: right;} #acl-wrapper-end, #profile-jot-end { clear: both; height: 5px; } + + + /** * section */ @@ -441,7 +444,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;} height: 30px; } -.wallwall .wwto img { width: 30px; height: 30px;} +.wallwall .wwto img { width: 30px!important; height: 30px!important;} .wallwall .wall-item-photo-end { clear: both; } .wall-item-arrowphoto-wrapper { position: absolute; @@ -474,7 +477,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;} .ccollapse-wrapper { font-size: 0.9em; margin-left: 80px; } .wall-item-outside-wrapper.comment { margin-left: 80px; } -.wall-item-outside-wrapper.comment .wall-item-photo { width: 40px; height: 40px;} +.wall-item-outside-wrapper.comment .wall-item-photo { width: 40px!important; height: 40px!important;} .wall-item-outside-wrapper.comment .wall-item-photo-wrapper {width: 40px; height: 40px; } .wall-item-outside-wrapper.comment .wall-item-photo-menu-button { width: 50px; top: 45px; background-position: 35px center; @@ -719,7 +722,8 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;} /** * contacts selector */ - +#group-edit-desc { margin: 10px 0xp; } +#group-members, #prof-members { height: 200px; overflow: auto; @@ -728,6 +732,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;} -moz-border-radius: 5px 5px 0px 0px; border-radius: 5px 5px 0px 0px; } +#group-all-contacts, #prof-all-contacts { height: 200px; overflow: auto; @@ -736,6 +741,8 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;} -moz-border-radius: 0px 0px 5px 5px; border-radius: 0px 0px 5px 5px; } +#group-members h3, +#group-all-contacts h3, #prof-members h3, #prof-all-contacts h3{ color: #eeeeec; @@ -743,7 +750,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;} margin: 0px; padding: 5px; } - +#group-separator, #prof-separator { display: none;} /** @@ -807,7 +814,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;} .attachtype { display: block; width: 20px; height: 23px; - background-image: url('../../../images/content-types.gif'); + background-image: url('../../../images/content-types.png'); } .type-video { background-position: 0px; 0px; } diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index f44931a5f0..2bac4238ea 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2434,7 +2434,7 @@ a.mail-list-link { .attachtype { display: block; width: 20px; height: 23px; float: left; - background-image: url('../../../images/content-types.gif'); + background-image: url('../../../images/content-types.png'); } .body-attach { diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css index 370e5c61a4..9c6c0120b8 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -114,8 +114,10 @@ blockquote:before { #profile-link, #profile-title, #wall-image-upload, +#wall-file-upload, #profile-upload-wrapper, #wall-image-upload-div, +#wall-file-upload-div, .hover, .focus { cursor: pointer; } @@ -1203,7 +1205,10 @@ padding: 5px 10px 0px; float: left; margin-left: 30px; } - +#profile-attach-wrapper { + float: left; + margin-left: 30px; +} #profile-rotator { float: left; margin-left: 30px; @@ -2445,7 +2450,7 @@ a.mail-list-link { .attachtype { display: block; width: 20px; height: 23px; float: left; - background-image: url('../../../images/content-types.gif'); + background-image: url('../../../images/content-types.png'); } .body-attach {