From 4ab363ed717fc4932b657f64fac4ff033bd6d867 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 7 Jan 2013 20:14:00 -0800 Subject: [PATCH] bypass smarty wherever using intltext_templates (install, register, friend confirmation emails, etc.) --- boot.php | 9 +- include/items.php | 7 + mod/dfrn_confirm.php | 9 + mod/install.php | 4 + mod/lostpass.php | 9 + mod/register.php | 15 + mod/regmod.php | 7 + util/messages.po | 938 ++++++++++++++++++++++--------------------- 8 files changed, 537 insertions(+), 461 deletions(-) diff --git a/boot.php b/boot.php index a0febceeb5..1277585bcf 100644 --- a/boot.php +++ b/boot.php @@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('include/features.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.1.1578' ); +define ( 'FRIENDICA_VERSION', '3.1.1581' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1157 ); @@ -839,6 +839,10 @@ if(! function_exists('check_config')) { $retval = $func(); if($retval) { //send the administrator an e-mail + + $engine = get_app()->get_template_engine(); + get_app()->set_template_engine(); + $email_tpl = get_intltext_template("update_fail_eml.tpl"); $email_msg = replace_macros($email_tpl, array( '$sitename' => $a->config['sitename'], @@ -846,6 +850,9 @@ if(! function_exists('check_config')) { '$update' => $x, '$error' => sprintf( t('Update %s failed. See error logs.'), $x) )); + + get_app()->set_template_engine($engine); + $subject=sprintf(t('Update Error at %s'), $a->get_baseurl()); require_once('include/email.php'); $subject = email_header_encode($subject,'UTF-8'); diff --git a/include/items.php b/include/items.php index b465c444ed..f65032c968 100755 --- a/include/items.php +++ b/include/items.php @@ -3361,6 +3361,10 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) { } if(($r[0]['notify-flags'] & NOTIFY_INTRO) && ($r[0]['page-flags'] == PAGE_NORMAL)) { + + $engine = get_app()->get_template_engine(); + get_app()->set_template_engine(); + $email_tpl = get_intltext_template('follow_notify_eml.tpl'); $email = replace_macros($email_tpl, array( '$requestor' => ((strlen($name)) ? $name : t('[Name Withheld]')), @@ -3369,6 +3373,9 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) { '$siteurl' => $a->get_baseurl(), '$sitename' => $a->config['sitename'] )); + + get_app()->set_template_engine($engine); + $res = mail($r[0]['email'], email_header_encode((($sharing) ? t('A new person is sharing with you at ') : t("You have a new follower at ")) . $a->config['sitename'],'UTF-8'), $email, diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 769036c5e0..64fd6df2fd 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -737,6 +737,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) { ? get_intltext_template('friend_complete_eml.tpl') : get_intltext_template('intro_complete_eml.tpl')); + + $engine = get_app()->get_template_engine(); + get_app()->set_template_engine(); + + $email_tpl = replace_macros($tpl, array( '$sitename' => $a->config['sitename'], '$siteurl' => $a->get_baseurl(), @@ -746,6 +751,10 @@ function dfrn_confirm_post(&$a,$handsfree = null) { '$dfrn_url' => $r[0]['url'], '$uid' => $newuid ) ); + + + get_app()->set_template_engine($engine); + require_once('include/email.php'); $res = mail($r[0]['email'], email_header_encode( sprintf( t("Connection accepted at %s") , $a->config['sitename']),'UTF-8'), diff --git a/mod/install.php b/mod/install.php index 7247ebb2c1..91725cf2ff 100755 --- a/mod/install.php +++ b/mod/install.php @@ -73,6 +73,9 @@ function install_post(&$a) { // connect to db $db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true); + // disable smarty for this template + $engine = $a->get_template_engine(); + $a->set_template_engine(); $tpl = get_intltext_template('htconfig.tpl'); $txt = replace_macros($tpl,array( '$dbhost' => $dbhost, @@ -84,6 +87,7 @@ function install_post(&$a) { '$phpath' => $phpath, '$adminmail' => $adminmail )); + $a->set_template_engine($engine); $result = file_put_contents('.htconfig.php', $txt); if(! $result) { diff --git a/mod/lostpass.php b/mod/lostpass.php index cc31efd973..ac67f8b20a 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -32,6 +32,9 @@ function lostpass_post(&$a) { if($r) info( t('Password reset request issued. Check your email.') . EOL); + $engine = get_app()->get_template_engine(); + get_app()->set_template_engine(); + $email_tpl = get_intltext_template("lostpass_eml.tpl"); $email_tpl = replace_macros($email_tpl, array( '$sitename' => $a->config['sitename'], @@ -41,6 +44,8 @@ function lostpass_post(&$a) { '$reset_link' => $a->get_baseurl() . '/lostpass?verify=' . $new_password )); + get_app()->set_template_engine($engine); + $res = mail($email, email_header_encode(sprintf( t('Password reset requested at %s'),$a->config['sitename']),'UTF-8'), $email_tpl, 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" @@ -94,6 +99,8 @@ function lostpass_content(&$a) { info("Your password has been reset." . EOL); + $engine = get_app()->get_template_engine(); + get_app()->set_template_engine(); $email_tpl = get_intltext_template("passchanged_eml.tpl"); $email_tpl = replace_macros($email_tpl, array( @@ -104,6 +111,8 @@ function lostpass_content(&$a) { '$new_password' => $new_password, '$uid' => $newuid )); + get_app()->set_template_engine($engine); + $subject = sprintf( t('Your password has been changed at %s'), $a->config['sitename']); $res = mail($email, email_header_encode( $subject, 'UTF-8'), $email_tpl, diff --git a/mod/register.php b/mod/register.php index 3532f92e8d..580101924c 100644 --- a/mod/register.php +++ b/mod/register.php @@ -79,6 +79,10 @@ function register_post(&$a) { set_pconfig($user['uid'],'system','invites_remaining',$num_invites); } + $engine = get_app()->get_template_engine(); + get_app()->set_template_engine(); + + $email_tpl = get_intltext_template("register_open_eml.tpl"); $email_tpl = replace_macros($email_tpl, array( '$sitename' => $a->config['sitename'], @@ -88,6 +92,10 @@ function register_post(&$a) { '$password' => $result['password'], '$uid' => $user['uid'] )); + + get_app()->set_template_engine($engine); + + $res = mail($user['email'], email_header_encode( sprintf( t('Registration details for %s'), $a->config['sitename']),'UTF-8'), $email_tpl, 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" @@ -131,6 +139,10 @@ function register_post(&$a) { set_pconfig($user['uid'],'system','invites_remaining',$num_invites); } + + $engine = get_app()->get_template_engine(); + get_app()->set_template_engine(); + $email_tpl = get_intltext_template("register_verify_eml.tpl"); $email_tpl = replace_macros($email_tpl, array( '$sitename' => $a->config['sitename'], @@ -142,6 +154,9 @@ function register_post(&$a) { '$hash' => $hash )); + get_app()->set_template_engine($engine); + + $res = mail($a->config['admin_email'], email_header_encode( sprintf(t('Registration request at %s'), $a->config['sitename']),'UTF-8'), $email_tpl, 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" diff --git a/mod/regmod.php b/mod/regmod.php index 5ed7642005..73bfc597b5 100644 --- a/mod/regmod.php +++ b/mod/regmod.php @@ -41,6 +41,9 @@ function user_allow($hash) { push_lang($register[0]['language']); + $engine = get_app()->get_template_engine(); + get_app()->set_template_engine(); + $email_tpl = get_intltext_template("register_open_eml.tpl"); $email_tpl = replace_macros($email_tpl, array( '$sitename' => $a->config['sitename'], @@ -51,6 +54,10 @@ function user_allow($hash) { '$uid' => $user[0]['uid'] )); + + get_app()->set_template_engine($engine); + + $res = mail($user[0]['email'], email_header_encode( sprintf(t('Registration details for %s'), $a->config['sitename']), 'UTF-8'), $email_tpl, 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" diff --git a/util/messages.po b/util/messages.po index 7aab4fbac1..2b808e1a48 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.1.1578\n" +"Project-Id-Version: 3.1.1581\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-04 10:00-0800\n" +"POT-Creation-Date: 2013-01-07 10:00-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -46,19 +46,19 @@ msgstr "" #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 #: ../../mod/group.php:19 ../../mod/viewcontacts.php:22 -#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:139 +#: ../../mod/register.php:40 ../../mod/regmod.php:118 ../../mod/item.php:139 #: ../../mod/item.php:155 ../../mod/mood.php:114 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:169 #: ../../mod/profile_photo.php:180 ../../mod/profile_photo.php:193 #: ../../mod/message.php:38 ../../mod/message.php:172 #: ../../mod/allfriends.php:9 ../../mod/nogroup.php:25 #: ../../mod/wall_upload.php:66 ../../mod/follow.php:9 -#: ../../mod/display.php:165 ../../mod/profiles.php:7 -#: ../../mod/profiles.php:431 ../../mod/delegate.php:6 -#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 -#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510 -#: ../../addon/facebook/facebook.php:516 ../../addon/fbpost/fbpost.php:166 -#: ../../addon/fbpost/fbpost.php:172 +#: ../../mod/display.php:173 ../../mod/profiles.php:9 +#: ../../mod/profiles.php:148 ../../mod/delegate.php:6 +#: ../../mod/suggest.php:28 ../../mod/invite.php:15 ../../mod/invite.php:83 +#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:512 +#: ../../addon/facebook/facebook.php:518 ../../addon/fbpost/fbpost.php:170 +#: ../../addon/fbpost/fbpost.php:176 #: ../../addon/dav/friendica/layout.fnk.php:354 #: ../../addon/tumblr/tumblr.php:34 ../../include/items.php:3987 #: ../../index.php:333 ../../addon.old/facebook/facebook.php:510 @@ -142,11 +142,11 @@ msgstr "" #: ../../mod/settings.php:1018 ../../mod/group.php:87 ../../mod/mood.php:137 #: ../../mod/message.php:301 ../../mod/message.php:527 ../../mod/admin.php:461 #: ../../mod/admin.php:728 ../../mod/admin.php:865 ../../mod/admin.php:1064 -#: ../../mod/admin.php:1151 ../../mod/profiles.php:604 -#: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:44 -#: ../../addon/facebook/facebook.php:619 +#: ../../mod/admin.php:1151 ../../mod/profiles.php:623 +#: ../../mod/invite.php:121 ../../addon/fromgplus/fromgplus.php:44 +#: ../../addon/facebook/facebook.php:621 #: ../../addon/snautofollow/snautofollow.php:64 -#: ../../addon/fbpost/fbpost.php:272 ../../addon/yourls/yourls.php:76 +#: ../../addon/fbpost/fbpost.php:280 ../../addon/yourls/yourls.php:76 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:88 #: ../../addon/page/page.php:211 ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 @@ -168,23 +168,23 @@ msgstr "" #: ../../addon/gravatar/gravatar.php:95 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93 #: ../../addon/jappixmini/jappixmini.php:307 -#: ../../addon/statusnet/statusnet.php:278 -#: ../../addon/statusnet/statusnet.php:292 -#: ../../addon/statusnet/statusnet.php:318 -#: ../../addon/statusnet/statusnet.php:325 -#: ../../addon/statusnet/statusnet.php:353 -#: ../../addon/statusnet/statusnet.php:703 ../../addon/tumblr/tumblr.php:233 +#: ../../addon/statusnet/statusnet.php:290 +#: ../../addon/statusnet/statusnet.php:304 +#: ../../addon/statusnet/statusnet.php:330 +#: ../../addon/statusnet/statusnet.php:337 +#: ../../addon/statusnet/statusnet.php:374 +#: ../../addon/statusnet/statusnet.php:752 ../../addon/tumblr/tumblr.php:233 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48 -#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 -#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:515 +#: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:191 +#: ../../addon/twitter/twitter.php:229 ../../addon/twitter/twitter.php:554 #: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77 #: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 -#: ../../view/theme/diabook/theme.php:643 +#: ../../view/theme/diabook/theme.php:642 #: ../../view/theme/diabook/config.php:152 #: ../../view/theme/quattro/config.php:64 ../../view/theme/dispy/config.php:70 -#: ../../object/Item.php:603 ../../addon.old/fromgplus/fromgplus.php:40 +#: ../../object/Item.php:609 ../../addon.old/fromgplus/fromgplus.php:40 #: ../../addon.old/facebook/facebook.php:619 #: ../../addon.old/snautofollow/snautofollow.php:64 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226 @@ -288,8 +288,8 @@ msgstr "" msgid "link to source" msgstr "" -#: ../../mod/events.php:358 ../../view/theme/diabook/theme.php:92 -#: ../../include/nav.php:52 ../../boot.php:1791 +#: ../../mod/events.php:358 ../../view/theme/diabook/theme.php:91 +#: ../../include/nav.php:52 ../../boot.php:1798 msgid "Events" msgstr "" @@ -348,7 +348,7 @@ msgstr "" #: ../../mod/events.php:459 ../../mod/directory.php:134 #: ../../addon/forumdirectory/forumdirectory.php:156 #: ../../include/event.php:40 ../../include/bb2diaspora.php:415 -#: ../../boot.php:1312 +#: ../../boot.php:1319 msgid "Location:" msgstr "" @@ -417,8 +417,8 @@ msgstr "" #: ../../mod/settings.php:969 ../../mod/settings.php:975 #: ../../mod/settings.php:1005 ../../mod/settings.php:1006 #: ../../mod/settings.php:1007 ../../mod/settings.php:1008 -#: ../../mod/settings.php:1009 ../../mod/register.php:237 -#: ../../mod/profiles.php:584 +#: ../../mod/settings.php:1009 ../../mod/register.php:239 +#: ../../mod/profiles.php:603 msgid "Yes" msgstr "" @@ -429,20 +429,20 @@ msgstr "" #: ../../mod/settings.php:969 ../../mod/settings.php:975 #: ../../mod/settings.php:1005 ../../mod/settings.php:1006 #: ../../mod/settings.php:1007 ../../mod/settings.php:1008 -#: ../../mod/settings.php:1009 ../../mod/register.php:238 -#: ../../mod/profiles.php:585 +#: ../../mod/settings.php:1009 ../../mod/register.php:240 +#: ../../mod/profiles.php:604 msgid "No" msgstr "" -#: ../../mod/photos.php:51 ../../boot.php:1784 +#: ../../mod/photos.php:51 ../../boot.php:1791 msgid "Photo Albums" msgstr "" #: ../../mod/photos.php:59 ../../mod/photos.php:154 ../../mod/photos.php:1009 #: ../../mod/photos.php:1102 ../../mod/photos.php:1125 #: ../../mod/photos.php:1626 ../../mod/photos.php:1638 -#: ../../addon/communityhome/communityhome.php:112 -#: ../../view/theme/diabook/theme.php:493 +#: ../../addon/communityhome/communityhome.php:115 +#: ../../view/theme/diabook/theme.php:492 #: ../../addon.old/communityhome/communityhome.php:110 msgid "Contact Photos" msgstr "" @@ -464,9 +464,9 @@ msgstr "" #: ../../mod/profile_photo.php:81 ../../mod/profile_photo.php:88 #: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296 #: ../../mod/profile_photo.php:305 -#: ../../addon/communityhome/communityhome.php:113 -#: ../../view/theme/diabook/theme.php:494 ../../include/user.php:324 -#: ../../include/user.php:331 ../../include/user.php:338 +#: ../../addon/communityhome/communityhome.php:116 +#: ../../view/theme/diabook/theme.php:493 ../../include/user.php:325 +#: ../../include/user.php:332 ../../include/user.php:339 #: ../../addon.old/communityhome/communityhome.php:111 msgid "Profile Photos" msgstr "" @@ -646,26 +646,26 @@ msgstr "" #: ../../mod/content.php:499 ../../mod/content.php:883 #: ../../mod/wallmessage.php:152 ../../mod/message.php:300 #: ../../mod/message.php:528 ../../include/conversation.php:645 -#: ../../include/conversation.php:1024 ../../object/Item.php:287 +#: ../../include/conversation.php:1024 ../../object/Item.php:292 msgid "Please wait" msgstr "" #: ../../mod/photos.php:1439 ../../mod/photos.php:1483 #: ../../mod/photos.php:1566 ../../mod/content.php:707 -#: ../../object/Item.php:600 +#: ../../object/Item.php:606 msgid "This is you" msgstr "" #: ../../mod/photos.php:1441 ../../mod/photos.php:1485 #: ../../mod/photos.php:1568 ../../mod/content.php:709 ../../boot.php:635 -#: ../../object/Item.php:284 ../../object/Item.php:602 +#: ../../object/Item.php:289 ../../object/Item.php:608 msgid "Comment" msgstr "" #: ../../mod/photos.php:1443 ../../mod/photos.php:1487 #: ../../mod/photos.php:1570 ../../mod/editpost.php:142 #: ../../mod/content.php:719 ../../include/conversation.php:1042 -#: ../../object/Item.php:612 +#: ../../object/Item.php:618 msgid "Preview" msgstr "" @@ -688,7 +688,7 @@ msgstr "" msgid "Not available." msgstr "" -#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:94 +#: ../../mod/community.php:32 ../../view/theme/diabook/theme.php:93 #: ../../include/nav.php:101 msgid "Community" msgstr "" @@ -1051,8 +1051,8 @@ msgstr "" #: ../../mod/uexport.php:48 ../../mod/settings.php:74 #: ../../mod/newmember.php:22 ../../mod/admin.php:824 ../../mod/admin.php:1029 #: ../../addon/dav/friendica/layout.fnk.php:225 -#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:538 -#: ../../view/theme/diabook/theme.php:659 ../../include/nav.php:140 +#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537 +#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:140 #: ../../addon.old/dav/friendica/layout.fnk.php:225 #: ../../addon.old/mathjax/mathjax.php:36 msgid "Settings" @@ -1428,7 +1428,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1250 +#: ../../include/contact_widgets.php:9 ../../boot.php:1257 msgid "Connect" msgstr "" @@ -1464,13 +1464,13 @@ msgstr "" #: ../../mod/content.php:472 ../../mod/content.php:852 #: ../../mod/content.php:853 ../../include/conversation.php:608 -#: ../../object/Item.php:252 ../../object/Item.php:253 +#: ../../object/Item.php:257 ../../object/Item.php:258 #, php-format msgid "View %s's profile @ %s" msgstr "" #: ../../mod/content.php:482 ../../mod/content.php:864 -#: ../../include/conversation.php:628 ../../object/Item.php:266 +#: ../../include/conversation.php:628 ../../object/Item.php:271 #, php-format msgid "%s from %s" msgstr "" @@ -1479,7 +1479,7 @@ msgstr "" msgid "View in context" msgstr "" -#: ../../mod/content.php:603 ../../object/Item.php:306 +#: ../../mod/content.php:603 ../../object/Item.php:312 #, php-format msgid "%d comment" msgid_plural "%d comments" @@ -1487,7 +1487,7 @@ msgstr[0] "" msgstr[1] "" #: ../../mod/content.php:605 ../../include/text.php:1503 -#: ../../object/Item.php:308 ../../object/Item.php:321 +#: ../../object/Item.php:314 ../../object/Item.php:327 msgid "comment" msgid_plural "comments" msgstr[0] "" @@ -1496,7 +1496,7 @@ msgstr[1] "" #: ../../mod/content.php:606 ../../addon/page/page.php:77 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119 #: ../../include/contact_widgets.php:204 ../../boot.php:636 -#: ../../object/Item.php:309 ../../addon.old/page/page.php:77 +#: ../../object/Item.php:315 ../../addon.old/page/page.php:77 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119 msgid "show more" msgstr "" @@ -1517,35 +1517,35 @@ msgstr "" msgid "share" msgstr "" -#: ../../mod/content.php:711 ../../object/Item.php:604 +#: ../../mod/content.php:711 ../../object/Item.php:610 msgid "Bold" msgstr "" -#: ../../mod/content.php:712 ../../object/Item.php:605 +#: ../../mod/content.php:712 ../../object/Item.php:611 msgid "Italic" msgstr "" -#: ../../mod/content.php:713 ../../object/Item.php:606 +#: ../../mod/content.php:713 ../../object/Item.php:612 msgid "Underline" msgstr "" -#: ../../mod/content.php:714 ../../object/Item.php:607 +#: ../../mod/content.php:714 ../../object/Item.php:613 msgid "Quote" msgstr "" -#: ../../mod/content.php:715 ../../object/Item.php:608 +#: ../../mod/content.php:715 ../../object/Item.php:614 msgid "Code" msgstr "" -#: ../../mod/content.php:716 ../../object/Item.php:609 +#: ../../mod/content.php:716 ../../object/Item.php:615 msgid "Image" msgstr "" -#: ../../mod/content.php:717 ../../object/Item.php:610 +#: ../../mod/content.php:717 ../../object/Item.php:616 msgid "Link" msgstr "" -#: ../../mod/content.php:718 ../../object/Item.php:611 +#: ../../mod/content.php:718 ../../object/Item.php:617 msgid "Video" msgstr "" @@ -1573,19 +1573,19 @@ msgstr "" msgid "save to folder" msgstr "" -#: ../../mod/content.php:854 ../../object/Item.php:254 +#: ../../mod/content.php:854 ../../object/Item.php:259 msgid "to" msgstr "" -#: ../../mod/content.php:855 ../../object/Item.php:256 +#: ../../mod/content.php:855 ../../object/Item.php:261 msgid "Wall-to-Wall" msgstr "" -#: ../../mod/content.php:856 ../../object/Item.php:257 +#: ../../mod/content.php:856 ../../object/Item.php:262 msgid "via Wall-To-Wall:" msgstr "" -#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:183 +#: ../../mod/home.php:30 ../../addon/communityhome/communityhome.php:189 #: ../../addon.old/communityhome/communityhome.php:179 #, php-format msgid "Welcome to %s" @@ -1618,7 +1618,7 @@ msgstr "" msgid "Personal" msgstr "" -#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:88 +#: ../../mod/notifications.php:93 ../../view/theme/diabook/theme.php:87 #: ../../include/nav.php:77 ../../include/nav.php:116 msgid "Home" msgstr "" @@ -2063,7 +2063,7 @@ msgstr "" msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:90 +#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89 #: ../../include/nav.php:144 msgid "Contacts" msgstr "" @@ -2083,81 +2083,71 @@ msgstr "" msgid "Find" msgstr "" -#: ../../mod/lostpass.php:16 +#: ../../mod/lostpass.php:17 msgid "No valid account found." msgstr "" -#: ../../mod/lostpass.php:32 +#: ../../mod/lostpass.php:33 msgid "Password reset request issued. Check your email." msgstr "" -#: ../../mod/lostpass.php:43 +#: ../../mod/lostpass.php:44 #, php-format msgid "Password reset requested at %s" msgstr "" -#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 -#: ../../mod/register.php:91 ../../mod/register.php:145 -#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752 -#: ../../addon/facebook/facebook.php:702 -#: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:805 -#: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3375 -#: ../../boot.php:852 ../../addon.old/facebook/facebook.php:702 -#: ../../addon.old/facebook/facebook.php:1200 -#: ../../addon.old/fbpost/fbpost.php:661 -#: ../../addon.old/public_server/public_server.php:62 -#: ../../addon.old/testdrive/testdrive.php:67 -msgid "Administrator" -msgstr "" - -#: ../../mod/lostpass.php:65 +#: ../../mod/lostpass.php:66 msgid "" "Request could not be verified. (You may have previously submitted it.) " "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:990 +#: ../../mod/lostpass.php:84 ../../boot.php:991 msgid "Password Reset" msgstr "" -#: ../../mod/lostpass.php:84 +#: ../../mod/lostpass.php:85 msgid "Your password has been reset as requested." msgstr "" -#: ../../mod/lostpass.php:85 +#: ../../mod/lostpass.php:86 msgid "Your new password is" msgstr "" -#: ../../mod/lostpass.php:86 +#: ../../mod/lostpass.php:87 msgid "Save or copy your new password - and then" msgstr "" -#: ../../mod/lostpass.php:87 +#: ../../mod/lostpass.php:88 msgid "click here to login" msgstr "" -#: ../../mod/lostpass.php:88 +#: ../../mod/lostpass.php:89 msgid "" "Your password may be changed from the Settings page after " "successful login." msgstr "" -#: ../../mod/lostpass.php:119 +#: ../../mod/lostpass.php:107 +#, php-format +msgid "Your password has been changed at %s" +msgstr "" + +#: ../../mod/lostpass.php:122 msgid "Forgot your Password?" msgstr "" -#: ../../mod/lostpass.php:120 +#: ../../mod/lostpass.php:123 msgid "" "Enter your email address and submit to have your password reset. Then check " "your email for further instructions." msgstr "" -#: ../../mod/lostpass.php:121 +#: ../../mod/lostpass.php:124 msgid "Nickname or Email: " msgstr "" -#: ../../mod/lostpass.php:122 +#: ../../mod/lostpass.php:125 msgid "Reset" msgstr "" @@ -2225,13 +2215,13 @@ msgstr "" msgid "Private forum has no privacy permissions and no default privacy group." msgstr "" -#: ../../mod/settings.php:488 ../../addon/facebook/facebook.php:495 -#: ../../addon/fbpost/fbpost.php:151 +#: ../../mod/settings.php:488 ../../addon/facebook/facebook.php:497 +#: ../../addon/fbpost/fbpost.php:155 #: ../../addon/remote_permissions/remote_permissions.php:205 #: ../../addon/impressum/impressum.php:78 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/altpager/altpager.php:107 ../../addon/mathjax/mathjax.php:66 -#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:504 +#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:548 #: ../../addon.old/facebook/facebook.php:495 #: ../../addon.old/fbpost/fbpost.php:144 #: ../../addon.old/impressum/impressum.php:78 @@ -2247,13 +2237,13 @@ msgid "Add application" msgstr "" #: ../../mod/settings.php:563 ../../mod/settings.php:589 -#: ../../addon/statusnet/statusnet.php:697 +#: ../../addon/statusnet/statusnet.php:747 #: ../../addon.old/statusnet/statusnet.php:570 msgid "Consumer Key" msgstr "" #: ../../mod/settings.php:564 ../../mod/settings.php:590 -#: ../../addon/statusnet/statusnet.php:696 +#: ../../addon/statusnet/statusnet.php:746 #: ../../addon.old/statusnet/statusnet.php:569 msgid "Consumer Secret" msgstr "" @@ -2359,7 +2349,7 @@ msgid "Security:" msgstr "" #: ../../mod/settings.php:732 ../../mod/settings.php:737 -#: ../../addon/fbpost/fbpost.php:247 ../../addon/fbpost/fbpost.php:249 +#: ../../addon/fbpost/fbpost.php:255 ../../addon/fbpost/fbpost.php:257 #: ../../addon/dav/common/wdcal_edit.inc.php:191 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191 msgid "None" @@ -2792,14 +2782,14 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1798 +#: ../../mod/notes.php:44 ../../boot.php:1805 msgid "Personal Notes" msgstr "" #: ../../mod/notes.php:63 ../../mod/filer.php:31 -#: ../../addon/facebook/facebook.php:770 -#: ../../addon/privacy_image_cache/privacy_image_cache.php:346 -#: ../../addon/fbpost/fbpost.php:314 +#: ../../addon/facebook/facebook.php:772 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:354 +#: ../../addon/fbpost/fbpost.php:322 #: ../../addon/dav/friendica/layout.fnk.php:441 #: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:742 #: ../../addon.old/facebook/facebook.php:770 @@ -2810,7 +2800,7 @@ msgstr "" msgid "Save" msgstr "" -#: ../../mod/uimport.php:50 ../../mod/register.php:190 +#: ../../mod/uimport.php:50 ../../mod/register.php:192 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." @@ -2909,7 +2899,7 @@ msgid "Subject:" msgstr "" #: ../../mod/wallmessage.php:147 ../../mod/message.php:295 -#: ../../mod/message.php:521 ../../mod/invite.php:113 +#: ../../mod/message.php:521 ../../mod/invite.php:115 msgid "Your message:" msgstr "" @@ -2964,9 +2954,9 @@ msgid "" msgstr "" #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 -#: ../../view/theme/diabook/theme.php:89 ../../include/profile_advanced.php:7 +#: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 -#: ../../boot.php:1774 +#: ../../boot.php:1781 msgid "Profile" msgstr "" @@ -3008,7 +2998,7 @@ msgid "Connecting" msgstr "" #: ../../mod/newmember.php:49 ../../mod/newmember.php:51 -#: ../../addon/facebook/facebook.php:728 ../../addon/fbpost/fbpost.php:286 +#: ../../addon/facebook/facebook.php:730 ../../addon/fbpost/fbpost.php:294 #: ../../include/contact_selectors.php:81 #: ../../addon.old/facebook/facebook.php:728 #: ../../addon.old/fbpost/fbpost.php:239 @@ -3193,85 +3183,85 @@ msgstr "" msgid "View Contacts" msgstr "" -#: ../../mod/register.php:89 ../../mod/regmod.php:52 +#: ../../mod/register.php:91 ../../mod/regmod.php:54 #, php-format msgid "Registration details for %s" msgstr "" -#: ../../mod/register.php:97 +#: ../../mod/register.php:99 msgid "" "Registration successful. Please check your email for further instructions." msgstr "" -#: ../../mod/register.php:101 +#: ../../mod/register.php:103 msgid "Failed to send email message. Here is the message that failed." msgstr "" -#: ../../mod/register.php:106 +#: ../../mod/register.php:108 msgid "Your registration can not be processed." msgstr "" -#: ../../mod/register.php:143 +#: ../../mod/register.php:145 #, php-format msgid "Registration request at %s" msgstr "" -#: ../../mod/register.php:152 +#: ../../mod/register.php:154 msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../mod/register.php:218 +#: ../../mod/register.php:220 msgid "" "You may (optionally) fill in this form via OpenID by supplying your OpenID " "and clicking 'Register'." msgstr "" -#: ../../mod/register.php:219 +#: ../../mod/register.php:221 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:220 +#: ../../mod/register.php:222 msgid "Your OpenID (optional): " msgstr "" -#: ../../mod/register.php:234 +#: ../../mod/register.php:236 msgid "Include your profile in member directory?" msgstr "" -#: ../../mod/register.php:255 +#: ../../mod/register.php:257 msgid "Membership on this site is by invitation only." msgstr "" -#: ../../mod/register.php:256 +#: ../../mod/register.php:258 msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:259 ../../mod/admin.php:462 +#: ../../mod/register.php:261 ../../mod/admin.php:462 msgid "Registration" msgstr "" -#: ../../mod/register.php:267 +#: ../../mod/register.php:269 msgid "Your Full Name (e.g. Joe Smith): " msgstr "" -#: ../../mod/register.php:268 +#: ../../mod/register.php:270 msgid "Your Email Address: " msgstr "" -#: ../../mod/register.php:269 +#: ../../mod/register.php:271 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:270 +#: ../../mod/register.php:272 msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:951 +#: ../../mod/register.php:275 ../../include/nav.php:81 ../../boot.php:952 msgid "Register" msgstr "" @@ -3280,8 +3270,8 @@ msgid "People Search" msgstr "" #: ../../mod/like.php:145 ../../mod/subthread.php:87 ../../mod/tagger.php:62 -#: ../../addon/communityhome/communityhome.php:166 -#: ../../view/theme/diabook/theme.php:465 ../../include/text.php:1499 +#: ../../addon/communityhome/communityhome.php:171 +#: ../../view/theme/diabook/theme.php:464 ../../include/text.php:1499 #: ../../include/diaspora.php:1851 ../../include/conversation.php:125 #: ../../include/conversation.php:253 #: ../../addon.old/communityhome/communityhome.php:163 @@ -3289,11 +3279,11 @@ msgid "photo" msgstr "" #: ../../mod/like.php:145 ../../mod/like.php:298 ../../mod/subthread.php:87 -#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1598 -#: ../../addon/communityhome/communityhome.php:161 -#: ../../addon/communityhome/communityhome.php:170 -#: ../../view/theme/diabook/theme.php:460 -#: ../../view/theme/diabook/theme.php:469 ../../include/diaspora.php:1851 +#: ../../mod/tagger.php:62 ../../addon/facebook/facebook.php:1600 +#: ../../addon/communityhome/communityhome.php:166 +#: ../../addon/communityhome/communityhome.php:175 +#: ../../view/theme/diabook/theme.php:459 +#: ../../view/theme/diabook/theme.php:468 ../../include/diaspora.php:1851 #: ../../include/conversation.php:120 ../../include/conversation.php:129 #: ../../include/conversation.php:248 ../../include/conversation.php:257 #: ../../addon.old/facebook/facebook.php:1598 @@ -3302,9 +3292,9 @@ msgstr "" msgid "status" msgstr "" -#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1602 -#: ../../addon/communityhome/communityhome.php:175 -#: ../../view/theme/diabook/theme.php:474 ../../include/diaspora.php:1867 +#: ../../mod/like.php:162 ../../addon/facebook/facebook.php:1604 +#: ../../addon/communityhome/communityhome.php:180 +#: ../../view/theme/diabook/theme.php:473 ../../include/diaspora.php:1867 #: ../../include/conversation.php:136 #: ../../addon.old/facebook/facebook.php:1602 #: ../../addon.old/communityhome/communityhome.php:172 @@ -3318,8 +3308,8 @@ msgid "%1$s doesn't like %2$s's %3$s" msgstr "" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159 -#: ../../mod/admin.php:773 ../../mod/admin.php:972 ../../mod/display.php:39 -#: ../../mod/display.php:169 ../../include/items.php:3853 +#: ../../mod/admin.php:773 ../../mod/admin.php:972 ../../mod/display.php:47 +#: ../../mod/display.php:177 ../../include/items.php:3853 msgid "Item not found." msgstr "" @@ -3327,8 +3317,8 @@ msgstr "" msgid "Access denied." msgstr "" -#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:91 -#: ../../include/nav.php:51 ../../boot.php:1781 +#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 +#: ../../include/nav.php:51 ../../boot.php:1788 msgid "Photos" msgstr "" @@ -3336,16 +3326,16 @@ msgstr "" msgid "Files" msgstr "" -#: ../../mod/regmod.php:61 +#: ../../mod/regmod.php:63 msgid "Account approved." msgstr "" -#: ../../mod/regmod.php:98 +#: ../../mod/regmod.php:100 #, php-format msgid "Registration revoked for %s" msgstr "" -#: ../../mod/regmod.php:110 +#: ../../mod/regmod.php:112 msgid "Please login." msgstr "" @@ -3698,7 +3688,7 @@ msgstr "" msgid "Performance" msgstr "" -#: ../../mod/admin.php:470 ../../addon/statusnet/statusnet.php:694 +#: ../../mod/admin.php:470 ../../addon/statusnet/statusnet.php:744 #: ../../addon.old/statusnet/statusnet.php:567 msgid "Site name" msgstr "" @@ -4265,15 +4255,15 @@ msgstr "" msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:1160 +#: ../../mod/profile.php:21 ../../boot.php:1165 msgid "Requested profile is not available." msgstr "" -#: ../../mod/profile.php:156 ../../mod/display.php:87 +#: ../../mod/profile.php:155 ../../mod/display.php:95 msgid "Access to this profile has been restricted." msgstr "" -#: ../../mod/profile.php:181 +#: ../../mod/profile.php:180 msgid "Tips for New Members" msgstr "" @@ -4361,7 +4351,7 @@ msgstr "" msgid "link" msgstr "" -#: ../../mod/display.php:162 +#: ../../mod/display.php:170 msgid "Item has been removed." msgstr "" @@ -4378,316 +4368,317 @@ msgstr "" msgid "Search" msgstr "" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:441 -#: ../../mod/profiles.php:555 ../../mod/dfrn_confirm.php:62 +#: ../../mod/profiles.php:20 ../../mod/profiles.php:135 +#: ../../mod/profiles.php:162 ../../mod/profiles.php:576 +#: ../../mod/dfrn_confirm.php:62 msgid "Profile not found." msgstr "" -#: ../../mod/profiles.php:31 +#: ../../mod/profiles.php:39 +msgid "Profile deleted." +msgstr "" + +#: ../../mod/profiles.php:57 ../../mod/profiles.php:91 +msgid "Profile-" +msgstr "" + +#: ../../mod/profiles.php:76 ../../mod/profiles.php:119 +msgid "New profile created." +msgstr "" + +#: ../../mod/profiles.php:97 +msgid "Profile unavailable to clone." +msgstr "" + +#: ../../mod/profiles.php:172 msgid "Profile Name is required." msgstr "" -#: ../../mod/profiles.php:178 +#: ../../mod/profiles.php:319 msgid "Marital Status" msgstr "" -#: ../../mod/profiles.php:182 +#: ../../mod/profiles.php:323 msgid "Romantic Partner" msgstr "" -#: ../../mod/profiles.php:186 +#: ../../mod/profiles.php:327 msgid "Likes" msgstr "" -#: ../../mod/profiles.php:190 +#: ../../mod/profiles.php:331 msgid "Dislikes" msgstr "" -#: ../../mod/profiles.php:194 +#: ../../mod/profiles.php:335 msgid "Work/Employment" msgstr "" -#: ../../mod/profiles.php:197 +#: ../../mod/profiles.php:338 msgid "Religion" msgstr "" -#: ../../mod/profiles.php:201 +#: ../../mod/profiles.php:342 msgid "Political Views" msgstr "" -#: ../../mod/profiles.php:205 +#: ../../mod/profiles.php:346 msgid "Gender" msgstr "" -#: ../../mod/profiles.php:209 +#: ../../mod/profiles.php:350 msgid "Sexual Preference" msgstr "" -#: ../../mod/profiles.php:213 +#: ../../mod/profiles.php:354 msgid "Homepage" msgstr "" -#: ../../mod/profiles.php:217 +#: ../../mod/profiles.php:358 msgid "Interests" msgstr "" -#: ../../mod/profiles.php:221 +#: ../../mod/profiles.php:362 msgid "Address" msgstr "" -#: ../../mod/profiles.php:228 ../../addon/dav/common/wdcal_edit.inc.php:183 +#: ../../mod/profiles.php:369 ../../addon/dav/common/wdcal_edit.inc.php:183 #: ../../addon.old/dav/common/wdcal_edit.inc.php:183 msgid "Location" msgstr "" -#: ../../mod/profiles.php:311 +#: ../../mod/profiles.php:452 msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:378 +#: ../../mod/profiles.php:519 msgid " and " msgstr "" -#: ../../mod/profiles.php:386 +#: ../../mod/profiles.php:527 msgid "public profile" msgstr "" -#: ../../mod/profiles.php:389 +#: ../../mod/profiles.php:530 #, php-format msgid "%1$s changed %2$s to “%3$s”" msgstr "" -#: ../../mod/profiles.php:390 +#: ../../mod/profiles.php:531 #, php-format msgid " - Visit %1$s's %2$s" msgstr "" -#: ../../mod/profiles.php:393 +#: ../../mod/profiles.php:534 #, php-format msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../mod/profiles.php:460 -msgid "Profile deleted." -msgstr "" - -#: ../../mod/profiles.php:478 ../../mod/profiles.php:512 -msgid "Profile-" -msgstr "" - -#: ../../mod/profiles.php:497 ../../mod/profiles.php:539 -msgid "New profile created." -msgstr "" - -#: ../../mod/profiles.php:518 -msgid "Profile unavailable to clone." -msgstr "" - -#: ../../mod/profiles.php:583 +#: ../../mod/profiles.php:602 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:603 +#: ../../mod/profiles.php:622 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:605 +#: ../../mod/profiles.php:624 msgid "Change Profile Photo" msgstr "" -#: ../../mod/profiles.php:606 +#: ../../mod/profiles.php:625 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:607 +#: ../../mod/profiles.php:626 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:608 +#: ../../mod/profiles.php:627 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:609 +#: ../../mod/profiles.php:628 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:610 +#: ../../mod/profiles.php:629 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:611 +#: ../../mod/profiles.php:630 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:612 +#: ../../mod/profiles.php:631 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:613 +#: ../../mod/profiles.php:632 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:614 +#: ../../mod/profiles.php:633 #, php-format msgid "Birthday (%s):" msgstr "" -#: ../../mod/profiles.php:615 +#: ../../mod/profiles.php:634 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:616 +#: ../../mod/profiles.php:635 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:617 +#: ../../mod/profiles.php:636 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:618 +#: ../../mod/profiles.php:637 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:619 +#: ../../mod/profiles.php:638 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:620 +#: ../../mod/profiles.php:639 msgid "♥ Marital Status:" msgstr "" -#: ../../mod/profiles.php:621 +#: ../../mod/profiles.php:640 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:622 +#: ../../mod/profiles.php:641 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:623 +#: ../../mod/profiles.php:642 msgid "Since [date]:" msgstr "" -#: ../../mod/profiles.php:624 ../../include/profile_advanced.php:46 +#: ../../mod/profiles.php:643 ../../include/profile_advanced.php:46 msgid "Sexual Preference:" msgstr "" -#: ../../mod/profiles.php:625 +#: ../../mod/profiles.php:644 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:626 ../../include/profile_advanced.php:50 +#: ../../mod/profiles.php:645 ../../include/profile_advanced.php:50 msgid "Hometown:" msgstr "" -#: ../../mod/profiles.php:627 ../../include/profile_advanced.php:54 +#: ../../mod/profiles.php:646 ../../include/profile_advanced.php:54 msgid "Political Views:" msgstr "" -#: ../../mod/profiles.php:628 +#: ../../mod/profiles.php:647 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:629 +#: ../../mod/profiles.php:648 msgid "Public Keywords:" msgstr "" -#: ../../mod/profiles.php:630 +#: ../../mod/profiles.php:649 msgid "Private Keywords:" msgstr "" -#: ../../mod/profiles.php:631 ../../include/profile_advanced.php:62 +#: ../../mod/profiles.php:650 ../../include/profile_advanced.php:62 msgid "Likes:" msgstr "" -#: ../../mod/profiles.php:632 ../../include/profile_advanced.php:64 +#: ../../mod/profiles.php:651 ../../include/profile_advanced.php:64 msgid "Dislikes:" msgstr "" -#: ../../mod/profiles.php:633 +#: ../../mod/profiles.php:652 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:634 +#: ../../mod/profiles.php:653 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "" -#: ../../mod/profiles.php:635 +#: ../../mod/profiles.php:654 msgid "(Used for searching profiles, never shown to others)" msgstr "" -#: ../../mod/profiles.php:636 +#: ../../mod/profiles.php:655 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:637 +#: ../../mod/profiles.php:656 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:638 +#: ../../mod/profiles.php:657 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:639 +#: ../../mod/profiles.php:658 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:640 +#: ../../mod/profiles.php:659 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:641 +#: ../../mod/profiles.php:660 msgid "Television" msgstr "" -#: ../../mod/profiles.php:642 +#: ../../mod/profiles.php:661 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:643 +#: ../../mod/profiles.php:662 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:644 +#: ../../mod/profiles.php:663 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:645 +#: ../../mod/profiles.php:664 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:650 +#: ../../mod/profiles.php:669 msgid "" "This is your public profile.
It may " "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:660 ../../mod/directory.php:111 +#: ../../mod/profiles.php:679 ../../mod/directory.php:111 #: ../../addon/forumdirectory/forumdirectory.php:133 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:699 +#: ../../mod/profiles.php:718 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:700 ../../boot.php:1278 +#: ../../mod/profiles.php:719 ../../boot.php:1285 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:701 ../../boot.php:1279 +#: ../../mod/profiles.php:720 ../../boot.php:1286 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:712 ../../boot.php:1289 +#: ../../mod/profiles.php:731 ../../boot.php:1296 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:714 ../../boot.php:1292 +#: ../../mod/profiles.php:733 ../../boot.php:1299 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:715 ../../boot.php:1293 +#: ../../mod/profiles.php:734 ../../boot.php:1300 msgid "Edit visibility" msgstr "" @@ -4784,7 +4775,7 @@ msgstr "" msgid "diaspora2bb: " msgstr "" -#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:521 +#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:520 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "" @@ -4800,7 +4791,7 @@ msgid "Ignore/Hide" msgstr "" #: ../../mod/directory.php:49 ../../addon/forumdirectory/forumdirectory.php:71 -#: ../../view/theme/diabook/theme.php:519 +#: ../../view/theme/diabook/theme.php:518 msgid "Global Directory" msgstr "" @@ -4819,19 +4810,19 @@ msgstr "" #: ../../mod/directory.php:136 #: ../../addon/forumdirectory/forumdirectory.php:158 -#: ../../include/profile_advanced.php:17 ../../boot.php:1314 +#: ../../include/profile_advanced.php:17 ../../boot.php:1321 msgid "Gender:" msgstr "" #: ../../mod/directory.php:138 #: ../../addon/forumdirectory/forumdirectory.php:160 -#: ../../include/profile_advanced.php:37 ../../boot.php:1317 +#: ../../include/profile_advanced.php:37 ../../boot.php:1324 msgid "Status:" msgstr "" #: ../../mod/directory.php:140 #: ../../addon/forumdirectory/forumdirectory.php:162 -#: ../../include/profile_advanced.php:48 ../../boot.php:1319 +#: ../../include/profile_advanced.php:48 ../../boot.php:1326 msgid "Homepage:" msgstr "" @@ -4846,32 +4837,32 @@ msgstr "" msgid "No entries (some entries may be hidden)." msgstr "" -#: ../../mod/invite.php:35 +#: ../../mod/invite.php:37 #, php-format msgid "%s : Not a valid email address." msgstr "" -#: ../../mod/invite.php:59 +#: ../../mod/invite.php:61 msgid "Please join us on Friendica" msgstr "" -#: ../../mod/invite.php:69 +#: ../../mod/invite.php:71 #, php-format msgid "%s : Message delivery failed." msgstr "" -#: ../../mod/invite.php:73 +#: ../../mod/invite.php:75 #, php-format msgid "%d message sent." msgid_plural "%d messages sent." msgstr[0] "" msgstr[1] "" -#: ../../mod/invite.php:92 +#: ../../mod/invite.php:94 msgid "You have no more invitations available" msgstr "" -#: ../../mod/invite.php:100 +#: ../../mod/invite.php:102 #, php-format msgid "" "Visit %s for a list of public sites that you can join. Friendica members on " @@ -4879,14 +4870,14 @@ msgid "" "other social networks." msgstr "" -#: ../../mod/invite.php:102 +#: ../../mod/invite.php:104 #, php-format msgid "" "To accept this invitation, please visit and register at %s or any other " "public Friendica website." msgstr "" -#: ../../mod/invite.php:103 +#: ../../mod/invite.php:105 #, php-format msgid "" "Friendica sites all inter-connect to create a huge privacy-enhanced social " @@ -4895,36 +4886,36 @@ msgid "" "sites you can join." msgstr "" -#: ../../mod/invite.php:106 +#: ../../mod/invite.php:108 msgid "" "Our apologies. This system is not currently configured to connect with other " "public sites or invite members." msgstr "" -#: ../../mod/invite.php:111 +#: ../../mod/invite.php:113 msgid "Send invitations" msgstr "" -#: ../../mod/invite.php:112 +#: ../../mod/invite.php:114 msgid "Enter email addresses, one per line:" msgstr "" -#: ../../mod/invite.php:114 +#: ../../mod/invite.php:116 msgid "" "You are cordially invited to join me and other close friends on Friendica - " "and help us to create a better social web." msgstr "" -#: ../../mod/invite.php:116 +#: ../../mod/invite.php:118 msgid "You will need to supply this invitation code: $invite_code" msgstr "" -#: ../../mod/invite.php:116 +#: ../../mod/invite.php:118 msgid "" "Once you have registered, please connect with me via my profile page at:" msgstr "" -#: ../../mod/invite.php:118 +#: ../../mod/invite.php:120 msgid "" "For more information about the Friendica project and why we feel it is " "important, please visit http://friendica.com" @@ -5007,12 +4998,12 @@ msgstr "" msgid "Unable to update your contact profile details on our system" msgstr "" -#: ../../mod/dfrn_confirm.php:750 +#: ../../mod/dfrn_confirm.php:751 #, php-format msgid "Connection accepted at %s" msgstr "" -#: ../../mod/dfrn_confirm.php:799 +#: ../../mod/dfrn_confirm.php:800 #, php-format msgid "%1$s has joined %2$s" msgstr "" @@ -5037,38 +5028,38 @@ msgstr "" msgid "Google+ Import Settings saved." msgstr "" -#: ../../addon/facebook/facebook.php:523 +#: ../../addon/facebook/facebook.php:525 #: ../../addon.old/facebook/facebook.php:523 msgid "Facebook disabled" msgstr "" -#: ../../addon/facebook/facebook.php:528 +#: ../../addon/facebook/facebook.php:530 #: ../../addon.old/facebook/facebook.php:528 msgid "Updating contacts" msgstr "" -#: ../../addon/facebook/facebook.php:551 ../../addon/fbpost/fbpost.php:199 +#: ../../addon/facebook/facebook.php:553 ../../addon/fbpost/fbpost.php:203 #: ../../addon.old/facebook/facebook.php:551 #: ../../addon.old/fbpost/fbpost.php:192 msgid "Facebook API key is missing." msgstr "" -#: ../../addon/facebook/facebook.php:558 +#: ../../addon/facebook/facebook.php:560 #: ../../addon.old/facebook/facebook.php:558 msgid "Facebook Connect" msgstr "" -#: ../../addon/facebook/facebook.php:564 +#: ../../addon/facebook/facebook.php:566 #: ../../addon.old/facebook/facebook.php:564 msgid "Install Facebook connector for this account." msgstr "" -#: ../../addon/facebook/facebook.php:571 +#: ../../addon/facebook/facebook.php:573 #: ../../addon.old/facebook/facebook.php:571 msgid "Remove Facebook connector" msgstr "" -#: ../../addon/facebook/facebook.php:576 ../../addon/fbpost/fbpost.php:224 +#: ../../addon/facebook/facebook.php:578 ../../addon/fbpost/fbpost.php:228 #: ../../addon.old/facebook/facebook.php:576 #: ../../addon.old/fbpost/fbpost.php:217 msgid "" @@ -5076,63 +5067,63 @@ msgid "" "changed.]" msgstr "" -#: ../../addon/facebook/facebook.php:583 ../../addon/fbpost/fbpost.php:231 +#: ../../addon/facebook/facebook.php:585 ../../addon/fbpost/fbpost.php:235 #: ../../addon.old/facebook/facebook.php:583 #: ../../addon.old/fbpost/fbpost.php:224 msgid "Post to Facebook by default" msgstr "" -#: ../../addon/facebook/facebook.php:589 +#: ../../addon/facebook/facebook.php:591 #: ../../addon.old/facebook/facebook.php:589 msgid "" "Facebook friend linking has been disabled on this site. The following " "settings will have no effect." msgstr "" -#: ../../addon/facebook/facebook.php:593 +#: ../../addon/facebook/facebook.php:595 #: ../../addon.old/facebook/facebook.php:593 msgid "" "Facebook friend linking has been disabled on this site. If you disable it, " "you will be unable to re-enable it." msgstr "" -#: ../../addon/facebook/facebook.php:596 +#: ../../addon/facebook/facebook.php:598 #: ../../addon.old/facebook/facebook.php:596 msgid "Link all your Facebook friends and conversations on this website" msgstr "" -#: ../../addon/facebook/facebook.php:598 +#: ../../addon/facebook/facebook.php:600 #: ../../addon.old/facebook/facebook.php:598 msgid "" "Facebook conversations consist of your profile wall and your friend " "stream." msgstr "" -#: ../../addon/facebook/facebook.php:599 +#: ../../addon/facebook/facebook.php:601 #: ../../addon.old/facebook/facebook.php:599 msgid "On this website, your Facebook friend stream is only visible to you." msgstr "" -#: ../../addon/facebook/facebook.php:600 +#: ../../addon/facebook/facebook.php:602 #: ../../addon.old/facebook/facebook.php:600 msgid "" "The following settings determine the privacy of your Facebook profile wall " "on this website." msgstr "" -#: ../../addon/facebook/facebook.php:604 +#: ../../addon/facebook/facebook.php:606 #: ../../addon.old/facebook/facebook.php:604 msgid "" "On this website your Facebook profile wall conversations will only be " "visible to you" msgstr "" -#: ../../addon/facebook/facebook.php:609 +#: ../../addon/facebook/facebook.php:611 #: ../../addon.old/facebook/facebook.php:609 msgid "Do not import your Facebook profile wall conversations" msgstr "" -#: ../../addon/facebook/facebook.php:611 +#: ../../addon/facebook/facebook.php:613 #: ../../addon.old/facebook/facebook.php:611 msgid "" "If you choose to link conversations and leave both of these boxes unchecked, " @@ -5141,28 +5132,40 @@ msgid "" "who may see the conversations." msgstr "" -#: ../../addon/facebook/facebook.php:616 +#: ../../addon/facebook/facebook.php:618 #: ../../addon.old/facebook/facebook.php:616 msgid "Comma separated applications to ignore" msgstr "" -#: ../../addon/facebook/facebook.php:700 +#: ../../addon/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:700 msgid "Problems with Facebook Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:729 +#: ../../addon/facebook/facebook.php:704 +#: ../../addon/facebook/facebook.php:1202 ../../addon/fbpost/fbpost.php:817 +#: ../../addon/public_server/public_server.php:62 +#: ../../addon/testdrive/testdrive.php:67 +#: ../../addon.old/facebook/facebook.php:702 +#: ../../addon.old/facebook/facebook.php:1200 +#: ../../addon.old/fbpost/fbpost.php:661 +#: ../../addon.old/public_server/public_server.php:62 +#: ../../addon.old/testdrive/testdrive.php:67 +msgid "Administrator" +msgstr "" + +#: ../../addon/facebook/facebook.php:731 #: ../../addon.old/facebook/facebook.php:729 msgid "Facebook Connector Settings" msgstr "" -#: ../../addon/facebook/facebook.php:744 ../../addon/fbpost/fbpost.php:302 +#: ../../addon/facebook/facebook.php:746 ../../addon/fbpost/fbpost.php:310 #: ../../addon.old/facebook/facebook.php:744 #: ../../addon.old/fbpost/fbpost.php:255 msgid "Facebook API Key" msgstr "" -#: ../../addon/facebook/facebook.php:754 ../../addon/fbpost/fbpost.php:309 +#: ../../addon/facebook/facebook.php:756 ../../addon/fbpost/fbpost.php:317 #: ../../addon.old/facebook/facebook.php:754 #: ../../addon.old/fbpost/fbpost.php:262 msgid "" @@ -5171,76 +5174,76 @@ msgid "" "using this form.

" msgstr "" -#: ../../addon/facebook/facebook.php:759 +#: ../../addon/facebook/facebook.php:761 #: ../../addon.old/facebook/facebook.php:759 msgid "" "Error: the given API Key seems to be incorrect (the application access token " "could not be retrieved)." msgstr "" -#: ../../addon/facebook/facebook.php:761 +#: ../../addon/facebook/facebook.php:763 #: ../../addon.old/facebook/facebook.php:761 msgid "The given API Key seems to work correctly." msgstr "" -#: ../../addon/facebook/facebook.php:763 +#: ../../addon/facebook/facebook.php:765 #: ../../addon.old/facebook/facebook.php:763 msgid "" "The correctness of the API Key could not be detected. Something strange's " "going on." msgstr "" -#: ../../addon/facebook/facebook.php:766 ../../addon/fbpost/fbpost.php:311 +#: ../../addon/facebook/facebook.php:768 ../../addon/fbpost/fbpost.php:319 #: ../../addon.old/facebook/facebook.php:766 #: ../../addon.old/fbpost/fbpost.php:264 msgid "App-ID / API-Key" msgstr "" -#: ../../addon/facebook/facebook.php:767 ../../addon/fbpost/fbpost.php:312 +#: ../../addon/facebook/facebook.php:769 ../../addon/fbpost/fbpost.php:320 #: ../../addon.old/facebook/facebook.php:767 #: ../../addon.old/fbpost/fbpost.php:265 msgid "Application secret" msgstr "" -#: ../../addon/facebook/facebook.php:768 +#: ../../addon/facebook/facebook.php:770 #: ../../addon.old/facebook/facebook.php:768 #, php-format msgid "Polling Interval in minutes (minimum %1$s minutes)" msgstr "" -#: ../../addon/facebook/facebook.php:769 +#: ../../addon/facebook/facebook.php:771 #: ../../addon.old/facebook/facebook.php:769 msgid "" "Synchronize comments (no comments on Facebook are missed, at the cost of " "increased system load)" msgstr "" -#: ../../addon/facebook/facebook.php:773 +#: ../../addon/facebook/facebook.php:775 #: ../../addon.old/facebook/facebook.php:773 msgid "Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:777 +#: ../../addon/facebook/facebook.php:779 #: ../../addon.old/facebook/facebook.php:777 msgid "Real-Time Updates are activated." msgstr "" -#: ../../addon/facebook/facebook.php:778 +#: ../../addon/facebook/facebook.php:780 #: ../../addon.old/facebook/facebook.php:778 msgid "Deactivate Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:780 +#: ../../addon/facebook/facebook.php:782 #: ../../addon.old/facebook/facebook.php:780 msgid "Real-Time Updates not activated." msgstr "" -#: ../../addon/facebook/facebook.php:780 +#: ../../addon/facebook/facebook.php:782 #: ../../addon.old/facebook/facebook.php:780 msgid "Activate Real-Time Updates" msgstr "" -#: ../../addon/facebook/facebook.php:799 ../../addon/fbpost/fbpost.php:329 +#: ../../addon/facebook/facebook.php:801 ../../addon/fbpost/fbpost.php:337 #: ../../addon/dav/friendica/layout.fnk.php:361 #: ../../addon.old/facebook/facebook.php:799 #: ../../addon.old/fbpost/fbpost.php:282 @@ -5248,13 +5251,13 @@ msgstr "" msgid "The new values have been saved." msgstr "" -#: ../../addon/facebook/facebook.php:823 ../../addon/fbpost/fbpost.php:348 +#: ../../addon/facebook/facebook.php:825 ../../addon/fbpost/fbpost.php:356 #: ../../addon.old/facebook/facebook.php:823 #: ../../addon.old/fbpost/fbpost.php:301 msgid "Post to Facebook" msgstr "" -#: ../../addon/facebook/facebook.php:921 ../../addon/fbpost/fbpost.php:471 +#: ../../addon/facebook/facebook.php:923 ../../addon/fbpost/fbpost.php:483 #: ../../addon.old/facebook/facebook.php:921 #: ../../addon.old/fbpost/fbpost.php:399 msgid "" @@ -5262,31 +5265,31 @@ msgid "" "conflict." msgstr "" -#: ../../addon/facebook/facebook.php:1149 ../../addon/fbpost/fbpost.php:750 +#: ../../addon/facebook/facebook.php:1151 ../../addon/fbpost/fbpost.php:762 #: ../../addon.old/facebook/facebook.php:1149 #: ../../addon.old/fbpost/fbpost.php:610 msgid "View on Friendica" msgstr "" -#: ../../addon/facebook/facebook.php:1182 ../../addon/fbpost/fbpost.php:787 +#: ../../addon/facebook/facebook.php:1184 ../../addon/fbpost/fbpost.php:799 #: ../../addon.old/facebook/facebook.php:1182 #: ../../addon.old/fbpost/fbpost.php:643 msgid "Facebook post failed. Queued for retry." msgstr "" -#: ../../addon/facebook/facebook.php:1222 ../../addon/fbpost/fbpost.php:827 +#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:839 #: ../../addon.old/facebook/facebook.php:1222 #: ../../addon.old/fbpost/fbpost.php:683 msgid "Your Facebook connection became invalid. Please Re-authenticate." msgstr "" -#: ../../addon/facebook/facebook.php:1223 ../../addon/fbpost/fbpost.php:828 +#: ../../addon/facebook/facebook.php:1225 ../../addon/fbpost/fbpost.php:840 #: ../../addon.old/facebook/facebook.php:1223 #: ../../addon.old/fbpost/fbpost.php:684 msgid "Facebook connection became invalid" msgstr "" -#: ../../addon/facebook/facebook.php:1224 ../../addon/fbpost/fbpost.php:829 +#: ../../addon/facebook/facebook.php:1226 ../../addon/fbpost/fbpost.php:841 #: ../../addon.old/facebook/facebook.php:1224 #: ../../addon.old/fbpost/fbpost.php:685 #, php-format @@ -5313,60 +5316,64 @@ msgstr "" msgid "Automatically follow any StatusNet followers/mentioners" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:343 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:351 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:260 msgid "Lifetime of the cache (in hours)" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:348 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:356 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:265 msgid "Cache Statistics" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:351 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:359 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:268 msgid "Number of items" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:353 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:361 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:270 msgid "Size of the cache" msgstr "" -#: ../../addon/privacy_image_cache/privacy_image_cache.php:355 +#: ../../addon/privacy_image_cache/privacy_image_cache.php:363 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:272 msgid "Delete the whole cache" msgstr "" -#: ../../addon/fbpost/fbpost.php:179 ../../addon.old/fbpost/fbpost.php:172 +#: ../../addon/fbpost/fbpost.php:183 ../../addon.old/fbpost/fbpost.php:172 msgid "Facebook Post disabled" msgstr "" -#: ../../addon/fbpost/fbpost.php:206 ../../addon.old/fbpost/fbpost.php:199 +#: ../../addon/fbpost/fbpost.php:210 ../../addon.old/fbpost/fbpost.php:199 msgid "Facebook Post" msgstr "" -#: ../../addon/fbpost/fbpost.php:212 ../../addon.old/fbpost/fbpost.php:205 +#: ../../addon/fbpost/fbpost.php:216 ../../addon.old/fbpost/fbpost.php:205 msgid "Install Facebook Post connector for this account." msgstr "" -#: ../../addon/fbpost/fbpost.php:219 ../../addon.old/fbpost/fbpost.php:212 +#: ../../addon/fbpost/fbpost.php:223 ../../addon.old/fbpost/fbpost.php:212 msgid "Remove Facebook Post connector" msgstr "" -#: ../../addon/fbpost/fbpost.php:235 +#: ../../addon/fbpost/fbpost.php:239 msgid "Suppress \"View on friendica\"" msgstr "" -#: ../../addon/fbpost/fbpost.php:245 +#: ../../addon/fbpost/fbpost.php:243 +msgid "Mirror wall posts from facebook to friendica." +msgstr "" + +#: ../../addon/fbpost/fbpost.php:253 msgid "Post to page/group:" msgstr "" -#: ../../addon/fbpost/fbpost.php:287 ../../addon.old/fbpost/fbpost.php:240 +#: ../../addon/fbpost/fbpost.php:295 ../../addon.old/fbpost/fbpost.php:240 msgid "Facebook Post Settings" msgstr "" -#: ../../addon/fbpost/fbpost.php:367 +#: ../../addon/fbpost/fbpost.php:375 #, php-format msgid "%s:" msgstr "" @@ -5719,11 +5726,8 @@ msgid "Forum Directory" msgstr "" #: ../../addon/communityhome/communityhome.php:28 -#: ../../addon/communityhome/communityhome.php:34 -#: ../../addon/communityhome/twillingham/communityhome.php:28 -#: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:976 -#: ../../addon.old/communityhome/communityhome.php:28 +#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:64 +#: ../../boot.php:977 ../../addon.old/communityhome/communityhome.php:28 #: ../../addon.old/communityhome/communityhome.php:34 #: ../../addon.old/communityhome/twillingham/communityhome.php:28 #: ../../addon.old/communityhome/twillingham/communityhome.php:34 @@ -5731,38 +5735,35 @@ msgid "Login" msgstr "" #: ../../addon/communityhome/communityhome.php:29 -#: ../../addon/communityhome/twillingham/communityhome.php:29 #: ../../addon.old/communityhome/communityhome.php:29 #: ../../addon.old/communityhome/twillingham/communityhome.php:29 msgid "OpenID" msgstr "" -#: ../../addon/communityhome/communityhome.php:38 -#: ../../addon/communityhome/twillingham/communityhome.php:38 +#: ../../addon/communityhome/communityhome.php:39 #: ../../addon.old/communityhome/communityhome.php:38 #: ../../addon.old/communityhome/twillingham/communityhome.php:38 msgid "Latest users" msgstr "" -#: ../../addon/communityhome/communityhome.php:82 -#: ../../addon/communityhome/twillingham/communityhome.php:81 +#: ../../addon/communityhome/communityhome.php:84 #: ../../addon.old/communityhome/communityhome.php:81 #: ../../addon.old/communityhome/twillingham/communityhome.php:81 msgid "Most active users" msgstr "" -#: ../../addon/communityhome/communityhome.php:99 +#: ../../addon/communityhome/communityhome.php:102 #: ../../addon.old/communityhome/communityhome.php:98 msgid "Latest photos" msgstr "" -#: ../../addon/communityhome/communityhome.php:136 +#: ../../addon/communityhome/communityhome.php:141 #: ../../addon.old/communityhome/communityhome.php:133 msgid "Latest likes" msgstr "" -#: ../../addon/communityhome/communityhome.php:158 -#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1497 +#: ../../addon/communityhome/communityhome.php:163 +#: ../../view/theme/diabook/theme.php:456 ../../include/text.php:1497 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -7269,39 +7270,39 @@ msgstr "" msgid "View Source" msgstr "" -#: ../../addon/statusnet/statusnet.php:134 +#: ../../addon/statusnet/statusnet.php:138 #: ../../addon.old/statusnet/statusnet.php:134 msgid "Post to StatusNet" msgstr "" -#: ../../addon/statusnet/statusnet.php:176 +#: ../../addon/statusnet/statusnet.php:180 #: ../../addon.old/statusnet/statusnet.php:176 msgid "" "Please contact your site administrator.
The provided API URL is not " "valid." msgstr "" -#: ../../addon/statusnet/statusnet.php:204 +#: ../../addon/statusnet/statusnet.php:208 #: ../../addon.old/statusnet/statusnet.php:204 msgid "We could not contact the StatusNet API with the Path you entered." msgstr "" -#: ../../addon/statusnet/statusnet.php:232 +#: ../../addon/statusnet/statusnet.php:238 #: ../../addon.old/statusnet/statusnet.php:232 msgid "StatusNet settings updated." msgstr "" -#: ../../addon/statusnet/statusnet.php:257 +#: ../../addon/statusnet/statusnet.php:269 #: ../../addon.old/statusnet/statusnet.php:257 msgid "StatusNet Posting Settings" msgstr "" -#: ../../addon/statusnet/statusnet.php:271 +#: ../../addon/statusnet/statusnet.php:283 #: ../../addon.old/statusnet/statusnet.php:271 msgid "Globally Available StatusNet OAuthKeys" msgstr "" -#: ../../addon/statusnet/statusnet.php:272 +#: ../../addon/statusnet/statusnet.php:284 #: ../../addon.old/statusnet/statusnet.php:272 msgid "" "There are preconfigured OAuth key pairs for some StatusNet servers " @@ -7309,12 +7310,12 @@ msgid "" "not feel free to connect to any other StatusNet instance (see below)." msgstr "" -#: ../../addon/statusnet/statusnet.php:280 +#: ../../addon/statusnet/statusnet.php:292 #: ../../addon.old/statusnet/statusnet.php:280 msgid "Provide your own OAuth Credentials" msgstr "" -#: ../../addon/statusnet/statusnet.php:281 +#: ../../addon/statusnet/statusnet.php:293 #: ../../addon.old/statusnet/statusnet.php:281 msgid "" "No consumer key pair for StatusNet found. Register your Friendica Account as " @@ -7324,22 +7325,22 @@ msgid "" "installation at your favorited StatusNet installation." msgstr "" -#: ../../addon/statusnet/statusnet.php:283 +#: ../../addon/statusnet/statusnet.php:295 #: ../../addon.old/statusnet/statusnet.php:283 msgid "OAuth Consumer Key" msgstr "" -#: ../../addon/statusnet/statusnet.php:286 +#: ../../addon/statusnet/statusnet.php:298 #: ../../addon.old/statusnet/statusnet.php:286 msgid "OAuth Consumer Secret" msgstr "" -#: ../../addon/statusnet/statusnet.php:289 +#: ../../addon/statusnet/statusnet.php:301 #: ../../addon.old/statusnet/statusnet.php:289 msgid "Base API Path (remember the trailing /)" msgstr "" -#: ../../addon/statusnet/statusnet.php:310 +#: ../../addon/statusnet/statusnet.php:322 #: ../../addon.old/statusnet/statusnet.php:310 msgid "" "To connect to your StatusNet account click the button below to get a " @@ -7348,38 +7349,38 @@ msgid "" "to StatusNet." msgstr "" -#: ../../addon/statusnet/statusnet.php:311 +#: ../../addon/statusnet/statusnet.php:323 #: ../../addon.old/statusnet/statusnet.php:311 msgid "Log in with StatusNet" msgstr "" -#: ../../addon/statusnet/statusnet.php:313 +#: ../../addon/statusnet/statusnet.php:325 #: ../../addon.old/statusnet/statusnet.php:313 msgid "Copy the security code from StatusNet here" msgstr "" -#: ../../addon/statusnet/statusnet.php:319 +#: ../../addon/statusnet/statusnet.php:331 #: ../../addon.old/statusnet/statusnet.php:319 msgid "Cancel Connection Process" msgstr "" -#: ../../addon/statusnet/statusnet.php:321 +#: ../../addon/statusnet/statusnet.php:333 #: ../../addon.old/statusnet/statusnet.php:321 msgid "Current StatusNet API is" msgstr "" -#: ../../addon/statusnet/statusnet.php:322 +#: ../../addon/statusnet/statusnet.php:334 #: ../../addon.old/statusnet/statusnet.php:322 msgid "Cancel StatusNet Connection" msgstr "" -#: ../../addon/statusnet/statusnet.php:333 ../../addon/twitter/twitter.php:189 +#: ../../addon/statusnet/statusnet.php:345 ../../addon/twitter/twitter.php:200 #: ../../addon.old/statusnet/statusnet.php:333 #: ../../addon.old/twitter/twitter.php:189 msgid "Currently connected to: " msgstr "" -#: ../../addon/statusnet/statusnet.php:334 +#: ../../addon/statusnet/statusnet.php:346 #: ../../addon.old/statusnet/statusnet.php:334 msgid "" "If enabled all your public postings can be posted to the " @@ -7387,7 +7388,7 @@ msgid "" "for every posting separately in the posting options when writing the entry." msgstr "" -#: ../../addon/statusnet/statusnet.php:336 +#: ../../addon/statusnet/statusnet.php:348 #: ../../addon.old/statusnet/statusnet.php:336 msgid "" "Note: Due your privacy settings (Hide your profile " @@ -7396,28 +7397,37 @@ msgid "" "informing the visitor that the access to your profile has been restricted." msgstr "" -#: ../../addon/statusnet/statusnet.php:339 +#: ../../addon/statusnet/statusnet.php:351 #: ../../addon.old/statusnet/statusnet.php:339 msgid "Allow posting to StatusNet" msgstr "" -#: ../../addon/statusnet/statusnet.php:342 +#: ../../addon/statusnet/statusnet.php:354 #: ../../addon.old/statusnet/statusnet.php:342 msgid "Send public postings to StatusNet by default" msgstr "" -#: ../../addon/statusnet/statusnet.php:345 +#: ../../addon/statusnet/statusnet.php:358 +msgid "" +"Mirror all posts from statusnet that are no replies or repeated messages" +msgstr "" + +#: ../../addon/statusnet/statusnet.php:362 +msgid "Shortening method that optimizes the post" +msgstr "" + +#: ../../addon/statusnet/statusnet.php:366 #: ../../addon.old/statusnet/statusnet.php:345 msgid "Send linked #-tags and @-names to StatusNet" msgstr "" -#: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206 +#: ../../addon/statusnet/statusnet.php:371 ../../addon/twitter/twitter.php:226 #: ../../addon.old/statusnet/statusnet.php:350 #: ../../addon.old/twitter/twitter.php:206 msgid "Clear OAuth configuration" msgstr "" -#: ../../addon/statusnet/statusnet.php:695 +#: ../../addon/statusnet/statusnet.php:745 #: ../../addon.old/statusnet/statusnet.php:568 msgid "API URL" msgstr "" @@ -7601,25 +7611,25 @@ msgstr "" msgid "Asynchronous tracking" msgstr "" -#: ../../addon/twitter/twitter.php:73 ../../addon.old/twitter/twitter.php:73 +#: ../../addon/twitter/twitter.php:77 ../../addon.old/twitter/twitter.php:73 msgid "Post to Twitter" msgstr "" -#: ../../addon/twitter/twitter.php:122 ../../addon.old/twitter/twitter.php:122 +#: ../../addon/twitter/twitter.php:129 ../../addon.old/twitter/twitter.php:122 msgid "Twitter settings updated." msgstr "" -#: ../../addon/twitter/twitter.php:146 ../../addon.old/twitter/twitter.php:146 +#: ../../addon/twitter/twitter.php:157 ../../addon.old/twitter/twitter.php:146 msgid "Twitter Posting Settings" msgstr "" -#: ../../addon/twitter/twitter.php:153 ../../addon.old/twitter/twitter.php:153 +#: ../../addon/twitter/twitter.php:164 ../../addon.old/twitter/twitter.php:153 msgid "" "No consumer key pair for Twitter found. Please contact your site " "administrator." msgstr "" -#: ../../addon/twitter/twitter.php:172 ../../addon.old/twitter/twitter.php:172 +#: ../../addon/twitter/twitter.php:183 ../../addon.old/twitter/twitter.php:172 msgid "" "At this Friendica instance the Twitter plugin was enabled but you have not " "yet connected your account to your Twitter account. To do so click the " @@ -7628,22 +7638,22 @@ msgid "" "be posted to Twitter." msgstr "" -#: ../../addon/twitter/twitter.php:173 ../../addon.old/twitter/twitter.php:173 +#: ../../addon/twitter/twitter.php:184 ../../addon.old/twitter/twitter.php:173 msgid "Log in with Twitter" msgstr "" -#: ../../addon/twitter/twitter.php:175 ../../addon.old/twitter/twitter.php:175 +#: ../../addon/twitter/twitter.php:186 ../../addon.old/twitter/twitter.php:175 msgid "Copy the PIN from Twitter here" msgstr "" -#: ../../addon/twitter/twitter.php:190 ../../addon.old/twitter/twitter.php:190 +#: ../../addon/twitter/twitter.php:201 ../../addon.old/twitter/twitter.php:190 msgid "" "If enabled all your public postings can be posted to the " "associated Twitter account. You can choose to do so by default (here) or for " "every posting separately in the posting options when writing the entry." msgstr "" -#: ../../addon/twitter/twitter.php:192 ../../addon.old/twitter/twitter.php:192 +#: ../../addon/twitter/twitter.php:203 ../../addon.old/twitter/twitter.php:192 msgid "" "Note: Due your privacy settings (Hide your profile " "details from unknown viewers?) the link potentially included in public " @@ -7651,23 +7661,31 @@ msgid "" "the visitor that the access to your profile has been restricted." msgstr "" -#: ../../addon/twitter/twitter.php:195 ../../addon.old/twitter/twitter.php:195 +#: ../../addon/twitter/twitter.php:206 ../../addon.old/twitter/twitter.php:195 msgid "Allow posting to Twitter" msgstr "" -#: ../../addon/twitter/twitter.php:198 ../../addon.old/twitter/twitter.php:198 +#: ../../addon/twitter/twitter.php:209 ../../addon.old/twitter/twitter.php:198 msgid "Send public postings to Twitter by default" msgstr "" -#: ../../addon/twitter/twitter.php:201 ../../addon.old/twitter/twitter.php:201 +#: ../../addon/twitter/twitter.php:213 +msgid "Mirror all posts from twitter that are no replies or retweets" +msgstr "" + +#: ../../addon/twitter/twitter.php:217 +msgid "Shortening method that optimizes the tweet" +msgstr "" + +#: ../../addon/twitter/twitter.php:221 ../../addon.old/twitter/twitter.php:201 msgid "Send linked #-tags and @-names to Twitter" msgstr "" -#: ../../addon/twitter/twitter.php:517 ../../addon.old/twitter/twitter.php:396 +#: ../../addon/twitter/twitter.php:556 ../../addon.old/twitter/twitter.php:396 msgid "Consumer key" msgstr "" -#: ../../addon/twitter/twitter.php:518 ../../addon.old/twitter/twitter.php:397 +#: ../../addon/twitter/twitter.php:557 ../../addon.old/twitter/twitter.php:397 msgid "Consumer secret" msgstr "" @@ -7805,137 +7823,137 @@ msgstr "" msgid "Color scheme" msgstr "" -#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:49 +#: ../../view/theme/diabook/theme.php:87 ../../include/nav.php:49 #: ../../include/nav.php:116 msgid "Your posts and conversations" msgstr "" -#: ../../view/theme/diabook/theme.php:89 ../../include/nav.php:50 +#: ../../view/theme/diabook/theme.php:88 ../../include/nav.php:50 msgid "Your profile page" msgstr "" -#: ../../view/theme/diabook/theme.php:90 +#: ../../view/theme/diabook/theme.php:89 msgid "Your contacts" msgstr "" -#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:51 +#: ../../view/theme/diabook/theme.php:90 ../../include/nav.php:51 msgid "Your photos" msgstr "" -#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:52 +#: ../../view/theme/diabook/theme.php:91 ../../include/nav.php:52 msgid "Your events" msgstr "" -#: ../../view/theme/diabook/theme.php:93 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 msgid "Personal notes" msgstr "" -#: ../../view/theme/diabook/theme.php:93 ../../include/nav.php:53 +#: ../../view/theme/diabook/theme.php:92 ../../include/nav.php:53 msgid "Your personal photos" msgstr "" -#: ../../view/theme/diabook/theme.php:95 -#: ../../view/theme/diabook/theme.php:538 -#: ../../view/theme/diabook/theme.php:633 +#: ../../view/theme/diabook/theme.php:94 +#: ../../view/theme/diabook/theme.php:537 +#: ../../view/theme/diabook/theme.php:632 #: ../../view/theme/diabook/config.php:163 msgid "Community Pages" msgstr "" -#: ../../view/theme/diabook/theme.php:385 -#: ../../view/theme/diabook/theme.php:635 +#: ../../view/theme/diabook/theme.php:384 +#: ../../view/theme/diabook/theme.php:634 #: ../../view/theme/diabook/config.php:165 msgid "Community Profiles" msgstr "" -#: ../../view/theme/diabook/theme.php:406 -#: ../../view/theme/diabook/theme.php:640 +#: ../../view/theme/diabook/theme.php:405 +#: ../../view/theme/diabook/theme.php:639 #: ../../view/theme/diabook/config.php:170 msgid "Last users" msgstr "" -#: ../../view/theme/diabook/theme.php:435 -#: ../../view/theme/diabook/theme.php:642 +#: ../../view/theme/diabook/theme.php:434 +#: ../../view/theme/diabook/theme.php:641 #: ../../view/theme/diabook/config.php:172 msgid "Last likes" msgstr "" -#: ../../view/theme/diabook/theme.php:480 -#: ../../view/theme/diabook/theme.php:641 +#: ../../view/theme/diabook/theme.php:479 +#: ../../view/theme/diabook/theme.php:640 #: ../../view/theme/diabook/config.php:171 msgid "Last photos" msgstr "" -#: ../../view/theme/diabook/theme.php:517 -#: ../../view/theme/diabook/theme.php:638 +#: ../../view/theme/diabook/theme.php:516 +#: ../../view/theme/diabook/theme.php:637 #: ../../view/theme/diabook/config.php:168 msgid "Find Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:518 +#: ../../view/theme/diabook/theme.php:517 msgid "Local Directory" msgstr "" -#: ../../view/theme/diabook/theme.php:520 ../../include/contact_widgets.php:35 +#: ../../view/theme/diabook/theme.php:519 ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "" -#: ../../view/theme/diabook/theme.php:522 ../../include/contact_widgets.php:37 +#: ../../view/theme/diabook/theme.php:521 ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "" -#: ../../view/theme/diabook/theme.php:573 -#: ../../view/theme/diabook/theme.php:634 +#: ../../view/theme/diabook/theme.php:572 +#: ../../view/theme/diabook/theme.php:633 #: ../../view/theme/diabook/config.php:164 msgid "Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:578 +#: ../../view/theme/diabook/theme.php:577 msgid "Set zoomfactor for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:579 +#: ../../view/theme/diabook/theme.php:578 #: ../../view/theme/diabook/config.php:161 msgid "Set longitude (X) for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:580 +#: ../../view/theme/diabook/theme.php:579 #: ../../view/theme/diabook/config.php:162 msgid "Set latitude (Y) for Earth Layers" msgstr "" -#: ../../view/theme/diabook/theme.php:593 -#: ../../view/theme/diabook/theme.php:636 +#: ../../view/theme/diabook/theme.php:592 +#: ../../view/theme/diabook/theme.php:635 #: ../../view/theme/diabook/config.php:166 msgid "Help or @NewHere ?" msgstr "" -#: ../../view/theme/diabook/theme.php:600 -#: ../../view/theme/diabook/theme.php:637 +#: ../../view/theme/diabook/theme.php:599 +#: ../../view/theme/diabook/theme.php:636 #: ../../view/theme/diabook/config.php:167 msgid "Connect Services" msgstr "" -#: ../../view/theme/diabook/theme.php:607 -#: ../../view/theme/diabook/theme.php:639 +#: ../../view/theme/diabook/theme.php:606 +#: ../../view/theme/diabook/theme.php:638 msgid "Last Tweets" msgstr "" -#: ../../view/theme/diabook/theme.php:610 +#: ../../view/theme/diabook/theme.php:609 #: ../../view/theme/diabook/config.php:159 msgid "Set twitter search term" msgstr "" -#: ../../view/theme/diabook/theme.php:630 +#: ../../view/theme/diabook/theme.php:629 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:313 msgid "don't show" msgstr "" -#: ../../view/theme/diabook/theme.php:630 +#: ../../view/theme/diabook/theme.php:629 #: ../../view/theme/diabook/config.php:146 ../../include/acl_selectors.php:312 msgid "show" msgstr "" -#: ../../view/theme/diabook/theme.php:631 +#: ../../view/theme/diabook/theme.php:630 msgid "Show/hide boxes at right-hand column:" msgstr "" @@ -8257,8 +8275,8 @@ msgstr "" msgid "Sex Addict" msgstr "" -#: ../../include/profile_selectors.php:42 ../../include/user.php:278 -#: ../../include/user.php:282 +#: ../../include/profile_selectors.php:42 ../../include/user.php:279 +#: ../../include/user.php:283 msgid "Friends" msgstr "" @@ -8581,7 +8599,7 @@ msgstr "" msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1279 ../../include/user.php:236 +#: ../../include/text.php:1279 ../../include/user.php:237 msgid "default" msgstr "" @@ -8692,7 +8710,7 @@ msgstr "" msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:975 +#: ../../include/nav.php:46 ../../boot.php:976 msgid "Logout" msgstr "" @@ -8700,7 +8718,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1767 +#: ../../include/nav.php:49 ../../boot.php:1774 msgid "Status" msgstr "" @@ -8792,7 +8810,7 @@ msgstr "" msgid "Delegations" msgstr "" -#: ../../include/nav.php:142 ../../boot.php:1272 +#: ../../include/nav.php:142 ../../boot.php:1279 msgid "Profiles" msgstr "" @@ -8952,7 +8970,7 @@ msgstr "" msgid "Happy Birthday %s" msgstr "" -#: ../../include/bbcode.php:210 ../../include/bbcode.php:491 +#: ../../include/bbcode.php:210 ../../include/bbcode.php:505 msgid "Image/photo" msgstr "" @@ -8963,11 +8981,11 @@ msgid "" "href=\"%s\" target=\"external-link\">post:" msgstr "" -#: ../../include/bbcode.php:456 ../../include/bbcode.php:476 +#: ../../include/bbcode.php:470 ../../include/bbcode.php:490 msgid "$1 wrote:" msgstr "" -#: ../../include/bbcode.php:496 ../../include/bbcode.php:497 +#: ../../include/bbcode.php:510 ../../include/bbcode.php:511 msgid "Encrypted content" msgstr "" @@ -9384,71 +9402,71 @@ msgstr "" msgid "Archives" msgstr "" -#: ../../include/user.php:38 +#: ../../include/user.php:39 msgid "An invitation is required." msgstr "" -#: ../../include/user.php:43 +#: ../../include/user.php:44 msgid "Invitation could not be verified." msgstr "" -#: ../../include/user.php:51 +#: ../../include/user.php:52 msgid "Invalid OpenID url" msgstr "" -#: ../../include/user.php:66 +#: ../../include/user.php:67 msgid "Please enter the required information." msgstr "" -#: ../../include/user.php:80 +#: ../../include/user.php:81 msgid "Please use a shorter name." msgstr "" -#: ../../include/user.php:82 +#: ../../include/user.php:83 msgid "Name too short." msgstr "" -#: ../../include/user.php:97 +#: ../../include/user.php:98 msgid "That doesn't appear to be your full (First Last) name." msgstr "" -#: ../../include/user.php:102 +#: ../../include/user.php:103 msgid "Your email domain is not among those allowed on this site." msgstr "" -#: ../../include/user.php:105 +#: ../../include/user.php:106 msgid "Not a valid email address." msgstr "" -#: ../../include/user.php:115 +#: ../../include/user.php:116 msgid "Cannot use that email." msgstr "" -#: ../../include/user.php:121 +#: ../../include/user.php:122 msgid "" "Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and " "must also begin with a letter." msgstr "" -#: ../../include/user.php:127 ../../include/user.php:225 +#: ../../include/user.php:128 ../../include/user.php:226 msgid "Nickname is already registered. Please choose another." msgstr "" -#: ../../include/user.php:137 +#: ../../include/user.php:138 msgid "" "Nickname was once registered here and may not be re-used. Please choose " "another." msgstr "" -#: ../../include/user.php:153 +#: ../../include/user.php:154 msgid "SERIOUS ERROR: Generation of security keys failed." msgstr "" -#: ../../include/user.php:211 +#: ../../include/user.php:212 msgid "An error occurred during registration. Please try again." msgstr "" -#: ../../include/user.php:246 +#: ../../include/user.php:247 msgid "An error occurred creating your default profile. Please try again." msgstr "" @@ -9519,11 +9537,11 @@ msgstr "" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:620 ../../object/Item.php:243 +#: ../../include/conversation.php:620 ../../object/Item.php:248 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:621 ../../object/Item.php:244 +#: ../../include/conversation.php:621 ../../object/Item.php:249 msgid "Filed under:" msgstr "" @@ -9638,115 +9656,115 @@ msgstr "" msgid "Update Error at %s" msgstr "" -#: ../../boot.php:950 +#: ../../boot.php:951 msgid "Create a New Account" msgstr "" -#: ../../boot.php:978 +#: ../../boot.php:979 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:979 +#: ../../boot.php:980 msgid "Password: " msgstr "" -#: ../../boot.php:980 +#: ../../boot.php:981 msgid "Remember me" msgstr "" -#: ../../boot.php:983 +#: ../../boot.php:984 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:989 +#: ../../boot.php:990 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:992 +#: ../../boot.php:993 msgid "Website Terms of Service" msgstr "" -#: ../../boot.php:993 +#: ../../boot.php:994 msgid "terms of service" msgstr "" -#: ../../boot.php:995 +#: ../../boot.php:996 msgid "Website Privacy Policy" msgstr "" -#: ../../boot.php:996 +#: ../../boot.php:997 msgid "privacy policy" msgstr "" -#: ../../boot.php:1121 +#: ../../boot.php:1126 msgid "Requested account is not available." msgstr "" -#: ../../boot.php:1198 +#: ../../boot.php:1205 msgid "Edit profile" msgstr "" -#: ../../boot.php:1264 +#: ../../boot.php:1271 msgid "Message" msgstr "" -#: ../../boot.php:1272 +#: ../../boot.php:1279 msgid "Manage/edit profiles" msgstr "" -#: ../../boot.php:1395 ../../boot.php:1481 +#: ../../boot.php:1402 ../../boot.php:1488 msgid "g A l F d" msgstr "" -#: ../../boot.php:1396 ../../boot.php:1482 +#: ../../boot.php:1403 ../../boot.php:1489 msgid "F d" msgstr "" -#: ../../boot.php:1441 ../../boot.php:1522 +#: ../../boot.php:1448 ../../boot.php:1529 msgid "[today]" msgstr "" -#: ../../boot.php:1453 +#: ../../boot.php:1460 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1454 +#: ../../boot.php:1461 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1515 +#: ../../boot.php:1522 msgid "[No description]" msgstr "" -#: ../../boot.php:1533 +#: ../../boot.php:1540 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1534 +#: ../../boot.php:1541 msgid "Events this week:" msgstr "" -#: ../../boot.php:1770 +#: ../../boot.php:1777 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1777 +#: ../../boot.php:1784 msgid "Profile Details" msgstr "" -#: ../../boot.php:1794 +#: ../../boot.php:1801 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1801 +#: ../../boot.php:1808 msgid "Only You Can See This" msgstr "" -#: ../../object/Item.php:255 +#: ../../object/Item.php:260 msgid "via" msgstr "" -#: ../../index.php:398 +#: ../../index.php:392 msgid "toggle mobile" msgstr "" -- 2.39.5