diff --git a/boot.php b/boot.php index 1d43008896..3c84b7cb33 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.1569' ); +define ( 'FRIENDICA_VERSION', '3.1.1570' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1157 ); diff --git a/util/messages.po b/util/messages.po index 2ac7bac571..d6f9b3f2dd 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.1.1569\n" +"Project-Id-Version: 3.1.1570\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-12-26 10:00-0800\n" +"POT-Creation-Date: 2012-12-27 10:00-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -93,8 +93,8 @@ msgstr "" msgid "Return to contact editor" msgstr "" -#: ../../mod/crepair.php:148 ../../mod/settings.php:568 -#: ../../mod/settings.php:600 ../../mod/admin.php:730 ../../mod/admin.php:740 +#: ../../mod/crepair.php:148 ../../mod/settings.php:562 +#: ../../mod/settings.php:588 ../../mod/admin.php:721 ../../mod/admin.php:731 msgid "Name" msgstr "" @@ -134,15 +134,15 @@ msgstr "" #: ../../mod/events.php:455 ../../mod/photos.php:1028 #: ../../mod/photos.php:1118 ../../mod/photos.php:1402 #: ../../mod/photos.php:1442 ../../mod/photos.php:1486 -#: ../../mod/photos.php:1569 ../../mod/install.php:253 -#: ../../mod/install.php:297 ../../mod/localtime.php:45 ../../mod/poke.php:199 -#: ../../mod/content.php:710 ../../mod/contacts.php:357 -#: ../../mod/settings.php:566 ../../mod/settings.php:688 -#: ../../mod/settings.php:766 ../../mod/settings.php:846 -#: ../../mod/settings.php:1069 ../../mod/group.php:93 ../../mod/mood.php:137 -#: ../../mod/message.php:302 ../../mod/message.php:536 ../../mod/admin.php:470 -#: ../../mod/admin.php:727 ../../mod/admin.php:864 ../../mod/admin.php:1063 -#: ../../mod/admin.php:1157 ../../mod/profiles.php:604 +#: ../../mod/photos.php:1569 ../../mod/install.php:248 +#: ../../mod/install.php:286 ../../mod/localtime.php:45 ../../mod/poke.php:199 +#: ../../mod/content.php:710 ../../mod/contacts.php:352 +#: ../../mod/settings.php:560 ../../mod/settings.php:670 +#: ../../mod/settings.php:739 ../../mod/settings.php:811 +#: ../../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:718 ../../mod/admin.php:855 ../../mod/admin.php:1054 +#: ../../mod/admin.php:1141 ../../mod/profiles.php:604 #: ../../mod/invite.php:119 ../../addon/fromgplus/fromgplus.php:44 #: ../../addon/facebook/facebook.php:619 #: ../../addon/snautofollow/snautofollow.php:64 @@ -180,11 +180,11 @@ msgstr "" #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:515 #: ../../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:87 +#: ../../view/theme/cleanzero/config.php:80 #: ../../view/theme/diabook/theme.php:643 -#: ../../view/theme/diabook/config.php:160 -#: ../../view/theme/quattro/config.php:70 ../../view/theme/dispy/config.php:77 -#: ../../object/Item.php:604 ../../addon.old/fromgplus/fromgplus.php:40 +#: ../../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 #: ../../addon.old/facebook/facebook.php:619 #: ../../addon.old/snautofollow/snautofollow.php:64 #: ../../addon.old/bg/bg.php:90 ../../addon.old/fbpost/fbpost.php:226 @@ -284,12 +284,12 @@ msgstr "" msgid "Edit event" msgstr "" -#: ../../mod/events.php:323 ../../include/text.php:1261 +#: ../../mod/events.php:323 ../../include/text.php:1246 msgid "link to source" msgstr "" #: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:92 -#: ../../include/nav.php:52 ../../boot.php:1793 +#: ../../include/nav.php:52 ../../boot.php:1791 msgid "Events" msgstr "" @@ -302,7 +302,7 @@ msgstr "" msgid "Previous" msgstr "" -#: ../../mod/events.php:350 ../../mod/install.php:205 +#: ../../mod/events.php:350 ../../mod/install.php:207 #: ../../addon/dav/friendica/layout.fnk.php:266 #: ../../addon.old/dav/friendica/layout.fnk.php:266 msgid "Next" @@ -348,7 +348,7 @@ msgstr "" #: ../../mod/events.php:448 ../../mod/directory.php:134 #: ../../addon/forumdirectory/forumdirectory.php:156 #: ../../include/event.php:40 ../../include/bb2diaspora.php:415 -#: ../../boot.php:1314 +#: ../../boot.php:1312 msgid "Location:" msgstr "" @@ -361,9 +361,10 @@ msgid "Share this event" msgstr "" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145 -#: ../../mod/dfrn_request.php:848 ../../mod/settings.php:567 -#: ../../mod/settings.php:599 ../../addon/js_upload/js_upload.php:45 -#: ../../include/conversation.php:1044 +#: ../../mod/dfrn_request.php:848 ../../mod/settings.php:561 +#: ../../mod/settings.php:587 ../../mod/fbrowser.php:81 +#: ../../mod/fbrowser.php:116 ../../addon/js_upload/js_upload.php:45 +#: ../../include/conversation.php:1045 #: ../../addon.old/js_upload/js_upload.php:45 msgid "Cancel" msgstr "" @@ -410,30 +411,30 @@ msgid "" msgstr "" #: ../../mod/api.php:105 ../../mod/dfrn_request.php:836 -#: ../../mod/settings.php:975 ../../mod/settings.php:981 -#: ../../mod/settings.php:989 ../../mod/settings.php:993 -#: ../../mod/settings.php:998 ../../mod/settings.php:1004 -#: ../../mod/settings.php:1010 ../../mod/settings.php:1016 -#: ../../mod/settings.php:1046 ../../mod/settings.php:1047 -#: ../../mod/settings.php:1048 ../../mod/settings.php:1049 -#: ../../mod/settings.php:1050 ../../mod/register.php:237 +#: ../../mod/settings.php:934 ../../mod/settings.php:940 +#: ../../mod/settings.php:948 ../../mod/settings.php:952 +#: ../../mod/settings.php:957 ../../mod/settings.php:963 +#: ../../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 msgid "Yes" msgstr "" #: ../../mod/api.php:106 ../../mod/dfrn_request.php:837 -#: ../../mod/settings.php:975 ../../mod/settings.php:981 -#: ../../mod/settings.php:989 ../../mod/settings.php:993 -#: ../../mod/settings.php:998 ../../mod/settings.php:1004 -#: ../../mod/settings.php:1010 ../../mod/settings.php:1016 -#: ../../mod/settings.php:1046 ../../mod/settings.php:1047 -#: ../../mod/settings.php:1048 ../../mod/settings.php:1049 -#: ../../mod/settings.php:1050 ../../mod/register.php:238 +#: ../../mod/settings.php:934 ../../mod/settings.php:940 +#: ../../mod/settings.php:948 ../../mod/settings.php:952 +#: ../../mod/settings.php:957 ../../mod/settings.php:963 +#: ../../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 msgid "No" msgstr "" -#: ../../mod/photos.php:51 ../../boot.php:1786 +#: ../../mod/photos.php:51 ../../boot.php:1784 msgid "Photo Albums" msgstr "" @@ -446,7 +447,7 @@ msgstr "" msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:66 ../../mod/photos.php:1141 ../../mod/photos.php:1691 +#: ../../mod/photos.php:66 ../../mod/photos.php:1141 ../../mod/photos.php:1685 msgid "Upload New Photos" msgstr "" @@ -637,40 +638,40 @@ msgstr "" msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1422 ../../include/conversation.php:1004 +#: ../../mod/photos.php:1422 ../../include/conversation.php:1005 msgid "Share" msgstr "" #: ../../mod/photos.php:1423 ../../mod/editpost.php:121 #: ../../mod/content.php:499 ../../mod/content.php:883 -#: ../../mod/wallmessage.php:152 ../../mod/message.php:301 -#: ../../mod/message.php:537 ../../include/conversation.php:645 -#: ../../include/conversation.php:1023 ../../object/Item.php:287 +#: ../../mod/wallmessage.php:152 ../../mod/message.php:300 +#: ../../mod/message.php:528 ../../include/conversation.php:645 +#: ../../include/conversation.php:1024 ../../object/Item.php:287 msgid "Please wait" msgstr "" #: ../../mod/photos.php:1439 ../../mod/photos.php:1483 #: ../../mod/photos.php:1566 ../../mod/content.php:707 -#: ../../object/Item.php:601 +#: ../../object/Item.php:600 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:603 +#: ../../object/Item.php:284 ../../object/Item.php:602 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:1041 -#: ../../object/Item.php:613 +#: ../../mod/content.php:719 ../../include/conversation.php:1042 +#: ../../object/Item.php:612 msgid "Preview" msgstr "" #: ../../mod/photos.php:1527 ../../mod/content.php:439 -#: ../../mod/content.php:741 ../../mod/settings.php:635 -#: ../../mod/group.php:177 ../../mod/admin.php:734 +#: ../../mod/content.php:741 ../../mod/settings.php:623 +#: ../../mod/group.php:171 ../../mod/admin.php:725 #: ../../include/conversation.php:569 ../../object/Item.php:119 msgid "Delete" msgstr "" @@ -679,7 +680,7 @@ msgstr "" msgid "View Album" msgstr "" -#: ../../mod/photos.php:1689 +#: ../../mod/photos.php:1683 msgid "Recent Photos" msgstr "" @@ -737,96 +738,96 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:91 ../../include/conversation.php:990 +#: ../../mod/editpost.php:91 ../../include/conversation.php:991 msgid "Post to Email" msgstr "" #: ../../mod/editpost.php:106 ../../mod/content.php:728 -#: ../../mod/settings.php:634 ../../object/Item.php:109 +#: ../../mod/settings.php:622 ../../object/Item.php:109 msgid "Edit" msgstr "" #: ../../mod/editpost.php:107 ../../mod/wallmessage.php:150 -#: ../../mod/message.php:299 ../../mod/message.php:534 -#: ../../include/conversation.php:1005 +#: ../../mod/message.php:298 ../../mod/message.php:525 +#: ../../include/conversation.php:1006 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:108 ../../include/conversation.php:1006 +#: ../../mod/editpost.php:108 ../../include/conversation.php:1007 msgid "upload photo" msgstr "" -#: ../../mod/editpost.php:109 ../../include/conversation.php:1007 +#: ../../mod/editpost.php:109 ../../include/conversation.php:1008 msgid "Attach file" msgstr "" -#: ../../mod/editpost.php:110 ../../include/conversation.php:1008 +#: ../../mod/editpost.php:110 ../../include/conversation.php:1009 msgid "attach file" msgstr "" #: ../../mod/editpost.php:111 ../../mod/wallmessage.php:151 -#: ../../mod/message.php:300 ../../mod/message.php:535 -#: ../../include/conversation.php:1009 +#: ../../mod/message.php:299 ../../mod/message.php:526 +#: ../../include/conversation.php:1010 msgid "Insert web link" msgstr "" -#: ../../mod/editpost.php:112 ../../include/conversation.php:1010 +#: ../../mod/editpost.php:112 ../../include/conversation.php:1011 msgid "web link" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:1011 +#: ../../mod/editpost.php:113 ../../include/conversation.php:1012 msgid "Insert video link" msgstr "" -#: ../../mod/editpost.php:114 ../../include/conversation.php:1012 +#: ../../mod/editpost.php:114 ../../include/conversation.php:1013 msgid "video link" msgstr "" -#: ../../mod/editpost.php:115 ../../include/conversation.php:1013 +#: ../../mod/editpost.php:115 ../../include/conversation.php:1014 msgid "Insert audio link" msgstr "" -#: ../../mod/editpost.php:116 ../../include/conversation.php:1014 +#: ../../mod/editpost.php:116 ../../include/conversation.php:1015 msgid "audio link" msgstr "" -#: ../../mod/editpost.php:117 ../../include/conversation.php:1015 +#: ../../mod/editpost.php:117 ../../include/conversation.php:1016 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:118 ../../include/conversation.php:1016 +#: ../../mod/editpost.php:118 ../../include/conversation.php:1017 msgid "set location" msgstr "" -#: ../../mod/editpost.php:119 ../../include/conversation.php:1017 +#: ../../mod/editpost.php:119 ../../include/conversation.php:1018 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:120 ../../include/conversation.php:1018 +#: ../../mod/editpost.php:120 ../../include/conversation.php:1019 msgid "clear location" msgstr "" -#: ../../mod/editpost.php:122 ../../include/conversation.php:1024 +#: ../../mod/editpost.php:122 ../../include/conversation.php:1025 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:130 ../../include/conversation.php:1033 +#: ../../mod/editpost.php:130 ../../include/conversation.php:1034 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:131 ../../include/conversation.php:1034 +#: ../../mod/editpost.php:131 ../../include/conversation.php:1035 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:134 ../../include/conversation.php:1020 +#: ../../mod/editpost.php:134 ../../include/conversation.php:1021 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:136 ../../include/conversation.php:1022 +#: ../../mod/editpost.php:136 ../../include/conversation.php:1023 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/editpost.php:137 ../../include/conversation.php:1036 +#: ../../mod/editpost.php:137 ../../include/conversation.php:1037 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -999,7 +1000,7 @@ msgstr "" msgid "StatusNet/Federated Social Web" msgstr "" -#: ../../mod/dfrn_request.php:842 ../../mod/settings.php:699 +#: ../../mod/dfrn_request.php:842 ../../mod/settings.php:681 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "" @@ -1048,7 +1049,7 @@ msgid "Remove account" msgstr "" #: ../../mod/uexport.php:48 ../../mod/settings.php:74 -#: ../../mod/newmember.php:22 ../../mod/admin.php:823 ../../mod/admin.php:1028 +#: ../../mod/newmember.php:22 ../../mod/admin.php:814 ../../mod/admin.php:1019 #: ../../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 @@ -1100,233 +1101,262 @@ msgid "" "or mysql." msgstr "" -#: ../../mod/install.php:139 ../../mod/install.php:204 -#: ../../mod/install.php:501 +#: ../../mod/install.php:139 ../../mod/install.php:206 +#: ../../mod/install.php:506 msgid "Please see the file \"INSTALL.txt\"." msgstr "" -#: ../../mod/install.php:201 +#: ../../mod/install.php:203 msgid "System check" msgstr "" -#: ../../mod/install.php:206 +#: ../../mod/install.php:208 msgid "Check again" msgstr "" -#: ../../mod/install.php:232 +#: ../../mod/install.php:227 msgid "Database connection" msgstr "" -#: ../../mod/install.php:233 +#: ../../mod/install.php:228 msgid "" "In order to install Friendica we need to know how to connect to your " "database." msgstr "" -#: ../../mod/install.php:234 +#: ../../mod/install.php:229 msgid "" "Please contact your hosting provider or site administrator if you have " "questions about these settings." msgstr "" -#: ../../mod/install.php:235 +#: ../../mod/install.php:230 msgid "" "The database you specify below should already exist. If it does not, please " "create it before continuing." msgstr "" -#: ../../mod/install.php:239 +#: ../../mod/install.php:234 msgid "Database Server Name" msgstr "" -#: ../../mod/install.php:240 +#: ../../mod/install.php:235 msgid "Database Login Name" msgstr "" -#: ../../mod/install.php:241 +#: ../../mod/install.php:236 msgid "Database Login Password" msgstr "" -#: ../../mod/install.php:242 +#: ../../mod/install.php:237 msgid "Database Name" msgstr "" -#: ../../mod/install.php:243 ../../mod/install.php:288 +#: ../../mod/install.php:238 ../../mod/install.php:277 msgid "Site administrator email address" msgstr "" -#: ../../mod/install.php:243 ../../mod/install.php:288 +#: ../../mod/install.php:238 ../../mod/install.php:277 msgid "" "Your account email address must match this in order to use the web admin " "panel." msgstr "" -#: ../../mod/install.php:247 ../../mod/install.php:291 +#: ../../mod/install.php:242 ../../mod/install.php:280 msgid "Please select a default timezone for your website" msgstr "" -#: ../../mod/install.php:278 +#: ../../mod/install.php:267 msgid "Site settings" msgstr "" -#: ../../mod/install.php:331 +#: ../../mod/install.php:320 msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: ../../mod/install.php:332 +#: ../../mod/install.php:321 msgid "" "If you don't have a command line version of PHP installed on server, you " "will not be able to run background polling via cron. See 'Activating scheduled tasks'" msgstr "" -#: ../../mod/install.php:336 +#: ../../mod/install.php:325 msgid "PHP executable path" msgstr "" -#: ../../mod/install.php:336 +#: ../../mod/install.php:325 msgid "" "Enter full path to php executable. You can leave this blank to continue the " "installation." msgstr "" -#: ../../mod/install.php:341 +#: ../../mod/install.php:330 msgid "Command line PHP" msgstr "" -#: ../../mod/install.php:350 +#: ../../mod/install.php:339 msgid "" "The command line version of PHP on your system does not have " "\"register_argc_argv\" enabled." msgstr "" -#: ../../mod/install.php:351 +#: ../../mod/install.php:340 msgid "This is required for message delivery to work." msgstr "" -#: ../../mod/install.php:353 +#: ../../mod/install.php:342 msgid "PHP register_argc_argv" msgstr "" -#: ../../mod/install.php:374 +#: ../../mod/install.php:363 msgid "" "Error: the \"openssl_pkey_new\" function on this system is not able to " "generate encryption keys" msgstr "" -#: ../../mod/install.php:375 +#: ../../mod/install.php:364 msgid "" "If running under Windows, please see \"http://www.php.net/manual/en/openssl." "installation.php\"." msgstr "" -#: ../../mod/install.php:377 +#: ../../mod/install.php:366 msgid "Generate encryption keys" msgstr "" -#: ../../mod/install.php:384 +#: ../../mod/install.php:373 msgid "libCurl PHP module" msgstr "" -#: ../../mod/install.php:385 +#: ../../mod/install.php:374 msgid "GD graphics PHP module" msgstr "" -#: ../../mod/install.php:386 +#: ../../mod/install.php:375 msgid "OpenSSL PHP module" msgstr "" -#: ../../mod/install.php:387 +#: ../../mod/install.php:376 msgid "mysqli PHP module" msgstr "" -#: ../../mod/install.php:388 +#: ../../mod/install.php:377 msgid "mb_string PHP module" msgstr "" -#: ../../mod/install.php:393 ../../mod/install.php:395 +#: ../../mod/install.php:382 ../../mod/install.php:384 msgid "Apache mod_rewrite module" msgstr "" -#: ../../mod/install.php:393 +#: ../../mod/install.php:382 msgid "" "Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: ../../mod/install.php:401 +#: ../../mod/install.php:390 msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: ../../mod/install.php:405 +#: ../../mod/install.php:394 msgid "" "Error: GD graphics PHP module with JPEG support required but not installed." msgstr "" -#: ../../mod/install.php:409 +#: ../../mod/install.php:398 msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../mod/install.php:413 +#: ../../mod/install.php:402 msgid "Error: mysqli PHP module required but not installed." msgstr "" -#: ../../mod/install.php:417 +#: ../../mod/install.php:406 msgid "Error: mb_string PHP module required but not installed." msgstr "" -#: ../../mod/install.php:434 +#: ../../mod/install.php:423 msgid "" "The web installer needs to be able to create a file called \".htconfig.php\" " "in the top folder of your web server and it is unable to do so." msgstr "" -#: ../../mod/install.php:435 +#: ../../mod/install.php:424 msgid "" "This is most often a permission setting, as the web server may not be able " "to write files in your folder - even if you can." msgstr "" -#: ../../mod/install.php:436 +#: ../../mod/install.php:425 msgid "" "At the end of this procedure, we will give you a text to save in a file " "named .htconfig.php in your Friendica top folder." msgstr "" -#: ../../mod/install.php:437 +#: ../../mod/install.php:426 msgid "" "You can alternatively skip this procedure and perform a manual installation. " "Please see the file \"INSTALL.txt\" for instructions." msgstr "" -#: ../../mod/install.php:440 +#: ../../mod/install.php:429 msgid ".htconfig.php is writable" msgstr "" -#: ../../mod/install.php:452 +#: ../../mod/install.php:439 +msgid "" +"Friendica uses the Smarty3 template engine to render its web views. Smarty3 " +"compiles templates to PHP to speed up rendering." +msgstr "" + +#: ../../mod/install.php:440 +msgid "" +"In order to store these compiled templates, the web server needs to have " +"write access to the directory view/smarty3/ under the Friendica top level " +"folder." +msgstr "" + +#: ../../mod/install.php:441 +msgid "" +"Please ensure that the user that your web server runs as (e.g. www-data) has " +"write access to this folder." +msgstr "" + +#: ../../mod/install.php:442 +msgid "" +"Note: as a security measure, you should give the web server write access to " +"view/smarty3/ only--not the template files (.tpl) that it contains." +msgstr "" + +#: ../../mod/install.php:445 +msgid "view/smarty3 is writable" +msgstr "" + +#: ../../mod/install.php:457 msgid "" "Url rewrite in .htaccess is not working. Check your server configuration." msgstr "" -#: ../../mod/install.php:454 +#: ../../mod/install.php:459 msgid "Url rewrite is working" msgstr "" -#: ../../mod/install.php:464 +#: ../../mod/install.php:469 msgid "" "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." msgstr "" -#: ../../mod/install.php:488 +#: ../../mod/install.php:493 msgid "Errors encountered creating database tables." msgstr "" -#: ../../mod/install.php:499 +#: ../../mod/install.php:504 msgid "

What next

" msgstr "" -#: ../../mod/install.php:500 +#: ../../mod/install.php:505 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" @@ -1398,7 +1428,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1252 +#: ../../include/contact_widgets.php:9 ../../boot.php:1250 msgid "Connect" msgstr "" @@ -1449,15 +1479,15 @@ msgstr "" msgid "View in context" msgstr "" -#: ../../mod/content.php:603 ../../object/Item.php:307 +#: ../../mod/content.php:603 ../../object/Item.php:306 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../mod/content.php:605 ../../include/text.php:1517 -#: ../../object/Item.php:309 ../../object/Item.php:322 +#: ../../mod/content.php:605 ../../include/text.php:1502 +#: ../../object/Item.php:308 ../../object/Item.php:321 msgid "comment" msgid_plural "comments" msgstr[0] "" @@ -1466,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:310 ../../addon.old/page/page.php:77 +#: ../../object/Item.php:309 ../../addon.old/page/page.php:77 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119 msgid "show more" msgstr "" @@ -1487,35 +1517,35 @@ msgstr "" msgid "share" msgstr "" -#: ../../mod/content.php:711 ../../object/Item.php:605 +#: ../../mod/content.php:711 ../../object/Item.php:604 msgid "Bold" msgstr "" -#: ../../mod/content.php:712 ../../object/Item.php:606 +#: ../../mod/content.php:712 ../../object/Item.php:605 msgid "Italic" msgstr "" -#: ../../mod/content.php:713 ../../object/Item.php:607 +#: ../../mod/content.php:713 ../../object/Item.php:606 msgid "Underline" msgstr "" -#: ../../mod/content.php:714 ../../object/Item.php:608 +#: ../../mod/content.php:714 ../../object/Item.php:607 msgid "Quote" msgstr "" -#: ../../mod/content.php:715 ../../object/Item.php:609 +#: ../../mod/content.php:715 ../../object/Item.php:608 msgid "Code" msgstr "" -#: ../../mod/content.php:716 ../../object/Item.php:610 +#: ../../mod/content.php:716 ../../object/Item.php:609 msgid "Image" msgstr "" -#: ../../mod/content.php:717 ../../object/Item.php:611 +#: ../../mod/content.php:717 ../../object/Item.php:610 msgid "Link" msgstr "" -#: ../../mod/content.php:718 ../../object/Item.php:612 +#: ../../mod/content.php:718 ../../object/Item.php:611 msgid "Video" msgstr "" @@ -1565,14 +1595,14 @@ msgstr "" msgid "Invalid request identifier." msgstr "" -#: ../../mod/notifications.php:35 ../../mod/notifications.php:170 -#: ../../mod/notifications.php:221 +#: ../../mod/notifications.php:35 ../../mod/notifications.php:165 +#: ../../mod/notifications.php:211 msgid "Discard" msgstr "" -#: ../../mod/notifications.php:51 ../../mod/notifications.php:169 -#: ../../mod/notifications.php:220 ../../mod/contacts.php:325 -#: ../../mod/contacts.php:384 +#: ../../mod/notifications.php:51 ../../mod/notifications.php:164 +#: ../../mod/notifications.php:210 ../../mod/contacts.php:325 +#: ../../mod/contacts.php:379 msgid "Ignore" msgstr "" @@ -1610,139 +1640,139 @@ msgstr "" msgid "Hide Ignored Requests" msgstr "" -#: ../../mod/notifications.php:154 ../../mod/notifications.php:205 +#: ../../mod/notifications.php:149 ../../mod/notifications.php:195 msgid "Notification type: " msgstr "" -#: ../../mod/notifications.php:155 +#: ../../mod/notifications.php:150 msgid "Friend Suggestion" msgstr "" -#: ../../mod/notifications.php:157 +#: ../../mod/notifications.php:152 #, php-format msgid "suggested by %s" msgstr "" -#: ../../mod/notifications.php:162 ../../mod/notifications.php:214 -#: ../../mod/contacts.php:390 +#: ../../mod/notifications.php:157 ../../mod/notifications.php:204 +#: ../../mod/contacts.php:385 msgid "Hide this contact from others" msgstr "" -#: ../../mod/notifications.php:163 ../../mod/notifications.php:215 +#: ../../mod/notifications.php:158 ../../mod/notifications.php:205 msgid "Post a new friend activity" msgstr "" -#: ../../mod/notifications.php:163 ../../mod/notifications.php:215 +#: ../../mod/notifications.php:158 ../../mod/notifications.php:205 msgid "if applicable" msgstr "" -#: ../../mod/notifications.php:166 ../../mod/notifications.php:218 -#: ../../mod/admin.php:732 +#: ../../mod/notifications.php:161 ../../mod/notifications.php:208 +#: ../../mod/admin.php:723 msgid "Approve" msgstr "" -#: ../../mod/notifications.php:186 +#: ../../mod/notifications.php:181 msgid "Claims to be known to you: " msgstr "" -#: ../../mod/notifications.php:186 +#: ../../mod/notifications.php:181 msgid "yes" msgstr "" -#: ../../mod/notifications.php:186 +#: ../../mod/notifications.php:181 msgid "no" msgstr "" -#: ../../mod/notifications.php:193 +#: ../../mod/notifications.php:188 msgid "Approve as: " msgstr "" -#: ../../mod/notifications.php:194 +#: ../../mod/notifications.php:189 msgid "Friend" msgstr "" -#: ../../mod/notifications.php:195 +#: ../../mod/notifications.php:190 msgid "Sharer" msgstr "" -#: ../../mod/notifications.php:195 +#: ../../mod/notifications.php:190 msgid "Fan/Admirer" msgstr "" -#: ../../mod/notifications.php:206 +#: ../../mod/notifications.php:196 msgid "Friend/Connect Request" msgstr "" -#: ../../mod/notifications.php:206 +#: ../../mod/notifications.php:196 msgid "New Follower" msgstr "" -#: ../../mod/notifications.php:227 +#: ../../mod/notifications.php:217 msgid "No introductions." msgstr "" -#: ../../mod/notifications.php:235 ../../include/nav.php:123 +#: ../../mod/notifications.php:220 ../../include/nav.php:123 msgid "Notifications" msgstr "" -#: ../../mod/notifications.php:272 ../../mod/notifications.php:407 -#: ../../mod/notifications.php:499 +#: ../../mod/notifications.php:257 ../../mod/notifications.php:382 +#: ../../mod/notifications.php:469 #, php-format msgid "%s liked %s's post" msgstr "" -#: ../../mod/notifications.php:281 ../../mod/notifications.php:416 -#: ../../mod/notifications.php:508 +#: ../../mod/notifications.php:266 ../../mod/notifications.php:391 +#: ../../mod/notifications.php:478 #, php-format msgid "%s disliked %s's post" msgstr "" -#: ../../mod/notifications.php:295 ../../mod/notifications.php:430 -#: ../../mod/notifications.php:522 +#: ../../mod/notifications.php:280 ../../mod/notifications.php:405 +#: ../../mod/notifications.php:492 #, php-format msgid "%s is now friends with %s" msgstr "" -#: ../../mod/notifications.php:302 ../../mod/notifications.php:437 +#: ../../mod/notifications.php:287 ../../mod/notifications.php:412 #, php-format msgid "%s created a new post" msgstr "" -#: ../../mod/notifications.php:303 ../../mod/notifications.php:438 -#: ../../mod/notifications.php:531 +#: ../../mod/notifications.php:288 ../../mod/notifications.php:413 +#: ../../mod/notifications.php:501 #, php-format msgid "%s commented on %s's post" msgstr "" -#: ../../mod/notifications.php:317 +#: ../../mod/notifications.php:302 msgid "No more network notifications." msgstr "" -#: ../../mod/notifications.php:326 +#: ../../mod/notifications.php:306 msgid "Network Notifications" msgstr "" -#: ../../mod/notifications.php:352 ../../mod/notify.php:61 +#: ../../mod/notifications.php:332 ../../mod/notify.php:61 msgid "No more system notifications." msgstr "" -#: ../../mod/notifications.php:361 ../../mod/notify.php:70 +#: ../../mod/notifications.php:336 ../../mod/notify.php:65 msgid "System Notifications" msgstr "" -#: ../../mod/notifications.php:452 +#: ../../mod/notifications.php:427 msgid "No more personal notifications." msgstr "" -#: ../../mod/notifications.php:461 +#: ../../mod/notifications.php:431 msgid "Personal Notifications" msgstr "" -#: ../../mod/notifications.php:538 +#: ../../mod/notifications.php:508 msgid "No more home notifications." msgstr "" -#: ../../mod/notifications.php:547 +#: ../../mod/notifications.php:512 msgid "Home Notifications" msgstr "" @@ -1837,13 +1867,13 @@ msgstr[1] "" msgid "View all contacts" msgstr "" -#: ../../mod/contacts.php:319 ../../mod/contacts.php:383 -#: ../../mod/admin.php:736 +#: ../../mod/contacts.php:319 ../../mod/contacts.php:378 +#: ../../mod/admin.php:727 msgid "Unblock" msgstr "" -#: ../../mod/contacts.php:319 ../../mod/contacts.php:383 -#: ../../mod/admin.php:735 +#: ../../mod/contacts.php:319 ../../mod/contacts.php:378 +#: ../../mod/admin.php:726 msgid "Block" msgstr "" @@ -1851,7 +1881,7 @@ msgstr "" msgid "Toggle Blocked status" msgstr "" -#: ../../mod/contacts.php:325 ../../mod/contacts.php:384 +#: ../../mod/contacts.php:325 ../../mod/contacts.php:379 msgid "Unignore" msgstr "" @@ -1883,171 +1913,171 @@ msgstr "" msgid "Communications lost with this contact!" msgstr "" -#: ../../mod/contacts.php:355 +#: ../../mod/contacts.php:350 msgid "Contact Editor" msgstr "" -#: ../../mod/contacts.php:358 +#: ../../mod/contacts.php:353 msgid "Profile Visibility" msgstr "" -#: ../../mod/contacts.php:359 +#: ../../mod/contacts.php:354 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/contacts.php:360 +#: ../../mod/contacts.php:355 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/contacts.php:361 +#: ../../mod/contacts.php:356 msgid "Edit contact notes" msgstr "" -#: ../../mod/contacts.php:366 ../../mod/contacts.php:558 +#: ../../mod/contacts.php:361 ../../mod/contacts.php:553 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "" -#: ../../mod/contacts.php:367 +#: ../../mod/contacts.php:362 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/contacts.php:368 +#: ../../mod/contacts.php:363 msgid "Ignore contact" msgstr "" -#: ../../mod/contacts.php:369 +#: ../../mod/contacts.php:364 msgid "Repair URL settings" msgstr "" -#: ../../mod/contacts.php:370 +#: ../../mod/contacts.php:365 msgid "View conversations" msgstr "" -#: ../../mod/contacts.php:372 +#: ../../mod/contacts.php:367 msgid "Delete contact" msgstr "" -#: ../../mod/contacts.php:376 +#: ../../mod/contacts.php:371 msgid "Last update:" msgstr "" -#: ../../mod/contacts.php:378 +#: ../../mod/contacts.php:373 msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:380 ../../mod/admin.php:1222 +#: ../../mod/contacts.php:375 ../../mod/admin.php:1199 msgid "Update now" msgstr "" -#: ../../mod/contacts.php:387 +#: ../../mod/contacts.php:382 msgid "Currently blocked" msgstr "" -#: ../../mod/contacts.php:388 +#: ../../mod/contacts.php:383 msgid "Currently ignored" msgstr "" -#: ../../mod/contacts.php:389 +#: ../../mod/contacts.php:384 msgid "Currently archived" msgstr "" -#: ../../mod/contacts.php:390 +#: ../../mod/contacts.php:385 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/contacts.php:443 +#: ../../mod/contacts.php:438 msgid "Suggestions" msgstr "" -#: ../../mod/contacts.php:446 +#: ../../mod/contacts.php:441 msgid "Suggest potential friends" msgstr "" -#: ../../mod/contacts.php:449 ../../mod/group.php:200 +#: ../../mod/contacts.php:444 ../../mod/group.php:194 msgid "All Contacts" msgstr "" -#: ../../mod/contacts.php:452 +#: ../../mod/contacts.php:447 msgid "Show all contacts" msgstr "" -#: ../../mod/contacts.php:455 +#: ../../mod/contacts.php:450 msgid "Unblocked" msgstr "" -#: ../../mod/contacts.php:458 +#: ../../mod/contacts.php:453 msgid "Only show unblocked contacts" msgstr "" -#: ../../mod/contacts.php:462 +#: ../../mod/contacts.php:457 msgid "Blocked" msgstr "" -#: ../../mod/contacts.php:465 +#: ../../mod/contacts.php:460 msgid "Only show blocked contacts" msgstr "" -#: ../../mod/contacts.php:469 +#: ../../mod/contacts.php:464 msgid "Ignored" msgstr "" -#: ../../mod/contacts.php:472 +#: ../../mod/contacts.php:467 msgid "Only show ignored contacts" msgstr "" -#: ../../mod/contacts.php:476 +#: ../../mod/contacts.php:471 msgid "Archived" msgstr "" -#: ../../mod/contacts.php:479 +#: ../../mod/contacts.php:474 msgid "Only show archived contacts" msgstr "" -#: ../../mod/contacts.php:483 +#: ../../mod/contacts.php:478 msgid "Hidden" msgstr "" -#: ../../mod/contacts.php:486 +#: ../../mod/contacts.php:481 msgid "Only show hidden contacts" msgstr "" -#: ../../mod/contacts.php:534 +#: ../../mod/contacts.php:529 msgid "Mutual Friendship" msgstr "" -#: ../../mod/contacts.php:538 +#: ../../mod/contacts.php:533 msgid "is a fan of yours" msgstr "" -#: ../../mod/contacts.php:542 +#: ../../mod/contacts.php:537 msgid "you are a fan of" msgstr "" -#: ../../mod/contacts.php:559 ../../mod/nogroup.php:41 +#: ../../mod/contacts.php:554 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:586 ../../view/theme/diabook/theme.php:90 +#: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:90 #: ../../include/nav.php:144 msgid "Contacts" msgstr "" -#: ../../mod/contacts.php:590 +#: ../../mod/contacts.php:579 msgid "Search your contacts" msgstr "" -#: ../../mod/contacts.php:591 ../../mod/directory.php:59 +#: ../../mod/contacts.php:580 ../../mod/directory.php:59 #: ../../addon/forumdirectory/forumdirectory.php:81 msgid "Finding: " msgstr "" -#: ../../mod/contacts.php:592 ../../mod/directory.php:61 +#: ../../mod/contacts.php:581 ../../mod/directory.php:61 #: ../../addon/forumdirectory/forumdirectory.php:83 #: ../../include/contact_widgets.php:33 msgid "Find" @@ -2087,7 +2117,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:999 +#: ../../mod/lostpass.php:83 ../../boot.php:990 msgid "Password Reset" msgstr "" @@ -2139,7 +2169,7 @@ msgstr "" msgid "Missing some important data!" msgstr "" -#: ../../mod/settings.php:121 ../../mod/settings.php:598 +#: ../../mod/settings.php:121 ../../mod/settings.php:586 msgid "Update" msgstr "" @@ -2211,455 +2241,455 @@ msgstr "" msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:565 ../../mod/settings.php:597 -#: ../../mod/settings.php:633 +#: ../../mod/settings.php:559 ../../mod/settings.php:585 +#: ../../mod/settings.php:621 msgid "Add application" msgstr "" -#: ../../mod/settings.php:569 ../../mod/settings.php:601 +#: ../../mod/settings.php:563 ../../mod/settings.php:589 #: ../../addon/statusnet/statusnet.php:697 #: ../../addon.old/statusnet/statusnet.php:570 msgid "Consumer Key" msgstr "" -#: ../../mod/settings.php:570 ../../mod/settings.php:602 +#: ../../mod/settings.php:564 ../../mod/settings.php:590 #: ../../addon/statusnet/statusnet.php:696 #: ../../addon.old/statusnet/statusnet.php:569 msgid "Consumer Secret" msgstr "" -#: ../../mod/settings.php:571 ../../mod/settings.php:603 +#: ../../mod/settings.php:565 ../../mod/settings.php:591 msgid "Redirect" msgstr "" -#: ../../mod/settings.php:572 ../../mod/settings.php:604 +#: ../../mod/settings.php:566 ../../mod/settings.php:592 msgid "Icon url" msgstr "" -#: ../../mod/settings.php:583 +#: ../../mod/settings.php:577 msgid "You can't edit this application." msgstr "" -#: ../../mod/settings.php:632 +#: ../../mod/settings.php:620 msgid "Connected Apps" msgstr "" -#: ../../mod/settings.php:636 +#: ../../mod/settings.php:624 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:637 +#: ../../mod/settings.php:625 msgid "No name" msgstr "" -#: ../../mod/settings.php:638 +#: ../../mod/settings.php:626 msgid "Remove authorization" msgstr "" -#: ../../mod/settings.php:650 +#: ../../mod/settings.php:638 msgid "No Plugin settings configured" msgstr "" -#: ../../mod/settings.php:658 ../../addon/widgets/widgets.php:124 +#: ../../mod/settings.php:646 ../../addon/widgets/widgets.php:124 #: ../../addon.old/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "" -#: ../../mod/settings.php:672 +#: ../../mod/settings.php:660 msgid "Off" msgstr "" -#: ../../mod/settings.php:672 +#: ../../mod/settings.php:660 msgid "On" msgstr "" -#: ../../mod/settings.php:686 +#: ../../mod/settings.php:668 msgid "Additional Features" msgstr "" -#: ../../mod/settings.php:699 ../../mod/settings.php:700 +#: ../../mod/settings.php:681 ../../mod/settings.php:682 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "" -#: ../../mod/settings.php:699 ../../mod/settings.php:700 +#: ../../mod/settings.php:681 ../../mod/settings.php:682 msgid "enabled" msgstr "" -#: ../../mod/settings.php:699 ../../mod/settings.php:700 +#: ../../mod/settings.php:681 ../../mod/settings.php:682 msgid "disabled" msgstr "" -#: ../../mod/settings.php:700 +#: ../../mod/settings.php:682 msgid "StatusNet" msgstr "" -#: ../../mod/settings.php:732 +#: ../../mod/settings.php:714 msgid "Email access is disabled on this site." msgstr "" -#: ../../mod/settings.php:748 +#: ../../mod/settings.php:721 msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:753 +#: ../../mod/settings.php:726 msgid "Email/Mailbox Setup" msgstr "" -#: ../../mod/settings.php:754 +#: ../../mod/settings.php:727 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:755 +#: ../../mod/settings.php:728 msgid "Last successful email check:" msgstr "" -#: ../../mod/settings.php:757 +#: ../../mod/settings.php:730 msgid "IMAP server name:" msgstr "" -#: ../../mod/settings.php:758 +#: ../../mod/settings.php:731 msgid "IMAP port:" msgstr "" -#: ../../mod/settings.php:759 +#: ../../mod/settings.php:732 msgid "Security:" msgstr "" -#: ../../mod/settings.php:759 ../../mod/settings.php:764 +#: ../../mod/settings.php:732 ../../mod/settings.php:737 #: ../../addon/fbpost/fbpost.php:247 ../../addon/fbpost/fbpost.php:249 #: ../../addon/dav/common/wdcal_edit.inc.php:191 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191 msgid "None" msgstr "" -#: ../../mod/settings.php:760 +#: ../../mod/settings.php:733 msgid "Email login name:" msgstr "" -#: ../../mod/settings.php:761 +#: ../../mod/settings.php:734 msgid "Email password:" msgstr "" -#: ../../mod/settings.php:762 +#: ../../mod/settings.php:735 msgid "Reply-to address:" msgstr "" -#: ../../mod/settings.php:763 +#: ../../mod/settings.php:736 msgid "Send public posts to all email contacts:" msgstr "" -#: ../../mod/settings.php:764 +#: ../../mod/settings.php:737 msgid "Action after import:" msgstr "" -#: ../../mod/settings.php:764 +#: ../../mod/settings.php:737 msgid "Mark as seen" msgstr "" -#: ../../mod/settings.php:764 +#: ../../mod/settings.php:737 msgid "Move to folder" msgstr "" -#: ../../mod/settings.php:765 +#: ../../mod/settings.php:738 msgid "Move to folder:" msgstr "" -#: ../../mod/settings.php:796 ../../mod/admin.php:420 +#: ../../mod/settings.php:769 ../../mod/admin.php:420 msgid "No special theme for mobile devices" msgstr "" -#: ../../mod/settings.php:844 +#: ../../mod/settings.php:809 msgid "Display Settings" msgstr "" -#: ../../mod/settings.php:850 ../../mod/settings.php:861 +#: ../../mod/settings.php:815 ../../mod/settings.php:826 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:851 +#: ../../mod/settings.php:816 msgid "Mobile Theme:" msgstr "" -#: ../../mod/settings.php:852 +#: ../../mod/settings.php:817 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:852 +#: ../../mod/settings.php:817 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:853 +#: ../../mod/settings.php:818 msgid "Number of items to display per page:" msgstr "" -#: ../../mod/settings.php:853 +#: ../../mod/settings.php:818 msgid "Maximum of 100 items" msgstr "" -#: ../../mod/settings.php:854 +#: ../../mod/settings.php:819 msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:936 +#: ../../mod/settings.php:895 msgid "Normal Account Page" msgstr "" -#: ../../mod/settings.php:937 +#: ../../mod/settings.php:896 msgid "This account is a normal personal profile" msgstr "" -#: ../../mod/settings.php:940 +#: ../../mod/settings.php:899 msgid "Soapbox Page" msgstr "" -#: ../../mod/settings.php:941 +#: ../../mod/settings.php:900 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: ../../mod/settings.php:944 +#: ../../mod/settings.php:903 msgid "Community Forum/Celebrity Account" msgstr "" -#: ../../mod/settings.php:945 +#: ../../mod/settings.php:904 msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: ../../mod/settings.php:948 +#: ../../mod/settings.php:907 msgid "Automatic Friend Page" msgstr "" -#: ../../mod/settings.php:949 +#: ../../mod/settings.php:908 msgid "Automatically approve all connection/friend requests as friends" msgstr "" -#: ../../mod/settings.php:952 +#: ../../mod/settings.php:911 msgid "Private Forum [Experimental]" msgstr "" -#: ../../mod/settings.php:953 +#: ../../mod/settings.php:912 msgid "Private forum - approved members only" msgstr "" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:924 msgid "OpenID:" msgstr "" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:924 msgid "(Optional) Allow this OpenID to login to this account." msgstr "" -#: ../../mod/settings.php:975 +#: ../../mod/settings.php:934 msgid "Publish your default profile in your local site directory?" msgstr "" -#: ../../mod/settings.php:981 +#: ../../mod/settings.php:940 msgid "Publish your default profile in the global social directory?" msgstr "" -#: ../../mod/settings.php:989 +#: ../../mod/settings.php:948 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "" -#: ../../mod/settings.php:993 +#: ../../mod/settings.php:952 msgid "Hide your profile details from unknown viewers?" msgstr "" -#: ../../mod/settings.php:998 +#: ../../mod/settings.php:957 msgid "Allow friends to post to your profile page?" msgstr "" -#: ../../mod/settings.php:1004 +#: ../../mod/settings.php:963 msgid "Allow friends to tag your posts?" msgstr "" -#: ../../mod/settings.php:1010 +#: ../../mod/settings.php:969 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:1016 +#: ../../mod/settings.php:975 msgid "Permit unknown people to send you private mail?" msgstr "" -#: ../../mod/settings.php:1024 +#: ../../mod/settings.php:983 msgid "Profile is not published." msgstr "" -#: ../../mod/settings.php:1027 ../../mod/profile_photo.php:248 +#: ../../mod/settings.php:986 ../../mod/profile_photo.php:248 msgid "or" msgstr "" -#: ../../mod/settings.php:1032 +#: ../../mod/settings.php:991 msgid "Your Identity Address is" msgstr "" -#: ../../mod/settings.php:1043 +#: ../../mod/settings.php:1002 msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/settings.php:1043 +#: ../../mod/settings.php:1002 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/settings.php:1044 +#: ../../mod/settings.php:1003 msgid "Advanced expiration settings" msgstr "" -#: ../../mod/settings.php:1045 +#: ../../mod/settings.php:1004 msgid "Advanced Expiration" msgstr "" -#: ../../mod/settings.php:1046 +#: ../../mod/settings.php:1005 msgid "Expire posts:" msgstr "" -#: ../../mod/settings.php:1047 +#: ../../mod/settings.php:1006 msgid "Expire personal notes:" msgstr "" -#: ../../mod/settings.php:1048 +#: ../../mod/settings.php:1007 msgid "Expire starred posts:" msgstr "" -#: ../../mod/settings.php:1049 +#: ../../mod/settings.php:1008 msgid "Expire photos:" msgstr "" -#: ../../mod/settings.php:1050 +#: ../../mod/settings.php:1009 msgid "Only expire posts by others:" msgstr "" -#: ../../mod/settings.php:1067 +#: ../../mod/settings.php:1016 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:1075 +#: ../../mod/settings.php:1024 msgid "Password Settings" msgstr "" -#: ../../mod/settings.php:1076 +#: ../../mod/settings.php:1025 msgid "New Password:" msgstr "" -#: ../../mod/settings.php:1077 +#: ../../mod/settings.php:1026 msgid "Confirm:" msgstr "" -#: ../../mod/settings.php:1077 +#: ../../mod/settings.php:1026 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:1081 +#: ../../mod/settings.php:1030 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:1082 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:1031 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "" -#: ../../mod/settings.php:1083 +#: ../../mod/settings.php:1032 msgid "Email Address:" msgstr "" -#: ../../mod/settings.php:1084 +#: ../../mod/settings.php:1033 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:1085 +#: ../../mod/settings.php:1034 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:1086 +#: ../../mod/settings.php:1035 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:1089 +#: ../../mod/settings.php:1038 msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/settings.php:1091 +#: ../../mod/settings.php:1040 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:1091 ../../mod/settings.php:1110 +#: ../../mod/settings.php:1040 ../../mod/settings.php:1059 msgid "(to prevent spam abuse)" msgstr "" -#: ../../mod/settings.php:1092 +#: ../../mod/settings.php:1041 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:1093 +#: ../../mod/settings.php:1042 msgid "(click to open/close)" msgstr "" -#: ../../mod/settings.php:1110 +#: ../../mod/settings.php:1059 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:1113 +#: ../../mod/settings.php:1062 msgid "Notification Settings" msgstr "" -#: ../../mod/settings.php:1114 +#: ../../mod/settings.php:1063 msgid "By default post a status message when:" msgstr "" -#: ../../mod/settings.php:1115 +#: ../../mod/settings.php:1064 msgid "accepting a friend request" msgstr "" -#: ../../mod/settings.php:1116 +#: ../../mod/settings.php:1065 msgid "joining a forum/community" msgstr "" -#: ../../mod/settings.php:1117 +#: ../../mod/settings.php:1066 msgid "making an interesting profile change" msgstr "" -#: ../../mod/settings.php:1118 +#: ../../mod/settings.php:1067 msgid "Send a notification email when:" msgstr "" -#: ../../mod/settings.php:1119 +#: ../../mod/settings.php:1068 msgid "You receive an introduction" msgstr "" -#: ../../mod/settings.php:1120 +#: ../../mod/settings.php:1069 msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/settings.php:1121 +#: ../../mod/settings.php:1070 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:1122 +#: ../../mod/settings.php:1071 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:1123 +#: ../../mod/settings.php:1072 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:1124 +#: ../../mod/settings.php:1073 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:1125 +#: ../../mod/settings.php:1074 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:1126 +#: ../../mod/settings.php:1075 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/settings.php:1129 +#: ../../mod/settings.php:1078 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/settings.php:1130 +#: ../../mod/settings.php:1079 msgid "Change the behaviour of this account for special situations" msgstr "" @@ -2762,16 +2792,16 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1800 +#: ../../mod/notes.php:44 ../../boot.php:1798 msgid "Personal Notes" msgstr "" -#: ../../mod/notes.php:63 ../../mod/filer.php:36 +#: ../../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/dav/friendica/layout.fnk.php:441 -#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:756 +#: ../../addon/dav/friendica/layout.fnk.php:488 ../../include/text.php:741 #: ../../addon.old/facebook/facebook.php:770 #: ../../addon.old/privacy_image_cache/privacy_image_cache.php:263 #: ../../addon.old/fbpost/fbpost.php:267 @@ -2786,36 +2816,36 @@ msgid "" "Please try again tomorrow." msgstr "" -#: ../../mod/uimport.php:70 +#: ../../mod/uimport.php:64 msgid "Import" msgstr "" -#: ../../mod/uimport.php:72 +#: ../../mod/uimport.php:66 msgid "Move account" msgstr "" -#: ../../mod/uimport.php:73 +#: ../../mod/uimport.php:67 msgid "You can import an account from another Friendica server." msgstr "" -#: ../../mod/uimport.php:74 +#: ../../mod/uimport.php:68 msgid "" "You need to export your account from the old server and upload it here. We " "will recreate your old account here with all your contacts. We will try also " "to inform your friends that you moved here." msgstr "" -#: ../../mod/uimport.php:75 +#: ../../mod/uimport.php:69 msgid "" "This feature is experimental. We can't import contacts from the OStatus " "network (statusnet/identi.ca) or from Diaspora" msgstr "" -#: ../../mod/uimport.php:76 +#: ../../mod/uimport.php:70 msgid "Account file" msgstr "" -#: ../../mod/uimport.php:76 +#: ../../mod/uimport.php:70 msgid "" "To export your accont, go to \"Settings->Export your porsonal data\" and " "select \"Export account\"" @@ -2852,12 +2882,12 @@ msgstr "" #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/message.php:249 ../../mod/message.php:257 -#: ../../mod/message.php:431 ../../mod/message.php:439 -#: ../../include/conversation.php:940 ../../include/conversation.php:958 +#: ../../mod/message.php:429 ../../mod/message.php:437 +#: ../../include/conversation.php:941 ../../include/conversation.php:959 msgid "Please enter a link URL:" msgstr "" -#: ../../mod/wallmessage.php:138 ../../mod/message.php:286 +#: ../../mod/wallmessage.php:138 ../../mod/message.php:285 msgid "Send Private Message" msgstr "" @@ -2868,18 +2898,18 @@ msgid "" "your site allow private mail from unknown senders." msgstr "" -#: ../../mod/wallmessage.php:140 ../../mod/message.php:287 -#: ../../mod/message.php:525 +#: ../../mod/wallmessage.php:140 ../../mod/message.php:286 +#: ../../mod/message.php:516 msgid "To:" msgstr "" -#: ../../mod/wallmessage.php:141 ../../mod/message.php:292 -#: ../../mod/message.php:527 +#: ../../mod/wallmessage.php:141 ../../mod/message.php:291 +#: ../../mod/message.php:518 msgid "Subject:" msgstr "" -#: ../../mod/wallmessage.php:147 ../../mod/message.php:296 -#: ../../mod/message.php:530 ../../mod/invite.php:113 +#: ../../mod/wallmessage.php:147 ../../mod/message.php:295 +#: ../../mod/message.php:521 ../../mod/invite.php:113 msgid "Your message:" msgstr "" @@ -2936,7 +2966,7 @@ msgstr "" #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 #: ../../view/theme/diabook/theme.php:89 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 -#: ../../boot.php:1776 +#: ../../boot.php:1774 msgid "Profile" msgstr "" @@ -3099,7 +3129,7 @@ msgstr "" msgid "Could not create group." msgstr "" -#: ../../mod/group.php:47 ../../mod/group.php:146 +#: ../../mod/group.php:47 ../../mod/group.php:140 msgid "Group not found." msgstr "" @@ -3111,31 +3141,31 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ../../mod/group.php:99 +#: ../../mod/group.php:93 msgid "Create a group of contacts/friends." msgstr "" -#: ../../mod/group.php:100 ../../mod/group.php:186 +#: ../../mod/group.php:94 ../../mod/group.php:180 msgid "Group Name: " msgstr "" -#: ../../mod/group.php:119 +#: ../../mod/group.php:113 msgid "Group removed." msgstr "" -#: ../../mod/group.php:121 +#: ../../mod/group.php:115 msgid "Unable to remove group." msgstr "" -#: ../../mod/group.php:185 +#: ../../mod/group.php:179 msgid "Group Editor" msgstr "" -#: ../../mod/group.php:198 +#: ../../mod/group.php:192 msgid "Members" msgstr "" -#: ../../mod/group.php:229 ../../mod/profperm.php:105 +#: ../../mod/group.php:223 ../../mod/profperm.php:105 msgid "Click on a contact to add or remove." msgstr "" @@ -3159,7 +3189,7 @@ msgstr "" msgid "No contacts." msgstr "" -#: ../../mod/viewcontacts.php:82 ../../include/text.php:693 +#: ../../mod/viewcontacts.php:76 ../../include/text.php:678 msgid "View Contacts" msgstr "" @@ -3218,7 +3248,7 @@ msgstr "" msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:260 ../../mod/admin.php:471 +#: ../../mod/register.php:260 ../../mod/admin.php:462 msgid "Registration" msgstr "" @@ -3251,7 +3281,7 @@ 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:1513 +#: ../../view/theme/diabook/theme.php:465 ../../include/text.php:1498 #: ../../include/diaspora.php:1851 ../../include/conversation.php:125 #: ../../include/conversation.php:253 #: ../../addon.old/communityhome/communityhome.php:163 @@ -3288,7 +3318,7 @@ 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:772 ../../mod/admin.php:971 ../../mod/display.php:39 +#: ../../mod/admin.php:763 ../../mod/admin.php:962 ../../mod/display.php:39 #: ../../mod/display.php:169 ../../include/items.php:3853 msgid "Item not found." msgstr "" @@ -3298,11 +3328,11 @@ msgid "Access denied." msgstr "" #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:91 -#: ../../include/nav.php:51 ../../boot.php:1783 +#: ../../include/nav.php:51 ../../boot.php:1781 msgid "Photos" msgstr "" -#: ../../mod/fbrowser.php:112 +#: ../../mod/fbrowser.php:113 msgid "Files" msgstr "" @@ -3469,55 +3499,55 @@ msgstr "" msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:336 +#: ../../mod/message.php:334 msgid "No messages." msgstr "" -#: ../../mod/message.php:343 +#: ../../mod/message.php:341 #, php-format msgid "Unknown sender - %s" msgstr "" -#: ../../mod/message.php:346 +#: ../../mod/message.php:344 #, php-format msgid "You and %s" msgstr "" -#: ../../mod/message.php:349 +#: ../../mod/message.php:347 #, php-format msgid "%s and You" msgstr "" -#: ../../mod/message.php:370 ../../mod/message.php:517 +#: ../../mod/message.php:368 ../../mod/message.php:509 msgid "Delete conversation" msgstr "" -#: ../../mod/message.php:373 +#: ../../mod/message.php:371 msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/message.php:376 +#: ../../mod/message.php:374 #, php-format msgid "%d message" msgid_plural "%d messages" msgstr[0] "" msgstr[1] "" -#: ../../mod/message.php:415 +#: ../../mod/message.php:413 msgid "Message not available." msgstr "" -#: ../../mod/message.php:485 +#: ../../mod/message.php:483 msgid "Delete message" msgstr "" -#: ../../mod/message.php:519 +#: ../../mod/message.php:511 msgid "" "No secure communications available. You may be able to " "respond from the sender's profile page." msgstr "" -#: ../../mod/message.php:524 +#: ../../mod/message.php:515 msgid "Send Reply" msgstr "" @@ -3534,19 +3564,19 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: ../../mod/admin.php:96 ../../mod/admin.php:469 +#: ../../mod/admin.php:96 ../../mod/admin.php:460 msgid "Site" msgstr "" -#: ../../mod/admin.php:97 ../../mod/admin.php:726 ../../mod/admin.php:739 +#: ../../mod/admin.php:97 ../../mod/admin.php:717 ../../mod/admin.php:730 msgid "Users" msgstr "" -#: ../../mod/admin.php:98 ../../mod/admin.php:821 ../../mod/admin.php:863 +#: ../../mod/admin.php:98 ../../mod/admin.php:812 ../../mod/admin.php:854 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:99 ../../mod/admin.php:1026 ../../mod/admin.php:1062 +#: ../../mod/admin.php:99 ../../mod/admin.php:1017 ../../mod/admin.php:1053 msgid "Themes" msgstr "" @@ -3554,7 +3584,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1156 +#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1140 msgid "Logs" msgstr "" @@ -3570,19 +3600,19 @@ msgstr "" msgid "User registrations waiting for confirmation" msgstr "" -#: ../../mod/admin.php:183 ../../mod/admin.php:707 +#: ../../mod/admin.php:183 ../../mod/admin.php:698 msgid "Normal Account" msgstr "" -#: ../../mod/admin.php:184 ../../mod/admin.php:708 +#: ../../mod/admin.php:184 ../../mod/admin.php:699 msgid "Soapbox Account" msgstr "" -#: ../../mod/admin.php:185 ../../mod/admin.php:709 +#: ../../mod/admin.php:185 ../../mod/admin.php:700 msgid "Community/Celebrity Account" msgstr "" -#: ../../mod/admin.php:186 ../../mod/admin.php:710 +#: ../../mod/admin.php:186 ../../mod/admin.php:701 msgid "Automatic Friend Account" msgstr "" @@ -3598,9 +3628,9 @@ msgstr "" msgid "Message queues" msgstr "" -#: ../../mod/admin.php:212 ../../mod/admin.php:468 ../../mod/admin.php:725 -#: ../../mod/admin.php:820 ../../mod/admin.php:862 ../../mod/admin.php:1025 -#: ../../mod/admin.php:1061 ../../mod/admin.php:1155 +#: ../../mod/admin.php:212 ../../mod/admin.php:459 ../../mod/admin.php:716 +#: ../../mod/admin.php:811 ../../mod/admin.php:853 ../../mod/admin.php:1016 +#: ../../mod/admin.php:1052 ../../mod/admin.php:1139 msgid "Administration" msgstr "" @@ -3652,590 +3682,590 @@ msgstr "" msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: ../../mod/admin.php:472 +#: ../../mod/admin.php:463 msgid "File upload" msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:464 msgid "Policies" msgstr "" -#: ../../mod/admin.php:474 +#: ../../mod/admin.php:465 msgid "Advanced" msgstr "" -#: ../../mod/admin.php:475 +#: ../../mod/admin.php:466 msgid "Performance" msgstr "" -#: ../../mod/admin.php:479 ../../addon/statusnet/statusnet.php:694 +#: ../../mod/admin.php:470 ../../addon/statusnet/statusnet.php:694 #: ../../addon.old/statusnet/statusnet.php:567 msgid "Site name" msgstr "" -#: ../../mod/admin.php:480 +#: ../../mod/admin.php:471 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:481 +#: ../../mod/admin.php:472 msgid "System language" msgstr "" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:473 msgid "System theme" msgstr "" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:473 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:474 msgid "Mobile system theme" msgstr "" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:474 msgid "Theme for mobile devices" msgstr "" -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:475 msgid "SSL link policy" msgstr "" -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:475 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: ../../mod/admin.php:485 +#: ../../mod/admin.php:476 msgid "'Share' element" msgstr "" -#: ../../mod/admin.php:485 +#: ../../mod/admin.php:476 msgid "Activates the bbcode element 'share' for repeating items." msgstr "" -#: ../../mod/admin.php:486 +#: ../../mod/admin.php:477 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:486 +#: ../../mod/admin.php:477 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:487 +#: ../../mod/admin.php:478 msgid "Maximum image length" msgstr "" -#: ../../mod/admin.php:487 +#: ../../mod/admin.php:478 msgid "" "Maximum length in pixels of the longest side of uploaded images. Default is -" "1, which means no limits." msgstr "" -#: ../../mod/admin.php:488 +#: ../../mod/admin.php:479 msgid "JPEG image quality" msgstr "" -#: ../../mod/admin.php:488 +#: ../../mod/admin.php:479 msgid "" "Uploaded JPEGS will be saved at this quality setting [0-100]. Default is " "100, which is full quality." msgstr "" -#: ../../mod/admin.php:490 +#: ../../mod/admin.php:481 msgid "Register policy" msgstr "" -#: ../../mod/admin.php:491 +#: ../../mod/admin.php:482 msgid "Maximum Daily Registrations" msgstr "" -#: ../../mod/admin.php:491 +#: ../../mod/admin.php:482 msgid "" "If registration is permitted above, this sets the maximum number of new user " "registrations to accept per day. If register is set to closed, this setting " "has no effect." msgstr "" -#: ../../mod/admin.php:492 +#: ../../mod/admin.php:483 msgid "Register text" msgstr "" -#: ../../mod/admin.php:492 +#: ../../mod/admin.php:483 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:493 +#: ../../mod/admin.php:484 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:493 +#: ../../mod/admin.php:484 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:494 +#: ../../mod/admin.php:485 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:494 +#: ../../mod/admin.php:485 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../mod/admin.php:495 +#: ../../mod/admin.php:486 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:495 +#: ../../mod/admin.php:486 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: ../../mod/admin.php:496 +#: ../../mod/admin.php:487 msgid "Block public" msgstr "" -#: ../../mod/admin.php:496 +#: ../../mod/admin.php:487 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: ../../mod/admin.php:497 +#: ../../mod/admin.php:488 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:497 +#: ../../mod/admin.php:488 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:498 +#: ../../mod/admin.php:489 msgid "Global directory update URL" msgstr "" -#: ../../mod/admin.php:498 +#: ../../mod/admin.php:489 msgid "" "URL to update the global directory. If this is not set, the global directory " "is completely unavailable to the application." msgstr "" -#: ../../mod/admin.php:499 +#: ../../mod/admin.php:490 msgid "Allow threaded items" msgstr "" -#: ../../mod/admin.php:499 +#: ../../mod/admin.php:490 msgid "Allow infinite level threading for items on this site." msgstr "" -#: ../../mod/admin.php:500 +#: ../../mod/admin.php:491 msgid "Private posts by default for new users" msgstr "" -#: ../../mod/admin.php:500 +#: ../../mod/admin.php:491 msgid "" "Set default post permissions for all new members to the default privacy " "group rather than public." msgstr "" -#: ../../mod/admin.php:502 +#: ../../mod/admin.php:493 msgid "Block multiple registrations" msgstr "" -#: ../../mod/admin.php:502 +#: ../../mod/admin.php:493 msgid "Disallow users to register additional accounts for use as pages." msgstr "" -#: ../../mod/admin.php:503 +#: ../../mod/admin.php:494 msgid "OpenID support" msgstr "" -#: ../../mod/admin.php:503 +#: ../../mod/admin.php:494 msgid "OpenID support for registration and logins." msgstr "" -#: ../../mod/admin.php:504 +#: ../../mod/admin.php:495 msgid "Fullname check" msgstr "" -#: ../../mod/admin.php:504 +#: ../../mod/admin.php:495 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "" -#: ../../mod/admin.php:505 +#: ../../mod/admin.php:496 msgid "UTF-8 Regular expressions" msgstr "" -#: ../../mod/admin.php:505 +#: ../../mod/admin.php:496 msgid "Use PHP UTF8 regular expressions" msgstr "" -#: ../../mod/admin.php:506 +#: ../../mod/admin.php:497 msgid "Show Community Page" msgstr "" -#: ../../mod/admin.php:506 +#: ../../mod/admin.php:497 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "" -#: ../../mod/admin.php:507 +#: ../../mod/admin.php:498 msgid "Enable OStatus support" msgstr "" -#: ../../mod/admin.php:507 +#: ../../mod/admin.php:498 msgid "" "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "" -#: ../../mod/admin.php:508 +#: ../../mod/admin.php:499 msgid "Enable Diaspora support" msgstr "" -#: ../../mod/admin.php:508 +#: ../../mod/admin.php:499 msgid "Provide built-in Diaspora network compatibility." msgstr "" -#: ../../mod/admin.php:509 +#: ../../mod/admin.php:500 msgid "Only allow Friendica contacts" msgstr "" -#: ../../mod/admin.php:509 +#: ../../mod/admin.php:500 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "" -#: ../../mod/admin.php:510 +#: ../../mod/admin.php:501 msgid "Verify SSL" msgstr "" -#: ../../mod/admin.php:510 +#: ../../mod/admin.php:501 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you " "cannot connect (at all) to self-signed SSL sites." msgstr "" -#: ../../mod/admin.php:511 +#: ../../mod/admin.php:502 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:512 +#: ../../mod/admin.php:503 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:513 +#: ../../mod/admin.php:504 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:513 +#: ../../mod/admin.php:504 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:514 +#: ../../mod/admin.php:505 msgid "Delivery interval" msgstr "" -#: ../../mod/admin.php:514 +#: ../../mod/admin.php:505 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../mod/admin.php:515 +#: ../../mod/admin.php:506 msgid "Poll interval" msgstr "" -#: ../../mod/admin.php:515 +#: ../../mod/admin.php:506 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../mod/admin.php:516 +#: ../../mod/admin.php:507 msgid "Maximum Load Average" msgstr "" -#: ../../mod/admin.php:516 +#: ../../mod/admin.php:507 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../mod/admin.php:518 +#: ../../mod/admin.php:509 msgid "Use MySQL full text engine" msgstr "" -#: ../../mod/admin.php:518 +#: ../../mod/admin.php:509 msgid "" "Activates the full text engine. Speeds up search - but can only search for " "four and more characters." msgstr "" -#: ../../mod/admin.php:519 +#: ../../mod/admin.php:510 msgid "Path to item cache" msgstr "" -#: ../../mod/admin.php:520 +#: ../../mod/admin.php:511 msgid "Cache duration in seconds" msgstr "" -#: ../../mod/admin.php:520 +#: ../../mod/admin.php:511 msgid "" "How long should the cache files be hold? Default value is 86400 seconds (One " "day)." msgstr "" -#: ../../mod/admin.php:521 +#: ../../mod/admin.php:512 msgid "Path for lock file" msgstr "" -#: ../../mod/admin.php:522 +#: ../../mod/admin.php:513 msgid "Temp path" msgstr "" -#: ../../mod/admin.php:523 +#: ../../mod/admin.php:514 msgid "Base path to installation" msgstr "" -#: ../../mod/admin.php:541 +#: ../../mod/admin.php:532 msgid "Update has been marked successful" msgstr "" -#: ../../mod/admin.php:551 +#: ../../mod/admin.php:542 #, php-format msgid "Executing %s failed. Check system logs." msgstr "" -#: ../../mod/admin.php:554 +#: ../../mod/admin.php:545 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: ../../mod/admin.php:558 +#: ../../mod/admin.php:549 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: ../../mod/admin.php:561 +#: ../../mod/admin.php:552 #, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../mod/admin.php:576 +#: ../../mod/admin.php:567 msgid "No failed updates." msgstr "" -#: ../../mod/admin.php:580 +#: ../../mod/admin.php:571 msgid "Failed Updates" msgstr "" -#: ../../mod/admin.php:581 +#: ../../mod/admin.php:572 msgid "" "This does not include updates prior to 1139, which did not return a status." msgstr "" -#: ../../mod/admin.php:582 +#: ../../mod/admin.php:573 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../mod/admin.php:583 +#: ../../mod/admin.php:574 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../mod/admin.php:608 +#: ../../mod/admin.php:599 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:615 +#: ../../mod/admin.php:606 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:654 +#: ../../mod/admin.php:645 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../mod/admin.php:662 +#: ../../mod/admin.php:653 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:662 +#: ../../mod/admin.php:653 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:728 +#: ../../mod/admin.php:719 msgid "select all" msgstr "" -#: ../../mod/admin.php:729 +#: ../../mod/admin.php:720 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:730 +#: ../../mod/admin.php:721 msgid "Request date" msgstr "" -#: ../../mod/admin.php:730 ../../mod/admin.php:740 +#: ../../mod/admin.php:721 ../../mod/admin.php:731 #: ../../include/contact_selectors.php:79 #: ../../include/contact_selectors.php:86 msgid "Email" msgstr "" -#: ../../mod/admin.php:731 +#: ../../mod/admin.php:722 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:733 +#: ../../mod/admin.php:724 msgid "Deny" msgstr "" -#: ../../mod/admin.php:737 +#: ../../mod/admin.php:728 msgid "Site admin" msgstr "" -#: ../../mod/admin.php:740 +#: ../../mod/admin.php:731 msgid "Register date" msgstr "" -#: ../../mod/admin.php:740 +#: ../../mod/admin.php:731 msgid "Last login" msgstr "" -#: ../../mod/admin.php:740 +#: ../../mod/admin.php:731 msgid "Last item" msgstr "" -#: ../../mod/admin.php:740 +#: ../../mod/admin.php:731 msgid "Account" msgstr "" -#: ../../mod/admin.php:742 +#: ../../mod/admin.php:733 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:743 +#: ../../mod/admin.php:734 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:784 +#: ../../mod/admin.php:775 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:788 +#: ../../mod/admin.php:779 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:798 ../../mod/admin.php:996 +#: ../../mod/admin.php:789 ../../mod/admin.php:987 msgid "Disable" msgstr "" -#: ../../mod/admin.php:800 ../../mod/admin.php:998 +#: ../../mod/admin.php:791 ../../mod/admin.php:989 msgid "Enable" msgstr "" -#: ../../mod/admin.php:822 ../../mod/admin.php:1027 +#: ../../mod/admin.php:813 ../../mod/admin.php:1018 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:830 ../../mod/admin.php:1037 +#: ../../mod/admin.php:821 ../../mod/admin.php:1028 msgid "Author: " msgstr "" -#: ../../mod/admin.php:831 ../../mod/admin.php:1038 +#: ../../mod/admin.php:822 ../../mod/admin.php:1029 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:960 +#: ../../mod/admin.php:951 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:1019 +#: ../../mod/admin.php:1010 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:1067 +#: ../../mod/admin.php:1058 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:1068 +#: ../../mod/admin.php:1059 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1095 +#: ../../mod/admin.php:1086 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1158 +#: ../../mod/admin.php:1142 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1164 +#: ../../mod/admin.php:1148 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1165 +#: ../../mod/admin.php:1149 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1165 +#: ../../mod/admin.php:1149 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: ../../mod/admin.php:1166 +#: ../../mod/admin.php:1150 msgid "Log level" msgstr "" -#: ../../mod/admin.php:1223 +#: ../../mod/admin.php:1200 msgid "Close" msgstr "" -#: ../../mod/admin.php:1229 +#: ../../mod/admin.php:1206 msgid "FTP Host" msgstr "" -#: ../../mod/admin.php:1230 +#: ../../mod/admin.php:1207 msgid "FTP Path" msgstr "" -#: ../../mod/admin.php:1231 +#: ../../mod/admin.php:1208 msgid "FTP User" msgstr "" -#: ../../mod/admin.php:1232 +#: ../../mod/admin.php:1209 msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:1162 +#: ../../mod/profile.php:21 ../../boot.php:1160 msgid "Requested profile is not available." msgstr "" @@ -4292,7 +4322,7 @@ msgstr "" msgid "{0} mentioned you in a post" msgstr "" -#: ../../mod/nogroup.php:65 +#: ../../mod/nogroup.php:59 msgid "Contacts who are not members of a group" msgstr "" @@ -4305,8 +4335,8 @@ msgid "" "Account not found and OpenID registration is not permitted on this site." msgstr "" -#: ../../mod/openid.php:93 ../../include/auth.php:110 -#: ../../include/auth.php:173 +#: ../../mod/openid.php:93 ../../include/auth.php:112 +#: ../../include/auth.php:175 msgid "Login failed." msgstr "" @@ -4343,8 +4373,8 @@ msgstr "" msgid "No installed applications." msgstr "" -#: ../../mod/search.php:99 ../../include/text.php:753 -#: ../../include/text.php:754 ../../include/nav.php:91 +#: ../../mod/search.php:99 ../../include/text.php:738 +#: ../../include/text.php:739 ../../include/nav.php:91 msgid "Search" msgstr "" @@ -4641,32 +4671,32 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:700 ../../boot.php:1280 +#: ../../mod/profiles.php:700 ../../boot.php:1278 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:701 ../../boot.php:1281 +#: ../../mod/profiles.php:701 ../../boot.php:1279 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:712 ../../boot.php:1291 +#: ../../mod/profiles.php:712 ../../boot.php:1289 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:714 ../../boot.php:1294 +#: ../../mod/profiles.php:714 ../../boot.php:1292 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:715 ../../boot.php:1295 +#: ../../mod/profiles.php:715 ../../boot.php:1293 msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:35 ../../include/conversation.php:944 -#: ../../include/conversation.php:962 +#: ../../mod/filer.php:30 ../../include/conversation.php:945 +#: ../../include/conversation.php:963 msgid "Save to Folder:" msgstr "" -#: ../../mod/filer.php:35 +#: ../../mod/filer.php:30 msgid "- select -" msgstr "" @@ -4789,19 +4819,19 @@ msgstr "" #: ../../mod/directory.php:136 #: ../../addon/forumdirectory/forumdirectory.php:158 -#: ../../include/profile_advanced.php:17 ../../boot.php:1316 +#: ../../include/profile_advanced.php:17 ../../boot.php:1314 msgid "Gender:" msgstr "" #: ../../mod/directory.php:138 #: ../../addon/forumdirectory/forumdirectory.php:160 -#: ../../include/profile_advanced.php:37 ../../boot.php:1319 +#: ../../include/profile_advanced.php:37 ../../boot.php:1317 msgid "Status:" msgstr "" #: ../../mod/directory.php:140 #: ../../addon/forumdirectory/forumdirectory.php:162 -#: ../../include/profile_advanced.php:48 ../../boot.php:1321 +#: ../../include/profile_advanced.php:48 ../../boot.php:1319 msgid "Homepage:" msgstr "" @@ -5692,7 +5722,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:985 +#: ../../include/nav.php:64 ../../boot.php:976 #: ../../addon.old/communityhome/communityhome.php:28 #: ../../addon.old/communityhome/communityhome.php:34 #: ../../addon.old/communityhome/twillingham/communityhome.php:28 @@ -5732,7 +5762,7 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:158 -#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1511 +#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1496 #: ../../include/conversation.php:117 ../../include/conversation.php:245 #: ../../addon.old/communityhome/communityhome.php:155 msgid "event" @@ -5886,7 +5916,7 @@ msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:254 #: ../../addon/dav/common/wdcal_edit.inc.php:270 #: ../../addon/dav/common/wdcal_edit.inc.php:293 -#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:990 +#: ../../addon/dav/common/wdcal_edit.inc.php:305 ../../include/text.php:975 #: ../../addon.old/dav/common/wdcal_edit.inc.php:231 #: ../../addon.old/dav/common/wdcal_edit.inc.php:254 #: ../../addon.old/dav/common/wdcal_edit.inc.php:270 @@ -5897,7 +5927,7 @@ msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:235 #: ../../addon/dav/common/wdcal_edit.inc.php:274 -#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:990 +#: ../../addon/dav/common/wdcal_edit.inc.php:308 ../../include/text.php:975 #: ../../addon.old/dav/common/wdcal_edit.inc.php:235 #: ../../addon.old/dav/common/wdcal_edit.inc.php:274 #: ../../addon.old/dav/common/wdcal_edit.inc.php:308 @@ -5905,35 +5935,35 @@ msgid "Monday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:238 -#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:990 +#: ../../addon/dav/common/wdcal_edit.inc.php:277 ../../include/text.php:975 #: ../../addon.old/dav/common/wdcal_edit.inc.php:238 #: ../../addon.old/dav/common/wdcal_edit.inc.php:277 msgid "Tuesday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:241 -#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:990 +#: ../../addon/dav/common/wdcal_edit.inc.php:280 ../../include/text.php:975 #: ../../addon.old/dav/common/wdcal_edit.inc.php:241 #: ../../addon.old/dav/common/wdcal_edit.inc.php:280 msgid "Wednesday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:244 -#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:990 +#: ../../addon/dav/common/wdcal_edit.inc.php:283 ../../include/text.php:975 #: ../../addon.old/dav/common/wdcal_edit.inc.php:244 #: ../../addon.old/dav/common/wdcal_edit.inc.php:283 msgid "Thursday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:247 -#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:990 +#: ../../addon/dav/common/wdcal_edit.inc.php:286 ../../include/text.php:975 #: ../../addon.old/dav/common/wdcal_edit.inc.php:247 #: ../../addon.old/dav/common/wdcal_edit.inc.php:286 msgid "Friday" msgstr "" #: ../../addon/dav/common/wdcal_edit.inc.php:250 -#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:990 +#: ../../addon/dav/common/wdcal_edit.inc.php:289 ../../include/text.php:975 #: ../../addon.old/dav/common/wdcal_edit.inc.php:250 #: ../../addon.old/dav/common/wdcal_edit.inc.php:289 msgid "Saturday" @@ -7750,28 +7780,28 @@ msgstr "" msgid "Post to Posterous by default" msgstr "" -#: ../../view/theme/cleanzero/config.php:89 -#: ../../view/theme/diabook/config.php:162 -#: ../../view/theme/quattro/config.php:72 ../../view/theme/dispy/config.php:79 +#: ../../view/theme/cleanzero/config.php:82 +#: ../../view/theme/diabook/config.php:154 +#: ../../view/theme/quattro/config.php:66 ../../view/theme/dispy/config.php:72 msgid "Theme settings" msgstr "" -#: ../../view/theme/cleanzero/config.php:90 +#: ../../view/theme/cleanzero/config.php:83 msgid "Set resize level for images in posts and comments (width and height)" msgstr "" -#: ../../view/theme/cleanzero/config.php:91 -#: ../../view/theme/diabook/config.php:163 -#: ../../view/theme/dispy/config.php:80 +#: ../../view/theme/cleanzero/config.php:84 +#: ../../view/theme/diabook/config.php:155 +#: ../../view/theme/dispy/config.php:73 msgid "Set font-size for posts and comments" msgstr "" -#: ../../view/theme/cleanzero/config.php:92 +#: ../../view/theme/cleanzero/config.php:85 msgid "Set theme width" msgstr "" -#: ../../view/theme/cleanzero/config.php:93 -#: ../../view/theme/quattro/config.php:74 +#: ../../view/theme/cleanzero/config.php:86 +#: ../../view/theme/quattro/config.php:68 msgid "Color scheme" msgstr "" @@ -7807,37 +7837,37 @@ msgstr "" #: ../../view/theme/diabook/theme.php:95 #: ../../view/theme/diabook/theme.php:538 #: ../../view/theme/diabook/theme.php:633 -#: ../../view/theme/diabook/config.php:171 +#: ../../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/config.php:173 +#: ../../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/config.php:178 +#: ../../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/config.php:180 +#: ../../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/config.php:179 +#: ../../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/config.php:176 +#: ../../view/theme/diabook/config.php:168 msgid "Find Friends" msgstr "" @@ -7855,7 +7885,7 @@ msgstr "" #: ../../view/theme/diabook/theme.php:573 #: ../../view/theme/diabook/theme.php:634 -#: ../../view/theme/diabook/config.php:172 +#: ../../view/theme/diabook/config.php:164 msgid "Earth Layers" msgstr "" @@ -7864,24 +7894,24 @@ msgid "Set zoomfactor for Earth Layers" msgstr "" #: ../../view/theme/diabook/theme.php:579 -#: ../../view/theme/diabook/config.php:169 +#: ../../view/theme/diabook/config.php:161 msgid "Set longitude (X) for Earth Layers" msgstr "" #: ../../view/theme/diabook/theme.php:580 -#: ../../view/theme/diabook/config.php:170 +#: ../../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/config.php:174 +#: ../../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/config.php:175 +#: ../../view/theme/diabook/config.php:167 msgid "Connect Services" msgstr "" @@ -7891,7 +7921,7 @@ msgid "Last Tweets" msgstr "" #: ../../view/theme/diabook/theme.php:610 -#: ../../view/theme/diabook/config.php:167 +#: ../../view/theme/diabook/config.php:159 msgid "Set twitter search term" msgstr "" @@ -7909,48 +7939,48 @@ msgstr "" msgid "Show/hide boxes at right-hand column:" msgstr "" -#: ../../view/theme/diabook/config.php:164 -#: ../../view/theme/dispy/config.php:81 +#: ../../view/theme/diabook/config.php:156 +#: ../../view/theme/dispy/config.php:74 msgid "Set line-height for posts and comments" msgstr "" -#: ../../view/theme/diabook/config.php:165 +#: ../../view/theme/diabook/config.php:157 msgid "Set resolution for middle column" msgstr "" -#: ../../view/theme/diabook/config.php:166 +#: ../../view/theme/diabook/config.php:158 msgid "Set color scheme" msgstr "" -#: ../../view/theme/diabook/config.php:168 +#: ../../view/theme/diabook/config.php:160 msgid "Set zoomfactor for Earth Layer" msgstr "" -#: ../../view/theme/diabook/config.php:177 +#: ../../view/theme/diabook/config.php:169 msgid "Last tweets" msgstr "" -#: ../../view/theme/quattro/config.php:73 +#: ../../view/theme/quattro/config.php:67 msgid "Alignment" msgstr "" -#: ../../view/theme/quattro/config.php:73 +#: ../../view/theme/quattro/config.php:67 msgid "Left" msgstr "" -#: ../../view/theme/quattro/config.php:73 +#: ../../view/theme/quattro/config.php:67 msgid "Center" msgstr "" -#: ../../view/theme/quattro/config.php:75 +#: ../../view/theme/quattro/config.php:69 msgid "Posts font size" msgstr "" -#: ../../view/theme/quattro/config.php:76 +#: ../../view/theme/quattro/config.php:70 msgid "Textareas font size" msgstr "" -#: ../../view/theme/dispy/config.php:82 +#: ../../view/theme/dispy/config.php:75 msgid "Set colour scheme" msgstr "" @@ -8356,218 +8386,218 @@ msgstr "" msgid "older" msgstr "" -#: ../../include/text.php:672 +#: ../../include/text.php:657 msgid "No contacts" msgstr "" -#: ../../include/text.php:681 +#: ../../include/text.php:666 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:794 +#: ../../include/text.php:779 msgid "poke" msgstr "" -#: ../../include/text.php:794 ../../include/conversation.php:210 +#: ../../include/text.php:779 ../../include/conversation.php:210 msgid "poked" msgstr "" -#: ../../include/text.php:795 +#: ../../include/text.php:780 msgid "ping" msgstr "" -#: ../../include/text.php:795 +#: ../../include/text.php:780 msgid "pinged" msgstr "" -#: ../../include/text.php:796 +#: ../../include/text.php:781 msgid "prod" msgstr "" -#: ../../include/text.php:796 +#: ../../include/text.php:781 msgid "prodded" msgstr "" -#: ../../include/text.php:797 +#: ../../include/text.php:782 msgid "slap" msgstr "" -#: ../../include/text.php:797 +#: ../../include/text.php:782 msgid "slapped" msgstr "" -#: ../../include/text.php:798 +#: ../../include/text.php:783 msgid "finger" msgstr "" -#: ../../include/text.php:798 +#: ../../include/text.php:783 msgid "fingered" msgstr "" -#: ../../include/text.php:799 +#: ../../include/text.php:784 msgid "rebuff" msgstr "" -#: ../../include/text.php:799 +#: ../../include/text.php:784 msgid "rebuffed" msgstr "" -#: ../../include/text.php:811 +#: ../../include/text.php:796 msgid "happy" msgstr "" -#: ../../include/text.php:812 +#: ../../include/text.php:797 msgid "sad" msgstr "" -#: ../../include/text.php:813 +#: ../../include/text.php:798 msgid "mellow" msgstr "" -#: ../../include/text.php:814 +#: ../../include/text.php:799 msgid "tired" msgstr "" -#: ../../include/text.php:815 +#: ../../include/text.php:800 msgid "perky" msgstr "" -#: ../../include/text.php:816 +#: ../../include/text.php:801 msgid "angry" msgstr "" -#: ../../include/text.php:817 +#: ../../include/text.php:802 msgid "stupified" msgstr "" -#: ../../include/text.php:818 +#: ../../include/text.php:803 msgid "puzzled" msgstr "" -#: ../../include/text.php:819 +#: ../../include/text.php:804 msgid "interested" msgstr "" -#: ../../include/text.php:820 +#: ../../include/text.php:805 msgid "bitter" msgstr "" -#: ../../include/text.php:821 +#: ../../include/text.php:806 msgid "cheerful" msgstr "" -#: ../../include/text.php:822 +#: ../../include/text.php:807 msgid "alive" msgstr "" -#: ../../include/text.php:823 +#: ../../include/text.php:808 msgid "annoyed" msgstr "" -#: ../../include/text.php:824 +#: ../../include/text.php:809 msgid "anxious" msgstr "" -#: ../../include/text.php:825 +#: ../../include/text.php:810 msgid "cranky" msgstr "" -#: ../../include/text.php:826 +#: ../../include/text.php:811 msgid "disturbed" msgstr "" -#: ../../include/text.php:827 +#: ../../include/text.php:812 msgid "frustrated" msgstr "" -#: ../../include/text.php:828 +#: ../../include/text.php:813 msgid "motivated" msgstr "" -#: ../../include/text.php:829 +#: ../../include/text.php:814 msgid "relaxed" msgstr "" -#: ../../include/text.php:830 +#: ../../include/text.php:815 msgid "surprised" msgstr "" -#: ../../include/text.php:994 +#: ../../include/text.php:979 msgid "January" msgstr "" -#: ../../include/text.php:994 +#: ../../include/text.php:979 msgid "February" msgstr "" -#: ../../include/text.php:994 +#: ../../include/text.php:979 msgid "March" msgstr "" -#: ../../include/text.php:994 +#: ../../include/text.php:979 msgid "April" msgstr "" -#: ../../include/text.php:994 +#: ../../include/text.php:979 msgid "May" msgstr "" -#: ../../include/text.php:994 +#: ../../include/text.php:979 msgid "June" msgstr "" -#: ../../include/text.php:994 +#: ../../include/text.php:979 msgid "July" msgstr "" -#: ../../include/text.php:994 +#: ../../include/text.php:979 msgid "August" msgstr "" -#: ../../include/text.php:994 +#: ../../include/text.php:979 msgid "September" msgstr "" -#: ../../include/text.php:994 +#: ../../include/text.php:979 msgid "October" msgstr "" -#: ../../include/text.php:994 +#: ../../include/text.php:979 msgid "November" msgstr "" -#: ../../include/text.php:994 +#: ../../include/text.php:979 msgid "December" msgstr "" -#: ../../include/text.php:1081 +#: ../../include/text.php:1066 msgid "bytes" msgstr "" -#: ../../include/text.php:1108 ../../include/text.php:1120 +#: ../../include/text.php:1093 ../../include/text.php:1105 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1293 ../../include/user.php:236 +#: ../../include/text.php:1278 ../../include/user.php:236 msgid "default" msgstr "" -#: ../../include/text.php:1305 +#: ../../include/text.php:1290 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1515 +#: ../../include/text.php:1500 msgid "activity" msgstr "" -#: ../../include/text.php:1518 +#: ../../include/text.php:1503 msgid "post" msgstr "" -#: ../../include/text.php:1673 +#: ../../include/text.php:1658 msgid "Item filed" msgstr "" @@ -8662,7 +8692,7 @@ msgstr "" msgid "Contacts not in any group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:984 +#: ../../include/nav.php:46 ../../boot.php:975 msgid "Logout" msgstr "" @@ -8670,7 +8700,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1769 +#: ../../include/nav.php:49 ../../boot.php:1767 msgid "Status" msgstr "" @@ -8762,7 +8792,7 @@ msgstr "" msgid "Delegations" msgstr "" -#: ../../include/nav.php:142 ../../boot.php:1274 +#: ../../include/nav.php:142 ../../boot.php:1272 msgid "Profiles" msgstr "" @@ -8841,17 +8871,17 @@ msgstr "" msgid "Categories" msgstr "" -#: ../../include/auth.php:36 +#: ../../include/auth.php:38 msgid "Logged out." msgstr "" -#: ../../include/auth.php:126 +#: ../../include/auth.php:128 msgid "" "We encountered a problem while logging in with the OpenID you provided. " "Please check the correct spelling of the ID." msgstr "" -#: ../../include/auth.php:126 +#: ../../include/auth.php:128 msgid "The error message was:" msgstr "" @@ -9444,34 +9474,34 @@ msgstr "" msgid "stopped following" msgstr "" -#: ../../include/Contact.php:225 ../../include/conversation.php:815 +#: ../../include/Contact.php:225 ../../include/conversation.php:816 msgid "Poke" msgstr "" -#: ../../include/Contact.php:226 ../../include/conversation.php:809 +#: ../../include/Contact.php:226 ../../include/conversation.php:810 msgid "View Status" msgstr "" -#: ../../include/Contact.php:227 ../../include/conversation.php:810 +#: ../../include/Contact.php:227 ../../include/conversation.php:811 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:228 ../../include/conversation.php:811 +#: ../../include/Contact.php:228 ../../include/conversation.php:812 msgid "View Photos" msgstr "" #: ../../include/Contact.php:229 ../../include/Contact.php:242 -#: ../../include/conversation.php:812 +#: ../../include/conversation.php:813 msgid "Network Posts" msgstr "" #: ../../include/Contact.php:230 ../../include/Contact.php:242 -#: ../../include/conversation.php:813 +#: ../../include/conversation.php:814 msgid "Edit Contact" msgstr "" #: ../../include/Contact.php:231 ../../include/Contact.php:242 -#: ../../include/conversation.php:814 +#: ../../include/conversation.php:815 msgid "Send PM" msgstr "" @@ -9497,80 +9527,84 @@ msgstr "" msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:709 +#: ../../include/conversation.php:706 +msgid "remove" +msgstr "" + +#: ../../include/conversation.php:710 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:808 +#: ../../include/conversation.php:809 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:877 +#: ../../include/conversation.php:878 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:877 +#: ../../include/conversation.php:878 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:883 +#: ../../include/conversation.php:884 msgid "like this" msgstr "" -#: ../../include/conversation.php:887 +#: ../../include/conversation.php:888 msgid "don't like this" msgstr "" -#: ../../include/conversation.php:894 +#: ../../include/conversation.php:895 msgid "people" msgstr "" -#: ../../include/conversation.php:904 +#: ../../include/conversation.php:905 msgid "and" msgstr "" -#: ../../include/conversation.php:910 +#: ../../include/conversation.php:911 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:912 +#: ../../include/conversation.php:913 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:912 +#: ../../include/conversation.php:913 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:939 ../../include/conversation.php:957 +#: ../../include/conversation.php:940 ../../include/conversation.php:958 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:941 ../../include/conversation.php:959 +#: ../../include/conversation.php:942 ../../include/conversation.php:960 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:942 ../../include/conversation.php:960 +#: ../../include/conversation.php:943 ../../include/conversation.php:961 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:943 ../../include/conversation.php:961 +#: ../../include/conversation.php:944 ../../include/conversation.php:962 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:945 ../../include/conversation.php:963 +#: ../../include/conversation.php:946 ../../include/conversation.php:964 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:946 +#: ../../include/conversation.php:947 msgid "Delete item(s)?" msgstr "" -#: ../../include/conversation.php:1025 +#: ../../include/conversation.php:1026 msgid "permissions" msgstr "" @@ -9608,87 +9642,103 @@ msgstr "" msgid "Create a New Account" msgstr "" -#: ../../boot.php:987 +#: ../../boot.php:978 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:988 +#: ../../boot.php:979 msgid "Password: " msgstr "" -#: ../../boot.php:989 +#: ../../boot.php:980 msgid "Remember me" msgstr "" -#: ../../boot.php:992 +#: ../../boot.php:983 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:998 +#: ../../boot.php:989 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1123 +#: ../../boot.php:992 +msgid "Website Terms of Service" +msgstr "" + +#: ../../boot.php:993 +msgid "terms of service" +msgstr "" + +#: ../../boot.php:995 +msgid "Website Privacy Policy" +msgstr "" + +#: ../../boot.php:996 +msgid "privacy policy" +msgstr "" + +#: ../../boot.php:1121 msgid "Requested account is not available." msgstr "" -#: ../../boot.php:1200 +#: ../../boot.php:1198 msgid "Edit profile" msgstr "" -#: ../../boot.php:1266 +#: ../../boot.php:1264 msgid "Message" msgstr "" -#: ../../boot.php:1274 +#: ../../boot.php:1272 msgid "Manage/edit profiles" msgstr "" -#: ../../boot.php:1397 ../../boot.php:1483 +#: ../../boot.php:1395 ../../boot.php:1481 msgid "g A l F d" msgstr "" -#: ../../boot.php:1398 ../../boot.php:1484 +#: ../../boot.php:1396 ../../boot.php:1482 msgid "F d" msgstr "" -#: ../../boot.php:1443 ../../boot.php:1524 +#: ../../boot.php:1441 ../../boot.php:1522 msgid "[today]" msgstr "" -#: ../../boot.php:1455 +#: ../../boot.php:1453 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1456 +#: ../../boot.php:1454 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1517 +#: ../../boot.php:1515 msgid "[No description]" msgstr "" -#: ../../boot.php:1535 +#: ../../boot.php:1533 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1536 +#: ../../boot.php:1534 msgid "Events this week:" msgstr "" -#: ../../boot.php:1772 +#: ../../boot.php:1770 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1779 +#: ../../boot.php:1777 msgid "Profile Details" msgstr "" -#: ../../boot.php:1796 +#: ../../boot.php:1794 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1803 +#: ../../boot.php:1801 msgid "Only You Can See This" msgstr "" @@ -9696,10 +9746,6 @@ msgstr "" msgid "via" msgstr "" -#: ../../object/Item.php:288 -msgid "remove" -msgstr "" - #: ../../index.php:398 msgid "toggle mobile" msgstr ""