From 67a2d5be771514b17b3f96979e7c2c350aa24778 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Fri, 13 Apr 2012 09:42:53 +0200 Subject: [PATCH 01/13] validate_url allow naked subdomain if is "localhost" --- include/network.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/network.php b/include/network.php index 23ef50b21..8c678a443 100644 --- a/include/network.php +++ b/include/network.php @@ -587,13 +587,14 @@ function fetch_xrd_links($url) { if(! function_exists('validate_url')) { function validate_url(&$url) { - // no naked subdomains - if(strpos($url,'.') === false) + + // no naked subdomains (allow localhost for tests) + if(strpos($url,'.') === false && strpos($url,'/localhost/') === false) return false; if(substr($url,0,4) != 'http') $url = 'http://' . $url; $h = @parse_url($url); - + if(($h) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR))) { return true; } From 8be7b5c65b8e43b7128bcd565cd50a710fc66b55 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Fri, 13 Apr 2012 09:43:38 +0200 Subject: [PATCH 02/13] quattro: work on "like" activitiy items less visible fixes to widths popup notification out of navbar category input in jot --- view/theme/quattro/TODO | 2 + view/theme/quattro/conversation.tpl | 7 ++- view/theme/quattro/dark/colors.less | 5 +- view/theme/quattro/dark/style.css | 68 +++++++++++++++++++++------- view/theme/quattro/green/style.css | 68 +++++++++++++++++++++------- view/theme/quattro/jot.tpl | 6 ++- view/theme/quattro/nav.tpl | 1 + view/theme/quattro/quattro.less | 60 +++++++++++++++++------- view/theme/quattro/wall_item_tag.tpl | 23 ++++++++++ 9 files changed, 188 insertions(+), 52 deletions(-) create mode 100644 view/theme/quattro/TODO create mode 100644 view/theme/quattro/wall_item_tag.tpl diff --git a/view/theme/quattro/TODO b/view/theme/quattro/TODO new file mode 100644 index 000000000..12638551a --- /dev/null +++ b/view/theme/quattro/TODO @@ -0,0 +1,2 @@ +jot.tpl: diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl index ff202bbe4..7bb7cd2fd 100644 --- a/view/theme/quattro/conversation.tpl +++ b/view/theme/quattro/conversation.tpl @@ -9,8 +9,11 @@ {{endif}} {{if $item.comment_lastcollapsed}}{{endif}} - {{ inc $item.template }}{{ endinc }} - + {{ if $item.type == tag }} + {{ inc wall_item_tag.tpl }}{{ endinc }} + {{ else }} + {{ inc $item.template }}{{ endinc }} + {{ endif }} {{ endfor }} diff --git a/view/theme/quattro/dark/colors.less b/view/theme/quattro/dark/colors.less index b6d487f92..e867d7643 100644 --- a/view/theme/quattro/dark/colors.less +++ b/view/theme/quattro/dark/colors.less @@ -38,7 +38,7 @@ @Link: @Blue3; @LinkHover: @Blue3; @LinkVisited: @Blue3; - +@LinkDimmed: @Blue2; @ButtonColor: @Grey1; @ButtonBackgroundColor: @Grey5; @@ -76,6 +76,9 @@ @ThreadBackgroundColor: #f6f7f8; @ShinyBorderColor: @Yellow1; +@ItemColor: @Grey5; +@ItemColorDimmed: @Grey3; + @CommentBoxEmptyColor: @Grey3; @CommentBoxEmptyBorderColor: @Grey3; @CommentBoxFullColor: @Grey5; diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 16c786d20..857596fc6 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -314,6 +314,10 @@ code { float: right; } /* popup notifications */ +#jGrowl.top-right { + top: 30px; + right: 15px; +} div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -565,7 +569,7 @@ ul.menu-popup .toolbar a:hover { color: #9eabb0; display: block; } -/* aside */ +/* aside 230px*/ aside { display: table-cell; vertical-align: top; @@ -772,11 +776,11 @@ aside #profiles-menu { width: 200px; top: 18px; } -/* section */ +/* section 800px */ section { display: table-cell; vertical-align: top; - width: 800px; + width: 770px; padding: 0px 20px 0px 10px; } /* wall item */ @@ -785,7 +789,7 @@ section { position: relative; padding: 10px; margin-bottom: 20px; - width: 780px; + width: 750px; } .wall-item-decor { position: absolute; @@ -798,7 +802,7 @@ section { } .wall-item-container { display: table; - width: 780px; + width: 750px; } .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { @@ -890,26 +894,42 @@ section { .wall-item-container .wall-item-actions-tools input { float: right; } -.wall-item-container.comment { - /*margin-top: 50px;*/ - +.wall-item-container.comment .contact-photo-wrapper { + margin-left: 16px; } .wall-item-container.comment .contact-photo { width: 32px; height: 32px; - margin-left: 16px; - /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ - } .wall-item-container.comment .contact-photo-menu-button { top: 15px !important; - left: 15px !important; + left: 0px !important; } .wall-item-container.comment .wall-item-links { padding-left: 12px; } +/* 'tag' item type */ +.wall-item-container.item-tag .wall-item-content { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container.item-tag .contact-photo-wrapper { + margin-left: 32px; +} +.wall-item-container.item-tag .contact-photo { + width: 16px; + height: 16px; +} +.wall-item-container.item-tag .contact-photo-menu-button { + top: 15px !important; + left: 15px !important; +} .wall-item-comment-wrapper { - margin: 30px 2em 2em 60px; + margin: 1em 2em 1em 60px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; @@ -961,6 +981,9 @@ section { #jot-preview-content .tread-wrapper { background-color: #fce94f; } +.hide-comments-outer { + margin-bottom: 0.8em; +} .wall-item-tags { padding-top: 5px; } @@ -1087,7 +1110,7 @@ section { padding: 0px; height: 40px; overflow: none; - width: 800px; + width: 770px; background-color: #0e232e; border-bottom: 2px solid #9eabb0; } @@ -1162,7 +1185,7 @@ section { border: 0px; margin: 0px; height: 20px; - width: 700px; + width: 500px; font-weight: bold; border: 1px solid #ffffff; } @@ -1179,13 +1202,26 @@ section { border: 1px solid #999999; } #jot #character-counter { - width: 80px; + width: 40px; float: right; text-align: right; height: 20px; line-height: 20px; padding-right: 20px; } +#jot #jot-category { + border: 0px; + margin: 0px; + height: 20px; + width: 200px; + border: 1px solid #ffffff; +} +#jot #jot-category:hover { + border: 1px solid #999999; +} +#jot #jot-category:focus { + border: 1px solid #999999; +} /** buttons **/ /*input[type="submit"] { border: 0px; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index df43aa152..9c8621c60 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -314,6 +314,10 @@ code { float: right; } /* popup notifications */ +#jGrowl.top-right { + top: 30px; + right: 15px; +} div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; color: #ffffff; @@ -565,7 +569,7 @@ ul.menu-popup .toolbar a:hover { color: #9eabb0; display: block; } -/* aside */ +/* aside 230px*/ aside { display: table-cell; vertical-align: top; @@ -772,11 +776,11 @@ aside #profiles-menu { width: 200px; top: 18px; } -/* section */ +/* section 800px */ section { display: table-cell; vertical-align: top; - width: 800px; + width: 770px; padding: 0px 20px 0px 10px; } /* wall item */ @@ -785,7 +789,7 @@ section { position: relative; padding: 10px; margin-bottom: 20px; - width: 780px; + width: 750px; } .wall-item-decor { position: absolute; @@ -798,7 +802,7 @@ section { } .wall-item-container { display: table; - width: 780px; + width: 750px; } .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { @@ -890,26 +894,42 @@ section { .wall-item-container .wall-item-actions-tools input { float: right; } -.wall-item-container.comment { - /*margin-top: 50px;*/ - +.wall-item-container.comment .contact-photo-wrapper { + margin-left: 16px; } .wall-item-container.comment .contact-photo { width: 32px; height: 32px; - margin-left: 16px; - /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ - } .wall-item-container.comment .contact-photo-menu-button { top: 15px !important; - left: 15px !important; + left: 0px !important; } .wall-item-container.comment .wall-item-links { padding-left: 12px; } +/* 'tag' item type */ +.wall-item-container.item-tag .wall-item-content { + opacity: 0.5; + -webkit-transition: all 0.2s ease-in-out; + -moz-transition: all 0.2s ease-in-out; + -o-transition: all 0.2s ease-in-out; + -ms-transition: all 0.2s ease-in-out; + transition: all 0.2s ease-in-out; +} +.wall-item-container.item-tag .contact-photo-wrapper { + margin-left: 32px; +} +.wall-item-container.item-tag .contact-photo { + width: 16px; + height: 16px; +} +.wall-item-container.item-tag .contact-photo-menu-button { + top: 15px !important; + left: 15px !important; +} .wall-item-comment-wrapper { - margin: 30px 2em 2em 60px; + margin: 1em 2em 1em 60px; } .wall-item-comment-wrapper .comment-edit-photo { display: none; @@ -961,6 +981,9 @@ section { #jot-preview-content .tread-wrapper { background-color: #ddffdd; } +.hide-comments-outer { + margin-bottom: 0.8em; +} .wall-item-tags { padding-top: 5px; } @@ -1087,7 +1110,7 @@ section { padding: 0px; height: 40px; overflow: none; - width: 800px; + width: 770px; background-color: #009100; border-bottom: 2px solid #9eabb0; } @@ -1162,7 +1185,7 @@ section { border: 0px; margin: 0px; height: 20px; - width: 700px; + width: 500px; font-weight: bold; border: 1px solid #ffffff; } @@ -1179,13 +1202,26 @@ section { border: 1px solid #999999; } #jot #character-counter { - width: 80px; + width: 40px; float: right; text-align: right; height: 20px; line-height: 20px; padding-right: 20px; } +#jot #jot-category { + border: 0px; + margin: 0px; + height: 20px; + width: 200px; + border: 1px solid #ffffff; +} +#jot #jot-category:hover { + border: 1px solid #999999; +} +#jot #jot-category:focus { + border: 1px solid #999999; +} /** buttons **/ /*input[type="submit"] { border: 0px; diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl index 2f89d4372..95c0ff6b1 100644 --- a/view/theme/quattro/jot.tpl +++ b/view/theme/quattro/jot.tpl @@ -1,8 +1,10 @@
 
- +
+ + @@ -20,8 +22,10 @@
  • $shortweblink
  • $shortvideo
  • $shortaudio
    • +
  • $preview
    • $jotplugins diff --git a/view/theme/quattro/nav.tpl b/view/theme/quattro/nav.tpl index 26f04f134..fb64f0a39 100644 --- a/view/theme/quattro/nav.tpl +++ b/view/theme/quattro/nav.tpl @@ -43,6 +43,7 @@
  • {2} {3}
    • +
    $langselector
    diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index d17b16bcd..4c3279943 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -1136,11 +1136,12 @@ ul.tabs { } /* theme screenshot */ -.screenshot { +.screenshot, #theme-preview { position: absolute; + width:202px; left: 70%; top: 50px; - img { width: 200px; } + img { width: 200px; height: 150px; } } /* page footer */ diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php index de2e5861e..0a13c2035 100644 --- a/view/theme/quattro/theme.php +++ b/view/theme/quattro/theme.php @@ -1,6 +1,7 @@ * Maintainer: Fabio * Maintainer: Tobias From 615cd53e51a2ae121846771a9a1ef2ce22550be3 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Fri, 13 Apr 2012 18:28:11 +0200 Subject: [PATCH 08/13] diabook-themes: small fixes --- view/theme/diabook-aerith/comment_item.tpl | 14 +++--- view/theme/diabook-aerith/group_side.tpl | 16 +++---- view/theme/diabook-aerith/icons/selected.png | Bin 211 -> 293 bytes .../theme/diabook-aerith/icons/unselected.png | Bin 0 -> 225 bytes view/theme/diabook-aerith/nets.tpl | 2 +- view/theme/diabook-aerith/style.css | 44 ++++++++++++++++++ view/theme/diabook-aerith/theme.php | 4 +- view/theme/diabook-blue/comment_item.tpl | 14 +++--- view/theme/diabook-blue/group_side.tpl | 16 +++---- view/theme/diabook-blue/icons/selected.png | Bin 211 -> 293 bytes view/theme/diabook-blue/icons/unselected.png | Bin 0 -> 225 bytes view/theme/diabook-blue/nets.tpl | 2 +- view/theme/diabook-blue/style.css | 44 ++++++++++++++++++ view/theme/diabook-blue/theme.php | 4 +- view/theme/diabook-red/comment_item.tpl | 14 +++--- view/theme/diabook-red/group_side.tpl | 16 +++---- view/theme/diabook-red/icons/selected.png | Bin 211 -> 293 bytes view/theme/diabook-red/icons/unselected.png | Bin 0 -> 225 bytes view/theme/diabook-red/nets.tpl | 2 +- view/theme/diabook-red/style.css | 44 ++++++++++++++++++ view/theme/diabook-red/theme.php | 4 +- view/theme/diabook/comment_item.tpl | 14 +++--- view/theme/diabook/group_side.tpl | 16 +++---- view/theme/diabook/icons/selected.png | Bin 211 -> 293 bytes view/theme/diabook/icons/unselected.png | Bin 0 -> 225 bytes view/theme/diabook/nets.tpl | 2 +- view/theme/diabook/style.css | 43 ++++++++++++++++- view/theme/diabook/theme.php | 9 ++-- 28 files changed, 249 insertions(+), 75 deletions(-) mode change 100755 => 100644 view/theme/diabook-aerith/icons/selected.png create mode 100644 view/theme/diabook-aerith/icons/unselected.png mode change 100755 => 100644 view/theme/diabook-blue/icons/selected.png create mode 100644 view/theme/diabook-blue/icons/unselected.png mode change 100755 => 100644 view/theme/diabook-red/icons/selected.png create mode 100644 view/theme/diabook-red/icons/unselected.png mode change 100755 => 100644 view/theme/diabook/icons/selected.png create mode 100644 view/theme/diabook/icons/unselected.png diff --git a/view/theme/diabook-aerith/comment_item.tpl b/view/theme/diabook-aerith/comment_item.tpl index 225a5dd5c..09fd8da3d 100644 --- a/view/theme/diabook-aerith/comment_item.tpl +++ b/view/theme/diabook-aerith/comment_item.tpl @@ -12,13 +12,13 @@
    - video - img - url - u - i - b - quote + img + url + video + u + i + b + quote {{ if $qcomment }} X0|9GzO>^9ZL)NsN={UA(2ivLpE{R{pSG=_wrkWUb3-g`Ntd6FfmNZyZvl l%{zbKzyrG|CO%^ZhQE$Fm)|E9R{>qj;OXk;vd$@?2>_#*Rwe)d delta 158 zcmZ3=beU1HGr-TCmrII^fq{Y7)59eQNb>+OCkGplWZQ8zWTK*736qQfi$WK3H$PA; z*we)^MB;LCf&$+cV*`Vj^n`>73Sl4XHTL;+J^CMD#|#9`rp(NTi`dxMyu(;{p#dARO8ge_~^IBqZGA$nLy(iJYD@<);T3K F0RXGqFnRz0 diff --git a/view/theme/diabook-aerith/icons/unselected.png b/view/theme/diabook-aerith/icons/unselected.png new file mode 100644 index 0000000000000000000000000000000000000000..9e9cead4b3c753f9d8883e061c6868ec00d57ab4 GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fjKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85p>QL70(Y)*K0-AbW|YuPgf<7G6GMiwe^pzCfWwPZ!4!i_^&o z60C>$EQ}2d&ZH+K{P1TeH!v`en3VK^i;a!VR_V%1Lj!{^laoHwdtEiUsHNl1D`zSp zZ17m%dP+jVj-v+-e3;b1bLhl@0~@ABaLaa_x%635LgJ3Q_klz$desc
      -
    • $all
      • +
    • $all
      • {{ for $nets as $net }}
    • $net.name
      • {{ endfor }} diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index b26c76910..20e91518a 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -1230,6 +1230,50 @@ aside #likes a:hover{ float: left; margin-right: 20px; } +.group_selected { + background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.group_unselected { + background: url("../../../view/theme/diabook/icons/unselected.png") no-repeat left center; + float: left; + height: 22px; + width: 22px; +} +.icon.text_add { + background-image: url("../../../images/icons/16/add.png"); + float: right; + opacity: 0.1; + margin-right: 14px; + } +.icon.text_add:hover { + background-image: url("../../../images/icons/16/add.png"); + float: right; + cursor: pointer; + margin-right: 14px; + opacity: 1; +-webkit-transition: all 0.2s ease-in-out; +-moz-transition: all 0.2s ease-in-out; +-o-transition: all 0.2s ease-in-out; +-ms-transition: all 0.2s ease-in-out; +transition: all 0.2s ease-in-out; + } +.icon.text_edit { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 0.1; + margin-top: 6px; + float: right; + height: 10px; +} +.icon.text_edit:hover { + background-image: url("../../../images/icons/10/edit.png"); + opacity: 1; + margin-top: 6px; + float: right; + height: 10px; +} /* widget */ .widget { margin-bottom: 2em; diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index a7d20a7ce..39ea118cf 100755 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -462,10 +462,10 @@ function restore_boxes(){ $a->page['htmlhead'] .= ' ';} + $a->page['htmlhead'] .= ' -', $diabook_version); //change css on network and profilepages diff --git a/view/theme/diabook/theme_settings.tpl b/view/theme/diabook/theme_settings.tpl new file mode 100644 index 000000000..564ecc283 --- /dev/null +++ b/view/theme/diabook/theme_settings.tpl @@ -0,0 +1,8 @@ +{{inc field_select.tpl with $field=$font_size}}{{endinc}} + +{{inc field_select.tpl with $field=$line_height}}{{endinc}} + +
      + +
      + From a300616bcbdda691682028c2fc13295dcfb43fbb Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Fri, 13 Apr 2012 22:08:13 +0200 Subject: [PATCH 10/13] diabook-themes: theme-settings: users can set font-size and line-height for posts and comments --- view/theme/diabook-aerith/config.php | 71 +++++++++++ view/theme/diabook-aerith/style-network.css | 4 +- view/theme/diabook-aerith/style-profile.css | 4 +- view/theme/diabook-aerith/style.css | 8 +- view/theme/diabook-aerith/style.php | 120 +++++++++++++++++++ view/theme/diabook-aerith/theme.php | 4 +- view/theme/diabook-aerith/theme_settings.tpl | 8 ++ view/theme/diabook-blue/config.php | 71 +++++++++++ view/theme/diabook-blue/style-network.css | 4 +- view/theme/diabook-blue/style-profile.css | 4 +- view/theme/diabook-blue/style.css | 8 +- view/theme/diabook-blue/style.php | 120 +++++++++++++++++++ view/theme/diabook-blue/theme.php | 4 +- view/theme/diabook-blue/theme_settings.tpl | 8 ++ view/theme/diabook-red/config.php | 71 +++++++++++ view/theme/diabook-red/style-network.css | 4 +- view/theme/diabook-red/style-profile.css | 4 +- view/theme/diabook-red/style.css | 8 +- view/theme/diabook-red/style.php | 120 +++++++++++++++++++ view/theme/diabook-red/theme.php | 4 +- view/theme/diabook-red/theme_settings.tpl | 8 ++ view/theme/diabook/config.php | 2 +- 22 files changed, 628 insertions(+), 31 deletions(-) create mode 100644 view/theme/diabook-aerith/config.php create mode 100644 view/theme/diabook-aerith/style.php create mode 100644 view/theme/diabook-aerith/theme_settings.tpl create mode 100644 view/theme/diabook-blue/config.php create mode 100644 view/theme/diabook-blue/style.php create mode 100644 view/theme/diabook-blue/theme_settings.tpl create mode 100644 view/theme/diabook-red/config.php create mode 100644 view/theme/diabook-red/style.php create mode 100644 view/theme/diabook-red/theme_settings.tpl diff --git a/view/theme/diabook-aerith/config.php b/view/theme/diabook-aerith/config.php new file mode 100644 index 000000000..afd3119f2 --- /dev/null +++ b/view/theme/diabook-aerith/config.php @@ -0,0 +1,71 @@ +"1.4", + "1.3"=>"1.3", + "1.2"=>"1.2", + "1.1"=>"1.1", + ); + + $font_sizes = array( + '14'=>'14', + '13.5'=>'13.5', + '13'=>'13', + '12.5'=>'12.5', + '12'=>'12', + ); + + + + $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); + $o .= replace_macros($t, array( + '$submit' => t('Submit'), + '$baseurl' => $a->get_baseurl(), + '$title' => t("Theme settings"), + '$font_size' => array('diabook-aerith_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), + '$line_height' => array('diabook-aerith_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), + )); + return $o; +} diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css index b9754ac32..17335389d 100644 --- a/view/theme/diabook-aerith/style-network.css +++ b/view/theme/diabook-aerith/style-network.css @@ -1380,10 +1380,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css index 078b6d01f..3dea20697 100644 --- a/view/theme/diabook-aerith/style-profile.css +++ b/view/theme/diabook-aerith/style-profile.css @@ -1358,10 +1358,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css index 20e91518a..a9269f21d 100644 --- a/view/theme/diabook-aerith/style.css +++ b/view/theme/diabook-aerith/style.css @@ -1454,10 +1454,10 @@ body .pageheader{ color: #999; } .wall-item-photo-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } .wall-item-photo-container .wall-item-content img { @@ -1599,10 +1599,10 @@ body .pageheader{ } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook-aerith/style.php b/view/theme/diabook-aerith/style.php new file mode 100644 index 000000000..1ae62503c --- /dev/null +++ b/view/theme/diabook-aerith/style.php @@ -0,0 +1,120 @@ +page['htmlhead'] .= sprintf('', $diabook_version); diff --git a/view/theme/diabook-aerith/theme_settings.tpl b/view/theme/diabook-aerith/theme_settings.tpl new file mode 100644 index 000000000..002923a2a --- /dev/null +++ b/view/theme/diabook-aerith/theme_settings.tpl @@ -0,0 +1,8 @@ +{{inc field_select.tpl with $field=$font_size}}{{endinc}} + +{{inc field_select.tpl with $field=$line_height}}{{endinc}} + +
      + +
      + diff --git a/view/theme/diabook-blue/config.php b/view/theme/diabook-blue/config.php new file mode 100644 index 000000000..3ad88b5bb --- /dev/null +++ b/view/theme/diabook-blue/config.php @@ -0,0 +1,71 @@ +"1.4", + "1.3"=>"1.3", + "1.2"=>"1.2", + "1.1"=>"1.1", + ); + + $font_sizes = array( + '14'=>'14', + '13.5'=>'13.5', + '13'=>'13', + '12.5'=>'12.5', + '12'=>'12', + ); + + + + $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); + $o .= replace_macros($t, array( + '$submit' => t('Submit'), + '$baseurl' => $a->get_baseurl(), + '$title' => t("Theme settings"), + '$font_size' => array('diabook-blue_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), + '$line_height' => array('diabook-blue_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), + )); + return $o; +} diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css index 021edc45e..2f25372a9 100644 --- a/view/theme/diabook-blue/style-network.css +++ b/view/theme/diabook-blue/style-network.css @@ -1342,10 +1342,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css index ae7fa8d14..f0b4fbd02 100644 --- a/view/theme/diabook-blue/style-profile.css +++ b/view/theme/diabook-blue/style-profile.css @@ -1325,10 +1325,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css index 5d0833931..923e63e3e 100644 --- a/view/theme/diabook-blue/style.css +++ b/view/theme/diabook-blue/style.css @@ -1411,10 +1411,10 @@ body .pageheader{ color: #999; } .wall-item-photo-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } .wall-item-photo-container .wall-item-content img { @@ -1557,10 +1557,10 @@ body .pageheader{ } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook-blue/style.php b/view/theme/diabook-blue/style.php new file mode 100644 index 000000000..330911b77 --- /dev/null +++ b/view/theme/diabook-blue/style.php @@ -0,0 +1,120 @@ +page['htmlhead'] .= sprintf('', $diabook_version); //change css on network and profilepages diff --git a/view/theme/diabook-blue/theme_settings.tpl b/view/theme/diabook-blue/theme_settings.tpl new file mode 100644 index 000000000..a40e0e298 --- /dev/null +++ b/view/theme/diabook-blue/theme_settings.tpl @@ -0,0 +1,8 @@ +{{inc field_select.tpl with $field=$font_size}}{{endinc}} + +{{inc field_select.tpl with $field=$line_height}}{{endinc}} + +
      + +
      + diff --git a/view/theme/diabook-red/config.php b/view/theme/diabook-red/config.php new file mode 100644 index 000000000..0b09a8751 --- /dev/null +++ b/view/theme/diabook-red/config.php @@ -0,0 +1,71 @@ +"1.4", + "1.3"=>"1.3", + "1.2"=>"1.2", + "1.1"=>"1.1", + ); + + $font_sizes = array( + '14'=>'14', + '13.5'=>'13.5', + '13'=>'13', + '12.5'=>'12.5', + '12'=>'12', + ); + + + + $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" ); + $o .= replace_macros($t, array( + '$submit' => t('Submit'), + '$baseurl' => $a->get_baseurl(), + '$title' => t("Theme settings"), + '$font_size' => array('diabook-red_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes), + '$line_height' => array('diabook-red_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights), + )); + return $o; +} diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css index ca32be231..17b7af09b 100644 --- a/view/theme/diabook-red/style-network.css +++ b/view/theme/diabook-red/style-network.css @@ -1376,10 +1376,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css index 242c08c68..74566d5c5 100644 --- a/view/theme/diabook-red/style-profile.css +++ b/view/theme/diabook-red/style-profile.css @@ -1338,10 +1338,10 @@ transition: all 0.2s ease-in-out; } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css index 7c92590c1..a722dbae9 100644 --- a/view/theme/diabook-red/style.css +++ b/view/theme/diabook-red/style.css @@ -1440,10 +1440,10 @@ body .pageheader{ color: #999; } .wall-item-photo-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } .wall-item-photo-container .wall-item-content img { @@ -1585,10 +1585,10 @@ body .pageheader{ } .wall-item-container .wall-item-content { - font-size: 12.5px; + max-width: 720px; word-wrap: break-word; - line-height: 1.2; + margin-bottom: 14px; } diff --git a/view/theme/diabook-red/style.php b/view/theme/diabook-red/style.php new file mode 100644 index 000000000..35b82ee96 --- /dev/null +++ b/view/theme/diabook-red/style.php @@ -0,0 +1,120 @@ +page['htmlhead'] .= sprintf('', $diabook_version); //change css on network and profilepages diff --git a/view/theme/diabook-red/theme_settings.tpl b/view/theme/diabook-red/theme_settings.tpl new file mode 100644 index 000000000..9e83ae8f2 --- /dev/null +++ b/view/theme/diabook-red/theme_settings.tpl @@ -0,0 +1,8 @@ +{{inc field_select.tpl with $field=$font_size}}{{endinc}} + +{{inc field_select.tpl with $field=$line_height}}{{endinc}} + +
      + +
      + diff --git a/view/theme/diabook/config.php b/view/theme/diabook/config.php index f4eb7aae5..25b3c4b54 100644 --- a/view/theme/diabook/config.php +++ b/view/theme/diabook/config.php @@ -30,7 +30,7 @@ function theme_admin(&$a){ $font_size = get_config('diabook', 'font_size' ); $line_height = get_config('diabook', 'line_height' ); - return quattro_form($a,$font_size, $line_height); + return diabook_form($a,$font_size, $line_height); } function theme_admin_post(&$a){ From dfe774179ad9a08a27bfc404e563422adbf0917f Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 13 Apr 2012 14:44:37 -0700 Subject: [PATCH 11/13] rev update --- boot.php | 2 +- util/messages.po | 1102 ++++++++++++++++++++++++---------------------- 2 files changed, 586 insertions(+), 518 deletions(-) diff --git a/boot.php b/boot.php index e77a35d8b..5ba3b1b4a 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1310' ); +define ( 'FRIENDICA_VERSION', '2.3.1311' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1138 ); diff --git a/util/messages.po b/util/messages.po index 75f379164..d09b1cfc0 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1310\n" +"Project-Id-Version: 2.3.1311\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-04-12 10:00-0700\n" +"POT-Creation-Date: 2012-04-13 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -39,8 +39,8 @@ msgstr "" #: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:866 #: ../../mod/editpost.php:10 ../../mod/install.php:171 #: ../../mod/notifications.php:66 ../../mod/contacts.php:125 -#: ../../mod/settings.php:99 ../../mod/settings.php:510 -#: ../../mod/settings.php:515 ../../mod/manage.php:86 ../../mod/network.php:6 +#: ../../mod/settings.php:99 ../../mod/settings.php:514 +#: ../../mod/settings.php:519 ../../mod/manage.php:86 ../../mod/network.php:6 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 @@ -50,12 +50,13 @@ msgstr "" #: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150 #: ../../mod/profile_photo.php:163 ../../mod/message.php:38 #: ../../mod/message.php:90 ../../mod/allfriends.php:9 -#: ../../mod/wall_upload.php:46 ../../mod/follow.php:8 ../../mod/common.php:9 -#: ../../mod/display.php:138 ../../mod/profiles.php:7 -#: ../../mod/profiles.php:233 ../../mod/delegate.php:6 -#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 -#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:461 -#: ../../include/items.php:3132 ../../index.php:305 +#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:46 +#: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138 +#: ../../mod/profiles.php:7 ../../mod/profiles.php:329 +#: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13 +#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53 +#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3132 +#: ../../index.php:305 msgid "Permission denied." msgstr "" @@ -84,8 +85,8 @@ msgstr "" msgid "Return to contact editor" msgstr "" -#: ../../mod/crepair.php:148 ../../mod/settings.php:530 -#: ../../mod/settings.php:556 ../../mod/admin.php:524 ../../mod/admin.php:533 +#: ../../mod/crepair.php:148 ../../mod/settings.php:534 +#: ../../mod/settings.php:560 ../../mod/admin.php:544 ../../mod/admin.php:553 msgid "Name" msgstr "" @@ -127,14 +128,14 @@ msgstr "" #: ../../mod/photos.php:1274 ../../mod/photos.php:1305 #: ../../mod/install.php:251 ../../mod/install.php:289 #: ../../mod/localtime.php:45 ../../mod/contacts.php:325 -#: ../../mod/settings.php:528 ../../mod/settings.php:674 -#: ../../mod/settings.php:735 ../../mod/settings.php:919 -#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:354 -#: ../../mod/admin.php:521 ../../mod/admin.php:650 ../../mod/admin.php:822 -#: ../../mod/admin.php:902 ../../mod/profiles.php:402 ../../mod/invite.php:119 +#: ../../mod/settings.php:532 ../../mod/settings.php:678 +#: ../../mod/settings.php:739 ../../mod/settings.php:930 +#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:374 +#: ../../mod/admin.php:541 ../../mod/admin.php:670 ../../mod/admin.php:850 +#: ../../mod/admin.php:930 ../../mod/profiles.php:498 ../../mod/invite.php:119 #: ../../addon/facebook/facebook.php:552 ../../addon/yourls/yourls.php:76 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57 -#: ../../addon/planets/planets.php:180 +#: ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 #: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93 #: ../../addon/drpost/drpost.php:110 ../../addon/geonames/geonames.php:187 @@ -154,8 +155,9 @@ msgstr "" #: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375 -#: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:90 -#: ../../view/theme/quattro/config.php:21 ../../include/conversation.php:555 +#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 +#: ../../addon/posterous/posterous.php:90 +#: ../../view/theme/quattro/config.php:52 ../../include/conversation.php:555 msgid "Submit" msgstr "" @@ -213,11 +215,11 @@ msgstr "" msgid "link to source" msgstr "" -#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:244 -#: ../../view/theme/diabook-blue/theme.php:244 +#: ../../mod/events.php:296 ../../view/theme/diabook-red/theme.php:243 +#: ../../view/theme/diabook-blue/theme.php:243 #: ../../view/theme/diabook/theme.php:251 -#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:52 -#: ../../boot.php:1469 +#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52 +#: ../../boot.php:1470 msgid "Events" msgstr "" @@ -267,7 +269,7 @@ msgid "Description:" msgstr "" #: ../../mod/events.php:395 ../../include/event.php:37 -#: ../../include/bb2diaspora.php:260 ../../boot.php:1081 +#: ../../include/bb2diaspora.php:260 ../../boot.php:1082 msgid "Location:" msgstr "" @@ -276,8 +278,8 @@ msgid "Share this event" msgstr "" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:752 ../../mod/settings.php:529 -#: ../../mod/settings.php:555 ../../addon/js_upload/js_upload.php:45 +#: ../../mod/dfrn_request.php:752 ../../mod/settings.php:533 +#: ../../mod/settings.php:559 ../../addon/js_upload/js_upload.php:45 msgid "Cancel" msgstr "" @@ -321,24 +323,24 @@ msgid "" msgstr "" #: ../../mod/api.php:105 ../../mod/dfrn_request.php:740 -#: ../../mod/settings.php:835 ../../mod/settings.php:841 -#: ../../mod/settings.php:849 ../../mod/settings.php:853 -#: ../../mod/settings.php:858 ../../mod/settings.php:864 -#: ../../mod/settings.php:870 ../../mod/settings.php:876 -#: ../../mod/settings.php:910 ../../mod/settings.php:911 -#: ../../mod/settings.php:912 ../../mod/settings.php:913 -#: ../../mod/register.php:532 ../../mod/profiles.php:379 +#: ../../mod/settings.php:844 ../../mod/settings.php:850 +#: ../../mod/settings.php:858 ../../mod/settings.php:862 +#: ../../mod/settings.php:867 ../../mod/settings.php:873 +#: ../../mod/settings.php:879 ../../mod/settings.php:885 +#: ../../mod/settings.php:921 ../../mod/settings.php:922 +#: ../../mod/settings.php:923 ../../mod/settings.php:924 +#: ../../mod/register.php:532 ../../mod/profiles.php:475 msgid "Yes" msgstr "" #: ../../mod/api.php:106 ../../mod/dfrn_request.php:741 -#: ../../mod/settings.php:835 ../../mod/settings.php:841 -#: ../../mod/settings.php:849 ../../mod/settings.php:853 -#: ../../mod/settings.php:858 ../../mod/settings.php:864 -#: ../../mod/settings.php:870 ../../mod/settings.php:876 -#: ../../mod/settings.php:910 ../../mod/settings.php:911 -#: ../../mod/settings.php:912 ../../mod/settings.php:913 -#: ../../mod/register.php:533 ../../mod/profiles.php:380 +#: ../../mod/settings.php:844 ../../mod/settings.php:850 +#: ../../mod/settings.php:858 ../../mod/settings.php:862 +#: ../../mod/settings.php:867 ../../mod/settings.php:873 +#: ../../mod/settings.php:879 ../../mod/settings.php:885 +#: ../../mod/settings.php:921 ../../mod/settings.php:922 +#: ../../mod/settings.php:923 ../../mod/settings.php:924 +#: ../../mod/register.php:533 ../../mod/profiles.php:476 msgid "No" msgstr "" @@ -349,10 +351,10 @@ msgstr "" #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:880 #: ../../mod/photos.php:951 ../../mod/photos.php:966 ../../mod/photos.php:1383 #: ../../mod/photos.php:1395 ../../addon/communityhome/communityhome.php:110 -#: ../../view/theme/diabook-red/theme.php:114 -#: ../../view/theme/diabook-blue/theme.php:114 +#: ../../view/theme/diabook-red/theme.php:113 +#: ../../view/theme/diabook-blue/theme.php:113 #: ../../view/theme/diabook/theme.php:117 -#: ../../view/theme/diabook-aerith/theme.php:115 +#: ../../view/theme/diabook-aerith/theme.php:114 msgid "Contact Photos" msgstr "" @@ -375,10 +377,10 @@ msgstr "" #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 #: ../../addon/communityhome/communityhome.php:111 -#: ../../view/theme/diabook-red/theme.php:115 -#: ../../view/theme/diabook-blue/theme.php:115 +#: ../../view/theme/diabook-red/theme.php:114 +#: ../../view/theme/diabook-blue/theme.php:114 #: ../../view/theme/diabook/theme.php:118 -#: ../../view/theme/diabook-aerith/theme.php:116 +#: ../../view/theme/diabook-aerith/theme.php:115 msgid "Profile Photos" msgstr "" @@ -400,10 +402,10 @@ msgstr "" #: ../../mod/photos.php:529 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook-red/theme.php:86 -#: ../../view/theme/diabook-blue/theme.php:86 +#: ../../view/theme/diabook-red/theme.php:85 +#: ../../view/theme/diabook-blue/theme.php:85 #: ../../view/theme/diabook/theme.php:89 -#: ../../view/theme/diabook-aerith/theme.php:87 ../../include/text.php:1297 +#: ../../view/theme/diabook-aerith/theme.php:86 ../../include/text.php:1304 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" @@ -551,7 +553,7 @@ msgstr "" #: ../../mod/photos.php:1233 ../../mod/photos.php:1273 #: ../../mod/photos.php:1304 ../../include/conversation.php:554 -#: ../../boot.php:494 +#: ../../boot.php:495 msgid "Comment" msgstr "" @@ -560,8 +562,8 @@ msgstr "" msgid "Preview" msgstr "" -#: ../../mod/photos.php:1332 ../../mod/settings.php:591 -#: ../../mod/settings.php:672 ../../mod/group.php:168 ../../mod/admin.php:528 +#: ../../mod/photos.php:1332 ../../mod/settings.php:595 +#: ../../mod/settings.php:676 ../../mod/group.php:168 ../../mod/admin.php:548 #: ../../include/conversation.php:318 ../../include/conversation.php:576 msgid "Delete" msgstr "" @@ -578,10 +580,10 @@ msgstr "" msgid "Not available." msgstr "" -#: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:246 -#: ../../view/theme/diabook-blue/theme.php:246 +#: ../../mod/community.php:30 ../../view/theme/diabook-red/theme.php:245 +#: ../../view/theme/diabook-blue/theme.php:245 #: ../../view/theme/diabook/theme.php:253 -#: ../../view/theme/diabook-aerith/theme.php:247 ../../include/nav.php:101 +#: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:101 msgid "Community" msgstr "" @@ -633,7 +635,7 @@ msgstr "" msgid "Post to Email" msgstr "" -#: ../../mod/editpost.php:95 ../../mod/settings.php:590 +#: ../../mod/editpost.php:95 ../../mod/settings.php:594 #: ../../include/conversation.php:563 msgid "Edit" msgstr "" @@ -863,7 +865,7 @@ msgstr "" msgid "StatusNet/Federated Social Web" msgstr "" -#: ../../mod/dfrn_request.php:746 ../../mod/settings.php:625 +#: ../../mod/dfrn_request.php:746 ../../mod/settings.php:629 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "" @@ -1174,7 +1176,7 @@ msgid "is interested in:" msgstr "" #: ../../mod/match.php:58 ../../mod/suggest.php:59 -#: ../../include/contact_widgets.php:9 ../../boot.php:1025 +#: ../../include/contact_widgets.php:9 ../../boot.php:1026 msgid "Connect" msgstr "" @@ -1222,10 +1224,10 @@ msgstr "" msgid "Personal" msgstr "" -#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:240 -#: ../../view/theme/diabook-blue/theme.php:240 +#: ../../mod/notifications.php:90 ../../view/theme/diabook-red/theme.php:239 +#: ../../view/theme/diabook-blue/theme.php:239 #: ../../view/theme/diabook/theme.php:247 -#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:77 +#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:77 #: ../../include/nav.php:115 msgid "Home" msgstr "" @@ -1274,7 +1276,7 @@ msgid "if applicable" msgstr "" #: ../../mod/notifications.php:157 ../../mod/notifications.php:204 -#: ../../mod/admin.php:526 +#: ../../mod/admin.php:546 msgid "Approve" msgstr "" @@ -1471,12 +1473,12 @@ msgid "View all contacts" msgstr "" #: ../../mod/contacts.php:303 ../../mod/contacts.php:350 -#: ../../mod/admin.php:530 +#: ../../mod/admin.php:550 msgid "Unblock" msgstr "" #: ../../mod/contacts.php:303 ../../mod/contacts.php:350 -#: ../../mod/admin.php:529 +#: ../../mod/admin.php:549 msgid "Block" msgstr "" @@ -1512,7 +1514,7 @@ msgid "Edit contact notes" msgstr "" #: ../../mod/contacts.php:334 ../../mod/contacts.php:507 -#: ../../mod/viewcontacts.php:62 +#: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #, php-format msgid "Visit %s's profile [%s]" msgstr "" @@ -1545,7 +1547,7 @@ msgstr "" msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:347 ../../mod/admin.php:951 +#: ../../mod/contacts.php:347 ../../mod/admin.php:979 msgid "Update now" msgstr "" @@ -1598,14 +1600,14 @@ msgstr "" msgid "you are a fan of" msgstr "" -#: ../../mod/contacts.php:508 +#: ../../mod/contacts.php:508 ../../mod/nogroup.php:41 msgid "Edit contact" msgstr "" -#: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:242 -#: ../../view/theme/diabook-blue/theme.php:242 +#: ../../mod/contacts.php:529 ../../view/theme/diabook-red/theme.php:241 +#: ../../view/theme/diabook-blue/theme.php:241 #: ../../view/theme/diabook/theme.php:249 -#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:139 +#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:139 msgid "Contacts" msgstr "" @@ -1650,7 +1652,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:83 ../../boot.php:808 +#: ../../mod/lostpass.php:83 ../../boot.php:809 msgid "Password Reset" msgstr "" @@ -1694,31 +1696,19 @@ msgstr "" msgid "Reset" msgstr "" -#: ../../mod/settings.php:49 ../../view/theme/diabook-red/theme.php:288 -#: ../../view/theme/diabook-blue/theme.php:287 -#: ../../view/theme/diabook/theme.php:298 -#: ../../view/theme/diabook-aerith/theme.php:288 ../../include/nav.php:137 +#: ../../mod/settings.php:49 ../../include/nav.php:137 msgid "Account settings" msgstr "" -#: ../../mod/settings.php:54 ../../view/theme/diabook-red/theme.php:293 -#: ../../view/theme/diabook-blue/theme.php:292 -#: ../../view/theme/diabook/theme.php:303 -#: ../../view/theme/diabook-aerith/theme.php:293 +#: ../../mod/settings.php:54 msgid "Display settings" msgstr "" -#: ../../mod/settings.php:60 ../../view/theme/diabook-red/theme.php:302 -#: ../../view/theme/diabook-blue/theme.php:301 -#: ../../view/theme/diabook/theme.php:312 -#: ../../view/theme/diabook-aerith/theme.php:302 +#: ../../mod/settings.php:60 msgid "Connector settings" msgstr "" -#: ../../mod/settings.php:65 ../../view/theme/diabook-red/theme.php:307 -#: ../../view/theme/diabook-blue/theme.php:306 -#: ../../view/theme/diabook/theme.php:317 -#: ../../view/theme/diabook-aerith/theme.php:307 +#: ../../mod/settings.php:65 msgid "Plugin settings" msgstr "" @@ -1726,14 +1716,11 @@ msgstr "" msgid "Connected apps" msgstr "" -#: ../../mod/settings.php:75 ../../view/theme/diabook-red/theme.php:317 -#: ../../view/theme/diabook-blue/theme.php:316 -#: ../../view/theme/diabook/theme.php:327 -#: ../../view/theme/diabook-aerith/theme.php:317 +#: ../../mod/settings.php:75 msgid "Export personal data" msgstr "" -#: ../../mod/settings.php:83 ../../mod/admin.php:611 ../../mod/admin.php:789 +#: ../../mod/settings.php:83 ../../mod/admin.php:631 ../../mod/admin.php:817 #: ../../include/nav.php:137 msgid "Settings" msgstr "" @@ -1742,8 +1729,8 @@ msgstr "" msgid "Missing some important data!" msgstr "" -#: ../../mod/settings.php:129 ../../mod/settings.php:554 -#: ../../mod/admin.php:75 +#: ../../mod/settings.php:129 ../../mod/settings.php:558 +#: ../../mod/admin.php:89 msgid "Update" msgstr "" @@ -1771,416 +1758,428 @@ msgstr "" msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/settings.php:377 +#: ../../mod/settings.php:379 msgid " Please use a shorter name." msgstr "" -#: ../../mod/settings.php:379 +#: ../../mod/settings.php:381 msgid " Name too short." msgstr "" -#: ../../mod/settings.php:385 +#: ../../mod/settings.php:387 msgid " Not valid email." msgstr "" -#: ../../mod/settings.php:387 +#: ../../mod/settings.php:389 msgid " Cannot change to that email." msgstr "" -#: ../../mod/settings.php:457 ../../addon/facebook/facebook.php:450 +#: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:450 #: ../../addon/impressum/impressum.php:75 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:370 msgid "Settings updated." msgstr "" -#: ../../mod/settings.php:527 ../../mod/settings.php:553 -#: ../../mod/settings.php:589 +#: ../../mod/settings.php:531 ../../mod/settings.php:557 +#: ../../mod/settings.php:593 msgid "Add application" msgstr "" -#: ../../mod/settings.php:531 ../../mod/settings.php:557 +#: ../../mod/settings.php:535 ../../mod/settings.php:561 #: ../../addon/statusnet/statusnet.php:547 msgid "Consumer Key" msgstr "" -#: ../../mod/settings.php:532 ../../mod/settings.php:558 +#: ../../mod/settings.php:536 ../../mod/settings.php:562 #: ../../addon/statusnet/statusnet.php:546 msgid "Consumer Secret" msgstr "" -#: ../../mod/settings.php:533 ../../mod/settings.php:559 +#: ../../mod/settings.php:537 ../../mod/settings.php:563 msgid "Redirect" msgstr "" -#: ../../mod/settings.php:534 ../../mod/settings.php:560 +#: ../../mod/settings.php:538 ../../mod/settings.php:564 msgid "Icon url" msgstr "" -#: ../../mod/settings.php:545 +#: ../../mod/settings.php:549 msgid "You can't edit this application." msgstr "" -#: ../../mod/settings.php:588 +#: ../../mod/settings.php:592 msgid "Connected Apps" msgstr "" -#: ../../mod/settings.php:592 +#: ../../mod/settings.php:596 msgid "Client key starts with" msgstr "" -#: ../../mod/settings.php:593 +#: ../../mod/settings.php:597 msgid "No name" msgstr "" -#: ../../mod/settings.php:594 +#: ../../mod/settings.php:598 msgid "Remove authorization" msgstr "" -#: ../../mod/settings.php:605 +#: ../../mod/settings.php:609 msgid "No Plugin settings configured" msgstr "" -#: ../../mod/settings.php:613 ../../addon/widgets/widgets.php:123 +#: ../../mod/settings.php:617 ../../addon/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "" -#: ../../mod/settings.php:625 ../../mod/settings.php:626 +#: ../../mod/settings.php:629 ../../mod/settings.php:630 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "" -#: ../../mod/settings.php:625 ../../mod/settings.php:626 +#: ../../mod/settings.php:629 ../../mod/settings.php:630 msgid "enabled" msgstr "" -#: ../../mod/settings.php:625 ../../mod/settings.php:626 +#: ../../mod/settings.php:629 ../../mod/settings.php:630 msgid "disabled" msgstr "" -#: ../../mod/settings.php:626 +#: ../../mod/settings.php:630 msgid "StatusNet" msgstr "" -#: ../../mod/settings.php:656 +#: ../../mod/settings.php:660 msgid "Connector Settings" msgstr "" -#: ../../mod/settings.php:661 +#: ../../mod/settings.php:665 msgid "Email/Mailbox Setup" msgstr "" -#: ../../mod/settings.php:662 +#: ../../mod/settings.php:666 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "" -#: ../../mod/settings.php:663 +#: ../../mod/settings.php:667 msgid "Last successful email check:" msgstr "" -#: ../../mod/settings.php:664 +#: ../../mod/settings.php:668 msgid "Email access is disabled on this site." msgstr "" -#: ../../mod/settings.php:665 +#: ../../mod/settings.php:669 msgid "IMAP server name:" msgstr "" -#: ../../mod/settings.php:666 +#: ../../mod/settings.php:670 msgid "IMAP port:" msgstr "" -#: ../../mod/settings.php:667 +#: ../../mod/settings.php:671 msgid "Security:" msgstr "" -#: ../../mod/settings.php:667 ../../mod/settings.php:672 +#: ../../mod/settings.php:671 ../../mod/settings.php:676 msgid "None" msgstr "" -#: ../../mod/settings.php:668 +#: ../../mod/settings.php:672 msgid "Email login name:" msgstr "" -#: ../../mod/settings.php:669 +#: ../../mod/settings.php:673 msgid "Email password:" msgstr "" -#: ../../mod/settings.php:670 +#: ../../mod/settings.php:674 msgid "Reply-to address:" msgstr "" -#: ../../mod/settings.php:671 +#: ../../mod/settings.php:675 msgid "Send public posts to all email contacts:" msgstr "" -#: ../../mod/settings.php:672 +#: ../../mod/settings.php:676 msgid "Action after import:" msgstr "" -#: ../../mod/settings.php:672 +#: ../../mod/settings.php:676 msgid "Mark as seen" msgstr "" -#: ../../mod/settings.php:672 +#: ../../mod/settings.php:676 msgid "Move to folder" msgstr "" -#: ../../mod/settings.php:673 +#: ../../mod/settings.php:677 msgid "Move to folder:" msgstr "" -#: ../../mod/settings.php:733 +#: ../../mod/settings.php:737 msgid "Display Settings" msgstr "" -#: ../../mod/settings.php:739 +#: ../../mod/settings.php:743 msgid "Display Theme:" msgstr "" -#: ../../mod/settings.php:740 +#: ../../mod/settings.php:744 msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/settings.php:740 +#: ../../mod/settings.php:744 msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/settings.php:741 +#: ../../mod/settings.php:745 msgid "Number of items to display on the network page:" msgstr "" -#: ../../mod/settings.php:741 +#: ../../mod/settings.php:745 msgid "Maximum of 100 items" msgstr "" -#: ../../mod/settings.php:742 +#: ../../mod/settings.php:746 msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:802 ../../mod/admin.php:142 ../../mod/admin.php:502 +#: ../../mod/settings.php:811 ../../mod/admin.php:162 ../../mod/admin.php:522 msgid "Normal Account" msgstr "" -#: ../../mod/settings.php:803 +#: ../../mod/settings.php:812 msgid "This account is a normal personal profile" msgstr "" -#: ../../mod/settings.php:806 ../../mod/admin.php:143 ../../mod/admin.php:503 +#: ../../mod/settings.php:815 ../../mod/admin.php:163 ../../mod/admin.php:523 msgid "Soapbox Account" msgstr "" -#: ../../mod/settings.php:807 +#: ../../mod/settings.php:816 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: ../../mod/settings.php:810 ../../mod/admin.php:144 ../../mod/admin.php:504 +#: ../../mod/settings.php:819 ../../mod/admin.php:164 ../../mod/admin.php:524 msgid "Community/Celebrity Account" msgstr "" -#: ../../mod/settings.php:811 +#: ../../mod/settings.php:820 msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: ../../mod/settings.php:814 ../../mod/admin.php:145 ../../mod/admin.php:505 +#: ../../mod/settings.php:823 ../../mod/admin.php:165 ../../mod/admin.php:525 msgid "Automatic Friend Account" msgstr "" -#: ../../mod/settings.php:815 +#: ../../mod/settings.php:824 msgid "Automatically approve all connection/friend requests as friends" msgstr "" -#: ../../mod/settings.php:825 +#: ../../mod/settings.php:834 msgid "OpenID:" msgstr "" -#: ../../mod/settings.php:825 +#: ../../mod/settings.php:834 msgid "(Optional) Allow this OpenID to login to this account." msgstr "" -#: ../../mod/settings.php:835 +#: ../../mod/settings.php:844 msgid "Publish your default profile in your local site directory?" msgstr "" -#: ../../mod/settings.php:841 +#: ../../mod/settings.php:850 msgid "Publish your default profile in the global social directory?" msgstr "" -#: ../../mod/settings.php:849 +#: ../../mod/settings.php:858 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "" -#: ../../mod/settings.php:853 +#: ../../mod/settings.php:862 msgid "Hide your profile details from unknown viewers?" msgstr "" -#: ../../mod/settings.php:858 +#: ../../mod/settings.php:867 msgid "Allow friends to post to your profile page?" msgstr "" -#: ../../mod/settings.php:864 +#: ../../mod/settings.php:873 msgid "Allow friends to tag your posts?" msgstr "" -#: ../../mod/settings.php:870 +#: ../../mod/settings.php:879 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/settings.php:876 +#: ../../mod/settings.php:885 msgid "Permit unknown people to send you private mail?" msgstr "" -#: ../../mod/settings.php:885 +#: ../../mod/settings.php:896 msgid "Profile is not published." msgstr "" -#: ../../mod/settings.php:891 ../../mod/profile_photo.php:211 +#: ../../mod/settings.php:902 ../../mod/profile_photo.php:211 msgid "or" msgstr "" -#: ../../mod/settings.php:896 +#: ../../mod/settings.php:907 msgid "Your Identity Address is" msgstr "" -#: ../../mod/settings.php:907 +#: ../../mod/settings.php:918 msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/settings.php:907 +#: ../../mod/settings.php:918 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/settings.php:908 +#: ../../mod/settings.php:919 msgid "Advanced expiration settings" msgstr "" -#: ../../mod/settings.php:909 +#: ../../mod/settings.php:920 msgid "Advanced Expiration" msgstr "" -#: ../../mod/settings.php:910 +#: ../../mod/settings.php:921 msgid "Expire posts:" msgstr "" -#: ../../mod/settings.php:911 +#: ../../mod/settings.php:922 msgid "Expire personal notes:" msgstr "" -#: ../../mod/settings.php:912 +#: ../../mod/settings.php:923 msgid "Expire starred posts:" msgstr "" -#: ../../mod/settings.php:913 +#: ../../mod/settings.php:924 msgid "Expire photos:" msgstr "" -#: ../../mod/settings.php:917 +#: ../../mod/settings.php:928 msgid "Account Settings" msgstr "" -#: ../../mod/settings.php:926 +#: ../../mod/settings.php:937 msgid "Password Settings" msgstr "" -#: ../../mod/settings.php:927 +#: ../../mod/settings.php:938 msgid "New Password:" msgstr "" -#: ../../mod/settings.php:928 +#: ../../mod/settings.php:939 msgid "Confirm:" msgstr "" -#: ../../mod/settings.php:928 +#: ../../mod/settings.php:939 msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/settings.php:932 +#: ../../mod/settings.php:943 msgid "Basic Settings" msgstr "" -#: ../../mod/settings.php:933 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:944 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "" -#: ../../mod/settings.php:934 +#: ../../mod/settings.php:945 msgid "Email Address:" msgstr "" -#: ../../mod/settings.php:935 +#: ../../mod/settings.php:946 msgid "Your Timezone:" msgstr "" -#: ../../mod/settings.php:936 +#: ../../mod/settings.php:947 msgid "Default Post Location:" msgstr "" -#: ../../mod/settings.php:937 +#: ../../mod/settings.php:948 msgid "Use Browser Location:" msgstr "" -#: ../../mod/settings.php:940 +#: ../../mod/settings.php:951 msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/settings.php:942 +#: ../../mod/settings.php:953 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/settings.php:942 ../../mod/settings.php:957 +#: ../../mod/settings.php:953 ../../mod/settings.php:968 msgid "(to prevent spam abuse)" msgstr "" -#: ../../mod/settings.php:943 +#: ../../mod/settings.php:954 msgid "Default Post Permissions" msgstr "" -#: ../../mod/settings.php:944 +#: ../../mod/settings.php:955 msgid "(click to open/close)" msgstr "" -#: ../../mod/settings.php:957 +#: ../../mod/settings.php:968 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../mod/settings.php:960 +#: ../../mod/settings.php:971 msgid "Notification Settings" msgstr "" -#: ../../mod/settings.php:961 +#: ../../mod/settings.php:972 +msgid "By default post a status message when:" +msgstr "" + +#: ../../mod/settings.php:973 +msgid "accepting a friend request" +msgstr "" + +#: ../../mod/settings.php:974 +msgid "making an interesting profile change" +msgstr "" + +#: ../../mod/settings.php:975 msgid "Send a notification email when:" msgstr "" -#: ../../mod/settings.php:962 +#: ../../mod/settings.php:976 msgid "You receive an introduction" msgstr "" -#: ../../mod/settings.php:963 +#: ../../mod/settings.php:977 msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/settings.php:964 +#: ../../mod/settings.php:978 msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:979 msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/settings.php:966 +#: ../../mod/settings.php:980 msgid "You receive a private message" msgstr "" -#: ../../mod/settings.php:967 +#: ../../mod/settings.php:981 msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/settings.php:968 +#: ../../mod/settings.php:982 msgid "You are tagged in a post" msgstr "" -#: ../../mod/settings.php:971 +#: ../../mod/settings.php:985 msgid "Advanced Page Settings" msgstr "" @@ -2210,7 +2209,7 @@ msgstr "" msgid "Saved Searches" msgstr "" -#: ../../mod/network.php:92 ../../include/group.php:216 +#: ../../mod/network.php:92 ../../include/group.php:217 msgid "add" msgstr "" @@ -2270,7 +2269,7 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1474 +#: ../../mod/notes.php:44 ../../boot.php:1475 msgid "Personal Notes" msgstr "" @@ -2517,12 +2516,12 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:241 -#: ../../view/theme/diabook-blue/theme.php:241 +#: ../../mod/profperm.php:103 ../../view/theme/diabook-red/theme.php:240 +#: ../../view/theme/diabook-blue/theme.php:240 #: ../../view/theme/diabook/theme.php:248 -#: ../../view/theme/diabook-aerith/theme.php:242 +#: ../../view/theme/diabook-aerith/theme.php:241 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:76 -#: ../../include/nav.php:50 ../../boot.php:1456 +#: ../../include/nav.php:50 ../../boot.php:1457 msgid "Profile" msgstr "" @@ -2671,7 +2670,7 @@ msgstr "" msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:553 ../../mod/admin.php:355 +#: ../../mod/register.php:553 ../../mod/admin.php:375 msgid "Registration" msgstr "" @@ -2694,7 +2693,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:774 +#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:775 msgid "Register" msgstr "" @@ -2706,13 +2705,13 @@ msgstr "" #: ../../addon/facebook/facebook.php:1549 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 -#: ../../view/theme/diabook-red/theme.php:81 -#: ../../view/theme/diabook-red/theme.php:90 -#: ../../view/theme/diabook-blue/theme.php:81 -#: ../../view/theme/diabook-blue/theme.php:90 +#: ../../view/theme/diabook-red/theme.php:80 +#: ../../view/theme/diabook-red/theme.php:89 +#: ../../view/theme/diabook-blue/theme.php:80 +#: ../../view/theme/diabook-blue/theme.php:89 #: ../../view/theme/diabook/theme.php:84 ../../view/theme/diabook/theme.php:93 -#: ../../view/theme/diabook-aerith/theme.php:82 -#: ../../view/theme/diabook-aerith/theme.php:91 +#: ../../view/theme/diabook-aerith/theme.php:81 +#: ../../view/theme/diabook-aerith/theme.php:90 #: ../../include/diaspora.php:1654 ../../include/conversation.php:48 #: ../../include/conversation.php:57 ../../include/conversation.php:121 #: ../../include/conversation.php:130 @@ -2721,10 +2720,10 @@ msgstr "" #: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1553 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook-red/theme.php:95 -#: ../../view/theme/diabook-blue/theme.php:95 +#: ../../view/theme/diabook-red/theme.php:94 +#: ../../view/theme/diabook-blue/theme.php:94 #: ../../view/theme/diabook/theme.php:98 -#: ../../view/theme/diabook-aerith/theme.php:96 +#: ../../view/theme/diabook-aerith/theme.php:95 #: ../../include/diaspora.php:1670 ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -2735,8 +2734,8 @@ msgstr "" msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:127 -#: ../../mod/admin.php:562 ../../mod/admin.php:741 ../../mod/display.php:37 +#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:141 +#: ../../mod/admin.php:582 ../../mod/admin.php:761 ../../mod/display.php:37 #: ../../mod/display.php:142 ../../include/items.php:3044 msgid "Item not found." msgstr "" @@ -2954,479 +2953,485 @@ msgstr "" msgid "No friends to display." msgstr "" -#: ../../mod/admin.php:71 ../../mod/admin.php:353 +#: ../../mod/admin.php:51 +msgid "Theme settings updated." +msgstr "" + +#: ../../mod/admin.php:85 ../../mod/admin.php:373 msgid "Site" msgstr "" -#: ../../mod/admin.php:72 ../../mod/admin.php:520 ../../mod/admin.php:532 +#: ../../mod/admin.php:86 ../../mod/admin.php:540 ../../mod/admin.php:552 msgid "Users" msgstr "" -#: ../../mod/admin.php:73 ../../mod/admin.php:609 ../../mod/admin.php:649 +#: ../../mod/admin.php:87 ../../mod/admin.php:629 ../../mod/admin.php:669 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:74 ../../mod/admin.php:787 ../../mod/admin.php:821 +#: ../../mod/admin.php:88 ../../mod/admin.php:815 ../../mod/admin.php:849 msgid "Themes" msgstr "" -#: ../../mod/admin.php:89 ../../mod/admin.php:901 +#: ../../mod/admin.php:103 ../../mod/admin.php:929 msgid "Logs" msgstr "" -#: ../../mod/admin.php:94 +#: ../../mod/admin.php:108 msgid "User registrations waiting for confirmation" msgstr "" -#: ../../mod/admin.php:157 ../../mod/admin.php:352 ../../mod/admin.php:519 -#: ../../mod/admin.php:608 ../../mod/admin.php:648 ../../mod/admin.php:786 -#: ../../mod/admin.php:820 ../../mod/admin.php:900 +#: ../../mod/admin.php:177 ../../mod/admin.php:372 ../../mod/admin.php:539 +#: ../../mod/admin.php:628 ../../mod/admin.php:668 ../../mod/admin.php:814 +#: ../../mod/admin.php:848 ../../mod/admin.php:928 msgid "Administration" msgstr "" -#: ../../mod/admin.php:158 +#: ../../mod/admin.php:178 msgid "Summary" msgstr "" -#: ../../mod/admin.php:159 +#: ../../mod/admin.php:179 msgid "Registered users" msgstr "" -#: ../../mod/admin.php:161 +#: ../../mod/admin.php:181 msgid "Pending registrations" msgstr "" -#: ../../mod/admin.php:162 +#: ../../mod/admin.php:182 msgid "Version" msgstr "" -#: ../../mod/admin.php:164 +#: ../../mod/admin.php:184 msgid "Active plugins" msgstr "" -#: ../../mod/admin.php:295 +#: ../../mod/admin.php:315 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:339 +#: ../../mod/admin.php:359 msgid "Closed" msgstr "" -#: ../../mod/admin.php:340 +#: ../../mod/admin.php:360 msgid "Requires approval" msgstr "" -#: ../../mod/admin.php:341 +#: ../../mod/admin.php:361 msgid "Open" msgstr "" -#: ../../mod/admin.php:345 +#: ../../mod/admin.php:365 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: ../../mod/admin.php:346 +#: ../../mod/admin.php:366 msgid "Force all links to use SSL" msgstr "" -#: ../../mod/admin.php:347 +#: ../../mod/admin.php:367 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: ../../mod/admin.php:356 +#: ../../mod/admin.php:376 msgid "File upload" msgstr "" -#: ../../mod/admin.php:357 +#: ../../mod/admin.php:377 msgid "Policies" msgstr "" -#: ../../mod/admin.php:358 +#: ../../mod/admin.php:378 msgid "Advanced" msgstr "" -#: ../../mod/admin.php:362 ../../addon/statusnet/statusnet.php:544 +#: ../../mod/admin.php:382 ../../addon/statusnet/statusnet.php:544 msgid "Site name" msgstr "" -#: ../../mod/admin.php:363 +#: ../../mod/admin.php:383 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:364 +#: ../../mod/admin.php:384 msgid "System language" msgstr "" -#: ../../mod/admin.php:365 +#: ../../mod/admin.php:385 msgid "System theme" msgstr "" -#: ../../mod/admin.php:365 -msgid "Default system theme - may be over-ridden by user profiles" +#: ../../mod/admin.php:385 +msgid "" +"Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "" -#: ../../mod/admin.php:366 +#: ../../mod/admin.php:386 msgid "SSL link policy" msgstr "" -#: ../../mod/admin.php:366 +#: ../../mod/admin.php:386 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: ../../mod/admin.php:367 +#: ../../mod/admin.php:387 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:367 +#: ../../mod/admin.php:387 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:369 +#: ../../mod/admin.php:389 msgid "Register policy" msgstr "" -#: ../../mod/admin.php:370 +#: ../../mod/admin.php:390 msgid "Register text" msgstr "" -#: ../../mod/admin.php:370 +#: ../../mod/admin.php:390 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:371 +#: ../../mod/admin.php:391 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:371 +#: ../../mod/admin.php:391 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:372 +#: ../../mod/admin.php:392 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:372 +#: ../../mod/admin.php:392 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../mod/admin.php:373 +#: ../../mod/admin.php:393 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:373 +#: ../../mod/admin.php:393 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: ../../mod/admin.php:374 +#: ../../mod/admin.php:394 msgid "Block public" msgstr "" -#: ../../mod/admin.php:374 +#: ../../mod/admin.php:394 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: ../../mod/admin.php:375 +#: ../../mod/admin.php:395 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:375 +#: ../../mod/admin.php:395 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:376 +#: ../../mod/admin.php:396 msgid "Global directory update URL" msgstr "" -#: ../../mod/admin.php:376 +#: ../../mod/admin.php:396 msgid "" "URL to update the global directory. If this is not set, the global directory " "is completely unavailable to the application." msgstr "" -#: ../../mod/admin.php:378 +#: ../../mod/admin.php:398 msgid "Block multiple registrations" msgstr "" -#: ../../mod/admin.php:378 +#: ../../mod/admin.php:398 msgid "Disallow users to register additional accounts for use as pages." msgstr "" -#: ../../mod/admin.php:379 +#: ../../mod/admin.php:399 msgid "OpenID support" msgstr "" -#: ../../mod/admin.php:379 +#: ../../mod/admin.php:399 msgid "OpenID support for registration and logins." msgstr "" -#: ../../mod/admin.php:380 +#: ../../mod/admin.php:400 msgid "Fullname check" msgstr "" -#: ../../mod/admin.php:380 +#: ../../mod/admin.php:400 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "" -#: ../../mod/admin.php:381 +#: ../../mod/admin.php:401 msgid "UTF-8 Regular expressions" msgstr "" -#: ../../mod/admin.php:381 +#: ../../mod/admin.php:401 msgid "Use PHP UTF8 regular expressions" msgstr "" -#: ../../mod/admin.php:382 +#: ../../mod/admin.php:402 msgid "Show Community Page" msgstr "" -#: ../../mod/admin.php:382 +#: ../../mod/admin.php:402 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "" -#: ../../mod/admin.php:383 +#: ../../mod/admin.php:403 msgid "Enable OStatus support" msgstr "" -#: ../../mod/admin.php:383 +#: ../../mod/admin.php:403 msgid "" "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "" -#: ../../mod/admin.php:384 +#: ../../mod/admin.php:404 msgid "Enable Diaspora support" msgstr "" -#: ../../mod/admin.php:384 +#: ../../mod/admin.php:404 msgid "Provide built-in Diaspora network compatibility." msgstr "" -#: ../../mod/admin.php:385 +#: ../../mod/admin.php:405 msgid "Only allow Friendica contacts" msgstr "" -#: ../../mod/admin.php:385 +#: ../../mod/admin.php:405 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "" -#: ../../mod/admin.php:386 +#: ../../mod/admin.php:406 msgid "Verify SSL" msgstr "" -#: ../../mod/admin.php:386 +#: ../../mod/admin.php:406 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you " "cannot connect (at all) to self-signed SSL sites." msgstr "" -#: ../../mod/admin.php:387 +#: ../../mod/admin.php:407 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:388 +#: ../../mod/admin.php:408 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:389 +#: ../../mod/admin.php:409 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:389 +#: ../../mod/admin.php:409 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:410 +#: ../../mod/admin.php:430 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:437 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:451 +#: ../../mod/admin.php:471 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:478 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:478 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:522 +#: ../../mod/admin.php:542 msgid "select all" msgstr "" -#: ../../mod/admin.php:523 +#: ../../mod/admin.php:543 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:524 +#: ../../mod/admin.php:544 msgid "Request date" msgstr "" -#: ../../mod/admin.php:524 ../../mod/admin.php:533 +#: ../../mod/admin.php:544 ../../mod/admin.php:553 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "" -#: ../../mod/admin.php:525 +#: ../../mod/admin.php:545 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:527 +#: ../../mod/admin.php:547 msgid "Deny" msgstr "" -#: ../../mod/admin.php:533 +#: ../../mod/admin.php:553 msgid "Register date" msgstr "" -#: ../../mod/admin.php:533 +#: ../../mod/admin.php:553 msgid "Last login" msgstr "" -#: ../../mod/admin.php:533 +#: ../../mod/admin.php:553 msgid "Last item" msgstr "" -#: ../../mod/admin.php:533 +#: ../../mod/admin.php:553 msgid "Account" msgstr "" -#: ../../mod/admin.php:535 +#: ../../mod/admin.php:555 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:536 +#: ../../mod/admin.php:556 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:572 +#: ../../mod/admin.php:592 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:576 +#: ../../mod/admin.php:596 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:586 ../../mod/admin.php:765 +#: ../../mod/admin.php:606 ../../mod/admin.php:785 msgid "Disable" msgstr "" -#: ../../mod/admin.php:588 ../../mod/admin.php:767 +#: ../../mod/admin.php:608 ../../mod/admin.php:787 msgid "Enable" msgstr "" -#: ../../mod/admin.php:610 ../../mod/admin.php:788 +#: ../../mod/admin.php:630 ../../mod/admin.php:816 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:618 ../../mod/admin.php:798 +#: ../../mod/admin.php:638 ../../mod/admin.php:826 msgid "Author: " msgstr "" -#: ../../mod/admin.php:619 ../../mod/admin.php:799 +#: ../../mod/admin.php:639 ../../mod/admin.php:827 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:730 +#: ../../mod/admin.php:750 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:780 +#: ../../mod/admin.php:808 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:826 +#: ../../mod/admin.php:854 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:827 +#: ../../mod/admin.php:855 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:850 +#: ../../mod/admin.php:878 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:903 +#: ../../mod/admin.php:931 msgid "Clear" msgstr "" -#: ../../mod/admin.php:909 +#: ../../mod/admin.php:937 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:910 +#: ../../mod/admin.php:938 msgid "Log file" msgstr "" -#: ../../mod/admin.php:910 +#: ../../mod/admin.php:938 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: ../../mod/admin.php:911 +#: ../../mod/admin.php:939 msgid "Log level" msgstr "" -#: ../../mod/admin.php:952 +#: ../../mod/admin.php:980 msgid "Close" msgstr "" -#: ../../mod/admin.php:958 +#: ../../mod/admin.php:986 msgid "FTP Host" msgstr "" -#: ../../mod/admin.php:959 +#: ../../mod/admin.php:987 msgid "FTP Path" msgstr "" -#: ../../mod/admin.php:960 +#: ../../mod/admin.php:988 msgid "FTP User" msgstr "" -#: ../../mod/admin.php:961 +#: ../../mod/admin.php:989 msgid "FTP Password" msgstr "" -#: ../../mod/profile.php:20 ../../boot.php:938 +#: ../../mod/profile.php:20 ../../boot.php:939 msgid "Requested profile is not available." msgstr "" @@ -3483,6 +3488,10 @@ msgstr "" msgid "{0} mentioned you in a post" msgstr "" +#: ../../mod/nogroup.php:58 +msgid "Contacts who are not members of a group" +msgstr "" + #: ../../mod/openid.php:24 msgid "OpenID protocol error. No ID returned." msgstr "" @@ -3566,8 +3575,8 @@ msgstr "" msgid "Search This Site" msgstr "" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:243 -#: ../../mod/profiles.php:357 ../../mod/dfrn_confirm.php:62 +#: ../../mod/profiles.php:21 ../../mod/profiles.php:339 +#: ../../mod/profiles.php:453 ../../mod/dfrn_confirm.php:62 msgid "Profile not found." msgstr "" @@ -3575,213 +3584,259 @@ msgstr "" msgid "Profile Name is required." msgstr "" -#: ../../mod/profiles.php:202 +#: ../../mod/profiles.php:143 +msgid "Marital Status" +msgstr "" + +#: ../../mod/profiles.php:144 +msgid "Romantic Partner" +msgstr "" + +#: ../../mod/profiles.php:145 +msgid "Work/Employment" +msgstr "" + +#: ../../mod/profiles.php:146 +msgid "Religion" +msgstr "" + +#: ../../mod/profiles.php:147 +msgid "Political Views" +msgstr "" + +#: ../../mod/profiles.php:148 +msgid "Gender" +msgstr "" + +#: ../../mod/profiles.php:149 +msgid "Sexual Preference" +msgstr "" + +#: ../../mod/profiles.php:150 +msgid "Homepage" +msgstr "" + +#: ../../mod/profiles.php:151 +msgid "Interests" +msgstr "" + +#: ../../mod/profiles.php:154 +msgid "Location" +msgstr "" + +#: ../../mod/profiles.php:225 msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:262 +#: ../../mod/profiles.php:300 +msgid "public profile" +msgstr "" + +#: ../../mod/profiles.php:302 +#, php-format +msgid "%1$s has an updated %2$s, changing %3$s." +msgstr "" + +#: ../../mod/profiles.php:358 msgid "Profile deleted." msgstr "" -#: ../../mod/profiles.php:280 ../../mod/profiles.php:314 +#: ../../mod/profiles.php:376 ../../mod/profiles.php:410 msgid "Profile-" msgstr "" -#: ../../mod/profiles.php:299 ../../mod/profiles.php:341 +#: ../../mod/profiles.php:395 ../../mod/profiles.php:437 msgid "New profile created." msgstr "" -#: ../../mod/profiles.php:320 +#: ../../mod/profiles.php:416 msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/profiles.php:378 +#: ../../mod/profiles.php:474 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:401 +#: ../../mod/profiles.php:497 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:403 +#: ../../mod/profiles.php:499 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:404 +#: ../../mod/profiles.php:500 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:405 +#: ../../mod/profiles.php:501 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:406 +#: ../../mod/profiles.php:502 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:407 +#: ../../mod/profiles.php:503 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:408 +#: ../../mod/profiles.php:504 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:409 +#: ../../mod/profiles.php:505 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:410 +#: ../../mod/profiles.php:506 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:411 +#: ../../mod/profiles.php:507 #, php-format msgid "Birthday (%s):" msgstr "" -#: ../../mod/profiles.php:412 +#: ../../mod/profiles.php:508 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:413 +#: ../../mod/profiles.php:509 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:414 +#: ../../mod/profiles.php:510 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:415 +#: ../../mod/profiles.php:511 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:416 +#: ../../mod/profiles.php:512 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:417 +#: ../../mod/profiles.php:513 msgid "♥ Marital Status:" msgstr "" -#: ../../mod/profiles.php:418 +#: ../../mod/profiles.php:514 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:419 +#: ../../mod/profiles.php:515 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:420 ../../include/profile_advanced.php:43 +#: ../../mod/profiles.php:516 ../../include/profile_advanced.php:43 msgid "Sexual Preference:" msgstr "" -#: ../../mod/profiles.php:421 +#: ../../mod/profiles.php:517 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:422 ../../include/profile_advanced.php:49 +#: ../../mod/profiles.php:518 ../../include/profile_advanced.php:49 msgid "Political Views:" msgstr "" -#: ../../mod/profiles.php:423 +#: ../../mod/profiles.php:519 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:424 +#: ../../mod/profiles.php:520 msgid "Public Keywords:" msgstr "" -#: ../../mod/profiles.php:425 +#: ../../mod/profiles.php:521 msgid "Private Keywords:" msgstr "" -#: ../../mod/profiles.php:426 +#: ../../mod/profiles.php:522 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:427 +#: ../../mod/profiles.php:523 msgid "(Used for suggesting potential friends, can be seen by others)" msgstr "" -#: ../../mod/profiles.php:428 +#: ../../mod/profiles.php:524 msgid "(Used for searching profiles, never shown to others)" msgstr "" -#: ../../mod/profiles.php:429 +#: ../../mod/profiles.php:525 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:430 +#: ../../mod/profiles.php:526 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:431 +#: ../../mod/profiles.php:527 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:432 +#: ../../mod/profiles.php:528 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:433 +#: ../../mod/profiles.php:529 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:434 +#: ../../mod/profiles.php:530 msgid "Television" msgstr "" -#: ../../mod/profiles.php:435 +#: ../../mod/profiles.php:531 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:436 +#: ../../mod/profiles.php:532 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:437 +#: ../../mod/profiles.php:533 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:438 +#: ../../mod/profiles.php:534 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:443 +#: ../../mod/profiles.php:539 msgid "" "This is your public profile.
      It may " "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:453 ../../mod/directory.php:111 +#: ../../mod/profiles.php:549 ../../mod/directory.php:111 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:488 ../../view/theme/diabook-red/theme.php:298 -#: ../../view/theme/diabook-blue/theme.php:297 -#: ../../view/theme/diabook/theme.php:308 -#: ../../view/theme/diabook-aerith/theme.php:298 +#: ../../mod/profiles.php:584 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:489 ../../boot.php:1047 +#: ../../mod/profiles.php:585 ../../boot.php:1048 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:490 ../../boot.php:1048 +#: ../../mod/profiles.php:586 ../../boot.php:1049 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:501 ../../boot.php:1058 +#: ../../mod/profiles.php:597 ../../boot.php:1059 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:503 ../../boot.php:1061 +#: ../../mod/profiles.php:599 ../../boot.php:1062 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:504 ../../boot.php:1062 +#: ../../mod/profiles.php:600 ../../boot.php:1063 msgid "Edit visibility" msgstr "" @@ -3833,10 +3888,10 @@ msgstr "" msgid "No entries." msgstr "" -#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:150 -#: ../../view/theme/diabook-blue/theme.php:150 +#: ../../mod/suggest.php:38 ../../view/theme/diabook-red/theme.php:149 +#: ../../view/theme/diabook-blue/theme.php:149 #: ../../view/theme/diabook/theme.php:153 -#: ../../view/theme/diabook-aerith/theme.php:151 +#: ../../view/theme/diabook-aerith/theme.php:150 #: ../../include/contact_widgets.php:34 msgid "Friend Suggestions" msgstr "" @@ -3851,10 +3906,10 @@ msgstr "" msgid "Ignore/Hide" msgstr "" -#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:148 -#: ../../view/theme/diabook-blue/theme.php:148 +#: ../../mod/directory.php:47 ../../view/theme/diabook-red/theme.php:147 +#: ../../view/theme/diabook-blue/theme.php:147 #: ../../view/theme/diabook/theme.php:151 -#: ../../view/theme/diabook-aerith/theme.php:149 +#: ../../view/theme/diabook-aerith/theme.php:148 msgid "Global Directory" msgstr "" @@ -4346,11 +4401,11 @@ msgstr "" msgid "Forums" msgstr "" -#: ../../addon/planets/planets.php:172 +#: ../../addon/planets/planets.php:150 msgid "Planets Settings" msgstr "" -#: ../../addon/planets/planets.php:174 +#: ../../addon/planets/planets.php:152 msgid "Enable Planets Plugin" msgstr "" @@ -4358,7 +4413,7 @@ msgstr "" #: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:34 -#: ../../include/nav.php:64 ../../boot.php:795 +#: ../../include/nav.php:64 ../../boot.php:796 msgid "Login" msgstr "" @@ -4386,10 +4441,10 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook-red/theme.php:78 -#: ../../view/theme/diabook-blue/theme.php:78 +#: ../../view/theme/diabook-red/theme.php:77 +#: ../../view/theme/diabook-blue/theme.php:77 #: ../../view/theme/diabook/theme.php:81 -#: ../../view/theme/diabook-aerith/theme.php:79 ../../include/text.php:1295 +#: ../../view/theme/diabook-aerith/theme.php:78 ../../include/text.php:1302 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "" @@ -5080,7 +5135,7 @@ msgid "Show More Settings saved." msgstr "" #: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466 -#: ../../boot.php:495 +#: ../../boot.php:496 msgid "show more" msgstr "" @@ -5190,11 +5245,27 @@ msgstr "" msgid "Consumer secret" msgstr "" -#: ../../addon/irc/irc.php:25 -msgid "IRC Chatroom" +#: ../../addon/irc/irc.php:44 +msgid "IRC Settings" msgstr "" #: ../../addon/irc/irc.php:46 +msgid "Channel(s) to auto connect (comma separated)" +msgstr "" + +#: ../../addon/irc/irc.php:51 +msgid "Popular Channels (comma separated)" +msgstr "" + +#: ../../addon/irc/irc.php:69 +msgid "IRC settings saved." +msgstr "" + +#: ../../addon/irc/irc.php:74 +msgid "IRC Chatroom" +msgstr "" + +#: ../../addon/irc/irc.php:96 msgid "Popular Channels" msgstr "" @@ -5250,189 +5321,182 @@ msgstr "" msgid "Post to Posterous by default" msgstr "" -#: ../../view/theme/diabook-red/theme.php:27 -#: ../../view/theme/diabook-blue/theme.php:27 +#: ../../view/theme/diabook-red/theme.php:26 +#: ../../view/theme/diabook-blue/theme.php:26 #: ../../view/theme/diabook/theme.php:30 -#: ../../view/theme/diabook-aerith/theme.php:28 +#: ../../view/theme/diabook-aerith/theme.php:27 msgid "Last users" msgstr "" -#: ../../view/theme/diabook-red/theme.php:56 -#: ../../view/theme/diabook-blue/theme.php:56 +#: ../../view/theme/diabook-red/theme.php:55 +#: ../../view/theme/diabook-blue/theme.php:55 #: ../../view/theme/diabook/theme.php:59 -#: ../../view/theme/diabook-aerith/theme.php:57 +#: ../../view/theme/diabook-aerith/theme.php:56 msgid "Last likes" msgstr "" -#: ../../view/theme/diabook-red/theme.php:101 -#: ../../view/theme/diabook-blue/theme.php:101 +#: ../../view/theme/diabook-red/theme.php:100 +#: ../../view/theme/diabook-blue/theme.php:100 #: ../../view/theme/diabook/theme.php:104 -#: ../../view/theme/diabook-aerith/theme.php:102 +#: ../../view/theme/diabook-aerith/theme.php:101 msgid "Last photos" msgstr "" +#: ../../view/theme/diabook-red/theme.php:145 +#: ../../view/theme/diabook-blue/theme.php:145 +#: ../../view/theme/diabook/theme.php:149 +#: ../../view/theme/diabook-aerith/theme.php:146 +msgid "Find Friends" +msgstr "" + #: ../../view/theme/diabook-red/theme.php:146 #: ../../view/theme/diabook-blue/theme.php:146 -#: ../../view/theme/diabook/theme.php:149 -#: ../../view/theme/diabook-aerith/theme.php:147 -msgid "Find Friends" -msgstr "" - -#: ../../view/theme/diabook-red/theme.php:147 -#: ../../view/theme/diabook-blue/theme.php:147 #: ../../view/theme/diabook/theme.php:150 -#: ../../view/theme/diabook-aerith/theme.php:148 +#: ../../view/theme/diabook-aerith/theme.php:147 msgid "Local Directory" msgstr "" -#: ../../view/theme/diabook-red/theme.php:149 -#: ../../view/theme/diabook-blue/theme.php:149 +#: ../../view/theme/diabook-red/theme.php:148 +#: ../../view/theme/diabook-blue/theme.php:148 #: ../../view/theme/diabook/theme.php:152 -#: ../../view/theme/diabook-aerith/theme.php:150 +#: ../../view/theme/diabook-aerith/theme.php:149 #: ../../include/contact_widgets.php:35 msgid "Similar Interests" msgstr "" -#: ../../view/theme/diabook-red/theme.php:151 -#: ../../view/theme/diabook-blue/theme.php:151 +#: ../../view/theme/diabook-red/theme.php:150 +#: ../../view/theme/diabook-blue/theme.php:150 #: ../../view/theme/diabook/theme.php:154 -#: ../../view/theme/diabook-aerith/theme.php:152 +#: ../../view/theme/diabook-aerith/theme.php:151 #: ../../include/contact_widgets.php:37 msgid "Invite Friends" msgstr "" -#: ../../view/theme/diabook-red/theme.php:166 -#: ../../view/theme/diabook-red/theme.php:247 -#: ../../view/theme/diabook-blue/theme.php:166 -#: ../../view/theme/diabook-blue/theme.php:247 +#: ../../view/theme/diabook-red/theme.php:165 +#: ../../view/theme/diabook-red/theme.php:246 +#: ../../view/theme/diabook-blue/theme.php:165 +#: ../../view/theme/diabook-blue/theme.php:246 #: ../../view/theme/diabook/theme.php:170 #: ../../view/theme/diabook/theme.php:254 -#: ../../view/theme/diabook-aerith/theme.php:167 -#: ../../view/theme/diabook-aerith/theme.php:248 +#: ../../view/theme/diabook-aerith/theme.php:166 +#: ../../view/theme/diabook-aerith/theme.php:247 msgid "Community Pages" msgstr "" -#: ../../view/theme/diabook-red/theme.php:199 -#: ../../view/theme/diabook-blue/theme.php:199 +#: ../../view/theme/diabook-red/theme.php:198 +#: ../../view/theme/diabook-blue/theme.php:198 #: ../../view/theme/diabook/theme.php:203 -#: ../../view/theme/diabook-aerith/theme.php:200 +#: ../../view/theme/diabook-aerith/theme.php:199 msgid "Help or @NewHere ?" msgstr "" -#: ../../view/theme/diabook-red/theme.php:205 -#: ../../view/theme/diabook-blue/theme.php:205 +#: ../../view/theme/diabook-red/theme.php:204 +#: ../../view/theme/diabook-blue/theme.php:204 #: ../../view/theme/diabook/theme.php:209 -#: ../../view/theme/diabook-aerith/theme.php:206 +#: ../../view/theme/diabook-aerith/theme.php:205 msgid "Connect Services" msgstr "" -#: ../../view/theme/diabook-red/theme.php:211 -#: ../../view/theme/diabook-blue/theme.php:211 +#: ../../view/theme/diabook-red/theme.php:210 +#: ../../view/theme/diabook-blue/theme.php:210 #: ../../view/theme/diabook/theme.php:215 -#: ../../view/theme/diabook-aerith/theme.php:212 +#: ../../view/theme/diabook-aerith/theme.php:211 msgid "PostIt to Friendica" msgstr "" -#: ../../view/theme/diabook-red/theme.php:211 -#: ../../view/theme/diabook-blue/theme.php:211 +#: ../../view/theme/diabook-red/theme.php:210 +#: ../../view/theme/diabook-blue/theme.php:210 #: ../../view/theme/diabook/theme.php:215 -#: ../../view/theme/diabook-aerith/theme.php:212 +#: ../../view/theme/diabook-aerith/theme.php:211 msgid "Post to Friendica" msgstr "" -#: ../../view/theme/diabook-red/theme.php:212 -#: ../../view/theme/diabook-blue/theme.php:212 +#: ../../view/theme/diabook-red/theme.php:211 +#: ../../view/theme/diabook-blue/theme.php:211 #: ../../view/theme/diabook/theme.php:216 -#: ../../view/theme/diabook-aerith/theme.php:213 +#: ../../view/theme/diabook-aerith/theme.php:212 msgid " from anywhere by bookmarking this Link." msgstr "" -#: ../../view/theme/diabook-red/theme.php:240 -#: ../../view/theme/diabook-blue/theme.php:240 +#: ../../view/theme/diabook-red/theme.php:239 +#: ../../view/theme/diabook-blue/theme.php:239 #: ../../view/theme/diabook/theme.php:247 -#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:49 +#: ../../view/theme/diabook-aerith/theme.php:240 ../../include/nav.php:49 #: ../../include/nav.php:115 msgid "Your posts and conversations" msgstr "" +#: ../../view/theme/diabook-red/theme.php:240 +#: ../../view/theme/diabook-blue/theme.php:240 +#: ../../view/theme/diabook/theme.php:248 +#: ../../view/theme/diabook-aerith/theme.php:241 ../../include/nav.php:50 +msgid "Your profile page" +msgstr "" + #: ../../view/theme/diabook-red/theme.php:241 #: ../../view/theme/diabook-blue/theme.php:241 -#: ../../view/theme/diabook/theme.php:248 -#: ../../view/theme/diabook-aerith/theme.php:242 ../../include/nav.php:50 -msgid "Your profile page" +#: ../../view/theme/diabook/theme.php:249 +#: ../../view/theme/diabook-aerith/theme.php:242 +msgid "Your contacts" msgstr "" #: ../../view/theme/diabook-red/theme.php:242 #: ../../view/theme/diabook-blue/theme.php:242 -#: ../../view/theme/diabook/theme.php:249 -#: ../../view/theme/diabook-aerith/theme.php:243 -msgid "Your contacts" -msgstr "" - -#: ../../view/theme/diabook-red/theme.php:243 -#: ../../view/theme/diabook-blue/theme.php:243 #: ../../view/theme/diabook/theme.php:250 -#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:51 -#: ../../boot.php:1461 +#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51 +#: ../../boot.php:1462 msgid "Photos" msgstr "" +#: ../../view/theme/diabook-red/theme.php:242 +#: ../../view/theme/diabook-blue/theme.php:242 +#: ../../view/theme/diabook/theme.php:250 +#: ../../view/theme/diabook-aerith/theme.php:243 ../../include/nav.php:51 +msgid "Your photos" +msgstr "" + #: ../../view/theme/diabook-red/theme.php:243 #: ../../view/theme/diabook-blue/theme.php:243 -#: ../../view/theme/diabook/theme.php:250 -#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:51 -msgid "Your photos" +#: ../../view/theme/diabook/theme.php:251 +#: ../../view/theme/diabook-aerith/theme.php:244 ../../include/nav.php:52 +msgid "Your events" msgstr "" #: ../../view/theme/diabook-red/theme.php:244 #: ../../view/theme/diabook-blue/theme.php:244 -#: ../../view/theme/diabook/theme.php:251 -#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:52 -msgid "Your events" -msgstr "" - -#: ../../view/theme/diabook-red/theme.php:245 -#: ../../view/theme/diabook-blue/theme.php:245 #: ../../view/theme/diabook/theme.php:252 -#: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:53 +#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53 msgid "Personal notes" msgstr "" -#: ../../view/theme/diabook-red/theme.php:245 -#: ../../view/theme/diabook-blue/theme.php:245 +#: ../../view/theme/diabook-red/theme.php:244 +#: ../../view/theme/diabook-blue/theme.php:244 #: ../../view/theme/diabook/theme.php:252 -#: ../../view/theme/diabook-aerith/theme.php:246 ../../include/nav.php:53 +#: ../../view/theme/diabook-aerith/theme.php:245 ../../include/nav.php:53 msgid "Your personal photos" msgstr "" -#: ../../view/theme/diabook-red/theme.php:312 -#: ../../view/theme/diabook-blue/theme.php:311 -#: ../../view/theme/diabook/theme.php:322 -#: ../../view/theme/diabook-aerith/theme.php:312 -msgid "Connections" -msgstr "" - -#: ../../view/theme/quattro/config.php:23 +#: ../../view/theme/quattro/config.php:54 msgid "Theme settings" msgstr "" -#: ../../view/theme/quattro/config.php:24 +#: ../../view/theme/quattro/config.php:55 msgid "Alignment" msgstr "" -#: ../../view/theme/quattro/config.php:24 +#: ../../view/theme/quattro/config.php:55 msgid "Left" msgstr "" -#: ../../view/theme/quattro/config.php:24 +#: ../../view/theme/quattro/config.php:55 msgid "Center" msgstr "" -#: ../../view/theme/quattro/config.php:25 +#: ../../view/theme/quattro/config.php:56 msgid "Color scheme" msgstr "" -#: ../../include/profile_advanced.php:17 ../../boot.php:1083 +#: ../../include/profile_advanced.php:17 ../../boot.php:1084 msgid "Gender:" msgstr "" @@ -5453,11 +5517,11 @@ msgstr "" msgid "Age:" msgstr "" -#: ../../include/profile_advanced.php:37 ../../boot.php:1086 +#: ../../include/profile_advanced.php:37 ../../boot.php:1087 msgid "Status:" msgstr "" -#: ../../include/profile_advanced.php:45 ../../boot.php:1088 +#: ../../include/profile_advanced.php:45 ../../boot.php:1089 msgid "Homepage:" msgstr "" @@ -5941,27 +6005,27 @@ msgstr "" msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1071 -msgid "Select an alternate language" -msgstr "" - -#: ../../include/text.php:1083 +#: ../../include/text.php:1084 msgid "default" msgstr "" -#: ../../include/text.php:1299 +#: ../../include/text.php:1096 +msgid "Select an alternate language" +msgstr "" + +#: ../../include/text.php:1306 msgid "activity" msgstr "" -#: ../../include/text.php:1301 +#: ../../include/text.php:1308 msgid "comment" msgstr "" -#: ../../include/text.php:1302 +#: ../../include/text.php:1309 msgid "post" msgstr "" -#: ../../include/text.php:1457 +#: ../../include/text.php:1464 msgid "Item filed" msgstr "" @@ -5978,7 +6042,7 @@ msgstr "" msgid "[Relayed] Comment authored by %s from network %s" msgstr "" -#: ../../include/network.php:822 +#: ../../include/network.php:823 msgid "view full size" msgstr "" @@ -6017,7 +6081,11 @@ msgstr "" msgid "Create a new group" msgstr "" -#: ../../include/nav.php:46 ../../boot.php:794 +#: ../../include/group.php:215 +msgid "Contacts not in any group" +msgstr "" + +#: ../../include/nav.php:46 ../../boot.php:795 msgid "Logout" msgstr "" @@ -6025,7 +6093,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1451 +#: ../../include/nav.php:49 ../../boot.php:1452 msgid "Status" msgstr "" @@ -6105,11 +6173,11 @@ msgstr "" msgid "Manage other pages" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1041 +#: ../../include/nav.php:138 ../../boot.php:1042 msgid "Profiles" msgstr "" -#: ../../include/nav.php:138 ../../boot.php:1041 +#: ../../include/nav.php:138 ../../boot.php:1042 msgid "Manage/edit profiles" msgstr "" @@ -6747,70 +6815,70 @@ msgstr "" msgid "permissions" msgstr "" -#: ../../boot.php:493 +#: ../../boot.php:494 msgid "Delete this item?" msgstr "" -#: ../../boot.php:496 +#: ../../boot.php:497 msgid "show fewer" msgstr "" -#: ../../boot.php:773 +#: ../../boot.php:774 msgid "Create a New Account" msgstr "" -#: ../../boot.php:797 +#: ../../boot.php:798 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:798 +#: ../../boot.php:799 msgid "Password: " msgstr "" -#: ../../boot.php:801 +#: ../../boot.php:802 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:807 +#: ../../boot.php:808 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:973 +#: ../../boot.php:974 msgid "Edit profile" msgstr "" -#: ../../boot.php:1033 +#: ../../boot.php:1034 msgid "Message" msgstr "" -#: ../../boot.php:1149 ../../boot.php:1221 +#: ../../boot.php:1150 ../../boot.php:1222 msgid "g A l F d" msgstr "" -#: ../../boot.php:1150 ../../boot.php:1222 +#: ../../boot.php:1151 ../../boot.php:1223 msgid "F d" msgstr "" -#: ../../boot.php:1175 +#: ../../boot.php:1176 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1176 +#: ../../boot.php:1177 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1199 ../../boot.php:1264 +#: ../../boot.php:1200 ../../boot.php:1265 msgid "[today]" msgstr "" -#: ../../boot.php:1245 +#: ../../boot.php:1246 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1246 +#: ../../boot.php:1247 msgid "Events this week:" msgstr "" -#: ../../boot.php:1258 +#: ../../boot.php:1259 msgid "[No description]" msgstr "" From d1b57d6e74e6881a81a4cffa8cc4d2780b687ccb Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 13 Apr 2012 15:37:25 -0700 Subject: [PATCH 12/13] setting wasn't being applied --- mod/notifications.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mod/notifications.php b/mod/notifications.php index 8e3eebba1..e47582966 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -151,7 +151,7 @@ function notifications_content(&$a) { '$fullname' => $rr['fname'], '$url' => zrl($rr['furl']), '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), - '$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')), + '$activity' => array('activity', t('Post a new friend activity'), (intval(get_config('system','post_newfriend')) ? '1' : 0), t('if applicable')), '$knowyou' => $knowyou, '$approve' => t('Approve'), @@ -198,7 +198,7 @@ function notifications_content(&$a) { '$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/person-175.jpg"), '$fullname' => $rr['name'], '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), - '$activity' => array('activity', t('Post a new friend activity'), get_config('system','post_newfriend'), t('if applicable')), + '$activity' => array('activity', t('Post a new friend activity'), (intval(get_config('system','post_newfriend')) ? '1' : 0), t('if applicable')), '$url' => zrl($rr['url']), '$knowyou' => $knowyou, '$approve' => t('Approve'), From bfb821e9188ef83fb2621250fd97bdb169447f3d Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 13 Apr 2012 16:12:06 -0700 Subject: [PATCH 13/13] well that was a silly mistake... --- mod/notifications.php | 4 ++-- view/field_checkbox.tpl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/notifications.php b/mod/notifications.php index e47582966..b28b1478d 100644 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -151,7 +151,7 @@ function notifications_content(&$a) { '$fullname' => $rr['fname'], '$url' => zrl($rr['furl']), '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), - '$activity' => array('activity', t('Post a new friend activity'), (intval(get_config('system','post_newfriend')) ? '1' : 0), t('if applicable')), + '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')), '$knowyou' => $knowyou, '$approve' => t('Approve'), @@ -198,7 +198,7 @@ function notifications_content(&$a) { '$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/person-175.jpg"), '$fullname' => $rr['name'], '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), - '$activity' => array('activity', t('Post a new friend activity'), (intval(get_config('system','post_newfriend')) ? '1' : 0), t('if applicable')), + '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')), '$url' => zrl($rr['url']), '$knowyou' => $knowyou, '$approve' => t('Approve'), diff --git a/view/field_checkbox.tpl b/view/field_checkbox.tpl index 725df4cdf..afab29243 100644 --- a/view/field_checkbox.tpl +++ b/view/field_checkbox.tpl @@ -1,6 +1,6 @@
      - + $field.3