From 1d816ba90ad3408822dc64f294597273fd19bc57 Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 2 Aug 2013 03:45:40 -0700 Subject: basic email invitations - and doc update --- boot.php | 4 +- doc/html/boot_8php.html | 22 +- doc/html/classphoto__imagick.html | 2 +- doc/html/conversation_8php.html | 2 +- doc/html/crypto_8php.html | 4 +- doc/html/dba__driver_8php.html | 4 +- doc/html/extract_8php.html | 4 +- doc/html/globals_0x70.html | 2 +- doc/html/globals_func_0x70.html | 2 +- doc/html/hostxrd_8php.html | 2 - doc/html/include_2config_8php.html | 2 +- doc/html/language_8php.html | 2 +- doc/html/nav_8php.html | 2 +- doc/html/navtreeindex6.js | 2 +- doc/html/permissions_8php.html | 2 +- doc/html/plugin_8php.html | 2 +- doc/html/redbasic_2php_2style_8php.html | 2 +- doc/html/search/all_70.js | 2 +- doc/html/search/functions_70.js | 2 +- doc/html/taxonomy_8php.html | 2 +- doc/html/text_8php.html | 20 +- doc/html/text_8php.js | 2 +- doc/html/typo_8php.html | 2 +- mod/invite.php | 47 ++- util/messages.po | 630 ++++++++++++++++---------------- version.inc | 2 +- 26 files changed, 393 insertions(+), 378 deletions(-) diff --git a/boot.php b/boot.php index 9cdaa53b7..3af47afe8 100755 --- a/boot.php +++ b/boot.php @@ -785,8 +785,8 @@ class App { return $this->path; } - function set_account($aid) { - $this->account = $aid; + function set_account($acct) { + $this->account = $acct; } function get_account() { diff --git a/doc/html/boot_8php.html b/doc/html/boot_8php.html index 2a64aa950..48c059c0d 100644 --- a/doc/html/boot_8php.html +++ b/doc/html/boot_8php.html @@ -222,7 +222,7 @@ Variables const ZOT_REVISION 1 -const DB_UPDATE_VERSION 1054 +const DB_UPDATE_VERSION 1057 const EOL '<br />' . "\r\n" @@ -900,7 +900,7 @@ Variables

Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_user(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), build_sync_packet(), call_hooks(), can_comment_on_post(), categories_widget(), change_channel(), channel_remove(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), common_friends_visitor_widget(), connections_content(), consume_feed(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), import_channel_photo(), import_post(), import_profile_photo(), info(), is_site_admin(), item_message_id(), item_permissions_sql(), item_photo_menu(), item_redir_and_replace_images(), items_fetch(), load_contact_links(), load_hooks(), local_delivery(), login(), FKOAuth1\loginUser(), lrdd(), manage_content(), map_scope(), nav_set_selected(), new_contact(), new_follower(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onepoll_run(), permissions_sql(), ping_init(), poco_load(), poller_run(), post_activity_item(), post_url(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), replace_macros(), rmagic_init(), saved_searches(), scale_external_images(), search(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), smilies(), tag_deliver(), terminate_friendship(), tgroup_check(), theme_include(), tt(), update_suggestions(), user_allow(), vcard_from_xchan(), what_next(), z_fetch_url(), and zot_finger().

Referenced by FriendicaSmarty\__construct(), FriendicaSmartyEngine\__construct(), abook_toggle_flag(), allowed_public_recips(), api_apply_template(), api_format_items(), api_get_user(), api_statuses_home_timeline(), api_statuses_repeat(), api_user(), argc(), argv(), atom_entry(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), build_sync_packet(), call_hooks(), can_comment_on_post(), categories_widget(), change_channel(), channel_remove(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), common_friends_visitor_widget(), connections_content(), consume_feed(), contact_block(), contact_select(), create_identity(), current_theme(), deliver_run(), dfrn_deliver(), drop_item(), event_store(), fetch_url(), fileas_widget(), findpeople_widget(), fix_attached_photo_permissions(), fix_private_photos(), format_event_diaspora(), get_account_id(), get_best_language(), get_birthdays(), get_events(), get_feed_for(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_observer_hash(), get_plink(), get_theme_config_file(), get_theme_screenshot(), gprobe_run(), group_select(), guess_image_type(), head_add_css(), head_add_js(), head_get_css(), head_get_js(), import_channel_photo(), import_post(), import_profile_photo(), info(), is_site_admin(), item_message_id(), item_photo_menu(), item_redir_and_replace_images(), items_fetch(), load_contact_links(), load_hooks(), local_delivery(), login(), FKOAuth1\loginUser(), lrdd(), manage_content(), map_scope(), nav_set_selected(), new_contact(), new_follower(), notice(), notification(), notifier_run(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), onepoll_run(), ping_init(), poco_load(), poller_run(), post_activity_item(), post_url(), preg_heart(), prepare_body(), proc_run(), process_delivery(), profile_activity(), profile_sidebar(), public_permissions_sql(), replace_macros(), rmagic_init(), saved_searches(), scale_external_images(), search(), send_message(), send_reg_approval_email(), send_status_notifications(), send_verification_email(), smilies(), tag_deliver(), terminate_friendship(), tgroup_check(), theme_include(), tt(), update_suggestions(), user_allow(), vcard_from_xchan(), what_next(), z_fetch_url(), and zot_finger().

@@ -998,7 +998,7 @@ Variables @@ -1168,7 +1168,7 @@ Variables

Referenced by acl_init(), Conversation\add_thread(), allfriends_content(), api_content(), api_get_user(), api_post(), api_user(), best_link_url(), App\build_pagehead(), build_sync_packet(), change_channel(), channel_content(), channel_init(), channel_remove(), chanview_content(), common_friends_visitor_widget(), community_content(), community_init(), connections_content(), connections_init(), connections_post(), contact_select(), contactgroup_content(), conversation(), crepair_content(), crepair_init(), crepair_post(), current_theme(), delegate_content(), directory_aside(), directory_content(), display_content(), drop_item(), drop_items(), editpost_content(), editwebpage_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), filerm_content(), findpeople_widget(), follow_content(), follow_init(), fsuggest_content(), fsuggest_post(), get_birthdays(), Item\get_comment_box(), get_events(), Item\get_template_data(), get_theme_uid(), group_aside(), group_content(), group_get_members(), group_post(), group_select(), group_side(), hcard_init(), intro_content(), intro_post(), invite_content(), invite_post(), item_content(), item_permissions_sql(), item_photo_menu(), item_post(), like_puller(), lockview_content(), login(), login_content(), magic_init(), manage_content(), match_content(), message_content(), message_post(), mood_content(), mood_init(), nav(), network_content(), network_init(), new_contact(), nogroup_content(), nogroup_init(), notifications_content(), notifications_post(), notify_content(), notify_init(), oexchange_content(), page_init(), permissions_sql(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poke_content(), poke_init(), post_init(), prepare_body(), private_messages_list(), profile_activity(), profile_content(), profile_create_sidebar(), profile_init(), profile_photo_aside(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), profperm_aside(), profperm_content(), profperm_init(), qsearch_init(), redbasic_form(), redir_init(), regmod_content(), removeme_content(), removeme_post(), rmagic_init(), saved_searches(), search_ac_init(), search_content(), search_init(), search_saved_searches(), service_class_allows(), service_class_fetch(), Conversation\set_mode(), settings_aside(), settings_init(), settings_post(), share_init(), smilies(), starred_init(), stream_perms_api_uids(), subthread_content(), suggest_content(), suggest_init(), tagger_content(), tagrm_content(), tagrm_post(), theme_content(), theme_post(), thing_content(), thing_init(), uexport_init(), vcard_from_xchan(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), webpages_content(), webpages_init(), and zid_init().

@@ -1511,7 +1511,7 @@ Variables

Referenced by allowed_public_recips(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), chanview_content(), check_config(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), display_content(), event_store(), follow_init(), format_css_if_exists(), format_js_if_exists(), group_post(), App\head_get_icon(), head_get_icon(), hostxrd_init(), import_post(), import_xchan(), intro_post(), item_photo_menu(), item_store(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), manage_content(), mood_init(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), photo_upload(), photos_album_widget(), photos_create_item(), post_init(), profile_activity(), public_recips(), redir_init(), register_post(), removeme_content(), rmagic_init(), rmagic_post(), search_content(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sync_directories(), tagger_content(), thing_init(), user_allow(), vcard_from_xchan(), wfinger_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

Referenced by allowed_public_recips(), chanlink_cid(), chanlink_hash(), chanlink_url(), channel_content(), chanview_content(), check_config(), connections_content(), conversation(), create_identity(), deliver_run(), directory_content(), display_content(), event_store(), follow_init(), format_css_if_exists(), format_js_if_exists(), group_post(), App\head_get_icon(), head_get_icon(), hostxrd_init(), import_post(), import_xchan(), intro_post(), item_photo_menu(), item_store(), login_content(), lostpass_content(), lostpass_post(), magic_init(), magiclink_url(), manage_content(), mood_init(), navbar_complete(), network_content(), new_channel_post(), notification(), notifications_post(), notifier_run(), photo_upload(), photos_album_widget(), photos_create_item(), post_init(), profile_activity(), public_recips(), redir_init(), register_post(), removeme_content(), rmagic_init(), rmagic_post(), search_content(), send_reg_approval_email(), send_verification_email(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), sync_directories(), tagger_content(), thing_init(), user_allow(), vcard_from_xchan(), webpages_content(), wfinger_init(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), and zot_new_uid().

@@ -2237,7 +2237,7 @@ Variables

- +

const DB_UPDATE_VERSION 1054 const DB_UPDATE_VERSION 1057

@@ -2556,6 +2556,8 @@ Variables

Referenced by editpost_content(), encode_item(), get_item_elements(), item_post(), item_store(), and prepare_body().

@@ -2702,7 +2704,7 @@ Variables @@ -2788,7 +2790,7 @@ Variables

Referenced by admin_page_logs(), advanced_profile(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), consume_feed(), detect_language(), dfrn_deliver(), directory_content(), fetch_xrd_links(), fix_private_photos(), import_xchan(), item_post(), item_store(), item_store_update(), lrdd(), mail_store(), message_content(), message_post(), mini_group_select(), network_content(), new_contact(), notifier_run(), parse_xml_string(), photos_post(), poco_load(), post_post(), public_recips(), tag_deliver(), tgroup_check(), webfinger_dfrn(), xml2array(), zot_build_packet(), zot_fetch(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

Referenced by admin_page_logs(), advanced_profile(), build_sync_packet(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), consume_feed(), detect_language(), dfrn_deliver(), directory_content(), fetch_xrd_links(), fix_private_photos(), import_xchan(), item_store(), item_store_update(), lrdd(), mail_store(), message_content(), message_post(), mini_group_select(), network_content(), new_contact(), notifier_run(), parse_xml_string(), photos_post(), poco_load(), post_post(), public_recips(), tag_deliver(), tgroup_check(), webfinger_dfrn(), xml2array(), zot_build_packet(), zot_fetch(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

@@ -4050,7 +4052,7 @@ Variables

Referenced by categories_widget(), decode_tags(), encode_item_terms(), file_tag_file_query(), filerm_content(), item_post(), and prepare_body().

@@ -4064,7 +4066,7 @@ Variables

Referenced by decode_tags(), file_tag_file_query(), fileas_widget(), filer_content(), filerm_content(), items_fetch(), network_content(), and prepare_body().

diff --git a/doc/html/classphoto__imagick.html b/doc/html/classphoto__imagick.html index e328cbd71..fba45f957 100644 --- a/doc/html/classphoto__imagick.html +++ b/doc/html/classphoto__imagick.html @@ -252,7 +252,7 @@ Additional Inherited Members

We need to remove the canva, or the image is not resized to the crop: http://php.net/manual/en/imagick.cropimage.php#97232

We need to remove the canvas, or the image is not resized to the crop: http://php.net/manual/en/imagick.cropimage.php#97232

diff --git a/doc/html/conversation_8php.html b/doc/html/conversation_8php.html index f5adcdc38..8f47cbe36 100644 --- a/doc/html/conversation_8php.html +++ b/doc/html/conversation_8php.html @@ -226,7 +226,7 @@ Functions

Referenced by channel_content(), display_content(), items_fetch(), network_content(), and search_content().

Referenced by channel_content(), display_content(), items_fetch(), network_content(), search_content(), and zot_feed().

diff --git a/doc/html/crypto_8php.html b/doc/html/crypto_8php.html index d3f12d012..7ab5222eb 100644 --- a/doc/html/crypto_8php.html +++ b/doc/html/crypto_8php.html @@ -224,7 +224,7 @@ Functions

Referenced by post_post(), zfinger_init(), zot_build_packet(), and zot_fetch().

Referenced by get_item_elements(), get_mail_elements(), item_post(), item_store(), post_post(), send_message(), zfinger_init(), zot_build_packet(), and zot_fetch().

@@ -252,7 +252,7 @@ Functions

Referenced by message_post(), new_contact(), post_post(), probe_content(), zot_import(), and zot_refresh().

Referenced by editpost_content(), encode_item(), encode_mail(), message_post(), new_contact(), post_post(), prepare_body(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), probe_content(), zot_import(), and zot_refresh().

diff --git a/doc/html/dba__driver_8php.html b/doc/html/dba__driver_8php.html index 6de58132c..85e6cab92 100644 --- a/doc/html/dba__driver_8php.html +++ b/doc/html/dba__driver_8php.html @@ -202,7 +202,7 @@ Functions

Referenced by account_verify_password(), acl_init(), add_fcontact(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_status_show(), api_statuses_mentions(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), authenticate_success(), build_sync_packet(), call_hooks(), change_channel(), channel_content(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_webbie(), Cache\clear(), common_friends(), connections_content(), connections_post(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), crepair_post(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dirsearch_content(), display_content(), editpost_content(), editwebpage_content(), event_store(), events_content(), expand_groups(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_tag(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), item_message_id(), item_permissions_sql(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), load_config(), load_pconfig(), load_plugin(), load_xconfig(), local_delivery(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), member_of(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), new_follower(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifier_run(), notify_init(), oauth_get_client(), onepoll_run(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), profiles_init(), profiles_post(), public_permissions_sql(), public_recips(), qsearch_init(), queue_run(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), search_ac_init(), search_content(), search_init(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), settings_post(), siteinfo_init(), photo_driver\store(), store_item_tag(), stringify_array_elms(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), syncdirs(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), thing_init(), uninstall_plugin(), unregister_hook(), update_modtime(), update_queue_time(), user_allow(), user_deny(), vcard_from_xchan(), wall_attach_post(), wall_upload_post(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

Referenced by account_verify_password(), acl_init(), add_fcontact(), advanced_profile(), allowed_public_recips(), api_direct_messages_new(), api_get_user(), api_status_show(), api_statuses_mentions(), api_user(), api_users_show(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_list_files(), attach_store(), authenticate_success(), build_sync_packet(), call_hooks(), change_channel(), channel_content(), channelx_by_hash(), channelx_by_n(), channelx_by_nick(), chanview_content(), check_account_email(), check_account_invite(), check_webbie(), Cache\clear(), common_friends(), connections_content(), connections_post(), consume_feed(), contact_remove(), contactgroup_content(), count_common_friends(), create_account(), create_identity(), crepair_post(), dbesc_array_cb(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), delete_imported_item(), delete_item_lowlevel(), deliver_run(), dirsearch_content(), display_content(), editpost_content(), editwebpage_content(), event_store(), events_content(), expand_groups(), fbrowser_content(), feed_init(), fetch_post_tags(), file_tag_file_query(), filerm_content(), fix_attached_photo_permissions(), fix_contact_ssl_policy(), fix_private_photos(), fix_system_urls(), fsuggest_post(), generate_user_guid(), Cache\get(), get_all_perms(), get_birthdays(), get_config_from_storage(), get_events(), gprobe_run(), group_add(), group_add_member(), group_byname(), group_content(), group_post(), group_rec_byhash(), group_rmv(), group_rmv_member(), groups_containing(), handle_tag(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), invite_post(), item_message_id(), item_permissions_sql(), item_post(), item_store(), item_store_update(), items_fetch(), like_content(), load_config(), load_plugin(), load_xconfig(), local_delivery(), lockview_content(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_nonce(), FKOAuthDataStore\lookup_token(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), member_of(), msearch_post(), network_content(), network_init(), FKOAuthDataStore\new_access_token(), new_contact(), new_cookie(), new_follower(), FKOAuthDataStore\new_request_token(), notification(), notifications_content(), notifier_run(), notify_init(), oauth_get_client(), onepoll_run(), page_content(), perm_is_allowed(), permissions_sql(), photo_init(), photo_new_resource(), photo_upload(), photos_album_exists(), photos_album_get_db_idstr(), photos_album_rename(), photos_content(), photos_list_photos(), photos_post(), ping_init(), poco_init(), poco_load(), poller_run(), post_init(), post_post(), private_messages_drop(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), profiles_init(), profiles_post(), public_permissions_sql(), public_recips(), qsearch_init(), queue_run(), red_zrl_callback(), redir_init(), ref_session_destroy(), ref_session_gc(), ref_session_read(), ref_session_write(), register_hook(), register_post(), remove_all_xchan_resources(), remove_community_tag(), remove_queue_item(), rmagic_init(), rmagic_post(), search_ac_init(), search_content(), search_init(), send_message(), send_reg_approval_email(), send_status_notifications(), Cache\set(), set_config(), set_pconfig(), set_xconfig(), settings_post(), siteinfo_init(), photo_driver\store(), store_item_tag(), stringify_array_elms(), subthread_content(), suggest_init(), suggestion_query(), sync_directories(), syncdirs(), tag_deliver(), tagger_content(), tagrm_post(), term_query(), tgroup_check(), thing_init(), uninstall_plugin(), unregister_hook(), update_modtime(), update_queue_time(), user_allow(), user_deny(), vcard_from_xchan(), wall_attach_post(), wall_upload_post(), wfinger_init(), xchan_content(), xchan_mail_query(), xchan_query(), xrd_init(), z_readdir(), zfinger_init(), zid_init(), zot_feed(), zot_finger(), zot_get_hubloc(), zot_gethub(), zot_process_response(), zot_refresh(), and zotfeed_init().

@@ -264,7 +264,7 @@ Functions

Referenced by search_content().

Referenced by attach_by_hash(), and search_content().

diff --git a/doc/html/extract_8php.html b/doc/html/extract_8php.html index 07d17ff9e..6ed749318 100644 --- a/doc/html/extract_8php.html +++ b/doc/html/extract_8php.html @@ -132,7 +132,7 @@ Variables

Referenced by activity_sanitise(), add_fcontact(), api_rss_extra(), array_sanitise(), attach_store(), check_account_admin(), check_account_email(), check_account_invite(), check_account_password(), check_list_permissions(), check_webbie(), connections_content(), construct_page(), contact_block(), contact_select(), conversation(), create_account(), create_identity(), dbesc_array(), directory_content(), event_store(), feature_enabled(), fetch_xrd_links(), find_xchan_in_array(), format_like(), get_all_perms(), get_atom_elements(), get_features(), get_item_elements(), get_mail_elements(), get_mood_verbs(), get_poke_verbs(), get_profile_elements(), Item\get_template_data(), get_terms_oftype(), App\get_widgets(), group_select(), identity_basic_import(), ids_to_querystr(), import_directory_profile(), import_post(), import_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), lrdd(), magic_init(), mail_store(), mood_init(), network_content(), new_channel_post(), new_contact(), obj_verbs(), parse_url_content(), perm_is_allowed(), photo_upload(), photos_album_get_db_idstr(), photos_create_item(), photos_post(), ping_init(), po2php_run(), poke_init(), post_activity_item(), post_init(), post_post(), prepare_body(), proc_run(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profile_tabs(), profiles_content(), register_post(), remove_community_tag(), send_reg_approval_email(), service_class_allows(), service_class_fetch(), App\set_apps(), settings_post(), sort_by_date(), stringify_array_elms(), subthread_content(), suggest_content(), tagger_content(), tagrm_content(), tagrm_post(), tgroup_check(), thing_init(), validate_channelname(), wfinger_init(), xchan_mail_query(), xchan_query(), xml2array(), xrd_init(), zfinger_init(), zid(), zid_init(), zot_fetch(), zot_get_hubloc(), zot_gethub(), zot_import(), zot_process_response(), and zot_register_hub().

Referenced by activity_sanitise(), add_fcontact(), api_rss_extra(), array_sanitise(), attach_store(), check_account_admin(), check_account_email(), check_account_invite(), check_account_password(), check_list_permissions(), check_webbie(), connections_content(), construct_page(), contact_block(), contact_select(), conversation(), create_account(), create_identity(), dbesc_array(), directory_content(), event_store(), feature_enabled(), fetch_xrd_links(), find_xchan_in_array(), format_like(), get_all_perms(), get_atom_elements(), get_features(), get_item_elements(), get_mail_elements(), get_mood_verbs(), get_poke_verbs(), get_profile_elements(), Item\get_template_data(), get_terms_oftype(), App\get_widgets(), group_select(), identity_basic_import(), ids_to_querystr(), import_directory_profile(), import_post(), import_site(), import_xchan(), item_getfeedattach(), item_store(), item_store_update(), items_fetch(), like_content(), like_puller(), load_database(), lrdd(), magic_init(), mail_store(), mood_init(), network_content(), new_channel_post(), new_contact(), obj_verbs(), parse_url_content(), perm_is_allowed(), photo_upload(), photos_album_get_db_idstr(), photos_create_item(), photos_post(), ping_init(), po2php_run(), poke_init(), post_activity_item(), post_init(), post_post(), prepare_body(), proc_run(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_activity(), profile_sidebar(), profile_tabs(), profiles_content(), register_post(), remove_community_tag(), send_reg_approval_email(), service_class_allows(), service_class_fetch(), App\set_apps(), settings_post(), sort_by_date(), stringify_array_elms(), subthread_content(), suggest_content(), tagger_content(), tagrm_content(), tagrm_post(), thing_init(), validate_channelname(), wfinger_init(), xchan_mail_query(), xchan_query(), xml2array(), xrd_init(), zfinger_init(), zid(), zid_init(), zot_fetch(), zot_get_hubloc(), zot_gethub(), zot_import(), zot_process_response(), and zot_register_hub().

@@ -160,7 +160,7 @@ Variables

Referenced by Template\_build_nodes(), Template\_replcb_node(), admin_page_themes(), attribute_contains(), base64url_decode(), base64url_encode(), bb_tag_preg_replace(), bb_translate_video(), bbtoevent(), bbtovcal(), chanlink_hash(), chanlink_url(), datetime_convert(), day_translate(), detect_language(), diaspora2bb(), diaspora_ol(), diaspora_ul(), expand_acl(), fetch_url(), file_tag_decode(), file_tag_encode(), file_tag_file_query(), fix_mce_lf(), fix_private_photos(), format_term_for_display(), get_bb_tag_pos(), get_intltext_template(), get_markup_template(), get_tags(), html2bb_video(), info(), is_a_date_arg(), legal_webbie(), linkify(), magic_link(), network_to_name(), normalise_openid(), notice(), notifier_run(), oembed_iframe(), oembed_replacecb(), oexchange_content(), parse_xml_string(), photos_post(), poco_load(), post_url(), prepare_body(), print_template(), printable(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), protect_sprintf(), purify_html(), qp(), random_string(), Template\replace(), replace_macros(), FriendicaSmartyEngine\replace_macros(), Template\replace_macros(), scale_external_images(), search(), App\set_widget(), siteinfo_content(), smilies(), stripdcode_br_cb(), t(), template_escape(), template_unescape(), term_query(), unamp(), undo_post_tagging(), unxmlify(), Template\var_replace(), webfinger(), webfinger_dfrn(), x(), z_fetch_url(), z_post_url(), zfinger_init(), and zid().

diff --git a/doc/html/globals_0x70.html b/doc/html/globals_0x70.html index a5c2a1aba..26df9bcd8 100644 --- a/doc/html/globals_0x70.html +++ b/doc/html/globals_0x70.html @@ -372,7 +372,7 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');}); : text.php

prepare_body() -: text.php +: text.php

prepare_page() : conversation.php diff --git a/doc/html/globals_func_0x70.html b/doc/html/globals_func_0x70.html index 51caf2070..51cd067e6 100644 --- a/doc/html/globals_func_0x70.html +++ b/doc/html/globals_func_0x70.html @@ -270,7 +270,7 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');}); : text.php

prepare_body() -: text.php +: text.php

prepare_page() : conversation.php diff --git a/doc/html/hostxrd_8php.html b/doc/html/hostxrd_8php.html index 010c76b4b..b9b6bf159 100644 --- a/doc/html/hostxrd_8php.html +++ b/doc/html/hostxrd_8php.html @@ -130,8 +130,6 @@ Functions

Referenced by _well_known_init().

diff --git a/doc/html/include_2config_8php.html b/doc/html/include_2config_8php.html index 7fa7c5f66..d34e8a42f 100644 --- a/doc/html/include_2config_8php.html +++ b/doc/html/include_2config_8php.html @@ -256,7 +256,7 @@ Functions

Referenced by admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), community_content(), create_account(), create_identity(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), dirfind_content(), dirsearch_content(), display_content(), dlogger(), dob(), events_content(), expire_run(), feed_init(), fetch_url(), fetch_xrd_links(), findpeople_widget(), Item\get_comment_box(), group_content(), hcard_init(), hostxrd_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), match_content(), nav(), navbar_complete(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), parse_url_content(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_post(), post_url(), proc_run(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), qsearch_init(), register_content(), register_post(), reload_plugins(), scale_external_images(), search_content(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), set_config(), settings_post(), siteinfo_content(), smilies(), upgrade_link(), user_allow(), valid_email(), validate_email(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_import(), and zotfeed_init().

Referenced by admin_page_dbsync(), admin_page_logs(), admin_page_site(), admin_page_summary(), admin_page_themes(), allowed_email(), allowed_url(), api_statuses_mentions(), api_statusnet_config(), attach_store(), build_sync_packet(), channel_content(), check_account_admin(), check_account_invite(), check_config(), cli_startup(), community_content(), create_account(), create_identity(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), dirfind_content(), dirsearch_content(), display_content(), dlogger(), dob(), editpost_content(), encode_item(), encode_mail(), events_content(), expire_run(), feed_init(), fetch_url(), fetch_xrd_links(), findpeople_widget(), Item\get_comment_box(), get_item_elements(), get_mail_elements(), group_content(), hcard_init(), hostxrd_init(), photo_gd\imageString(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), item_store(), photo_imagick\load(), logger(), login(), lostpass_content(), lostpass_post(), match_content(), nav(), navbar_complete(), FKOAuthDataStore\new_access_token(), new_channel_post(), new_keypair(), notification(), notifier_run(), oembed_bbcode2html(), parse_url_content(), photo_upload(), photos_content(), photos_init(), poco_init(), poller_run(), post_post(), post_url(), prepare_body(), private_messages_fetch_conversation(), private_messages_fetch_message(), private_messages_list(), proc_run(), profile_content(), profile_create_sidebar(), profile_photo_post(), profiles_content(), profperm_content(), qsearch_init(), register_content(), register_post(), reload_plugins(), scale_external_images(), search_content(), send_message(), send_reg_approval_email(), send_verification_email(), service_class_allows(), service_class_fetch(), set_config(), settings_post(), siteinfo_content(), smilies(), upgrade_link(), user_allow(), valid_email(), validate_email(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), z_fetch_url(), z_post_url(), zfinger_init(), zot_fetch(), zot_import(), and zotfeed_init().

diff --git a/doc/html/language_8php.html b/doc/html/language_8php.html index 4bebe5030..c048fe064 100644 --- a/doc/html/language_8php.html +++ b/doc/html/language_8php.html @@ -280,7 +280,7 @@ Functions

Referenced by admin_content(), admin_page_dbsync(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_post(), advanced_profile(), allfriends_content(), alt_pager(), api_content(), api_post(), api_statuses_public_timeline(), apps_content(), attach_by_hash(), attach_by_hash_nodata(), attach_count_files(), attach_init(), attach_list_files(), attach_store(), authenticate_success(), bb_ShareAttributes(), bbcode(), categories_widget(), channel_content(), channel_init(), chanview_content(), check_account_email(), check_account_invite(), check_config(), check_form_security_std_err_msg(), check_funcs(), check_htaccess(), check_htconfig(), check_keys(), check_php(), check_smarty3(), common_content(), common_friends_visitor_widget(), common_init(), community_content(), connections_content(), connections_post(), construct_page(), consume_feed(), contact_block(), contact_poll_interval(), contact_reputation(), conversation(), create_account(), create_identity(), crepair_content(), crepair_post(), datesel_format(), day_translate(), delegate_content(), directory_content(), dirfind_content(), dirsearch_content(), display_content(), drop_item(), editpost_content(), editwebpage_content(), events_content(), events_post(), fbrowser_content(), fileas_widget(), filer_content(), findpeople_widget(), fix_attached_photo_permissions(), follow_init(), follow_widget(), format_event_diaspora(), format_event_html(), format_like(), format_notification(), fsuggest_content(), fsuggest_post(), gender_selector(), get_birthdays(), Item\get_comment_box(), get_events(), get_features(), get_mood_verbs(), get_perms(), get_plink(), get_poke_verbs(), Item\get_template_data(), group_add(), group_content(), group_post(), group_side(), hcard_init(), help_content(), identity_check_service_class(), import_channel_photo(), import_content(), import_post(), import_xchan(), dba_driver\install(), intro_content(), intro_post(), invite_content(), invite_post(), item_photo_menu(), item_post(), item_post_type(), items_fetch(), lang_selector(), like_content(), load_database(), localize_item(), lockview_content(), login(), lostpass_content(), lostpass_post(), magic_init(), manage_content(), manual_config(), marital_selector(), match_content(), message_aside(), message_content(), message_post(), mini_group_select(), mood_content(), mood_init(), nav(), network_content(), network_init(), network_to_name(), new_channel_content(), new_channel_post(), new_contact(), new_follower(), nogroup_content(), notification(), notifications_content(), notifications_post(), notify_content(), obj_verbs(), oembed_bbcode2html(), oembed_iframe(), oexchange_content(), page_content(), paginate(), photo_upload(), photos_album_widget(), photos_content(), photos_init(), photos_post(), ping_init(), poke_content(), poke_init(), populate_acl(), post_activity_item(), post_init(), posted_date_widget(), prepare_body(), profile_activity(), profile_content(), profile_init(), profile_load(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_content(), profiles_init(), profiles_post(), profperm_content(), redbasic_form(), register_content(), register_post(), regmod_content(), relative_date(), removeme_content(), rmagic_content(), saved_searches(), scale_external_images(), search(), search_content(), search_saved_searches(), select_timezone(), send_message(), send_reg_approval_email(), send_verification_email(), settings_aside(), settings_post(), setup_content(), sexpref_selector(), siteinfo_content(), subthread_content(), suggest_content(), tagblock(), tagger_content(), tagrm_content(), tagrm_post(), thing_content(), thing_init(), timezone_cmp(), update_channel_content(), update_community_content(), update_display_content(), update_network_content(), update_search_content(), upgrade_bool_message(), upgrade_link(), upgrade_message(), user_allow(), user_deny(), validate_channelname(), vcard_from_xchan(), viewconnections_content(), viewsrc_content(), wall_upload_post(), webpages_content(), webpages_init(), what_next(), xchan_content(), z_readdir(), and zfinger_init().

diff --git a/doc/html/nav_8php.html b/doc/html/nav_8php.html index 355209a69..a2f9e61b6 100644 --- a/doc/html/nav_8php.html +++ b/doc/html/nav_8php.html @@ -158,7 +158,7 @@ Functions diff --git a/doc/html/navtreeindex6.js b/doc/html/navtreeindex6.js index 3a2fa59c0..d2b44a25d 100644 --- a/doc/html/navtreeindex6.js +++ b/doc/html/navtreeindex6.js @@ -146,8 +146,8 @@ var NAVTREEINDEX6 = "text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[5,0,0,63,34], "text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[5,0,0,63,59], "text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[5,0,0,63,17], +"text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[5,0,0,63,50], "text_8php.html#ae4f6881d7e13623f8eded6277595112a":[5,0,0,63,22], -"text_8php.html#af3a7139d40ea758f315c2acf2ccc1b1c":[5,0,0,63,50], "text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[5,0,0,63,0], "text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[5,0,0,63,55], "text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[5,0,0,63,21], diff --git a/doc/html/permissions_8php.html b/doc/html/permissions_8php.html index 1888e6d89..17a87ab5a 100644 --- a/doc/html/permissions_8php.html +++ b/doc/html/permissions_8php.html @@ -195,7 +195,7 @@ Functions

Returns: : array of all permissions, key is permission name, value is true or false

Referenced by change_channel(), channel_content(), connections_content(), page_content(), photos_init(), and zfinger_init().

Referenced by change_channel(), channel_content(), connections_content(), editwebpage_content(), page_content(), photos_init(), and zfinger_init().

diff --git a/doc/html/plugin_8php.html b/doc/html/plugin_8php.html index e979c75bc..2b13545cc 100644 --- a/doc/html/plugin_8php.html +++ b/doc/html/plugin_8php.html @@ -190,7 +190,7 @@ Functions

Referenced by api_login(), atom_author(), atom_entry(), authenticate_success(), avatar_img(), bb2diaspora(), bbcode(), channel_remove(), check_account_email(), check_account_invite(), check_account_password(), connections_content(), connections_post(), contact_block(), contact_select(), conversation(), create_identity(), cronhooks_run(), directory_content(), editpost_content(), editwebpage_content(), event_store(), feature_enabled(), gender_selector(), get_all_perms(), get_atom_elements(), get_features(), get_feed_for(), get_mood_verbs(), get_perms(), get_poke_verbs(), Item\get_template_data(), App\get_widgets(), group_select(), html2bbcode(), import_directory_profile(), item_photo_menu(), item_post(), item_store(), item_store_update(), like_content(), login(), FKOAuth1\loginUser(), magic_init(), mail_store(), marital_selector(), mood_init(), nav(), network_content(), network_to_name(), new_contact(), notification(), notifier_run(), obj_verbs(), oembed_fetch_url(), parse_url_content(), perm_is_allowed(), photo_upload(), photos_content(), ping_init(), post_activity_item(), post_init(), prepare_body(), proc_run(), profile_content(), profile_sidebar(), profile_tabs(), profiles_content(), profiles_post(), settings_post(), sexpref_selector(), siteinfo_content(), smilies(), subthread_content(), validate_channelname(), wfinger_init(), xrd_init(), zid(), and zid_init().

diff --git a/doc/html/redbasic_2php_2style_8php.html b/doc/html/redbasic_2php_2style_8php.html index ceed32f61..efd233f77 100644 --- a/doc/html/redbasic_2php_2style_8php.html +++ b/doc/html/redbasic_2php_2style_8php.html @@ -400,7 +400,7 @@ Variables

Referenced by Template\_replcb_for(), Template\_replcb_if(), acl_init(), activity_sanitise(), admin_page_themes(), aes_encapsulate(), argv(), array_sanitise(), attach_store(), autoname(), build_sync_packet(), change_channel(), channel_content(), check_config(), check_form_security_token(), check_list_permissions(), check_webbie(), common_init(), construct_page(), consume_feed(), conversation(), crepair_post(), photo_gd\cropImage(), photo_imagick\cropImage(), datesel(), datesel_format(), decode_tags(), deliver_run(), directory_content(), directory_run(), dirfind_content(), display_content(), email_header_encode(), encode_item(), encode_mail(), event_store(), expand_groups(), feature_enabled(), fetch_post_tags(), find_xchan_in_array(), findpeople_widget(), fix_private_photos(), fix_system_urls(), photo_gd\flip(), fsuggest_post(), generate_user_guid(), get_all_perms(), get_item_elements(), get_mail_elements(), get_mentions(), get_profile_elements(), get_terms_oftype(), gprobe_run(), ids_to_querystr(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), json_return_and_die(), legal_webbie(), local_delivery(), lrdd(), magic_init(), manage_content(), match_content(), message_post(), navbar_complete(), network_content(), network_init(), new_channel_init(), new_contact(), notification(), oembed_fetch_url(), onepoll_run(), parse_xml_string(), perm_is_allowed(), photos_post(), ping_init(), poco_load(), poller_run(), post_init(), post_post(), preg_heart(), prepare_body(), print_template(), private_messages_list(), proc_run(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), public_recips(), dba_mysql\q(), dba_mysqli\q(), randprof_init(), remove_community_tag(), search_ac_init(), send_status_notifications(), App\set_widget(), smilies(), photo_driver\store(), stringify_array_elms(), sync_directories(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), timesel(), toggle_theme(), upgrade_bool_message(), upgrade_message(), valid_email(), webpages_content(), xchan_query(), xmlify(), zfinger_init(), zot_process_response(), zot_refresh(), and zot_register_hub().

Referenced by Template\_replcb_for(), Template\_replcb_if(), acl_init(), activity_sanitise(), admin_page_themes(), aes_encapsulate(), argv(), array_sanitise(), attach_store(), autoname(), build_sync_packet(), change_channel(), channel_content(), check_config(), check_form_security_token(), check_list_permissions(), check_webbie(), common_init(), construct_page(), consume_feed(), conversation(), crepair_post(), photo_gd\cropImage(), photo_imagick\cropImage(), datesel(), datesel_format(), decode_tags(), deliver_run(), directory_content(), directory_run(), dirfind_content(), display_content(), email_header_encode(), encode_item(), encode_mail(), event_store(), expand_groups(), feature_enabled(), fetch_post_tags(), find_xchan_in_array(), findpeople_widget(), fix_private_photos(), fix_system_urls(), photo_gd\flip(), fsuggest_post(), generate_user_guid(), get_all_perms(), get_item_elements(), get_mail_elements(), get_mentions(), get_profile_elements(), get_terms_oftype(), gprobe_run(), ids_to_querystr(), import_author_xchan(), import_directory_keywords(), import_directory_profile(), import_post(), import_xchan(), invite_content(), invite_post(), item_post(), json_return_and_die(), legal_webbie(), local_delivery(), lrdd(), magic_init(), manage_content(), match_content(), message_post(), navbar_complete(), network_content(), network_init(), new_channel_init(), new_contact(), notification(), notifier_run(), oembed_fetch_url(), onepoll_run(), parse_xml_string(), perm_is_allowed(), photos_post(), ping_init(), poco_load(), poller_run(), post_init(), post_post(), preg_heart(), prepare_body(), print_template(), private_messages_list(), proc_run(), process_mail_delivery(), profile_init(), profile_load(), profile_photo_post(), public_recips(), dba_mysql\q(), dba_mysqli\q(), randprof_init(), remove_community_tag(), search_ac_init(), send_status_notifications(), App\set_widget(), smilies(), photo_driver\store(), stringify_array_elms(), sync_directories(), tag_deliver(), tagadelic(), tagrm_content(), tagrm_post(), theme_status(), timesel(), toggle_theme(), upgrade_bool_message(), upgrade_message(), valid_email(), webpages_content(), xchan_query(), xmlify(), zfinger_init(), zot_process_response(), zot_refresh(), and zot_register_hub().

diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js index d7e25263f..d362b680b 100644 --- a/doc/html/search/all_70.js +++ b/doc/html/search/all_70.js @@ -99,7 +99,7 @@ var searchData= ['posted_5fdate_5fwidget',['posted_date_widget',['../items_8php.html#abe695dd89e1e10ed042c26b80114f0ed',1,'items.php']]], ['posted_5fdates',['posted_dates',['../items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0',1,'items.php']]], ['preg_5fheart',['preg_heart',['../text_8php.html#ac19d2b33a58372a357a43d51eed19162',1,'text.php']]], - ['prepare_5fbody',['prepare_body',['../text_8php.html#af3a7139d40ea758f315c2acf2ccc1b1c',1,'text.php']]], + ['prepare_5fbody',['prepare_body',['../text_8php.html#ae4df74296fbe55051ed3c035e55205e5',1,'text.php']]], ['prepare_5fpage',['prepare_page',['../conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c',1,'conversation.php']]], ['prepare_5ftext',['prepare_text',['../text_8php.html#afe54312607d92f7ce9593f5760831f80',1,'text.php']]], ['pretheme_2ephp',['pretheme.php',['../pretheme_8php.html',1,'']]], diff --git a/doc/html/search/functions_70.js b/doc/html/search/functions_70.js index 0a540cbab..f37bb2de9 100644 --- a/doc/html/search/functions_70.js +++ b/doc/html/search/functions_70.js @@ -43,7 +43,7 @@ var searchData= ['posted_5fdate_5fwidget',['posted_date_widget',['../items_8php.html#abe695dd89e1e10ed042c26b80114f0ed',1,'items.php']]], ['posted_5fdates',['posted_dates',['../items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0',1,'items.php']]], ['preg_5fheart',['preg_heart',['../text_8php.html#ac19d2b33a58372a357a43d51eed19162',1,'text.php']]], - ['prepare_5fbody',['prepare_body',['../text_8php.html#af3a7139d40ea758f315c2acf2ccc1b1c',1,'text.php']]], + ['prepare_5fbody',['prepare_body',['../text_8php.html#ae4df74296fbe55051ed3c035e55205e5',1,'text.php']]], ['prepare_5fpage',['prepare_page',['../conversation_8php.html#a4b0888b0f26e1c284a4341fe5fd04f0c',1,'conversation.php']]], ['prepare_5ftext',['prepare_text',['../text_8php.html#afe54312607d92f7ce9593f5760831f80',1,'text.php']]], ['pretheme_5finit',['pretheme_init',['../pretheme_8php.html#af5660943ee99db5fd75182316522eafe',1,'pretheme.php']]], diff --git a/doc/html/taxonomy_8php.html b/doc/html/taxonomy_8php.html index ee6ee9020..03e168570 100644 --- a/doc/html/taxonomy_8php.html +++ b/doc/html/taxonomy_8php.html @@ -246,7 +246,7 @@ Functions

Referenced by conversation(), item_getfeedtags(), prepare_body(), tag_deliver(), and tgroup_check().

diff --git a/doc/html/text_8php.html b/doc/html/text_8php.html index 82fd85ac2..13c4489ef 100644 --- a/doc/html/text_8php.html +++ b/doc/html/text_8php.html @@ -195,8 +195,8 @@ Functions link_compare ($a, $b) - prepare_body ($item, $attach=false) - + prepare_body (&$item, $attach=false) + prepare_text ($text, $content_type= 'text/bbcode') zidify_callback ($match) @@ -429,7 +429,7 @@ Variables @@ -457,7 +457,7 @@ Variables

Referenced by aes_encapsulate(), allowed_public_recips(), atom_entry(), create_identity(), fix_system_urls(), get_item_elements(), get_mail_elements(), get_profile_elements(), identity_basic_export(), import_post(), import_xchan(), magic_init(), oembed_iframe(), post_post(), random_string(), send_message(), smile_encode(), zfinger_init(), zot_build_packet(), zot_fetch(), zot_import(), zot_new_uid(), and zot_register_hub().

Referenced by aes_encapsulate(), allowed_public_recips(), atom_entry(), create_identity(), fix_system_urls(), get_item_elements(), get_mail_elements(), get_profile_elements(), identity_basic_export(), import_post(), import_xchan(), magic_init(), oembed_iframe(), post_post(), random_string(), smile_encode(), zfinger_init(), zot_build_packet(), zot_fetch(), zot_import(), zot_new_uid(), and zot_register_hub().

@@ -930,7 +930,7 @@ Variables

Referenced by channel_content(), display_content(), items_fetch(), network_content(), and search_content().

Referenced by channel_content(), display_content(), items_fetch(), network_content(), search_content(), and zot_feed().

@@ -1120,7 +1120,7 @@ Variables

Referenced by account_verify_password(), Item\add_child(), Conversation\add_thread(), advanced_profile(), aes_encapsulate(), allowed_public_recips(), api_call(), api_channel_stream(), api_export_basic(), api_favorites(), api_get_user(), api_login(), api_statuses_destroy(), api_statuses_mediap(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), authenticate_success(), avatar_img(), base64url_decode(), build_sync_packet(), channel_remove(), chanview_content(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), consume_feed(), conversation(), create_account(), create_identity(), crepair_post(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), display_content(), email_send(), encode_item(), encode_mail(), expire_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), filer_content(), filerm_content(), fix_private_photos(), Conversation\get_template_data(), group_content(), guess_image_type(), head_set_icon(), http_status_exit(), import_author_xchan(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), item_expire(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), local_delivery(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), lrdd(), magic_init(), mail_store(), message_content(), message_post(), mini_group_select(), mood_init(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_keypair(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), onepoll_run(), parse_url_content(), parse_xml_string(), photo_init(), photo_upload(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), public_recips(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), redir_init(), register_content(), reload_plugins(), Item\remove_child(), remove_community_tag(), remove_queue_item(), scale_external_images(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), subthread_content(), syncdirs(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_imported_item(), update_queue_time(), webfinger(), webfinger_dfrn(), xml2array(), xml_status(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), zot_finger(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

Referenced by account_verify_password(), Item\add_child(), Conversation\add_thread(), advanced_profile(), aes_encapsulate(), allowed_public_recips(), api_call(), api_channel_stream(), api_export_basic(), api_favorites(), api_get_user(), api_login(), api_statuses_destroy(), api_statuses_mediap(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), authenticate_success(), avatar_img(), base64url_decode(), build_sync_packet(), channel_remove(), chanview_content(), check_config(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), consume_feed(), conversation(), create_account(), create_identity(), crepair_post(), cronhooks_run(), datetime_convert(), delete_imported_item(), deliver_run(), detect_language(), dfrn_deliver(), directory_content(), directory_run(), display_content(), email_send(), encode_item(), expire_run(), feed_init(), fetch_lrdd_template(), fetch_xrd_links(), filer_content(), filerm_content(), fix_private_photos(), Conversation\get_template_data(), group_content(), guess_image_type(), head_set_icon(), http_status_exit(), import_author_xchan(), import_channel_photo(), import_directory_profile(), import_post(), import_profile_photo(), import_site(), import_xchan(), install_plugin(), item_expire(), item_post(), item_store(), item_store_update(), like_content(), limit_body_size(), load_plugin(), local_delivery(), FKOAuth1\loginUser(), FKOAuthDataStore\lookup_consumer(), FKOAuthDataStore\lookup_token(), lrdd(), magic_init(), mail_store(), message_content(), message_post(), mini_group_select(), mood_init(), network_content(), FKOAuthDataStore\new_access_token(), new_contact(), new_keypair(), FKOAuthDataStore\new_request_token(), notification(), notifier_run(), onepoll_run(), parse_url_content(), parse_xml_string(), photo_init(), photo_upload(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), post_activity_item(), post_init(), post_post(), private_messages_list(), process_channel_sync_delivery(), process_delivery(), process_mail_delivery(), process_profile_delivery(), profile_load(), public_recips(), dba_mysql\q(), dba_mysqli\q(), q(), queue_run(), redir_init(), register_content(), reload_plugins(), Item\remove_child(), remove_community_tag(), remove_queue_item(), scale_external_images(), search_ac_init(), enotify\send(), send_reg_approval_email(), Conversation\set_mode(), subthread_content(), syncdirs(), tag_deliver(), tagger_content(), tgroup_check(), uninstall_plugin(), unload_plugin(), update_imported_item(), update_queue_time(), webfinger(), webfinger_dfrn(), xml2array(), xml_status(), zfinger_init(), zid_init(), zot_build_packet(), zot_fetch(), zot_finger(), zot_gethub(), zot_import(), zot_process_response(), zot_refresh(), and zot_register_hub().

@@ -1346,14 +1346,14 @@ Variables - +

- + @@ -1398,7 +1398,7 @@ Variables

prepare_body ( & $item,

Referenced by advanced_profile(), and prepare_body().

@@ -1512,7 +1512,7 @@ Variables

Referenced by aes_encapsulate(), attach_store(), build_sync_packet(), create_account(), create_identity(), dfrn_deliver(), event_store(), fsuggest_post(), generate_user_guid(), group_add(), item_message_id(), item_store(), local_delivery(), lostpass_content(), lostpass_post(), magic_init(), mail_store(), new_follower(), notification(), notifier_run(), prepare_body(), profiles_init(), redir_init(), removeme_content(), send_message(), send_reg_approval_email(), settings_post(), setup_post(), and thing_init().

diff --git a/doc/html/text_8php.js b/doc/html/text_8php.js index 4e6d6f65f..8a58abf15 100644 --- a/doc/html/text_8php.js +++ b/doc/html/text_8php.js @@ -50,7 +50,7 @@ var text_8php = [ "perms2str", "text_8php.html#a98fd99dee3da8cf4c148dc04efe782ee", null ], [ "photo_new_resource", "text_8php.html#aa5528f41533927e1bd2da3618a74a6d7", null ], [ "preg_heart", "text_8php.html#ac19d2b33a58372a357a43d51eed19162", null ], - [ "prepare_body", "text_8php.html#af3a7139d40ea758f315c2acf2ccc1b1c", null ], + [ "prepare_body", "text_8php.html#ae4df74296fbe55051ed3c035e55205e5", null ], [ "prepare_text", "text_8php.html#afe54312607d92f7ce9593f5760831f80", null ], [ "profiler", "text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6", null ], [ "protect_sprintf", "text_8php.html#a4e7698aca48982512594b274543c3b9b", null ], diff --git a/doc/html/typo_8php.html b/doc/html/typo_8php.html index ea39f5efd..d574879e4 100644 --- a/doc/html/typo_8php.html +++ b/doc/html/typo_8php.html @@ -134,7 +134,7 @@ Variables

Referenced by FriendicaSmarty\__construct(), Item\__construct(), FriendicaSmartyEngine\__construct(), Template\_replcb_if(), Template\_replcb_inc(), _well_known_init(), abook_toggle_flag(), acl_init(), admin_content(), admin_page_dbsync(), admin_page_logs(), admin_page_logs_post(), admin_page_plugins(), admin_page_site(), admin_page_site_post(), admin_page_summary(), admin_page_themes(), admin_page_users(), admin_page_users_post(), admin_post(), advanced_profile(), allfriends_content(), allowed_email(), allowed_url(), alt_pager(), api_account_verify_credentials(), api_albums(), api_apply_template(), api_call(), api_content(), api_direct_messages_all(), api_direct_messages_box(), api_direct_messages_conversation(), api_direct_messages_inbox(), api_direct_messages_new(), api_direct_messages_sentbox(), api_favorites(), api_followers_ids(), api_format_as(), api_format_items(), api_friends_ids(), api_get_user(), api_item_get_user(), api_login(), api_photos(), api_post(), api_rss_extra(), api_status_show(), api_statuses_destroy(), api_statuses_f(), api_statuses_followers(), api_statuses_friends(), api_statuses_home_timeline(), api_statuses_mediap(), api_statuses_mentions(), api_statuses_public_timeline(), api_statuses_repeat(), api_statuses_show(), api_statuses_update(), api_statuses_user_timeline(), api_statusnet_config(), api_users_show(), apps_content(), atom_entry(), attribute_contains(), authenticate_success(), avatar_img(), bbcode(), best_link_url(), build_sync_packet(), cal(), call_hooks(), categories_widget(), channel_aside(), channel_content(), channel_init(), channel_remove(), chanview_content(), check_config(), check_form_security_token(), check_form_security_token_ForbiddenOnErr(), check_form_security_token_redirectOnErr(), check_htaccess(), clean_urls(), cli_startup(), common_aside(), common_content(), common_friends_visitor_widget(), common_init(), community_content(), connections_aside(), connections_clone(), connections_content(), connections_init(), connections_post(), construct_page(), consume_feed(), contact_block(), contact_select(), conversation(), create_identity(), crepair_content(), crepair_init(), crepair_post(), current_theme(), current_theme_url(), del_config(), del_pconfig(), del_xconfig(), delegate_content(), deliver_run(), dfrn_deliver(), directory_aside(), directory_content(), directory_init(), dirfind_content(), dirfind_init(), dirsearch_init(), display_content(), dlogger(), drop_item(), editpost_content(), editwebpage_content(), ev_compare(), event_store(), events_content(), events_post(), expand_acl(), expand_groups(), fbrowser_content(), fetch_url(), fileas_widget(), filer_content(), filerm_content(), findpeople_widget(), fix_private_photos(), follow_init(), format_event_diaspora(), fsuggest_content(), fsuggest_post(), BaseObject\get_app(), get_app(), get_best_language(), get_birthdays(), Item\get_comment_box(), get_config(), get_events(), get_form_security_token(), FriendicaSmartyEngine\get_intltext_template(), get_intltext_template(), get_markup_template(), get_max_import_size(), get_pconfig(), get_plink(), Item\get_template_data(), get_theme_screenshot(), get_xconfig(), gprobe_run(), group_aside(), group_content(), group_post(), group_select(), guess_image_type(), handle_tag(), hcard_aside(), hcard_init(), head_get_icon(), head_set_icon(), help_content(), hostxrd_init(), import_channel_photo(), import_profile_photo(), info(), intro_aside(), intro_content(), invite_content(), invite_post(), is_site_admin(), item_content(), item_photo_menu(), item_post(), items_fetch(), lang_selector(), like_content(), like_puller(), link_compare(), load_config(), load_contact_links(), load_database(), load_hooks(), load_pconfig(), load_translation_table(), load_xconfig(), local_delivery(), logger(), login(), login_content(), FKOAuth1\loginUser(), lostpass_content(), lostpass_post(), lrdd(), magic_init(), manual_config(), match_content(), message_aside(), message_content(), message_post(), mood_init(), msearch_post(), nav(), nav_set_selected(), network_content(), network_init(), new_contact(), new_follower(), nogroup_content(), nogroup_init(), notice(), notification(), notifications_content(), notifications_post(), notifier_run(), notify_content(), notify_init(), oembed_fetch_url(), oembed_format_object(), oembed_iframe(), oexchange_content(), oexchange_init(), onepoll_run(), opensearch_init(), page_content(), page_init(), paginate(), photo_init(), photos_content(), photos_init(), photos_post(), ping_init(), poco_init(), poco_load(), poke_init(), poller_run(), pop_lang(), post_init(), post_url(), preg_heart(), prepare_body(), probe_content(), proc_run(), profile_activity(), profile_aside(), profile_content(), profile_create_sidebar(), profile_init(), profile_load(), profile_photo_aside(), profile_photo_init(), profile_photo_post(), profile_sidebar(), profile_tabs(), profiles_aside(), profiles_content(), profiles_init(), profiles_post(), profperm_aside(), profperm_content(), profperm_init(), push_lang(), queue_run(), randprof_init(), redbasic_form(), redbasic_init(), redir_init(), redstrap_init(), register_content(), regmod_content(), relative_date(), removeme_content(), removeme_post(), replace_macros(), rmagic_post(), saved_searches(), scale_external_images(), search(), search_ac_init(), search_content(), search_init(), search_post(), send_message(), service_class_allows(), service_class_fetch(), set_config(), Conversation\set_mode(), set_pconfig(), set_xconfig(), settings_aside(), settings_init(), settings_post(), setup_content(), setup_post(), siteinfo_content(), siteinfo_init(), smilies(), subthread_content(), suggest_aside(), suggest_content(), t(), tag_deliver(), tagger_content(), tagrm_content(), tagrm_post(), tags_sort(), terminate_friendship(), tgroup_check(), theme_content(), theme_include(), thing_init(), timezone_cmp(), toggle_mobile_init(), tt(), uexport_init(), update_channel_content(), update_community_content(), update_display_content(), update_network_content(), update_search_content(), update_suggestions(), user_allow(), vcard_from_xchan(), viewconnections_aside(), viewconnections_content(), viewconnections_init(), viewsrc_content(), wall_upload_post(), webpages_content(), webpages_init(), wfinger_init(), what_next(), xrd_init(), z_fetch_url(), z_path(), z_root(), zfinger_init(), zid_init(), and zotfeed_init().

diff --git a/mod/invite.php b/mod/invite.php index cb8d4c6eb..cb8cd1f63 100644 --- a/mod/invite.php +++ b/mod/invite.php @@ -68,9 +68,12 @@ function invite_post(&$a) { else $nmessage = $message; + $account = $a->get_account(); + + $res = mail($recip, sprintf( t('Please join us on Red'), $a->config['sitename']), $nmessage, - "From: " . $a->user['email'] . "\n" + "From: " . $account['account_email'] . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-transfer-encoding: 8bit' ); @@ -112,29 +115,41 @@ function invite_content(&$a) { } } - $dirloc = get_config('system','directory_submit_url'); - if(strlen($dirloc)) { - if($a->config['system']['register_policy'] == REGISTER_CLOSED) - $linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), dirname($dirloc) . '/siteinfo'); - elseif($a->config['system']['register_policy'] != REGISTER_CLOSED) - $linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), $a->get_baseurl()) - . "\r\n" . "\r\n" . sprintf( t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.'),dirname($dirloc) . '/siteinfo'); - } - else { - $o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.'); +// $dirloc = get_config('system','directory_submit_url'); +// if(strlen($dirloc)) { +// if($a->config['system']['register_policy'] == REGISTER_CLOSED) +// $linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), dirname($dirloc) . '/siteinfo'); +// elseif($a->config['system']['register_policy'] != REGISTER_CLOSED) +// $linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), $a->get_baseurl()) +// . "\r\n" . "\r\n" . sprintf( t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.'),dirname($dirloc) . '/siteinfo'); +// } +// else { +// $o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.'); +// return $o; +// } + + $ob = $a->get_observer(); + if(! $ob) return $o; - } + + $channel = $a->get_channel(); $o = replace_macros($tpl, array( '$form_security_token' => get_form_security_token("send_invite"), '$invite' => t('Send invitations'), '$addr_text' => t('Enter email addresses, one per line:'), '$msg_text' => t('Your message:'), - '$default_message' => t('You are cordially invited to join me and other close friends on Friendica - and help us to create a better social web.') . "\r\n" . "\r\n" + '$default_message' => t('You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralised social and information tool.') . "\r\n" . "\r\n" . $linktxt - . "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:') - . "\r\n" . "\r\n" . $a->get_baseurl() . '/channel/' . $a->user['nickname'] - . "\r\n" . "\r\n" . t('For more information about the Friendica project and why we feel it is important, please visit http://friendica.com') . "\r\n" . "\r\n" , + . (($invonly) ? "\r\n" . "\r\n" . t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') + + . t('Please visit my channel at') + . "\r\n" . "\r\n" + . z_root() . "/channel/" . $channel['channel_address'] + . "\r\n" . "\r\n" + . t('Once you have registered, please connect with my Red Matrix channel address:') + . "\r\n" . "\r\n" . $ob['xchan_addr'] + . "\r\n" . "\r\n" . t('For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com') . "\r\n" . "\r\n" , '$submit' => t('Submit') )); diff --git a/util/messages.po b/util/messages.po index b26539e84..04d946a6c 100644 --- a/util/messages.po +++ b/util/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-26 00:01-0700\n" +"POT-Creation-Date: 2013-08-02 00:01-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -58,7 +58,7 @@ msgid "Public Timeline" msgstr "" #: ../../include/enotify.php:36 -msgid "Red Notification" +msgid "Red Matrix Notification" msgstr "" #: ../../include/enotify.php:39 @@ -125,8 +125,8 @@ msgid "%s commented on an item/conversation you have been following." msgstr "" #: ../../include/enotify.php:147 ../../include/enotify.php:164 -#: ../../include/enotify.php:177 ../../include/enotify.php:195 -#: ../../include/enotify.php:208 +#: ../../include/enotify.php:190 ../../include/enotify.php:208 +#: ../../include/enotify.php:221 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "" @@ -146,98 +146,98 @@ msgstr "" msgid "%1$s posted to [zrl=%2$s]your wall[/zrl]" msgstr "" -#: ../../include/enotify.php:171 +#: ../../include/enotify.php:184 #, php-format msgid "[Red:Notify] %s tagged you" msgstr "" -#: ../../include/enotify.php:172 +#: ../../include/enotify.php:185 #, php-format msgid "%1$s tagged you at %2$s" msgstr "" -#: ../../include/enotify.php:173 +#: ../../include/enotify.php:186 #, php-format msgid "%1$s [zrl=%2$s]tagged you[/zrl]." msgstr "" -#: ../../include/enotify.php:185 +#: ../../include/enotify.php:198 #, php-format msgid "[Red:Notify] %1$s poked you" msgstr "" -#: ../../include/enotify.php:186 +#: ../../include/enotify.php:199 #, php-format msgid "%1$s poked you at %2$s" msgstr "" -#: ../../include/enotify.php:187 +#: ../../include/enotify.php:200 #, php-format msgid "%1$s [zrl=%2$s]poked you[/zrl]." msgstr "" -#: ../../include/enotify.php:202 +#: ../../include/enotify.php:215 #, php-format msgid "[Red:Notify] %s tagged your post" msgstr "" -#: ../../include/enotify.php:203 +#: ../../include/enotify.php:216 #, php-format msgid "%1$s tagged your post at %2$s" msgstr "" -#: ../../include/enotify.php:204 +#: ../../include/enotify.php:217 #, php-format msgid "%1$s tagged [zrl=%2$s]your post[/zrl]" msgstr "" -#: ../../include/enotify.php:215 +#: ../../include/enotify.php:228 msgid "[Red:Notify] Introduction received" msgstr "" -#: ../../include/enotify.php:216 +#: ../../include/enotify.php:229 #, php-format msgid "You've received an introduction from '%1$s' at %2$s" msgstr "" -#: ../../include/enotify.php:217 +#: ../../include/enotify.php:230 #, php-format msgid "You've received [zrl=%1$s]an introduction[/zrl] from %2$s." msgstr "" -#: ../../include/enotify.php:220 ../../include/enotify.php:238 +#: ../../include/enotify.php:233 ../../include/enotify.php:251 #, php-format msgid "You may visit their profile at %s" msgstr "" -#: ../../include/enotify.php:222 +#: ../../include/enotify.php:235 #, php-format msgid "Please visit %s to approve or reject the introduction." msgstr "" -#: ../../include/enotify.php:229 +#: ../../include/enotify.php:242 msgid "[Red:Notify] Friend suggestion received" msgstr "" -#: ../../include/enotify.php:230 +#: ../../include/enotify.php:243 #, php-format msgid "You've received a friend suggestion from '%1$s' at %2$s" msgstr "" -#: ../../include/enotify.php:231 +#: ../../include/enotify.php:244 #, php-format msgid "You've received [zrl=%1$s]a friend suggestion[/zrl] for %2$s from %3$s." msgstr "" -#: ../../include/enotify.php:236 +#: ../../include/enotify.php:249 msgid "Name:" msgstr "" -#: ../../include/enotify.php:237 +#: ../../include/enotify.php:250 msgid "Photo:" msgstr "" -#: ../../include/enotify.php:240 +#: ../../include/enotify.php:253 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "" @@ -264,8 +264,8 @@ msgid "View Status" msgstr "" #: ../../include/Contact.php:385 ../../include/nav.php:75 -#: ../../include/conversation.php:888 ../../mod/connections.php:295 -#: ../../mod/connections.php:402 +#: ../../include/conversation.php:888 ../../mod/connections.php:294 +#: ../../mod/connections.php:401 msgid "View Profile" msgstr "" @@ -545,7 +545,7 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:40 ../../include/bb2diaspora.php:455 -#: ../../mod/events.php:448 ../../mod/directory.php:120 ../../boot.php:1665 +#: ../../mod/events.php:450 ../../mod/directory.php:120 ../../boot.php:1665 msgid "Location:" msgstr "" @@ -872,19 +872,19 @@ msgstr "" msgid "timeago.numbers" msgstr "" -#: ../../include/message.php:16 +#: ../../include/message.php:17 msgid "No recipient provided." msgstr "" -#: ../../include/message.php:21 +#: ../../include/message.php:22 msgid "[no subject]" msgstr "" -#: ../../include/message.php:36 +#: ../../include/message.php:37 msgid "Unable to determine sender." msgstr "" -#: ../../include/message.php:83 +#: ../../include/message.php:106 msgid "Stored post could not be verified." msgstr "" @@ -907,7 +907,7 @@ msgstr "" msgid "Profile" msgstr "" -#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1016 +#: ../../include/profile_advanced.php:15 ../../mod/settings.php:1018 msgid "Full Name:" msgstr "" @@ -1027,7 +1027,7 @@ msgstr "" msgid "Welcome back " msgstr "" -#: ../../include/security.php:349 +#: ../../include/security.php:355 msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." @@ -1234,7 +1234,7 @@ msgstr "" msgid "New Message" msgstr "" -#: ../../include/nav.php:169 ../../mod/events.php:346 ../../boot.php:2097 +#: ../../include/nav.php:169 ../../mod/events.php:348 ../../boot.php:2097 msgid "Events" msgstr "" @@ -1312,24 +1312,24 @@ msgstr "" #: ../../include/attach.php:133 ../../include/attach.php:189 #: ../../include/attach.php:204 ../../include/attach.php:237 #: ../../include/attach.php:251 ../../include/attach.php:272 -#: ../../include/attach.php:464 ../../include/items.php:4522 +#: ../../include/attach.php:464 ../../include/items.php:4580 #: ../../mod/common.php:43 ../../mod/events.php:134 ../../mod/invite.php:13 #: ../../mod/invite.php:99 ../../mod/allfriends.php:10 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/page.php:31 ../../mod/setup.php:181 -#: ../../mod/settings.php:583 ../../mod/viewconnections.php:33 +#: ../../mod/settings.php:585 ../../mod/viewconnections.php:33 #: ../../mod/viewconnections.php:38 ../../mod/delegate.php:6 #: ../../mod/group.php:15 ../../mod/photos.php:74 ../../mod/photos.php:644 -#: ../../mod/viewsrc.php:12 ../../mod/message.php:204 ../../mod/item.php:150 +#: ../../mod/viewsrc.php:12 ../../mod/message.php:204 ../../mod/item.php:151 #: ../../mod/network.php:7 ../../mod/intro.php:50 -#: ../../mod/connections.php:166 ../../mod/profiles.php:163 +#: ../../mod/connections.php:165 ../../mod/profiles.php:163 #: ../../mod/profiles.php:476 ../../mod/new_channel.php:66 #: ../../mod/new_channel.php:97 ../../mod/manage.php:6 #: ../../mod/crepair.php:115 ../../mod/nogroup.php:25 #: ../../mod/profile_photo.php:185 ../../mod/profile_photo.php:198 -#: ../../mod/editwebpage.php:12 ../../mod/notifications.php:66 -#: ../../mod/editpost.php:10 ../../mod/poke.php:128 ../../mod/channel.php:108 +#: ../../mod/editwebpage.php:42 ../../mod/notifications.php:66 +#: ../../mod/editpost.php:11 ../../mod/poke.php:128 ../../mod/channel.php:108 #: ../../mod/fsuggest.php:78 ../../mod/suggest.php:32 -#: ../../mod/register.php:60 ../../mod/regmod.php:18 ../../mod/mood.php:111 +#: ../../mod/register.php:60 ../../mod/regmod.php:18 ../../mod/mood.php:112 #: ../../index.php:178 ../../index.php:340 msgid "Permission denied." msgstr "" @@ -1505,7 +1505,7 @@ msgid "Sex Addict" msgstr "" #: ../../include/profile_selectors.php:42 ../../include/identity.php:233 -#: ../../mod/network.php:381 ../../mod/connections.php:368 +#: ../../mod/network.php:381 ../../mod/connections.php:367 msgid "Friends" msgstr "" @@ -1627,7 +1627,7 @@ msgid "Registration request at %s" msgstr "" #: ../../include/account.php:266 ../../include/account.php:293 -#: ../../include/account.php:350 ../../include/items.php:4047 +#: ../../include/account.php:350 ../../include/items.php:4105 #: ../../boot.php:1191 msgid "Administrator" msgstr "" @@ -1951,68 +1951,68 @@ msgstr "" msgid "December" msgstr "" -#: ../../include/text.php:1017 +#: ../../include/text.php:1029 msgid "unknown.???" msgstr "" -#: ../../include/text.php:1018 +#: ../../include/text.php:1030 msgid "bytes" msgstr "" -#: ../../include/text.php:1054 ../../include/text.php:1069 +#: ../../include/text.php:1066 ../../include/text.php:1081 #: ../../include/conversation.php:793 msgid "remove" msgstr "" -#: ../../include/text.php:1054 ../../include/text.php:1069 +#: ../../include/text.php:1066 ../../include/text.php:1081 msgid "[remove]" msgstr "" -#: ../../include/text.php:1057 ../../include/conversation.php:655 +#: ../../include/text.php:1069 ../../include/conversation.php:655 msgid "Categories:" msgstr "" -#: ../../include/text.php:1072 ../../include/conversation.php:656 +#: ../../include/text.php:1084 ../../include/conversation.php:656 msgid "Filed under:" msgstr "" -#: ../../include/text.php:1088 ../../include/text.php:1100 +#: ../../include/text.php:1100 ../../include/text.php:1112 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1252 ../../mod/events.php:324 +#: ../../include/text.php:1264 ../../mod/events.php:326 msgid "link to source" msgstr "" -#: ../../include/text.php:1284 +#: ../../include/text.php:1296 msgid "default" msgstr "" -#: ../../include/text.php:1296 +#: ../../include/text.php:1308 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1448 ../../include/conversation.php:115 +#: ../../include/text.php:1460 ../../include/conversation.php:115 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:45 msgid "photo" msgstr "" -#: ../../include/text.php:1451 ../../include/conversation.php:118 +#: ../../include/text.php:1463 ../../include/conversation.php:118 #: ../../mod/tagger.php:49 msgid "event" msgstr "" -#: ../../include/text.php:1454 ../../include/conversation.php:143 +#: ../../include/text.php:1466 ../../include/conversation.php:143 #: ../../mod/like.php:103 ../../mod/subthread.php:89 ../../mod/tagger.php:53 msgid "status" msgstr "" -#: ../../include/text.php:1456 ../../include/conversation.php:145 +#: ../../include/text.php:1468 ../../include/conversation.php:145 #: ../../mod/tagger.php:55 msgid "comment" msgstr "" -#: ../../include/text.php:1461 +#: ../../include/text.php:1473 msgid "activity" msgstr "" @@ -2205,16 +2205,16 @@ msgstr "" msgid "Private Message" msgstr "" -#: ../../include/ItemObject.php:92 ../../mod/webpages.php:66 -#: ../../mod/settings.php:668 ../../mod/editwebpage.php:68 -#: ../../mod/editpost.php:66 +#: ../../include/ItemObject.php:92 ../../mod/webpages.php:68 +#: ../../mod/settings.php:670 ../../mod/editwebpage.php:97 +#: ../../mod/editpost.php:76 msgid "Edit" msgstr "" #: ../../include/ItemObject.php:104 ../../include/conversation.php:619 -#: ../../mod/settings.php:669 ../../mod/group.php:177 +#: ../../mod/settings.php:671 ../../mod/group.php:177 #: ../../mod/photos.php:1162 ../../mod/admin.php:630 -#: ../../mod/connections.php:335 +#: ../../mod/connections.php:334 msgid "Delete" msgstr "" @@ -2287,7 +2287,7 @@ msgstr "" #: ../../include/ItemObject.php:233 ../../include/conversation.php:684 #: ../../include/conversation.php:1040 ../../mod/photos.php:1052 #: ../../mod/message.php:297 ../../mod/message.php:430 -#: ../../mod/editwebpage.php:77 ../../mod/editpost.php:75 +#: ../../mod/editwebpage.php:106 ../../mod/editpost.php:85 msgid "Please wait" msgstr "" @@ -2303,20 +2303,20 @@ msgstr[1] "" msgid "This is you" msgstr "" -#: ../../include/ItemObject.php:505 ../../mod/events.php:456 +#: ../../include/ItemObject.php:505 ../../mod/events.php:458 #: ../../mod/thing.php:190 ../../mod/invite.php:138 ../../mod/setup.php:283 -#: ../../mod/setup.php:326 ../../mod/settings.php:606 -#: ../../mod/settings.php:718 ../../mod/settings.php:746 -#: ../../mod/settings.php:770 ../../mod/settings.php:841 -#: ../../mod/settings.php:1008 ../../mod/group.php:83 ../../mod/photos.php:675 +#: ../../mod/setup.php:326 ../../mod/settings.php:608 +#: ../../mod/settings.php:720 ../../mod/settings.php:748 +#: ../../mod/settings.php:772 ../../mod/settings.php:843 +#: ../../mod/settings.php:1010 ../../mod/group.php:83 ../../mod/photos.php:675 #: ../../mod/photos.php:769 ../../mod/photos.php:1031 #: ../../mod/photos.php:1070 ../../mod/photos.php:1108 #: ../../mod/photos.php:1135 ../../mod/message.php:298 #: ../../mod/message.php:429 ../../mod/admin.php:400 ../../mod/admin.php:623 #: ../../mod/admin.php:759 ../../mod/admin.php:958 ../../mod/admin.php:1045 -#: ../../mod/connections.php:412 ../../mod/profiles.php:529 +#: ../../mod/connections.php:411 ../../mod/profiles.php:529 #: ../../mod/import.php:356 ../../mod/crepair.php:166 ../../mod/poke.php:166 -#: ../../mod/fsuggest.php:108 ../../mod/mood.php:134 +#: ../../mod/fsuggest.php:108 ../../mod/mood.php:135 #: ../../view/theme/redbasic/php/config.php:136 #: ../../view/theme/redbasic/php/config.php:154 #: ../../view/theme/redstrap/php/config.php:131 @@ -2356,8 +2356,8 @@ msgid "Video" msgstr "" #: ../../include/ItemObject.php:514 ../../include/conversation.php:1058 -#: ../../mod/photos.php:1071 ../../mod/editwebpage.php:97 -#: ../../mod/editpost.php:95 +#: ../../mod/photos.php:1071 ../../mod/editwebpage.php:126 +#: ../../mod/editpost.php:105 msgid "Preview" msgstr "" @@ -2488,8 +2488,8 @@ msgid "Page link title" msgstr "" #: ../../include/conversation.php:1021 ../../mod/message.php:295 -#: ../../mod/message.php:427 ../../mod/editwebpage.php:69 -#: ../../mod/editpost.php:67 +#: ../../mod/message.php:427 ../../mod/editwebpage.php:98 +#: ../../mod/editpost.php:77 msgid "Upload photo" msgstr "" @@ -2497,8 +2497,8 @@ msgstr "" msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1023 ../../mod/editwebpage.php:70 -#: ../../mod/editpost.php:68 +#: ../../include/conversation.php:1023 ../../mod/editwebpage.php:99 +#: ../../mod/editpost.php:78 msgid "Attach file" msgstr "" @@ -2507,8 +2507,8 @@ msgid "attach file" msgstr "" #: ../../include/conversation.php:1025 ../../mod/message.php:296 -#: ../../mod/message.php:428 ../../mod/editwebpage.php:71 -#: ../../mod/editpost.php:69 +#: ../../mod/message.php:428 ../../mod/editwebpage.php:100 +#: ../../mod/editpost.php:79 msgid "Insert web link" msgstr "" @@ -2532,8 +2532,8 @@ msgstr "" msgid "audio link" msgstr "" -#: ../../include/conversation.php:1031 ../../mod/editwebpage.php:75 -#: ../../mod/editpost.php:73 +#: ../../include/conversation.php:1031 ../../mod/editwebpage.php:104 +#: ../../mod/editpost.php:83 msgid "Set your location" msgstr "" @@ -2541,8 +2541,8 @@ msgstr "" msgid "set location" msgstr "" -#: ../../include/conversation.php:1033 ../../mod/editwebpage.php:76 -#: ../../mod/editpost.php:74 +#: ../../include/conversation.php:1033 ../../mod/editwebpage.php:105 +#: ../../mod/editpost.php:84 msgid "Clear browser location" msgstr "" @@ -2550,18 +2550,18 @@ msgstr "" msgid "clear location" msgstr "" -#: ../../include/conversation.php:1036 ../../mod/editwebpage.php:89 -#: ../../mod/editpost.php:87 +#: ../../include/conversation.php:1036 ../../mod/editwebpage.php:118 +#: ../../mod/editpost.php:97 msgid "Set title" msgstr "" -#: ../../include/conversation.php:1039 ../../mod/editwebpage.php:91 -#: ../../mod/editpost.php:89 +#: ../../include/conversation.php:1039 ../../mod/editwebpage.php:120 +#: ../../mod/editpost.php:99 msgid "Categories (comma-separated list)" msgstr "" -#: ../../include/conversation.php:1041 ../../mod/editwebpage.php:78 -#: ../../mod/editpost.php:76 +#: ../../include/conversation.php:1041 ../../mod/editwebpage.php:107 +#: ../../mod/editpost.php:86 msgid "Permission settings" msgstr "" @@ -2569,13 +2569,13 @@ msgstr "" msgid "permissions" msgstr "" -#: ../../include/conversation.php:1050 ../../mod/editwebpage.php:86 -#: ../../mod/editpost.php:84 +#: ../../include/conversation.php:1050 ../../mod/editwebpage.php:115 +#: ../../mod/editpost.php:94 msgid "Public post" msgstr "" -#: ../../include/conversation.php:1052 ../../mod/editwebpage.php:92 -#: ../../mod/editpost.php:90 +#: ../../include/conversation.php:1052 ../../mod/editwebpage.php:121 +#: ../../mod/editpost.php:100 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -2584,47 +2584,47 @@ msgstr "" msgid "Permission denied" msgstr "" -#: ../../include/items.php:2575 +#: ../../include/items.php:2633 #, php-format msgid "%s's birthday" msgstr "" -#: ../../include/items.php:2576 +#: ../../include/items.php:2634 #, php-format msgid "Happy Birthday %s" msgstr "" -#: ../../include/items.php:4037 +#: ../../include/items.php:4095 msgid "[Name Withheld]" msgstr "" -#: ../../include/items.php:4045 +#: ../../include/items.php:4103 msgid "A new person is sharing with you at " msgstr "" -#: ../../include/items.php:4045 +#: ../../include/items.php:4103 msgid "You have a new follower at " msgstr "" -#: ../../include/items.php:4471 ../../mod/page.php:62 ../../mod/viewsrc.php:18 +#: ../../include/items.php:4529 ../../mod/page.php:62 ../../mod/viewsrc.php:18 #: ../../mod/home.php:64 ../../mod/admin.php:142 ../../mod/admin.php:667 #: ../../mod/admin.php:866 ../../mod/display.php:33 msgid "Item not found." msgstr "" -#: ../../include/items.php:4643 +#: ../../include/items.php:4701 msgid "Archives" msgstr "" -#: ../../include/items.php:4791 ../../mod/group.php:43 ../../mod/group.php:141 +#: ../../include/items.php:4862 ../../mod/group.php:43 ../../mod/group.php:141 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4801 +#: ../../include/items.php:4872 msgid "Collection has no members." msgstr "" -#: ../../include/items.php:4817 +#: ../../include/items.php:4888 msgid "Connection not found." msgstr "" @@ -2644,68 +2644,68 @@ msgstr "" msgid "Event title and start time are required." msgstr "" -#: ../../mod/events.php:279 +#: ../../mod/events.php:281 msgid "l, F j" msgstr "" -#: ../../mod/events.php:301 +#: ../../mod/events.php:303 msgid "Edit event" msgstr "" -#: ../../mod/events.php:347 +#: ../../mod/events.php:349 msgid "Create New Event" msgstr "" -#: ../../mod/events.php:348 +#: ../../mod/events.php:350 msgid "Previous" msgstr "" -#: ../../mod/events.php:349 ../../mod/setup.php:237 +#: ../../mod/events.php:351 ../../mod/setup.php:237 msgid "Next" msgstr "" -#: ../../mod/events.php:423 +#: ../../mod/events.php:425 msgid "hour:minute" msgstr "" -#: ../../mod/events.php:433 +#: ../../mod/events.php:435 msgid "Event details" msgstr "" -#: ../../mod/events.php:434 +#: ../../mod/events.php:436 #, php-format msgid "Format is %s %s. Starting date and Title are required." msgstr "" -#: ../../mod/events.php:436 +#: ../../mod/events.php:438 msgid "Event Starts:" msgstr "" -#: ../../mod/events.php:436 ../../mod/events.php:450 +#: ../../mod/events.php:438 ../../mod/events.php:452 msgid "Required" msgstr "" -#: ../../mod/events.php:439 +#: ../../mod/events.php:441 msgid "Finish date/time is not known or not relevant" msgstr "" -#: ../../mod/events.php:441 +#: ../../mod/events.php:443 msgid "Event Finishes:" msgstr "" -#: ../../mod/events.php:444 +#: ../../mod/events.php:446 msgid "Adjust for viewer timezone" msgstr "" -#: ../../mod/events.php:446 +#: ../../mod/events.php:448 msgid "Description:" msgstr "" -#: ../../mod/events.php:450 +#: ../../mod/events.php:452 msgid "Title:" msgstr "" -#: ../../mod/events.php:452 +#: ../../mod/events.php:454 msgid "Share this event" msgstr "" @@ -2856,6 +2856,15 @@ msgstr "" msgid "No friends to display." msgstr "" +#: ../../mod/webpages.php:8 ../../mod/profile.php:8 ../../mod/channel.php:8 +#: ../../boot.php:1524 +msgid "Requested profile is not available." +msgstr "" + +#: ../../mod/webpages.php:71 +msgid "View" +msgstr "" + #: ../../mod/api.php:76 ../../mod/api.php:102 msgid "Authorize application connection" msgstr "" @@ -2874,29 +2883,20 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/settings.php:963 ../../mod/settings.php:968 -#: ../../mod/settings.php:991 ../../mod/settings.php:993 -#: ../../mod/settings.php:994 ../../mod/settings.php:995 +#: ../../mod/api.php:105 ../../mod/settings.php:965 ../../mod/settings.php:970 +#: ../../mod/settings.php:993 ../../mod/settings.php:995 +#: ../../mod/settings.php:996 ../../mod/settings.php:997 #: ../../mod/profiles.php:506 msgid "Yes" msgstr "" -#: ../../mod/api.php:106 ../../mod/settings.php:963 ../../mod/settings.php:968 -#: ../../mod/settings.php:991 ../../mod/settings.php:993 -#: ../../mod/settings.php:994 ../../mod/settings.php:995 +#: ../../mod/api.php:106 ../../mod/settings.php:965 ../../mod/settings.php:970 +#: ../../mod/settings.php:993 ../../mod/settings.php:995 +#: ../../mod/settings.php:996 ../../mod/settings.php:997 #: ../../mod/profiles.php:507 msgid "No" msgstr "" -#: ../../mod/webpages.php:8 ../../mod/profile.php:8 ../../mod/channel.php:8 -#: ../../boot.php:1524 -msgid "Requested profile is not available." -msgstr "" - -#: ../../mod/webpages.php:69 -msgid "View" -msgstr "" - #: ../../mod/apps.php:8 msgid "No installed applications." msgstr "" @@ -3308,7 +3308,7 @@ msgstr "" msgid "Missing some important data!" msgstr "" -#: ../../mod/settings.php:148 ../../mod/settings.php:632 +#: ../../mod/settings.php:148 ../../mod/settings.php:634 msgid "Update" msgstr "" @@ -3340,355 +3340,355 @@ msgstr "" msgid "System failure storing new email. Please try again." msgstr "" -#: ../../mod/settings.php:534 +#: ../../mod/settings.php:536 msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:605 ../../mod/settings.php:631 -#: ../../mod/settings.php:667 +#: ../../mod/settings.php:607 ../../mod/settings.php:633 +#: ../../mod/settings.php:669 msgid "Add application" msgstr "" -#: ../../mod/settings.php:607 ../../mod/settings.php:633 +#: ../../mod/settings.php:609 ../../mod/settings.php:635 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/fbrowser.php:81 #: ../../mod/fbrowser.php:116 msgid "Cancel" msgstr "" -#: ../../mod/settings.php:608 ../../mod/settings.php:634 +#: ../../mod/settings.php:610 ../../mod/settings.php:636 #: ../../mod/admin.php:626 ../../mod/crepair.php:148 msgid "Name" msgstr "" -#: ../../mod/settings.php:609 ../../mod/settings.php:635 +#: ../../mod/settings.php:611 ../../mod/settings.php:637 msgid "Consumer Key" msgstr "" -#: ../../mod/settings.php:610 ../../mod/settings.php:636 +#: ../../mod/settings.php:612 ../../mod/settings.php:638 msgid "Consumer Secret" msgstr "" -#: ../../mod/settings.php:611 ../../mod/settings.php:637 +#: ../../mod/settings.php:613 ../../mod/settings.php:639 msgid "Redirect" msgstr "" -#: ../../mod/settings.php:612 ../../mod/settings.php:638 +#: ../../mod/settings.php:614 ../../mod/settings.php:640 msgid "Icon url" msgstr "" -#: ../../mod/settings.php:623 +#: ../../mod/settings.php:625 msgid "You can't edit this application." msgstr "" -#: ../../mod/settings.php:666 +#: ../../mod/settings.php:668 msgid "Connected Apps" msgstr "" -#: ../../mod/settings.php:670 +#: ../../mod/settings.php:672 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:671 +#: ../../mod/settings.php:673 msgid "No name" msgstr "" -#: ../../mod/settings.php:672 +#: ../../mod/settings.php:674 msgid "Remove authorization" msgstr "" -#: ../../mod/settings.php:683 +#: ../../mod/settings.php:685 msgid "No feature settings configured" msgstr "" -#: ../../mod/settings.php:691 +#: ../../mod/settings.php:693 msgid "Feature Settings" msgstr "" -#: ../../mod/settings.php:714 +#: ../../mod/settings.php:716 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:715 +#: ../../mod/settings.php:717 msgid "Password Settings" msgstr "" -#: ../../mod/settings.php:716 +#: ../../mod/settings.php:718 msgid "New Password:" msgstr "" -#: ../../mod/settings.php:717 +#: ../../mod/settings.php:719 msgid "Confirm:" msgstr "" -#: ../../mod/settings.php:717 +#: ../../mod/settings.php:719 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:719 ../../mod/settings.php:1017 +#: ../../mod/settings.php:721 ../../mod/settings.php:1019 msgid "Email Address:" msgstr "" -#: ../../mod/settings.php:720 +#: ../../mod/settings.php:722 msgid "Remove Account" msgstr "" -#: ../../mod/settings.php:721 +#: ../../mod/settings.php:723 msgid "Warning: This action is permanent and cannot be reversed." msgstr "" -#: ../../mod/settings.php:737 +#: ../../mod/settings.php:739 msgid "Off" msgstr "" -#: ../../mod/settings.php:737 +#: ../../mod/settings.php:739 msgid "On" msgstr "" -#: ../../mod/settings.php:744 +#: ../../mod/settings.php:746 msgid "Additional Features" msgstr "" -#: ../../mod/settings.php:769 +#: ../../mod/settings.php:771 msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:799 ../../mod/admin.php:359 +#: ../../mod/settings.php:801 ../../mod/admin.php:359 msgid "No special theme for mobile devices" msgstr "" -#: ../../mod/settings.php:839 +#: ../../mod/settings.php:841 msgid "Display Settings" msgstr "" -#: ../../mod/settings.php:845 +#: ../../mod/settings.php:847 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:846 +#: ../../mod/settings.php:848 msgid "Mobile Theme:" msgstr "" -#: ../../mod/settings.php:847 +#: ../../mod/settings.php:849 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:847 +#: ../../mod/settings.php:849 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:848 +#: ../../mod/settings.php:850 msgid "Maximum number of conversations to load at any time:" msgstr "" -#: ../../mod/settings.php:848 +#: ../../mod/settings.php:850 msgid "Maximum of 100 items" msgstr "" -#: ../../mod/settings.php:849 +#: ../../mod/settings.php:851 msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:885 +#: ../../mod/settings.php:887 msgid "Nobody except yourself" msgstr "" -#: ../../mod/settings.php:886 +#: ../../mod/settings.php:888 msgid "Only those you specifically allow" msgstr "" -#: ../../mod/settings.php:887 +#: ../../mod/settings.php:889 msgid "Anybody in your address book" msgstr "" -#: ../../mod/settings.php:888 +#: ../../mod/settings.php:890 msgid "Anybody on this website" msgstr "" -#: ../../mod/settings.php:889 +#: ../../mod/settings.php:891 msgid "Anybody in this network" msgstr "" -#: ../../mod/settings.php:890 +#: ../../mod/settings.php:892 msgid "Anybody on the internet" msgstr "" -#: ../../mod/settings.php:963 +#: ../../mod/settings.php:965 msgid "Publish your default profile in the network directory" msgstr "" -#: ../../mod/settings.php:968 +#: ../../mod/settings.php:970 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:972 ../../mod/profile_photo.php:276 +#: ../../mod/settings.php:974 ../../mod/profile_photo.php:276 msgid "or" msgstr "" -#: ../../mod/settings.php:977 +#: ../../mod/settings.php:979 msgid "Your channel address is" msgstr "" -#: ../../mod/settings.php:988 +#: ../../mod/settings.php:990 msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/settings.php:988 +#: ../../mod/settings.php:990 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/settings.php:989 +#: ../../mod/settings.php:991 msgid "Advanced expiration settings" msgstr "" -#: ../../mod/settings.php:990 +#: ../../mod/settings.php:992 msgid "Advanced Expiration" msgstr "" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:993 msgid "Expire posts:" msgstr "" -#: ../../mod/settings.php:993 +#: ../../mod/settings.php:995 msgid "Expire starred posts:" msgstr "" -#: ../../mod/settings.php:994 +#: ../../mod/settings.php:996 msgid "Expire photos:" msgstr "" -#: ../../mod/settings.php:995 +#: ../../mod/settings.php:997 msgid "Only expire posts by others:" msgstr "" -#: ../../mod/settings.php:1006 +#: ../../mod/settings.php:1008 msgid "Channel Settings" msgstr "" -#: ../../mod/settings.php:1015 +#: ../../mod/settings.php:1017 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:1018 +#: ../../mod/settings.php:1020 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:1019 +#: ../../mod/settings.php:1021 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:1020 +#: ../../mod/settings.php:1022 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:1023 +#: ../../mod/settings.php:1025 msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/settings.php:1025 +#: ../../mod/settings.php:1027 msgid "Quick Privacy Settings:" msgstr "" -#: ../../mod/settings.php:1026 +#: ../../mod/settings.php:1028 msgid "Very Public - extremely permissive" msgstr "" -#: ../../mod/settings.php:1027 +#: ../../mod/settings.php:1029 msgid "Typical - default public, privacy when desired" msgstr "" -#: ../../mod/settings.php:1028 +#: ../../mod/settings.php:1030 msgid "Private - default private, rarely open or public" msgstr "" -#: ../../mod/settings.php:1029 +#: ../../mod/settings.php:1031 msgid "Blocked - default blocked to/from everybody" msgstr "" -#: ../../mod/settings.php:1032 +#: ../../mod/settings.php:1034 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:1032 +#: ../../mod/settings.php:1034 msgid "May reduce spam activity" msgstr "" -#: ../../mod/settings.php:1033 +#: ../../mod/settings.php:1035 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:1034 +#: ../../mod/settings.php:1036 msgid "(click to open/close)" msgstr "" -#: ../../mod/settings.php:1047 +#: ../../mod/settings.php:1049 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:1047 +#: ../../mod/settings.php:1049 msgid "Useful to reduce spamming" msgstr "" -#: ../../mod/settings.php:1050 +#: ../../mod/settings.php:1052 msgid "Notification Settings" msgstr "" -#: ../../mod/settings.php:1051 +#: ../../mod/settings.php:1053 msgid "By default post a status message when:" msgstr "" -#: ../../mod/settings.php:1052 +#: ../../mod/settings.php:1054 msgid "accepting a friend request" msgstr "" -#: ../../mod/settings.php:1053 +#: ../../mod/settings.php:1055 msgid "joining a forum/community" msgstr "" -#: ../../mod/settings.php:1054 +#: ../../mod/settings.php:1056 msgid "making an interesting profile change" msgstr "" -#: ../../mod/settings.php:1055 +#: ../../mod/settings.php:1057 msgid "Send a notification email when:" msgstr "" -#: ../../mod/settings.php:1056 +#: ../../mod/settings.php:1058 msgid "You receive an introduction" msgstr "" -#: ../../mod/settings.php:1057 +#: ../../mod/settings.php:1059 msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/settings.php:1058 +#: ../../mod/settings.php:1060 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:1059 +#: ../../mod/settings.php:1061 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:1060 +#: ../../mod/settings.php:1062 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:1061 +#: ../../mod/settings.php:1063 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:1062 +#: ../../mod/settings.php:1064 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:1063 +#: ../../mod/settings.php:1065 msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/settings.php:1066 +#: ../../mod/settings.php:1068 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../mod/settings.php:1067 +#: ../../mod/settings.php:1069 msgid "Change the behaviour of this account for special situations" msgstr "" @@ -4113,15 +4113,15 @@ msgstr "" msgid "Unable to locate original post." msgstr "" -#: ../../mod/item.php:284 +#: ../../mod/item.php:289 msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:715 +#: ../../mod/item.php:751 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:992 ../../mod/wall_upload.php:41 +#: ../../mod/item.php:1028 ../../mod/wall_upload.php:41 msgid "Wall Photos" msgstr "" @@ -4153,7 +4153,7 @@ msgstr "" msgid "Posts that mention or involve you" msgstr "" -#: ../../mod/network.php:315 ../../mod/connections.php:512 +#: ../../mod/network.php:315 ../../mod/connections.php:511 msgid "New" msgstr "" @@ -4181,11 +4181,11 @@ msgstr "" msgid "Refresh" msgstr "" -#: ../../mod/network.php:379 ../../mod/connections.php:365 +#: ../../mod/network.php:379 ../../mod/connections.php:364 msgid "Me" msgstr "" -#: ../../mod/network.php:380 ../../mod/connections.php:367 +#: ../../mod/network.php:380 ../../mod/connections.php:366 msgid "Best Friends" msgstr "" @@ -4193,11 +4193,11 @@ msgstr "" msgid "Co-workers" msgstr "" -#: ../../mod/network.php:383 ../../mod/connections.php:369 +#: ../../mod/network.php:383 ../../mod/connections.php:368 msgid "Former Friends" msgstr "" -#: ../../mod/network.php:384 ../../mod/connections.php:370 +#: ../../mod/network.php:384 ../../mod/connections.php:369 msgid "Acquaintances" msgstr "" @@ -4623,12 +4623,12 @@ msgid "Deny" msgstr "" #: ../../mod/admin.php:631 ../../mod/intro.php:14 ../../mod/intro.php:99 -#: ../../mod/connections.php:309 ../../mod/connections.php:450 +#: ../../mod/connections.php:308 ../../mod/connections.php:449 msgid "Block" msgstr "" -#: ../../mod/admin.php:632 ../../mod/connections.php:309 -#: ../../mod/connections.php:450 +#: ../../mod/admin.php:632 ../../mod/connections.php:308 +#: ../../mod/connections.php:449 msgid "Unblock" msgstr "" @@ -4728,7 +4728,7 @@ msgid "Log level" msgstr "" #: ../../mod/intro.php:17 ../../mod/intro.php:100 -#: ../../mod/connections.php:316 ../../mod/connections.php:451 +#: ../../mod/connections.php:315 ../../mod/connections.php:450 #: ../../mod/notifications.php:51 ../../mod/notifications.php:162 #: ../../mod/notifications.php:208 msgid "Ignore" @@ -4754,7 +4754,7 @@ msgstr "" msgid "System error. Please try again later." msgstr "" -#: ../../mod/intro.php:95 ../../mod/connections.php:456 +#: ../../mod/intro.php:95 ../../mod/connections.php:455 #: ../../mod/notifications.php:155 ../../mod/notifications.php:202 msgid "Hide this contact from others" msgstr "" @@ -4786,296 +4786,296 @@ msgstr "" msgid "Failed to update connection record." msgstr "" -#: ../../mod/connections.php:187 +#: ../../mod/connections.php:186 msgid "Could not access address book record." msgstr "" -#: ../../mod/connections.php:201 +#: ../../mod/connections.php:200 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../mod/connections.php:208 +#: ../../mod/connections.php:207 msgid "Channel has been unblocked" msgstr "" -#: ../../mod/connections.php:209 +#: ../../mod/connections.php:208 msgid "Channel has been blocked" msgstr "" -#: ../../mod/connections.php:213 ../../mod/connections.php:225 -#: ../../mod/connections.php:237 ../../mod/connections.php:249 -#: ../../mod/connections.php:264 +#: ../../mod/connections.php:212 ../../mod/connections.php:224 +#: ../../mod/connections.php:236 ../../mod/connections.php:248 +#: ../../mod/connections.php:263 msgid "Unable to set address book parameters." msgstr "" -#: ../../mod/connections.php:220 +#: ../../mod/connections.php:219 msgid "Channel has been unignored" msgstr "" -#: ../../mod/connections.php:221 +#: ../../mod/connections.php:220 msgid "Channel has been ignored" msgstr "" -#: ../../mod/connections.php:232 +#: ../../mod/connections.php:231 msgid "Channel has been unarchived" msgstr "" -#: ../../mod/connections.php:233 +#: ../../mod/connections.php:232 msgid "Channel has been archived" msgstr "" -#: ../../mod/connections.php:244 +#: ../../mod/connections.php:243 msgid "Channel has been unhidden" msgstr "" -#: ../../mod/connections.php:245 +#: ../../mod/connections.php:244 msgid "Channel has been hidden" msgstr "" -#: ../../mod/connections.php:259 +#: ../../mod/connections.php:258 msgid "Channel has been approved" msgstr "" -#: ../../mod/connections.php:260 +#: ../../mod/connections.php:259 msgid "Channel has been unapproved" msgstr "" -#: ../../mod/connections.php:278 +#: ../../mod/connections.php:277 msgid "Contact has been removed." msgstr "" -#: ../../mod/connections.php:298 +#: ../../mod/connections.php:297 #, php-format msgid "View %s's profile" msgstr "" -#: ../../mod/connections.php:302 +#: ../../mod/connections.php:301 msgid "Refresh Permissions" msgstr "" -#: ../../mod/connections.php:305 +#: ../../mod/connections.php:304 msgid "Fetch updated permissions" msgstr "" -#: ../../mod/connections.php:312 +#: ../../mod/connections.php:311 msgid "Block or Unblock this connection" msgstr "" -#: ../../mod/connections.php:316 ../../mod/connections.php:451 +#: ../../mod/connections.php:315 ../../mod/connections.php:450 msgid "Unignore" msgstr "" -#: ../../mod/connections.php:319 +#: ../../mod/connections.php:318 msgid "Ignore or Unignore this connection" msgstr "" -#: ../../mod/connections.php:322 +#: ../../mod/connections.php:321 msgid "Unarchive" msgstr "" -#: ../../mod/connections.php:322 +#: ../../mod/connections.php:321 msgid "Archive" msgstr "" -#: ../../mod/connections.php:325 +#: ../../mod/connections.php:324 msgid "Archive or Unarchive this connection" msgstr "" -#: ../../mod/connections.php:328 +#: ../../mod/connections.php:327 msgid "Unhide" msgstr "" -#: ../../mod/connections.php:328 +#: ../../mod/connections.php:327 msgid "Hide" msgstr "" -#: ../../mod/connections.php:331 +#: ../../mod/connections.php:330 msgid "Hide or Unhide this connection" msgstr "" -#: ../../mod/connections.php:338 +#: ../../mod/connections.php:337 msgid "Delete this connection" msgstr "" -#: ../../mod/connections.php:371 +#: ../../mod/connections.php:370 msgid "Unknown" msgstr "" -#: ../../mod/connections.php:381 ../../mod/connections.php:409 +#: ../../mod/connections.php:380 ../../mod/connections.php:408 msgid "Approve this connection" msgstr "" -#: ../../mod/connections.php:381 +#: ../../mod/connections.php:380 msgid "Accept connection to allow communication" msgstr "" -#: ../../mod/connections.php:397 +#: ../../mod/connections.php:396 msgid "Automatic Permissions Settings" msgstr "" -#: ../../mod/connections.php:397 +#: ../../mod/connections.php:396 #, php-format msgid "Connections: settings for %s" msgstr "" -#: ../../mod/connections.php:401 +#: ../../mod/connections.php:400 msgid "" "When receiving a channel introduction, any permissions provided here will be " "applied to the new connection automatically and the introduction approved. " "Leave this page if you do not wish to use this feature." msgstr "" -#: ../../mod/connections.php:403 +#: ../../mod/connections.php:402 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../mod/connections.php:410 +#: ../../mod/connections.php:409 msgid "Connection has no individual permissions!" msgstr "" -#: ../../mod/connections.php:411 +#: ../../mod/connections.php:410 msgid "" "This may be appropriate based on your privacy settings, though you may wish to review the \"Advanced Permissions\"" msgstr "" -#: ../../mod/connections.php:413 +#: ../../mod/connections.php:412 msgid "Profile Visibility" msgstr "" -#: ../../mod/connections.php:414 +#: ../../mod/connections.php:413 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/connections.php:415 +#: ../../mod/connections.php:414 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/connections.php:416 +#: ../../mod/connections.php:415 msgid "Edit contact notes" msgstr "" -#: ../../mod/connections.php:418 +#: ../../mod/connections.php:417 msgid "Their Settings" msgstr "" -#: ../../mod/connections.php:419 +#: ../../mod/connections.php:418 msgid "My Settings" msgstr "" -#: ../../mod/connections.php:421 +#: ../../mod/connections.php:420 msgid "Forum Members" msgstr "" -#: ../../mod/connections.php:422 +#: ../../mod/connections.php:421 msgid "Soapbox" msgstr "" -#: ../../mod/connections.php:423 +#: ../../mod/connections.php:422 msgid "Full Sharing" msgstr "" -#: ../../mod/connections.php:424 +#: ../../mod/connections.php:423 msgid "Cautious Sharing" msgstr "" -#: ../../mod/connections.php:425 +#: ../../mod/connections.php:424 msgid "Follow Only" msgstr "" -#: ../../mod/connections.php:426 +#: ../../mod/connections.php:425 msgid "Individual Permissions" msgstr "" -#: ../../mod/connections.php:427 +#: ../../mod/connections.php:426 msgid "" "Individual permissions are only enabled for privacy " "settings which are set to \"Only those you specifically allow\". " "Otherwise they are controlled by your privacy settings." msgstr "" -#: ../../mod/connections.php:428 +#: ../../mod/connections.php:427 msgid "Advanced Permissions" msgstr "" -#: ../../mod/connections.php:429 +#: ../../mod/connections.php:428 msgid "Quick Links" msgstr "" -#: ../../mod/connections.php:433 +#: ../../mod/connections.php:432 #, php-format msgid "Visit %s's profile - %s" msgstr "" -#: ../../mod/connections.php:434 +#: ../../mod/connections.php:433 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/connections.php:435 +#: ../../mod/connections.php:434 msgid "Ignore contact" msgstr "" -#: ../../mod/connections.php:436 +#: ../../mod/connections.php:435 msgid "Repair URL settings" msgstr "" -#: ../../mod/connections.php:437 +#: ../../mod/connections.php:436 msgid "View conversations" msgstr "" -#: ../../mod/connections.php:439 +#: ../../mod/connections.php:438 msgid "Delete contact" msgstr "" -#: ../../mod/connections.php:442 +#: ../../mod/connections.php:441 msgid "Last update:" msgstr "" -#: ../../mod/connections.php:444 +#: ../../mod/connections.php:443 msgid "Update public posts" msgstr "" -#: ../../mod/connections.php:446 +#: ../../mod/connections.php:445 msgid "Update now" msgstr "" -#: ../../mod/connections.php:452 +#: ../../mod/connections.php:451 msgid "Currently blocked" msgstr "" -#: ../../mod/connections.php:453 +#: ../../mod/connections.php:452 msgid "Currently ignored" msgstr "" -#: ../../mod/connections.php:454 +#: ../../mod/connections.php:453 msgid "Currently archived" msgstr "" -#: ../../mod/connections.php:455 +#: ../../mod/connections.php:454 msgid "Currently pending" msgstr "" -#: ../../mod/connections.php:456 +#: ../../mod/connections.php:455 msgid "" "Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/connections.php:492 ../../mod/connections.php:563 +#: ../../mod/connections.php:491 ../../mod/connections.php:563 msgid "Blocked" msgstr "" -#: ../../mod/connections.php:497 ../../mod/connections.php:570 +#: ../../mod/connections.php:496 ../../mod/connections.php:570 msgid "Ignored" msgstr "" -#: ../../mod/connections.php:502 ../../mod/connections.php:584 +#: ../../mod/connections.php:501 ../../mod/connections.php:584 msgid "Hidden" msgstr "" -#: ../../mod/connections.php:507 ../../mod/connections.php:577 +#: ../../mod/connections.php:506 ../../mod/connections.php:577 msgid "Archived" msgstr "" @@ -5807,23 +5807,23 @@ msgstr "" msgid "Image size reduction [%s] failed." msgstr "" -#: ../../mod/editwebpage.php:19 ../../mod/editpost.php:17 +#: ../../mod/editwebpage.php:30 ../../mod/editpost.php:18 msgid "Item not found" msgstr "" -#: ../../mod/editwebpage.php:39 ../../mod/editpost.php:37 +#: ../../mod/editwebpage.php:63 ../../mod/editpost.php:38 msgid "Edit post" msgstr "" -#: ../../mod/editwebpage.php:72 ../../mod/editpost.php:70 +#: ../../mod/editwebpage.php:101 ../../mod/editpost.php:80 msgid "Insert YouTube video" msgstr "" -#: ../../mod/editwebpage.php:73 ../../mod/editpost.php:71 +#: ../../mod/editwebpage.php:102 ../../mod/editpost.php:81 msgid "Insert Vorbis [.ogg] video" msgstr "" -#: ../../mod/editwebpage.php:74 ../../mod/editpost.php:72 +#: ../../mod/editwebpage.php:103 ../../mod/editpost.php:82 msgid "Insert Vorbis [.ogg] audio" msgstr "" @@ -5965,7 +5965,7 @@ msgstr "" msgid "Post successful." msgstr "" -#: ../../mod/editpost.php:28 +#: ../../mod/editpost.php:29 msgid "Item is not editable" msgstr "" @@ -6175,11 +6175,11 @@ msgstr "" msgid "Please enter your password for verification:" msgstr "" -#: ../../mod/mood.php:130 +#: ../../mod/mood.php:131 msgid "Mood" msgstr "" -#: ../../mod/mood.php:131 +#: ../../mod/mood.php:132 msgid "Set your current mood and tell your friends" msgstr "" diff --git a/version.inc b/version.inc index 2ed006fbc..867675f81 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-08-01.392 +2013-08-02.393 -- cgit v1.2.3