From e6364f6680e2abcffd3311ba189f17ceef08b9f5 Mon Sep 17 00:00:00 2001 From: Beanow Date: Sat, 28 Jun 2014 01:30:10 +0200 Subject: [PATCH 001/163] Redirect profiles list to default profile, when multi_profiles is disabled. --- mod/profiles.php | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/mod/profiles.php b/mod/profiles.php index e57a0fa84..c47d9ad51 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -726,12 +726,26 @@ function profiles_content(&$a) { return $o; } + + //Profiles list. else { - + + //If we don't support multi profiles, don't display this list. + if(!feature_enabled(local_user(),'multi_profiles')){ + $r = q( + "SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1", + local_user() + ); + if(count($r)){ + //Go to the default profile. + goaway($a->get_baseurl(true) . '/profiles/'.$r[0]['id']); + } + } + $r = q("SELECT * FROM `profile` WHERE `uid` = %d", local_user()); if(count($r)) { - + $tpl_header = get_markup_template('profile_listing_header.tpl'); $o .= replace_macros($tpl_header,array( '$header' => t('Edit/Manage Profiles'), @@ -739,10 +753,10 @@ function profiles_content(&$a) { '$cr_new' => t('Create New Profile'), '$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new") )); - - + + $tpl = get_markup_template('profile_entry.tpl'); - + foreach($r as $rr) { $o .= replace_macros($tpl, array( '$photo' => $a->get_cached_avatar_image($rr['thumb']), From 6089bc94b3a89b8459f5031d49b8975729064524 Mon Sep 17 00:00:00 2001 From: Beanow Date: Sat, 28 Jun 2014 01:31:11 +0200 Subject: [PATCH 002/163] Extend profile editor information. * Labels for splitting fields into sections. * Security token for profile_photo action. --- mod/profiles.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/mod/profiles.php b/mod/profiles.php index c47d9ad51..7903b8b60 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -137,6 +137,8 @@ function profiles_init(&$a) { profile_load($a,$a->user['nickname'],$r[0]['id']); } + + } @@ -636,6 +638,7 @@ function profiles_content(&$a) { $o .= replace_macros($tpl,array( '$multi_profiles' => feature_enabled(local_user(),'multi_profiles'), '$form_security_token' => get_form_security_token("profile_edit"), + '$form_security_token_photo' => get_form_security_token("profile_photo"), '$profile_clone_link' => 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone"), '$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"), '$banner' => t('Edit Profile Details'), @@ -645,6 +648,15 @@ function profiles_content(&$a) { '$cr_prof' => t('Create a new profile using these settings'), '$cl_prof' => t('Clone this profile'), '$del_prof' => t('Delete this profile'), + '$lbl_basic_section' => t('Edit basic information'), + '$lbl_picture_section' => t('Edit profile picture'), + '$lbl_location_section' => t('Edit location'), + '$lbl_contacting_section' => t('Edit contacting information'), + '$lbl_status_section' => t('Edit status information'), + '$lbl_about_section' => t('Edit additional information'), + '$lbl_interests_section' => t('Edit interests'), + '$lbl_keywords_section' => t('Edit keywords'), + '$lbl_profile_photo' => t('Upload Profile Photo'), '$lbl_profname' => t('Profile Name:'), '$lbl_fullname' => t('Your Full Name:'), '$lbl_title' => t('Title/Description:'), From e9dc6e4faa8d69b0760317cdf601fe1c0220b3bb Mon Sep 17 00:00:00 2001 From: Beanow Date: Thu, 3 Jul 2014 18:39:22 +0200 Subject: [PATCH 003/163] Some changes to the labels and an edit profile button. --- include/profile_advanced.php | 9 ++++++--- mod/profiles.php | 15 +++++++-------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/profile_advanced.php b/include/profile_advanced.php index 8dfb1beec..05fd56d02 100644 --- a/include/profile_advanced.php +++ b/include/profile_advanced.php @@ -79,10 +79,13 @@ function advanced_profile(&$a) { if($txt = prepare_text($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt); if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt ); - + + if ($a->profile['uid'] == local_user()) + $profile['edit'] = array($a->get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile')); + return replace_macros($tpl, array( - '$title' => t('Profile'), - '$profile' => $profile, + '$title' => t('Profile'), + '$profile' => $profile )); } diff --git a/mod/profiles.php b/mod/profiles.php index 7903b8b60..423804437 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -648,14 +648,13 @@ function profiles_content(&$a) { '$cr_prof' => t('Create a new profile using these settings'), '$cl_prof' => t('Clone this profile'), '$del_prof' => t('Delete this profile'), - '$lbl_basic_section' => t('Edit basic information'), - '$lbl_picture_section' => t('Edit profile picture'), - '$lbl_location_section' => t('Edit location'), - '$lbl_contacting_section' => t('Edit contacting information'), - '$lbl_status_section' => t('Edit status information'), - '$lbl_about_section' => t('Edit additional information'), - '$lbl_interests_section' => t('Edit interests'), - '$lbl_keywords_section' => t('Edit keywords'), + '$lbl_basic_section' => t('Basic information'), + '$lbl_picture_section' => t('Profile picture'), + '$lbl_location_section' => t('Location'), + '$lbl_preferences_section' => t('Preferences'), + '$lbl_status_section' => t('Status information'), + '$lbl_about_section' => t('Additional information'), + '$lbl_interests_section' => t('Interests'), '$lbl_profile_photo' => t('Upload Profile Photo'), '$lbl_profname' => t('Profile Name:'), '$lbl_fullname' => t('Your Full Name:'), From 034912747333964061e2746e33166da42a66e83c Mon Sep 17 00:00:00 2001 From: hauke Date: Fri, 5 Sep 2014 23:57:17 +0200 Subject: [PATCH 004/163] bug fix #1097 --- util/vagrant_provision.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/util/vagrant_provision.sh b/util/vagrant_provision.sh index 476a1cd1c..448e80fed 100644 --- a/util/vagrant_provision.sh +++ b/util/vagrant_provision.sh @@ -15,6 +15,9 @@ if [ -f /vagrant/.htconfig.php ] rm /vagrant/.htconfig.php fi +#change ownership of dir where sessions are stored +chown -R www-data:www-data /var/lib/php5 + #create the friendica database echo "create database friendica" | mysql -u root -proot From 191595766d399cfd012a10ef6f14f97c8ab87d1d Mon Sep 17 00:00:00 2001 From: hauke Date: Sat, 6 Sep 2014 00:14:25 +0200 Subject: [PATCH 005/163] removed old comment that is no longer true --- view/ca/smarty3/cmnt_received_eml.tpl | 6 +----- view/ca/smarty3/follow_notify_eml.tpl | 6 +----- view/ca/smarty3/friend_complete_eml.tpl | 6 +----- view/ca/smarty3/htconfig.tpl | 6 +----- view/ca/smarty3/intro_complete_eml.tpl | 6 +----- view/ca/smarty3/lostpass_eml.tpl | 6 +----- view/ca/smarty3/mail_received_html_body_eml.tpl | 6 +----- view/ca/smarty3/mail_received_text_body_eml.tpl | 6 +----- view/ca/smarty3/passchanged_eml.tpl | 6 +----- view/ca/smarty3/register_open_eml.tpl | 6 +----- view/ca/smarty3/register_verify_eml.tpl | 6 +----- view/ca/smarty3/request_notify_eml.tpl | 6 +----- view/ca/smarty3/wall_received_eml.tpl | 6 +----- view/cs/smarty3/cmnt_received_eml.tpl | 6 +----- view/cs/smarty3/cmnt_received_html_body_eml.tpl | 6 +----- view/cs/smarty3/cmnt_received_text_body_eml.tpl | 6 +----- view/cs/smarty3/follow_notify_eml.tpl | 6 +----- view/cs/smarty3/friend_complete_eml.tpl | 6 +----- view/cs/smarty3/htconfig.tpl | 6 +----- view/cs/smarty3/intro_complete_eml.tpl | 6 +----- view/cs/smarty3/lostpass_eml.tpl | 6 +----- view/cs/smarty3/mail_received_html_body_eml.tpl | 6 +----- view/cs/smarty3/mail_received_text_body_eml.tpl | 6 +----- view/cs/smarty3/passchanged_eml.tpl | 6 +----- view/cs/smarty3/register_open_eml.tpl | 6 +----- view/cs/smarty3/register_verify_eml.tpl | 6 +----- view/cs/smarty3/request_notify_eml.tpl | 6 +----- view/cs/smarty3/wall_received_eml.tpl | 6 +----- view/cs/smarty3/wall_received_html_body_eml.tpl | 6 +----- view/cs/smarty3/wall_received_text_body_eml.tpl | 6 +----- view/de/smarty3/cmnt_received_eml.tpl | 6 +----- view/de/smarty3/cmnt_received_html_body_eml.tpl | 6 +----- view/de/smarty3/cmnt_received_text_body_eml.tpl | 8 ++------ view/de/smarty3/follow_notify_eml.tpl | 6 +----- view/de/smarty3/friend_complete_eml.tpl | 6 +----- view/de/smarty3/htconfig.tpl | 6 +----- view/de/smarty3/intro_complete_eml.tpl | 6 +----- view/de/smarty3/lostpass_eml.tpl | 6 +----- view/de/smarty3/mail_received_html_body_eml.tpl | 6 +----- view/de/smarty3/mail_received_text_body_eml.tpl | 8 ++------ view/de/smarty3/passchanged_eml.tpl | 6 +----- view/de/smarty3/register_open_eml.tpl | 6 +----- view/de/smarty3/register_verify_eml.tpl | 6 +----- view/de/smarty3/request_notify_eml.tpl | 6 +----- view/de/smarty3/update_fail_eml.tpl | 6 +----- view/de/smarty3/wall_received_eml.tpl | 6 +----- view/de/smarty3/wall_received_html_body_eml.tpl | 6 +----- view/de/smarty3/wall_received_text_body_eml.tpl | 6 +----- view/en/smarty3/follow_notify_eml.tpl | 6 +----- view/en/smarty3/friend_complete_eml.tpl | 6 +----- view/en/smarty3/htconfig.tpl | 6 +----- view/en/smarty3/intro_complete_eml.tpl | 6 +----- view/en/smarty3/lostpass_eml.tpl | 6 +----- view/en/smarty3/passchanged_eml.tpl | 6 +----- view/en/smarty3/register_open_eml.tpl | 6 +----- view/en/smarty3/register_verify_eml.tpl | 6 +----- view/en/smarty3/request_notify_eml.tpl | 6 +----- view/en/smarty3/update_fail_eml.tpl | 6 +----- view/eo/smarty3/follow_notify_eml.tpl | 6 +----- view/eo/smarty3/friend_complete_eml.tpl | 6 +----- view/eo/smarty3/intro_complete_eml.tpl | 6 +----- view/eo/smarty3/lostpass_eml.tpl | 6 +----- view/eo/smarty3/passchanged_eml.tpl | 6 +----- view/eo/smarty3/register_open_eml.tpl | 6 +----- view/eo/smarty3/register_verify_eml.tpl | 6 +----- view/eo/smarty3/request_notify_eml.tpl | 6 +----- view/eo/smarty3/update_fail_eml.tpl | 6 +----- view/es/smarty3/cmnt_received_eml.tpl | 6 +----- view/es/smarty3/follow_notify_eml.tpl | 6 +----- view/es/smarty3/friend_complete_eml.tpl | 6 +----- view/es/smarty3/htconfig.tpl | 6 +----- view/es/smarty3/intro_complete_eml.tpl | 6 +----- view/es/smarty3/lostpass_eml.tpl | 6 +----- view/es/smarty3/mail_received_html_body_eml.tpl | 6 +----- view/es/smarty3/mail_received_text_body_eml.tpl | 6 +----- view/es/smarty3/passchanged_eml.tpl | 6 +----- view/es/smarty3/register_open_eml.tpl | 6 +----- view/es/smarty3/register_verify_eml.tpl | 6 +----- view/es/smarty3/request_notify_eml.tpl | 6 +----- view/es/smarty3/wall_received_eml.tpl | 6 +----- view/fr/smarty3/cmnt_received_eml.tpl | 6 +----- view/fr/smarty3/cmnt_received_html_body_eml.tpl | 6 +----- view/fr/smarty3/cmnt_received_text_body_eml.tpl | 10 +++------- view/fr/smarty3/follow_notify_eml.tpl | 6 +----- view/fr/smarty3/friend_complete_eml.tpl | 6 +----- view/fr/smarty3/htconfig.tpl | 6 +----- view/fr/smarty3/intro_complete_eml.tpl | 6 +----- view/fr/smarty3/lostpass_eml.tpl | 6 +----- view/fr/smarty3/mail_received_html_body_eml.tpl | 6 +----- view/fr/smarty3/mail_received_text_body_eml.tpl | 10 +++------- view/fr/smarty3/passchanged_eml.tpl | 6 +----- view/fr/smarty3/register_open_eml.tpl | 6 +----- view/fr/smarty3/register_verify_eml.tpl | 6 +----- view/fr/smarty3/request_notify_eml.tpl | 6 +----- view/fr/smarty3/wall_received_eml.tpl | 6 +----- view/is/smarty3/follow_notify_eml.tpl | 6 +----- view/is/smarty3/friend_complete_eml.tpl | 6 +----- view/is/smarty3/intro_complete_eml.tpl | 6 +----- view/is/smarty3/lostpass_eml.tpl | 6 +----- view/is/smarty3/passchanged_eml.tpl | 6 +----- view/is/smarty3/register_open_eml.tpl | 6 +----- view/is/smarty3/register_verify_eml.tpl | 6 +----- view/is/smarty3/request_notify_eml.tpl | 6 +----- view/is/smarty3/update_fail_eml.tpl | 6 +----- view/it/smarty3/htconfig.tpl | 6 +----- view/nb-no/smarty3/follow_notify_eml.tpl | 6 +----- view/nb-no/smarty3/friend_complete_eml.tpl | 6 +----- view/nb-no/smarty3/intro_complete_eml.tpl | 6 +----- view/nb-no/smarty3/lostpass_eml.tpl | 6 +----- view/nb-no/smarty3/passchanged_eml.tpl | 6 +----- view/nb-no/smarty3/register_open_eml.tpl | 6 +----- view/nb-no/smarty3/register_verify_eml.tpl | 6 +----- view/nb-no/smarty3/request_notify_eml.tpl | 6 +----- view/nb-no/smarty3/update_fail_eml.tpl | 6 +----- view/pl/smarty3/follow_notify_eml.tpl | 6 +----- view/pl/smarty3/friend_complete_eml.tpl | 6 +----- view/pl/smarty3/intro_complete_eml.tpl | 6 +----- view/pl/smarty3/lostpass_eml.tpl | 6 +----- view/pl/smarty3/passchanged_eml.tpl | 6 +----- view/pl/smarty3/register_open_eml.tpl | 6 +----- view/pl/smarty3/register_verify_eml.tpl | 6 +----- view/pl/smarty3/request_notify_eml.tpl | 6 +----- view/pl/smarty3/update_fail_eml.tpl | 6 +----- view/pt-br/smarty3/intro_complete_eml.tpl | 6 +----- view/pt-br/smarty3/update_fail_eml.tpl | 6 +----- view/sv/smarty3/cmnt_received_eml.tpl | 6 +----- view/sv/smarty3/follow_notify_eml.tpl | 6 +----- view/sv/smarty3/friend_complete_eml.tpl | 6 +----- view/sv/smarty3/htconfig.tpl | 6 +----- view/sv/smarty3/intro_complete_eml.tpl | 6 +----- view/sv/smarty3/lostpass_eml.tpl | 6 +----- view/sv/smarty3/mail_received_html_body_eml.tpl | 6 +----- view/sv/smarty3/mail_received_text_body_eml.tpl | 6 +----- view/sv/smarty3/passchanged_eml.tpl | 6 +----- view/sv/smarty3/register_open_eml.tpl | 6 +----- view/sv/smarty3/register_verify_eml.tpl | 6 +----- view/sv/smarty3/request_notify_eml.tpl | 6 +----- view/sv/smarty3/wall_received_eml.tpl | 6 +----- view/templates/404.tpl | 5 ----- view/templates/admin_aside.tpl | 5 ----- view/templates/admin_logs.tpl | 5 ----- view/templates/admin_plugins.tpl | 6 +----- view/templates/admin_plugins_details.tpl | 6 +----- view/templates/admin_remoteupdate.tpl | 6 +----- view/templates/admin_summary.tpl | 6 +----- view/templates/admin_users.tpl | 6 +----- view/templates/album_edit.tpl | 6 +----- view/templates/api_config_xml.tpl | 6 +----- view/templates/api_friends_xml.tpl | 6 +----- view/templates/api_ratelimit_xml.tpl | 6 +----- view/templates/api_status_xml.tpl | 6 +----- view/templates/api_test_xml.tpl | 6 +----- view/templates/api_timeline_atom.tpl | 6 +----- view/templates/api_timeline_rss.tpl | 6 +----- view/templates/api_timeline_xml.tpl | 6 +----- view/templates/api_user_xml.tpl | 6 +----- view/templates/apps.tpl | 6 +----- view/templates/atom_feed.tpl | 6 +----- view/templates/atom_feed_dfrn.tpl | 6 +----- view/templates/atom_mail.tpl | 6 +----- view/templates/atom_relocate.tpl | 6 +----- view/templates/atom_suggest.tpl | 6 +----- view/templates/auto_request.tpl | 6 +----- view/templates/birthdays_reminder.tpl | 6 +----- view/templates/categories_widget.tpl | 6 +----- view/templates/comment_item.tpl | 6 +----- view/templates/common_friends.tpl | 6 +----- view/templates/common_tabs.tpl | 6 +----- view/templates/confirm.tpl | 6 +----- view/templates/contact_block.tpl | 6 +----- view/templates/contact_edit.tpl | 6 +----- view/templates/contact_end.tpl | 6 +----- view/templates/contact_head.tpl | 6 +----- view/templates/contacts-end.tpl | 6 +----- view/templates/contacts-head.tpl | 6 +----- view/templates/contacts-widget-sidebar.tpl | 6 +----- view/templates/content.tpl | 6 +----- view/templates/conversation.tpl | 6 +----- view/templates/cropend.tpl | 6 +----- view/templates/delegate.tpl | 6 +----- view/templates/dfrn_req_confirm.tpl | 6 +----- view/templates/dfrn_request.tpl | 6 +----- view/templates/diasp_dec_hdr.tpl | 6 +----- view/templates/diaspora_comment.tpl | 6 +----- view/templates/diaspora_comment_relay.tpl | 6 +----- view/templates/diaspora_conversation.tpl | 6 +----- view/templates/diaspora_like.tpl | 6 +----- view/templates/diaspora_like_relay.tpl | 6 +----- view/templates/diaspora_message.tpl | 6 +----- view/templates/diaspora_photo.tpl | 6 +----- view/templates/diaspora_post.tpl | 6 +----- view/templates/diaspora_profile.tpl | 6 +----- view/templates/diaspora_relay_retraction.tpl | 6 +----- view/templates/diaspora_relayable_retraction.tpl | 6 +----- view/templates/diaspora_reshare.tpl | 6 +----- view/templates/diaspora_retract.tpl | 6 +----- view/templates/diaspora_share.tpl | 6 +----- view/templates/diaspora_signed_retract.tpl | 6 +----- view/templates/diaspora_vcard.tpl | 6 +----- view/templates/directory_header.tpl | 6 +----- view/templates/directory_item.tpl | 6 +----- view/templates/display-head.tpl | 6 +----- view/templates/email_notify_html.tpl | 6 +----- view/templates/email_notify_text.tpl | 6 +----- view/templates/end.tpl | 6 +----- view/templates/event.tpl | 6 +----- view/templates/event_end.tpl | 6 +----- view/templates/event_form.tpl | 6 +----- view/templates/event_head.tpl | 6 +----- view/templates/events-js.tpl | 6 +----- view/templates/events.tpl | 6 +----- view/templates/events_reminder.tpl | 6 +----- view/templates/failed_updates.tpl | 6 +----- view/templates/fake_feed.tpl | 6 +----- view/templates/field.tpl | 6 +----- view/templates/field_checkbox.tpl | 6 +----- view/templates/field_custom.tpl | 6 +----- view/templates/field_intcheckbox.tpl | 6 +----- view/templates/field_radio.tpl | 6 +----- view/templates/field_richtext.tpl | 6 +----- view/templates/field_select.tpl | 6 +----- view/templates/field_select_raw.tpl | 6 +----- view/templates/field_textarea.tpl | 6 +----- view/templates/field_themeselect.tpl | 6 +----- view/templates/field_yesno.tpl | 6 +----- view/templates/fileas_widget.tpl | 6 +----- view/templates/filebrowser.tpl | 6 +----- view/templates/filer_dialog.tpl | 6 +----- view/templates/follow.tpl | 6 +----- view/templates/follow_slap.tpl | 6 +----- view/templates/generic_links_widget.tpl | 6 +----- view/templates/group_drop.tpl | 6 +----- view/templates/group_edit.tpl | 6 +----- view/templates/group_selection.tpl | 6 +----- view/templates/group_side.tpl | 6 +----- view/templates/groupeditor.tpl | 6 +----- view/templates/head.tpl | 6 +----- view/templates/hide_comments.tpl | 6 +----- view/templates/install.tpl | 6 +----- view/templates/install_checks.tpl | 6 +----- view/templates/install_db.tpl | 6 +----- view/templates/install_settings.tpl | 6 +----- view/templates/intros.tpl | 6 +----- view/templates/invite.tpl | 6 +----- view/templates/jot-end.tpl | 6 +----- view/templates/jot-header.tpl | 6 +----- view/templates/jot.tpl | 6 +----- view/templates/jot_geotag.tpl | 6 +----- view/templates/lang_selector.tpl | 6 +----- view/templates/like_noshare.tpl | 6 +----- view/templates/login.tpl | 6 +----- view/templates/logout.tpl | 6 +----- view/templates/lostpass.tpl | 6 +----- view/templates/magicsig.tpl | 6 +----- view/templates/mail_conv.tpl | 6 +----- view/templates/mail_display.tpl | 6 +----- view/templates/mail_head.tpl | 6 +----- view/templates/mail_list.tpl | 6 +----- view/templates/maintenance.tpl | 6 +----- view/templates/manage.tpl | 6 +----- view/templates/match.tpl | 6 +----- view/templates/message-end.tpl | 6 +----- view/templates/message-head.tpl | 6 +----- view/templates/message_side.tpl | 6 +----- view/templates/moderated_comment.tpl | 6 +----- view/templates/mood_content.tpl | 6 +----- view/templates/msg-end.tpl | 6 +----- view/templates/msg-header.tpl | 6 +----- view/templates/nav.tpl | 6 +----- view/templates/navigation.tpl | 6 +----- view/templates/netfriend.tpl | 6 +----- view/templates/nets.tpl | 6 +----- view/templates/nogroup-template.tpl | 6 +----- view/templates/notifications.tpl | 6 +----- view/templates/notifications_comments_item.tpl | 6 +----- view/templates/notifications_dislikes_item.tpl | 6 +----- view/templates/notifications_friends_item.tpl | 6 +----- view/templates/notifications_likes_item.tpl | 6 +----- view/templates/notifications_network_item.tpl | 6 +----- view/templates/notifications_posts_item.tpl | 6 +----- view/templates/notify.tpl | 6 +----- view/templates/oauth_authorize.tpl | 6 +----- view/templates/oauth_authorize_done.tpl | 6 +----- view/templates/oembed_video.tpl | 6 +----- view/templates/oexchange_xrd.tpl | 6 +----- view/templates/opensearch.tpl | 6 +----- view/templates/pagetypes.tpl | 6 +----- view/templates/peoplefind.tpl | 6 +----- view/templates/photo_album.tpl | 6 +----- view/templates/photo_edit.tpl | 6 +----- view/templates/photo_edit_head.tpl | 6 +----- view/templates/photo_item.tpl | 6 +----- view/templates/photo_top.tpl | 6 +----- view/templates/photo_view.tpl | 6 +----- view/templates/photos_default_uploader_box.tpl | 6 +----- view/templates/photos_default_uploader_submit.tpl | 6 +----- view/templates/photos_head.tpl | 6 +----- view/templates/photos_recent.tpl | 6 +----- view/templates/photos_upload.tpl | 6 +----- view/templates/poco_entry_xml.tpl | 6 +----- view/templates/poco_xml.tpl | 6 +----- view/templates/poke_content.tpl | 6 +----- view/templates/profed_end.tpl | 6 +----- view/templates/profed_head.tpl | 6 +----- view/templates/profile-hide-friends.tpl | 6 +----- view/templates/profile-hide-wall.tpl | 6 +----- view/templates/profile-in-directory.tpl | 6 +----- view/templates/profile-in-netdir.tpl | 6 +----- view/templates/profile_advanced.tpl | 6 +----- view/templates/profile_edit.tpl | 6 +----- view/templates/profile_edlink.tpl | 6 +----- view/templates/profile_entry.tpl | 6 +----- view/templates/profile_listing_header.tpl | 6 +----- view/templates/profile_photo.tpl | 6 +----- view/templates/profile_publish.tpl | 6 +----- view/templates/profile_vcard.tpl | 6 +----- view/templates/prv_message.tpl | 6 +----- view/templates/pwdreset.tpl | 6 +----- view/templates/remote_friends_common.tpl | 6 +----- view/templates/removeme.tpl | 6 +----- view/templates/saved_searches_aside.tpl | 6 +----- view/templates/search_item.tpl | 6 +----- view/templates/settings-end.tpl | 6 +----- view/templates/settings-head.tpl | 6 +----- view/templates/settings_addons.tpl | 6 +----- view/templates/settings_connectors.tpl | 6 +----- view/templates/settings_display.tpl | 6 +----- view/templates/settings_display_end.tpl | 6 +----- view/templates/settings_features.tpl | 6 +----- view/templates/settings_nick_set.tpl | 6 +----- view/templates/settings_nick_subdir.tpl | 6 +----- view/templates/settings_oauth.tpl | 6 +----- view/templates/settings_oauth_edit.tpl | 6 +----- view/templates/structure_check.tpl | 6 +----- view/templates/suggest_friends.tpl | 6 +----- view/templates/suggestions.tpl | 6 +----- view/templates/tag_slap.tpl | 6 +----- view/templates/threaded_conversation.tpl | 6 +----- view/templates/toggle_mobile_footer.tpl | 6 +----- view/templates/uexport.tpl | 6 +----- view/templates/uimport.tpl | 6 +----- view/templates/vcard-widget.tpl | 6 +----- view/templates/viewcontact_template.tpl | 6 +----- view/templates/voting_fakelink.tpl | 6 +----- view/templates/wall_thread.tpl | 6 +----- view/templates/wallmessage.tpl | 6 +----- view/templates/wallmsg-end.tpl | 6 +----- view/templates/wallmsg-header.tpl | 6 +----- view/templates/xrd_diaspora.tpl | 6 +----- view/templates/xrd_host.tpl | 6 +----- view/templates/xrd_person.tpl | 6 +----- view/theme/cleanzero/templates/nav.tpl | 6 +----- view/theme/cleanzero/templates/theme_settings.tpl | 6 +----- view/theme/comix-plain/templates/comment_item.tpl | 6 +----- view/theme/comix-plain/templates/search_item.tpl | 6 +----- view/theme/comix/templates/comment_item.tpl | 6 +----- view/theme/comix/templates/search_item.tpl | 6 +----- .../theme/decaf-mobile/templates/acl_html_selector.tpl | 6 +----- view/theme/decaf-mobile/templates/acl_selector.tpl | 6 +----- view/theme/decaf-mobile/templates/admin_aside.tpl | 6 +----- view/theme/decaf-mobile/templates/admin_site.tpl | 6 +----- view/theme/decaf-mobile/templates/album_edit.tpl | 6 +----- .../theme/decaf-mobile/templates/categories_widget.tpl | 6 +----- view/theme/decaf-mobile/templates/comment_item.tpl | 6 +----- view/theme/decaf-mobile/templates/common_tabs.tpl | 6 +----- view/theme/decaf-mobile/templates/contact_block.tpl | 6 +----- view/theme/decaf-mobile/templates/contact_edit.tpl | 6 +----- view/theme/decaf-mobile/templates/contact_head.tpl | 6 +----- view/theme/decaf-mobile/templates/contact_template.tpl | 6 +----- view/theme/decaf-mobile/templates/contacts-end.tpl | 6 +----- view/theme/decaf-mobile/templates/contacts-head.tpl | 6 +----- .../theme/decaf-mobile/templates/contacts-template.tpl | 6 +----- .../decaf-mobile/templates/contacts-widget-sidebar.tpl | 6 +----- view/theme/decaf-mobile/templates/conversation.tpl | 6 +----- view/theme/decaf-mobile/templates/display-head.tpl | 6 +----- view/theme/decaf-mobile/templates/end.tpl | 6 +----- view/theme/decaf-mobile/templates/event_end.tpl | 6 +----- view/theme/decaf-mobile/templates/event_head.tpl | 6 +----- view/theme/decaf-mobile/templates/field_checkbox.tpl | 6 +----- view/theme/decaf-mobile/templates/field_openid.tpl | 6 +----- view/theme/decaf-mobile/templates/field_password.tpl | 6 +----- .../theme/decaf-mobile/templates/field_themeselect.tpl | 6 +----- view/theme/decaf-mobile/templates/field_yesno.tpl | 6 +----- .../decaf-mobile/templates/generic_links_widget.tpl | 6 +----- view/theme/decaf-mobile/templates/group_drop.tpl | 6 +----- view/theme/decaf-mobile/templates/group_side.tpl | 6 +----- view/theme/decaf-mobile/templates/jot-end.tpl | 6 +----- view/theme/decaf-mobile/templates/jot-header.tpl | 6 +----- view/theme/decaf-mobile/templates/jot.tpl | 6 +----- view/theme/decaf-mobile/templates/lang_selector.tpl | 6 +----- view/theme/decaf-mobile/templates/like_noshare.tpl | 6 +----- view/theme/decaf-mobile/templates/login.tpl | 6 +----- view/theme/decaf-mobile/templates/lostpass.tpl | 6 +----- view/theme/decaf-mobile/templates/mail_conv.tpl | 6 +----- view/theme/decaf-mobile/templates/mail_list.tpl | 6 +----- view/theme/decaf-mobile/templates/manage.tpl | 6 +----- view/theme/decaf-mobile/templates/message-end.tpl | 6 +----- view/theme/decaf-mobile/templates/message-head.tpl | 6 +----- .../theme/decaf-mobile/templates/moderated_comment.tpl | 6 +----- view/theme/decaf-mobile/templates/msg-end.tpl | 6 +----- view/theme/decaf-mobile/templates/msg-header.tpl | 6 +----- view/theme/decaf-mobile/templates/nav.tpl | 6 +----- view/theme/decaf-mobile/templates/photo_drop.tpl | 6 +----- view/theme/decaf-mobile/templates/photo_edit.tpl | 6 +----- view/theme/decaf-mobile/templates/photo_edit_head.tpl | 6 +----- view/theme/decaf-mobile/templates/photo_view.tpl | 6 +----- view/theme/decaf-mobile/templates/photos_head.tpl | 6 +----- view/theme/decaf-mobile/templates/photos_upload.tpl | 6 +----- view/theme/decaf-mobile/templates/profed_end.tpl | 6 +----- view/theme/decaf-mobile/templates/profed_head.tpl | 6 +----- view/theme/decaf-mobile/templates/profile_edit.tpl | 6 +----- view/theme/decaf-mobile/templates/profile_photo.tpl | 6 +----- view/theme/decaf-mobile/templates/profile_vcard.tpl | 6 +----- view/theme/decaf-mobile/templates/prv_message.tpl | 6 +----- view/theme/decaf-mobile/templates/register.tpl | 6 +----- view/theme/decaf-mobile/templates/search_item.tpl | 6 +----- view/theme/decaf-mobile/templates/settings-head.tpl | 6 +----- view/theme/decaf-mobile/templates/settings.tpl | 6 +----- view/theme/decaf-mobile/templates/suggest_friends.tpl | 6 +----- .../decaf-mobile/templates/threaded_conversation.tpl | 6 +----- view/theme/decaf-mobile/templates/voting_fakelink.tpl | 6 +----- view/theme/decaf-mobile/templates/wall_thread.tpl | 6 +----- .../decaf-mobile/templates/wall_thread_toponly.tpl | 6 +----- view/theme/decaf-mobile/templates/wallmessage.tpl | 6 +----- view/theme/decaf-mobile/templates/wallmsg-end.tpl | 6 +----- view/theme/decaf-mobile/templates/wallmsg-header.tpl | 6 +----- view/theme/diabook/templates/admin_users.tpl | 6 +----- view/theme/diabook/templates/bottom.tpl | 6 +----- view/theme/diabook/templates/ch_directory_item.tpl | 6 +----- view/theme/diabook/templates/comment_item.tpl | 6 +----- view/theme/diabook/templates/communityhome.tpl | 6 +----- view/theme/diabook/templates/contact_template.tpl | 6 +----- view/theme/diabook/templates/directory_item.tpl | 6 +----- view/theme/diabook/templates/footer.tpl | 6 +----- view/theme/diabook/templates/generic_links_widget.tpl | 6 +----- view/theme/diabook/templates/group_side.tpl | 6 +----- view/theme/diabook/templates/jot.tpl | 6 +----- view/theme/diabook/templates/login.tpl | 6 +----- view/theme/diabook/templates/mail_conv.tpl | 6 +----- view/theme/diabook/templates/mail_display.tpl | 6 +----- view/theme/diabook/templates/mail_list.tpl | 6 +----- view/theme/diabook/templates/message_side.tpl | 6 +----- view/theme/diabook/templates/nav.tpl | 6 +----- view/theme/diabook/templates/nets.tpl | 6 +----- view/theme/diabook/templates/oembed_video.tpl | 6 +----- view/theme/diabook/templates/photo_item.tpl | 6 +----- view/theme/diabook/templates/photo_view.tpl | 6 +----- view/theme/diabook/templates/profile_side.tpl | 6 +----- view/theme/diabook/templates/profile_vcard.tpl | 6 +----- view/theme/diabook/templates/prv_message.tpl | 6 +----- view/theme/diabook/templates/right_aside.tpl | 6 +----- view/theme/diabook/templates/search_item.tpl | 6 +----- view/theme/diabook/templates/theme_settings.tpl | 6 +----- view/theme/diabook/templates/wall_thread.tpl | 6 +----- view/theme/dispy/templates/bottom.tpl | 6 +----- view/theme/dispy/templates/comment_item.tpl | 6 +----- view/theme/dispy/templates/communityhome.tpl | 6 +----- view/theme/dispy/templates/contact_template.tpl | 6 +----- view/theme/dispy/templates/conversation.tpl | 6 +----- view/theme/dispy/templates/group_side.tpl | 6 +----- view/theme/dispy/templates/header.tpl | 6 +----- view/theme/dispy/templates/jot-header.tpl | 6 +----- view/theme/dispy/templates/jot.tpl | 6 +----- view/theme/dispy/templates/lang_selector.tpl | 6 +----- view/theme/dispy/templates/mail_head.tpl | 6 +----- view/theme/dispy/templates/nav.tpl | 6 +----- view/theme/dispy/templates/photo_edit.tpl | 6 +----- view/theme/dispy/templates/photo_view.tpl | 6 +----- view/theme/dispy/templates/profile_vcard.tpl | 6 +----- view/theme/dispy/templates/saved_searches_aside.tpl | 6 +----- view/theme/dispy/templates/search_item.tpl | 6 +----- view/theme/dispy/templates/theme_settings.tpl | 6 +----- view/theme/dispy/templates/threaded_conversation.tpl | 6 +----- view/theme/dispy/templates/wall_thread.tpl | 6 +----- view/theme/duepuntozero/templates/comment_item.tpl | 6 +----- view/theme/duepuntozero/templates/lang_selector.tpl | 6 +----- .../theme/duepuntozero/templates/moderated_comment.tpl | 6 +----- view/theme/duepuntozero/templates/nav.tpl | 6 +----- view/theme/duepuntozero/templates/profile_vcard.tpl | 6 +----- view/theme/duepuntozero/templates/prv_message.tpl | 6 +----- view/theme/facepark/templates/comment_item.tpl | 6 +----- view/theme/facepark/templates/group_side.tpl | 6 +----- view/theme/facepark/templates/jot.tpl | 6 +----- view/theme/facepark/templates/nav.tpl | 6 +----- view/theme/facepark/templates/profile_vcard.tpl | 6 +----- view/theme/facepark/templates/search_item.tpl | 6 +----- view/theme/frost-mobile/templates/acl_selector.tpl | 6 +----- view/theme/frost-mobile/templates/admin_aside.tpl | 6 +----- view/theme/frost-mobile/templates/admin_site.tpl | 6 +----- .../theme/frost-mobile/templates/categories_widget.tpl | 6 +----- view/theme/frost-mobile/templates/comment_item.tpl | 6 +----- view/theme/frost-mobile/templates/common_tabs.tpl | 6 +----- view/theme/frost-mobile/templates/contact_block.tpl | 6 +----- view/theme/frost-mobile/templates/contact_edit.tpl | 6 +----- view/theme/frost-mobile/templates/contact_head.tpl | 6 +----- view/theme/frost-mobile/templates/contact_template.tpl | 6 +----- view/theme/frost-mobile/templates/contacts-end.tpl | 6 +----- view/theme/frost-mobile/templates/contacts-head.tpl | 6 +----- .../theme/frost-mobile/templates/contacts-template.tpl | 6 +----- .../frost-mobile/templates/contacts-widget-sidebar.tpl | 6 +----- view/theme/frost-mobile/templates/conversation.tpl | 6 +----- view/theme/frost-mobile/templates/display-head.tpl | 6 +----- view/theme/frost-mobile/templates/event.tpl | 6 +----- view/theme/frost-mobile/templates/event_end.tpl | 6 +----- view/theme/frost-mobile/templates/event_head.tpl | 6 +----- view/theme/frost-mobile/templates/field_checkbox.tpl | 6 +----- .../theme/frost-mobile/templates/field_themeselect.tpl | 6 +----- .../frost-mobile/templates/generic_links_widget.tpl | 6 +----- view/theme/frost-mobile/templates/group_drop.tpl | 6 +----- view/theme/frost-mobile/templates/jot-end.tpl | 6 +----- view/theme/frost-mobile/templates/jot-header.tpl | 6 +----- view/theme/frost-mobile/templates/jot.tpl | 6 +----- view/theme/frost-mobile/templates/lang_selector.tpl | 6 +----- view/theme/frost-mobile/templates/like_noshare.tpl | 6 +----- view/theme/frost-mobile/templates/login.tpl | 6 +----- view/theme/frost-mobile/templates/lostpass.tpl | 6 +----- view/theme/frost-mobile/templates/mail_conv.tpl | 6 +----- view/theme/frost-mobile/templates/mail_list.tpl | 6 +----- view/theme/frost-mobile/templates/message-end.tpl | 6 +----- view/theme/frost-mobile/templates/message-head.tpl | 6 +----- .../theme/frost-mobile/templates/moderated_comment.tpl | 6 +----- view/theme/frost-mobile/templates/msg-end.tpl | 6 +----- view/theme/frost-mobile/templates/msg-header.tpl | 6 +----- view/theme/frost-mobile/templates/nav.tpl | 6 +----- view/theme/frost-mobile/templates/photo_drop.tpl | 6 +----- view/theme/frost-mobile/templates/photo_edit.tpl | 6 +----- view/theme/frost-mobile/templates/photo_edit_head.tpl | 6 +----- view/theme/frost-mobile/templates/photo_view.tpl | 6 +----- view/theme/frost-mobile/templates/photos_head.tpl | 6 +----- view/theme/frost-mobile/templates/photos_upload.tpl | 6 +----- view/theme/frost-mobile/templates/profed_end.tpl | 6 +----- view/theme/frost-mobile/templates/profed_head.tpl | 6 +----- view/theme/frost-mobile/templates/profile_edit.tpl | 6 +----- view/theme/frost-mobile/templates/profile_photo.tpl | 6 +----- view/theme/frost-mobile/templates/profile_vcard.tpl | 6 +----- view/theme/frost-mobile/templates/prv_message.tpl | 6 +----- view/theme/frost-mobile/templates/register.tpl | 6 +----- view/theme/frost-mobile/templates/search_item.tpl | 6 +----- view/theme/frost-mobile/templates/settings-head.tpl | 6 +----- view/theme/frost-mobile/templates/settings.tpl | 6 +----- view/theme/frost-mobile/templates/suggest_friends.tpl | 6 +----- .../frost-mobile/templates/threaded_conversation.tpl | 6 +----- view/theme/frost-mobile/templates/voting_fakelink.tpl | 6 +----- view/theme/frost-mobile/templates/wall_thread.tpl | 6 +----- view/theme/frost-mobile/templates/wallmsg-end.tpl | 6 +----- view/theme/frost-mobile/templates/wallmsg-header.tpl | 6 +----- view/theme/frost/templates/acl_selector.tpl | 6 +----- view/theme/frost/templates/admin_aside.tpl | 6 +----- view/theme/frost/templates/admin_site.tpl | 6 +----- view/theme/frost/templates/comment_item.tpl | 6 +----- view/theme/frost/templates/contact_edit.tpl | 6 +----- view/theme/frost/templates/contact_end.tpl | 6 +----- view/theme/frost/templates/contact_head.tpl | 6 +----- view/theme/frost/templates/contact_template.tpl | 6 +----- view/theme/frost/templates/contacts-end.tpl | 6 +----- view/theme/frost/templates/contacts-head.tpl | 6 +----- view/theme/frost/templates/contacts-template.tpl | 6 +----- view/theme/frost/templates/display-head.tpl | 6 +----- view/theme/frost/templates/end.tpl | 6 +----- view/theme/frost/templates/event.tpl | 6 +----- view/theme/frost/templates/event_end.tpl | 6 +----- view/theme/frost/templates/event_form.tpl | 6 +----- view/theme/frost/templates/event_head.tpl | 6 +----- view/theme/frost/templates/field_themeselect.tpl | 6 +----- view/theme/frost/templates/filebrowser.tpl | 6 +----- view/theme/frost/templates/group_drop.tpl | 6 +----- view/theme/frost/templates/head.tpl | 6 +----- view/theme/frost/templates/jot-end.tpl | 6 +----- view/theme/frost/templates/jot-header.tpl | 6 +----- view/theme/frost/templates/jot.tpl | 6 +----- view/theme/frost/templates/lang_selector.tpl | 6 +----- view/theme/frost/templates/like_noshare.tpl | 6 +----- view/theme/frost/templates/login.tpl | 6 +----- view/theme/frost/templates/lostpass.tpl | 6 +----- view/theme/frost/templates/mail_conv.tpl | 6 +----- view/theme/frost/templates/mail_list.tpl | 6 +----- view/theme/frost/templates/message-end.tpl | 6 +----- view/theme/frost/templates/message-head.tpl | 6 +----- view/theme/frost/templates/moderated_comment.tpl | 6 +----- view/theme/frost/templates/msg-end.tpl | 6 +----- view/theme/frost/templates/msg-header.tpl | 6 +----- view/theme/frost/templates/nav.tpl | 6 +----- view/theme/frost/templates/photo_drop.tpl | 6 +----- view/theme/frost/templates/photo_edit.tpl | 6 +----- view/theme/frost/templates/photo_edit_head.tpl | 6 +----- view/theme/frost/templates/photo_view.tpl | 6 +----- view/theme/frost/templates/photos_head.tpl | 6 +----- view/theme/frost/templates/photos_upload.tpl | 6 +----- view/theme/frost/templates/profed_end.tpl | 6 +----- view/theme/frost/templates/profed_head.tpl | 6 +----- view/theme/frost/templates/profile_edit.tpl | 6 +----- view/theme/frost/templates/profile_vcard.tpl | 6 +----- view/theme/frost/templates/prv_message.tpl | 6 +----- view/theme/frost/templates/register.tpl | 6 +----- view/theme/frost/templates/search_item.tpl | 6 +----- view/theme/frost/templates/settings-head.tpl | 6 +----- view/theme/frost/templates/suggest_friends.tpl | 6 +----- view/theme/frost/templates/threaded_conversation.tpl | 6 +----- view/theme/frost/templates/voting_fakelink.tpl | 6 +----- view/theme/frost/templates/wall_thread.tpl | 6 +----- view/theme/frost/templates/wallmsg-end.tpl | 6 +----- view/theme/frost/templates/wallmsg-header.tpl | 6 +----- view/theme/slackr/templates/birthdays_reminder.tpl | 6 +----- view/theme/slackr/templates/events_reminder.tpl | 6 +----- view/theme/smoothly/templates/bottom.tpl | 6 +----- view/theme/smoothly/templates/follow.tpl | 6 +----- view/theme/smoothly/templates/jot-header.tpl | 6 +----- view/theme/smoothly/templates/jot.tpl | 6 +----- view/theme/smoothly/templates/lang_selector.tpl | 6 +----- view/theme/smoothly/templates/nav.tpl | 6 +----- view/theme/smoothly/templates/search_item.tpl | 6 +----- view/theme/smoothly/templates/tools.tpl | 6 +----- view/theme/smoothly/templates/wall_thread.tpl | 6 +----- view/theme/testbubble/templates/comment_item.tpl | 6 +----- view/theme/testbubble/templates/group_drop.tpl | 6 +----- view/theme/testbubble/templates/group_edit.tpl | 6 +----- view/theme/testbubble/templates/group_side.tpl | 6 +----- view/theme/testbubble/templates/jot-header.tpl | 6 +----- view/theme/testbubble/templates/jot.tpl | 6 +----- view/theme/testbubble/templates/match.tpl | 6 +----- view/theme/testbubble/templates/nav.tpl | 6 +----- view/theme/testbubble/templates/photo_album.tpl | 6 +----- view/theme/testbubble/templates/photo_top.tpl | 6 +----- view/theme/testbubble/templates/photo_view.tpl | 6 +----- view/theme/testbubble/templates/profile_entry.tpl | 6 +----- view/theme/testbubble/templates/profile_vcard.tpl | 6 +----- .../testbubble/templates/saved_searches_aside.tpl | 6 +----- view/theme/testbubble/templates/search_item.tpl | 6 +----- view/theme/testbubble/templates/wall_thread.tpl | 6 +----- view/theme/vier/templates/comment_item.tpl | 6 +----- view/theme/vier/templates/mail_list.tpl | 6 +----- view/theme/vier/templates/nav.tpl | 6 +----- view/theme/vier/templates/photo_view.tpl | 6 +----- view/theme/vier/templates/profile_edlink.tpl | 6 +----- view/theme/vier/templates/profile_vcard.tpl | 6 +----- view/theme/vier/templates/search_item.tpl | 6 +----- view/theme/vier/templates/theme_settings.tpl | 6 +----- view/theme/vier/templates/threaded_conversation.tpl | 6 +----- view/theme/vier/templates/wall_item_tag.tpl | 6 +----- view/theme/vier/templates/wall_thread.tpl | 6 +----- view/zh-cn/smarty3/follow_notify_eml.tpl | 6 +----- view/zh-cn/smarty3/friend_complete_eml.tpl | 6 +----- view/zh-cn/smarty3/intro_complete_eml.tpl | 6 +----- view/zh-cn/smarty3/lostpass_eml.tpl | 6 +----- view/zh-cn/smarty3/passchanged_eml.tpl | 6 +----- view/zh-cn/smarty3/register_open_eml.tpl | 6 +----- view/zh-cn/smarty3/register_verify_eml.tpl | 6 +----- view/zh-cn/smarty3/request_notify_eml.tpl | 6 +----- view/zh-cn/smarty3/update_fail_eml.tpl | 6 +----- 649 files changed, 652 insertions(+), 3251 deletions(-) diff --git a/view/ca/smarty3/cmnt_received_eml.tpl b/view/ca/smarty3/cmnt_received_eml.tpl index c398c5231..406eaaeb6 100644 --- a/view/ca/smarty3/cmnt_received_eml.tpl +++ b/view/ca/smarty3/cmnt_received_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Apreciat/da {{$username}}, diff --git a/view/ca/smarty3/follow_notify_eml.tpl b/view/ca/smarty3/follow_notify_eml.tpl index b90804741..153f19562 100644 --- a/view/ca/smarty3/follow_notify_eml.tpl +++ b/view/ca/smarty3/follow_notify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Apreciat/da {{$myname}}, diff --git a/view/ca/smarty3/friend_complete_eml.tpl b/view/ca/smarty3/friend_complete_eml.tpl index b26152d81..660ac8c1a 100644 --- a/view/ca/smarty3/friend_complete_eml.tpl +++ b/view/ca/smarty3/friend_complete_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Apreciat/da {{$username}}, diff --git a/view/ca/smarty3/htconfig.tpl b/view/ca/smarty3/htconfig.tpl index cb92f2531..17bd56f79 100644 --- a/view/ca/smarty3/htconfig.tpl +++ b/view/ca/smarty3/htconfig.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/ca/smarty3/mail_received_text_body_eml.tpl b/view/ca/smarty3/mail_received_text_body_eml.tpl index 3bd4a186f..4addb7d6e 100644 --- a/view/ca/smarty3/mail_received_text_body_eml.tpl +++ b/view/ca/smarty3/mail_received_text_body_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Has rebut un nou missatge privat de '{{$from}}' en {{$siteName}}. {{$title}} diff --git a/view/ca/smarty3/passchanged_eml.tpl b/view/ca/smarty3/passchanged_eml.tpl index eddf2ed85..43063fc81 100644 --- a/view/ca/smarty3/passchanged_eml.tpl +++ b/view/ca/smarty3/passchanged_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Apreciat/da {{$username}}, diff --git a/view/ca/smarty3/register_open_eml.tpl b/view/ca/smarty3/register_open_eml.tpl index b4e90991b..ba56d6ae8 100644 --- a/view/ca/smarty3/register_open_eml.tpl +++ b/view/ca/smarty3/register_open_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Apreciat/da {{$username}}, diff --git a/view/ca/smarty3/register_verify_eml.tpl b/view/ca/smarty3/register_verify_eml.tpl index d9cc94c1a..070288a43 100644 --- a/view/ca/smarty3/register_verify_eml.tpl +++ b/view/ca/smarty3/register_verify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + S'ha rebut la sol·licitud de registre d'un nou usuari en {{$sitename}} que requereix la teva aprovació. diff --git a/view/ca/smarty3/request_notify_eml.tpl b/view/ca/smarty3/request_notify_eml.tpl index 3e94e1a59..5bef9f672 100644 --- a/view/ca/smarty3/request_notify_eml.tpl +++ b/view/ca/smarty3/request_notify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Apreciat/da {{$myname}}, diff --git a/view/ca/smarty3/wall_received_eml.tpl b/view/ca/smarty3/wall_received_eml.tpl index faaaf1b19..254095775 100644 --- a/view/ca/smarty3/wall_received_eml.tpl +++ b/view/ca/smarty3/wall_received_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Apreciat/da {{$username}}, diff --git a/view/cs/smarty3/cmnt_received_eml.tpl b/view/cs/smarty3/cmnt_received_eml.tpl index 2bf7cc18c..87d379d2e 100644 --- a/view/cs/smarty3/cmnt_received_eml.tpl +++ b/view/cs/smarty3/cmnt_received_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Milý/Milá {{$username}}, '{{$from}}' okommentoval položku/konverzaci, kterou následujete. diff --git a/view/cs/smarty3/cmnt_received_html_body_eml.tpl b/view/cs/smarty3/cmnt_received_html_body_eml.tpl index 0fa62da8f..c512a317e 100644 --- a/view/cs/smarty3/cmnt_received_html_body_eml.tpl +++ b/view/cs/smarty3/cmnt_received_html_body_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/cs/smarty3/cmnt_received_text_body_eml.tpl b/view/cs/smarty3/cmnt_received_text_body_eml.tpl index 2bf7cc18c..87d379d2e 100644 --- a/view/cs/smarty3/cmnt_received_text_body_eml.tpl +++ b/view/cs/smarty3/cmnt_received_text_body_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Milý/Milá {{$username}}, '{{$from}}' okommentoval položku/konverzaci, kterou následujete. diff --git a/view/cs/smarty3/follow_notify_eml.tpl b/view/cs/smarty3/follow_notify_eml.tpl index f2bd3175b..1b4d6a94d 100644 --- a/view/cs/smarty3/follow_notify_eml.tpl +++ b/view/cs/smarty3/follow_notify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Milý/Milá {{$username}}, diff --git a/view/cs/smarty3/friend_complete_eml.tpl b/view/cs/smarty3/friend_complete_eml.tpl index 138036d63..462022a05 100644 --- a/view/cs/smarty3/friend_complete_eml.tpl +++ b/view/cs/smarty3/friend_complete_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Milý/Milá {{$username}}, diff --git a/view/cs/smarty3/htconfig.tpl b/view/cs/smarty3/htconfig.tpl index da9b798c5..4aeff753a 100644 --- a/view/cs/smarty3/htconfig.tpl +++ b/view/cs/smarty3/htconfig.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} +  diff --git a/view/cs/smarty3/mail_received_text_body_eml.tpl b/view/cs/smarty3/mail_received_text_body_eml.tpl index de9a84a76..a15fd6c4a 100644 --- a/view/cs/smarty3/mail_received_text_body_eml.tpl +++ b/view/cs/smarty3/mail_received_text_body_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$from}} Vám poslal(a) novou soukromou zprávu na {{$siteName}}. {{$title}} diff --git a/view/cs/smarty3/passchanged_eml.tpl b/view/cs/smarty3/passchanged_eml.tpl index 41eb2b403..cfc71356d 100644 --- a/view/cs/smarty3/passchanged_eml.tpl +++ b/view/cs/smarty3/passchanged_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Milý/Milá {{$username}}, Vaše heslo bylo na Vaši žádost změněno. Prosím zaznamenejte si tuto informaci (nebo si Vaše heslo změňte na nějaké, které si budete pamatovat). diff --git a/view/cs/smarty3/register_open_eml.tpl b/view/cs/smarty3/register_open_eml.tpl index 7278baf7c..df9bcf53c 100644 --- a/view/cs/smarty3/register_open_eml.tpl +++ b/view/cs/smarty3/register_open_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Milý/milá {{$username}}, Díky za registraci na {{$sitename}}. Váš účet byl vytvořen. Vaše přihlašovací údaje jsou tato: diff --git a/view/cs/smarty3/register_verify_eml.tpl b/view/cs/smarty3/register_verify_eml.tpl index 785a18267..7d08ffa00 100644 --- a/view/cs/smarty3/register_verify_eml.tpl +++ b/view/cs/smarty3/register_verify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Na webu {{$sitename}} byla vytvořena nová uživatelská registrace, která vyžaduje Vaše schválení. diff --git a/view/cs/smarty3/request_notify_eml.tpl b/view/cs/smarty3/request_notify_eml.tpl index 537cea01c..6fd4d02bc 100644 --- a/view/cs/smarty3/request_notify_eml.tpl +++ b/view/cs/smarty3/request_notify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Milý/Milá {{$username}}, diff --git a/view/cs/smarty3/wall_received_eml.tpl b/view/cs/smarty3/wall_received_eml.tpl index a7c8bd136..b22551301 100644 --- a/view/cs/smarty3/wall_received_eml.tpl +++ b/view/cs/smarty3/wall_received_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Milý/Milá {{$username}}, '{{$from}}' obohatil Vaši profilovou zeď. diff --git a/view/cs/smarty3/wall_received_html_body_eml.tpl b/view/cs/smarty3/wall_received_html_body_eml.tpl index 245843e96..6d6b06b03 100644 --- a/view/cs/smarty3/wall_received_html_body_eml.tpl +++ b/view/cs/smarty3/wall_received_html_body_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/cs/smarty3/wall_received_text_body_eml.tpl b/view/cs/smarty3/wall_received_text_body_eml.tpl index eddf6d330..9646db63d 100644 --- a/view/cs/smarty3/wall_received_text_body_eml.tpl +++ b/view/cs/smarty3/wall_received_text_body_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Milý/Milá {{$username}}, '{{$from}}' obohatil Vaši profilovou zeď. diff --git a/view/de/smarty3/cmnt_received_eml.tpl b/view/de/smarty3/cmnt_received_eml.tpl index 9b5c3d842..6e5eab7ab 100644 --- a/view/de/smarty3/cmnt_received_eml.tpl +++ b/view/de/smarty3/cmnt_received_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Hallo {{$username}}, diff --git a/view/de/smarty3/cmnt_received_html_body_eml.tpl b/view/de/smarty3/cmnt_received_html_body_eml.tpl index c219fcb18..39f08073c 100644 --- a/view/de/smarty3/cmnt_received_html_body_eml.tpl +++ b/view/de/smarty3/cmnt_received_html_body_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/de/smarty3/cmnt_received_text_body_eml.tpl b/view/de/smarty3/cmnt_received_text_body_eml.tpl index d100040c0..b99432a76 100644 --- a/view/de/smarty3/cmnt_received_text_body_eml.tpl +++ b/view/de/smarty3/cmnt_received_text_body_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Hallo {{$username}}, '{{$from}}' hat einen Pinnwandeintrag kommentiert dem du auch folgst. @@ -15,7 +11,7 @@ Um die gesamte Konversation zu sehen melde dich bitte bei {{$siteurl}} an: {{$display}} -Danke fr die Aufmerksamkeit +Danke f�r die Aufmerksamkeit {{$sitename}} Administrator diff --git a/view/de/smarty3/follow_notify_eml.tpl b/view/de/smarty3/follow_notify_eml.tpl index 7bec4d32d..4da71eb19 100644 --- a/view/de/smarty3/follow_notify_eml.tpl +++ b/view/de/smarty3/follow_notify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Hallo {{$myname}}, diff --git a/view/de/smarty3/friend_complete_eml.tpl b/view/de/smarty3/friend_complete_eml.tpl index 592bf7dd8..27dd1bc94 100644 --- a/view/de/smarty3/friend_complete_eml.tpl +++ b/view/de/smarty3/friend_complete_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Hallo {{$username}}, diff --git a/view/de/smarty3/htconfig.tpl b/view/de/smarty3/htconfig.tpl index 033e48194..a5f8dab1a 100644 --- a/view/de/smarty3/htconfig.tpl +++ b/view/de/smarty3/htconfig.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/de/smarty3/mail_received_text_body_eml.tpl b/view/de/smarty3/mail_received_text_body_eml.tpl index 2004cc3b0..a09dafc6e 100644 --- a/view/de/smarty3/mail_received_text_body_eml.tpl +++ b/view/de/smarty3/mail_received_text_body_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Du hast eine neue private Nachricht von '{{$from}}' auf '{{$siteName}}' erhhalten. {{$title}} @@ -12,5 +8,5 @@ Du hast eine neue private Nachricht von '{{$from}}' auf '{{$siteName}}' erhhalte Bitte melde dich unter {{$siteurl}} an um deine privaten Nachrichte zu lesen und zu beantworten. -Viele Gre, +Viele Gr��e, {{$siteName}} Administrator diff --git a/view/de/smarty3/passchanged_eml.tpl b/view/de/smarty3/passchanged_eml.tpl index 4fd97881f..2c4576f0d 100644 --- a/view/de/smarty3/passchanged_eml.tpl +++ b/view/de/smarty3/passchanged_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Hallo {{$username}}, Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese diff --git a/view/de/smarty3/register_open_eml.tpl b/view/de/smarty3/register_open_eml.tpl index 9e474ce9e..acd286935 100644 --- a/view/de/smarty3/register_open_eml.tpl +++ b/view/de/smarty3/register_open_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Hallo {{$username}}, Danke für deine Anmeldung auf {{$sitename}}. Dein Account wurde angelegt. diff --git a/view/de/smarty3/register_verify_eml.tpl b/view/de/smarty3/register_verify_eml.tpl index c7acbd9b6..9c0bb77f2 100644 --- a/view/de/smarty3/register_verify_eml.tpl +++ b/view/de/smarty3/register_verify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Eine Neuanmeldung auf {{$sitename}} benötigt deine Aufmerksamkeit. diff --git a/view/de/smarty3/request_notify_eml.tpl b/view/de/smarty3/request_notify_eml.tpl index d7c49b028..a68032c20 100644 --- a/view/de/smarty3/request_notify_eml.tpl +++ b/view/de/smarty3/request_notify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Hallo {{$myname}}, diff --git a/view/de/smarty3/update_fail_eml.tpl b/view/de/smarty3/update_fail_eml.tpl index 4329d0e42..8a480d502 100644 --- a/view/de/smarty3/update_fail_eml.tpl +++ b/view/de/smarty3/update_fail_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Hi, ich bin {{$sitename}}. Die friendica Entwickler haben jüngst Update {{$update}} veröffentlicht, diff --git a/view/de/smarty3/wall_received_eml.tpl b/view/de/smarty3/wall_received_eml.tpl index 2ace0d5f4..19e314135 100644 --- a/view/de/smarty3/wall_received_eml.tpl +++ b/view/de/smarty3/wall_received_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Hallo {{$username}}, diff --git a/view/de/smarty3/wall_received_html_body_eml.tpl b/view/de/smarty3/wall_received_html_body_eml.tpl index c58ee7500..e8d8dd2cd 100644 --- a/view/de/smarty3/wall_received_html_body_eml.tpl +++ b/view/de/smarty3/wall_received_html_body_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/de/smarty3/wall_received_text_body_eml.tpl b/view/de/smarty3/wall_received_text_body_eml.tpl index eb310177d..1ecba1dd7 100644 --- a/view/de/smarty3/wall_received_text_body_eml.tpl +++ b/view/de/smarty3/wall_received_text_body_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Hallo {{$username}}, diff --git a/view/en/smarty3/follow_notify_eml.tpl b/view/en/smarty3/follow_notify_eml.tpl index e944aad1a..00a2406e8 100644 --- a/view/en/smarty3/follow_notify_eml.tpl +++ b/view/en/smarty3/follow_notify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Dear {{$myname}}, diff --git a/view/en/smarty3/friend_complete_eml.tpl b/view/en/smarty3/friend_complete_eml.tpl index 8f72027e1..32311e837 100644 --- a/view/en/smarty3/friend_complete_eml.tpl +++ b/view/en/smarty3/friend_complete_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Dear {{$username}}, diff --git a/view/en/smarty3/htconfig.tpl b/view/en/smarty3/htconfig.tpl index 0cceabb65..f11922a9c 100644 --- a/view/en/smarty3/htconfig.tpl +++ b/view/en/smarty3/htconfig.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/es/smarty3/mail_received_text_body_eml.tpl b/view/es/smarty3/mail_received_text_body_eml.tpl index 7ff093b91..43ea2fa3c 100644 --- a/view/es/smarty3/mail_received_text_body_eml.tpl +++ b/view/es/smarty3/mail_received_text_body_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Has recibido un nuevo mensaje privado de '{{$from}}' en {{$siteName}}. {{$title}} diff --git a/view/es/smarty3/passchanged_eml.tpl b/view/es/smarty3/passchanged_eml.tpl index e17776eaa..c3003b2ce 100644 --- a/view/es/smarty3/passchanged_eml.tpl +++ b/view/es/smarty3/passchanged_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Estimado/a {{$username}}, diff --git a/view/es/smarty3/register_open_eml.tpl b/view/es/smarty3/register_open_eml.tpl index 5d5630461..0d0cc5ae0 100644 --- a/view/es/smarty3/register_open_eml.tpl +++ b/view/es/smarty3/register_open_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Estimado/a {{$username}}, diff --git a/view/es/smarty3/register_verify_eml.tpl b/view/es/smarty3/register_verify_eml.tpl index a67aedd10..b49a616d2 100644 --- a/view/es/smarty3/register_verify_eml.tpl +++ b/view/es/smarty3/register_verify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Se ha recibido la solicitud de registro de un nuevo usuario en {{$sitename}} que requiere tu aprobación. diff --git a/view/es/smarty3/request_notify_eml.tpl b/view/es/smarty3/request_notify_eml.tpl index f7bdf3294..e4eae838b 100644 --- a/view/es/smarty3/request_notify_eml.tpl +++ b/view/es/smarty3/request_notify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Estimado/a {{$myname}}, diff --git a/view/es/smarty3/wall_received_eml.tpl b/view/es/smarty3/wall_received_eml.tpl index a69c421c2..daa5b4116 100644 --- a/view/es/smarty3/wall_received_eml.tpl +++ b/view/es/smarty3/wall_received_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Estimado/a {{$username}}, diff --git a/view/fr/smarty3/cmnt_received_eml.tpl b/view/fr/smarty3/cmnt_received_eml.tpl index a2c1407f5..05a71d5aa 100644 --- a/view/fr/smarty3/cmnt_received_eml.tpl +++ b/view/fr/smarty3/cmnt_received_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Cher(e) {{$username}}, diff --git a/view/fr/smarty3/cmnt_received_html_body_eml.tpl b/view/fr/smarty3/cmnt_received_html_body_eml.tpl index d4f7ee7ef..d879e4cd0 100644 --- a/view/fr/smarty3/cmnt_received_html_body_eml.tpl +++ b/view/fr/smarty3/cmnt_received_html_body_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/fr/smarty3/cmnt_received_text_body_eml.tpl b/view/fr/smarty3/cmnt_received_text_body_eml.tpl index b0360655b..e5bae0ac1 100644 --- a/view/fr/smarty3/cmnt_received_text_body_eml.tpl +++ b/view/fr/smarty3/cmnt_received_text_body_eml.tpl @@ -1,18 +1,14 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Cher(e) {{$username}}, - {{$from}} a comment un lment ou une conversation que vous suivez. + � {{$from}} � a comment� un �l�ment ou une conversation que vous suivez. ----- {{$body}} ----- -Connectez-vous {{$siteurl}} si vous souhaitez voir la conversation complte : +Connectez-vous � {{$siteurl}} si vous souhaitez voir la conversation compl�te : {{$display}} diff --git a/view/fr/smarty3/follow_notify_eml.tpl b/view/fr/smarty3/follow_notify_eml.tpl index 7f7da5ec3..b96ef04fe 100644 --- a/view/fr/smarty3/follow_notify_eml.tpl +++ b/view/fr/smarty3/follow_notify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Cher(e) {{$myname}}, diff --git a/view/fr/smarty3/friend_complete_eml.tpl b/view/fr/smarty3/friend_complete_eml.tpl index 2f68255a2..9f329c950 100644 --- a/view/fr/smarty3/friend_complete_eml.tpl +++ b/view/fr/smarty3/friend_complete_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Cher(e) {{$username}}, diff --git a/view/fr/smarty3/htconfig.tpl b/view/fr/smarty3/htconfig.tpl index 033e48194..a5f8dab1a 100644 --- a/view/fr/smarty3/htconfig.tpl +++ b/view/fr/smarty3/htconfig.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/fr/smarty3/mail_received_text_body_eml.tpl b/view/fr/smarty3/mail_received_text_body_eml.tpl index d1f03fb6e..a23211298 100644 --- a/view/fr/smarty3/mail_received_text_body_eml.tpl +++ b/view/fr/smarty3/mail_received_text_body_eml.tpl @@ -1,15 +1,11 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} -{{$from}} vous a envoy un message {{$siteName}}. + +{{$from}} vous a envoy� un message � {{$siteName}}. {{$title}} {{$textversion}} -Veuillez ouvrir une session sur {{$siteurl}} pour lire et rpondre vos messages privs. +Veuillez ouvrir une session sur {{$siteurl}} pour lire et r�pondre � vos messages priv�s. Merci, {{$siteName}} Administrateur diff --git a/view/fr/smarty3/passchanged_eml.tpl b/view/fr/smarty3/passchanged_eml.tpl index 47b10d3f5..a7a4bd306 100644 --- a/view/fr/smarty3/passchanged_eml.tpl +++ b/view/fr/smarty3/passchanged_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Cher(e) {{$username}}, diff --git a/view/fr/smarty3/register_open_eml.tpl b/view/fr/smarty3/register_open_eml.tpl index 320a58016..3e8121354 100644 --- a/view/fr/smarty3/register_open_eml.tpl +++ b/view/fr/smarty3/register_open_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Cher(e) {{$username}}, diff --git a/view/fr/smarty3/register_verify_eml.tpl b/view/fr/smarty3/register_verify_eml.tpl index 8127010dd..f046797db 100644 --- a/view/fr/smarty3/register_verify_eml.tpl +++ b/view/fr/smarty3/register_verify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Une nouvelle demande d'inscription a été reçue sur {{$sitename}}, et elle nécessite votre approbation. diff --git a/view/fr/smarty3/request_notify_eml.tpl b/view/fr/smarty3/request_notify_eml.tpl index cf2fe0cf0..6fa998a76 100644 --- a/view/fr/smarty3/request_notify_eml.tpl +++ b/view/fr/smarty3/request_notify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Cher(e) {{$myname}}, diff --git a/view/fr/smarty3/wall_received_eml.tpl b/view/fr/smarty3/wall_received_eml.tpl index 2f91457fd..0c537c5b8 100644 --- a/view/fr/smarty3/wall_received_eml.tpl +++ b/view/fr/smarty3/wall_received_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Cher(e) {{$username}}, diff --git a/view/is/smarty3/follow_notify_eml.tpl b/view/is/smarty3/follow_notify_eml.tpl index e96380112..fcc0cf875 100644 --- a/view/is/smarty3/follow_notify_eml.tpl +++ b/view/is/smarty3/follow_notify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Góðan daginn {{$myname}}, diff --git a/view/is/smarty3/friend_complete_eml.tpl b/view/is/smarty3/friend_complete_eml.tpl index 5bdbeff51..f25787eff 100644 --- a/view/is/smarty3/friend_complete_eml.tpl +++ b/view/is/smarty3/friend_complete_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Góðan daginn {{$username}}, diff --git a/view/is/smarty3/intro_complete_eml.tpl b/view/is/smarty3/intro_complete_eml.tpl index 11b6bbd46..feab4d6f6 100644 --- a/view/is/smarty3/intro_complete_eml.tpl +++ b/view/is/smarty3/intro_complete_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Góðan daginn {{$username}}, diff --git a/view/is/smarty3/lostpass_eml.tpl b/view/is/smarty3/lostpass_eml.tpl index a6f83ed51..2ff6812ae 100644 --- a/view/is/smarty3/lostpass_eml.tpl +++ b/view/is/smarty3/lostpass_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Góðan dag {{$username}}, Beiðni barst á {{$sitename}} um að endursetja diff --git a/view/is/smarty3/passchanged_eml.tpl b/view/is/smarty3/passchanged_eml.tpl index 6d08a0763..8574b8278 100644 --- a/view/is/smarty3/passchanged_eml.tpl +++ b/view/is/smarty3/passchanged_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Góðan daginn {{$username}}, Lykilorð þínu hefur verið breytt einsog umbeðið var. Endilega geyma þessar diff --git a/view/is/smarty3/register_open_eml.tpl b/view/is/smarty3/register_open_eml.tpl index 8ab04b3ae..3391c08c1 100644 --- a/view/is/smarty3/register_open_eml.tpl +++ b/view/is/smarty3/register_open_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Góðan daginn {{$username}}, Takk fyrir að skrá þig á {{$sitename}}. Notandinn þinn hefur verið stofnaður. diff --git a/view/is/smarty3/register_verify_eml.tpl b/view/is/smarty3/register_verify_eml.tpl index 1e6060df9..0b16695a9 100644 --- a/view/is/smarty3/register_verify_eml.tpl +++ b/view/is/smarty3/register_verify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Beiðni um nýjan notanda barst {{$sitename}} sem krefst þíns samþykkis. diff --git a/view/is/smarty3/request_notify_eml.tpl b/view/is/smarty3/request_notify_eml.tpl index 6ecec12f3..09a80902a 100644 --- a/view/is/smarty3/request_notify_eml.tpl +++ b/view/is/smarty3/request_notify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Góðan dag {{$myname}}, diff --git a/view/is/smarty3/update_fail_eml.tpl b/view/is/smarty3/update_fail_eml.tpl index 227ee288b..c14afe557 100644 --- a/view/is/smarty3/update_fail_eml.tpl +++ b/view/is/smarty3/update_fail_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + Hæ, Ég er {{$sitename}}. Þróunarteymi friendica gáfu nýlega út uppfærslu {{$update}}, diff --git a/view/it/smarty3/htconfig.tpl b/view/it/smarty3/htconfig.tpl index f5796445b..30998b86c 100644 --- a/view/it/smarty3/htconfig.tpl +++ b/view/it/smarty3/htconfig.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/sv/smarty3/mail_received_text_body_eml.tpl b/view/sv/smarty3/mail_received_text_body_eml.tpl index ce3340785..fea4a74f0 100644 --- a/view/sv/smarty3/mail_received_text_body_eml.tpl +++ b/view/sv/smarty3/mail_received_text_body_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$from}} har skickat ett personligt meddelande till dig på {{$siteName}}. {{$title}} diff --git a/view/sv/smarty3/passchanged_eml.tpl b/view/sv/smarty3/passchanged_eml.tpl index 49afb735f..8b724f7fc 100644 --- a/view/sv/smarty3/passchanged_eml.tpl +++ b/view/sv/smarty3/passchanged_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$username}}, diff --git a/view/sv/smarty3/register_open_eml.tpl b/view/sv/smarty3/register_open_eml.tpl index 55bd64e3d..a399bd02b 100644 --- a/view/sv/smarty3/register_open_eml.tpl +++ b/view/sv/smarty3/register_open_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$username}}, Tack för att du registrerat dig på {{$sitename}}. Kontot har skapats. Här är dina inloggningsuppgifter: diff --git a/view/sv/smarty3/register_verify_eml.tpl b/view/sv/smarty3/register_verify_eml.tpl index 50c94f94a..369c9a53c 100644 --- a/view/sv/smarty3/register_verify_eml.tpl +++ b/view/sv/smarty3/register_verify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + En registreringsförfrågan som kräver svar har mottagits på {{$sitename}} diff --git a/view/sv/smarty3/request_notify_eml.tpl b/view/sv/smarty3/request_notify_eml.tpl index 22cfb46de..97a0b9618 100644 --- a/view/sv/smarty3/request_notify_eml.tpl +++ b/view/sv/smarty3/request_notify_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$myname}}, Du har just fått en kontaktförfrågan på {{$sitename}} från '{{$requestor}}' diff --git a/view/sv/smarty3/wall_received_eml.tpl b/view/sv/smarty3/wall_received_eml.tpl index cd286ecf2..7a3d673dc 100644 --- a/view/sv/smarty3/wall_received_eml.tpl +++ b/view/sv/smarty3/wall_received_eml.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$username}}, '{{$from}}' har skrivit på din profilsida. diff --git a/view/templates/404.tpl b/view/templates/404.tpl index 2d581ab8d..518ad1d29 100644 --- a/view/templates/404.tpl +++ b/view/templates/404.tpl @@ -1,6 +1 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}}

{{$message}}

diff --git a/view/templates/admin_aside.tpl b/view/templates/admin_aside.tpl index 24f07e28e..a9d26a89f 100644 --- a/view/templates/admin_aside.tpl +++ b/view/templates/admin_aside.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} diff --git a/view/templates/contacts-widget-sidebar.tpl b/view/templates/contacts-widget-sidebar.tpl index c4697a91c..5c52f4329 100644 --- a/view/templates/contacts-widget-sidebar.tpl +++ b/view/templates/contacts-widget-sidebar.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$vcard_widget}} {{$follow_widget}} {{$groups_widget}} diff --git a/view/templates/content.tpl b/view/templates/content.tpl index 811f92dd5..2cd732b28 100644 --- a/view/templates/content.tpl +++ b/view/templates/content.tpl @@ -1,7 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} +
diff --git a/view/templates/conversation.tpl b/view/templates/conversation.tpl index 24f0d120d..e46cd1395 100644 --- a/view/templates/conversation.tpl +++ b/view/templates/conversation.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$live_update}} {{foreach $threads as $thread}} diff --git a/view/templates/cropend.tpl b/view/templates/cropend.tpl index a7fb96108..8b1378917 100644 --- a/view/templates/cropend.tpl +++ b/view/templates/cropend.tpl @@ -1,5 +1 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/delegate.tpl b/view/templates/delegate.tpl index 7aa85cf39..0897b8a57 100644 --- a/view/templates/delegate.tpl +++ b/view/templates/delegate.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} +

{{$header}}

{{$desc}}
diff --git a/view/templates/dfrn_req_confirm.tpl b/view/templates/dfrn_req_confirm.tpl index c941a201d..accfd4f83 100644 --- a/view/templates/dfrn_req_confirm.tpl +++ b/view/templates/dfrn_req_confirm.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} +

{{$welcome}} diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl index 82d5f67e9..d72478586 100644 --- a/view/templates/dfrn_request.tpl +++ b/view/templates/dfrn_request.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} +

{{$header}}

diff --git a/view/templates/diasp_dec_hdr.tpl b/view/templates/diasp_dec_hdr.tpl index c3305ecd0..136d1ca30 100644 --- a/view/templates/diasp_dec_hdr.tpl +++ b/view/templates/diasp_dec_hdr.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$inner_iv}} {{$inner_key}} diff --git a/view/templates/diaspora_comment.tpl b/view/templates/diaspora_comment.tpl index 8df3842d0..107cc7302 100644 --- a/view/templates/diaspora_comment.tpl +++ b/view/templates/diaspora_comment.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_comment_relay.tpl b/view/templates/diaspora_comment_relay.tpl index c01441e3c..b4f84dc84 100644 --- a/view/templates/diaspora_comment_relay.tpl +++ b/view/templates/diaspora_comment_relay.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_conversation.tpl b/view/templates/diaspora_conversation.tpl index fd11b826a..28e4cdb98 100644 --- a/view/templates/diaspora_conversation.tpl +++ b/view/templates/diaspora_conversation.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_like.tpl b/view/templates/diaspora_like.tpl index b35ec46ad..165b0f5f7 100644 --- a/view/templates/diaspora_like.tpl +++ b/view/templates/diaspora_like.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_like_relay.tpl b/view/templates/diaspora_like_relay.tpl index 379bf0f45..e1696e722 100644 --- a/view/templates/diaspora_like_relay.tpl +++ b/view/templates/diaspora_like_relay.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_message.tpl b/view/templates/diaspora_message.tpl index e1690734f..fe0ab4b5f 100644 --- a/view/templates/diaspora_message.tpl +++ b/view/templates/diaspora_message.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_photo.tpl b/view/templates/diaspora_photo.tpl index 258a9c2f4..033049957 100644 --- a/view/templates/diaspora_photo.tpl +++ b/view/templates/diaspora_photo.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_post.tpl b/view/templates/diaspora_post.tpl index b5a79c194..d6ba97327 100644 --- a/view/templates/diaspora_post.tpl +++ b/view/templates/diaspora_post.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_profile.tpl b/view/templates/diaspora_profile.tpl index e57b82820..afbbb1e1a 100644 --- a/view/templates/diaspora_profile.tpl +++ b/view/templates/diaspora_profile.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$handle}} diff --git a/view/templates/diaspora_relay_retraction.tpl b/view/templates/diaspora_relay_retraction.tpl index 97a1344c9..b3f97a2e1 100644 --- a/view/templates/diaspora_relay_retraction.tpl +++ b/view/templates/diaspora_relay_retraction.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_relayable_retraction.tpl b/view/templates/diaspora_relayable_retraction.tpl index c25e13db1..2ae776d1d 100644 --- a/view/templates/diaspora_relayable_retraction.tpl +++ b/view/templates/diaspora_relayable_retraction.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_reshare.tpl b/view/templates/diaspora_reshare.tpl index c2b4bf774..6a4776b1b 100644 --- a/view/templates/diaspora_reshare.tpl +++ b/view/templates/diaspora_reshare.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_retract.tpl b/view/templates/diaspora_retract.tpl index 345f4bcb6..3ddfcabfa 100644 --- a/view/templates/diaspora_retract.tpl +++ b/view/templates/diaspora_retract.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_share.tpl b/view/templates/diaspora_share.tpl index 5ff04440d..0142ab36c 100644 --- a/view/templates/diaspora_share.tpl +++ b/view/templates/diaspora_share.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_signed_retract.tpl b/view/templates/diaspora_signed_retract.tpl index 58c5cc237..83d0def4d 100644 --- a/view/templates/diaspora_signed_retract.tpl +++ b/view/templates/diaspora_signed_retract.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/diaspora_vcard.tpl b/view/templates/diaspora_vcard.tpl index 5ea6335a8..25a0fe0fc 100644 --- a/view/templates/diaspora_vcard.tpl +++ b/view/templates/diaspora_vcard.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} +
Nickname
diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl index ed1115de9..29393aeda 100644 --- a/view/templates/directory_header.tpl +++ b/view/templates/directory_header.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} +

{{$sitedir}}

{{$globaldir}} diff --git a/view/templates/directory_item.tpl b/view/templates/directory_item.tpl index ae52646b8..b43fcd28c 100644 --- a/view/templates/directory_item.tpl +++ b/view/templates/directory_item.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} +
diff --git a/view/templates/display-head.tpl b/view/templates/display-head.tpl index 7750b655e..2050cdec0 100644 --- a/view/templates/display-head.tpl +++ b/view/templates/display-head.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + diff --git a/view/templates/events-js.tpl b/view/templates/events-js.tpl index 5fa046f5a..ed9354bde 100644 --- a/view/templates/events-js.tpl +++ b/view/templates/events-js.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$tabs}}

{{$title}}

diff --git a/view/templates/events.tpl b/view/templates/events.tpl index f798a8e37..525a5e067 100644 --- a/view/templates/events.tpl +++ b/view/templates/events.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{$tabs}}

{{$title}}

diff --git a/view/templates/events_reminder.tpl b/view/templates/events_reminder.tpl index 3448ea45c..df163b815 100644 --- a/view/templates/events_reminder.tpl +++ b/view/templates/events_reminder.tpl @@ -1,8 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} + {{if $count}}