diff --git a/boot.php b/boot.php index f4dce840f..77be9ac26 100644 --- a/boot.php +++ b/boot.php @@ -969,16 +969,7 @@ if(! function_exists('login')) { $a->module = 'login'; } - - $includes = array( - '$field_input' => 'field_input.tpl', - '$field_password' => 'field_password.tpl', - '$field_openid' => 'field_openid.tpl', - '$field_checkbox' => 'field_checkbox.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros($tpl,$includes + array( + $o .= replace_macros($tpl, array( '$dest_url' => $dest_url, '$logout' => t('Logout'), @@ -997,6 +988,13 @@ if(! function_exists('login')) { '$lostpass' => t('Forgot your password?'), '$lostlink' => t('Password Reset'), + + '$tostitle' => t('Website Terms of Service'), + '$toslink' => t('terms of service'), + + '$privacytitle' => t('Website Privacy Policy'), + '$privacylink' => t('privacy policy'), + )); call_hooks('login_hook',$o); @@ -1348,15 +1346,10 @@ if(! function_exists('profile_sidebar')) { $tpl = get_markup_template('profile_vcard.tpl'); - $includes = array( - '$diaspora_vcard' => 'diaspora_vcard.tpl' - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - if($a->theme['template_engine'] === 'internal') $location = template_escape($location); - $o .= replace_macros($tpl, $includes + array( + $o .= replace_macros($tpl, array( '$profile' => $profile, '$connect' => $connect, '$wallmessage' => $wallmessage, @@ -1365,7 +1358,7 @@ if(! function_exists('profile_sidebar')) { '$pdesc' => $pdesc, '$marital' => $marital, '$homepage' => $homepage, - '$diaspora_info' => $diaspora, + '$diaspora' => $diaspora, '$contact_block' => $contact_block, )); @@ -1946,3 +1939,18 @@ function clear_cache($basepath = "", $path = "") { closedir($dh); } } + +function set_template_engine(&$a, $engine = 'internal') { + + $a->theme['template_engine'] = 'internal'; + + if(is_writable('view/smarty3/')) { + switch($engine) { + case 'smarty3': + $a->theme['template_engine'] = 'smarty3'; + break; + default: + break; + } + } +} diff --git a/include/auth.php b/include/auth.php index b534d4a4d..4c695cc1e 100644 --- a/include/auth.php +++ b/include/auth.php @@ -5,6 +5,8 @@ require_once('include/security.php'); require_once('include/datetime.php'); function nuke_session() { + new_cookie(0); // make sure cookie is deleted on browser close, as a security measure + unset($_SESSION['authenticated']); unset($_SESSION['uid']); unset($_SESSION['visitor_id']); @@ -187,18 +189,10 @@ else { // (i.e. expire when the browser is closed), even when there's a time expiration // on the cookie if($_POST['remember']) { - $old_sid = session_id(); - session_set_cookie_params('31449600'); // one year - session_regenerate_id(false); - - q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid)); + new_cookie(31449600); // one year } else { - $old_sid = session_id(); - session_set_cookie_params('0'); - session_regenerate_id(false); - - q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid)); + new_cookie(0); // 0 means delete on browser exit } // if we haven't failed up this point, log them in. @@ -208,4 +202,10 @@ else { } } +function new_cookie($time) { + $old_sid = session_id(); + session_set_cookie_params("$time"); + session_regenerate_id(false); + q("UPDATE session SET sid = '%s' WHERE sid = '%s'", dbesc(session_id()), dbesc($old_sid)); +} diff --git a/include/conversation.php b/include/conversation.php index 9cc6a8342..1f416f352 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -703,6 +703,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $o = replace_macros($page_template, array( '$baseurl' => $a->get_baseurl($ssl_state), '$live_update' => $live_update_div, + '$remove' => t('remove'), '$mode' => $mode, '$user' => $a->user, '$threads' => $threads, @@ -920,7 +921,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { $o = ''; - $geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : ''); + $geotag = (($x['allow_location']) ? replace_macros(get_markup_template('jot_geotag.tpl'), array()) : ''); /* $plaintext = false; if( local_user() && (intval(get_pconfig(local_user(),'system','plaintext')) || !feature_enabled(local_user(),'richtext')) ) diff --git a/include/friendica_smarty.php b/include/friendica_smarty.php index 2a294e9e2..9ad14ad8a 100644 --- a/include/friendica_smarty.php +++ b/include/friendica_smarty.php @@ -5,20 +5,24 @@ require_once("library/Smarty/libs/Smarty.class.php"); class FriendicaSmarty extends Smarty { public $filename; - public $root; function __construct() { parent::__construct(); $a = get_app(); + $theme = current_theme(); - //$this->root = $_SERVER['DOCUMENT_ROOT'] . '/'; - $this->root = ''; + // setTemplateDir can be set to an array, which Smarty will parse in order. + // The order is thus very important here + $template_dirs = array('theme' => "view/theme/$theme/smarty3/"); + if( x($a->theme_info,"extends") ) + $template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/smarty3/"); + $template_dirs = $template_dirs + array('base' => 'view/smarty3/'); + $this->setTemplateDir($template_dirs); - $this->setTemplateDir($this->root . 'view/smarty3/'); - $this->setCompileDir($this->root . 'view/smarty3/compiled/'); - $this->setConfigDir($this->root . 'view/smarty3/config/'); - $this->setCacheDir($this->root . 'view/smarty3/cache/'); + $this->setCompileDir('view/smarty3/compiled/'); + $this->setConfigDir('view/smarty3/config/'); + $this->setCacheDir('view/smarty3/cache/'); $this->left_delimiter = $a->smarty3_ldelim; $this->right_delimiter = $a->smarty3_rdelim; @@ -28,7 +32,7 @@ class FriendicaSmarty extends Smarty { if($template) { return $this->fetch('string:' . $template); } - return $this->fetch('file:' . $this->root . $this->filename); + return $this->fetch('file:' . $this->filename); } } diff --git a/include/text.php b/include/text.php index 0591390a8..628da1c1b 100644 --- a/include/text.php +++ b/include/text.php @@ -499,21 +499,6 @@ function get_template_file($a, $filename, $root = '') { return $template_file; }} -if(! function_exists("set_template_includes")) { -function set_template_includes($engine, $includes) { - if($engine === 'smarty3') { - $a = get_app(); - foreach($includes as $name=>$path) { -// $sm_includes[$name] = $_SERVER['DOCUMENT_ROOT'] . '/' . get_template_file($a, 'smarty3/' . $path); - $sm_includes[$name] = get_template_file($a, 'smarty3/' . $path); - } - return $sm_includes; - } - else { - return $includes; - } -}} - diff --git a/mod/admin.php b/mod/admin.php index c951dd8b9..0381fcf4c 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -455,16 +455,7 @@ function admin_page_site(&$a) { ); $t = get_markup_template("admin_site.tpl"); - - $includes = array( - '$field_checkbox' => 'field_checkbox.tpl', - '$field_input' => 'field_input.tpl', - '$field_select' => 'field_select.tpl', - '$field_textarea' => 'field_textarea.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - return replace_macros($t, $includes + array( + return replace_macros($t, array( '$title' => t('Administration'), '$page' => t('Site'), '$submit' => t('Submit'), @@ -1144,14 +1135,7 @@ readable."); } } - $includes = array( - '$field_checkbox' => 'field_checkbox.tpl', - '$field_input' => 'field_input.tpl', - '$field_select' => 'field_select.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - return replace_macros($t, $includes + array( + return replace_macros($t, array( '$title' => t('Administration'), '$page' => t('Logs'), '$submit' => t('Submit'), @@ -1210,14 +1194,7 @@ function admin_page_remoteupdate(&$a) { } $tpl = get_markup_template("admin_remoteupdate.tpl"); - - $includes = array( - '$field_input' => 'field_input.tpl', - '$field_password' => 'field_password.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - return replace_macros($tpl, $includes + array( + return replace_macros($tpl, array( '$baseurl' => $a->get_baseurl(true), '$submit' => t("Update now"), '$close' => t("Close"), diff --git a/mod/contacts.php b/mod/contacts.php index 1a57afbf5..6e62ec8ef 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -346,12 +346,7 @@ function contacts_content(&$a) { $lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : ''); - $includes = array( - '$field_checkbox' => 'field_checkbox.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros($tpl,$includes + array( + $o .= replace_macros($tpl, array( '$header' => t('Contact Editor'), '$tab_str' => $tab_str, '$submit' => t('Submit'), @@ -576,13 +571,7 @@ function contacts_content(&$a) { } $tpl = get_markup_template("contacts-template.tpl"); - - $includes = array( - '$contact_template' => 'contact_template.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros($tpl,$includes + array( + $o .= replace_macros($tpl, array( '$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''), '$tabs' => $t, '$total' => $total, diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 92c6bd3b4..075846e50 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -78,6 +78,7 @@ function fbrowser_content($a){ '$path' => $path, '$folders' => $albums, '$files' =>$files, + '$cancel' => t('Cancel'), )); @@ -112,6 +113,7 @@ function fbrowser_content($a){ '$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Files")) ), '$folders' => false, '$files' =>$files, + '$cancel' => t('Cancel'), )); } diff --git a/mod/filer.php b/mod/filer.php index 7b0fd59d5..4e79f337d 100644 --- a/mod/filer.php +++ b/mod/filer.php @@ -24,13 +24,8 @@ function filer_content(&$a) { $filetags = get_pconfig(local_user(),'system','filetags'); $filetags = file_tag_file_to_list($filetags,'file'); $filetags = explode(",", $filetags); + $tpl = get_markup_template("filer_dialog.tpl"); - - $includes = array( - '$field_combobox' => 'field_combobox.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - $o = replace_macros($tpl, array( '$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')), '$submit' => t('Save'), diff --git a/mod/group.php b/mod/group.php index f5a37819e..13a899ed9 100644 --- a/mod/group.php +++ b/mod/group.php @@ -83,13 +83,7 @@ function group_content(&$a) { $tpl = get_markup_template('group_edit.tpl'); - $includes = array( - '$field_input' => 'field_input.tpl', - '$groupeditortpl' => 'groupeditor.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $context = $includes + array( + $context = array( '$submit' => t('Submit'), ); diff --git a/mod/install.php b/mod/install.php index ab6d7d204..d4e04c1a9 100755 --- a/mod/install.php +++ b/mod/install.php @@ -177,6 +177,8 @@ function install_content(&$a) { check_htconfig($checks); + check_smarty3($checks); + check_keys($checks); if(x($_POST,'phpath')) @@ -220,14 +222,7 @@ function install_content(&$a) { $tpl = get_markup_template('install_db.tpl'); - - $includes = array( - '$field_input' => 'field_input.tpl', - '$field_password' => 'field_password.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros($tpl,$includes + array( + $o .= replace_macros($tpl, array( '$title' => $install_title, '$pass' => t('Database connection'), '$info_01' => t('In order to install Friendica we need to know how to connect to your database.'), @@ -267,13 +262,7 @@ function install_content(&$a) { $timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles'); $tpl = get_markup_template('install_settings.tpl'); - - $includes = array( - '$field_input' => 'field_input.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros($tpl, $includes + array( + $o .= replace_macros($tpl, array( '$title' => $install_title, '$pass' => t('Site settings'), @@ -441,6 +430,22 @@ function check_htconfig(&$checks) { } +function check_smarty3(&$checks) { + $status = true; + $help = ""; + if( !is_writable('view/smarty3') ) { + + $status=false; + $help = t('Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') .EOL; + $help .= t('In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder.').EOL; + $help .= t('Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.').EOL; + $help .= t('Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains.').EOL; + } + + check_add($checks, t('view/smarty3 is writable'), $status, true, $help); + +} + function check_htaccess(&$checks) { $a = get_app(); $status = true; diff --git a/mod/message.php b/mod/message.php index 7ca3fba70..057797ddd 100644 --- a/mod/message.php +++ b/mod/message.php @@ -282,25 +282,23 @@ function message_content(&$a) { $tpl = get_markup_template('prv_message.tpl'); $o .= replace_macros($tpl,array( - '$reply' => array( - 'header' => t('Send Private Message'), - 'to' => t('To:'), - 'showinputs' => 'true', - 'prefill' => $prefill, - 'autocomp' => $autocomp, - 'preid' => $preid, - 'subject' => t('Subject:'), - 'subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''), - 'text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''), - 'readonly' => '', - 'yourmessage' => t('Your message:'), - 'select' => $select, - 'parent' => '', - 'upload' => t('Upload photo'), - 'insert' => t('Insert web link'), - 'wait' => t('Please wait'), - 'submit' => t('Submit') - ) + '$header' => t('Send Private Message'), + '$to' => t('To:'), + '$showinputs' => 'true', + '$prefill' => $prefill, + '$autocomp' => $autocomp, + '$preid' => $preid, + '$subject' => t('Subject:'), + '$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''), + '$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''), + '$readonly' => '', + '$yourmessage' => t('Your message:'), + '$select' => $select, + '$parent' => '', + '$upload' => t('Upload photo'), + '$insert' => t('Insert web link'), + '$wait' => t('Please wait'), + '$submit' => t('Submit') )); return $o; @@ -497,12 +495,6 @@ function message_content(&$a) { $tpl = get_markup_template('mail_display.tpl'); - $includes = array( - '$mail_conv' => 'mail_conv.tpl', - '$prv_message' => 'prv_message.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - if($a->theme['template_engine'] === 'internal') { $subjtxt_e = template_escape($message['title']); } @@ -510,7 +502,7 @@ function message_content(&$a) { $subjtxt_e = $message['title']; } - $o = replace_macros($tpl, $includes + array( + $o = replace_macros($tpl, array( '$thread_id' => $a->argv[1], '$thread_subject' => $message['title'], '$thread_seen' => $seen, @@ -520,22 +512,20 @@ function message_content(&$a) { '$mails' => $mails, // reply - '$reply_info' => array( - 'header' => t('Send Reply'), - 'to' => t('To:'), - 'showinputs' => '', - 'subject' => t('Subject:'), - 'subjtxt' => $subjtxt_e, - 'readonly' => ' readonly="readonly" style="background: #BBBBBB;" ', - 'yourmessage' => t('Your message:'), - 'text' => '', - 'select' => $select, - 'parent' => $parent, - 'upload' => t('Upload photo'), - 'insert' => t('Insert web link'), - 'submit' => t('Submit'), - 'wait' => t('Please wait'), - ), + '$header' => t('Send Reply'), + '$to' => t('To:'), + '$showinputs' => '', + '$subject' => t('Subject:'), + '$subjtxt' => template_escape($message['title']), + '$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ', + '$yourmessage' => t('Your message:'), + '$text' => '', + '$select' => $select, + '$parent' => $parent, + '$upload' => t('Upload photo'), + '$insert' => t('Insert web link'), + '$submit' => t('Submit'), + '$wait' => t('Please wait') )); diff --git a/mod/nogroup.php b/mod/nogroup.php index 885ba62c6..24d99a59b 100644 --- a/mod/nogroup.php +++ b/mod/nogroup.php @@ -55,13 +55,7 @@ function nogroup_content(&$a) { } $tpl = get_markup_template("nogroup-template.tpl"); - - $includes = array( - '$contact_template' => 'contact_template.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros($tpl,$includes + array( + $o .= replace_macros($tpl, array( '$header' => t('Contacts who are not members of a group'), '$contacts' => $contacts, '$paginate' => paginate($a), diff --git a/mod/notifications.php b/mod/notifications.php index 03a39a268..9c14737f7 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -145,12 +145,7 @@ function notifications_content(&$a) { $return_addr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : '')); - $includes = array( - '$field_checkbox' => 'field_checkbox.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $notif_content .= replace_macros($sugg,$includes + array( + $notif_content .= replace_macros($sugg, array( '$str_notifytype' => t('Notification type: '), '$notify_type' => t('Friend Suggestion'), '$intro_id' => $rr['intro_id'], @@ -196,12 +191,7 @@ function notifications_content(&$a) { )); } - $includes = array( - '$field_checkbox' => 'field_checkbox.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $notif_content .= replace_macros($tpl,$includes + array( + $notif_content .= replace_macros($tpl, array( '$str_notifytype' => t('Notification type: '), '$notify_type' => (($rr['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')), '$dfrn_text' => $dfrn_text, @@ -226,14 +216,9 @@ function notifications_content(&$a) { else info( t('No introductions.') . EOL); - $includes = array( - '$common_tabs' => 'common_tabs.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros($notif_tpl,$includes + array( + $o .= replace_macros($notif_tpl, array( '$notif_header' => t('Notifications'), - '$tabs_data' => $tabs, + '$tabs' => $tabs, '$notif_content' => $notif_content, )); @@ -317,14 +302,9 @@ function notifications_content(&$a) { $notif_content = t('No more network notifications.'); } - $includes = array( - '$common_tabs' => 'common_tabs.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros($notif_tpl,$includes + array( + $o .= replace_macros($notif_tpl, array( '$notif_header' => t('Network Notifications'), - '$tabs_data' => $tabs, + '$tabs' => $tabs, '$notif_content' => $notif_content, )); @@ -352,14 +332,9 @@ function notifications_content(&$a) { $notif_content .= t('No more system notifications.'); } - $includes = array( - '$common_tabs' => 'common_tabs.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros($notif_tpl,$includes + array( + $o .= replace_macros($notif_tpl, array( '$notif_header' => t('System Notifications'), - '$tabs_data' => $tabs, + '$tabs' => $tabs, '$notif_content' => $notif_content, )); @@ -452,14 +427,9 @@ function notifications_content(&$a) { $notif_content = t('No more personal notifications.'); } - $includes = array( - '$common_tabs' => 'common_tabs.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros($notif_tpl,$includes + array( + $o .= replace_macros($notif_tpl, array( '$notif_header' => t('Personal Notifications'), - '$tabs_data' => $tabs, + '$tabs' => $tabs, '$notif_content' => $notif_content, )); @@ -538,14 +508,9 @@ function notifications_content(&$a) { $notif_content = t('No more home notifications.'); } - $includes = array( - '$common_tabs' => 'common_tabs.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros($notif_tpl,$includes + array( + $o .= replace_macros($notif_tpl, array( '$notif_header' => t('Home Notifications'), - '$tabs_data' => $tabs, + '$tabs' => $tabs, '$notif_content' => $notif_content, )); } diff --git a/mod/notify.php b/mod/notify.php index 3abc1185c..b4d60a747 100644 --- a/mod/notify.php +++ b/mod/notify.php @@ -61,14 +61,9 @@ function notify_content(&$a) { $notif_content .= t('No more system notifications.'); } - $includes = array( - '$common_tabs' => 'common_tabs.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros($notif_tpl,$includes + array( + $o .= replace_macros($notif_tpl, array( '$notif_header' => t('System Notifications'), - '$tabs_data' => '', // $tabs, + '$tabs' => '', // $tabs, '$notif_content' => $notif_content, )); diff --git a/mod/photos.php b/mod/photos.php index 8ac4d8590..7035c6690 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -1679,13 +1679,7 @@ function photos_content(&$a) { } $tpl = get_markup_template('photos_recent.tpl'); - - $includes = array( - '$photo_top' => 'photo_top.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros($tpl,$includes + array( + $o .= replace_macros($tpl, array( '$title' => t('Recent Photos'), '$can_post' => $can_post, '$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['user']['nickname'].'/upload'), diff --git a/mod/poco.php b/mod/poco.php index abe2c8e35..ae5f0cef4 100644 --- a/mod/poco.php +++ b/mod/poco.php @@ -147,13 +147,7 @@ function poco_init(&$a) { if($format === 'xml') { header('Content-type: text/xml'); - - $includes = array( - '$poco_entry_xml' => 'poco_entry_xml.tpl' - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify($includes + array('$response' => $ret))); + echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify(array('$response' => $ret))); http_status_exit(500); } if($format === 'json') { diff --git a/mod/profile.php b/mod/profile.php index 15a022421..9e9af1983 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -33,7 +33,7 @@ function profile_init(&$a) { auto_redir($a, $which); } - $a->theme["template_engine"] = 'internal'; // reset the template engine to the default in case the user's theme doesn't specify one + set_template_engine($a); // reset the template engine to the default in case the user's theme doesn't specify one profile_load($a,$which,$profile); $blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false); diff --git a/mod/settings.php b/mod/settings.php index 09a45f832..dbdd40bc3 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -554,13 +554,7 @@ function settings_content(&$a) { if(($a->argc > 2) && ($a->argv[2] === 'add')) { $tpl = get_markup_template("settings_oauth_edit.tpl"); - - $includes = array( - '$field_input' => 'field_input.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros($tpl, $includes + array( + $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_oauth"), '$title' => t('Add application'), '$submit' => t('Submit'), @@ -586,13 +580,7 @@ function settings_content(&$a) { $app = $r[0]; $tpl = get_markup_template("settings_oauth_edit.tpl"); - - $includes = array( - '$field_input' => 'field_input.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros($tpl, $includes + array( + $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_oauth"), '$title' => t('Add application'), '$submit' => t('Update'), @@ -675,13 +663,7 @@ function settings_content(&$a) { $tpl = get_markup_template("settings_features.tpl"); - - $includes = array( - '$field_yesno' => 'field_yesno.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros($tpl, $includes + array( + $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_features"), '$title' => t('Additional Features'), '$features' => $arr, @@ -733,16 +715,7 @@ function settings_content(&$a) { } - $includes = array( - '$field_checkbox' => 'field_checkbox.tpl', - '$field_input' => 'field_input.tpl', - '$field_select' => 'field_select.tpl', - '$field_custom' => 'field_custom.tpl', - '$field_password' => 'field_password.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros($tpl, $includes + array( + $o .= replace_macros($tpl, array( '$form_security_token' => get_form_security_token("settings_connectors"), '$title' => t('Connector Settings'), @@ -832,15 +805,7 @@ function settings_content(&$a) { } $tpl = get_markup_template("settings_display.tpl"); - - $includes = array( - '$field_themeselect' => 'field_themeselect.tpl', - '$field_checkbox' => 'field_checkbox.tpl', - '$field_input' => 'field_input.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o = replace_macros($tpl, $includes + array( + $o = replace_macros($tpl, array( '$ptitle' => t('Display Settings'), '$form_security_token' => get_form_security_token("settings_display"), '$submit' => t('Submit'), @@ -926,13 +891,7 @@ function settings_content(&$a) { $pageset_tpl = get_markup_template('pagetypes.tpl'); - - $includes = array( - '$field_radio' => 'field_radio.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $pagetype = replace_macros($pageset_tpl,$includes + array( + $pagetype = replace_macros($pageset_tpl, array( '$page_normal' => array('page-flags', t('Normal Account Page'), PAGE_NORMAL, t('This account is a normal personal profile'), ($a->user['page-flags'] == PAGE_NORMAL)), @@ -1053,17 +1012,7 @@ function settings_content(&$a) { require_once('include/group.php'); $group_select = mini_group_select(local_user(),$a->user['def_gid']); - $includes = array( - '$field_password' => 'field_password.tpl', - '$field_input' => 'field_input.tpl', - '$field_custom' => 'field_custom.tpl', - '$field_checkbox' => 'field_checkbox.tpl', - '$field_yesno' => 'field_yesno.tpl', - '$field_intcheckbox' => 'field_intcheckbox.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros($stpl,$includes + array( + $o .= replace_macros($stpl, array( '$ptitle' => t('Account Settings'), '$submit' => t('Submit'), diff --git a/mod/uimport.php b/mod/uimport.php index d28198f69..6cca08cda 100644 --- a/mod/uimport.php +++ b/mod/uimport.php @@ -60,13 +60,7 @@ function uimport_content(&$a) { $tpl = get_markup_template("uimport.tpl"); - - $includes = array( - '$field_custom' => 'field_custom.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - return replace_macros($tpl, $includes + array( + return replace_macros($tpl, array( '$regbutt' => t('Import'), '$import' => array( 'title' => t("Move account"), diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index f54a76be4..8e261e711 100644 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@ -72,13 +72,7 @@ function viewcontacts_content(&$a) { $tpl = get_markup_template("viewcontact_template.tpl"); - - $includes = array( - '$contact_template' => 'contact_template.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros($tpl, $includes + array( + $o .= replace_macros($tpl, array( '$title' => t('View Contacts'), '$contacts' => $contacts, '$paginate' => paginate($a), diff --git a/object/Item.php b/object/Item.php index 4da5b8a59..eef8a5058 100644 --- a/object/Item.php +++ b/object/Item.php @@ -285,7 +285,6 @@ class Item extends BaseObject { 'comment' => $this->get_comment_box($indent), 'previewing' => ($conv->is_preview() ? ' preview ' : ''), 'wait' => t('Please wait'), - 'remove' => t('remove'), 'thread_level' => $thread_level ); diff --git a/view/admin_logs.tpl b/view/admin_logs.tpl index db1b00c11..b777cf420 100644 --- a/view/admin_logs.tpl +++ b/view/admin_logs.tpl @@ -4,9 +4,9 @@
- {{ inc $field_checkbox with $field=$debugging }}{{ endinc }} - {{ inc $field_input with $field=$logfile }}{{ endinc }} - {{ inc $field_select with $field=$loglevel }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$debugging }}{{ endinc }} + {{ inc field_input.tpl with $field=$logfile }}{{ endinc }} + {{ inc field_select.tpl with $field=$loglevel }}{{ endinc }}
diff --git a/view/admin_remoteupdate.tpl b/view/admin_remoteupdate.tpl index 844cbad27..874c6e626 100644 --- a/view/admin_remoteupdate.tpl +++ b/view/admin_remoteupdate.tpl @@ -84,10 +84,10 @@

Your friendica installation is not writable by web server.

{{ if $canftp }}

You can try to update via FTP

- {{ inc $field_input with $field=$ftphost }}{{ endinc }} - {{ inc $field_input with $field=$ftppath }}{{ endinc }} - {{ inc $field_input with $field=$ftpuser }}{{ endinc }} - {{ inc $field_password with $field=$ftppwd }}{{ endinc }} + {{ inc field_input.tpl with $field=$ftphost }}{{ endinc }} + {{ inc field_input.tpl with $field=$ftppath }}{{ endinc }} + {{ inc field_input.tpl with $field=$ftpuser }}{{ endinc }} + {{ inc field_password.tpl with $field=$ftppwd }}{{ endinc }}
{{ endif }} {{ endif }} diff --git a/view/admin_site.tpl b/view/admin_site.tpl index 4892dc314..38d1fb8d0 100644 --- a/view/admin_site.tpl +++ b/view/admin_site.tpl @@ -53,32 +53,32 @@

$registration

- {{ inc $field_input with $field=$register_text }}{{ endinc }} - {{ inc $field_select with $field=$register_policy }}{{ endinc }} - {{ inc $field_input with $field=$daily_registrations }}{{ endinc }} - {{ inc $field_checkbox with $field=$no_multi_reg }}{{ endinc }} - {{ inc $field_checkbox with $field=$no_openid }}{{ endinc }} - {{ inc $field_checkbox with $field=$no_regfullname }}{{ endinc }} + {{ inc field_input.tpl with $field=$register_text }}{{ endinc }} + {{ inc field_select.tpl with $field=$register_policy }}{{ endinc }} + {{ inc field_input.tpl with $field=$daily_registrations }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}

$upload

- {{ inc $field_input with $field=$maximagesize }}{{ endinc }} - {{ inc $field_input with $field=$maximagelength }}{{ endinc }} - {{ inc $field_input with $field=$jpegimagequality }}{{ endinc }} + {{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }} + {{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }} + {{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}

$corporate

- {{ inc $field_input with $field=$allowed_sites }}{{ endinc }} - {{ inc $field_input with $field=$allowed_email }}{{ endinc }} - {{ inc $field_checkbox with $field=$block_public }}{{ endinc }} - {{ inc $field_checkbox with $field=$force_publish }}{{ endinc }} - {{ inc $field_checkbox with $field=$no_community_page }}{{ endinc }} - {{ inc $field_checkbox with $field=$ostatus_disabled }}{{ endinc }} - {{ inc $field_checkbox with $field=$diaspora_enabled }}{{ endinc }} - {{ inc $field_checkbox with $field=$dfrn_only }}{{ endinc }} - {{ inc $field_input with $field=$global_directory }}{{ endinc }} - {{ inc $field_checkbox with $field=$thread_allow }}{{ endinc }} - {{ inc $field_checkbox with $field=$newuser_private }}{{ endinc }} + {{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }} + {{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }} + {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
diff --git a/view/api_friends_xml.tpl b/view/api_friends_xml.tpl index 1cabd295d..9bdf53222 100644 --- a/view/api_friends_xml.tpl +++ b/view/api_friends_xml.tpl @@ -2,6 +2,6 @@ {{for $users as $u }} - {{inc $api_user_xml with $user=$u }}{{endinc}} + {{inc api_user_xml.tpl with $user=$u }}{{endinc}} {{endfor}} diff --git a/view/api_timeline_xml.tpl b/view/api_timeline_xml.tpl index df55d807a..4a32b411b 100644 --- a/view/api_timeline_xml.tpl +++ b/view/api_timeline_xml.tpl @@ -10,7 +10,7 @@ $status.in_reply_to_screen_name $status.geo $status.favorited -{{ inc $api_user_xml with $user=$status.user }}{{ endinc }} $status.statusnet_html +{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }} $status.statusnet_html $status.statusnet_conversation_id $status.url $status.coordinates diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl index a11e252b4..c68ca7f1d 100644 --- a/view/contact_edit.tpl +++ b/view/contact_edit.tpl @@ -65,7 +65,7 @@ {{ endif }}
- {{inc $field_checkbox with $field=$hidden }}{{endinc}} + {{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}

$lbl_info1

diff --git a/view/contacts-template.tpl b/view/contacts-template.tpl index efd426bba..69e3202c3 100644 --- a/view/contacts-template.tpl +++ b/view/contacts-template.tpl @@ -15,7 +15,7 @@ $tabs {{ for $contacts as $c }} - {{ inc $contact_template with $contact=$c }}{{ endinc }} + {{ inc contact_template.tpl with $contact=$c }}{{ endinc }} {{ endfor }}
diff --git a/view/de/messages.po b/view/de/messages.po index a1ba4ac6d..95224e538 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-12-18 10:00-0800\n" -"PO-Revision-Date: 2012-12-21 12:00+0000\n" +"POT-Creation-Date: 2012-12-22 10:00-0800\n" +"PO-Revision-Date: 2012-12-24 08:27+0000\n" "Last-Translator: bavatar \n" "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -55,8 +55,8 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:995 #: ../../mod/editpost.php:10 ../../mod/install.php:151 ../../mod/poke.php:135 #: ../../mod/notifications.php:66 ../../mod/contacts.php:147 -#: ../../mod/settings.php:91 ../../mod/settings.php:541 -#: ../../mod/settings.php:546 ../../mod/manage.php:90 ../../mod/network.php:6 +#: ../../mod/settings.php:91 ../../mod/settings.php:542 +#: ../../mod/settings.php:547 ../../mod/manage.php:90 ../../mod/network.php:6 #: ../../mod/notes.php:20 ../../mod/uimport.php:23 ../../mod/wallmessage.php:9 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 @@ -108,8 +108,8 @@ msgstr "Bitte nutze den Zurück-Button deines Browsers jetzt, w msgid "Return to contact editor" msgstr "Zurück zum Kontakteditor" -#: ../../mod/crepair.php:148 ../../mod/settings.php:561 -#: ../../mod/settings.php:587 ../../mod/admin.php:695 ../../mod/admin.php:705 +#: ../../mod/crepair.php:148 ../../mod/settings.php:562 +#: ../../mod/settings.php:588 ../../mod/admin.php:695 ../../mod/admin.php:705 msgid "Name" msgstr "Name" @@ -152,9 +152,9 @@ msgstr "Neues Foto von dieser URL" #: ../../mod/photos.php:1519 ../../mod/install.php:246 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199 #: ../../mod/content.php:693 ../../mod/contacts.php:352 -#: ../../mod/settings.php:559 ../../mod/settings.php:669 -#: ../../mod/settings.php:738 ../../mod/settings.php:810 -#: ../../mod/settings.php:1017 ../../mod/group.php:85 ../../mod/mood.php:137 +#: ../../mod/settings.php:560 ../../mod/settings.php:670 +#: ../../mod/settings.php:739 ../../mod/settings.php:811 +#: ../../mod/settings.php:1018 ../../mod/group.php:85 ../../mod/mood.php:137 #: ../../mod/message.php:301 ../../mod/message.php:487 ../../mod/admin.php:445 #: ../../mod/admin.php:692 ../../mod/admin.php:829 ../../mod/admin.php:1028 #: ../../mod/admin.php:1115 ../../mod/profiles.php:604 @@ -304,7 +304,7 @@ msgid "link to source" msgstr "Link zum Originalbeitrag" #: ../../mod/events.php:347 ../../view/theme/diabook/theme.php:91 -#: ../../include/nav.php:52 ../../boot.php:1748 +#: ../../include/nav.php:52 ../../boot.php:1761 msgid "Events" msgstr "Veranstaltungen" @@ -362,8 +362,8 @@ msgstr "Beschreibung" #: ../../mod/events.php:448 ../../mod/directory.php:134 #: ../../addon/forumdirectory/forumdirectory.php:156 -#: ../../include/event.php:40 ../../include/bb2diaspora.php:412 -#: ../../boot.php:1278 +#: ../../include/event.php:40 ../../include/bb2diaspora.php:415 +#: ../../boot.php:1291 msgid "Location:" msgstr "Ort:" @@ -376,8 +376,8 @@ msgid "Share this event" msgstr "Veranstaltung teilen" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:145 -#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:560 -#: ../../mod/settings.php:586 ../../addon/js_upload/js_upload.php:45 +#: ../../mod/dfrn_request.php:847 ../../mod/settings.php:561 +#: ../../mod/settings.php:587 ../../addon/js_upload/js_upload.php:45 #: ../../include/conversation.php:1009 #: ../../addon.old/js_upload/js_upload.php:45 msgid "Cancel" @@ -425,30 +425,30 @@ msgid "" msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in deinem Namen gestatten?" #: ../../mod/api.php:105 ../../mod/dfrn_request.php:835 -#: ../../mod/settings.php:933 ../../mod/settings.php:939 -#: ../../mod/settings.php:947 ../../mod/settings.php:951 -#: ../../mod/settings.php:956 ../../mod/settings.php:962 -#: ../../mod/settings.php:968 ../../mod/settings.php:974 -#: ../../mod/settings.php:1004 ../../mod/settings.php:1005 -#: ../../mod/settings.php:1006 ../../mod/settings.php:1007 -#: ../../mod/settings.php:1008 ../../mod/register.php:237 +#: ../../mod/settings.php:934 ../../mod/settings.php:940 +#: ../../mod/settings.php:948 ../../mod/settings.php:952 +#: ../../mod/settings.php:957 ../../mod/settings.php:963 +#: ../../mod/settings.php:969 ../../mod/settings.php:975 +#: ../../mod/settings.php:1005 ../../mod/settings.php:1006 +#: ../../mod/settings.php:1007 ../../mod/settings.php:1008 +#: ../../mod/settings.php:1009 ../../mod/register.php:237 #: ../../mod/profiles.php:584 msgid "Yes" msgstr "Ja" #: ../../mod/api.php:106 ../../mod/dfrn_request.php:836 -#: ../../mod/settings.php:933 ../../mod/settings.php:939 -#: ../../mod/settings.php:947 ../../mod/settings.php:951 -#: ../../mod/settings.php:956 ../../mod/settings.php:962 -#: ../../mod/settings.php:968 ../../mod/settings.php:974 -#: ../../mod/settings.php:1004 ../../mod/settings.php:1005 -#: ../../mod/settings.php:1006 ../../mod/settings.php:1007 -#: ../../mod/settings.php:1008 ../../mod/register.php:238 +#: ../../mod/settings.php:934 ../../mod/settings.php:940 +#: ../../mod/settings.php:948 ../../mod/settings.php:952 +#: ../../mod/settings.php:957 ../../mod/settings.php:963 +#: ../../mod/settings.php:969 ../../mod/settings.php:975 +#: ../../mod/settings.php:1005 ../../mod/settings.php:1006 +#: ../../mod/settings.php:1007 ../../mod/settings.php:1008 +#: ../../mod/settings.php:1009 ../../mod/register.php:238 #: ../../mod/profiles.php:585 msgid "No" msgstr "Nein" -#: ../../mod/photos.php:51 ../../boot.php:1741 +#: ../../mod/photos.php:51 ../../boot.php:1754 msgid "Photo Albums" msgstr "Fotoalben" @@ -672,7 +672,7 @@ msgid "This is you" msgstr "Das bist du" #: ../../mod/photos.php:1402 ../../mod/photos.php:1446 -#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:608 +#: ../../mod/photos.php:1518 ../../mod/content.php:692 ../../boot.php:621 #: ../../object/Item.php:267 ../../object/Item.php:576 msgid "Comment" msgstr "Kommentar" @@ -685,7 +685,7 @@ msgid "Preview" msgstr "Vorschau" #: ../../mod/photos.php:1488 ../../mod/content.php:439 -#: ../../mod/content.php:724 ../../mod/settings.php:622 +#: ../../mod/content.php:724 ../../mod/settings.php:623 #: ../../mod/group.php:168 ../../mod/admin.php:699 #: ../../include/conversation.php:569 ../../object/Item.php:119 msgid "Delete" @@ -758,7 +758,7 @@ msgid "Post to Email" msgstr "An E-Mail senden" #: ../../mod/editpost.php:106 ../../mod/content.php:711 -#: ../../mod/settings.php:621 ../../object/Item.php:109 +#: ../../mod/settings.php:622 ../../object/Item.php:109 msgid "Edit" msgstr "Bearbeiten" @@ -1015,7 +1015,7 @@ msgstr "Friendica" msgid "StatusNet/Federated Social Web" msgstr "StatusNet/Federated Social Web" -#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:681 +#: ../../mod/dfrn_request.php:841 ../../mod/settings.php:682 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "Diaspora" @@ -1035,7 +1035,7 @@ msgstr "Adresse deines Profils:" msgid "Submit Request" msgstr "Anfrage abschicken" -#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:138 +#: ../../mod/uexport.php:9 ../../mod/settings.php:30 ../../include/nav.php:140 msgid "Account settings" msgstr "Kontoeinstellungen" @@ -1067,7 +1067,7 @@ msgstr "Konto löschen" #: ../../mod/newmember.php:22 ../../mod/admin.php:788 ../../mod/admin.php:993 #: ../../addon/dav/friendica/layout.fnk.php:225 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:537 -#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:138 +#: ../../view/theme/diabook/theme.php:658 ../../include/nav.php:140 #: ../../addon.old/dav/friendica/layout.fnk.php:225 #: ../../addon.old/mathjax/mathjax.php:36 msgid "Settings" @@ -1349,7 +1349,7 @@ msgid "" msgstr "WICHTIG: Du musst [manuell] einen Cronjob (o.ä.) für den Poller einrichten." #: ../../mod/localtime.php:12 ../../include/event.php:11 -#: ../../include/bb2diaspora.php:390 +#: ../../include/bb2diaspora.php:393 msgid "l F d, Y \\@ g:i A" msgstr "l, d. F Y\\, H:i" @@ -1415,7 +1415,7 @@ msgid "is interested in:" msgstr "ist interessiert an:" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1216 +#: ../../include/contact_widgets.php:9 ../../boot.php:1229 msgid "Connect" msgstr "Verbinden" @@ -1482,7 +1482,7 @@ msgstr[1] "Kommentar" #: ../../mod/content.php:589 ../../addon/page/page.php:77 #: ../../addon/page/page.php:111 ../../addon/showmore/showmore.php:119 -#: ../../include/contact_widgets.php:204 ../../boot.php:609 +#: ../../include/contact_widgets.php:204 ../../boot.php:622 #: ../../object/Item.php:292 ../../addon.old/page/page.php:77 #: ../../addon.old/page/page.php:111 ../../addon.old/showmore/showmore.php:119 msgid "show more" @@ -2051,7 +2051,7 @@ msgid "Edit contact" msgstr "Kontakt bearbeiten" #: ../../mod/contacts.php:575 ../../view/theme/diabook/theme.php:89 -#: ../../include/nav.php:142 +#: ../../include/nav.php:144 msgid "Contacts" msgstr "Kontakte" @@ -2090,7 +2090,7 @@ msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten" #: ../../addon/facebook/facebook.php:1200 ../../addon/fbpost/fbpost.php:777 #: ../../addon/public_server/public_server.php:62 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3365 -#: ../../boot.php:824 ../../addon.old/facebook/facebook.php:702 +#: ../../boot.php:837 ../../addon.old/facebook/facebook.php:702 #: ../../addon.old/facebook/facebook.php:1200 #: ../../addon.old/fbpost/fbpost.php:661 #: ../../addon.old/public_server/public_server.php:62 @@ -2104,7 +2104,7 @@ msgid "" "Password reset failed." msgstr "Anfrage konnte nicht verifiziert werden. (Eventuell hast du bereits eine ähnliche Anfrage gestellt.) Zurücksetzen des Passworts gescheitert." -#: ../../mod/lostpass.php:83 ../../boot.php:963 +#: ../../mod/lostpass.php:83 ../../boot.php:976 msgid "Password Reset" msgstr "Passwort zurücksetzen" @@ -2156,63 +2156,63 @@ msgstr "Zusätzliche Features" msgid "Missing some important data!" msgstr "Wichtige Daten fehlen!" -#: ../../mod/settings.php:121 ../../mod/settings.php:585 +#: ../../mod/settings.php:121 ../../mod/settings.php:586 msgid "Update" msgstr "Aktualisierungen" -#: ../../mod/settings.php:226 +#: ../../mod/settings.php:227 msgid "Failed to connect with email account using the settings provided." msgstr "Verbindung zum E-Mail-Konto mit den angegebenen Einstellungen nicht möglich." -#: ../../mod/settings.php:231 +#: ../../mod/settings.php:232 msgid "Email settings updated." msgstr "E-Mail Einstellungen bearbeitet." -#: ../../mod/settings.php:246 +#: ../../mod/settings.php:247 msgid "Features updated" msgstr "Features aktualisiert" -#: ../../mod/settings.php:306 +#: ../../mod/settings.php:307 msgid "Passwords do not match. Password unchanged." msgstr "Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert." -#: ../../mod/settings.php:311 +#: ../../mod/settings.php:312 msgid "Empty passwords are not allowed. Password unchanged." msgstr "Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert." -#: ../../mod/settings.php:322 +#: ../../mod/settings.php:323 msgid "Password changed." msgstr "Passwort ändern." -#: ../../mod/settings.php:324 +#: ../../mod/settings.php:325 msgid "Password update failed. Please try again." msgstr "Aktualisierung des Passworts gescheitert, bitte versuche es noch einmal." -#: ../../mod/settings.php:389 +#: ../../mod/settings.php:390 msgid " Please use a shorter name." msgstr " Bitte verwende einen kürzeren Namen." -#: ../../mod/settings.php:391 +#: ../../mod/settings.php:392 msgid " Name too short." msgstr " Name ist zu kurz." -#: ../../mod/settings.php:397 +#: ../../mod/settings.php:398 msgid " Not valid email." msgstr " Keine gültige E-Mail." -#: ../../mod/settings.php:399 +#: ../../mod/settings.php:400 msgid " Cannot change to that email." msgstr "Ändern der E-Mail nicht möglich. " -#: ../../mod/settings.php:453 +#: ../../mod/settings.php:454 msgid "Private forum has no privacy permissions. Using default privacy group." msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt. Die voreingestellte Gruppe für neue Kontakte wird benutzt." -#: ../../mod/settings.php:457 +#: ../../mod/settings.php:458 msgid "Private forum has no privacy permissions and no default privacy group." msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gibt keine voreingestellte Gruppe für neue Kontakte." -#: ../../mod/settings.php:487 ../../addon/facebook/facebook.php:495 +#: ../../mod/settings.php:488 ../../addon/facebook/facebook.php:495 #: ../../addon/fbpost/fbpost.php:151 #: ../../addon/remote_permissions/remote_permissions.php:204 #: ../../addon/impressum/impressum.php:78 @@ -2228,456 +2228,456 @@ msgstr "Für das private Forum sind keine Zugriffsrechte eingestellt, und es gib msgid "Settings updated." msgstr "Einstellungen aktualisiert." -#: ../../mod/settings.php:558 ../../mod/settings.php:584 -#: ../../mod/settings.php:620 +#: ../../mod/settings.php:559 ../../mod/settings.php:585 +#: ../../mod/settings.php:621 msgid "Add application" msgstr "Programm hinzufügen" -#: ../../mod/settings.php:562 ../../mod/settings.php:588 +#: ../../mod/settings.php:563 ../../mod/settings.php:589 #: ../../addon/statusnet/statusnet.php:694 #: ../../addon.old/statusnet/statusnet.php:570 msgid "Consumer Key" msgstr "Consumer Key" -#: ../../mod/settings.php:563 ../../mod/settings.php:589 +#: ../../mod/settings.php:564 ../../mod/settings.php:590 #: ../../addon/statusnet/statusnet.php:693 #: ../../addon.old/statusnet/statusnet.php:569 msgid "Consumer Secret" msgstr "Consumer Secret" -#: ../../mod/settings.php:564 ../../mod/settings.php:590 +#: ../../mod/settings.php:565 ../../mod/settings.php:591 msgid "Redirect" msgstr "Umleiten" -#: ../../mod/settings.php:565 ../../mod/settings.php:591 +#: ../../mod/settings.php:566 ../../mod/settings.php:592 msgid "Icon url" msgstr "Icon URL" -#: ../../mod/settings.php:576 +#: ../../mod/settings.php:577 msgid "You can't edit this application." msgstr "Du kannst dieses Programm nicht bearbeiten." -#: ../../mod/settings.php:619 +#: ../../mod/settings.php:620 msgid "Connected Apps" msgstr "Verbundene Programme" -#: ../../mod/settings.php:623 +#: ../../mod/settings.php:624 msgid "Client key starts with" msgstr "Anwenderschlüssel beginnt mit" -#: ../../mod/settings.php:624 +#: ../../mod/settings.php:625 msgid "No name" msgstr "Kein Name" -#: ../../mod/settings.php:625 +#: ../../mod/settings.php:626 msgid "Remove authorization" msgstr "Autorisierung entziehen" -#: ../../mod/settings.php:637 +#: ../../mod/settings.php:638 msgid "No Plugin settings configured" msgstr "Keine Plugin-Einstellungen konfiguriert" -#: ../../mod/settings.php:645 ../../addon/widgets/widgets.php:123 +#: ../../mod/settings.php:646 ../../addon/widgets/widgets.php:123 #: ../../addon.old/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "Plugin-Einstellungen" -#: ../../mod/settings.php:659 +#: ../../mod/settings.php:660 msgid "Off" msgstr "Aus" -#: ../../mod/settings.php:659 +#: ../../mod/settings.php:660 msgid "On" msgstr "An" -#: ../../mod/settings.php:667 +#: ../../mod/settings.php:668 msgid "Additional Features" msgstr "Zusätzliche Features" -#: ../../mod/settings.php:681 ../../mod/settings.php:682 +#: ../../mod/settings.php:682 ../../mod/settings.php:683 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s" -#: ../../mod/settings.php:681 ../../mod/settings.php:682 +#: ../../mod/settings.php:682 ../../mod/settings.php:683 msgid "enabled" msgstr "eingeschaltet" -#: ../../mod/settings.php:681 ../../mod/settings.php:682 +#: ../../mod/settings.php:682 ../../mod/settings.php:683 msgid "disabled" msgstr "ausgeschaltet" -#: ../../mod/settings.php:682 +#: ../../mod/settings.php:683 msgid "StatusNet" msgstr "StatusNet" -#: ../../mod/settings.php:714 +#: ../../mod/settings.php:715 msgid "Email access is disabled on this site." msgstr "Zugriff auf E-Mails für diese Seite deaktiviert." -#: ../../mod/settings.php:720 +#: ../../mod/settings.php:721 msgid "Connector Settings" msgstr "Verbindungs-Einstellungen" -#: ../../mod/settings.php:725 +#: ../../mod/settings.php:726 msgid "Email/Mailbox Setup" msgstr "E-Mail/Postfach-Einstellungen" -#: ../../mod/settings.php:726 +#: ../../mod/settings.php:727 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an." -#: ../../mod/settings.php:727 +#: ../../mod/settings.php:728 msgid "Last successful email check:" msgstr "Letzter erfolgreicher E-Mail Check" -#: ../../mod/settings.php:729 +#: ../../mod/settings.php:730 msgid "IMAP server name:" msgstr "IMAP-Server-Name:" -#: ../../mod/settings.php:730 +#: ../../mod/settings.php:731 msgid "IMAP port:" msgstr "IMAP-Port:" -#: ../../mod/settings.php:731 +#: ../../mod/settings.php:732 msgid "Security:" msgstr "Sicherheit:" -#: ../../mod/settings.php:731 ../../mod/settings.php:736 +#: ../../mod/settings.php:732 ../../mod/settings.php:737 #: ../../addon/fbpost/fbpost.php:247 ../../addon/fbpost/fbpost.php:249 #: ../../addon/dav/common/wdcal_edit.inc.php:191 #: ../../addon.old/dav/common/wdcal_edit.inc.php:191 msgid "None" msgstr "Keine" -#: ../../mod/settings.php:732 +#: ../../mod/settings.php:733 msgid "Email login name:" msgstr "E-Mail-Login-Name:" -#: ../../mod/settings.php:733 +#: ../../mod/settings.php:734 msgid "Email password:" msgstr "E-Mail-Passwort:" -#: ../../mod/settings.php:734 +#: ../../mod/settings.php:735 msgid "Reply-to address:" msgstr "Reply-to Adresse:" -#: ../../mod/settings.php:735 +#: ../../mod/settings.php:736 msgid "Send public posts to all email contacts:" msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:" -#: ../../mod/settings.php:736 +#: ../../mod/settings.php:737 msgid "Action after import:" msgstr "Aktion nach Import:" -#: ../../mod/settings.php:736 +#: ../../mod/settings.php:737 msgid "Mark as seen" msgstr "Als gelesen markieren" -#: ../../mod/settings.php:736 +#: ../../mod/settings.php:737 msgid "Move to folder" msgstr "In einen Ordner verschieben" -#: ../../mod/settings.php:737 +#: ../../mod/settings.php:738 msgid "Move to folder:" msgstr "In diesen Ordner verschieben:" -#: ../../mod/settings.php:768 ../../mod/admin.php:404 +#: ../../mod/settings.php:769 ../../mod/admin.php:404 msgid "No special theme for mobile devices" msgstr "Kein spezielles Theme für mobile Geräte verwenden." -#: ../../mod/settings.php:808 +#: ../../mod/settings.php:809 msgid "Display Settings" msgstr "Anzeige-Einstellungen" -#: ../../mod/settings.php:814 ../../mod/settings.php:825 +#: ../../mod/settings.php:815 ../../mod/settings.php:826 msgid "Display Theme:" msgstr "Theme:" -#: ../../mod/settings.php:815 +#: ../../mod/settings.php:816 msgid "Mobile Theme:" msgstr "Mobiles Theme" -#: ../../mod/settings.php:816 +#: ../../mod/settings.php:817 msgid "Update browser every xx seconds" msgstr "Browser alle xx Sekunden aktualisieren" -#: ../../mod/settings.php:816 +#: ../../mod/settings.php:817 msgid "Minimum of 10 seconds, no maximum" msgstr "Minimal 10 Sekunden, kein Maximum" -#: ../../mod/settings.php:817 +#: ../../mod/settings.php:818 msgid "Number of items to display per page:" msgstr "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: " -#: ../../mod/settings.php:817 +#: ../../mod/settings.php:818 msgid "Maximum of 100 items" msgstr "Maximal 100 Beiträge" -#: ../../mod/settings.php:818 +#: ../../mod/settings.php:819 msgid "Don't show emoticons" msgstr "Keine Smilies anzeigen" -#: ../../mod/settings.php:894 +#: ../../mod/settings.php:895 msgid "Normal Account Page" msgstr "Normales Konto" -#: ../../mod/settings.php:895 +#: ../../mod/settings.php:896 msgid "This account is a normal personal profile" msgstr "Dieses Konto ist ein normales persönliches Profil" -#: ../../mod/settings.php:898 +#: ../../mod/settings.php:899 msgid "Soapbox Page" msgstr "Marktschreier-Konto" -#: ../../mod/settings.php:899 +#: ../../mod/settings.php:900 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert" -#: ../../mod/settings.php:902 +#: ../../mod/settings.php:903 msgid "Community Forum/Celebrity Account" msgstr "Forum/Promi-Konto" -#: ../../mod/settings.php:903 +#: ../../mod/settings.php:904 msgid "" "Automatically approve all connection/friend requests as read-write fans" msgstr "Kontaktanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert" -#: ../../mod/settings.php:906 +#: ../../mod/settings.php:907 msgid "Automatic Friend Page" msgstr "Automatische Freunde Seite" -#: ../../mod/settings.php:907 +#: ../../mod/settings.php:908 msgid "Automatically approve all connection/friend requests as friends" msgstr "Kontaktanfragen werden automatisch als Freund akzeptiert" -#: ../../mod/settings.php:910 +#: ../../mod/settings.php:911 msgid "Private Forum [Experimental]" msgstr "Privates Forum [Versuchsstadium]" -#: ../../mod/settings.php:911 +#: ../../mod/settings.php:912 msgid "Private forum - approved members only" msgstr "Privates Forum, nur für Mitglieder" -#: ../../mod/settings.php:923 +#: ../../mod/settings.php:924 msgid "OpenID:" msgstr "OpenID:" -#: ../../mod/settings.php:923 +#: ../../mod/settings.php:924 msgid "(Optional) Allow this OpenID to login to this account." msgstr "(Optional) Erlaube die Anmeldung für dieses Konto mit dieser OpenID." -#: ../../mod/settings.php:933 +#: ../../mod/settings.php:934 msgid "Publish your default profile in your local site directory?" msgstr "Darf dein Standardprofil im Verzeichnis dieses Servers veröffentlicht werden?" -#: ../../mod/settings.php:939 +#: ../../mod/settings.php:940 msgid "Publish your default profile in the global social directory?" msgstr "Darf dein Standardprofil im weltweiten Verzeichnis veröffentlicht werden?" -#: ../../mod/settings.php:947 +#: ../../mod/settings.php:948 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?" -#: ../../mod/settings.php:951 +#: ../../mod/settings.php:952 msgid "Hide your profile details from unknown viewers?" msgstr "Profil-Details vor unbekannten Betrachtern verbergen?" -#: ../../mod/settings.php:956 +#: ../../mod/settings.php:957 msgid "Allow friends to post to your profile page?" msgstr "Dürfen deine Kontakte auf deine Pinnwand schreiben?" -#: ../../mod/settings.php:962 +#: ../../mod/settings.php:963 msgid "Allow friends to tag your posts?" msgstr "Dürfen deine Kontakte deine Beiträge mit Schlagwörtern versehen?" -#: ../../mod/settings.php:968 +#: ../../mod/settings.php:969 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Dürfen wir dich neuen Mitgliedern als potentiellen Kontakt vorschlagen?" -#: ../../mod/settings.php:974 +#: ../../mod/settings.php:975 msgid "Permit unknown people to send you private mail?" msgstr "Dürfen dir Unbekannte private Nachrichten schicken?" -#: ../../mod/settings.php:982 +#: ../../mod/settings.php:983 msgid "Profile is not published." msgstr "Profil ist nicht veröffentlicht." -#: ../../mod/settings.php:985 ../../mod/profile_photo.php:248 +#: ../../mod/settings.php:986 ../../mod/profile_photo.php:248 msgid "or" msgstr "oder" -#: ../../mod/settings.php:990 +#: ../../mod/settings.php:991 msgid "Your Identity Address is" msgstr "Die Adresse deines Profils lautet:" -#: ../../mod/settings.php:1001 +#: ../../mod/settings.php:1002 msgid "Automatically expire posts after this many days:" msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen:" -#: ../../mod/settings.php:1001 +#: ../../mod/settings.php:1002 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht." -#: ../../mod/settings.php:1002 +#: ../../mod/settings.php:1003 msgid "Advanced expiration settings" msgstr "Erweiterte Verfallseinstellungen" -#: ../../mod/settings.php:1003 +#: ../../mod/settings.php:1004 msgid "Advanced Expiration" msgstr "Erweitertes Verfallen" -#: ../../mod/settings.php:1004 +#: ../../mod/settings.php:1005 msgid "Expire posts:" msgstr "Beiträge verfallen lassen:" -#: ../../mod/settings.php:1005 +#: ../../mod/settings.php:1006 msgid "Expire personal notes:" msgstr "Persönliche Notizen verfallen lassen:" -#: ../../mod/settings.php:1006 +#: ../../mod/settings.php:1007 msgid "Expire starred posts:" msgstr "Markierte Beiträge verfallen lassen:" -#: ../../mod/settings.php:1007 +#: ../../mod/settings.php:1008 msgid "Expire photos:" msgstr "Fotos verfallen lassen:" -#: ../../mod/settings.php:1008 +#: ../../mod/settings.php:1009 msgid "Only expire posts by others:" msgstr "Nur Beiträge anderer verfallen:" -#: ../../mod/settings.php:1015 +#: ../../mod/settings.php:1016 msgid "Account Settings" msgstr "Kontoeinstellungen" -#: ../../mod/settings.php:1023 +#: ../../mod/settings.php:1024 msgid "Password Settings" msgstr "Passwort-Einstellungen" -#: ../../mod/settings.php:1024 +#: ../../mod/settings.php:1025 msgid "New Password:" msgstr "Neues Passwort:" -#: ../../mod/settings.php:1025 +#: ../../mod/settings.php:1026 msgid "Confirm:" msgstr "Bestätigen:" -#: ../../mod/settings.php:1025 +#: ../../mod/settings.php:1026 msgid "Leave password fields blank unless changing" msgstr "Lass die Passwort-Felder leer, außer du willst das Passwort ändern" -#: ../../mod/settings.php:1029 +#: ../../mod/settings.php:1030 msgid "Basic Settings" msgstr "Grundeinstellungen" -#: ../../mod/settings.php:1030 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:1031 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "Kompletter Name:" -#: ../../mod/settings.php:1031 +#: ../../mod/settings.php:1032 msgid "Email Address:" msgstr "E-Mail-Adresse:" -#: ../../mod/settings.php:1032 +#: ../../mod/settings.php:1033 msgid "Your Timezone:" msgstr "Deine Zeitzone:" -#: ../../mod/settings.php:1033 +#: ../../mod/settings.php:1034 msgid "Default Post Location:" msgstr "Standardstandort:" -#: ../../mod/settings.php:1034 +#: ../../mod/settings.php:1035 msgid "Use Browser Location:" msgstr "Standort des Browsers verwenden:" -#: ../../mod/settings.php:1037 +#: ../../mod/settings.php:1038 msgid "Security and Privacy Settings" msgstr "Sicherheits- und Privatsphäre-Einstellungen" -#: ../../mod/settings.php:1039 +#: ../../mod/settings.php:1040 msgid "Maximum Friend Requests/Day:" msgstr "Maximale Anzahl von Freundschaftsanfragen/Tag:" -#: ../../mod/settings.php:1039 ../../mod/settings.php:1058 +#: ../../mod/settings.php:1040 ../../mod/settings.php:1059 msgid "(to prevent spam abuse)" msgstr "(um SPAM zu vermeiden)" -#: ../../mod/settings.php:1040 +#: ../../mod/settings.php:1041 msgid "Default Post Permissions" msgstr "Standard-Zugriffsrechte für Beiträge" -#: ../../mod/settings.php:1041 +#: ../../mod/settings.php:1042 msgid "(click to open/close)" msgstr "(klicke zum öffnen/schließen)" -#: ../../mod/settings.php:1058 +#: ../../mod/settings.php:1059 msgid "Maximum private messages per day from unknown people:" msgstr "Maximale Anzahl privater Nachrichten von Unbekannten pro Tag:" -#: ../../mod/settings.php:1061 +#: ../../mod/settings.php:1062 msgid "Notification Settings" msgstr "Benachrichtigungseinstellungen" -#: ../../mod/settings.php:1062 +#: ../../mod/settings.php:1063 msgid "By default post a status message when:" msgstr "Standardmäßig eine Statusnachricht posten, wenn:" -#: ../../mod/settings.php:1063 +#: ../../mod/settings.php:1064 msgid "accepting a friend request" msgstr "– du eine Kontaktanfrage akzeptierst" -#: ../../mod/settings.php:1064 +#: ../../mod/settings.php:1065 msgid "joining a forum/community" msgstr "– du einem Forum/einer Gemeinschaftsseite beitrittst" -#: ../../mod/settings.php:1065 +#: ../../mod/settings.php:1066 msgid "making an interesting profile change" msgstr "– du eine interessante Änderung an deinem Profil durchführst" -#: ../../mod/settings.php:1066 +#: ../../mod/settings.php:1067 msgid "Send a notification email when:" msgstr "Benachrichtigungs-E-Mail senden wenn:" -#: ../../mod/settings.php:1067 +#: ../../mod/settings.php:1068 msgid "You receive an introduction" msgstr "– du eine Kontaktanfrage erhältst" -#: ../../mod/settings.php:1068 +#: ../../mod/settings.php:1069 msgid "Your introductions are confirmed" msgstr "– eine deiner Kontaktanfragen akzeptiert wurde" -#: ../../mod/settings.php:1069 +#: ../../mod/settings.php:1070 msgid "Someone writes on your profile wall" msgstr "– jemand etwas auf deine Pinnwand schreibt" -#: ../../mod/settings.php:1070 +#: ../../mod/settings.php:1071 msgid "Someone writes a followup comment" msgstr "– jemand auch einen Kommentar verfasst" -#: ../../mod/settings.php:1071 +#: ../../mod/settings.php:1072 msgid "You receive a private message" msgstr "– du eine private Nachricht erhältst" -#: ../../mod/settings.php:1072 +#: ../../mod/settings.php:1073 msgid "You receive a friend suggestion" msgstr "– du eine Empfehlung erhältst" -#: ../../mod/settings.php:1073 +#: ../../mod/settings.php:1074 msgid "You are tagged in a post" msgstr "– du in einem Beitrag erwähnt wirst" -#: ../../mod/settings.php:1074 +#: ../../mod/settings.php:1075 msgid "You are poked/prodded/etc. in a post" msgstr "– du von jemandem angestupst oder sonstwie behandelt wirst" -#: ../../mod/settings.php:1077 +#: ../../mod/settings.php:1078 msgid "Advanced Account/Page Type Settings" msgstr "Erweiterte Konto-/Seitentyp-Einstellungen" -#: ../../mod/settings.php:1078 +#: ../../mod/settings.php:1079 msgid "Change the behaviour of this account for special situations" msgstr "Verhalten dieses Kontos in bestimmten Situationen:" @@ -2780,7 +2780,7 @@ msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gela msgid "Invalid contact." msgstr "Ungültiger Kontakt." -#: ../../mod/notes.php:44 ../../boot.php:1755 +#: ../../mod/notes.php:44 ../../boot.php:1768 msgid "Personal Notes" msgstr "Persönliche Notizen" @@ -2943,7 +2943,7 @@ msgstr "Überprüfe die restlichen Einstellungen, insbesondere die Einstellungen #: ../../mod/newmember.php:32 ../../mod/profperm.php:103 #: ../../view/theme/diabook/theme.php:88 ../../include/profile_advanced.php:7 #: ../../include/profile_advanced.php:84 ../../include/nav.php:50 -#: ../../boot.php:1731 +#: ../../boot.php:1744 msgid "Profile" msgstr "Profil" @@ -3248,7 +3248,7 @@ msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstab msgid "Choose a nickname: " msgstr "Spitznamen wählen: " -#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:923 +#: ../../mod/register.php:274 ../../include/nav.php:81 ../../boot.php:936 msgid "Register" msgstr "Registrieren" @@ -3305,7 +3305,7 @@ msgid "Access denied." msgstr "Zugriff verweigert." #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:90 -#: ../../include/nav.php:51 ../../boot.php:1738 +#: ../../include/nav.php:51 ../../boot.php:1751 msgid "Photos" msgstr "Bilder" @@ -3566,7 +3566,7 @@ msgstr "DB Updates" msgid "Logs" msgstr "Protokolle" -#: ../../mod/admin.php:120 ../../include/nav.php:149 +#: ../../mod/admin.php:120 ../../include/nav.php:151 msgid "Admin" msgstr "Administration" @@ -4195,7 +4195,7 @@ msgstr "FTP Nutzername" msgid "FTP Password" msgstr "FTP Passwort" -#: ../../mod/profile.php:21 ../../boot.php:1126 +#: ../../mod/profile.php:21 ../../boot.php:1139 msgid "Requested profile is not available." msgstr "Das angefragte Profil ist nicht vorhanden." @@ -4601,23 +4601,23 @@ msgstr "Alter: " msgid "Edit/Manage Profiles" msgstr "Verwalte/Editiere Profile" -#: ../../mod/profiles.php:700 ../../boot.php:1244 +#: ../../mod/profiles.php:700 ../../boot.php:1257 msgid "Change profile photo" msgstr "Profilbild ändern" -#: ../../mod/profiles.php:701 ../../boot.php:1245 +#: ../../mod/profiles.php:701 ../../boot.php:1258 msgid "Create New Profile" msgstr "Neues Profil anlegen" -#: ../../mod/profiles.php:712 ../../boot.php:1255 +#: ../../mod/profiles.php:712 ../../boot.php:1268 msgid "Profile Image" msgstr "Profilbild" -#: ../../mod/profiles.php:714 ../../boot.php:1258 +#: ../../mod/profiles.php:714 ../../boot.php:1271 msgid "visible to everybody" msgstr "sichtbar für jeden" -#: ../../mod/profiles.php:715 ../../boot.php:1259 +#: ../../mod/profiles.php:715 ../../boot.php:1272 msgid "Edit visibility" msgstr "Sichtbarkeit bearbeiten" @@ -4639,7 +4639,7 @@ msgstr "%1$s hat %2$ss %3$s mit %4$s getaggt" msgid "No potential page delegates located." msgstr "Keine potentiellen Bevollmächtigten für die Seite gefunden." -#: ../../mod/delegate.php:121 +#: ../../mod/delegate.php:121 ../../include/nav.php:138 msgid "Delegate Page Management" msgstr "Delegiere das Management für die Seite" @@ -4749,19 +4749,19 @@ msgstr "Geschlecht:" #: ../../mod/directory.php:136 #: ../../addon/forumdirectory/forumdirectory.php:158 -#: ../../include/profile_advanced.php:17 ../../boot.php:1280 +#: ../../include/profile_advanced.php:17 ../../boot.php:1293 msgid "Gender:" msgstr "Geschlecht:" #: ../../mod/directory.php:138 #: ../../addon/forumdirectory/forumdirectory.php:160 -#: ../../include/profile_advanced.php:37 ../../boot.php:1283 +#: ../../include/profile_advanced.php:37 ../../boot.php:1296 msgid "Status:" msgstr "Status:" #: ../../mod/directory.php:140 #: ../../addon/forumdirectory/forumdirectory.php:162 -#: ../../include/profile_advanced.php:48 ../../boot.php:1285 +#: ../../include/profile_advanced.php:48 ../../boot.php:1298 msgid "Homepage:" msgstr "Homepage:" @@ -5646,7 +5646,7 @@ msgstr "Foren Verzeichnis" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:949 +#: ../../include/nav.php:64 ../../boot.php:962 #: ../../addon.old/communityhome/communityhome.php:28 #: ../../addon.old/communityhome/communityhome.php:34 #: ../../addon.old/communityhome/twillingham/communityhome.php:28 @@ -6254,8 +6254,8 @@ msgid "Extended calendar with CalDAV-support" msgstr "Erweiterter Kalender mit CalDAV Unterstützung." #: ../../addon/dav/friendica/main.php:279 -#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:464 -#: ../../include/enotify.php:28 ../../include/notifier.php:778 +#: ../../addon/dav/friendica/main.php:280 ../../include/delivery.php:468 +#: ../../include/enotify.php:28 ../../include/notifier.php:781 #: ../../addon.old/dav/friendica/main.php:279 #: ../../addon.old/dav/friendica/main.php:280 msgid "noreply" @@ -8266,11 +8266,11 @@ msgstr "Ist mir nicht wichtig" msgid "Ask me" msgstr "Frag mich" -#: ../../include/event.php:20 ../../include/bb2diaspora.php:396 +#: ../../include/event.php:20 ../../include/bb2diaspora.php:399 msgid "Starts:" msgstr "Beginnt:" -#: ../../include/event.php:30 ../../include/bb2diaspora.php:404 +#: ../../include/event.php:30 ../../include/bb2diaspora.php:407 msgid "Finishes:" msgstr "Endet:" @@ -8612,7 +8612,7 @@ msgstr "Neue Gruppe erstellen" msgid "Contacts not in any group" msgstr "Kontakte in keiner Gruppe" -#: ../../include/nav.php:46 ../../boot.php:948 +#: ../../include/nav.php:46 ../../boot.php:961 msgid "Logout" msgstr "Abmelden" @@ -8620,7 +8620,7 @@ msgstr "Abmelden" msgid "End this session" msgstr "Diese Sitzung beenden" -#: ../../include/nav.php:49 ../../boot.php:1724 +#: ../../include/nav.php:49 ../../boot.php:1737 msgid "Status" msgstr "Status" @@ -8708,23 +8708,27 @@ msgstr "Verwalten" msgid "Manage other pages" msgstr "Andere Seiten verwalten" -#: ../../include/nav.php:140 ../../boot.php:1238 +#: ../../include/nav.php:138 +msgid "Delegations" +msgstr "Delegierungen" + +#: ../../include/nav.php:142 ../../boot.php:1251 msgid "Profiles" msgstr "Profile" -#: ../../include/nav.php:140 +#: ../../include/nav.php:142 msgid "Manage/Edit Profiles" msgstr "Profile Verwalten/Editieren" -#: ../../include/nav.php:142 +#: ../../include/nav.php:144 msgid "Manage/edit friends and contacts" msgstr "Freunde und Kontakte verwalten/editieren" -#: ../../include/nav.php:149 +#: ../../include/nav.php:151 msgid "Site setup and configuration" msgstr "Einstellungen der Seite und Konfiguration" -#: ../../include/nav.php:173 +#: ../../include/nav.php:175 msgid "Nothing new here" msgstr "Keine Neuigkeiten." @@ -8868,19 +8872,26 @@ msgstr "%ss Geburtstag" msgid "Happy Birthday %s" msgstr "Herzlichen Glückwunsch %s" -#: ../../include/onepoll.php:421 +#: ../../include/onepoll.php:439 msgid "From: " msgstr "Von: " -#: ../../include/bbcode.php:202 ../../include/bbcode.php:423 +#: ../../include/bbcode.php:202 ../../include/bbcode.php:482 msgid "Image/photo" msgstr "Bild/Foto" -#: ../../include/bbcode.php:388 ../../include/bbcode.php:408 +#: ../../include/bbcode.php:254 +#, php-format +msgid "" +"%s wrote the following post:" +msgstr "%s schrieb den folgenden Beitrag:" + +#: ../../include/bbcode.php:447 ../../include/bbcode.php:467 msgid "$1 wrote:" msgstr "$1 hat geschrieben:" -#: ../../include/bbcode.php:427 ../../include/bbcode.php:428 +#: ../../include/bbcode.php:487 ../../include/bbcode.php:488 msgid "Encrypted content" msgstr "Verschlüsselter Inhalt" @@ -9532,109 +9543,109 @@ msgstr "Diese Aktion überschreitet die Obergrenze deines Abonnements." msgid "This action is not available under your subscription plan." msgstr "Diese Aktion ist in deinem Abonnement nicht verfügbar." -#: ../../boot.php:607 +#: ../../boot.php:620 msgid "Delete this item?" msgstr "Diesen Beitrag löschen?" -#: ../../boot.php:610 +#: ../../boot.php:623 msgid "show fewer" msgstr "weniger anzeigen" -#: ../../boot.php:819 +#: ../../boot.php:832 #, php-format msgid "Update %s failed. See error logs." msgstr "Update %s fehlgeschlagen. Bitte Fehlerprotokoll überprüfen." -#: ../../boot.php:821 +#: ../../boot.php:834 #, php-format msgid "Update Error at %s" msgstr "Updatefehler bei %s" -#: ../../boot.php:922 +#: ../../boot.php:935 msgid "Create a New Account" msgstr "Neues Konto erstellen" -#: ../../boot.php:951 +#: ../../boot.php:964 msgid "Nickname or Email address: " msgstr "Spitzname oder E-Mail-Adresse: " -#: ../../boot.php:952 +#: ../../boot.php:965 msgid "Password: " msgstr "Passwort: " -#: ../../boot.php:953 +#: ../../boot.php:966 msgid "Remember me" msgstr "Anmeldedaten merken" -#: ../../boot.php:956 +#: ../../boot.php:969 msgid "Or login using OpenID: " msgstr "Oder melde dich mit deiner OpenID an: " -#: ../../boot.php:962 +#: ../../boot.php:975 msgid "Forgot your password?" msgstr "Passwort vergessen?" -#: ../../boot.php:1087 +#: ../../boot.php:1100 msgid "Requested account is not available." msgstr "Das angefragte Profil ist nicht vorhanden." -#: ../../boot.php:1164 +#: ../../boot.php:1177 msgid "Edit profile" msgstr "Profil bearbeiten" -#: ../../boot.php:1230 +#: ../../boot.php:1243 msgid "Message" msgstr "Nachricht" -#: ../../boot.php:1238 +#: ../../boot.php:1251 msgid "Manage/edit profiles" msgstr "Profile verwalten/editieren" -#: ../../boot.php:1352 ../../boot.php:1438 +#: ../../boot.php:1365 ../../boot.php:1451 msgid "g A l F d" msgstr "l, d. F G \\U\\h\\r" -#: ../../boot.php:1353 ../../boot.php:1439 +#: ../../boot.php:1366 ../../boot.php:1452 msgid "F d" msgstr "d. F" -#: ../../boot.php:1398 ../../boot.php:1479 +#: ../../boot.php:1411 ../../boot.php:1492 msgid "[today]" msgstr "[heute]" -#: ../../boot.php:1410 +#: ../../boot.php:1423 msgid "Birthday Reminders" msgstr "Geburtstagserinnerungen" -#: ../../boot.php:1411 +#: ../../boot.php:1424 msgid "Birthdays this week:" msgstr "Geburtstage diese Woche:" -#: ../../boot.php:1472 +#: ../../boot.php:1485 msgid "[No description]" msgstr "[keine Beschreibung]" -#: ../../boot.php:1490 +#: ../../boot.php:1503 msgid "Event Reminders" msgstr "Veranstaltungserinnerungen" -#: ../../boot.php:1491 +#: ../../boot.php:1504 msgid "Events this week:" msgstr "Veranstaltungen diese Woche" -#: ../../boot.php:1727 +#: ../../boot.php:1740 msgid "Status Messages and Posts" msgstr "Statusnachrichten und Beiträge" -#: ../../boot.php:1734 +#: ../../boot.php:1747 msgid "Profile Details" msgstr "Profildetails" -#: ../../boot.php:1751 +#: ../../boot.php:1764 msgid "Events and Calendar" msgstr "Ereignisse und Kalender" -#: ../../boot.php:1758 +#: ../../boot.php:1771 msgid "Only You Can See This" msgstr "Nur du kannst das sehen" diff --git a/view/de/strings.php b/view/de/strings.php index adc1300d1..ae06508fe 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -1863,6 +1863,7 @@ $a->strings["Inbox"] = "Eingang"; $a->strings["Outbox"] = "Ausgang"; $a->strings["Manage"] = "Verwalten"; $a->strings["Manage other pages"] = "Andere Seiten verwalten"; +$a->strings["Delegations"] = "Delegierungen"; $a->strings["Profiles"] = "Profile"; $a->strings["Manage/Edit Profiles"] = "Profile Verwalten/Editieren"; $a->strings["Manage/edit friends and contacts"] = "Freunde und Kontakte verwalten/editieren"; @@ -1906,6 +1907,7 @@ $a->strings["%s's birthday"] = "%ss Geburtstag"; $a->strings["Happy Birthday %s"] = "Herzlichen Glückwunsch %s"; $a->strings["From: "] = "Von: "; $a->strings["Image/photo"] = "Bild/Foto"; +$a->strings["%s wrote the following post:"] = "%s schrieb den folgenden Beitrag:"; $a->strings["$1 wrote:"] = "$1 hat geschrieben:"; $a->strings["Encrypted content"] = "Verschlüsselter Inhalt"; $a->strings["General Features"] = "Allgemeine Features"; diff --git a/view/field.tpl b/view/field.tpl index 6119ccf22..35f5afd39 100644 --- a/view/field.tpl +++ b/view/field.tpl @@ -1,4 +1,4 @@ {{ if $field.0==select }} - {{ inc $field_select }}{{ endinc }} + {{ inc field_select.tpl }}{{ endinc }} {{ endif }} diff --git a/view/filebrowser.tpl b/view/filebrowser.tpl index 1e97237f4..7db31d716 100644 --- a/view/filebrowser.tpl +++ b/view/filebrowser.tpl @@ -77,7 +77,7 @@
- +
diff --git a/view/filer_dialog.tpl b/view/filer_dialog.tpl index f7a253ba5..ae837d6b7 100644 --- a/view/filer_dialog.tpl +++ b/view/filer_dialog.tpl @@ -1,4 +1,4 @@ -{{ inc $field_combobox }}{{ endinc }} +{{ inc field_combobox.tpl }}{{ endinc }}
diff --git a/view/group_edit.tpl b/view/group_edit.tpl index d60a1b0f9..35d298111 100644 --- a/view/group_edit.tpl +++ b/view/group_edit.tpl @@ -5,7 +5,7 @@ - {{ inc $field_input with $field=$gname }}{{ endinc }} + {{ inc field_input.tpl with $field=$gname }}{{ endinc }} {{ if $drop }}$drop{{ endif }}
@@ -17,7 +17,7 @@ {{ if $groupedit_info }}
- {{ inc $groupeditortpl with $groupeditor=$groupedit_info }}{{ endinc }} + {{ inc groupeditor.tpl with $groupeditor=$groupedit_info }}{{ endinc }}
{{ endif }} {{ if $desc }}
$desc
{{ endif }} diff --git a/view/install_db.tpl b/view/install_db.tpl index bf17256eb..1302b5a70 100644 --- a/view/install_db.tpl +++ b/view/install_db.tpl @@ -18,10 +18,10 @@ $info_03 -{{ inc $field_input with $field=$dbhost }}{{endinc}} -{{ inc $field_input with $field=$dbuser }}{{endinc}} -{{ inc $field_password with $field=$dbpass }}{{endinc}} -{{ inc $field_input with $field=$dbdata }}{{endinc}} +{{ inc field_input.tpl with $field=$dbhost }}{{endinc}} +{{ inc field_input.tpl with $field=$dbuser }}{{endinc}} +{{ inc field_password.tpl with $field=$dbpass }}{{endinc}} +{{ inc field_input.tpl with $field=$dbdata }}{{endinc}} diff --git a/view/install_settings.tpl b/view/install_settings.tpl index 453e2e5cc..05b87f904 100644 --- a/view/install_settings.tpl +++ b/view/install_settings.tpl @@ -16,7 +16,7 @@ -{{ inc $field_input with $field=$adminmail }}{{endinc}} +{{ inc field_input.tpl with $field=$adminmail }}{{endinc}} $timezone diff --git a/view/intros.tpl b/view/intros.tpl index 2dd684079..e7fd53ca4 100644 --- a/view/intros.tpl +++ b/view/intros.tpl @@ -14,8 +14,8 @@
-{{inc $field_checkbox with $field=$hidden }}{{endinc}} -{{inc $field_checkbox with $field=$activity }}{{endinc}} +{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}} +{{inc field_checkbox.tpl with $field=$activity }}{{endinc}} diff --git a/view/login.tpl b/view/login.tpl index 21ed66a66..297b36c9a 100644 --- a/view/login.tpl +++ b/view/login.tpl @@ -3,17 +3,17 @@
- {{ inc $field_input with $field=$lname }}{{ endinc }} - {{ inc $field_password with $field=$lpassword }}{{ endinc }} + {{ inc field_input.tpl with $field=$lname }}{{ endinc }} + {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
{{ if $openid }}
- {{ inc $field_openid with $field=$lopenid }}{{ endinc }} + {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
{{ endif }} - {{ inc $field_checkbox with $field=$lremember }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}