From bb22464165daed42826d7e11c47006a9cf4094d5 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 8 Feb 2012 03:40:49 -0800 Subject: browser being sent to update_community --- mod/community.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mod/community.php b/mod/community.php index d578b469f..a98999942 100755 --- a/mod/community.php +++ b/mod/community.php @@ -80,12 +80,10 @@ function community_content(&$a, $update = 0) { // we behave the same in message lists as the search module - $o .= conversation($a,$r,'community',false); + $o .= conversation($a,$r,'community',$update); $o .= paginate($a); -// $o .= '
' . t('Shared content is covered by the Creative Commons Attribution 3.0 license.') . '
'; - return $o; } -- cgit v1.2.3 From 1eb32a0bb58bc61afcb82e8d40bfb862e5a23472 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 8 Feb 2012 19:09:25 +0100 Subject: added theme "vier" by Michael Vogel --- view/theme/vier/colors.less | 94 +++ view/theme/vier/contact_template.tpl | 21 + view/theme/vier/icons.less | 54 ++ view/theme/vier/icons.png | Bin 0 -> 20316 bytes view/theme/vier/icons.svg | 1463 ++++++++++++++++++++++++++++++++++ view/theme/vier/quattro.less | 833 +++++++++++++++++++ view/theme/vier/search_item.tpl | 87 ++ view/theme/vier/style.css | 1451 +++++++++++++++++++++++++++++++++ view/theme/vier/style.less | 14 + view/theme/vier/wall_item.tpl | 90 +++ view/theme/vier/wallwall_item.tpl | 97 +++ 11 files changed, 4204 insertions(+) create mode 100644 view/theme/vier/colors.less create mode 100644 view/theme/vier/contact_template.tpl create mode 100644 view/theme/vier/icons.less create mode 100644 view/theme/vier/icons.png create mode 100644 view/theme/vier/icons.svg create mode 100644 view/theme/vier/quattro.less create mode 100755 view/theme/vier/search_item.tpl create mode 100644 view/theme/vier/style.css create mode 100644 view/theme/vier/style.less create mode 100644 view/theme/vier/wall_item.tpl create mode 100644 view/theme/vier/wallwall_item.tpl diff --git a/view/theme/vier/colors.less b/view/theme/vier/colors.less new file mode 100644 index 000000000..5314b5284 --- /dev/null +++ b/view/theme/vier/colors.less @@ -0,0 +1,94 @@ +// Quattro Theme LESS file + +// "Echo" palette from Inkscape +@Blue1:rgb(25,174,255); +@Blue2:rgb(0,132,200); +@Blue3:rgb(0,92,148); +@Red1:rgb(255,65,65); +@Red2:rgb(220,0,0); +@Red3:rgb(181,0,0); +@Orange1:rgb(255,255,62); +@Orange2:rgb(255,153,0); +@Orange3:rgb(255,102,0); +@Brown1:rgb(255,192,34); +@Brown2:rgb(184,129,0); +@Brown3:rgb(128,77,0); +@Green1:rgb(204,255,66); +@Green2:rgb(154,222,0); +@Green3:rgb(0,145,0); +@Purple1:rgb(241,202,255); +@Purple2:rgb(215,108,255); +@Purple3:rgb(186,0,255); +@Metalic1:rgb(189,205,212); +@Metalic2:rgb(158,171,176); +@Metalic3:rgb(54,78,89); +@Metalic4:rgb(14,35,46); +@Grey1:rgb(255,255,255); +@Grey2:rgb(204,204,204); +@Grey3:rgb(153,153,153); +@Grey4:rgb(102,102,102); +@Grey5:rgb(45,45,45); + + +// Theme colors +@BodyBackground: @Grey1; +@BodyColor: @Grey5; + +@Link: @Blue3; +@LinkHover: @Blue3; +@LinkVisited: @Blue3; + + +@ButtonColor: @Grey1; +@ButtonBackgroundColor: @Grey5; + +@Banner: @Grey1; + +@NavbarBackground:@Metalic4; +@NavbarSelectedBg:@Metalic3; +@NavbarSelectedBorder: @Metalic2; +@NavbarNotifBg: @Blue1; + +@Menu: @Grey5; +@MenuBg: @Grey1; +@MenuBorder: @Metalic3; +@MenuItem: @Grey5; +@MenuItemHoverBg: @Metalic1; +@MenuItemSeparator: @Metalic2; +@MenuEmpty: @Metalic2; +@MenuItemDetail: @Metalic2; + +@AsideBorder: @Metalic1; +@AsideConnect: @Grey1; +@AsideConnectBg: @Blue3; +@AsideConnectHoverBg: @Blue1; +@VCardLabelColor: @Grey3; + +@InfoColor: @Grey1; +@InfoBackgroundColor: @Metalic3; + +@NoticeColor: @Grey1; +@NoticeBackgroundColor: #511919; + +@ThreadBackgroundColor: #f6f7f8; + +@CommentBoxEmptyColor: @Grey3; +@CommentBoxEmptyBorderColor: @Grey3; +@CommentBoxFullColor: @Grey5; +@CommentBoxFullBorderColor: @Grey5; + +@TagColor: @Grey1; + +@JotToolsBackgroundColor: @Metalic4; +@JotToolsBorderColor: @Metalic2; +@JotToolsOverBackgroundColor: @Metalic3; +@JotToolsOverBorderColor: @Metalic1; +@JotToolsText: @Grey2; +@JotSubmitBackgroundColor: @Grey2; +@JotSubmitText: @Grey4; +@JotSubmitOverBackgroundColor: @Metalic1; +@JotSubmitOverText: @Grey4; +@JotPermissionUnlockBackgroundColor: @Grey2; +@JotPermissionLockBackgroundColor: @Grey4; +@JotLoadingBackgroundColor: @Grey1; + diff --git a/view/theme/vier/contact_template.tpl b/view/theme/vier/contact_template.tpl new file mode 100644 index 000000000..f2749656a --- /dev/null +++ b/view/theme/vier/contact_template.tpl @@ -0,0 +1,21 @@ + +
+
+
+ + $name + + menu + + +
+ +
+
$name
+ + +
+ diff --git a/view/theme/vier/icons.less b/view/theme/vier/icons.less new file mode 100644 index 000000000..f87327703 --- /dev/null +++ b/view/theme/vier/icons.less @@ -0,0 +1,54 @@ +// Quattro Theme LESS file +/* icons */ + +.icons(@size: 22) { + &.notify { background-image: url("../../../images/icons/@{size}/notify_off.png"); } + &.gear { background-image: url("../../../images/icons/@{size}/gear.png"); } + + &.add { background-image: url("../../../images/icons/@{size}/add.png"); } + &.delete { background-image: url("../../../images/icons/@{size}/delete.png"); } + &.edit { background-image: url("../../../images/icons/@{size}/edit.png"); } + &.star { background-image: url("../../../images/icons/@{size}/star.png"); } + &.menu { background-image: url("../../../images/icons/@{size}/menu.png"); } + &.link { background-image: url("../../../images/icons/@{size}/link.png"); } + &.lock { background-image: url("../../../images/icons/@{size}/lock.png"); } + &.unlock { background-image: url("../../../images/icons/@{size}/unlock.png"); } + +} + + +.icon { + background-color: transparent ; + background-repeat: no-repeat; + background-position: left center; + display: block; + overflow: hidden; + text-indent: -9999px; + padding: 1px; + + &.text { + text-indent: 0px; + } + + &.s10 { + min-width:10px; height: 10px; + .icons(10); + &.text { padding: 2px 0px 0px 15px; } + } + &.s16 { + min-width:16px; height: 16px; + .icons(16); + &.text { padding: 4px 0px 0px 20px; } + } + &.s22 { + min-width:22px; height: 22px; + .icons(22); + &.text { padding: 10px 0px 0px 25px; } + } + &.s48 { + width:48px; height: 48px; + .icons(48); + } + + +} diff --git a/view/theme/vier/icons.png b/view/theme/vier/icons.png new file mode 100644 index 000000000..0e1e7662d Binary files /dev/null and b/view/theme/vier/icons.png differ diff --git a/view/theme/vier/icons.svg b/view/theme/vier/icons.svg new file mode 100644 index 000000000..91bb2ff38 --- /dev/null +++ b/view/theme/vier/icons.svg @@ -0,0 +1,1463 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + YouTube + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Lorem Ip + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ? + ? + + + diff --git a/view/theme/vier/quattro.less b/view/theme/vier/quattro.less new file mode 100644 index 000000000..671577303 --- /dev/null +++ b/view/theme/vier/quattro.less @@ -0,0 +1,833 @@ +// Quattro Theme LESS file + +/* global */ +body { + font-family: Liberation Sans,helvetica,arial,clean,sans-serif; + font-size: 10px; + background-color: @BodyBackground; + color: @BodyColor; + margin: 50px 0px 0px 0px; + display:table; +} +h4 { font-size: 1.1em } + +.shadow(@x: 0px, @y: 5px){ + -webkit-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7); + box-shadow:@x @y 10px rgba(0, 0, 0, 0.7); +} + +.rounded(@tr: 5px, @tl: 5px, @bl: 5px, @br: 5px){ + -moz-border-radius: @arguments; + -webkit-border-radius: @arguments; + border-radius: @arguments; +} +.roundbottom (@radius: 5px){ .rounded(0, 0, @radius, @radius); } +.roundtop (@radius: 5px){ .rounded(@radius, @radius, 0, 0); } + +.opaque(@v: 0.5){ + opacity: @v; + -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; +} + + +a, a:link { color: @Link; text-decoration: none; } +a:visited { color: @LinkVisited; text-decoration: none; } +a:hover {color: @LinkHover; text-decoration: underline; } + +.left { float: left; } +.right { float: right; } +.hidden { display: none; } +.clear { clear: both; } + +code { + font-family: Courier, monospace; + white-space: pre; + display: block; + overflow: auto; + border: 1px solid #444; + background: #EEE; + color: #444; + padding: 10px; + margin-top: 20px; +} +/* tool */ + +.tool { + height: auto; overflow: auto; + .label { float: left;} + .action { float: right; } +} + + + + +/* popup notifications */ +div.jGrowl div.notice { + background: @NoticeBackgroundColor url("../../../images/icons/48/notice.png") no-repeat 5px center; + color: @NoticeColor; + padding-left: 58px; +} +div.jGrowl div.info { + background: @InfoBackgroundColor url("../../../images/icons/48/info.png") no-repeat 5px center; + color: @InfoColor; + padding-left: 58px; +} + + + +/* header */ +header { + position: fixed; left: 43%; right: 43%; top: 0px; + margin: 0px; padding: 0px; + /*width: 100%; height: 12px; */ + z-index: 110; + color: @Grey1; + #site-location { + display: none; + } + + #banner { + overflow: hidden; + text-align: center; + width: 100%; + a, a:active, a:visited, a:link, a:hover { color: @Grey1; text-decoration: none; outline: none; vertical-align: bottom; } + #logo-img { height: 22px; margin-top:5px;} + #logo-text { font-size: 22px } + } +} +/* nav */ +nav { + width: 100%; height: 32px; + position: fixed; left: 0px; top: 0px; + padding: 0px; + background-color: @NavbarBackground; + color: @Grey1; + z-index: 100; + .shadow(0px, 0px); + + a, a:active, a:visited, a:link, a:hover { color: @Banner; text-decoration: none; outline: none; } + + ul { + margin: 0px; + padding: 0px 20px; + li { + list-style: none; + margin: 0px; padding: 0px; + float: left; + .menu-popup{ left: 0px; right: auto; } + } + + } + + .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 10px; + .roundtop(); + + &.selected { + background-color: @NavbarSelectedBg; + } + + img { width: 22px; height: 22px; } + .nav-notify { top: 3px; } + } + + .nav-menu { + position: relative; + height: 16px; + padding: 5px; + margin: 3px 15px 0px; + font-size: 14px; + border-bottom: 3px solid @NavbarBackground; + &.selected { + border-bottom: 3px solid @NavbarSelectedBorder; + } + + } + + .nav-notify { + display: none; + position: absolute; + background-color: @NavbarNotifBg; + .rounded(); + font-size: 10px; + padding: 1px 3px; + top: 0px; + right: -10px; + min-width: 15px; + text-align: right; + + &.show{ display: block; } + } + + + #nav-help-link, + #nav-search-link, + #nav-directory-link, + #nav-apps-link, + #nav-site-linkmenu { + float: right; + .menu-popup{ right: 0px; left: auto; } + } + + #nav-notifications-linkmenu.on .icon.s22.notify, + #nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/22/notify_on.png") } + #nav-apps-link.selected { background-color: @NavbarSelectedBg; } +} + + +ul.menu-popup { + position: absolute; + display: none; + width: 10em; + background: @MenuBg; + color: @Menu; + margin: 0px; + padding: 0px; + list-style: none; + border: 3px solid @MenuBorder; + z-index: 100000; + + .shadow(); + + a { display: block; color: @MenuItem; padding: 5px 10px; text-decoration: none;} + a:hover { background-color: @MenuItemHoverBg; } + .menu-sep { border-top: 1px solid @MenuItemSeparator; } + li { float: none; overflow: auto; height: auto; display: block; } + li img { float: left; width: 16px; height: 16px; padding-right: 5px;} + .empty { + padding: 5px; + text-align: center; + color: @MenuEmpty; + } + +} + +/* autocomplete popup */ +.acpopup { + max-height:150px; + background-color:@MenuBg; + color: @Menu; + border:1px solid #MenuBorder; + overflow:auto; + z-index:100000; + .shadow(); +} +.acpopupitem { + color: @MenuItem; padding: 4px; + clear:left; + img { + float: left; + margin-right: 4px; + } + &.selected{ + background-color: @MenuItemHoverBg; + } +} + + +#nav-notifications-menu { + width: 400px; + img { float: left; margin-right: 5px; } + .contactname { font-weight: bold; } + .notif-when { font-size: 10px; color: @MenuItemDetail; display: block; } +} + + + + +/* aside */ +aside { + display: table-cell; + vertical-align: top; + width: 200px; + padding:0px 10px 0px 20px; + border-right: 1px solid @AsideBorder; + + .vcard { + .fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; } + .title { margin-bottom: 5px; } + dl { height: auto; overflow: auto; } + dt {float: left; margin-left: 0px; width: 35%; text-align: right; color: @VCardLabelColor; } + dd {float: left; margin-left: 4px; width: 60%;} + + } + + #profile-extra-links { + ul { padding: 0px; margin: 0px; } + li { padding: 0px; margin: 0px; list-style: none; } + } + + #dfrn-request-link { + display: block; + .rounded(); + color: @AsideConnect; + background: @AsideConnectBg url('../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform:uppercase; + padding: 4px 2px 2px 35px; + + &:hover { text-decoration: none; background-color: @AsideConnectHoverBg; } + } + + #profiles-menu { width: 20em; } + + +} + +#contact-block { + overflow: auto; height: auto; + .contact-block-h4 { float: left; margin: 5px 0px; } + .allcontact-link { float: right; margin: 5px 0px; } + .contact-block-content { + clear: both; + overflow: auto; height: auto; + } + .contact-block-link { + float: left; + margin: 0px 2px 2px 0px; + img { widht: 48px; height: 58px; } + } +} + + +/* widget */ +.widget { + margin-bottom: 2em; + + h3 { padding: 0px; margin: 2px;} + .action { .opaque(0.1); } + input.action { .opaque(0.5); } + &:hover .title .action { .opaque(1); } + .tool:hover .action { .opaque(1); } + .tool:hover .action.ticked { .opaque(1); } + + ul { padding: 0px;} + ul li {padding-left: 16px; min-height: 16px; list-style: none; } + + .tool.selected { + background: url('../../../images/selected.png') no-repeat left center; + } + + /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} + .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ + +} + +/* widget: search */ +#add-search-popup { + width: 200px; + top: 18px; +} + + +/* section */ +section { + display: table-cell; + vertical-align: top; + width: 800px; + padding:0px 20px 0px 10px; +} + +/* wall item */ +.tread-wrapper { + background-color: @ThreadBackgroundColor; + position: relative; + padding: 10px; + margin-bottom: 20px; + width: 780px; +} +.wall-item-decor { position: absolute; left: 790px; top: -10px; width: 16px;} +.unstarred { display: none; } + +.wall-item-container { + display: table; + width: 780px; + + .wall-item-item, + .wall-item-bottom { display: table-row; } + + .wall-item-bottom { .opaque(0.5); } + &:hover .wall-item-bottom { .opaque(1); } + .wall-item-info { + display: table-cell; + vertical-align: top; + text-align: left; + width: 60px; + + } + .wall-item-location { + word-wrap: break-word; + width: 50px; + } + .wall-item-content { + display: table-cell; + font-size: 12px; + max-width: 720px; + word-wrap: break-word; + } + .wall-item-content img { max-width: 710px; } + .wall-item-links, + .wall-item-actions { + display: table-cell; + vertical-align: middle; + + .icon { + .opaque(0.5); + } + .icon:hover { + .opaque(1.0); + } + } + + .wall-item-ago { padding-right: 40px; } + .wall-item-name { font-weight: bold; } + + .wall-item-actions-author { float: left; width: 20em; margin-top: 0.5em; } + .wall-item-actions-social { float: left; margin-top: 0.5em; + a { margin-right: 3em; } + } + .wall-item-actions-tools { float: right; width: 15%; + a { float: right; } + input { float: right; } + } + +} + + +.wall-item-container.comment { + /*margin-top: 50px;*/ + .contact-photo { width: 32px; height: 32px; margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + } + .contact-photo-menu-button { + top: 15px !important; + left: 15px !important; + } + .wall-item-links { padding-left: 12px; } +} + +.wall-item-comment-wrapper { + margin: 30px 2em 2em 60px; + .comment-edit-photo { display: none; } + textarea { + height: 1em; width: 100%; font-size: 10px; + color: @CommentBoxEmptyColor; + border: 1px solid @CommentBoxEmptyBorderColor; + padding:0.3em; + } + .comment-edit-text-full { + font-size: 14px; + height: 4em; + color: @CommentBoxFullColor; + border: 1px solid @CommentBoxFullBorderColor; + } +} + + + +.wall-item-tags { padding-top: 5px; } +.tag { + background: url("../../../images/tag_b.png") no-repeat center left; + color: @TagColor; + padding-left: 3px; + a { + padding-right: 8px; + background: url("../../../images/tag.png") no-repeat center right; + color: @TagColor; + } +} + +/* contacts menu */ +.contact-photo-wrapper { position: relative; } +.contact-photo { + width: 48px; height: 48px; + img { width: 48px; height: 48px; } + overflow: hidden; + display: block; + } +.contact-photo-menu-button { + display: none; + position: absolute; + left: -2px; + top: 31px; +} + +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + .contact-photo { + width: 80px; height: 80px; + img { width: 80px; height: 80px; } + } + .contact-photo-menu-button { + left: 0px; + top: 63px; + } +} +.directory-item { + float: left; + width: 200px; + height: 200px; + .contact-photo { + width: 175px; height: 175px; + img { width: 175px; height: 175px; } + } +} +.contact-name { text-align: center; font-weight: bold; } +.contact-details { color: @Grey3;} + +/* editor */ +.jothidden { display: none; } +#jot { + + width: 100%; + margin: 0px 2em 20px 0px; + + + .profile-jot-text { + height: 1em; width: 99%; font-size: 10px; + color: @CommentBoxEmptyColor; + border: 1px solid @CommentBoxEmptyBorderColor; + padding:0.3em; + } + + #jot-tools { + margin: 0px; padding: 0px; + height: 40px; overflow: none; + width: 800px; + background-color: @JotToolsBackgroundColor; + border-bottom: 2px solid @JotToolsBorderColor; + li { + list-style: none; + float: left; + width: 80px; + height: 40px; + border-bottom: 2px solid @JotToolsBorderColor; + a { + display: block; + color: @JotToolsText; + width: 100%; + height:40px; + text-align: center; + line-height: 40px; + overflow: hidden; + } + } + li:hover { + background-color: @JotToolsOverBackgroundColor; + border-bottom: 2px solid @JotToolsOverBorderColor; + } + li.perms { + float: right; + width: 40px; + a.unlock { + width: 30px; + border-left: 10px solid @JotPermissionUnlockBackgroundColor; + background-color: @JotPermissionUnlockBackgroundColor; + } + a.lock { + width: 30px; + border-left: 10px solid @JotPermissionLockBackgroundColor; + background-color: @JotPermissionLockBackgroundColor; + } + + } + li.submit { + float: right; + background-color: @JotSubmitBackgroundColor; + border-bottom: 2px solid @JotSubmitBackgroundColor; + border-right: 1px solid @Grey4; + border-left: 1px solid @Grey4; + input { + border: 0px; margin: 0px; padding: 0px; + background-color: @JotSubmitBackgroundColor; + color: @JotSubmitText; + width: 80px; height: 40px; + line-height: 40px; + } + input:hover { + background-color: @JotSubmitOverBackgroundColor; + color: @JotSubmitOverText; + } + } + li.loading { + float: right; + background-color: @JotLoadingBackgroundColor; + width: 20px; + vertical-align: center; + text-align: center; + img { margin-top: 10px; } + border-top: 2px solid @JotToolsBorderColor; + height: 38px; + } + } + + #jot-title { + border: 0px; + margin: 0px; + height: 20px; + width: 700px; + font-weight: bold; + border: 1px solid @BodyBackground; + + &:-webkit-input-placeholder { + font-weight: normal; + } + + &:-moz-placeholder { + font-weight: normal; + } + + &:hover { border: 1px solid @CommentBoxEmptyBorderColor } + &:focus { border: 1px solid @CommentBoxEmptyBorderColor } + } + + #character-counter { + width: 80px; + float: right; + text-align: right; + height: 20px; + line-height: 20px; + padding-right: 20px; + } + +} + + +/** buttons **/ +/*input[type="submit"] { + border: 0px; + background-color: @ButtonBackgroundColor; + color: @ButtonColor; + padding: 0px 10px; + .rounded(5px); + height: 18px; +}*/ + + +/** acl **/ +#photo-edit-perms-select, +#photos-upload-permissions-wrapper, +#profile-jot-acl-wrapper{ + display:block!important; +} + + + +#acl-wrapper { + width: 690px; + float:left; +} +#acl-search { + float:right; + background: #ffffff url("../../../images/search_18.png") no-repeat right center; + padding-right:20px; +} +#acl-showall { + float: left; + display: block; + width: auto; + height: 18px; + background-color: #cccccc; + background-image: url("../../../images/show_all_off.png"); + background-position: 7px 7px; + background-repeat: no-repeat; + padding: 7px 5px 0px 30px; + color: #999999; + .rounded(5px); +} +#acl-showall.selected { + color: #000000; + background-color: #ff9900; + background-image: url("../../../images/show_all_on.png"); +} + +#acl-list { + height: 210px; + border: 1px solid #cccccc; + clear: both; + margin-top: 30px; + overflow: auto; +} +#acl-list-content { + +} +.acl-list-item { + display: block; + width: 150px; + height: 30px; + border: 1px solid #cccccc; + margin: 5px; + float: left; +} +.acl-list-item img{ + width:22px; + height: 22px; + float: left; + margin: 4px; +} +.acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;} +.acl-list-item a { + font-size: 8px; + display: block; + width: 40px; + height: 10px; + float: left; + color: #999999; + background-color: #cccccc; + background-position: 3px 3px; + background-repeat: no-repeat; + margin-right: 5px; + -webkit-border-radius: 2px ; + -moz-border-radius: 2px; + border-radius: 2px; + padding-left: 15px; +} +#acl-wrapper a:hover { + text-decoration: none; + color:#000000; +} +.acl-button-show { background-image: url("../../../images/show_off.png"); } +.acl-button-hide { background-image: url("../../../images/hide_off.png"); } + +.acl-button-show.selected { + color: #000000; + background-color: #9ade00; + background-image: url("../../../images/show_on.png"); +} +.acl-button-hide.selected { + color: #000000; + background-color: #ff4141; + background-image: url("../../../images/hide_on.png"); +} +.acl-list-item.groupshow { border-color: #9ade00; } +.acl-list-item.grouphide { border-color: #ff4141; } +/** /acl **/ + +/** tab buttons **/ +ul.tabs { + list-style-type: none; + padding-bottom: 10px; + + li { + float: left; + margin-left: 20px; + + .active { + border-bottom: 1px solid @LinkVisited; + } + } + +} + + +/** + * Form fields + */ +.field { + margin-bottom: 10px; + padding-bottom: 10px; + overflow: auto; + width: 100%; + + + label { + float: left; + width: 200px; + } + + input, + textarea { + width: 400px; + } + textarea { height: 100px; } + .field_help { + display: block; + margin-left: 200px; + color: #666666; + + } + + + .onoff { + float: left; + width: 80px; + } + .onoff a { + display: block; + border:1px solid #666666; + background-image:url("../../../images/onoff.jpg"); + background-repeat: no-repeat; + padding: 4px 2px 2px 2px; + height: 16px; + text-decoration: none; + } + .onoff .off { + border-color:#666666; + padding-left: 40px; + background-position: left center; + background-color: #cccccc; + color: #666666; + text-align: right; + } + .onoff .on { + border-color:#204A87; + padding-right: 40px; + background-position: right center; + background-color: #D7E3F1; + color: #204A87; + text-align: left; + } + .hidden { display: none!important; } + + &.radio .field_help { margin-left: 0px; } +} + +#profile-edit-links li { + list-style: none; +} + +/* oauth */ +.oauthapp { + height: auto; overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; height: 48px; + margin: 10px; +} +.oauthapp img.noicon { + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; +} + +/* contacts */ +.contact-entry-wrapper { + width: 50px; float: left; +} + +/* photo */ +.lframe { + float: left; + margin: 0px 10px 10px 0px; +} + + +/* page footer */ +footer { height: 100px; display: table-row; } diff --git a/view/theme/vier/search_item.tpl b/view/theme/vier/search_item.tpl new file mode 100755 index 000000000..9cd3c8e2e --- /dev/null +++ b/view/theme/vier/search_item.tpl @@ -0,0 +1,87 @@ + +
+ $star.starred + {{ if $lock }}$lock{{ endif }} + +
+ +
+
+
+
+ + $name + + menu + + +
+
+
+ $name + -   + {{ if $plink }}$ago{{ else }} $ago {{ endif }} + +
+
+ {{ if $title }}

$title

{{ endif }} + $body +
+
+
+
+
+
+ {{ for $tags as $tag }} + $tag + {{ endfor }} +
+
+
+
+ {{ if $plink }}$plink.title{{ endif }} +
+
+ +
$location 
+ +
+ {{ if $star }} + $star.do + $star.undo + $star.tagger + {{ endif }} + + {{ if $vote }} + $vote.like.1 + $vote.dislike.1 + {{ endif }} + + {{ if $vote.share }} + $vote.share.1 + {{ endif }} +
+ +
+ + {{ if $drop.dropping }} + + $drop.delete + {{ endif }} + {{ if $edpost }} + + {{ endif }} +
+ +
+
+
+
+ +
$dislike
+
+
diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css new file mode 100644 index 000000000..96233c1da --- /dev/null +++ b/view/theme/vier/style.css @@ -0,0 +1,1451 @@ +/** + * Fabio Comuni + * Additional Changes: Michael Vogel + **/ + +/* ========= */ +/* = Admin = */ +/* ========= */ + +#adminpage { +/* width: 80%;*/ +} + +#pending-update { + float:right; + color: #ffffff; + font-weight: bold; + background-color: #FF0000; + padding: 0em 0.3em; +} + +.admin.linklist { + border: 0px; padding: 0px; +} + +.admin.link { + list-style-position: inside; + font-size: 1em; + padding: 5px; + width: 100px; + margin: 5px; +} + +#adminpage dl { + clear: left; + margin-bottom: 2px; + padding-bottom: 2px; + border-bottom: 1px solid black; +} + +#adminpage dt { + width: 200px; + float: left; + font-weight: bold; +} + +#adminpage dd { + margin-left: 200px; +} +#adminpage h3 { + border-bottom: 1px solid #898989; + margin-bottom: 5px; + margin-top: 10px; +} + +#adminpage .submit { + clear:left; +} + +#adminpage #pluginslist { + margin: 0px; padding: 0px; +} + +#adminpage .plugin { + list-style: none; + display: block; + /* border: 1px solid #888888; */ + padding: 1em; + margin-bottom: 5px; + clear: left; +} + +#adminpage .toggleplugin { + float:left; + margin-right: 1em; +} + +#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;} +#adminpage table th { text-align: left;} +#adminpage td .icon { float: left;} +#adminpage table#users img { width: 16px; height: 16px; } +#adminpage table tr:hover { background-color: #eeeeee; } +#adminpage .selectall { text-align: right; } +/* icons */ + + +.article { background-position: -50px 0px;} +.audio { background-position: -70px 0px;} +.block { background-position: -90px 0px;} +.drop { background-position: -110px 0px;} +.drophide { background-position: -130px 0px;} +.edit { background-position: -150px 0px;} +.camera { background-position: -170px 0px;} +.dislike { background-position: -190px 0px;} +.like { background-position: -210px 0px;} +.link { background-position: -230px 0px;} + +.globe { background-position: -50px -20px;} +.noglobe { background-position: -70px -20px;} +.no { background-position: -90px -20px;} +.pause { background-position: -110px -20px;} +.play { background-position: -130px -20px;} +.pencil { background-position: -150px -20px;} +.small-pencil { background-position: -170px -20px;} +.recycle { background-position: -190px -20px;} +.remote-link { background-position: -210px -20px;} +.share { background-position: -230px -20px;} + +.tools { background-position: -50px -40px;} +.lock { background-position: -70px -40px;} + +.video { background-position: -110px -40px;} +.youtube { background-position: -130px -40px;} + +.attach { background-position: -190px -40px;} +.language { background-position: -210px -40px;} + + +.on { background-position: -50px -60px;} +.off { background-position: -70px -60px;} +.prev { background-position: -90px -60px;} +.next { background-position: -110px -60px;} +.tagged { background-position: -130px -60px;} + +.icon.drop, .icon.drophide { + float: left; +} + +.icon { + display: block; + width: 20px; + height: 20px; + background-image: url('icons.png'); +} + +.icon { + background-color: transparent ; + background-repeat: no-repeat; + /* background-position: left center; */ + display: block; + overflow: hidden; + text-indent: -9999px; + padding: 1px; +} + +.icon.text { + text-indent: 0px; +} +.icon.s10 { + min-width: 10px; + height: 10px; +} +.icon.s10.notify { + background-image: url("../../../images/icons/10/notify_off.png"); +} +.icon.s10.gear { + background-image: url("../../../images/icons/10/gear.png"); +} +.icon.s10.add { + background-image: url("../../../images/icons/10/add.png"); +} +.icon.s10.delete { + background-image: url("../../../images/icons/10/delete.png"); +} +.icon.s10.edit { + background-image: url("../../../images/icons/10/edit.png"); +} +.icon.s10.star { + background-image: url("../../../images/icons/10/star.png"); +} +.icon.s10.menu { + background-image: url("../../../images/icons/10/menu.png"); +} +.icon.s10.link { + background-image: url("../../../images/icons/10/link.png"); +} +.icon.s10.lock { + background-image: url("../../../images/icons/10/lock.png"); +} +.icon.s10.unlock { + background-image: url("../../../images/icons/10/unlock.png"); +} +.icon.s10.text { + padding: 2px 0px 0px 15px; + font-size: 10px; +} +.icon.s16 { + min-width: 16px; + height: 16px; +} +.icon.s16.notify { + background-image: url("../../../images/icons/16/notify_off.png"); +} +.icon.s16.gear { + background-image: url("../../../images/icons/16/gear.png"); +} +.icon.s16.add { + background-image: url("../../../images/icons/16/add.png"); +} +.icon.s16.delete { + background-image: url("../../../images/icons/16/delete.png"); +} +.icon.s16.edit { + background-image: url("../../../images/icons/16/edit.png"); +} +.icon.s16.star { + background-image: url("../../../images/icons/16/star.png"); +} +.icon.s16.menu { + background-image: url("../../../images/icons/16/menu.png"); +} +/*.icon.s16.link { + background-image: url("../../../images/icons/16/link.png"); +}*/ +.icon.s16.lock { + background-image: url("../../../images/icons/16/lock.png"); +} +.icon.s16.unlock { + background-image: url("../../../images/icons/16/unlock.png"); +} +.icon.s16.text { + padding: 4px 0px 0px 20px; + font-size: 10px; +} +.icon.s22 { + min-width: 22px; + height: 22px; +} +.icon.s22.notify { + background-image: url("../../../images/icons/22/notify_off.png"); +} +.icon.s22.gear { + background-image: url("../../../images/icons/22/gear.png"); +} +.icon.s22.add { + background-image: url("../../../images/icons/22/add.png"); +} +.icon.s22.delete { + background-image: url("../../../images/icons/22/delete.png"); +} +.icon.s22.edit { + background-image: url("../../../images/icons/22/edit.png"); +} +.icon.s22.star { + background-image: url("../../../images/icons/22/star.png"); +} +.icon.s22.menu { + background-image: url("../../../images/icons/22/menu.png"); +} +.icon.s22.link { + background-image: url("../../../images/icons/22/link.png"); +} +.icon.s22.lock { + background-image: url("../../../images/icons/22/lock.png"); +} +.icon.s22.unlock { + background-image: url("../../../images/icons/22/unlock.png"); +} +.icon.s22.text { + padding: 10px 0px 0px 25px; + width: 200px; +} +.icon.s48 { + width: 48px; + height: 48px; +} +.icon.s48.notify { + background-image: url("../../../images/icons/48/notify_off.png"); +} +.icon.s48.gear { + background-image: url("../../../images/icons/48/gear.png"); +} +.icon.s48.add { + background-image: url("../../../images/icons/48/add.png"); +} +.icon.s48.delete { + background-image: url("../../../images/icons/48/delete.png"); +} +.icon.s48.edit { + background-image: url("../../../images/icons/48/edit.png"); +} +.icon.s48.star { + background-image: url("../../../images/icons/48/star.png"); +} +.icon.s48.menu { + background-image: url("../../../images/icons/48/menu.png"); +} +.icon.s48.link { + background-image: url("../../../images/icons/48/link.png"); +} +.icon.s48.lock { + background-image: url("../../../images/icons/48/lock.png"); +} +.icon.s48.unlock { + background-image: url("../../../images/icons/48/unlock.png"); +} + +#contact-edit-links ul { + list-style: none; + list-style-type: none; +} + +.hide-comments-outer { + margin-left: 80px; + margin-bottom: 5px; + width: 684px; + border-bottom: 1px solid #BDCDD4; + border-top: 1px solid #BDCDD4; + + padding: 8px; +} + +/* global */ +body { + font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 13px; + background-color: #ffffff; + color: #2d2d2d; + margin: 50px 0px 0px 0px; + display: table; +} +h4 { + font-size: 1.1em; +} + +a {color: #3e3e8c; +text-decoration: none; +} +a:hover {color: blue; +text-decoration: underline} + +.wall-item-name-link { +/* float: left;*/ +} + +.wall-item-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} + +.left { + float: left; +} +.right { + float: right; +} +.hidden { + display: none; +} +.clear { + clear: both; +} +.fakelink { + color: #3e3e8c; + text-decoration: none; + cursor: pointer; +} +.fakelink:hover { + color: blue; + /*color: #005c94; */ + text-decoration: underline; +} +code { + font-family: Courier, monospace; + white-space: pre; + display: block; + overflow: auto; + border: 1px solid #444; + background: #EEE; + color: #444; + padding: 10px; + margin-top: 20px; +} +#panel { + position: absolute; + width: 10em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 1em; + list-style: none; + border: 3px solid #364e59; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +/* tool */ +.tool { + height: auto; + overflow: auto; +} +.tool .label { + float: left; +} +.tool .action { + float: right; +} +/* popup notifications */ +div.jGrowl div.notice { + background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +div.jGrowl div.info { + background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +/* header */ +header { + position: fixed; + left: 43%; + right: 43%; + top: 0px; + margin: 0px; + padding: 0px; + /*width: 100%; height: 12px; */ + + z-index: 110; + color: #ffffff; +} +header #site-location { + display: none; +} +header #banner { + overflow: hidden; + text-align: center; + width: 100%; +} +header #banner a, +header #banner a:active, +header #banner a:visited, +header #banner a:link, +header #banner a:hover { + color: #ffffff; + text-decoration: none; + outline: none; + vertical-align: bottom; +} +header #banner #logo-img { + height: 22px; + margin-top: 5px; +} +header #banner #logo-text { + font-size: 22px; +} +/* nav */ +nav { + width: 100%; + height: 32px; + position: fixed; + left: 0px; + top: 0px; + padding: 0px; + background: #364A84; + background: -moz-linear-gradient(top, #516499 0%, #364a84 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#516499), color-stop(100%,#364a84)); + background: -webkit-linear-gradient(top, #516499 0%,#364a84 100%); + background: -o-linear-gradient(top, #516499 0%,#364a84 100%); + background: -ms-linear-gradient(top, #516499 0%,#364a84 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#516499', endColorstr='#364a84',GradientType=0 ); + background: linear-gradient(top, #516499 0%,#364a84 100%); + color: #ffffff; + z-index: 100; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); +} +nav a, +nav a:active, +nav a:visited, +nav a:link, +nav a:hover { + color: #ffffff; + text-decoration: none; + outline: none; +} +nav ul { + margin: 0px; + padding: 0px 20px; +} +nav ul li { + list-style: none; + margin: 0px; + padding: 0px; + float: left; +} +nav ul li .menu-popup { + left: 0px; + right: auto; +} +nav .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 10px; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +nav .nav-menu-icon.selected { + background-color: #364e59; +} +nav .nav-menu-icon img { + width: 22px; + height: 22px; +} +nav .nav-menu-icon .nav-notify { + top: 3px; +} +nav .nav-menu { + position: relative; + height: 16px; + padding: 5px; + margin: 3px 15px 0px; + font-size: 13px; + border-bottom: 3px solid #364A84; +} +nav .nav-menu.selected { + border-bottom: 3px solid #9eabb0; +} +nav .nav-notify { + display: none; + position: absolute; + background-color: #19aeff; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + font-size: 10px; + padding: 1px 3px; + top: 0px; + right: -10px; + min-width: 15px; + text-align: right; +} +nav .nav-notify.show { + display: block; +} +nav #nav-help-link, +nav #nav-search-link, +nav #nav-directory-link, +nav #nav-apps-link, +nav #nav-site-linkmenu { + float: right; +} +nav #nav-help-link .menu-popup, +nav #nav-search-link .menu-popup, +nav #nav-directory-link .menu-popup, +nav #nav-apps-link .menu-popup, +nav #nav-site-linkmenu .menu-popup { + right: 0px; + left: auto; +} +nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify { + background-image: url("../../../images/icons/22/notify_on.png"); +} +nav #nav-apps-link.selected { + background-color: #364e59; +} +ul.menu-popup { + position: absolute; + display: none; + width: 10em; + background: #ffffff; + color: #2d2d2d; + margin: 0px; + padding: 0px; + list-style: none; + border: 3px solid #364e59; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +ul.menu-popup a { + display: block; + color: #2d2d2d; + padding: 5px 10px; + text-decoration: none; +} +ul.menu-popup a:hover { + background-color: #bdcdd4; +} +ul.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} +ul.menu-popup li { + float: none; + overflow: auto; + height: auto; + display: block; +} +ul.menu-popup li img { + float: left; + width: 16px; + height: 16px; + padding-right: 5px; +} +ul.menu-popup .empty { + padding: 5px; + text-align: center; + color: #9eabb0; +} +/* autocomplete popup */ +.acpopup { + max-height: 150px; + background-color: #ffffff; + color: #2d2d2d; + border: 1px solid #MenuBorder; + overflow: auto; + z-index: 100000; + -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); +} +.acpopupitem { + color: #2d2d2d; + padding: 4px; + clear: left; +} +.acpopupitem img { + float: left; + margin-right: 4px; +} +.acpopupitem.selected { + background-color: #bdcdd4; +} +#nav-notifications-menu { + width: 400px; + max-height: 550px; + overflow: auto; +} +#nav-notifications-menu img { + float: left; + margin-right: 5px; +} +#nav-notifications-menu .contactname { + font-weight: bold; +} +#nav-notifications-menu .notif-when { + font-size: 10px; + color: #9eabb0; + display: block; +} +/* aside */ +aside { + display: table-cell; + vertical-align: top; + width: 200px; + padding: 0px 10px 0px 20px; + border-right: 1px solid #D2D2D2; + /* background: #F1F1F1; */ +} +aside .vcard .fn { + font-size: 16px; + font-weight: bold; + margin-bottom: 5px; +} +aside .vcard .title { + margin-bottom: 5px; +} +aside .vcard dl { + height: auto; + overflow: auto; +} +aside .vcard dt { + float: left; + margin-left: 0px; + width: 35%; + text-align: right; + color: #999999; +} +aside .vcard dd { + float: left; + margin-left: 4px; + width: 60%; +} +aside #profile-extra-links ul { + padding: 0px; + margin: 0px; +} +aside #profile-extra-links li { + padding: 0px; + margin: 0px; + list-style: none; +} +aside #dfrn-request-link { + display: block; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + color: #ffffff; + background: #005c94 url('../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform: uppercase; + padding: 4px 2px 2px 35px; +} +aside #dfrn-request-link:hover { + text-decoration: none; + background-color: #19aeff; +} +aside #profiles-menu { + width: 20em; +} +#contact-block { + overflow: auto; + height: auto; +} +#contact-block .contact-block-h4 { + float: left; + margin: 5px 0px; +} +#contact-block .allcontact-link { + float: right; + margin: 5px 0px; +} +#contact-block .contact-block-content { + clear: both; + overflow: auto; + height: auto; +} +#contact-block .contact-block-link { + float: left; + margin: 0px 2px 2px 0px; +} +#contact-block .contact-block-link img { + widht: 48px; + height: 58px; +} +/* widget */ +.widget { + margin-bottom: 2em; + /*.action .s10 { width: 10px; overflow: hidden; padding: 0px;} + .action .s16 { width: 16px; overflow: hidden; padding: 0px;}*/ +/* font-size: 12px; */ +} +.widget h3 { + padding: 0px; + margin: 2px; +} +.widget .action { + opacity: 0.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; +} +.widget input.action { + 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; +} +.widget:hover .title .action { + 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; +} +.widget .tool:hover .action { + 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; +} +.widget .tool:hover .action.ticked { + 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; +} +.widget ul { + padding: 0px; +} +.widget ul li { + padding-left: 16px; + min-height: 16px; + list-style: none; +} +.widget .tool.selected { + background: url('../../../images/selected.png') no-repeat left center; +} +/* widget: search */ +#add-search-popup { + width: 200px; + top: 18px; +} +/* section */ +section { + display: table-cell; + vertical-align: top; + width: 800px; + padding: 0px 20px 0px 10px; +} +/* wall item */ +.tread-wrapper { + border-bottom: 1px solid #D2D2D2; + position: relative; + padding: 5px; + margin-bottom: 0px; + width: 775px; +} +.wall-item-decor { + position: absolute; + left: 790px; + top: -10px; + width: 16px; +} +.unstarred { + display: none; +} +.wall-item-container { + display: table; + width: 780px; +} +.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { + display: table-row; +} +.wall-item-bottom { + font-size: 13px; +} +.wall-item-container .wall-item-bottom { + 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:hover .wall-item-bottom { + 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; +} +.wall-item-container .wall-item-info { + display: table-cell; + vertical-align: top; + text-align: left; + width: 80px; +} +.wall-item-container .wall-item-location { + padding-right: 40px; +} +.wall-item-container .wall-item-ago { + word-wrap: break-word; + width: 50px; + margin-left: 10px; + color: #999; +} +.wall-item-location { + width: 180px; + float: left; +} + +.wall-item-container .wall-item-content { + font-size: 13px; + max-width: 720px; + word-wrap: break-word; + line-height: 1.4; +} + +.wall-item-container .wall-item-content img { + max-width: 710px; +} +.wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { + display: table-cell; + vertical-align: middle; +} +.wall-item-container .wall-item-links .icon, .wall-item-container .wall-item-actions .icon { + 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 .wall-item-links .icon:hover, .wall-item-container .wall-item-actions .icon:hover { + 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; +} +.wall-item-container .wall-item-name { + font-weight: bold; +} +.wall-item-container .wall-item-actions-author { + width: 100%; + margin-bottom: 0.3em; +} +.wall-item-container .wall-item-actions-social { + float: left; + margin-bottom: 1px; +} +.wall-item-container .wall-item-actions-social a { + margin-right: 1em; +} +.wall-item-container .wall-item-actions-tools { + float: right; + width: 60px; +} +.wall-item-container .wall-item-actions-tools a { + float: right; +} +.wall-item-container .wall-item-actions-tools input { + float: right; +} +.wall-item-container.comment { + margin-top: 5px; + margin-bottom: 5px; + margin-left: 80px; + width: 700px; + border-bottom: 1px solid hsl(198, 21%, 79%); +} +.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; +} +.wall-item-container.comment .wall-item-links { + padding-left: 12px; +} +.wall-item-comment-wrapper { + margin: 1px 5px 1px 80px; +} +.wall-item-comment-wrapper .comment-edit-photo { + display: none; +} +.wall-item-comment-wrapper textarea { + height: 1.2em; + width: 100%; + font-size: 10px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; +} +.wall-item-comment-wrapper .comment-edit-text-full { + font-size: 14px; + height: 4em; + color: #2d2d2d; + border: 1px solid #2d2d2d; +} +.comment-edit-preview { + width: 710px; + border: 1px solid #2d2d2d; + margin-top: 10px; +} +.comment-edit-preview .contact-photo { + width: 32px; + height: 32px; + margin-left: 16px; + /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ + +} +.comment-edit-preview .contact-photo-menu-button { + top: 15px !important; + left: 15px !important; +} +.comment-edit-preview .wall-item-links { + padding-left: 12px; +} +.comment-edit-preview .wall-item-container { + width: 700px; +} +.comment-edit-preview .tread-wrapper { + width: 700px; + padding: 0; + margin: 10px 0; +} +.wall-item-tags { + padding-top: 1px; + padding-bottom: 2px; +} +.tag { + background: url("../../../images/tag_b.png") repeat-x center left; + color: #ffffff; + padding-left: 3px; + font-size: 10px; +} +.tag a { + padding-right: 8px; + background: url("../../../images/tag.png") no-repeat center right; + color: #ffffff; +} +.wwto { + position: absolute !important; + width: 25px; + height: 25px; + background: #FFFFFF; + border: 2px solid #364e59; + height: 25px; + width: 25px; + overflow: hidden; + padding: 1px; + position: absolute !important; + top: 40px; + left: 30px; + -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); + box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.7); +} +.wwto .contact-photo { + width: auto; + height: 25px; +} +/* contacts menu */ +.contact-photo-wrapper { + position: relative; +} +.contact-photo { + width: 48px; + height: 48px; + overflow: hidden; + display: block; +} +.contact-photo img { + width: 48px; + height: 48px; +} +.contact-photo-menu-button { + display: none; + position: absolute; + left: -2px; + top: 31px; +} +.contact-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 15px; +} +.contact-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.contact-wrapper .contact-photo-menu-button { + left: 0px; + top: 63px; +} +.directory-item { + float: left; + width: 200px; + height: 200px; +} +.directory-item .contact-photo { + width: 175px; + height: 175px; +} +.directory-item .contact-photo img { + width: 175px; + height: 175px; +} +.contact-name { + text-align: center; + font-weight: bold; + font-size: 12px; +} +.contact-details { + color: #999999; +} +/* editor */ +.jothidden { + display: none; +} +#jot { + width: 785px; + margin: 0px 2em 20px 0px; +} +#jot .profile-jot-text { + height: 1.2em; + width: 99%; + font-size: 10px; + color: #999999; + border: 1px solid #DDD; + padding: 0.3em; +} +#jot #jot-tools { + margin: 0px; + padding: 0px; + height: 40px; + overflow: none; + width: 783px; + background-color: #0e232e; + border-bottom: 2px solid #9eabb0; +} +#jot #jot-tools li { + list-style: none; + float: left; + width: 80px; + height: 40px; + border-bottom: 2px solid #9eabb0; +} +#jot #jot-tools li a { + display: block; + color: #cccccc; + width: 100%; + height: 40px; + text-align: center; + line-height: 40px; + overflow: hidden; +} +#jot #jot-tools li:hover { + background-color: #364e59; + border-bottom: 2px solid #bdcdd4; +} +#jot #jot-tools li.perms { + float: right; + width: 40px; +} +#jot #jot-tools li.perms a.unlock { + width: 30px; + border-left: 10px solid #cccccc; + background-color: #cccccc; + background-position: left center; +} +#jot #jot-tools li.perms a.lock { + width: 30px; + border-left: 10px solid #666666; + background-color: #666666; +} +#jot #jot-tools li.submit { + float: right; + background-color: #cccccc; + border-bottom: 2px solid #cccccc; + border-right: 1px solid #666666; + border-left: 1px solid #666666; +} +#jot #jot-tools li.submit input { + border: 0px; + margin: 0px; + padding: 0px; + background-color: #cccccc; + color: #666666; + width: 80px; + height: 40px; + line-height: 40px; +} +#jot #jot-tools li.submit input:hover { + background-color: #bdcdd4; + color: #666666; +} +#jot #jot-tools li.loading { + float: right; + background-color: #ffffff; + width: 20px; + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + height: 38px; +} +#jot #jot-tools li.loading img { + margin-top: 10px; +} +#jot #jot-title { + border: 0px; + margin: 0px; + height: 20px; + width: 700px; + font-weight: bold; + border: 1px solid #ffffff; +} +#jot #jot-title:-webkit-input-placeholder { + font-weight: normal; +} +#jot #jot-title:-moz-placeholder { + font-weight: normal; +} +#jot #jot-title:hover { + border: 1px solid #999999; +} +#jot #jot-title:focus { + border: 1px solid #999999; +} +#jot #character-counter { + width: 80px; + float: right; + text-align: right; + height: 20px; + line-height: 20px; + padding-right: 20px; +} +/** buttons **/ +/*input[type="submit"] { + border: 0px; + background-color: @ButtonBackgroundColor; + color: @ButtonColor; + padding: 0px 10px; + .rounded(5px); + height: 18px; +}*/ +/** acl **/ +#photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { + display: block!important; +} +#acl-wrapper { + width: 690px; + float: left; +} +#acl-search { + float: right; + background: #ffffff url("../../../images/search_18.png") no-repeat right center; + padding-right: 20px; +} +#acl-showall { + float: left; + display: block; + width: auto; + height: 18px; + background-color: #cccccc; + background-image: url("../../../images/show_all_off.png"); + background-position: 7px 7px; + background-repeat: no-repeat; + padding: 7px 5px 0px 30px; + color: #999999; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; +} +#acl-showall.selected { + color: #000000; + background-color: #ff9900; + background-image: url("../../../images/show_all_on.png"); +} +#acl-list { + height: 210px; + border: 1px solid #cccccc; + clear: both; + margin-top: 30px; + overflow: auto; +} +.acl-list-item { + display: block; + width: 150px; + height: 30px; + border: 1px solid #cccccc; + margin: 5px; + float: left; +} +.acl-list-item img { + width: 22px; + height: 22px; + float: left; + margin: 4px; +} +.acl-list-item p { + height: 12px; + font-size: 10px; + margin: 0px; + padding: 2px 0px 1px; + overflow: hidden; +} +.acl-list-item a { + font-size: 8px; + display: block; + width: 40px; + height: 10px; + float: left; + color: #999999; + background-color: #cccccc; + background-position: 3px 3px; + background-repeat: no-repeat; + margin-right: 5px; + -webkit-border-radius: 2px ; + -moz-border-radius: 2px; + border-radius: 2px; + padding-left: 15px; +} +#acl-wrapper a:hover { + text-decoration: none; + color: #000000; +} +.acl-button-show { + background-image: url("../../../images/show_off.png"); +} +.acl-button-hide { + background-image: url("../../../images/hide_off.png"); +} +.acl-button-show.selected { + color: #000000; + background-color: #9ade00; + background-image: url("../../../images/show_on.png"); +} +.acl-button-hide.selected { + color: #000000; + background-color: #ff4141; + background-image: url("../../../images/hide_on.png"); +} +.acl-list-item.groupshow { + border-color: #9ade00; +} +.acl-list-item.grouphide { + border-color: #ff4141; +} +/** /acl **/ +/** tab buttons **/ +ul.tabs { + list-style-type: none; + padding-bottom: 10px; + font-size: 13px; +} +ul.tabs li { + float: left; + margin-left: 7px; +} +ul.tabs li .active { + border-bottom: 1px solid #005c94; +} +/** + * Form fields + */ +.field { + margin-bottom: 10px; + padding-bottom: 10px; + overflow: auto; + width: 100%; +} +.field label { + float: left; + width: 200px; +} +.field input, .field textarea { + width: 400px; +} +.field textarea { + height: 100px; +} +.field .field_help { + display: block; + margin-left: 200px; + color: #666666; +} +.field .onoff { + float: left; + width: 80px; +} +.field .onoff a { + display: block; + border: 1px solid #666666; + background-image: url("../../../images/onoff.jpg"); + background-repeat: no-repeat; + padding: 4px 2px 2px 2px; + height: 16px; + text-decoration: none; +} +.field .onoff .off { + border-color: #666666; + padding-left: 40px; + background-position: left center; + background-color: #cccccc; + color: #666666; + text-align: right; +} +.field .onoff .on { + border-color: #204A87; + padding-right: 40px; + background-position: right center; + background-color: #D7E3F1; + color: #204A87; + text-align: left; +} +.field .hidden { + display: none!important; +} +.field.radio .field_help { + margin-left: 0px; +} +#profile-edit-links li { + list-style: none; +} +/* oauth */ +.oauthapp { + height: auto; + overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; + height: 48px; + margin: 10px; +} +.oauthapp img.noicon { + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; +} +/* contacts */ +.contact-entry-wrapper { + width: 50px; + float: left; +} +/* photo */ +.lframe { + float: left; + margin: 0px 10px 10px 0px; +} +/* profile match wrapper */ +.profile-match-wrapper { + float: left; + width: 90px; + height: 90px; + margin-bottom: 20px; +} +.profile-match-wrapper .contact-photo { + width: 80px; + height: 80px; +} +.profile-match-wrapper .contact-photo img { + width: 80px; + height: 80px; +} +.profile-match-wrapper .contact-photo-menu-button { + left: 0px; + top: 63px; +} +/* page footer */ +footer { + height: 100px; + display: table-row; +} diff --git a/view/theme/vier/style.less b/view/theme/vier/style.less new file mode 100644 index 000000000..c3dbae777 --- /dev/null +++ b/view/theme/vier/style.less @@ -0,0 +1,14 @@ +/** + * Fabio Comuni + **/ +// Less file http://lesscss.org/ +// compile with lessc +// $ lessc style.less > style.css + +@import "colors"; +@import "icons"; +@import "quattro"; + + + + diff --git a/view/theme/vier/wall_item.tpl b/view/theme/vier/wall_item.tpl new file mode 100644 index 000000000..03cbd4c0b --- /dev/null +++ b/view/theme/vier/wall_item.tpl @@ -0,0 +1,90 @@ +{{ if $indent }}{{ else }} +
+ $star.starred + {{ if $lock }}$lock{{ endif }} + +
+{{ endif }} +
+
+
+
+ + $name + + menu + + +
+
+
+ $name + -   + {{ if $plink }}$ago{{ else }} $ago {{ endif }} + +
+
+ + {{ if $title }}

$title

{{ endif }} + $body +
+
+
+
+
+
+ {{ for $tags as $tag }} + $tag + {{ endfor }} +
+
+
+
+ {{ if $plink }}$plink.title{{ endif }} +
+
+
$location 
+
+ {{ if $star }} + $star.do + $star.undo + $star.tagger + {{ endif }} + + {{ if $vote }} + $vote.like.1 + $vote.dislike.1 + {{ endif }} + + {{ if $vote.share }} + $vote.share.1 + {{ endif }} +
+ +
+ + {{ if $drop.dropping }} + + $drop.delete + {{ endif }} + {{ if $edpost }} + + {{ endif }} +
+ +
+
+
+
+ +
$dislike
+
+
+ +
+ $comment +
diff --git a/view/theme/vier/wallwall_item.tpl b/view/theme/vier/wallwall_item.tpl new file mode 100644 index 000000000..3357bd8e0 --- /dev/null +++ b/view/theme/vier/wallwall_item.tpl @@ -0,0 +1,97 @@ +{{ if $indent }}{{ else }} +
+ $star.starred + {{ if $lock }}$lock{{ endif }} + +
+{{ endif }} +
+
+
+
+ + $owner_name + +
+
+ + $name + + menu + + +
+
+ +
+ $name + $to $owner_name + $vwall -   + {{ if $plink }}$ago{{ else }} $ago {{ endif }} + +
+ +
+ {{ if $title }}

$title

{{ endif }} + $body +
+
+
+
+
+
+ {{ for $tags as $tag }} + $tag + {{ endfor }} +
+
+
+
+ {{ if $plink }}$plink.title{{ endif }} +
+
+ +
$location 
+ +
+ {{ if $star }} + $star.do + $star.undo + {{ endif }} + + {{ if $vote }} + $vote.like.1 + $vote.dislike.1 + {{ endif }} + + {{ if $vote.share }} + $vote.share.1 + {{ endif }} +
+ +
+ + {{ if $drop.dropping }} + + $drop.delete + {{ endif }} + {{ if $edpost }} + + {{ endif }} +
+ +
+
+
+
+ +
$dislike
+
+
+
+ $comment +
-- cgit v1.2.3 From 72c30deb645abaa12d03b49aeb157486501dc3ce Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 8 Feb 2012 20:47:52 +0100 Subject: quattro: group member selection styling --- view/theme/quattro/quattro.less | 35 +++++++++++++++++++++++++++++++++++ view/theme/quattro/style.css | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+) diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index c9fda0e1d..475e16997 100755 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -318,7 +318,41 @@ aside { } } +#contact-edit-drop-link { + float: right; + margin-right: 20px; +} +/* group member */ +.group-delete-wrapper { + float: right; + margin-right: 50px; +} +#group-members { + margin-top: 20px; + padding: 10px; + height: 250px; + overflow: auto; + border: 1px solid #ddd; +} +#group-members-end { + clear: both; +} +#group-all-contacts { + padding: 10px; + height: 450px; + overflow: auto; + border: 1px solid #ddd; +} +#group-all-contacts-end { + clear: both; + margin-bottom: 10px; +} +.contact-block-div { + float: left; + width: 52px; + height: 52px; +} /* widget */ .widget { margin-bottom: 2em; @@ -962,3 +996,4 @@ footer { height: 100px; display: table-row; } margin-top: 25px; clear: both; } + diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 41adcd8d2..deb2cd62f 100755 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -564,6 +564,40 @@ aside #profiles-menu { widht: 48px; height: 58px; } +#contact-edit-drop-link { + float: right; + margin-right: 20px; +} +/* group member */ +.group-delete-wrapper { + float: right; + margin-right: 50px; +} +#group-members { + margin-top: 20px; + padding: 10px; + height: 250px; + overflow: auto; + border: 1px solid #ddd; +} +#group-members-end { + clear: both; +} +#group-all-contacts { + padding: 10px; + height: 450px; + overflow: auto; + border: 1px solid #ddd; +} +#group-all-contacts-end { + clear: both; + margin-bottom: 10px; +} +.contact-block-div { + float: left; + width: 52px; + height: 52px; +} /* widget */ .widget { margin-bottom: 2em; -- cgit v1.2.3 From ca8a25172e1b209b2c70230a9701ea3606e0030d Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 8 Feb 2012 22:13:36 +0100 Subject: quattro: added delete buttons to groups and contacts --- view/theme/quattro/quattro.less | 18 ++++++++++++++++++ view/theme/quattro/style.css | 26 ++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 475e16997..3bc01a839 100755 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -321,12 +321,30 @@ aside { #contact-edit-drop-link { float: right; margin-right: 20px; + .drophide { + background-image: url('../../../images/icons/22/delete.png'); + display: block; width: 22px; height: 22px; + opacity: 0.3; + } + .drop { + background-image: url('../../../images/icons/22/delete.png'); + display: block; width: 22px; height: 22px; + } } /* group member */ .group-delete-wrapper { float: right; margin-right: 50px; + .drophide { + background-image: url('../../../images/icons/22/delete.png'); + display: block; width: 22px; height: 22px; + opacity: 0.3; + } + .drop { + background-image: url('../../../images/icons/22/delete.png'); + display: block; width: 22px; height: 22px; + } } #group-members { margin-top: 20px; diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index deb2cd62f..f05dbefa8 100755 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -568,11 +568,37 @@ aside #profiles-menu { float: right; margin-right: 20px; } +#contact-edit-drop-link .drophide { + background-image: url('../../../images/icons/22/delete.png'); + display: block; + width: 22px; + height: 22px; + opacity: 0.3; +} +#contact-edit-drop-link .drop { + background-image: url('../../../images/icons/22/delete.png'); + display: block; + width: 22px; + height: 22px; +} /* group member */ .group-delete-wrapper { float: right; margin-right: 50px; } +.group-delete-wrapper .drophide { + background-image: url('../../../images/icons/22/delete.png'); + display: block; + width: 22px; + height: 22px; + opacity: 0.3; +} +.group-delete-wrapper .drop { + background-image: url('../../../images/icons/22/delete.png'); + display: block; + width: 22px; + height: 22px; +} #group-members { margin-top: 20px; padding: 10px; -- cgit v1.2.3 From d8157f73ef3e5807c05213efb33e9cc546b759cb Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Wed, 8 Feb 2012 22:29:38 +0100 Subject: quattro: added delete button to mail list overview --- view/theme/quattro/quattro.less | 20 ++++++-------------- view/theme/quattro/style.css | 27 +++++++-------------------- 2 files changed, 13 insertions(+), 34 deletions(-) diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 3bc01a839..0d58000e6 100755 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -318,21 +318,9 @@ aside { } } -#contact-edit-drop-link { - float: right; - margin-right: 20px; - .drophide { - background-image: url('../../../images/icons/22/delete.png'); - display: block; width: 22px; height: 22px; - opacity: 0.3; - } - .drop { - background-image: url('../../../images/icons/22/delete.png'); - display: block; width: 22px; height: 22px; - } -} - /* group member */ +#contact-edit-drop-link, +.mail-list-delete-wrapper, .group-delete-wrapper { float: right; margin-right: 50px; @@ -340,10 +328,14 @@ aside { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; height: 22px; opacity: 0.3; + position: relative; + top: -50px; } .drop { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; height: 22px; + position: relative; + top: -50px; } } #group-members { diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index f05dbefa8..49d57eb37 100755 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -564,40 +564,27 @@ aside #profiles-menu { widht: 48px; height: 58px; } -#contact-edit-drop-link { - float: right; - margin-right: 20px; -} -#contact-edit-drop-link .drophide { - background-image: url('../../../images/icons/22/delete.png'); - display: block; - width: 22px; - height: 22px; - opacity: 0.3; -} -#contact-edit-drop-link .drop { - background-image: url('../../../images/icons/22/delete.png'); - display: block; - width: 22px; - height: 22px; -} /* group member */ -.group-delete-wrapper { +#contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper { float: right; margin-right: 50px; } -.group-delete-wrapper .drophide { +#contact-edit-drop-link .drophide, .mail-list-delete-wrapper .drophide, .group-delete-wrapper .drophide { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; height: 22px; opacity: 0.3; + position: relative; + top: -50px; } -.group-delete-wrapper .drop { +#contact-edit-drop-link .drop, .mail-list-delete-wrapper .drop, .group-delete-wrapper .drop { background-image: url('../../../images/icons/22/delete.png'); display: block; width: 22px; height: 22px; + position: relative; + top: -50px; } #group-members { margin-top: 20px; -- cgit v1.2.3 From b0ee8dd409f28f19ac0f9d0c4e2aa28afeab561d Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 8 Feb 2012 17:56:23 -0800 Subject: begin cmin, cmax --- boot.php | 2 +- mod/network.php | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 99108a0a3..b34615443 100755 --- 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.1245' ); +define ( 'FRIENDICA_VERSION', '2.3.1246' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1120 ); diff --git a/mod/network.php b/mod/network.php index 497e8a115..8f10ace77 100755 --- a/mod/network.php +++ b/mod/network.php @@ -56,7 +56,9 @@ function saved_searches($search) { . ((x($_GET,'star')) ? '?star=' . $_GET['star'] : '') . ((x($_GET,'bmark')) ? '?bmark=' . $_GET['bmark'] : '') . ((x($_GET,'conv')) ? '?conv=' . $_GET['conv'] : '') - . ((x($_GET,'nets')) ? '?nets=' . $_GET['nets'] : ''); + . ((x($_GET,'nets')) ? '?nets=' . $_GET['nets'] : '') + . ((x($_GET,'cmin')) ? '?cmin=' . $_GET['cmin'] : '') + . ((x($_GET,'cmax')) ? '?cmax=' . $_GET['cmax'] : ''); $o = ''; @@ -222,6 +224,8 @@ function network_content(&$a, $update = 0) { $conv = ((x($_GET,'conv')) ? intval($_GET['conv']) : 0); $spam = ((x($_GET,'spam')) ? intval($_GET['spam']) : 0); $nets = ((x($_GET,'nets')) ? $_GET['nets'] : ''); + $cmin = ((x($_GET,'cmin')) ? intval($_GET['cmin']) : 0); + $cmax = ((x($_GET,'cmax')) ? intval($_GET['cmax']) : 99); if(($a->argc > 2) && $a->argv[2] === 'new') $nouveau = true; @@ -358,6 +362,8 @@ function network_content(&$a, $update = 0) { . ((x($_GET,'conv')) ? '&conv=' . $_GET['conv'] : '') . ((x($_GET,'spam')) ? '&spam=' . $_GET['spam'] : '') . ((x($_GET,'nets')) ? '&nets=' . $_GET['nets'] : '') + . ((x($_GET,'cmin')) ? '&cmin=' . $_GET['cmin'] : '') + . ((x($_GET,'cmax')) ? '&cmax=' . $_GET['cmax'] : '') . "'; var profile_page = " . $a->pager['page'] . "; \r\n"; } -- cgit v1.2.3 From 03435853b369227f914026c85c6bb1240386e3ba Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 8 Feb 2012 18:12:26 -0800 Subject: fix apps sub-menu on quattro and vier --- view/nav.tpl | 2 +- view/theme/darkbubble/experimental | 0 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100755 view/theme/darkbubble/experimental diff --git a/view/nav.tpl b/view/nav.tpl index a5d845987..dffa6e520 100755 --- a/view/nav.tpl +++ b/view/nav.tpl @@ -79,7 +79,7 @@ $nav.apps.1 diff --git a/view/theme/darkbubble/experimental b/view/theme/darkbubble/experimental deleted file mode 100755 index e69de29bb..000000000 -- cgit v1.2.3 From 11517a027b3778c56aabb4df20af46dcb24a93d0 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 8 Feb 2012 21:15:26 -0800 Subject: if removing a contact after viewing the third page of contacts, go back to page 3 --- mod/contacts.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mod/contacts.php b/mod/contacts.php index 51c6920d3..206128f9d 100755 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -111,7 +111,6 @@ function contacts_content(&$a) { $o = ''; nav_set_selected('contacts'); - $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; if(! local_user()) { notice( t('Permission denied.') . EOL); @@ -211,7 +210,10 @@ function contacts_content(&$a) { contact_remove($orig_record[0]['id']); info( t('Contact has been removed.') . EOL ); - goaway($a->get_baseurl() . '/contacts'); + if(x($_SESSION,'return_url')) + goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); + else + goaway($a->get_baseurl() . '/contacts'); return; // NOTREACHED } } @@ -354,6 +356,7 @@ function contacts_content(&$a) { } + $_SESSION['return_url'] = $a->query_string; if(($a->argc == 2) && ($a->argv[1] === 'all')) $sql_extra = ''; -- cgit v1.2.3 From 1c8680d9f90629bdaebff38ff436aca42e0ebcd4 Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Wed, 8 Feb 2012 22:01:42 -0800 Subject: Install note about PHP path. --- INSTALL.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/INSTALL.txt b/INSTALL.txt index 70027dc4c..fdd54b765 100755 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -107,6 +107,11 @@ one shown, substituting for your unique paths and settings: You can generally find the location of PHP by executing "which php". If you have troubles with this section please contact your hosting provider for assistance. Friendika will not work correctly if you cannot perform this step. + +You should also be sure that $a->config['php_path'] is set correctly, it should +look like (changing it to the correct PHP location) + +$a->config['php_path'] = '/usr/local/php53/bin/php' Alternative: You may be able to use the 'poormancron' plugin to perform this step if you are using a recent Friendika release. 'poormancron' may result in -- cgit v1.2.3 From 955022e7dc6bb8f581177ddbad84b4f59c349763 Mon Sep 17 00:00:00 2001 From: Keith Fernie Date: Thu, 9 Feb 2012 20:45:38 +0000 Subject: modified: library/slinky.php Added a custom YourLS shortener to the available shorteners --- library/slinky.php | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/library/slinky.php b/library/slinky.php index 51432c3f5..56734c9fb 100755 --- a/library/slinky.php +++ b/library/slinky.php @@ -153,7 +153,7 @@ class Slinky { public function set_service_from_url( $url = false ) { if ( !$url ) $url = $this->url; - + $host = parse_url( $url, PHP_URL_HOST ); switch ( str_replace( 'www.', '', $host ) ) { case 'bit.ly': @@ -181,6 +181,11 @@ class Slinky { $this->service = new Slinky_Fongs(); break; } + case $this->get( 'yourls-url' ): + if ( class_exists( 'Slinky_YourLS' ) ) { + $this->service = new Slinky_YourLS(); + break; + } case 'micurl.com': if ( class_exists( 'Slinky_Micurl' ) ) { $this->service = new Slinky_Micurl(); @@ -574,6 +579,31 @@ class Slinky_Fongs extends Slinky_Service { } } +// yourls +class Slinky_YourLS extends Slinky_Service { + function url_is_short( $url ) { + return stristr( $url, 'shit.li/' ); + } + + function url_is_long( $url ) { + return !stristr( $url, 'shit.li/' ); + } + + function make_short( $url ) { + echo $this->get( 'username' ); + $use_ssl = $this->get( 'ssl' ); + if ( $use_ssl ) + $use_ssl = 's'; + else + $use_ssl = ''; + $result = $this->url_get( 'http'. $use_ssl . '://' . $this->get( 'yourls-url' ) . '/yourls-api.php?username=' . $this->get( 'username' ) . '&password=' . $this->get( 'password' ) . '&action=shorturl&format=simple&url=' . urlencode( $url ) ); + if ( 1 != $result && 2 != $result ) + return $result; + else + return $url; + } +} + // Micu.rl class Slinky_Micurl extends Slinky_Service { function url_is_short( $url ) { -- cgit v1.2.3 From 2c9cfb1fe9fe331cb386025643b2c23a32b25787 Mon Sep 17 00:00:00 2001 From: Keith Fernie Date: Thu, 9 Feb 2012 21:44:52 +0000 Subject: modified: library/slinky.php Set up tabs in code correctly. --- library/slinky.php | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/library/slinky.php b/library/slinky.php index 56734c9fb..cae1f755f 100755 --- a/library/slinky.php +++ b/library/slinky.php @@ -181,11 +181,11 @@ class Slinky { $this->service = new Slinky_Fongs(); break; } - case $this->get( 'yourls-url' ): - if ( class_exists( 'Slinky_YourLS' ) ) { - $this->service = new Slinky_YourLS(); - break; - } + case $this->get( 'yourls-url' ): + if ( class_exists( 'Slinky_YourLS' ) ) { + $this->service = new Slinky_YourLS(); + break; + } case 'micurl.com': if ( class_exists( 'Slinky_Micurl' ) ) { $this->service = new Slinky_Micurl(); @@ -581,27 +581,27 @@ class Slinky_Fongs extends Slinky_Service { // yourls class Slinky_YourLS extends Slinky_Service { - function url_is_short( $url ) { - return stristr( $url, 'shit.li/' ); + function url_is_short( $url ) { + return stristr( $url, 'shit.li/' ); } - function url_is_long( $url ) { - return !stristr( $url, 'shit.li/' ); + function url_is_long( $url ) { + return !stristr( $url, 'shit.li/' ); } - function make_short( $url ) { + function make_short( $url ) { echo $this->get( 'username' ); $use_ssl = $this->get( 'ssl' ); if ( $use_ssl ) $use_ssl = 's'; else $use_ssl = ''; - $result = $this->url_get( 'http'. $use_ssl . '://' . $this->get( 'yourls-url' ) . '/yourls-api.php?username=' . $this->get( 'username' ) . '&password=' . $this->get( 'password' ) . '&action=shorturl&format=simple&url=' . urlencode( $url ) ); - if ( 1 != $result && 2 != $result ) - return $result; - else - return $url; - } + $result = $this->url_get( 'http'. $use_ssl . '://' . $this->get( 'yourls-url' ) . '/yourls-api.php?username=' . $this->get( 'username' ) . '&password=' . $this->get( 'password' ) . '&action=shorturl&format=simple&url=' . urlencode( $url ) ); + if ( 1 != $result && 2 != $result ) + return $result; + else + return $url; + } } // Micu.rl -- cgit v1.2.3 From 171249966e68d12a4e2e485d26007de8372e8235 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 9 Feb 2012 14:06:17 -0800 Subject: add tag notifications to enotify --- boot.php | 19 ++++++++++--------- include/enotify.php | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/boot.php b/boot.php index b34615443..9573408f0 100755 --- 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.1246' ); +define ( 'FRIENDICA_VERSION', '2.3.1247' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1120 ); @@ -125,14 +125,15 @@ define ( 'ZCURL_TIMEOUT' , (-1)); * email notification options */ -define ( 'NOTIFY_INTRO', 0x0001 ); -define ( 'NOTIFY_CONFIRM', 0x0002 ); -define ( 'NOTIFY_WALL', 0x0004 ); -define ( 'NOTIFY_COMMENT', 0x0008 ); -define ( 'NOTIFY_MAIL', 0x0010 ); -define ( 'NOTIFY_SUGGEST', 0x0020 ); -define ( 'NOTIFY_PROFILE', 0x0040 ); - +define ( 'NOTIFY_INTRO', 0x0001 ); +define ( 'NOTIFY_CONFIRM', 0x0002 ); +define ( 'NOTIFY_WALL', 0x0004 ); +define ( 'NOTIFY_COMMENT', 0x0008 ); +define ( 'NOTIFY_MAIL', 0x0010 ); +define ( 'NOTIFY_SUGGEST', 0x0020 ); +define ( 'NOTIFY_PROFILE', 0x0040 ); +define ( 'NOTIFY_TAGSELF', 0x0080 ); +define ( 'NOTIFY_TAGSHARE', 0x0100 ); /** * various namespaces we may need to parse diff --git a/include/enotify.php b/include/enotify.php index 9df9b57e5..6e7130bc8 100755 --- a/include/enotify.php +++ b/include/enotify.php @@ -54,6 +54,24 @@ function notification($params) { $itemlink = $params['link']; } + if($params['type'] == NOTIFY_TAGSELF) { + $preamble = $subject = sprintf( t('%s tagged you at %s') , $params['source_name'], $sitename); + + $sitelink = t('Please visit %s to view and/or reply to the conversation.'); + $tsitelink = sprintf( $sitelink, $siteurl ); + $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $itemlink = $params['link']; + } + + if($params['type'] == NOTIFY_TAGSHARE) { + $preamble = $subject = sprintf( t('%s tagged your post at %s') , $params['source_name'], $sitename); + + $sitelink = t('Please visit %s to view and/or reply to the conversation.'); + $tsitelink = sprintf( $sitelink, $siteurl ); + $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $itemlink = $params['link']; + } + if($params['type'] == NOTIFY_INTRO) { $subject = sprintf( t('Introduction received at %s'), $sitename); $preamble = sprintf( t('You\'ve received an introduction from \'%s\' at %s'), $params['source_name'], $sitename); -- cgit v1.2.3 From ec26f88be9876b75044c37219018bf1337f8d61e Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 9 Feb 2012 15:02:59 -0800 Subject: render_location hook --- include/conversation.php | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 6defefc73..9df7b20e9 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -262,15 +262,10 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { else $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']); - $location = (($item['location']) ? '' . $item['location'] . '' : ''); - $coord = (($item['coord']) ? '' . $item['coord'] . '' : ''); - if($coord) { - if($location) - $location .= '
(' . $coord . ')'; - else - $location = '' . $coord . ''; - } + $locate = array('location' => $item_location, 'coord' => $item['coord'], 'html' => ''); + call_hooks('render_location',$locate); + $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate)); localize_item($item); if($mode === 'network-new') @@ -1008,3 +1003,17 @@ function find_thread_parent_index($arr,$x) { return $k; return false; } + +function render_location_google($item) { + $location = ''; + $location = (($item['location']) ? '' . $item['location'] . '' : ''); + $coord = (($item['coord']) ? '' . $item['coord'] . '' : ''); + if($coord) { + if($location) + $location .= '
(' . $coord . ')'; + else + $location = '' . $coord . ''; + } + return $location; +} + -- cgit v1.2.3 From 795e02aa1490f6238e6ed719a0bf3604931eec3d Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 9 Feb 2012 15:13:34 -0800 Subject: bug #273 - no $baseurl variable expansion in install template --- mod/install.php | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/install.php b/mod/install.php index f7820fc80..33502938a 100755 --- a/mod/install.php +++ b/mod/install.php @@ -210,6 +210,7 @@ function install_content(&$a) { '$next' => t('Next'), '$reload' => t('Check again'), '$phpath' => $phpath, + '$baseurl' => $a->get_baseurl(), )); return $o; }; break; -- cgit v1.2.3 From 7b0a005441a6abc3d4c327965e86ac82d2ec4db3 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 9 Feb 2012 15:58:26 -0800 Subject: edit post not working after plaintext editor fixes, missing some recent editor template changes --- include/items.php | 16 ++++++++++------ mod/editpost.php | 4 ++++ mod/item.php | 3 ++- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/include/items.php b/include/items.php index ba95919a6..9f2cc491b 100755 --- a/include/items.php +++ b/include/items.php @@ -1486,7 +1486,8 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) if(count($r)) { if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) { - $r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($datarray['title']), dbesc($datarray['body']), dbesc(datetime_convert('UTC','UTC',$datarray['edited'])), dbesc($item_id), @@ -1616,7 +1617,8 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) if(count($r)) { if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) { - $r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($datarray['title']), dbesc($datarray['body']), dbesc(datetime_convert('UTC','UTC',$datarray['edited'])), dbesc($item_id), @@ -2167,7 +2169,8 @@ function local_delivery($importer,$data) { if(count($r)) { if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) { - $r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($datarray['title']), dbesc($datarray['body']), dbesc(datetime_convert('UTC','UTC',$datarray['edited'])), dbesc($item_id), @@ -2309,7 +2312,8 @@ function local_delivery($importer,$data) { if(count($r)) { if((x($datarray,'edited') !== false) && (datetime_convert('UTC','UTC',$datarray['edited']) !== $r[0]['edited'])) { - $r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", + dbesc($datarray['title']), dbesc($datarray['body']), dbesc(datetime_convert('UTC','UTC',$datarray['edited'])), dbesc($item_id), @@ -2805,7 +2809,7 @@ function drop_item($id,$interactive = true) { // delete the item - $r = q("UPDATE `item` SET `deleted` = 1, `body` = '', `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1", + $r = q("UPDATE `item` SET `deleted` = 1, `title` = '', `body` = '', `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1", dbesc(datetime_convert()), dbesc(datetime_convert()), intval($item['id']) @@ -2838,7 +2842,7 @@ function drop_item($id,$interactive = true) { // If it's the parent of a comment thread, kill all the kids if($item['uri'] == $item['parent-uri']) { - $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' + $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' , `title` = '' WHERE `parent-uri` = '%s' AND `uid` = %d ", dbesc(datetime_convert()), dbesc(datetime_convert()), diff --git a/mod/editpost.php b/mod/editpost.php index bceb9250a..f23b305f0 100755 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -35,6 +35,7 @@ function editpost_content(&$a) { $a->page['htmlhead'] .= replace_macros($tpl, array( '$baseurl' => $a->get_baseurl(), + '$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'), '$ispublic' => ' ', // t('Visible to everybody'), '$geotag' => $geotag, '$nickname' => $a->user['nickname'] @@ -108,11 +109,14 @@ function editpost_content(&$a) { '$emailcc' => t('CC: email addresses'), '$public' => t('Public post'), '$jotnets' => $jotnets, + '$title' => $itm[0]['title'], + '$placeholdertitle' => t('Set title'), '$emtitle' => t('Example: bob@example.com, mary@example.com'), '$lockstate' => $lockstate, '$acl' => '', // populate_acl((($group) ? $group_acl : $a->user), $celeb), '$bang' => (($group) ? '!' : ''), '$profile_uid' => $_SESSION['uid'], + '$preview' => t('Preview'), '$jotplugins' => $jotplugins, )); diff --git a/mod/item.php b/mod/item.php index 217f13c49..d5dcfccbd 100755 --- a/mod/item.php +++ b/mod/item.php @@ -649,7 +649,8 @@ function item_post(&$a) { if($orig_post) { - $r = q("UPDATE `item` SET `body` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1", + $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `edited` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1", + dbesc($title), dbesc($body), dbesc(datetime_convert()), intval($post_id), -- cgit v1.2.3 From 5859f9dcf68c2ca6ad355c16e7fbf5080eea9e75 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 9 Feb 2012 18:09:28 -0800 Subject: add render_location hook to both sets of conversations --- include/conversation.php | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 9df7b20e9..35abb29ca 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -262,7 +262,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { else $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']); - $locate = array('location' => $item_location, 'coord' => $item['coord'], 'html' => ''); + $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => ''); call_hooks('render_location',$locate); $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate)); @@ -589,16 +589,10 @@ function conversation(&$a, $items, $mode, $update, $preview = false) { $like = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : ''); $dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : ''); - $location = (($item['location']) ? '' . $item['location'] . '' : ''); - $coord = (($item['coord']) ? '' . $item['coord'] . '' : ''); - if($coord) { - if($location) - $location .= '
(' . $coord . ')'; - else - $location = '' . $coord . ''; - } + $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => ''); + call_hooks('render_location',$locate); + + $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate)); $indent = (($toplevelpost) ? '' : ' comment'); -- cgit v1.2.3 From ffe7d8b1e9964e28b50ccce49d74836067c099c1 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 9 Feb 2012 21:18:50 -0800 Subject: item tag notifications --- include/items.php | 64 +++++++++++++++++++++++++++++++++++-------------------- mod/settings.php | 1 + view/settings.tpl | 1 + 3 files changed, 43 insertions(+), 23 deletions(-) diff --git a/include/items.php b/include/items.php index 9f2cc491b..fd90494b1 100755 --- a/include/items.php +++ b/include/items.php @@ -905,7 +905,7 @@ function item_store($arr,$force_parent = false) { ); } - tgroup_deliver($arr['uid'],$current_post); + tag_deliver($arr['uid'],$current_post); return $current_post; } @@ -923,22 +923,22 @@ function get_item_contact($item,$contacts) { } -function tgroup_deliver($uid,$item_id) { +function tag_deliver($uid,$item_id) { - - // setup a second delivery chain for forum/community posts if appropriate + // look for mention tags and setup a second delivery chain for forum/community posts if appropriate $a = get_app(); - $deliver_to_tgroup = false; + $mention = false; - $u = q("select * from user where uid = %d and `page-flags` = %d limit 1", - intval($uid), - intval(PAGE_COMMUNITY) + $u = q("select uid, nickname, language, username, email, `page-flags`, `notify-flags` from user where uid = %d limit 1", + intval($uid) ); if(! count($u)) return; + $community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false); + $i = q("select * from item where id = %d and uid = %d limit 1", intval($item_id), intval($uid) @@ -948,13 +948,6 @@ function tgroup_deliver($uid,$item_id) { $item = $i[0]; - // prevent delivery looping - only proceed - // if the message originated elsewhere and is a top-level post - - if(($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent'])) - return; - - $link = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']); // Diaspora uses their own hardwired link URL in @-tags @@ -966,24 +959,49 @@ function tgroup_deliver($uid,$item_id) { if($cnt) { foreach($matches as $mtch) { if(link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) { - $deliver_to_tgroup = true; - logger('tgroup_deliver: local group mention found: ' . $mtch[2]); + $mention = true; + logger('tag_deliver: mention found: ' . $mtch[2]); } } } - if(! $deliver_to_tgroup) + if(! $mention) + return; + + if(! $community_page) { + require_once('include/enotify.php'); + notification(array( + 'type' => NOTIFY_TAGSELF, + 'notify_flags' => $u[0]['notify-flags'], + 'language' => $u[0]['language'], + 'to_name' => $u[0]['username'], + 'to_email' => $u[0]['email'], + 'item' => $item, + 'link' => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item['id'], + 'source_name' => $item['author-name'], + 'source_link' => $item['author-link'], + 'source_photo' => $item['author-avatar'], + 'verb' => ACTIVITY_TAG, + 'otype' => 'item' + )); return; + } + else { + // prevent delivery looping - only proceed + // if the message originated elsewhere and is a top-level post - // now change this copy of the post to a forum head message and deliver to all the tgroup members + if(($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent'])) + return; + // now change this copy of the post to a forum head message and deliver to all the tgroup members - q("update item set wall = 1, origin = 1, forum_mode = 1 where id = %d limit 1", - intval($item_id) - ); - proc_run('php','include/notifier.php','tgroup',$item_id); + q("update item set wall = 1, origin = 1, forum_mode = 1 where id = %d limit 1", + intval($item_id) + ); + proc_run('php','include/notifier.php','tgroup',$item_id); + } } diff --git a/mod/settings.php b/mod/settings.php index e75272539..b4cd2e608 100755 --- a/mod/settings.php +++ b/mod/settings.php @@ -818,6 +818,7 @@ function settings_content(&$a) { '$notify4' => array('notify4', t('Someone writes a followup comment'), ($notify & NOTIFY_COMMENT), NOTIFY_COMMENT, ''), '$notify5' => array('notify5', t('You receive a private message'), ($notify & NOTIFY_MAIL), NOTIFY_MAIL, ''), '$notify6' => array('notify6', t('You receive a friend suggestion'), ($notify & NOTIFY_SUGGEST), NOTIFY_SUGGEST, ''), + '$notify7' => array('notify7', t('You are tagged in a post'), ($notify & NOTIFY_TAGSELF), NOTIFY_TAGSELF, ''), '$h_advn' => t('Advanced Page Settings'), diff --git a/view/settings.tpl b/view/settings.tpl index 6310ff47e..1172df8b9 100755 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -108,6 +108,7 @@ $suggestme {{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}} {{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}} {{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}} +{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}} -- cgit v1.2.3 From 2f2e331c33535d8ae1a8c9d95d03a39b5c8a5885 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 9 Feb 2012 22:44:59 -0800 Subject: bug #274 --- include/plugin.php | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/include/plugin.php b/include/plugin.php index fe325ac3b..85b51edff 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -56,25 +56,29 @@ function reload_plugins() { if(count($parr)) { foreach($parr as $pl) { $pl = trim($pl); + + $fname = 'addon/' . $pl . '/' . $pl . '.php'; - $t = filemtime('addon/' . $pl . '/' . $pl . '.php'); - foreach($installed as $i) { - if(($i['name'] == $pl) && ($i['timestamp'] != $t)) { - logger('Reloading plugin: ' . $i['name']); - @include_once('addon/' . $pl . '/' . $pl . '.php'); - - if(function_exists($pl . '_uninstall')) { - $func = $pl . '_uninstall'; - $func(); - } - if(function_exists($pl . '_install')) { - $func = $pl . '_install'; - $func(); + if(file_exists($fname)) { + $t = @filemtime($fname); + foreach($installed as $i) { + if(($i['name'] == $pl) && ($i['timestamp'] != $t)) { + logger('Reloading plugin: ' . $i['name']); + @include_once($fname); + + if(function_exists($pl . '_uninstall')) { + $func = $pl . '_uninstall'; + $func(); + } + if(function_exists($pl . '_install')) { + $func = $pl . '_install'; + $func(); + } + q("UPDATE `addon` SET `timestamp` = %d WHERE `id` = %d LIMIT 1", + intval($t), + intval($i['id']) + ); } - q("UPDATE `addon` SET `timestamp` = %d WHERE `id` = %d LIMIT 1", - intval($t), - intval($i['id']) - ); } } } -- cgit v1.2.3 From b346f4464c230af4636c61397decd03eadb18e9a Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 10 Feb 2012 00:08:23 -0800 Subject: send notify emails to community pages as well as people --- include/items.php | 62 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/include/items.php b/include/items.php index fd90494b1..3c30e99aa 100755 --- a/include/items.php +++ b/include/items.php @@ -968,40 +968,42 @@ function tag_deliver($uid,$item_id) { if(! $mention) return; - if(! $community_page) { - require_once('include/enotify.php'); - notification(array( - 'type' => NOTIFY_TAGSELF, - 'notify_flags' => $u[0]['notify-flags'], - 'language' => $u[0]['language'], - 'to_name' => $u[0]['username'], - 'to_email' => $u[0]['email'], - 'item' => $item, - 'link' => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item['id'], - 'source_name' => $item['author-name'], - 'source_link' => $item['author-link'], - 'source_photo' => $item['author-avatar'], - 'verb' => ACTIVITY_TAG, - 'otype' => 'item' - )); + // send a notification + + require_once('include/enotify.php'); + notification(array( + 'type' => NOTIFY_TAGSELF, + 'notify_flags' => $u[0]['notify-flags'], + 'language' => $u[0]['language'], + 'to_name' => $u[0]['username'], + 'to_email' => $u[0]['email'], + 'item' => $item, + 'link' => $a->get_baseurl() . '/display/' . $u[0]['nickname'] . '/' . $item['id'], + 'source_name' => $item['author-name'], + 'source_link' => $item['author-link'], + 'source_photo' => $item['author-avatar'], + 'verb' => ACTIVITY_TAG, + 'otype' => 'item' + )); + if(! $community_page) return; - } - else { - // prevent delivery looping - only proceed - // if the message originated elsewhere and is a top-level post - if(($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent'])) - return; + // tgroup delivery - setup a second delivery chain + // prevent delivery looping - only proceed + // if the message originated elsewhere and is a top-level post - // now change this copy of the post to a forum head message and deliver to all the tgroup members + if(($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent'])) + return; + // now change this copy of the post to a forum head message and deliver to all the tgroup members - q("update item set wall = 1, origin = 1, forum_mode = 1 where id = %d limit 1", - intval($item_id) - ); - proc_run('php','include/notifier.php','tgroup',$item_id); - } + q("update item set wall = 1, origin = 1, forum_mode = 1 where id = %d limit 1", + intval($item_id) + ); + + proc_run('php','include/notifier.php','tgroup',$item_id); + } @@ -1065,7 +1067,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { $final_dfrn_id = ''; - if(($contact['duplex'] && strlen($contact['pubkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) { + if(($contact['duplex'] && strlen($contact['pubkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))) { openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']); openssl_public_decrypt($challenge,$postvars['challenge'],$contact['pubkey']); } @@ -1108,7 +1110,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { if($dfrn_version >= 2.1) { - if(($contact['duplex'] && strlen($contact['pubkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) { + if(($contact['duplex'] && strlen($contact['pubkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))) { openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']); } else { -- cgit v1.2.3 From d79c3351ea6692478a490f4225ea1009863dd65f Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 10 Feb 2012 13:43:35 -0800 Subject: db installation sync --- boot.php | 4 ++-- database.sql | 2 ++ include/items.php | 1 + update.php | 18 +++++++++++++++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/boot.php b/boot.php index 9573408f0..1909abbed 100755 --- a/boot.php +++ b/boot.php @@ -9,9 +9,9 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1247' ); +define ( 'FRIENDICA_VERSION', '2.3.1248' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); -define ( 'DB_UPDATE_VERSION', 1120 ); +define ( 'DB_UPDATE_VERSION', 1121 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/database.sql b/database.sql index 8abaa5a93..0b03149e9 100755 --- a/database.sql +++ b/database.sql @@ -226,6 +226,7 @@ CREATE TABLE IF NOT EXISTS `item` ( `pubmail` tinyint(1) NOT NULL DEFAULT '0', `moderated` tinyint(1) NOT NULL DEFAULT '0', `visible` tinyint(1) NOT NULL DEFAULT '0', + `spam` tinyint(1) NOT NULL DEFAULT '0', `starred` tinyint(1) NOT NULL DEFAULT '0', `bookmark` tinyint(1) NOT NULL DEFAULT '0', `unseen` tinyint(1) NOT NULL DEFAULT '1', @@ -247,6 +248,7 @@ CREATE TABLE IF NOT EXISTS `item` ( KEY `received` (`received`), KEY `moderated` (`moderated`), KEY `visible` (`visible`), + KEY `spam` (`spam`), KEY `starred` (`starred`), KEY `bookmark` (`bookmark`), KEY `deleted` (`deleted`), diff --git a/include/items.php b/include/items.php index 3c30e99aa..5e3f9a60a 100755 --- a/include/items.php +++ b/include/items.php @@ -985,6 +985,7 @@ function tag_deliver($uid,$item_id) { 'verb' => ACTIVITY_TAG, 'otype' => 'item' )); + if(! $community_page) return; diff --git a/update.php b/update.php index dc3cc0e56..9e3f22ef1 100755 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ Date: Fri, 10 Feb 2012 14:03:43 -0800 Subject: bug #270 - solved --- mod/install.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mod/install.php b/mod/install.php index 33502938a..003d81c6a 100755 --- a/mod/install.php +++ b/mod/install.php @@ -186,8 +186,8 @@ function install_content(&$a) { check_keys($checks); - if(x($_POST,'phppath')) - $phpath = notags(trim($_POST['phppath'])); + if(x($_POST,'phpath')) + $phpath = notags(trim($_POST['phpath'])); check_php($phpath, $checks); @@ -221,7 +221,7 @@ function install_content(&$a) { $dbuser = notags(trim($_POST['dbuser'])); $dbpass = notags(trim($_POST['dbpass'])); $dbdata = notags(trim($_POST['dbdata'])); - $phpath = notags(trim($_POST['phppath'])); + $phpath = notags(trim($_POST['phpath'])); $tpl = get_markup_template('install_db.tpl'); @@ -259,7 +259,7 @@ function install_content(&$a) { $dbuser = notags(trim($_POST['dbuser'])); $dbpass = notags(trim($_POST['dbpass'])); $dbdata = notags(trim($_POST['dbdata'])); - $phpath = notags(trim($_POST['phppath'])); + $phpath = notags(trim($_POST['phpath'])); $adminmail = notags(trim($_POST['adminmail'])); $timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles'); @@ -323,7 +323,7 @@ function check_php(&$phpath, &$checks) { $help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL; $tpl = get_markup_template('field_input.tpl'); $help .= replace_macros($tpl, array( - '$field' => array('phppath', t('PHP executable path'), $phpath, t('Enter full path to php executable')), + '$field' => array('phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable')), )); $phpath=""; } -- cgit v1.2.3 From 857f21eb327828391b747f0f08f04956860b6743 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sat, 11 Feb 2012 10:03:14 +0100 Subject: fpostit by Devlon Duthied added to utils --- util/fpostit/README | 8 +++ util/fpostit/fpostit.js | 11 ++++ util/fpostit/fpostit.php | 129 ++++++++++++++++++++++++++++++++++++++++++ util/fpostit/friendika-32.png | Bin 0 -> 1593 bytes 4 files changed, 148 insertions(+) create mode 100644 util/fpostit/README create mode 100644 util/fpostit/fpostit.js create mode 100644 util/fpostit/fpostit.php create mode 100644 util/fpostit/friendika-32.png diff --git a/util/fpostit/README b/util/fpostit/README new file mode 100644 index 000000000..39b7c5761 --- /dev/null +++ b/util/fpostit/README @@ -0,0 +1,8 @@ +fpostit + +original author: Devlon Duthied + +see his blog posting: +http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/ + +original published at github https://github.com/duthied/Friendika-Bookmarklet diff --git a/util/fpostit/fpostit.js b/util/fpostit/fpostit.js new file mode 100644 index 000000000..a6c75aba8 --- /dev/null +++ b/util/fpostit/fpostit.js @@ -0,0 +1,11 @@ +javascript: (function() { + the_url = 'http://testbubble.com/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent('' (window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text)); + a_funct = function() { + if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url; + }; + if (/Firefox/.test(navigator.userAgent)) { + setTimeout(a_funct, 0) + } else { + a_funct() + } +})() \ No newline at end of file diff --git a/util/fpostit/fpostit.php b/util/fpostit/fpostit.php new file mode 100644 index 000000000..491d81f6d --- /dev/null +++ b/util/fpostit/fpostit.php @@ -0,0 +1,129 @@ + + + + + + + + $content); + + // echo "posting to: $url
"; + + $c = curl_init(); + curl_setopt($c, CURLOPT_URL, $url); + curl_setopt($c, CURLOPT_USERPWD, "$username:$password"); + curl_setopt($c, CURLOPT_POSTFIELDS, $data); + curl_setopt($c, CURLOPT_RETURNTRANSFER, true); + curl_setopt($c, CURLOPT_FOLLOWLOCATION, true); + $c_result = curl_exec($c); + if(curl_errno($c)){ + $error = curl_error($c); + showForm($error, $content); + } + + curl_close($c); + if (!isset($error)) { + echo ''; + } + + } else { + $error = "Missing account name and/or password...try again please"; + showForm($error, $content); + } + +} else { + showForm(null, $content); +} + +function showForm($error, $content) { + $username_cookie = $_COOKIE['username']; + $password_cookie = $_COOKIE['password']; + + echo << +

+ Friendika Bookmarklet

+ + +
+
+ Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)

+ Account ID:
+ Password:
+
+   $error +
+

+
+EOF; + +} +?> + + + \ No newline at end of file diff --git a/util/fpostit/friendika-32.png b/util/fpostit/friendika-32.png new file mode 100644 index 000000000..61764bf20 Binary files /dev/null and b/util/fpostit/friendika-32.png differ -- cgit v1.2.3 From 75a62db9c5e59adbd1d8dc2d5e0ba3544df3a15e Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 11 Feb 2012 01:24:29 -0800 Subject: show tags (pub_keywords) in advanced profile --- boot.php | 14 ++++++++++++-- include/profile_advanced.php | 2 ++ view/profile_advanced.tpl | 7 +++++++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 1909abbed..d04563d53 100755 --- a/boot.php +++ b/boot.php @@ -819,7 +819,7 @@ function profile_load(&$a, $nickname, $profile = 0) { } $r = null; - + if($profile) { $profile_int = intval($profile); $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` @@ -829,7 +829,7 @@ function profile_load(&$a, $nickname, $profile = 0) { intval($profile_int) ); } - if(! count($r)) { + if((! $r) && (! count($r))) { $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` left join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid` WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 and `contact`.`self` = 1 LIMIT 1", @@ -842,6 +842,16 @@ function profile_load(&$a, $nickname, $profile = 0) { $a->error = 404; return; } + + // fetch user tags if this isn't the default profile + + if(! $r[0]['is-default']) { + $x = q("select `pub_keywords` from `profile` where uid = %d and `is-default` = 1 limit 1", + intval($profile_uid) + ); + if($x && count($x)) + $r[0]['pub_keywords'] = $x[0]['pub_keywords']; + } $a->profile = $r[0]; diff --git a/include/profile_advanced.php b/include/profile_advanced.php index ccecb95de..004a58524 100755 --- a/include/profile_advanced.php +++ b/include/profile_advanced.php @@ -44,6 +44,8 @@ function advanced_profile(&$a) { if($a->profile['homepage']) $profile['homepage'] = array( t('Homepage:'), linkify($a->profile['homepage']) ); + if($a->profile['pub_keywords']) $profile['pub_keywords'] = array( t('Tags:'), $a->profile['pub_keywords']); + if($a->profile['politic']) $profile['politic'] = array( t('Political Views:'), $a->profile['politic']); if($a->profile['religion']) $profile['religion'] = array( t('Religion:'), $a->profile['religion']); diff --git a/view/profile_advanced.tpl b/view/profile_advanced.tpl index 5cef25a2e..470404fc3 100755 --- a/view/profile_advanced.tpl +++ b/view/profile_advanced.tpl @@ -40,6 +40,13 @@ {{ endif }} +{{ if $profile.pub_keywords }} +
+
$profile.pub_keywords.0
+
$profile.pub_keywords.1
+
+{{ endif }} + {{ if $profile.homepage }}
$profile.homepage.0
-- cgit v1.2.3 From da946bb9b0905a2126e7234c6c85157bd7978102 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 11 Feb 2012 03:07:15 -0800 Subject: bug #278 show only blocked contacts --- mod/contacts.php | 19 ++++++++++++++----- view/contacts-top.tpl | 3 ++- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/mod/contacts.php b/mod/contacts.php index 206128f9d..aaa2ff961 100755 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -356,20 +356,29 @@ function contacts_content(&$a) { } + $blocked = false; + $_SESSION['return_url'] = $a->query_string; if(($a->argc == 2) && ($a->argv[1] === 'all')) $sql_extra = ''; - else - $sql_extra = " AND `blocked` = 0 "; - + else { + if(($a->argc == 2) && ($a->argv[1] === 'blocked')) { + $sql_extra = " AND `blocked` = 1 "; + $blocked = true; + } + else + $sql_extra = " AND `blocked` = 0 "; + } $search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : ''); $tpl = get_markup_template("contacts-top.tpl"); $o .= replace_macros($tpl,array( '$header' => t('Contacts'), - '$hide_url' => ((strlen($sql_extra)) ? 'contacts/all' : 'contacts' ), - '$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections')), + '$hide_url' => (($blocked) ? 'contacts' : 'contacts/blocked'), + '$hide_text' => (($blocked) ? t('Show Unblocked Contacts') : t('Show Blocked Contacts')), + '$all_url' => 'contacts/all', + '$all_text' => t('Show All Contacts'), '$search' => $search, '$desc' => t('Search your contacts'), '$finding' => (strlen($search) ? '

' . t('Finding: ') . "'" . $search . "'" . '

' : ""), diff --git a/view/contacts-top.tpl b/view/contacts-top.tpl index 4dffda1ce..b8972834c 100755 --- a/view/contacts-top.tpl +++ b/view/contacts-top.tpl @@ -14,5 +14,6 @@ $finding -- cgit v1.2.3 From 0c4606682ff0463c7d07e5215bb3d0881f94701c Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 11 Feb 2012 19:21:41 -0800 Subject: fix link/bookmark reshares --- boot.php | 2 +- mod/oembed.php | 15 +++++++++++++++ view/theme/duepuntozero/style.css | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/boot.php b/boot.php index d04563d53..7a26dd9a2 100755 --- 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.1248' ); +define ( 'FRIENDICA_VERSION', '2.3.1249' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1121 ); diff --git a/mod/oembed.php b/mod/oembed.php index 25995813a..236625f68 100755 --- a/mod/oembed.php +++ b/mod/oembed.php @@ -2,11 +2,26 @@ require_once("include/oembed.php"); function oembed_content(&$a){ + // logger('mod_oembed ' . $a->query_string, LOGGER_ALL); + + if ($a->argv[1]=='b2h'){ + $url = array( "", trim(hex2bin($_REQUEST['url']))); + echo oembed_replacecb($url); + killme(); + } + + if ($a->argv[1]=='h2b'){ + $text = trim(hex2bin($_REQUEST['text'])); + echo oembed_html2bbcode($text); + killme(); + } + if ($a->argc == 2){ echo ""; $url = base64url_decode($a->argv[1]); $j = oembed_fetch_url($url); echo $j->html; +// logger('mod-oembed ' . $j->html, LOGGER_ALL); echo ""; } killme(); diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 66809a8d8..60fe4fb28 100755 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -824,6 +824,7 @@ input#dfrn-url { .contact-entry-name { float: left; margin-left: 0px; + margin-right: 10px; width: 120px; overflow: hidden; } -- cgit v1.2.3 From d856ae1fa527772ebc9194f25a1e55df614b8f3e Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 11 Feb 2012 21:39:51 -0800 Subject: bug #279, add network selector widget to contacts page --- mod/contacts.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/mod/contacts.php b/mod/contacts.php index aaa2ff961..32af29c15 100755 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -42,6 +42,7 @@ function contacts_init(&$a) { $a->page['aside'] .= findpeople_widget(); + $a->page['aside'] .= networks_widget('contacts',$_GET['nets']); } function contacts_post(&$a) { @@ -371,10 +372,11 @@ function contacts_content(&$a) { $sql_extra = " AND `blocked` = 0 "; } $search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : ''); + $nets = ((x($_GET,'nets')) ? notags(trim($_GET['nets'])) : ''); $tpl = get_markup_template("contacts-top.tpl"); $o .= replace_macros($tpl,array( - '$header' => t('Contacts'), + '$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''), '$hide_url' => (($blocked) ? 'contacts' : 'contacts/blocked'), '$hide_text' => (($blocked) ? t('Show Unblocked Contacts') : t('Show Blocked Contacts')), '$all_url' => 'contacts/all', @@ -392,6 +394,9 @@ function contacts_content(&$a) { $search = dbesc($search.'*'); $sql_extra .= ((strlen($search)) ? " AND MATCH `name` AGAINST ('$search' IN BOOLEAN MODE) " : ""); + if($nets) + $sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets)); + $sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : ''); -- cgit v1.2.3 From bb19c8ba4ea279265ad146f69949a62b4024c2ab Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 11 Feb 2012 21:46:48 -0800 Subject: kissing smilie may need escaping (thanks - Abinoam) --- include/text.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/text.php b/include/text.php index 9aca14598..9e67d36a9 100755 --- a/include/text.php +++ b/include/text.php @@ -678,7 +678,7 @@ function smilies($s) { $a = get_app(); $s = str_replace( - array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/', 'o.O', 'O.o', '\\.../', '\\ooo/', + array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/', 'o.O', 'O.o', '\\.../', '\\ooo/', ':beer', ':homebrew', ':coffee', '~friendika', '~friendica', 'Diaspora*' ), array( @@ -693,6 +693,7 @@ function smilies($s) { ':-P', ':P', ':-\', + ':-\', ':-x', ':-X', ':-D', -- cgit v1.2.3 From 4cfb1fe0cfb0520f4d6be88c1bf09cd9a03bc88a Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 11 Feb 2012 23:17:55 -0800 Subject: refresh contact record after setting change --- mod/contacts.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mod/contacts.php b/mod/contacts.php index 32af29c15..ef77366da 100755 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -100,6 +100,14 @@ function contacts_post(&$a) { info( t('Contact updated.') . EOL); else notice( t('Failed to update contact record.') . EOL); + + $r = q("select * from contact where id = %d and uid = %d limit 1", + intval($contact_id), + intval(local_user()) + ); + if($r && count($r)) + $a->data['contact'] = $r[0]; + return; } -- cgit v1.2.3 From 8b101c6cb865c24cefd610e01ad628abd1152217 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 11 Feb 2012 23:49:05 -0800 Subject: do not display contact_block if config for num shown is 0 --- include/text.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/text.php b/include/text.php index 9e67d36a9..63846fb10 100755 --- a/include/text.php +++ b/include/text.php @@ -538,8 +538,10 @@ function contact_block() { $a = get_app(); $shown = get_pconfig($a->profile['uid'],'system','display_friend_count'); - if(! $shown) + if($shown === false) $shown = 24; + if($shown == 0) + return; if((! is_array($a->profile)) || ($a->profile['hide-friends'])) return $o; -- cgit v1.2.3 From cbf53beec12bf835177695fef9cd6a33ce9d1629 Mon Sep 17 00:00:00 2001 From: Vasudev Kamath Date: Sun, 12 Feb 2012 15:06:12 +0530 Subject: ;) :D and :-O are also enabled for wink laugh and surprised smiley's --- include/text.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/include/text.php b/include/text.php index 9e67d36a9..68170e988 100755 --- a/include/text.php +++ b/include/text.php @@ -678,9 +678,9 @@ function smilies($s) { $a = get_app(); $s = str_replace( - array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ':-(', ':(', ':-P', ':P', ':-"', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O', '\\o/', 'o.O', 'O.o', '\\.../', '\\ooo/', + array( '<3', '</3', '<\\3', ':-)', ':)', ';-)', ';)', ':-(', ':(', ':-P', ':P', ':-"', ':-"', ':-x', ':-X', ':-D', ':D', '8-|', '8-O', ':-O', '\\o/', 'o.O', 'O.o', '\\.../', '\\ooo/', ':beer', ':homebrew', ':coffee', - '~friendika', '~friendica', 'Diaspora*' ), + '~friendika', '~friendica', 'Diaspora*' ), array( '<3', '</3', @@ -688,6 +688,7 @@ function smilies($s) { ':-)', ':)', ';-)', + ';)', ':-(', ':(', ':-P', @@ -697,13 +698,16 @@ function smilies($s) { ':-x', ':-X', ':-D', + ':D', '8-|', '8-O', + ':-O', '\\o/', 'o.O', 'O.o', '\\.../', - '\\ooo/', + '\\ooo/', + ':beer', ':homebrew', ':coffee', -- cgit v1.2.3 From 5107ee52d3e9c743e977b2e651c8846dfa4ada38 Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 12 Feb 2012 06:13:49 -0800 Subject: Regexp fix for [LIST=i], [list=i], [LIST=I] and [LIST=i] bbcodes --- include/bbcode.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 6b733c8f4..7825914b5 100755 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -124,10 +124,14 @@ function bbcode($Text,$preserve_nl = false) { $Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '
    $1
' ,$Text); $Text = preg_replace("/\[list=\](.*?)\[\/list\]/ism", '
    $1
' ,$Text); $Text = preg_replace("/\[list=1\](.*?)\[\/list\]/ism", '
    $1
' ,$Text); - $Text = preg_replace("/\[list=i\](.*?)\[\/list\]/sm",'
    $1
' ,$Text); - $Text = preg_replace("/\[list=I\](.*?)\[\/list\]/sm", '
    $1
' ,$Text); - $Text = preg_replace("/\[list=a\](.*?)\[\/list\]/sm", '
    $1
' ,$Text); - $Text = preg_replace("/\[list=A\](.*?)\[\/list\]/sm", '
    $1
' ,$Text); + $Text = preg_replace("/\[list=((?-i)i)\](.*?)\[\/list\]/ism",'
    $2
' ,$Text); + $Text = preg_replace("/\[list=((?-i)I)\](.*?)\[\/list\]/ism", '
    $2
' ,$Text); + $Text = preg_replace("/\[list=((?-i)a)\](.*?)\[\/list\]/ism", '
    $2
' ,$Text); + $Text = preg_replace("/\[list=((?-i)A)\](.*?)\[\/list\]/ism", '
    $2
' ,$Text); $Text = preg_replace("/\[li\](.*?)\[\/li\]/sm", '
  • $1
    • ' ,$Text); $Text = preg_replace("/\[td\](.*?)\[\/td\]/sm", '$1' ,$Text); -- cgit v1.2.3 From 5479142efca1fff08f2d60dc5a723b5d0842548b Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 12 Feb 2012 06:21:01 -0800 Subject: Added support for [ul] standard unordered list bbcode. --- include/bbcode.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/bbcode.php b/include/bbcode.php index 7825914b5..5d9665be5 100755 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -115,13 +115,15 @@ function bbcode($Text,$preserve_nl = false) { // Check for list text - if(stristr($Text,'[/list]')) + if(stristr($Text,'[/(list|ul|ol)]')) $Text = str_replace("[*]", "
  • ", $Text); if(stristr($Text,'[/list]')) $Text = str_replace("[*]", "
  • ", $Text); $Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '
      $1
    ' ,$Text); + $Text = preg_replace("/\[ul\](.*?)\[\/ul\]/ism", '
      $1
    ' +,$Text); $Text = preg_replace("/\[list=\](.*?)\[\/list\]/ism", '
      $1
    ' ,$Text); $Text = preg_replace("/\[list=1\](.*?)\[\/list\]/ism", '
      $1
    ' ,$Text); $Text = preg_replace("/\[list=((?-i)i)\](.*?)\[\/list\]/ism",'
      Date: Sun, 12 Feb 2012 12:00:23 -0800 Subject: Added support for [ol] standard ordered list bbcode. --- include/bbcode.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/bbcode.php b/include/bbcode.php index 5d9665be5..7133a1a34 100755 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -126,6 +126,8 @@ function bbcode($Text,$preserve_nl = false) { ,$Text); $Text = preg_replace("/\[list=\](.*?)\[\/list\]/ism", '
        $1
      ' ,$Text); $Text = preg_replace("/\[list=1\](.*?)\[\/list\]/ism", '
        $1
      ' ,$Text); + $Text = preg_replace("/\[ol\](.*?)\[\/ol\]/ism", '
        $1
      ' +,$Text); $Text = preg_replace("/\[list=((?-i)i)\](.*?)\[\/list\]/ism",'
        $2
      ' ,$Text); $Text = preg_replace("/\[list=((?-i)I)\](.*?)\[\/list\]/ism", '
        Date: Sun, 12 Feb 2012 14:35:29 -0800 Subject: Added support to [noparse], [nobb] and [pre] as bbcode escape tags. --- include/bbcode.php | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/include/bbcode.php b/include/bbcode.php index 7133a1a34..3534a7315 100755 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -24,13 +24,40 @@ function tryoembed($match){ } +// [noparse][i]italic[/i][/noparse] turns into +// [noparse][ i ]italic[ /i ][/noparse], +// to hide them from parser. + +function bb_spacefy($st) { + $whole_match = $st[0]; + $captured = $st[1]; + $spacefied = preg_replace("/\[(.*?)\]/", "[ $1 ]", $captured); + $new_str = str_replace($captured, $spacefied, $whole_match); + return $new_str; +} + +// The previously spacefied [noparse][ i ]italic[ /i ][/noparse], +// now turns back and the [noparse] tags are trimed +// returning [i]italic[/i] +function bb_unspacefy_and_trim($st) { + $whole_match = $st[0]; + $captured = $st[1]; + $unspacefied = preg_replace("/\[ (.*?)\ ]/", "[$1]", $captured); + return $unspacefied; +} // BBcode 2 HTML was written by WAY2WEB.net // extended to work with Mistpark/Friendica - Mike Macgirvin function bbcode($Text,$preserve_nl = false) { + // Hide all [noparse] contained bbtags spacefying them + + $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_spacefy',$Text); + $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_spacefy',$Text); + $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_spacefy',$Text); + // Extract a single private image which uses data url's since preg has issues with // large data sizes. Stash it away while we do bbcode conversion, and then put it back @@ -227,6 +254,13 @@ upper-alpha;">$2
      ' ,$Text); $Text = preg_replace("/\[event\-adjust\](.*?)\[\/event\-adjust\]/ism",'',$Text); } + // Unhide all [noparse] contained bbtags unspacefying them + // and triming the [noparse] tag. + + $Text = preg_replace_callback("/\[noparse\](.*?)\[\/noparse\]/ism", 'bb_unspacefy_and_trim',$Text); + $Text = preg_replace_callback("/\[nobb\](.*?)\[\/nobb\]/ism", 'bb_unspacefy_and_trim',$Text); + $Text = preg_replace_callback("/\[pre\](.*?)\[\/pre\]/ism", 'bb_unspacefy_and_trim',$Text); + // fix any escaped ampersands that may have been converted into links $Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text); if(strlen($saved_image)) -- cgit v1.2.3 From 74b529bda2fb024815299db094ac8313a9d9d809 Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 12 Feb 2012 14:59:07 -0800 Subject: BBCode [size=50] --> font-size: 50px (with the unit px). This [size=number] without unit is kind of a standard. It was being rendered like "font-size: 50" and that's not valid CSS style. --- include/bbcode.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/bbcode.php b/include/bbcode.php index 3534a7315..fa5b7e080 100755 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -138,6 +138,8 @@ function bbcode($Text,$preserve_nl = false) { $Text = preg_replace("(\[color=(.*?)\](.*?)\[\/color\])ism","$2",$Text); // Check for sized text + // [size=50] --> font-size: 50px (with the unit). + $Text = preg_replace("(\[size=(\d*?)\](.*?)\[\/size\])ism","$2",$Text); $Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])ism","$2",$Text); // Check for list text -- cgit v1.2.3 From 3a07973ffae4e0f9c576d343eafee30401d92449 Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 12 Feb 2012 15:51:17 -0800 Subject: Added [center] bbcode support. --- include/bbcode.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/bbcode.php b/include/bbcode.php index fa5b7e080..20418f940 100755 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -142,6 +142,9 @@ function bbcode($Text,$preserve_nl = false) { $Text = preg_replace("(\[size=(\d*?)\](.*?)\[\/size\])ism","$2",$Text); $Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])ism","$2",$Text); + // Check for centered text + $Text = preg_replace("(\[center\](.*?)\[\/center\])ism","
      $1
      ",$Text); + // Check for list text if(stristr($Text,'[/(list|ul|ol)]')) -- cgit v1.2.3 From 10e66d293df695e37be05200ab130f1fc988880b Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 12 Feb 2012 16:18:58 -0800 Subject: Added [quote=Name] bbcode support. --- include/bbcode.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/bbcode.php b/include/bbcode.php index 20418f940..5eacb256b 100755 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -197,7 +197,13 @@ upper-alpha;">$2
    ' ,$Text); $QuoteLayout = '
    $1
    '; // Check for [quote] text $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/ism","$QuoteLayout", $Text); - + + // Check for [quote=Author] text + $t_wrote = t("wrote"); + $Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism", + "
    $1 wrote: $2
    ", + $Text); + // [img=widthxheight]image source[/img] $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '', $Text); -- cgit v1.2.3 From e575a3a02c324d65e6849ffd3f8cf68e7318f748 Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 12 Feb 2012 17:10:06 -0800 Subject: Fixed bbcode [li] and [*] handling. --- include/bbcode.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 5eacb256b..1d11f687d 100755 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -146,12 +146,8 @@ function bbcode($Text,$preserve_nl = false) { $Text = preg_replace("(\[center\](.*?)\[\/center\])ism","
    $1
    ",$Text); // Check for list text - - if(stristr($Text,'[/(list|ul|ol)]')) - $Text = str_replace("[*]", "
  • ", $Text); - - if(stristr($Text,'[/list]')) - $Text = str_replace("[*]", "
  • ", $Text); + $Text = str_replace("[*]", "
  • ", $Text); + $Text = preg_replace("/\[li\](.*?)\[\/li\]/ism", '
  • $1
    • ' ,$Text); $Text = preg_replace("/\[list\](.*?)\[\/list\]/ism", '
      $1
    ' ,$Text); $Text = preg_replace("/\[ul\](.*?)\[\/ul\]/ism", '
      $1
    ' @@ -168,7 +164,6 @@ upper-roman;">$2' ,$Text); lower-alpha;">$2' ,$Text); $Text = preg_replace("/\[list=((?-i)A)\](.*?)\[\/list\]/ism", '
      $2
    ' ,$Text); - $Text = preg_replace("/\[li\](.*?)\[\/li\]/sm", '
  • $1
    • ' ,$Text); $Text = preg_replace("/\[td\](.*?)\[\/td\]/sm", '$1' ,$Text); $Text = preg_replace("/\[tr\](.*?)\[\/tr\]/sm", '$1' ,$Text); -- cgit v1.2.3 From 3e85c1d3304c51489249ce2a284910885a1a3c73 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 12 Feb 2012 17:15:09 -0800 Subject: make 'x minutes ago' fully translateable with argument ordering. string update. --- include/bbcode.php | 2 +- include/datetime.php | 9 +- util/messages.po | 5682 ++++++++++++++++++++++++++------------------------ 3 files changed, 2951 insertions(+), 2742 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 6b733c8f4..e93cbf7d7 100755 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -11,7 +11,7 @@ function stripcode_br_cb($s) { function tryoembed($match){ $url = ((count($match)==2)?$match[1]:$match[2]); - logger("tryoembed: $url"); +// logger("tryoembed: $url"); $o = oembed_fetch_url($url); diff --git a/include/datetime.php b/include/datetime.php index d44e995cf..6d395fe3f 100755 --- a/include/datetime.php +++ b/include/datetime.php @@ -260,10 +260,11 @@ function relative_date($posted_date) { ); foreach ($a as $secs => $str) { - $d = $etime / $secs; - if ($d >= 1) { - $r = round($d); - return $r . ' ' . (($r == 1) ? $str[0] : $str[1]) . t(' ago'); + $d = $etime / $secs; + if ($d >= 1) { + $r = round($d); + // translators - e.g. 22 hours ago, 1 minute ago + return sprintf( t('%1$d %2$s ago'),$r, (($r == 1) ? $str[0] : $str[1])); } } }} diff --git a/util/messages.po b/util/messages.po index f553041b2..6e1652b39 100755 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.3.1221\n" +"Project-Id-Version: 2.3.1250\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-01-10 08:21-0800\n" +"POT-Creation-Date: 2012-02-12 17:14-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,1894 +17,2287 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: ../../mod/allfriends.php:9 ../../mod/follow.php:8 -#: ../../mod/contacts.php:117 ../../mod/settings.php:43 -#: ../../mod/settings.php:48 ../../mod/settings.php:403 -#: ../../mod/crepair.php:113 ../../mod/notifications.php:62 -#: ../../mod/message.php:9 ../../mod/message.php:46 -#: ../../mod/wall_upload.php:42 ../../mod/wall_attach.php:43 +#: ../../mod/oexchange.php:27 +msgid "Post successful." +msgstr "" + +#: ../../mod/update_notes.php:41 ../../mod/update_community.php:18 +#: ../../mod/update_network.php:22 ../../mod/update_profile.php:41 +msgid "[Embedded content - reload page to view]" +msgstr "" + +#: ../../mod/crepair.php:102 +msgid "Contact settings applied." +msgstr "" + +#: ../../mod/crepair.php:104 +msgid "Contact update failed." +msgstr "" + +#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:43 +#: ../../mod/fsuggest.php:78 ../../mod/events.php:109 ../../mod/api.php:26 +#: ../../mod/api.php:31 ../../mod/photos.php:129 ../../mod/photos.php:865 +#: ../../mod/editpost.php:10 ../../mod/install.php:171 +#: ../../mod/notifications.php:62 ../../mod/contacts.php:125 +#: ../../mod/settings.php:49 ../../mod/settings.php:404 +#: ../../mod/settings.php:409 ../../mod/manage.php:86 ../../mod/network.php:6 +#: ../../mod/notes.php:20 ../../mod/attach.php:33 ../../mod/group.php:19 +#: ../../mod/viewcontacts.php:21 ../../mod/register.php:36 +#: ../../mod/regmod.php:111 ../../mod/item.php:123 ../../mod/item.php:139 #: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:137 #: ../../mod/profile_photo.php:148 ../../mod/profile_photo.php:159 -#: ../../mod/manage.php:75 ../../mod/common.php:9 ../../mod/profiles.php:7 -#: ../../mod/profiles.php:229 ../../mod/invite.php:13 ../../mod/invite.php:81 -#: ../../mod/register.php:36 ../../mod/fsuggest.php:78 -#: ../../mod/editpost.php:10 ../../mod/regmod.php:111 -#: ../../mod/install.php:171 ../../mod/suggest.php:28 -#: ../../mod/display.php:111 ../../mod/notes.php:20 -#: ../../mod/dfrn_confirm.php:53 ../../mod/item.php:118 -#: ../../mod/photos.php:125 ../../mod/photos.php:860 ../../mod/network.php:6 -#: ../../mod/api.php:26 ../../mod/api.php:31 ../../mod/attach.php:33 -#: ../../mod/viewcontacts.php:21 ../../mod/group.php:19 -#: ../../mod/events.php:109 ../../index.php:288 ../../include/items.php:2867 -#: ../../addon/facebook/facebook.php:331 +#: ../../mod/message.php:9 ../../mod/message.php:46 ../../mod/allfriends.php:9 +#: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 ../../mod/common.php:9 +#: ../../mod/display.php:112 ../../mod/profiles.php:7 +#: ../../mod/profiles.php:229 ../../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:331 +#: ../../include/items.php:2907 ../../index.php:288 msgid "Permission denied." msgstr "" -#: ../../mod/allfriends.php:34 +#: ../../mod/crepair.php:129 ../../mod/fsuggest.php:20 +#: ../../mod/fsuggest.php:92 ../../mod/dfrn_confirm.php:118 +msgid "Contact not found." +msgstr "" + +#: ../../mod/crepair.php:135 +msgid "Repair Contact Settings" +msgstr "" + +#: ../../mod/crepair.php:137 +msgid "" +"WARNING: This is highly advanced and if you enter incorrect " +"information your communications with this contact may stop working." +msgstr "" + +#: ../../mod/crepair.php:138 +msgid "" +"Please use your browser 'Back' button now if you are " +"uncertain what to do on this page." +msgstr "" + +#: ../../mod/crepair.php:144 +msgid "Return to contact editor" +msgstr "" + +#: ../../mod/crepair.php:148 ../../mod/settings.php:455 +#: ../../mod/settings.php:481 ../../mod/admin.php:464 ../../mod/admin.php:473 +msgid "Name" +msgstr "" + +#: ../../mod/crepair.php:149 +msgid "Account Nickname" +msgstr "" + +#: ../../mod/crepair.php:150 +msgid "@Tagname - overrides Name/Nickname" +msgstr "" + +#: ../../mod/crepair.php:151 +msgid "Account URL" +msgstr "" + +#: ../../mod/crepair.php:152 +msgid "Friend Request URL" +msgstr "" + +#: ../../mod/crepair.php:153 +msgid "Friend Confirm URL" +msgstr "" + +#: ../../mod/crepair.php:154 +msgid "Notification Endpoint URL" +msgstr "" + +#: ../../mod/crepair.php:155 +msgid "Poll/Feed URL" +msgstr "" + +#: ../../mod/crepair.php:156 +msgid "New photo from this URL" +msgstr "" + +#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 +#: ../../mod/events.php:333 ../../mod/photos.php:900 ../../mod/photos.php:958 +#: ../../mod/photos.php:1182 ../../mod/photos.php:1222 +#: ../../mod/photos.php:1262 ../../mod/photos.php:1293 +#: ../../mod/install.php:251 ../../mod/install.php:289 +#: ../../mod/localtime.php:45 ../../mod/contacts.php:319 +#: ../../mod/settings.php:453 ../../mod/settings.php:592 +#: ../../mod/settings.php:773 ../../mod/manage.php:109 ../../mod/group.php:84 +#: ../../mod/group.php:167 ../../mod/admin.php:296 ../../mod/admin.php:461 +#: ../../mod/admin.php:587 ../../mod/admin.php:652 ../../mod/profiles.php:375 +#: ../../mod/invite.php:106 ../../addon/facebook/facebook.php:410 +#: ../../addon/yourls/yourls.php:76 ../../addon/nsfw/nsfw.php:57 +#: ../../addon/uhremotestorage/uhremotestorage.php:89 +#: ../../addon/randplace/randplace.php:179 ../../addon/drpost/drpost.php:110 +#: ../../addon/geonames/geonames.php:187 ../../addon/oembed.old/oembed.php:41 +#: ../../addon/impressum/impressum.php:69 ../../addon/blockem/blockem.php:57 +#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94 +#: ../../addon/pageheader/pageheader.php:52 +#: ../../addon/statusnet/statusnet.php:280 +#: ../../addon/statusnet/statusnet.php:294 +#: ../../addon/statusnet/statusnet.php:320 +#: ../../addon/statusnet/statusnet.php:327 +#: ../../addon/statusnet/statusnet.php:349 +#: ../../addon/statusnet/statusnet.php:495 ../../addon/tumblr/tumblr.php:90 +#: ../../addon/numfriends/numfriends.php:85 ../../addon/wppost/wppost.php:102 +#: ../../addon/piwik/piwik.php:81 ../../addon/twitter/twitter.php:180 +#: ../../addon/twitter/twitter.php:203 ../../addon/twitter/twitter.php:315 +#: ../../addon/posterous/posterous.php:90 ../../include/conversation.php:515 +msgid "Submit" +msgstr "" + +#: ../../mod/help.php:30 +msgid "Help:" +msgstr "" + +#: ../../mod/help.php:34 ../../include/nav.php:82 +msgid "Help" +msgstr "" + +#: ../../mod/help.php:38 ../../index.php:221 +msgid "Not Found" +msgstr "" + +#: ../../mod/help.php:41 ../../index.php:224 +msgid "Page not found." +msgstr "" + +#: ../../mod/wall_attach.php:57 #, php-format -msgid "Friends of %s" +msgid "File exceeds size limit of %d" msgstr "" -#: ../../mod/allfriends.php:40 -msgid "No friends to display." +#: ../../mod/wall_attach.php:85 ../../mod/wall_attach.php:96 +msgid "File upload failed." msgstr "" -#: ../../mod/update_profile.php:41 ../../mod/update_network.php:22 -#: ../../mod/update_notes.php:41 ../../mod/update_community.php:18 -msgid "[Embedded content - reload page to view]" +#: ../../mod/fsuggest.php:63 +msgid "Friend suggestion sent." msgstr "" -#: ../../mod/directory.php:31 ../../mod/dfrn_request.php:624 -#: ../../mod/community.php:16 ../../mod/display.php:7 ../../mod/search.php:71 -#: ../../mod/photos.php:754 ../../mod/viewcontacts.php:16 -msgid "Public access denied." +#: ../../mod/fsuggest.php:97 +msgid "Suggest Friends" msgstr "" -#: ../../mod/directory.php:49 -msgid "Global Directory" +#: ../../mod/fsuggest.php:99 +#, php-format +msgid "Suggest a friend for %s" msgstr "" -#: ../../mod/directory.php:55 -msgid "Normal site view" +#: ../../mod/events.php:61 +msgid "Event description and start time are required." msgstr "" -#: ../../mod/directory.php:57 -msgid "Admin - View all site entries" +#: ../../mod/events.php:117 ../../include/nav.php:50 ../../boot.php:1345 +msgid "Events" msgstr "" -#: ../../mod/directory.php:63 -msgid "Find on this site" +#: ../../mod/events.php:207 +msgid "Create New Event" msgstr "" -#: ../../mod/directory.php:65 ../../mod/contacts.php:372 -msgid "Finding: " +#: ../../mod/events.php:210 +msgid "Previous" msgstr "" -#: ../../mod/directory.php:66 -msgid "Site Directory" +#: ../../mod/events.php:213 ../../mod/install.php:210 +msgid "Next" msgstr "" -#: ../../mod/directory.php:67 ../../mod/contacts.php:373 -#: ../../include/contact_widgets.php:34 -msgid "Find" +#: ../../mod/events.php:220 +msgid "l, F j" msgstr "" -#: ../../mod/directory.php:122 ../../mod/profiles.php:426 -msgid "Age: " +#: ../../mod/events.php:235 +msgid "Edit event" msgstr "" -#: ../../mod/directory.php:125 -msgid "Gender: " +#: ../../mod/events.php:237 ../../include/text.php:883 +msgid "link to source" msgstr "" -#: ../../mod/directory.php:151 -msgid "No entries (some entries may be hidden)." +#: ../../mod/events.php:305 +msgid "hour:minute" msgstr "" -#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:111 -#: ../../mod/admin.php:502 ../../mod/display.php:28 ../../mod/display.php:115 -#: ../../include/items.php:2779 -msgid "Item not found." +#: ../../mod/events.php:314 +msgid "Event details" msgstr "" -#: ../../mod/viewsrc.php:7 -msgid "Access denied." +#: ../../mod/events.php:315 +#, php-format +msgid "Format is %s %s. Starting date and Description are required." msgstr "" -#: ../../mod/newmember.php:6 -msgid "Welcome to Friendica" +#: ../../mod/events.php:316 +msgid "Event Starts:" msgstr "" -#: ../../mod/newmember.php:8 -msgid "New Member Checklist" +#: ../../mod/events.php:319 +msgid "Finish date/time is not known or not relevant" msgstr "" -#: ../../mod/newmember.php:12 -msgid "" -"We would like to offer some tips and links to help make your experience " -"enjoyable. Click any item to visit the relevant page." +#: ../../mod/events.php:321 +msgid "Event Finishes:" msgstr "" -#: ../../mod/newmember.php:16 -msgid "" -"On your Settings page - change your initial password. Also make a " -"note of your Identity Address. This will be useful in making friends." +#: ../../mod/events.php:324 +msgid "Adjust for viewer timezone" msgstr "" -#: ../../mod/newmember.php:18 -msgid "" -"Review the other settings, particularly the privacy settings. An unpublished " -"directory listing is like having an unlisted phone number. In general, you " -"should probably publish your listing - unless all of your friends and " -"potential friends know exactly how to find you." +#: ../../mod/events.php:326 +msgid "Description:" msgstr "" -#: ../../mod/newmember.php:20 -msgid "" -"Upload a profile photo if you have not done so already. Studies have shown " -"that people with real photos of themselves are ten times more likely to make " -"friends than people who do not." +#: ../../mod/events.php:328 ../../include/event.php:37 +#: ../../include/bb2diaspora.php:271 ../../boot.php:976 +msgid "Location:" msgstr "" -#: ../../mod/newmember.php:23 -msgid "" -"Authorise the Facebook Connector if you currently have a Facebook account " -"and we will (optionally) import all your Facebook friends and conversations." +#: ../../mod/events.php:330 +msgid "Share this event" msgstr "" -#: ../../mod/newmember.php:28 -msgid "" -"Enter your email access information on your Connector Settings page if you " -"wish to import and interact with friends or mailing lists from your email " -"INBOX" +#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 +#: ../../mod/dfrn_request.php:685 ../../mod/settings.php:454 +#: ../../mod/settings.php:480 ../../addon/js_upload/js_upload.php:45 +msgid "Cancel" msgstr "" -#: ../../mod/newmember.php:30 -msgid "" -"Edit your default profile to your liking. Review the " -"settings for hiding your list of friends and hiding the profile from unknown " -"visitors." +#: ../../mod/tagrm.php:41 +msgid "Tag removed" msgstr "" -#: ../../mod/newmember.php:32 -msgid "" -"Set some public keywords for your default profile which describe your " -"interests. We may be able to find other people with similar interests and " -"suggest friendships." +#: ../../mod/tagrm.php:79 +msgid "Remove Item Tag" msgstr "" -#: ../../mod/newmember.php:34 +#: ../../mod/tagrm.php:81 +msgid "Select a tag to remove: " +msgstr "" + +#: ../../mod/tagrm.php:93 ../../mod/delegate.php:130 +msgid "Remove" +msgstr "" + +#: ../../mod/dfrn_poll.php:91 ../../mod/dfrn_poll.php:517 +#, php-format +msgid "%s welcomes %s" +msgstr "" + +#: ../../mod/api.php:76 ../../mod/api.php:102 +msgid "Authorize application connection" +msgstr "" + +#: ../../mod/api.php:77 +msgid "Return to your app and insert this Securty Code:" +msgstr "" + +#: ../../mod/api.php:89 +msgid "Please login to continue." +msgstr "" + +#: ../../mod/api.php:104 msgid "" -"Your Contacts page is your gateway to managing friendships and connecting " -"with friends on other networks. Typically you enter their address or site " -"URL in the Add New Contact dialog." +"Do you want to authorize this application to access your posts and contacts, " +"and/or create new posts for you?" msgstr "" -#: ../../mod/newmember.php:36 +#: ../../mod/api.php:105 ../../mod/dfrn_request.php:675 +#: ../../mod/settings.php:681 ../../mod/settings.php:687 +#: ../../mod/settings.php:695 ../../mod/settings.php:699 +#: ../../mod/settings.php:704 ../../mod/settings.php:710 +#: ../../mod/settings.php:716 ../../mod/settings.php:763 +#: ../../mod/settings.php:764 ../../mod/settings.php:765 +#: ../../mod/settings.php:766 ../../mod/register.php:524 +#: ../../mod/profiles.php:357 +msgid "Yes" +msgstr "" + +#: ../../mod/api.php:106 ../../mod/dfrn_request.php:676 +#: ../../mod/settings.php:681 ../../mod/settings.php:687 +#: ../../mod/settings.php:695 ../../mod/settings.php:699 +#: ../../mod/settings.php:704 ../../mod/settings.php:710 +#: ../../mod/settings.php:716 ../../mod/settings.php:763 +#: ../../mod/settings.php:764 ../../mod/settings.php:765 +#: ../../mod/settings.php:766 ../../mod/register.php:525 +#: ../../mod/profiles.php:358 +msgid "No" +msgstr "" + +#: ../../mod/photos.php:42 +msgid "Photo Albums" +msgstr "" + +#: ../../mod/photos.php:50 ../../mod/photos.php:150 ../../mod/photos.php:879 +#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1371 +#: ../../mod/photos.php:1383 ../../addon/communityhome/communityhome.php:110 +msgid "Contact Photos" +msgstr "" + +#: ../../mod/photos.php:57 ../../mod/photos.php:975 ../../mod/photos.php:1413 +msgid "Upload New Photos" +msgstr "" + +#: ../../mod/photos.php:68 ../../mod/settings.php:11 +msgid "everybody" +msgstr "" + +#: ../../mod/photos.php:139 +msgid "Contact information unavailable" +msgstr "" + +#: ../../mod/photos.php:150 ../../mod/photos.php:597 ../../mod/photos.php:950 +#: ../../mod/photos.php:965 ../../mod/register.php:327 +#: ../../mod/register.php:334 ../../mod/register.php:341 +#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65 +#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:170 +#: ../../mod/profile_photo.php:246 ../../mod/profile_photo.php:255 +#: ../../addon/communityhome/communityhome.php:111 +msgid "Profile Photos" +msgstr "" + +#: ../../mod/photos.php:160 +msgid "Album not found." +msgstr "" + +#: ../../mod/photos.php:178 ../../mod/photos.php:959 +msgid "Delete Album" +msgstr "" + +#: ../../mod/photos.php:241 ../../mod/photos.php:1183 +msgid "Delete Photo" +msgstr "" + +#: ../../mod/photos.php:528 +msgid "was tagged in a" +msgstr "" + +#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 +#: ../../addon/communityhome/communityhome.php:163 +#: ../../include/diaspora.php:1587 ../../include/conversation.php:31 +#: ../../include/conversation.php:104 +msgid "photo" +msgstr "" + +#: ../../mod/photos.php:528 +msgid "by" +msgstr "" + +#: ../../mod/photos.php:631 ../../addon/js_upload/js_upload.php:312 +msgid "Image exceeds size limit of " +msgstr "" + +#: ../../mod/photos.php:639 +msgid "Image file is empty." +msgstr "" + +#: ../../mod/photos.php:653 ../../mod/profile_photo.php:122 +#: ../../mod/wall_upload.php:65 +msgid "Unable to process image." +msgstr "" + +#: ../../mod/photos.php:673 ../../mod/profile_photo.php:251 +#: ../../mod/wall_upload.php:84 +msgid "Image upload failed." +msgstr "" + +#: ../../mod/photos.php:759 ../../mod/community.php:16 +#: ../../mod/dfrn_request.php:624 ../../mod/viewcontacts.php:16 +#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:31 +msgid "Public access denied." +msgstr "" + +#: ../../mod/photos.php:769 +msgid "No photos selected" +msgstr "" + +#: ../../mod/photos.php:846 +msgid "Access to this item is restricted." +msgstr "" + +#: ../../mod/photos.php:907 +msgid "Upload Photos" +msgstr "" + +#: ../../mod/photos.php:910 ../../mod/photos.php:954 +msgid "New album name: " +msgstr "" + +#: ../../mod/photos.php:911 +msgid "or existing album name: " +msgstr "" + +#: ../../mod/photos.php:912 +msgid "Do not show a status post for this upload" +msgstr "" + +#: ../../mod/photos.php:914 ../../mod/photos.php:1178 +msgid "Permissions" +msgstr "" + +#: ../../mod/photos.php:969 +msgid "Edit Album" +msgstr "" + +#: ../../mod/photos.php:984 ../../mod/photos.php:1396 +msgid "View Photo" +msgstr "" + +#: ../../mod/photos.php:1019 +msgid "Permission denied. Access to this item may be restricted." +msgstr "" + +#: ../../mod/photos.php:1021 +msgid "Photo not available" +msgstr "" + +#: ../../mod/photos.php:1071 +msgid "View photo" +msgstr "" + +#: ../../mod/photos.php:1071 +msgid "Edit photo" +msgstr "" + +#: ../../mod/photos.php:1072 +msgid "Use as profile photo" +msgstr "" + +#: ../../mod/photos.php:1078 ../../include/conversation.php:450 +msgid "Private Message" +msgstr "" + +#: ../../mod/photos.php:1089 +msgid "View Full Size" +msgstr "" + +#: ../../mod/photos.php:1157 +msgid "Tags: " +msgstr "" + +#: ../../mod/photos.php:1160 +msgid "[Remove any tag]" +msgstr "" + +#: ../../mod/photos.php:1171 +msgid "New album name" +msgstr "" + +#: ../../mod/photos.php:1174 +msgid "Caption" +msgstr "" + +#: ../../mod/photos.php:1176 +msgid "Add a Tag" +msgstr "" + +#: ../../mod/photos.php:1180 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +msgstr "" + +#: ../../mod/photos.php:1200 ../../include/conversation.php:497 +msgid "I like this (toggle)" +msgstr "" + +#: ../../mod/photos.php:1201 ../../include/conversation.php:498 +msgid "I don't like this (toggle)" +msgstr "" + +#: ../../mod/photos.php:1202 ../../include/conversation.php:889 +msgid "Share" +msgstr "" + +#: ../../mod/photos.php:1203 ../../mod/editpost.php:100 +#: ../../mod/message.php:155 ../../mod/message.php:296 +#: ../../include/conversation.php:321 ../../include/conversation.php:652 +#: ../../include/conversation.php:906 +msgid "Please wait" +msgstr "" + +#: ../../mod/photos.php:1219 ../../mod/photos.php:1259 +#: ../../mod/photos.php:1290 ../../include/conversation.php:512 +msgid "This is you" +msgstr "" + +#: ../../mod/photos.php:1221 ../../mod/photos.php:1261 +#: ../../mod/photos.php:1292 ../../include/conversation.php:514 +#: ../../boot.php:443 +msgid "Comment" +msgstr "" + +#: ../../mod/photos.php:1223 ../../mod/editpost.php:119 +#: ../../include/conversation.php:516 ../../include/conversation.php:924 +msgid "Preview" +msgstr "" + +#: ../../mod/photos.php:1320 ../../mod/settings.php:513 +#: ../../mod/group.php:154 ../../mod/admin.php:468 +#: ../../include/conversation.php:280 ../../include/conversation.php:536 +msgid "Delete" +msgstr "" + +#: ../../mod/photos.php:1402 +msgid "View Album" +msgstr "" + +#: ../../mod/photos.php:1411 +msgid "Recent Photos" +msgstr "" + +#: ../../mod/community.php:21 +msgid "Not available." +msgstr "" + +#: ../../mod/community.php:30 ../../include/nav.php:97 +msgid "Community" +msgstr "" + +#: ../../mod/community.php:60 ../../mod/search.php:118 +msgid "No results." +msgstr "" + +#: ../../mod/friendica.php:43 +msgid "This is Friendica, version" +msgstr "" + +#: ../../mod/friendica.php:44 +msgid "running at web location" +msgstr "" + +#: ../../mod/friendica.php:46 msgid "" -"The Directory page lets you find other people in this network or other " -"federated sites. Look for a Connect or Follow link on " -"their profile page. Provide your own Identity Address if requested." +"Please visit Friendica.com to learn " +"more about the Friendica project." msgstr "" -#: ../../mod/newmember.php:38 -msgid "" -"Once you have made some friends, organize them into private conversation " -"groups from the sidebar of your Contacts page and then you can interact with " -"each group privately on your Network page." +#: ../../mod/friendica.php:48 +msgid "Bug reports and issues: please visit" msgstr "" -#: ../../mod/newmember.php:40 +#: ../../mod/friendica.php:49 msgid "" -"Our help pages may be consulted for detail on other program " -"features and resources." +"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - " +"dot com" msgstr "" -#: ../../mod/follow.php:20 ../../mod/dfrn_request.php:370 -msgid "Disallowed profile URL." +#: ../../mod/friendica.php:54 +msgid "Installed plugins/addons/apps" msgstr "" -#: ../../mod/follow.php:27 -msgid "Connect URL missing." +#: ../../mod/friendica.php:62 +msgid "No installed plugins/addons/apps" msgstr "" -#: ../../mod/follow.php:47 -msgid "" -"This site is not configured to allow communications with other networks." +#: ../../mod/editpost.php:17 ../../mod/editpost.php:27 +msgid "Item not found" msgstr "" -#: ../../mod/follow.php:48 ../../mod/follow.php:58 -msgid "No compatible communication protocols or feeds were discovered." +#: ../../mod/editpost.php:32 +msgid "Edit post" msgstr "" -#: ../../mod/follow.php:56 -msgid "The profile address specified does not provide adequate information." +#: ../../mod/editpost.php:76 ../../include/conversation.php:875 +msgid "Post to Email" msgstr "" -#: ../../mod/follow.php:60 -msgid "An author or name was not found." +#: ../../mod/editpost.php:91 ../../mod/settings.php:512 +#: ../../include/conversation.php:523 +msgid "Edit" msgstr "" -#: ../../mod/follow.php:62 -msgid "No browser URL could be matched to this address." +#: ../../mod/editpost.php:92 ../../mod/message.php:153 +#: ../../mod/message.php:294 ../../include/conversation.php:890 +msgid "Upload photo" msgstr "" -#: ../../mod/follow.php:69 -msgid "" -"The profile address specified belongs to a network which has been disabled " -"on this site." +#: ../../mod/editpost.php:93 ../../include/conversation.php:892 +msgid "Attach file" msgstr "" -#: ../../mod/follow.php:74 -msgid "" -"Limited profile. This person will be unable to receive direct/personal " -"notifications from you." +#: ../../mod/editpost.php:94 ../../mod/message.php:154 +#: ../../mod/message.php:295 ../../include/conversation.php:894 +msgid "Insert web link" msgstr "" -#: ../../mod/follow.php:144 -msgid "Unable to retrieve contact information." +#: ../../mod/editpost.php:95 +msgid "Insert YouTube video" msgstr "" -#: ../../mod/follow.php:190 -msgid "following" +#: ../../mod/editpost.php:96 +msgid "Insert Vorbis [.ogg] video" msgstr "" -#: ../../mod/dirfind.php:23 -msgid "People Search" +#: ../../mod/editpost.php:97 +msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/dirfind.php:57 ../../mod/match.php:65 -msgid "No matches" +#: ../../mod/editpost.php:98 ../../include/conversation.php:900 +msgid "Set your location" msgstr "" -#: ../../mod/contacts.php:62 ../../mod/contacts.php:135 -msgid "Could not access contact record." +#: ../../mod/editpost.php:99 ../../include/conversation.php:902 +msgid "Clear browser location" msgstr "" -#: ../../mod/contacts.php:76 -msgid "Could not locate selected profile." +#: ../../mod/editpost.php:101 ../../include/conversation.php:907 +msgid "Permission settings" msgstr "" -#: ../../mod/contacts.php:99 -msgid "Contact updated." +#: ../../mod/editpost.php:109 ../../include/conversation.php:916 +msgid "CC: email addresses" msgstr "" -#: ../../mod/contacts.php:101 ../../mod/dfrn_request.php:439 -msgid "Failed to update contact record." +#: ../../mod/editpost.php:110 ../../include/conversation.php:917 +msgid "Public post" msgstr "" -#: ../../mod/contacts.php:157 -msgid "Contact has been blocked" +#: ../../mod/editpost.php:113 ../../include/conversation.php:905 +msgid "Set title" msgstr "" -#: ../../mod/contacts.php:157 -msgid "Contact has been unblocked" +#: ../../mod/editpost.php:114 ../../include/conversation.php:919 +msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../mod/contacts.php:171 -msgid "Contact has been ignored" +#: ../../mod/dfrn_request.php:92 +msgid "This introduction has already been accepted." msgstr "" -#: ../../mod/contacts.php:171 -msgid "Contact has been unignored" +#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:381 +msgid "Profile location is not valid or does not contain profile information." msgstr "" -#: ../../mod/contacts.php:192 -msgid "stopped following" +#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:386 +msgid "Warning: profile location has no identifiable owner name." msgstr "" -#: ../../mod/contacts.php:213 -msgid "Contact has been removed." +#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:388 +msgid "Warning: profile location has no profile photo." msgstr "" -#: ../../mod/contacts.php:234 +#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:391 #, php-format -msgid "You are mutual friends with %s" +msgid "%d required parameter was not found at the given location" +msgid_plural "%d required parameters were not found at the given location" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/dfrn_request.php:167 +msgid "Introduction complete." msgstr "" -#: ../../mod/contacts.php:238 -#, php-format -msgid "You are sharing with %s" +#: ../../mod/dfrn_request.php:191 +msgid "Unrecoverable protocol error." +msgstr "" + +#: ../../mod/dfrn_request.php:219 +msgid "Profile unavailable." msgstr "" -#: ../../mod/contacts.php:243 +#: ../../mod/dfrn_request.php:244 #, php-format -msgid "%s is sharing with you" +msgid "%s has received too many connection requests today." msgstr "" -#: ../../mod/contacts.php:260 -msgid "Private communications are not available for this contact." +#: ../../mod/dfrn_request.php:245 +msgid "Spam protection measures have been invoked." msgstr "" -#: ../../mod/contacts.php:263 -msgid "Never" +#: ../../mod/dfrn_request.php:246 +msgid "Friends are advised to please try again in 24 hours." msgstr "" -#: ../../mod/contacts.php:267 -msgid "(Update was successful)" +#: ../../mod/dfrn_request.php:306 +msgid "Invalid locator" msgstr "" -#: ../../mod/contacts.php:267 -msgid "(Update was not successful)" +#: ../../mod/dfrn_request.php:326 +msgid "Unable to resolve your name at the provided location." msgstr "" -#: ../../mod/contacts.php:269 -msgid "Suggest friends" +#: ../../mod/dfrn_request.php:339 +msgid "You have already introduced yourself here." msgstr "" -#: ../../mod/contacts.php:273 +#: ../../mod/dfrn_request.php:343 #, php-format -msgid "Network type: %s" +msgid "Apparently you are already friends with %s." msgstr "" -#: ../../mod/contacts.php:276 -#, php-format -msgid "%d contact in common" -msgid_plural "%d contacts in common" -msgstr[0] "" -msgstr[1] "" +#: ../../mod/dfrn_request.php:364 +msgid "Invalid profile URL." +msgstr "" -#: ../../mod/contacts.php:281 -msgid "View all contacts" +#: ../../mod/dfrn_request.php:370 ../../mod/follow.php:20 +msgid "Disallowed profile URL." msgstr "" -#: ../../mod/contacts.php:286 ../../mod/contacts.php:333 -#: ../../mod/admin.php:470 -msgid "Unblock" +#: ../../mod/dfrn_request.php:439 ../../mod/contacts.php:102 +msgid "Failed to update contact record." msgstr "" -#: ../../mod/contacts.php:286 ../../mod/contacts.php:333 -#: ../../mod/admin.php:469 -msgid "Block" +#: ../../mod/dfrn_request.php:460 +msgid "Your introduction has been sent." msgstr "" -#: ../../mod/contacts.php:291 ../../mod/contacts.php:334 -msgid "Unignore" +#: ../../mod/dfrn_request.php:513 +msgid "Please login to confirm introduction." msgstr "" -#: ../../mod/contacts.php:291 ../../mod/contacts.php:334 -#: ../../mod/notifications.php:47 ../../mod/notifications.php:149 -#: ../../mod/notifications.php:194 -msgid "Ignore" +#: ../../mod/dfrn_request.php:527 +msgid "" +"Incorrect identity currently logged in. Please login to this profile." msgstr "" -#: ../../mod/contacts.php:296 -msgid "Repair" +#: ../../mod/dfrn_request.php:539 +#, php-format +msgid "Welcome home %s." msgstr "" -#: ../../mod/contacts.php:306 -msgid "Contact Editor" +#: ../../mod/dfrn_request.php:540 +#, php-format +msgid "Please confirm your introduction/connection request to %s." msgstr "" -#: ../../mod/contacts.php:308 ../../mod/settings.php:447 -#: ../../mod/settings.php:586 ../../mod/settings.php:767 -#: ../../mod/crepair.php:162 ../../mod/manage.php:106 -#: ../../mod/profiles.php:375 ../../mod/localtime.php:45 -#: ../../mod/invite.php:106 ../../mod/fsuggest.php:107 -#: ../../mod/install.php:250 ../../mod/install.php:288 ../../mod/admin.php:296 -#: ../../mod/admin.php:461 ../../mod/admin.php:587 ../../mod/admin.php:652 -#: ../../mod/photos.php:888 ../../mod/photos.php:946 ../../mod/photos.php:1165 -#: ../../mod/photos.php:1205 ../../mod/photos.php:1245 -#: ../../mod/photos.php:1276 ../../mod/group.php:84 ../../mod/group.php:167 -#: ../../mod/events.php:333 ../../include/conversation.php:488 -#: ../../addon/facebook/facebook.php:410 ../../addon/wppost/wppost.php:101 -#: ../../addon/uhremotestorage/uhremotestorage.php:58 -#: ../../addon/tumblr/tumblr.php:89 ../../addon/oembed/oembed.php:41 -#: ../../addon/posterous/posterous.php:89 -#: ../../addon/statusnet/statusnet.php:282 -#: ../../addon/statusnet/statusnet.php:296 -#: ../../addon/statusnet/statusnet.php:322 -#: ../../addon/statusnet/statusnet.php:329 -#: ../../addon/statusnet/statusnet.php:351 -#: ../../addon/statusnet/statusnet.php:486 ../../addon/twitter/twitter.php:179 -#: ../../addon/twitter/twitter.php:202 ../../addon/twitter/twitter.php:299 -#: ../../addon/impressum/impressum.php:69 ../../addon/piwik/piwik.php:81 -#: ../../addon/pageheader/pageheader.php:52 -#: ../../addon/randplace/randplace.php:178 ../../addon/blockem/blockem.php:53 -#: ../../addon/nsfw/nsfw.php:53 -msgid "Submit" +#: ../../mod/dfrn_request.php:541 +msgid "Confirm" msgstr "" -#: ../../mod/contacts.php:309 -msgid "Profile Visibility" +#: ../../mod/dfrn_request.php:581 ../../include/items.php:2443 +msgid "[Name Withheld]" msgstr "" -#: ../../mod/contacts.php:310 +#: ../../mod/dfrn_request.php:665 #, php-format msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." +"Diaspora members: Please do not use this form. Instead, enter \"%s\" into " +"your Diaspora search bar." msgstr "" -#: ../../mod/contacts.php:311 -msgid "Contact Information / Notes" +#: ../../mod/dfrn_request.php:668 +msgid "" +"Please enter your 'Identity Address' from one of the following supported " +"social networks:" msgstr "" -#: ../../mod/contacts.php:312 -msgid "Edit contact notes" +#: ../../mod/dfrn_request.php:671 +msgid "Friend/Connection Request" msgstr "" -#: ../../mod/contacts.php:317 ../../mod/contacts.php:433 -#: ../../mod/viewcontacts.php:61 +#: ../../mod/dfrn_request.php:672 +msgid "" +"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " +"testuser@identi.ca" +msgstr "" + +#: ../../mod/dfrn_request.php:673 +msgid "Please answer the following:" +msgstr "" + +#: ../../mod/dfrn_request.php:674 #, php-format -msgid "Visit %s's profile [%s]" +msgid "Does %s know you?" msgstr "" -#: ../../mod/contacts.php:318 -msgid "Block/Unblock contact" +#: ../../mod/dfrn_request.php:677 +msgid "Add a personal note:" msgstr "" -#: ../../mod/contacts.php:319 -msgid "Ignore contact" +#: ../../mod/dfrn_request.php:679 ../../include/contact_selectors.php:76 +msgid "Friendica" msgstr "" -#: ../../mod/contacts.php:320 -msgid "Repair URL settings" +#: ../../mod/dfrn_request.php:680 +msgid "StatusNet/Federated Social Web" msgstr "" -#: ../../mod/contacts.php:321 -msgid "View conversations" +#: ../../mod/dfrn_request.php:681 ../../mod/settings.php:548 +#: ../../include/contact_selectors.php:80 +msgid "Diaspora" msgstr "" -#: ../../mod/contacts.php:323 -msgid "Delete contact" +#: ../../mod/dfrn_request.php:682 +msgid "- please share from your own site as noted above" msgstr "" -#: ../../mod/contacts.php:327 -msgid "Last update:" +#: ../../mod/dfrn_request.php:683 +msgid "Your Identity Address:" msgstr "" -#: ../../mod/contacts.php:328 -msgid "Update public posts" +#: ../../mod/dfrn_request.php:684 +msgid "Submit Request" msgstr "" -#: ../../mod/contacts.php:330 ../../mod/admin.php:701 -msgid "Update now" +#: ../../mod/install.php:111 +msgid "Friendica Social Communications Server - Setup" msgstr "" -#: ../../mod/contacts.php:337 -msgid "Currently blocked" +#: ../../mod/install.php:117 ../../mod/install.php:157 +#: ../../mod/install.php:230 +msgid "Database connection" msgstr "" -#: ../../mod/contacts.php:338 -msgid "Currently ignored" +#: ../../mod/install.php:124 +msgid "Could not connect to database." msgstr "" -#: ../../mod/contacts.php:339 ../../mod/notifications.php:144 -#: ../../mod/notifications.php:189 -msgid "Hide this contact from others" +#: ../../mod/install.php:128 +msgid "Could not create table." msgstr "" -#: ../../mod/contacts.php:339 -msgid "" -"Replies/likes to your public posts may still be visible" +#: ../../mod/install.php:133 +msgid "Your Friendica site database has been installed." msgstr "" -#: ../../mod/contacts.php:367 ../../include/nav.php:130 -msgid "Contacts" +#: ../../mod/install.php:134 +msgid "" +"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" -#: ../../mod/contacts.php:369 -msgid "Show Blocked Connections" +#: ../../mod/install.php:135 ../../mod/install.php:151 +#: ../../mod/install.php:209 +msgid "Please see the file \"INSTALL.txt\"." msgstr "" -#: ../../mod/contacts.php:369 -msgid "Hide Blocked Connections" +#: ../../mod/install.php:137 +msgid "Proceed to registration" msgstr "" -#: ../../mod/contacts.php:371 -msgid "Search your contacts" +#: ../../mod/install.php:143 +msgid "Proceed with Installation" msgstr "" -#: ../../mod/contacts.php:409 -msgid "Mutual Friendship" +#: ../../mod/install.php:150 +msgid "" +"You may need to import the file \"database.sql\" manually using phpmyadmin " +"or mysql." msgstr "" -#: ../../mod/contacts.php:413 -msgid "is a fan of yours" +#: ../../mod/install.php:158 +msgid "Database import failed." msgstr "" -#: ../../mod/contacts.php:417 -msgid "you are a fan of" +#: ../../mod/install.php:206 +msgid "System check" msgstr "" -#: ../../mod/contacts.php:434 ../../include/Contact.php:129 -#: ../../include/conversation.php:727 -msgid "Edit contact" +#: ../../mod/install.php:211 +msgid "Check again" msgstr "" -#: ../../mod/settings.php:11 ../../mod/photos.php:64 -msgid "everybody" +#: ../../mod/install.php:231 +msgid "" +"In order to install Friendica we need to know how to connect to your " +"database." msgstr "" -#: ../../mod/settings.php:69 -msgid "Missing some important data!" +#: ../../mod/install.php:232 +msgid "" +"Please contact your hosting provider or site administrator if you have " +"questions about these settings." msgstr "" -#: ../../mod/settings.php:72 ../../mod/settings.php:473 ../../mod/admin.php:62 -msgid "Update" +#: ../../mod/install.php:233 +msgid "" +"The database you specify below should already exist. If it does not, please " +"create it before continuing." msgstr "" -#: ../../mod/settings.php:167 -msgid "Failed to connect with email account using the settings provided." +#: ../../mod/install.php:237 +msgid "Database Server Name" msgstr "" -#: ../../mod/settings.php:172 -msgid "Email settings updated." +#: ../../mod/install.php:238 +msgid "Database Login Name" msgstr "" -#: ../../mod/settings.php:190 -msgid "Passwords do not match. Password unchanged." +#: ../../mod/install.php:239 +msgid "Database Login Password" msgstr "" -#: ../../mod/settings.php:195 -msgid "Empty passwords are not allowed. Password unchanged." +#: ../../mod/install.php:240 +msgid "Database Name" msgstr "" -#: ../../mod/settings.php:206 -msgid "Password changed." +#: ../../mod/install.php:241 ../../mod/install.php:280 +msgid "Site administrator email address" msgstr "" -#: ../../mod/settings.php:208 -msgid "Password update failed. Please try again." +#: ../../mod/install.php:241 ../../mod/install.php:280 +msgid "" +"Your account email address must match this in order to use the web admin " +"panel." msgstr "" -#: ../../mod/settings.php:272 -msgid " Please use a shorter name." +#: ../../mod/install.php:245 ../../mod/install.php:283 +msgid "Please select a default timezone for your website" msgstr "" -#: ../../mod/settings.php:274 -msgid " Name too short." +#: ../../mod/install.php:270 +msgid "Site settings" msgstr "" -#: ../../mod/settings.php:280 -msgid " Not valid email." +#: ../../mod/install.php:323 +msgid "Could not find a command line version of PHP in the web server PATH." msgstr "" -#: ../../mod/settings.php:282 -msgid " Cannot change to that email." +#: ../../mod/install.php:326 +msgid "PHP executable path" msgstr "" -#: ../../mod/settings.php:350 ../../addon/facebook/facebook.php:320 -#: ../../addon/twitter/twitter.php:294 ../../addon/impressum/impressum.php:64 -#: ../../addon/piwik/piwik.php:94 -msgid "Settings updated." +#: ../../mod/install.php:326 +msgid "Enter full path to php executable" msgstr "" -#: ../../mod/settings.php:409 ../../include/nav.php:128 -msgid "Account settings" +#: ../../mod/install.php:331 +msgid "Command line PHP" msgstr "" -#: ../../mod/settings.php:414 -msgid "Connector settings" +#: ../../mod/install.php:340 +msgid "" +"The command line version of PHP on your system does not have " +"\"register_argc_argv\" enabled." msgstr "" -#: ../../mod/settings.php:419 -msgid "Plugin settings" +#: ../../mod/install.php:341 +msgid "This is required for message delivery to work." msgstr "" -#: ../../mod/settings.php:424 -msgid "Connections" +#: ../../mod/install.php:343 +msgid "PHP \"register_argc_argv\"" msgstr "" -#: ../../mod/settings.php:429 -msgid "Export personal data" +#: ../../mod/install.php:364 +msgid "" +"Error: the \"openssl_pkey_new\" function on this system is not able to " +"generate encryption keys" msgstr "" -#: ../../mod/settings.php:446 ../../mod/settings.php:472 -#: ../../mod/settings.php:505 -msgid "Add application" +#: ../../mod/install.php:365 +msgid "" +"If running under Windows, please see \"http://www.php.net/manual/en/openssl." +"installation.php\"." msgstr "" -#: ../../mod/settings.php:448 ../../mod/settings.php:474 -#: ../../mod/dfrn_request.php:685 ../../mod/tagrm.php:11 -#: ../../mod/tagrm.php:94 ../../addon/js_upload/js_upload.php:45 -msgid "Cancel" +#: ../../mod/install.php:367 +msgid "Generate encryption keys" msgstr "" -#: ../../mod/settings.php:449 ../../mod/settings.php:475 -#: ../../mod/crepair.php:144 ../../mod/admin.php:464 ../../mod/admin.php:473 -msgid "Name" +#: ../../mod/install.php:374 +msgid "libCurl PHP module" msgstr "" -#: ../../mod/settings.php:450 ../../mod/settings.php:476 -#: ../../addon/statusnet/statusnet.php:480 -msgid "Consumer Key" +#: ../../mod/install.php:375 +msgid "GD graphics PHP module" msgstr "" -#: ../../mod/settings.php:451 ../../mod/settings.php:477 -#: ../../addon/statusnet/statusnet.php:479 -msgid "Consumer Secret" +#: ../../mod/install.php:376 +msgid "OpenSSL PHP module" msgstr "" -#: ../../mod/settings.php:452 ../../mod/settings.php:478 -msgid "Redirect" +#: ../../mod/install.php:377 +msgid "mysqli PHP module" msgstr "" -#: ../../mod/settings.php:453 ../../mod/settings.php:479 -msgid "Icon url" +#: ../../mod/install.php:378 +msgid "mb_string PHP module" msgstr "" -#: ../../mod/settings.php:464 -msgid "You can't edit this application." +#: ../../mod/install.php:383 ../../mod/install.php:385 +msgid "Apace mod_rewrite module" msgstr "" -#: ../../mod/settings.php:504 -msgid "Connected Apps" +#: ../../mod/install.php:383 +msgid "" +"Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: ../../mod/settings.php:506 ../../mod/editpost.php:90 -#: ../../include/conversation.php:496 -msgid "Edit" +#: ../../mod/install.php:390 +msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: ../../mod/settings.php:507 ../../mod/admin.php:468 -#: ../../mod/photos.php:1303 ../../mod/group.php:154 -#: ../../include/conversation.php:253 ../../include/conversation.php:509 -msgid "Delete" +#: ../../mod/install.php:394 +msgid "" +"Error: GD graphics PHP module with JPEG support required but not installed." msgstr "" -#: ../../mod/settings.php:508 -msgid "Client key starts with" +#: ../../mod/install.php:398 +msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../mod/settings.php:509 -msgid "No name" +#: ../../mod/install.php:402 +msgid "Error: mysqli PHP module required but not installed." msgstr "" -#: ../../mod/settings.php:510 -msgid "Remove authorization" +#: ../../mod/install.php:406 +msgid "Error: mb_string PHP module required but not installed." msgstr "" -#: ../../mod/settings.php:522 -msgid "No Plugin settings configured" +#: ../../mod/install.php:423 +msgid "" +"The web installer needs to be able to create a file called \".htconfig.php\" " +"in the top folder of your web server and it is unable to do so." msgstr "" -#: ../../mod/settings.php:529 ../../addon/widgets/widgets.php:122 -msgid "Plugin Settings" +#: ../../mod/install.php:424 +msgid "" +"This is most often a permission setting, as the web server may not be able " +"to write files in your folder - even if you can." msgstr "" -#: ../../mod/settings.php:542 ../../mod/settings.php:543 -#, php-format -msgid "Built-in support for %s connectivity is %s" +#: ../../mod/install.php:425 +msgid "" +"Please check with your site documentation or support people to see if this " +"situation can be corrected." msgstr "" -#: ../../mod/settings.php:542 ../../mod/dfrn_request.php:681 -#: ../../include/contact_selectors.php:80 -msgid "Diaspora" +#: ../../mod/install.php:426 +msgid "" +"If not, you may be required to perform a manual installation. Please see the " +"file \"INSTALL.txt\" for instructions." msgstr "" -#: ../../mod/settings.php:542 ../../mod/settings.php:543 -msgid "enabled" +#: ../../mod/install.php:429 +msgid ".htconfig.php is writable" msgstr "" -#: ../../mod/settings.php:542 ../../mod/settings.php:543 -msgid "disabled" +#: ../../mod/install.php:436 +msgid "" +"The database configuration file \".htconfig.php\" could not be written. " +"Please use the enclosed text to create a configuration file in your web " +"server root." msgstr "" -#: ../../mod/settings.php:543 -msgid "StatusNet" +#: ../../mod/install.php:461 +msgid "Errors encountered creating database tables." msgstr "" -#: ../../mod/settings.php:569 -msgid "Connector Settings" +#: ../../mod/localtime.php:12 ../../include/event.php:11 +#: ../../include/bb2diaspora.php:249 +msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../mod/settings.php:575 -msgid "Email/Mailbox Setup" +#: ../../mod/localtime.php:24 +msgid "Time Conversion" msgstr "" -#: ../../mod/settings.php:576 +#: ../../mod/localtime.php:26 msgid "" -"If you wish to communicate with email contacts using this service " -"(optional), please specify how to connect to your mailbox." +"Friendika provides this service for sharing events with other networks and " +"friends in unknown timezones." msgstr "" -#: ../../mod/settings.php:577 -msgid "Last successful email check:" +#: ../../mod/localtime.php:30 +#, php-format +msgid "UTC time: %s" msgstr "" -#: ../../mod/settings.php:578 -msgid "Email access is disabled on this site." +#: ../../mod/localtime.php:33 +#, php-format +msgid "Current timezone: %s" msgstr "" -#: ../../mod/settings.php:579 -msgid "IMAP server name:" +#: ../../mod/localtime.php:36 +#, php-format +msgid "Converted localtime: %s" msgstr "" -#: ../../mod/settings.php:580 -msgid "IMAP port:" +#: ../../mod/localtime.php:41 +msgid "Please select your timezone:" msgstr "" -#: ../../mod/settings.php:581 -msgid "Security:" +#: ../../mod/match.php:12 +msgid "Profile Match" msgstr "" -#: ../../mod/settings.php:581 -msgid "None" +#: ../../mod/match.php:20 +msgid "No keywords to match. Please add keywords to your default profile." msgstr "" -#: ../../mod/settings.php:582 -msgid "Email login name:" +#: ../../mod/match.php:57 +msgid "is interested in:" msgstr "" -#: ../../mod/settings.php:583 -msgid "Email password:" +#: ../../mod/match.php:58 ../../mod/suggest.php:59 +#: ../../include/contact_widgets.php:9 ../../boot.php:926 +msgid "Connect" msgstr "" -#: ../../mod/settings.php:584 -msgid "Reply-to address:" +#: ../../mod/match.php:65 ../../mod/dirfind.php:57 +msgid "No matches" msgstr "" -#: ../../mod/settings.php:585 -msgid "Send public posts to all email contacts:" +#: ../../mod/lockview.php:39 +msgid "Remote privacy information not available." msgstr "" -#: ../../mod/settings.php:642 ../../mod/admin.php:126 ../../mod/admin.php:443 -msgid "Normal Account" +#: ../../mod/lockview.php:43 +msgid "Visible to:" msgstr "" -#: ../../mod/settings.php:643 -msgid "This account is a normal personal profile" +#: ../../mod/home.php:26 ../../addon/communityhome/communityhome.php:179 +#, php-format +msgid "Welcome to %s" msgstr "" -#: ../../mod/settings.php:646 ../../mod/admin.php:127 ../../mod/admin.php:444 -msgid "Soapbox Account" +#: ../../mod/notifications.php:26 +msgid "Invalid request identifier." msgstr "" -#: ../../mod/settings.php:647 -msgid "Automatically approve all connection/friend requests as read-only fans" +#: ../../mod/notifications.php:35 ../../mod/notifications.php:152 +#: ../../mod/notifications.php:198 +msgid "Discard" msgstr "" -#: ../../mod/settings.php:650 ../../mod/admin.php:128 ../../mod/admin.php:445 -msgid "Community/Celebrity Account" +#: ../../mod/notifications.php:47 ../../mod/notifications.php:151 +#: ../../mod/notifications.php:197 ../../mod/contacts.php:302 +#: ../../mod/contacts.php:345 +msgid "Ignore" msgstr "" -#: ../../mod/settings.php:651 -msgid "Automatically approve all connection/friend requests as read-write fans" +#: ../../mod/notifications.php:71 ../../include/nav.php:109 +msgid "Network" msgstr "" -#: ../../mod/settings.php:654 ../../mod/admin.php:129 ../../mod/admin.php:446 -msgid "Automatic Friend Account" +#: ../../mod/notifications.php:76 ../../mod/network.php:177 +msgid "Personal" msgstr "" -#: ../../mod/settings.php:655 -msgid "Automatically approve all connection/friend requests as friends" +#: ../../mod/notifications.php:81 ../../include/nav.php:73 +#: ../../include/nav.php:111 +msgid "Home" msgstr "" -#: ../../mod/settings.php:665 -msgid "OpenID:" +#: ../../mod/notifications.php:86 ../../include/nav.php:117 +msgid "Introductions" msgstr "" -#: ../../mod/settings.php:665 -msgid "(Optional) Allow this OpenID to login to this account." +#: ../../mod/notifications.php:91 ../../mod/message.php:76 +#: ../../include/nav.php:123 +msgid "Messages" msgstr "" -#: ../../mod/settings.php:675 -msgid "Publish your default profile in your local site directory?" +#: ../../mod/notifications.php:110 +msgid "Show Ignored Requests" msgstr "" -#: ../../mod/settings.php:675 ../../mod/settings.php:681 -#: ../../mod/settings.php:689 ../../mod/settings.php:693 -#: ../../mod/settings.php:698 ../../mod/settings.php:704 -#: ../../mod/settings.php:710 ../../mod/settings.php:757 -#: ../../mod/settings.php:758 ../../mod/settings.php:759 -#: ../../mod/settings.php:760 ../../mod/dfrn_request.php:676 -#: ../../mod/profiles.php:358 ../../mod/register.php:525 ../../mod/api.php:106 -msgid "No" +#: ../../mod/notifications.php:110 +msgid "Hide Ignored Requests" msgstr "" -#: ../../mod/settings.php:675 ../../mod/settings.php:681 -#: ../../mod/settings.php:689 ../../mod/settings.php:693 -#: ../../mod/settings.php:698 ../../mod/settings.php:704 -#: ../../mod/settings.php:710 ../../mod/settings.php:757 -#: ../../mod/settings.php:758 ../../mod/settings.php:759 -#: ../../mod/settings.php:760 ../../mod/dfrn_request.php:675 -#: ../../mod/profiles.php:357 ../../mod/register.php:524 ../../mod/api.php:105 -msgid "Yes" +#: ../../mod/notifications.php:136 ../../mod/notifications.php:182 +msgid "Notification type: " msgstr "" -#: ../../mod/settings.php:681 -msgid "Publish your default profile in the global social directory?" +#: ../../mod/notifications.php:137 +msgid "Friend Suggestion" msgstr "" -#: ../../mod/settings.php:689 -msgid "Hide your contact/friend list from viewers of your default profile?" +#: ../../mod/notifications.php:139 +#, php-format +msgid "suggested by %s" msgstr "" -#: ../../mod/settings.php:693 -msgid "Hide your profile details from unknown viewers?" +#: ../../mod/notifications.php:144 ../../mod/notifications.php:191 +#: ../../mod/contacts.php:350 +msgid "Hide this contact from others" msgstr "" -#: ../../mod/settings.php:698 -msgid "Allow friends to post to your profile page?" +#: ../../mod/notifications.php:145 ../../mod/notifications.php:192 +msgid "Post a new friend activity" msgstr "" -#: ../../mod/settings.php:704 -msgid "Allow friends to tag your posts?" +#: ../../mod/notifications.php:145 ../../mod/notifications.php:192 +msgid "if applicable" msgstr "" -#: ../../mod/settings.php:710 -msgid "Allow us to suggest you as a potential friend to new members?" +#: ../../mod/notifications.php:148 ../../mod/notifications.php:195 +#: ../../mod/admin.php:466 +msgid "Approve" msgstr "" -#: ../../mod/settings.php:719 -msgid "Profile is not published." +#: ../../mod/notifications.php:168 +msgid "Claims to be known to you: " msgstr "" -#: ../../mod/settings.php:738 ../../mod/profile_photo.php:206 -msgid "or" +#: ../../mod/notifications.php:168 +msgid "yes" msgstr "" -#: ../../mod/settings.php:743 -msgid "Your Identity Address is" +#: ../../mod/notifications.php:168 +msgid "no" msgstr "" -#: ../../mod/settings.php:754 -msgid "Automatically expire posts after days:" +#: ../../mod/notifications.php:175 +msgid "Approve as: " msgstr "" -#: ../../mod/settings.php:754 -msgid "If empty, posts will not expire. Expired posts will be deleted" +#: ../../mod/notifications.php:176 +msgid "Friend" msgstr "" -#: ../../mod/settings.php:755 -msgid "Advanced expiration settings" +#: ../../mod/notifications.php:177 +msgid "Sharer" msgstr "" -#: ../../mod/settings.php:756 -msgid "Advanced Expiration" +#: ../../mod/notifications.php:177 +msgid "Fan/Admirer" msgstr "" -#: ../../mod/settings.php:757 -msgid "Expire posts:" +#: ../../mod/notifications.php:183 +msgid "Friend/Connect Request" msgstr "" -#: ../../mod/settings.php:758 -msgid "Expire personal notes:" +#: ../../mod/notifications.php:183 +msgid "New Follower" msgstr "" -#: ../../mod/settings.php:759 -msgid "Expire starred posts:" +#: ../../mod/notifications.php:204 +msgid "No introductions." msgstr "" -#: ../../mod/settings.php:760 -msgid "Expire photos:" +#: ../../mod/notifications.php:207 ../../mod/notifications.php:293 +#: ../../mod/notifications.php:388 ../../mod/notifications.php:469 +#: ../../include/nav.php:118 +msgid "Notifications" msgstr "" -#: ../../mod/settings.php:765 -msgid "Account Settings" +#: ../../mod/notifications.php:244 ../../mod/notifications.php:339 +#: ../../mod/notifications.php:426 +#, php-format +msgid "%s liked %s's post" msgstr "" -#: ../../mod/settings.php:773 -msgid "Password Settings" +#: ../../mod/notifications.php:253 ../../mod/notifications.php:348 +#: ../../mod/notifications.php:435 +#, php-format +msgid "%s disliked %s's post" msgstr "" -#: ../../mod/settings.php:774 -msgid "New Password:" +#: ../../mod/notifications.php:267 ../../mod/notifications.php:362 +#: ../../mod/notifications.php:449 +#, php-format +msgid "%s is now friends with %s" msgstr "" -#: ../../mod/settings.php:775 -msgid "Confirm:" +#: ../../mod/notifications.php:274 ../../mod/notifications.php:369 +#, php-format +msgid "%s created a new post" msgstr "" -#: ../../mod/settings.php:775 -msgid "Leave password fields blank unless changing" +#: ../../mod/notifications.php:275 ../../mod/notifications.php:370 +#: ../../mod/notifications.php:458 +#, php-format +msgid "%s commented on %s's post" msgstr "" -#: ../../mod/settings.php:779 -msgid "Basic Settings" +#: ../../mod/notifications.php:289 +msgid "No more network notifications." msgstr "" -#: ../../mod/settings.php:780 ../../include/profile_advanced.php:15 -msgid "Full Name:" +#: ../../mod/notifications.php:384 +msgid "No more personal notifications." msgstr "" -#: ../../mod/settings.php:781 -msgid "Email Address:" +#: ../../mod/notifications.php:465 +msgid "No more home notifications." msgstr "" -#: ../../mod/settings.php:782 -msgid "Your Timezone:" +#: ../../mod/contacts.php:63 ../../mod/contacts.php:143 +msgid "Could not access contact record." msgstr "" -#: ../../mod/settings.php:783 -msgid "Default Post Location:" +#: ../../mod/contacts.php:77 +msgid "Could not locate selected profile." msgstr "" -#: ../../mod/settings.php:784 -msgid "Use Browser Location:" +#: ../../mod/contacts.php:100 +msgid "Contact updated." msgstr "" -#: ../../mod/settings.php:785 -msgid "Display Theme:" +#: ../../mod/contacts.php:165 +msgid "Contact has been blocked" msgstr "" -#: ../../mod/settings.php:786 -msgid "Update browser every xx seconds" +#: ../../mod/contacts.php:165 +msgid "Contact has been unblocked" msgstr "" -#: ../../mod/settings.php:786 -msgid "Minimum of 10 seconds, no maximum" +#: ../../mod/contacts.php:179 +msgid "Contact has been ignored" msgstr "" -#: ../../mod/settings.php:788 -msgid "Security and Privacy Settings" +#: ../../mod/contacts.php:179 +msgid "Contact has been unignored" msgstr "" -#: ../../mod/settings.php:790 -msgid "Maximum Friend Requests/Day:" +#: ../../mod/contacts.php:200 +msgid "stopped following" msgstr "" -#: ../../mod/settings.php:790 -msgid "(to prevent spam abuse)" +#: ../../mod/contacts.php:221 +msgid "Contact has been removed." msgstr "" -#: ../../mod/settings.php:791 -msgid "Default Post Permissions" +#: ../../mod/contacts.php:245 +#, php-format +msgid "You are mutual friends with %s" msgstr "" -#: ../../mod/settings.php:792 -msgid "(click to open/close)" +#: ../../mod/contacts.php:249 +#, php-format +msgid "You are sharing with %s" msgstr "" -#: ../../mod/settings.php:807 -msgid "Notification Settings" +#: ../../mod/contacts.php:254 +#, php-format +msgid "%s is sharing with you" msgstr "" -#: ../../mod/settings.php:808 -msgid "Send a notification email when:" +#: ../../mod/contacts.php:271 +msgid "Private communications are not available for this contact." msgstr "" -#: ../../mod/settings.php:809 -msgid "You receive an introduction" +#: ../../mod/contacts.php:274 +msgid "Never" msgstr "" -#: ../../mod/settings.php:810 -msgid "Your introductions are confirmed" +#: ../../mod/contacts.php:278 +msgid "(Update was successful)" msgstr "" -#: ../../mod/settings.php:811 -msgid "Someone writes on your profile wall" +#: ../../mod/contacts.php:278 +msgid "(Update was not successful)" msgstr "" -#: ../../mod/settings.php:812 -msgid "Someone writes a followup comment" +#: ../../mod/contacts.php:280 +msgid "Suggest friends" msgstr "" -#: ../../mod/settings.php:813 -msgid "You receive a private message" +#: ../../mod/contacts.php:284 +#, php-format +msgid "Network type: %s" msgstr "" -#: ../../mod/settings.php:814 -msgid "You receive a friend suggestion" +#: ../../mod/contacts.php:287 +#, php-format +msgid "%d contact in common" +msgid_plural "%d contacts in common" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/contacts.php:292 +msgid "View all contacts" msgstr "" -#: ../../mod/settings.php:817 -msgid "Advanced Page Settings" +#: ../../mod/contacts.php:297 ../../mod/contacts.php:344 +#: ../../mod/admin.php:470 +msgid "Unblock" msgstr "" -#: ../../mod/crepair.php:100 -msgid "Contact settings applied." +#: ../../mod/contacts.php:297 ../../mod/contacts.php:344 +#: ../../mod/admin.php:469 +msgid "Block" msgstr "" -#: ../../mod/crepair.php:102 -msgid "Contact update failed." +#: ../../mod/contacts.php:302 ../../mod/contacts.php:345 +msgid "Unignore" msgstr "" -#: ../../mod/crepair.php:127 ../../mod/fsuggest.php:20 -#: ../../mod/fsuggest.php:92 ../../mod/dfrn_confirm.php:116 -msgid "Contact not found." +#: ../../mod/contacts.php:307 +msgid "Repair" msgstr "" -#: ../../mod/crepair.php:133 -msgid "Repair Contact Settings" +#: ../../mod/contacts.php:317 +msgid "Contact Editor" msgstr "" -#: ../../mod/crepair.php:135 -msgid "" -"WARNING: This is highly advanced and if you enter incorrect " -"information your communications with this contact may stop working." +#: ../../mod/contacts.php:320 +msgid "Profile Visibility" msgstr "" -#: ../../mod/crepair.php:136 +#: ../../mod/contacts.php:321 +#, php-format msgid "" -"Please use your browser 'Back' button now if you are " -"uncertain what to do on this page." +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." msgstr "" -#: ../../mod/crepair.php:145 -msgid "Account Nickname" +#: ../../mod/contacts.php:322 +msgid "Contact Information / Notes" msgstr "" -#: ../../mod/crepair.php:146 -msgid "@Tagname - overrides Name/Nickname" +#: ../../mod/contacts.php:323 +msgid "Edit contact notes" msgstr "" -#: ../../mod/crepair.php:147 -msgid "Account URL" +#: ../../mod/contacts.php:328 ../../mod/contacts.php:458 +#: ../../mod/viewcontacts.php:61 +#, php-format +msgid "Visit %s's profile [%s]" msgstr "" -#: ../../mod/crepair.php:148 -msgid "Friend Request URL" +#: ../../mod/contacts.php:329 +msgid "Block/Unblock contact" msgstr "" -#: ../../mod/crepair.php:149 -msgid "Friend Confirm URL" +#: ../../mod/contacts.php:330 +msgid "Ignore contact" msgstr "" -#: ../../mod/crepair.php:150 -msgid "Notification Endpoint URL" +#: ../../mod/contacts.php:331 +msgid "Repair URL settings" msgstr "" -#: ../../mod/crepair.php:151 -msgid "Poll/Feed URL" +#: ../../mod/contacts.php:332 +msgid "View conversations" msgstr "" -#: ../../mod/crepair.php:152 -msgid "New photo from this URL" +#: ../../mod/contacts.php:334 +msgid "Delete contact" msgstr "" -#: ../../mod/dfrn_request.php:92 -msgid "This introduction has already been accepted." +#: ../../mod/contacts.php:338 +msgid "Last update:" msgstr "" -#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:381 -msgid "Profile location is not valid or does not contain profile information." +#: ../../mod/contacts.php:339 +msgid "Update public posts" msgstr "" -#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:386 -msgid "Warning: profile location has no identifiable owner name." +#: ../../mod/contacts.php:341 ../../mod/admin.php:701 +msgid "Update now" msgstr "" -#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:388 -msgid "Warning: profile location has no profile photo." +#: ../../mod/contacts.php:348 +msgid "Currently blocked" msgstr "" -#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:391 -#, php-format -msgid "%d required parameter was not found at the given location" -msgid_plural "%d required parameters were not found at the given location" -msgstr[0] "" -msgstr[1] "" +#: ../../mod/contacts.php:349 +msgid "Currently ignored" +msgstr "" -#: ../../mod/dfrn_request.php:167 -msgid "Introduction complete." +#: ../../mod/contacts.php:350 +msgid "" +"Replies/likes to your public posts may still be visible" msgstr "" -#: ../../mod/dfrn_request.php:191 -msgid "Unrecoverable protocol error." +#: ../../mod/contacts.php:387 ../../include/nav.php:131 +msgid "Contacts" msgstr "" -#: ../../mod/dfrn_request.php:219 -msgid "Profile unavailable." +#: ../../mod/contacts.php:389 +msgid "Show Unblocked Contacts" msgstr "" -#: ../../mod/dfrn_request.php:244 -#, php-format -msgid "%s has received too many connection requests today." +#: ../../mod/contacts.php:389 +msgid "Show Blocked Contacts" msgstr "" -#: ../../mod/dfrn_request.php:245 -msgid "Spam protection measures have been invoked." +#: ../../mod/contacts.php:391 +msgid "Show All Contacts" msgstr "" -#: ../../mod/dfrn_request.php:246 -msgid "Friends are advised to please try again in 24 hours." +#: ../../mod/contacts.php:393 +msgid "Search your contacts" msgstr "" -#: ../../mod/dfrn_request.php:306 -msgid "Invalid locator" +#: ../../mod/contacts.php:394 ../../mod/directory.php:65 +msgid "Finding: " msgstr "" -#: ../../mod/dfrn_request.php:326 -msgid "Unable to resolve your name at the provided location." +#: ../../mod/contacts.php:395 ../../mod/directory.php:67 +#: ../../include/contact_widgets.php:34 +msgid "Find" msgstr "" -#: ../../mod/dfrn_request.php:339 -msgid "You have already introduced yourself here." +#: ../../mod/contacts.php:434 +msgid "Mutual Friendship" msgstr "" -#: ../../mod/dfrn_request.php:343 -#, php-format -msgid "Apparently you are already friends with %s." +#: ../../mod/contacts.php:438 +msgid "is a fan of yours" msgstr "" -#: ../../mod/dfrn_request.php:364 -msgid "Invalid profile URL." +#: ../../mod/contacts.php:442 +msgid "you are a fan of" msgstr "" -#: ../../mod/dfrn_request.php:460 -msgid "Your introduction has been sent." +#: ../../mod/contacts.php:459 ../../include/Contact.php:135 +#: ../../include/conversation.php:748 +msgid "Edit contact" msgstr "" -#: ../../mod/dfrn_request.php:513 -msgid "Please login to confirm introduction." +#: ../../mod/lostpass.php:16 +msgid "No valid account found." msgstr "" -#: ../../mod/dfrn_request.php:527 -msgid "" -"Incorrect identity currently logged in. Please login to this profile." +#: ../../mod/lostpass.php:31 +msgid "Password reset request issued. Check your email." msgstr "" -#: ../../mod/dfrn_request.php:539 +#: ../../mod/lostpass.php:42 #, php-format -msgid "Welcome home %s." +msgid "Password reset requested at %s" msgstr "" -#: ../../mod/dfrn_request.php:540 -#, php-format -msgid "Please confirm your introduction/connection request to %s." +#: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106 +#: ../../mod/register.php:380 ../../mod/register.php:434 +#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:716 +#: ../../include/items.php:2452 +msgid "Administrator" msgstr "" -#: ../../mod/dfrn_request.php:541 -msgid "Confirm" +#: ../../mod/lostpass.php:64 +msgid "" +"Request could not be verified. (You may have previously submitted it.) " +"Password reset failed." msgstr "" -#: ../../mod/dfrn_request.php:581 ../../include/items.php:2406 -msgid "[Name Withheld]" +#: ../../mod/lostpass.php:82 ../../boot.php:719 +msgid "Password Reset" msgstr "" -#: ../../mod/dfrn_request.php:665 -#, php-format -msgid "" -"Diaspora members: Please do not use this form. Instead, enter \"%s\" into " -"your Diaspora search bar." +#: ../../mod/lostpass.php:83 +msgid "Your password has been reset as requested." msgstr "" -#: ../../mod/dfrn_request.php:668 -msgid "" -"Please enter your 'Identity Address' from one of the following supported " -"social networks:" +#: ../../mod/lostpass.php:84 +msgid "Your new password is" msgstr "" -#: ../../mod/dfrn_request.php:671 -msgid "Friend/Connection Request" +#: ../../mod/lostpass.php:85 +msgid "Save or copy your new password - and then" msgstr "" -#: ../../mod/dfrn_request.php:672 -msgid "" -"Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " -"testuser@identi.ca" +#: ../../mod/lostpass.php:86 +msgid "click here to login" msgstr "" -#: ../../mod/dfrn_request.php:673 -msgid "Please answer the following:" +#: ../../mod/lostpass.php:87 +msgid "" +"Your password may be changed from the Settings page after " +"successful login." msgstr "" -#: ../../mod/dfrn_request.php:674 -#, php-format -msgid "Does %s know you?" +#: ../../mod/lostpass.php:118 +msgid "Forgot your Password?" msgstr "" -#: ../../mod/dfrn_request.php:677 -msgid "Add a personal note:" +#: ../../mod/lostpass.php:119 +msgid "" +"Enter your email address and submit to have your password reset. Then check " +"your email for further instructions." msgstr "" -#: ../../mod/dfrn_request.php:679 ../../include/contact_selectors.php:76 -msgid "Friendica" +#: ../../mod/lostpass.php:120 +msgid "Nickname or Email: " msgstr "" -#: ../../mod/dfrn_request.php:680 -msgid "StatusNet/Federated Social Web" +#: ../../mod/lostpass.php:121 +msgid "Reset" msgstr "" -#: ../../mod/dfrn_request.php:682 -msgid "- please share from your own site as noted above" +#: ../../mod/settings.php:70 +msgid "Missing some important data!" msgstr "" -#: ../../mod/dfrn_request.php:683 -msgid "Your Identity Address:" +#: ../../mod/settings.php:73 ../../mod/settings.php:479 ../../mod/admin.php:62 +msgid "Update" msgstr "" -#: ../../mod/dfrn_request.php:684 -msgid "Submit Request" +#: ../../mod/settings.php:168 +msgid "Failed to connect with email account using the settings provided." msgstr "" -#: ../../mod/notifications.php:26 -msgid "Invalid request identifier." +#: ../../mod/settings.php:173 +msgid "Email settings updated." msgstr "" -#: ../../mod/notifications.php:35 ../../mod/notifications.php:150 -#: ../../mod/notifications.php:195 -msgid "Discard" +#: ../../mod/settings.php:191 +msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../mod/notifications.php:71 ../../include/nav.php:109 -msgid "Network" +#: ../../mod/settings.php:196 +msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../mod/notifications.php:76 ../../mod/network.php:169 -msgid "Personal" +#: ../../mod/settings.php:207 +msgid "Password changed." msgstr "" -#: ../../mod/notifications.php:81 ../../include/nav.php:73 -#: ../../include/nav.php:111 -msgid "Home" +#: ../../mod/settings.php:209 +msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/notifications.php:86 ../../include/nav.php:117 -msgid "Introductions" +#: ../../mod/settings.php:273 +msgid " Please use a shorter name." msgstr "" -#: ../../mod/notifications.php:91 ../../mod/message.php:76 -#: ../../include/nav.php:122 -msgid "Messages" +#: ../../mod/settings.php:275 +msgid " Name too short." msgstr "" -#: ../../mod/notifications.php:110 -msgid "Show Ignored Requests" +#: ../../mod/settings.php:281 +msgid " Not valid email." msgstr "" -#: ../../mod/notifications.php:110 -msgid "Hide Ignored Requests" +#: ../../mod/settings.php:283 +msgid " Cannot change to that email." msgstr "" -#: ../../mod/notifications.php:136 ../../mod/notifications.php:180 -msgid "Notification type: " +#: ../../mod/settings.php:351 ../../addon/facebook/facebook.php:320 +#: ../../addon/impressum/impressum.php:64 ../../addon/piwik/piwik.php:94 +#: ../../addon/twitter/twitter.php:310 +msgid "Settings updated." msgstr "" -#: ../../mod/notifications.php:137 -msgid "Friend Suggestion" +#: ../../mod/settings.php:415 ../../include/nav.php:129 +msgid "Account settings" msgstr "" -#: ../../mod/notifications.php:139 -#, php-format -msgid "suggested by %s" +#: ../../mod/settings.php:420 +msgid "Connector settings" msgstr "" -#: ../../mod/notifications.php:146 ../../mod/notifications.php:192 -#: ../../mod/admin.php:466 -msgid "Approve" +#: ../../mod/settings.php:425 +msgid "Plugin settings" msgstr "" -#: ../../mod/notifications.php:166 -msgid "Claims to be known to you: " +#: ../../mod/settings.php:430 +msgid "Connections" msgstr "" -#: ../../mod/notifications.php:166 -msgid "yes" +#: ../../mod/settings.php:435 +msgid "Export personal data" msgstr "" -#: ../../mod/notifications.php:166 -msgid "no" +#: ../../mod/settings.php:452 ../../mod/settings.php:478 +#: ../../mod/settings.php:511 +msgid "Add application" msgstr "" -#: ../../mod/notifications.php:173 -msgid "Approve as: " +#: ../../mod/settings.php:456 ../../mod/settings.php:482 +#: ../../addon/statusnet/statusnet.php:489 +msgid "Consumer Key" msgstr "" -#: ../../mod/notifications.php:174 -msgid "Friend" +#: ../../mod/settings.php:457 ../../mod/settings.php:483 +#: ../../addon/statusnet/statusnet.php:488 +msgid "Consumer Secret" msgstr "" -#: ../../mod/notifications.php:175 -msgid "Sharer" +#: ../../mod/settings.php:458 ../../mod/settings.php:484 +msgid "Redirect" msgstr "" -#: ../../mod/notifications.php:175 -msgid "Fan/Admirer" +#: ../../mod/settings.php:459 ../../mod/settings.php:485 +msgid "Icon url" msgstr "" -#: ../../mod/notifications.php:181 -msgid "Friend/Connect Request" +#: ../../mod/settings.php:470 +msgid "You can't edit this application." msgstr "" -#: ../../mod/notifications.php:181 -msgid "New Follower" +#: ../../mod/settings.php:510 +msgid "Connected Apps" msgstr "" -#: ../../mod/notifications.php:201 -msgid "No introductions." +#: ../../mod/settings.php:514 +msgid "Client key starts with" msgstr "" -#: ../../mod/notifications.php:204 ../../mod/notifications.php:290 -#: ../../mod/notifications.php:385 ../../mod/notifications.php:466 -#: ../../include/nav.php:118 -msgid "Notifications" +#: ../../mod/settings.php:515 +msgid "No name" msgstr "" -#: ../../mod/notifications.php:241 ../../mod/notifications.php:336 -#: ../../mod/notifications.php:423 -#, php-format -msgid "%s liked %s's post" +#: ../../mod/settings.php:516 +msgid "Remove authorization" msgstr "" -#: ../../mod/notifications.php:250 ../../mod/notifications.php:345 -#: ../../mod/notifications.php:432 -#, php-format -msgid "%s disliked %s's post" +#: ../../mod/settings.php:528 +msgid "No Plugin settings configured" msgstr "" -#: ../../mod/notifications.php:264 ../../mod/notifications.php:359 -#: ../../mod/notifications.php:446 -#, php-format -msgid "%s is now friends with %s" +#: ../../mod/settings.php:535 ../../addon/widgets/widgets.php:122 +msgid "Plugin Settings" msgstr "" -#: ../../mod/notifications.php:271 ../../mod/notifications.php:366 +#: ../../mod/settings.php:548 ../../mod/settings.php:549 #, php-format -msgid "%s created a new post" +msgid "Built-in support for %s connectivity is %s" msgstr "" -#: ../../mod/notifications.php:272 ../../mod/notifications.php:367 -#: ../../mod/notifications.php:455 -#, php-format -msgid "%s commented on %s's post" +#: ../../mod/settings.php:548 ../../mod/settings.php:549 +msgid "enabled" msgstr "" -#: ../../mod/notifications.php:286 -msgid "No more network notifications." +#: ../../mod/settings.php:548 ../../mod/settings.php:549 +msgid "disabled" msgstr "" -#: ../../mod/notifications.php:381 -msgid "No more personal notifications." +#: ../../mod/settings.php:549 +msgid "StatusNet" msgstr "" -#: ../../mod/notifications.php:462 -msgid "No more home notifications." +#: ../../mod/settings.php:575 +msgid "Connector Settings" msgstr "" -#: ../../mod/message.php:23 -msgid "No recipient selected." +#: ../../mod/settings.php:581 +msgid "Email/Mailbox Setup" msgstr "" -#: ../../mod/message.php:26 -msgid "Unable to locate contact information." +#: ../../mod/settings.php:582 +msgid "" +"If you wish to communicate with email contacts using this service " +"(optional), please specify how to connect to your mailbox." msgstr "" -#: ../../mod/message.php:29 -msgid "Message could not be sent." +#: ../../mod/settings.php:583 +msgid "Last successful email check:" msgstr "" -#: ../../mod/message.php:32 -msgid "Message collection failure." +#: ../../mod/settings.php:584 +msgid "Email access is disabled on this site." msgstr "" -#: ../../mod/message.php:35 -msgid "Message sent." +#: ../../mod/settings.php:585 +msgid "IMAP server name:" msgstr "" -#: ../../mod/message.php:55 -msgid "Inbox" +#: ../../mod/settings.php:586 +msgid "IMAP port:" msgstr "" -#: ../../mod/message.php:60 -msgid "Outbox" +#: ../../mod/settings.php:587 +msgid "Security:" msgstr "" -#: ../../mod/message.php:65 -msgid "New Message" +#: ../../mod/settings.php:587 +msgid "None" msgstr "" -#: ../../mod/message.php:91 -msgid "Message deleted." +#: ../../mod/settings.php:588 +msgid "Email login name:" msgstr "" -#: ../../mod/message.php:121 -msgid "Conversation removed." +#: ../../mod/settings.php:589 +msgid "Email password:" msgstr "" -#: ../../mod/message.php:137 ../../include/conversation.php:815 -msgid "Please enter a link URL:" +#: ../../mod/settings.php:590 +msgid "Reply-to address:" msgstr "" -#: ../../mod/message.php:145 -msgid "Send Private Message" +#: ../../mod/settings.php:591 +msgid "Send public posts to all email contacts:" msgstr "" -#: ../../mod/message.php:146 ../../mod/message.php:287 -msgid "To:" +#: ../../mod/settings.php:648 ../../mod/admin.php:126 ../../mod/admin.php:443 +msgid "Normal Account" msgstr "" -#: ../../mod/message.php:147 ../../mod/message.php:288 -msgid "Subject:" +#: ../../mod/settings.php:649 +msgid "This account is a normal personal profile" msgstr "" -#: ../../mod/message.php:150 ../../mod/message.php:291 -#: ../../mod/invite.php:101 -msgid "Your message:" +#: ../../mod/settings.php:652 ../../mod/admin.php:127 ../../mod/admin.php:444 +msgid "Soapbox Account" msgstr "" -#: ../../mod/message.php:153 ../../mod/message.php:294 -#: ../../mod/editpost.php:91 ../../include/conversation.php:863 -msgid "Upload photo" +#: ../../mod/settings.php:653 +msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: ../../mod/message.php:154 ../../mod/message.php:295 -#: ../../mod/editpost.php:93 ../../include/conversation.php:867 -msgid "Insert web link" +#: ../../mod/settings.php:656 ../../mod/admin.php:128 ../../mod/admin.php:445 +msgid "Community/Celebrity Account" msgstr "" -#: ../../mod/message.php:155 ../../mod/message.php:296 -#: ../../mod/editpost.php:99 ../../mod/photos.php:1186 -#: ../../include/conversation.php:294 ../../include/conversation.php:631 -#: ../../include/conversation.php:879 -msgid "Please wait" +#: ../../mod/settings.php:657 +msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: ../../mod/message.php:188 -msgid "No messages." +#: ../../mod/settings.php:660 ../../mod/admin.php:129 ../../mod/admin.php:446 +msgid "Automatic Friend Account" msgstr "" -#: ../../mod/message.php:201 -msgid "Delete conversation" +#: ../../mod/settings.php:661 +msgid "Automatically approve all connection/friend requests as friends" msgstr "" -#: ../../mod/message.php:204 -msgid "D, d M Y - g:i A" +#: ../../mod/settings.php:671 +msgid "OpenID:" msgstr "" -#: ../../mod/message.php:239 -msgid "Message not available." +#: ../../mod/settings.php:671 +msgid "(Optional) Allow this OpenID to login to this account." msgstr "" -#: ../../mod/message.php:276 -msgid "Delete message" +#: ../../mod/settings.php:681 +msgid "Publish your default profile in your local site directory?" msgstr "" -#: ../../mod/message.php:286 -msgid "Send Reply" +#: ../../mod/settings.php:687 +msgid "Publish your default profile in the global social directory?" msgstr "" -#: ../../mod/wall_upload.php:56 ../../mod/profile_photo.php:113 -#, php-format -msgid "Image exceeds size limit of %d" +#: ../../mod/settings.php:695 +msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "" -#: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:122 -#: ../../mod/photos.php:649 -msgid "Unable to process image." +#: ../../mod/settings.php:699 +msgid "Hide your profile details from unknown viewers?" msgstr "" -#: ../../mod/wall_upload.php:81 ../../mod/wall_upload.php:90 -#: ../../mod/wall_upload.php:97 ../../mod/item.php:318 -#: ../../include/message.php:143 -msgid "Wall Photos" +#: ../../mod/settings.php:704 +msgid "Allow friends to post to your profile page?" msgstr "" -#: ../../mod/wall_upload.php:84 ../../mod/profile_photo.php:251 -#: ../../mod/photos.php:669 -msgid "Image upload failed." +#: ../../mod/settings.php:710 +msgid "Allow friends to tag your posts?" msgstr "" -#: ../../mod/wall_attach.php:57 -#, php-format -msgid "File exceeds size limit of %d" +#: ../../mod/settings.php:716 +msgid "Allow us to suggest you as a potential friend to new members?" msgstr "" -#: ../../mod/wall_attach.php:87 ../../mod/wall_attach.php:98 -msgid "File upload failed." +#: ../../mod/settings.php:725 +msgid "Profile is not published." msgstr "" -#: ../../mod/profile_photo.php:28 -msgid "Image uploaded but image cropping failed." +#: ../../mod/settings.php:744 ../../mod/profile_photo.php:206 +msgid "or" msgstr "" -#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65 -#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:170 -#: ../../mod/profile_photo.php:246 ../../mod/profile_photo.php:255 -#: ../../mod/register.php:327 ../../mod/register.php:334 -#: ../../mod/register.php:341 ../../mod/photos.php:146 -#: ../../mod/photos.php:593 ../../mod/photos.php:938 ../../mod/photos.php:953 -#: ../../addon/communityhome/communityhome.php:111 -msgid "Profile Photos" +#: ../../mod/settings.php:749 +msgid "Your Identity Address is" msgstr "" -#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68 -#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:258 -#, php-format -msgid "Image size reduction [%s] failed." +#: ../../mod/settings.php:760 +msgid "Automatically expire posts after this many days:" msgstr "" -#: ../../mod/profile_photo.php:89 -msgid "" -"Shift-reload the page or clear browser cache if the new photo does not " -"display immediately." +#: ../../mod/settings.php:760 +msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "" -#: ../../mod/profile_photo.php:99 -msgid "Unable to process image" +#: ../../mod/settings.php:761 +msgid "Advanced expiration settings" msgstr "" -#: ../../mod/profile_photo.php:203 -msgid "Upload File:" +#: ../../mod/settings.php:762 +msgid "Advanced Expiration" msgstr "" -#: ../../mod/profile_photo.php:204 -msgid "Upload Profile Photo" +#: ../../mod/settings.php:763 +msgid "Expire posts:" msgstr "" -#: ../../mod/profile_photo.php:205 -msgid "Upload" +#: ../../mod/settings.php:764 +msgid "Expire personal notes:" msgstr "" -#: ../../mod/profile_photo.php:206 -msgid "skip this step" +#: ../../mod/settings.php:765 +msgid "Expire starred posts:" msgstr "" -#: ../../mod/profile_photo.php:206 -msgid "select a photo from your photo albums" +#: ../../mod/settings.php:766 +msgid "Expire photos:" msgstr "" -#: ../../mod/profile_photo.php:219 -msgid "Crop Image" +#: ../../mod/settings.php:771 +msgid "Account Settings" msgstr "" -#: ../../mod/profile_photo.php:220 -msgid "Please adjust the image cropping for optimum viewing." +#: ../../mod/settings.php:779 +msgid "Password Settings" msgstr "" -#: ../../mod/profile_photo.php:221 -msgid "Done Editing" +#: ../../mod/settings.php:780 +msgid "New Password:" msgstr "" -#: ../../mod/profile_photo.php:249 -msgid "Image uploaded successfully." +#: ../../mod/settings.php:781 +msgid "Confirm:" msgstr "" -#: ../../mod/manage.php:37 -#, php-format -msgid "Welcome back %s" +#: ../../mod/settings.php:781 +msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/manage.php:87 -msgid "Manage Identities and/or Pages" +#: ../../mod/settings.php:785 +msgid "Basic Settings" msgstr "" -#: ../../mod/manage.php:90 -msgid "" -"(Toggle between different identities or community/group pages which share " -"your account details.)" +#: ../../mod/settings.php:786 ../../include/profile_advanced.php:15 +msgid "Full Name:" msgstr "" -#: ../../mod/manage.php:92 -msgid "Select an identity to manage: " +#: ../../mod/settings.php:787 +msgid "Email Address:" msgstr "" -#: ../../mod/tagger.php:70 ../../mod/like.php:127 ../../mod/photos.php:524 -#: ../../include/conversation.php:31 ../../include/conversation.php:104 -#: ../../include/diaspora.php:1554 -#: ../../addon/communityhome/communityhome.php:163 -msgid "photo" +#: ../../mod/settings.php:788 +msgid "Your Timezone:" msgstr "" -#: ../../mod/tagger.php:70 ../../mod/like.php:127 -#: ../../include/conversation.php:26 ../../include/conversation.php:35 -#: ../../include/conversation.php:99 ../../include/conversation.php:108 -#: ../../include/diaspora.php:1554 ../../addon/facebook/facebook.php:1084 -#: ../../addon/communityhome/communityhome.php:158 -#: ../../addon/communityhome/communityhome.php:167 -msgid "status" +#: ../../mod/settings.php:789 +msgid "Default Post Location:" msgstr "" -#: ../../mod/tagger.php:103 ../../include/conversation.php:116 -#, php-format -msgid "%1$s tagged %2$s's %3$s with %4$s" +#: ../../mod/settings.php:790 +msgid "Use Browser Location:" msgstr "" -#: ../../mod/common.php:34 -msgid "Common Friends" +#: ../../mod/settings.php:791 +msgid "Display Theme:" msgstr "" -#: ../../mod/common.php:42 -msgid "No friends in common." +#: ../../mod/settings.php:792 +msgid "Update browser every xx seconds" msgstr "" -#: ../../mod/profiles.php:21 ../../mod/profiles.php:239 -#: ../../mod/profiles.php:344 ../../mod/dfrn_confirm.php:62 -msgid "Profile not found." +#: ../../mod/settings.php:792 +msgid "Minimum of 10 seconds, no maximum" msgstr "" -#: ../../mod/profiles.php:28 -msgid "Profile Name is required." +#: ../../mod/settings.php:794 +msgid "Security and Privacy Settings" msgstr "" -#: ../../mod/profiles.php:198 -msgid "Profile updated." +#: ../../mod/settings.php:796 +msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../mod/profiles.php:256 -msgid "Profile deleted." +#: ../../mod/settings.php:796 +msgid "(to prevent spam abuse)" msgstr "" -#: ../../mod/profiles.php:272 ../../mod/profiles.php:303 -msgid "Profile-" +#: ../../mod/settings.php:797 +msgid "Default Post Permissions" msgstr "" -#: ../../mod/profiles.php:291 ../../mod/profiles.php:330 -msgid "New profile created." +#: ../../mod/settings.php:798 +msgid "(click to open/close)" msgstr "" -#: ../../mod/profiles.php:309 -msgid "Profile unavailable to clone." +#: ../../mod/settings.php:813 +msgid "Notification Settings" msgstr "" -#: ../../mod/profiles.php:356 -msgid "Hide your contact/friend list from viewers of this profile?" +#: ../../mod/settings.php:814 +msgid "Send a notification email when:" msgstr "" -#: ../../mod/profiles.php:374 -msgid "Edit Profile Details" +#: ../../mod/settings.php:815 +msgid "You receive an introduction" msgstr "" -#: ../../mod/profiles.php:376 -msgid "View this profile" +#: ../../mod/settings.php:816 +msgid "Your introductions are confirmed" msgstr "" -#: ../../mod/profiles.php:377 -msgid "Create a new profile using these settings" +#: ../../mod/settings.php:817 +msgid "Someone writes on your profile wall" msgstr "" -#: ../../mod/profiles.php:378 -msgid "Clone this profile" +#: ../../mod/settings.php:818 +msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/profiles.php:379 -msgid "Delete this profile" +#: ../../mod/settings.php:819 +msgid "You receive a private message" msgstr "" -#: ../../mod/profiles.php:380 -msgid "Profile Name:" +#: ../../mod/settings.php:820 +msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/profiles.php:381 -msgid "Your Full Name:" +#: ../../mod/settings.php:821 +msgid "You are tagged in a post" msgstr "" -#: ../../mod/profiles.php:382 -msgid "Title/Description:" +#: ../../mod/settings.php:824 +msgid "Advanced Page Settings" msgstr "" -#: ../../mod/profiles.php:383 -msgid "Your Gender:" +#: ../../mod/manage.php:90 +msgid "Manage Identities and/or Pages" msgstr "" -#: ../../mod/profiles.php:384 -#, php-format -msgid "Birthday (%s):" +#: ../../mod/manage.php:93 +msgid "" +"Toggle between different identities or community/group pages which share " +"your account details or which you have been granted \"manage\" permissions" msgstr "" -#: ../../mod/profiles.php:385 -msgid "Street Address:" +#: ../../mod/manage.php:95 +msgid "Select an identity to manage: " msgstr "" -#: ../../mod/profiles.php:386 -msgid "Locality/City:" +#: ../../mod/network.php:43 +msgid "Search Results For:" msgstr "" -#: ../../mod/profiles.php:387 -msgid "Postal/Zip Code:" +#: ../../mod/network.php:77 ../../mod/search.php:16 +msgid "Remove term" msgstr "" -#: ../../mod/profiles.php:388 -msgid "Country:" +#: ../../mod/network.php:86 ../../mod/search.php:13 +msgid "Saved Searches" msgstr "" -#: ../../mod/profiles.php:389 -msgid "Region/State:" +#: ../../mod/network.php:87 ../../include/group.php:216 +msgid "add" msgstr "" -#: ../../mod/profiles.php:390 -msgid "♥ Marital Status:" +#: ../../mod/network.php:166 +msgid "Commented Order" msgstr "" -#: ../../mod/profiles.php:391 -msgid "Who: (if applicable)" +#: ../../mod/network.php:171 +msgid "Posted Order" msgstr "" -#: ../../mod/profiles.php:392 -msgid "Examples: cathy123, Cathy Williams, cathy@example.com" +#: ../../mod/network.php:182 +msgid "New" msgstr "" -#: ../../mod/profiles.php:393 ../../include/profile_advanced.php:43 -msgid "Sexual Preference:" +#: ../../mod/network.php:187 +msgid "Starred" msgstr "" -#: ../../mod/profiles.php:394 -msgid "Homepage URL:" +#: ../../mod/network.php:192 +msgid "Bookmarks" msgstr "" -#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:47 -msgid "Political Views:" +#: ../../mod/network.php:250 +#, php-format +msgid "Warning: This group contains %s member from an insecure network." +msgid_plural "" +"Warning: This group contains %s members from an insecure network." +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/network.php:253 +msgid "Private messages to this group are at risk of public disclosure." msgstr "" -#: ../../mod/profiles.php:396 -msgid "Religious Views:" +#: ../../mod/network.php:304 +msgid "No such group" msgstr "" -#: ../../mod/profiles.php:397 -msgid "Public Keywords:" +#: ../../mod/network.php:315 +msgid "Group is empty" msgstr "" -#: ../../mod/profiles.php:398 -msgid "Private Keywords:" +#: ../../mod/network.php:319 +msgid "Group: " msgstr "" -#: ../../mod/profiles.php:399 -msgid "Example: fishing photography software" +#: ../../mod/network.php:329 +msgid "Contact: " msgstr "" -#: ../../mod/profiles.php:400 -msgid "(Used for suggesting potential friends, can be seen by others)" +#: ../../mod/network.php:331 +msgid "Private messages to this person are at risk of public disclosure." msgstr "" -#: ../../mod/profiles.php:401 -msgid "(Used for searching profiles, never shown to others)" +#: ../../mod/network.php:336 +msgid "Invalid contact." msgstr "" -#: ../../mod/profiles.php:402 -msgid "Tell us about yourself..." +#: ../../mod/notes.php:44 ../../boot.php:1350 +msgid "Personal Notes" msgstr "" -#: ../../mod/profiles.php:403 -msgid "Hobbies/Interests" +#: ../../mod/notes.php:63 ../../include/text.php:639 +msgid "Save" msgstr "" -#: ../../mod/profiles.php:404 -msgid "Contact information and Social Networks" +#: ../../mod/newmember.php:6 +msgid "Welcome to Friendica" msgstr "" -#: ../../mod/profiles.php:405 -msgid "Musical interests" +#: ../../mod/newmember.php:8 +msgid "New Member Checklist" msgstr "" -#: ../../mod/profiles.php:406 -msgid "Books, literature" +#: ../../mod/newmember.php:12 +msgid "" +"We would like to offer some tips and links to help make your experience " +"enjoyable. Click any item to visit the relevant page." msgstr "" -#: ../../mod/profiles.php:407 -msgid "Television" +#: ../../mod/newmember.php:16 +msgid "" +"On your Settings page - change your initial password. Also make a " +"note of your Identity Address. This will be useful in making friends." msgstr "" -#: ../../mod/profiles.php:408 -msgid "Film/dance/culture/entertainment" +#: ../../mod/newmember.php:18 +msgid "" +"Review the other settings, particularly the privacy settings. An unpublished " +"directory listing is like having an unlisted phone number. In general, you " +"should probably publish your listing - unless all of your friends and " +"potential friends know exactly how to find you." msgstr "" -#: ../../mod/profiles.php:409 -msgid "Love/romance" +#: ../../mod/newmember.php:20 +msgid "" +"Upload a profile photo if you have not done so already. Studies have shown " +"that people with real photos of themselves are ten times more likely to make " +"friends than people who do not." msgstr "" -#: ../../mod/profiles.php:410 -msgid "Work/employment" +#: ../../mod/newmember.php:23 +msgid "" +"Authorise the Facebook Connector if you currently have a Facebook account " +"and we will (optionally) import all your Facebook friends and conversations." msgstr "" -#: ../../mod/profiles.php:411 -msgid "School/education" +#: ../../mod/newmember.php:28 +msgid "" +"Enter your email access information on your Connector Settings page if you " +"wish to import and interact with friends or mailing lists from your email " +"INBOX" msgstr "" -#: ../../mod/profiles.php:416 +#: ../../mod/newmember.php:30 msgid "" -"This is your public profile.
    It may " -"be visible to anybody using the internet." +"Edit your default profile to your liking. Review the " +"settings for hiding your list of friends and hiding the profile from unknown " +"visitors." msgstr "" -#: ../../mod/profiles.php:461 -msgid "Edit/Manage Profiles" +#: ../../mod/newmember.php:32 +msgid "" +"Set some public keywords for your default profile which describe your " +"interests. We may be able to find other people with similar interests and " +"suggest friendships." msgstr "" -#: ../../mod/profiles.php:462 ../../boot.php:927 -msgid "Change profile photo" +#: ../../mod/newmember.php:34 +msgid "" +"Your Contacts page is your gateway to managing friendships and connecting " +"with friends on other networks. Typically you enter their address or site " +"URL in the Add New Contact dialog." msgstr "" -#: ../../mod/profiles.php:463 ../../boot.php:928 -msgid "Create New Profile" +#: ../../mod/newmember.php:36 +msgid "" +"The Directory page lets you find other people in this network or other " +"federated sites. Look for a Connect or Follow link on " +"their profile page. Provide your own Identity Address if requested." msgstr "" -#: ../../mod/profiles.php:473 ../../boot.php:938 -msgid "Profile Image" +#: ../../mod/newmember.php:38 +msgid "" +"Once you have made some friends, organize them into private conversation " +"groups from the sidebar of your Contacts page and then you can interact with " +"each group privately on your Network page." msgstr "" -#: ../../mod/profiles.php:475 ../../boot.php:941 -msgid "visible to everybody" +#: ../../mod/newmember.php:40 +msgid "" +"Our help pages may be consulted for detail on other program " +"features and resources." msgstr "" -#: ../../mod/profiles.php:476 ../../boot.php:942 -msgid "Edit visibility" +#: ../../mod/attach.php:8 +msgid "Item not available." msgstr "" -#: ../../mod/openid.php:63 ../../mod/openid.php:123 ../../include/auth.php:122 -#: ../../include/auth.php:147 ../../include/auth.php:201 -msgid "Login failed." +#: ../../mod/attach.php:20 +msgid "Item was not found." msgstr "" -#: ../../mod/openid.php:79 ../../include/auth.php:217 -msgid "Welcome " +#: ../../mod/group.php:27 +msgid "Group created." msgstr "" -#: ../../mod/openid.php:80 ../../include/auth.php:218 -msgid "Please upload a profile photo." +#: ../../mod/group.php:33 +msgid "Could not create group." msgstr "" -#: ../../mod/openid.php:83 ../../include/auth.php:221 -msgid "Welcome back " +#: ../../mod/group.php:43 ../../mod/group.php:123 +msgid "Group not found." msgstr "" -#: ../../mod/localtime.php:12 ../../include/event.php:11 -#: ../../include/bb2diaspora.php:237 -msgid "l F d, Y \\@ g:i A" +#: ../../mod/group.php:56 +msgid "Group name changed." msgstr "" -#: ../../mod/localtime.php:24 -msgid "Time Conversion" +#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../index.php:287 +msgid "Permission denied" msgstr "" -#: ../../mod/localtime.php:26 -msgid "" -"Friendika provides this service for sharing events with other networks and " -"friends in unknown timezones." +#: ../../mod/group.php:82 +msgid "Create a group of contacts/friends." msgstr "" -#: ../../mod/localtime.php:30 -#, php-format -msgid "UTC time: %s" +#: ../../mod/group.php:83 ../../mod/group.php:166 +msgid "Group Name: " msgstr "" -#: ../../mod/localtime.php:33 -#, php-format -msgid "Current timezone: %s" +#: ../../mod/group.php:98 +msgid "Group removed." msgstr "" -#: ../../mod/localtime.php:36 -#, php-format -msgid "Converted localtime: %s" +#: ../../mod/group.php:100 +msgid "Unable to remove group." msgstr "" -#: ../../mod/localtime.php:41 -msgid "Please select your timezone:" +#: ../../mod/group.php:164 ../../mod/profperm.php:105 +msgid "Click on a contact to add or remove." msgstr "" -#: ../../mod/invite.php:35 -#, php-format -msgid "%s : Not a valid email address." +#: ../../mod/group.php:165 +msgid "Group Editor" msgstr "" -#: ../../mod/invite.php:59 -#, php-format -msgid "Please join my network on %s" +#: ../../mod/group.php:179 +msgid "Members" msgstr "" -#: ../../mod/invite.php:69 -#, php-format -msgid "%s : Message delivery failed." +#: ../../mod/group.php:194 +msgid "All Contacts" msgstr "" -#: ../../mod/invite.php:73 -#, php-format -msgid "%d message sent." -msgid_plural "%d messages sent." -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/invite.php:92 -msgid "You have no more invitations available" +#: ../../mod/profperm.php:25 ../../mod/profperm.php:55 +msgid "Invalid profile identifier." msgstr "" -#: ../../mod/invite.php:99 -msgid "Send invitations" +#: ../../mod/profperm.php:101 +msgid "Profile Visibility Editor" msgstr "" -#: ../../mod/invite.php:100 -msgid "Enter email addresses, one per line:" +#: ../../mod/profperm.php:103 ../../include/profile_advanced.php:7 +#: ../../include/profile_advanced.php:76 ../../include/nav.php:48 +#: ../../boot.php:1332 +msgid "Profile" msgstr "" -#: ../../mod/invite.php:102 -#, php-format -msgid "Please join my social network on %s" +#: ../../mod/profperm.php:114 +msgid "Visible To" msgstr "" -#: ../../mod/invite.php:103 -msgid "To accept this invitation, please visit:" +#: ../../mod/profperm.php:130 +msgid "All Contacts (with secure profile access)" msgstr "" -#: ../../mod/invite.php:104 -msgid "You will need to supply this invitation code: $invite_code" +#: ../../mod/viewcontacts.php:25 ../../include/text.php:578 +msgid "View Contacts" msgstr "" -#: ../../mod/invite.php:104 -msgid "" -"Once you have registered, please connect with me via my profile page at:" +#: ../../mod/viewcontacts.php:40 +msgid "No contacts." msgstr "" #: ../../mod/register.php:62 @@ -1974,13 +2367,6 @@ msgstr "" msgid "Registration details for %s" msgstr "" -#: ../../mod/register.php:380 ../../mod/register.php:434 -#: ../../mod/lostpass.php:44 ../../mod/lostpass.php:106 -#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:710 -#: ../../include/items.php:2415 -msgid "Administrator" -msgstr "" - #: ../../mod/register.php:386 msgid "" "Registration successful. Please check your email for further instructions." @@ -2049,218 +2435,55 @@ msgstr "" msgid "Your Email Address: " msgstr "" -#: ../../mod/register.php:550 -msgid "" -"Choose a profile nickname. This must begin with a text character. Your " -"profile address on this site will then be 'nickname@$sitename'." -msgstr "" - -#: ../../mod/register.php:551 -msgid "Choose a nickname: " -msgstr "" - -#: ../../mod/register.php:554 ../../include/nav.php:77 ../../boot.php:684 -msgid "Register" -msgstr "" - -#: ../../mod/apps.php:4 -msgid "Applications" -msgstr "" - -#: ../../mod/apps.php:7 -msgid "No installed applications." -msgstr "" - -#: ../../mod/hcard.php:10 -msgid "No profile" -msgstr "" - -#: ../../mod/fsuggest.php:63 -msgid "Friend suggestion sent." -msgstr "" - -#: ../../mod/fsuggest.php:97 -msgid "Suggest Friends" -msgstr "" - -#: ../../mod/fsuggest.php:99 -#, php-format -msgid "Suggest a friend for %s" -msgstr "" - -#: ../../mod/ping.php:148 -msgid "{0} wants to be your friend" -msgstr "" - -#: ../../mod/ping.php:153 -msgid "{0} sent you a message" -msgstr "" - -#: ../../mod/ping.php:158 -msgid "{0} requested registration" -msgstr "" - -#: ../../mod/ping.php:164 -#, php-format -msgid "{0} commented %s's post" -msgstr "" - -#: ../../mod/ping.php:169 -#, php-format -msgid "{0} liked %s's post" -msgstr "" - -#: ../../mod/ping.php:174 -#, php-format -msgid "{0} disliked %s's post" -msgstr "" - -#: ../../mod/ping.php:179 -#, php-format -msgid "{0} is now friends with %s" -msgstr "" - -#: ../../mod/ping.php:184 -msgid "{0} posted" -msgstr "" - -#: ../../mod/ping.php:189 -#, php-format -msgid "{0} tagged %s's post with #%s" -msgstr "" - -#: ../../mod/ping.php:195 -msgid "{0} mentioned you in a post" -msgstr "" - -#: ../../mod/lostpass.php:16 -msgid "No valid account found." -msgstr "" - -#: ../../mod/lostpass.php:31 -msgid "Password reset request issued. Check your email." -msgstr "" - -#: ../../mod/lostpass.php:42 -#, php-format -msgid "Password reset requested at %s" -msgstr "" - -#: ../../mod/lostpass.php:64 -msgid "" -"Request could not be verified. (You may have previously submitted it.) " -"Password reset failed." -msgstr "" - -#: ../../mod/lostpass.php:82 ../../boot.php:714 -msgid "Password Reset" -msgstr "" - -#: ../../mod/lostpass.php:83 -msgid "Your password has been reset as requested." -msgstr "" - -#: ../../mod/lostpass.php:84 -msgid "Your new password is" -msgstr "" - -#: ../../mod/lostpass.php:85 -msgid "Save or copy your new password - and then" -msgstr "" - -#: ../../mod/lostpass.php:86 -msgid "click here to login" -msgstr "" - -#: ../../mod/lostpass.php:87 -msgid "" -"Your password may be changed from the Settings page after " -"successful login." -msgstr "" - -#: ../../mod/lostpass.php:118 -msgid "Forgot your Password?" -msgstr "" - -#: ../../mod/lostpass.php:119 -msgid "" -"Enter your email address and submit to have your password reset. Then check " -"your email for further instructions." -msgstr "" - -#: ../../mod/lostpass.php:120 -msgid "Nickname or Email: " -msgstr "" - -#: ../../mod/lostpass.php:121 -msgid "Reset" -msgstr "" - -#: ../../mod/editpost.php:17 ../../mod/editpost.php:27 -msgid "Item not found" -msgstr "" - -#: ../../mod/editpost.php:32 -msgid "Edit post" -msgstr "" - -#: ../../mod/editpost.php:75 ../../include/conversation.php:848 -msgid "Post to Email" -msgstr "" - -#: ../../mod/editpost.php:92 ../../include/conversation.php:865 -msgid "Attach file" -msgstr "" - -#: ../../mod/editpost.php:94 -msgid "Insert YouTube video" -msgstr "" - -#: ../../mod/editpost.php:95 -msgid "Insert Vorbis [.ogg] video" -msgstr "" - -#: ../../mod/editpost.php:96 -msgid "Insert Vorbis [.ogg] audio" -msgstr "" - -#: ../../mod/editpost.php:97 ../../include/conversation.php:873 -msgid "Set your location" +#: ../../mod/register.php:550 +msgid "" +"Choose a profile nickname. This must begin with a text character. Your " +"profile address on this site will then be 'nickname@$sitename'." msgstr "" -#: ../../mod/editpost.php:98 ../../include/conversation.php:875 -msgid "Clear browser location" +#: ../../mod/register.php:551 +msgid "Choose a nickname: " msgstr "" -#: ../../mod/editpost.php:100 ../../include/conversation.php:880 -msgid "Permission settings" +#: ../../mod/register.php:554 ../../include/nav.php:77 ../../boot.php:689 +msgid "Register" msgstr "" -#: ../../mod/editpost.php:108 ../../include/conversation.php:889 -msgid "CC: email addresses" +#: ../../mod/dirfind.php:23 +msgid "People Search" msgstr "" -#: ../../mod/editpost.php:109 ../../include/conversation.php:890 -msgid "Public post" +#: ../../mod/like.php:127 ../../mod/tagger.php:70 +#: ../../addon/facebook/facebook.php:1091 +#: ../../addon/communityhome/communityhome.php:158 +#: ../../addon/communityhome/communityhome.php:167 +#: ../../include/diaspora.php:1587 ../../include/conversation.php:26 +#: ../../include/conversation.php:35 ../../include/conversation.php:99 +#: ../../include/conversation.php:108 +msgid "status" msgstr "" -#: ../../mod/editpost.php:111 ../../include/conversation.php:892 -msgid "Example: bob@example.com, mary@example.com" +#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1095 +#: ../../addon/communityhome/communityhome.php:172 +#: ../../include/diaspora.php:1603 ../../include/conversation.php:43 +#, php-format +msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../mod/removeme.php:42 ../../mod/removeme.php:45 -msgid "Remove My Account" +#: ../../mod/like.php:146 ../../include/conversation.php:46 +#, php-format +msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../mod/removeme.php:43 -msgid "" -"This will completely remove your account. Once this has been done it is not " -"recoverable." +#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:111 +#: ../../mod/admin.php:502 ../../mod/display.php:28 ../../mod/display.php:116 +#: ../../mod/viewd.php:14 ../../include/items.php:2819 +msgid "Item not found." msgstr "" -#: ../../mod/removeme.php:44 -msgid "Please enter your password for verification:" +#: ../../mod/viewsrc.php:7 ../../mod/viewd.php:6 +msgid "Access denied." msgstr "" #: ../../mod/regmod.php:61 @@ -2276,274 +2499,217 @@ msgstr "" msgid "Please login." msgstr "" -#: ../../mod/install.php:111 -msgid "Friendica Social Communications Server - Setup" -msgstr "" - -#: ../../mod/install.php:117 ../../mod/install.php:157 -#: ../../mod/install.php:229 -msgid "Database connection" +#: ../../mod/item.php:88 +msgid "Unable to locate original post." msgstr "" -#: ../../mod/install.php:124 -msgid "Could not connect to database." +#: ../../mod/item.php:248 +msgid "Empty post discarded." msgstr "" -#: ../../mod/install.php:128 -msgid "Could not create table." +#: ../../mod/item.php:350 ../../mod/wall_upload.php:81 +#: ../../mod/wall_upload.php:90 ../../mod/wall_upload.php:97 +#: ../../include/message.php:143 +msgid "Wall Photos" msgstr "" -#: ../../mod/install.php:133 -msgid "Your Friendica site database has been installed." +#: ../../mod/item.php:827 +msgid "System error. Post not saved." msgstr "" -#: ../../mod/install.php:134 +#: ../../mod/item.php:852 +#, php-format msgid "" -"IMPORTANT: You will need to [manually] setup a scheduled task for the poller." -msgstr "" - -#: ../../mod/install.php:135 ../../mod/install.php:151 -#: ../../mod/install.php:209 -msgid "Please see the file \"INSTALL.txt\"." -msgstr "" - -#: ../../mod/install.php:137 -msgid "Proceed to registration" +"This message was sent to you by %s, a member of the Friendica social network." msgstr "" -#: ../../mod/install.php:143 -msgid "Proceed with Installation" +#: ../../mod/item.php:854 +#, php-format +msgid "You may visit them online at %s" msgstr "" -#: ../../mod/install.php:150 +#: ../../mod/item.php:855 msgid "" -"You may need to import the file \"database.sql\" manually using phpmyadmin " -"or mysql." -msgstr "" - -#: ../../mod/install.php:158 -msgid "Database import failed." -msgstr "" - -#: ../../mod/install.php:206 -msgid "System check" -msgstr "" - -#: ../../mod/install.php:210 ../../mod/events.php:213 -msgid "Next" +"Please contact the sender by replying to this post if you do not wish to " +"receive these messages." msgstr "" -#: ../../mod/install.php:211 -msgid "Check again" +#: ../../mod/item.php:857 +#, php-format +msgid "%s posted an update." msgstr "" -#: ../../mod/install.php:230 -msgid "" -"In order to install Friendica we need to know how to connect to your " -"database." +#: ../../mod/profile_photo.php:28 +msgid "Image uploaded but image cropping failed." msgstr "" -#: ../../mod/install.php:231 -msgid "" -"Please contact your hosting provider or site administrator if you have " -"questions about these settings." +#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68 +#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:258 +#, php-format +msgid "Image size reduction [%s] failed." msgstr "" -#: ../../mod/install.php:232 +#: ../../mod/profile_photo.php:89 msgid "" -"The database you specify below should already exist. If it does not, please " -"create it before continuing." -msgstr "" - -#: ../../mod/install.php:236 -msgid "Database Server Name" -msgstr "" - -#: ../../mod/install.php:237 -msgid "Database Login Name" -msgstr "" - -#: ../../mod/install.php:238 -msgid "Database Login Password" +"Shift-reload the page or clear browser cache if the new photo does not " +"display immediately." msgstr "" -#: ../../mod/install.php:239 -msgid "Database Name" +#: ../../mod/profile_photo.php:99 +msgid "Unable to process image" msgstr "" -#: ../../mod/install.php:240 ../../mod/install.php:279 -msgid "Site administrator email address" +#: ../../mod/profile_photo.php:113 ../../mod/wall_upload.php:56 +#, php-format +msgid "Image exceeds size limit of %d" msgstr "" -#: ../../mod/install.php:240 ../../mod/install.php:279 -msgid "" -"Your account email address must match this in order to use the web admin " -"panel." +#: ../../mod/profile_photo.php:203 +msgid "Upload File:" msgstr "" -#: ../../mod/install.php:244 ../../mod/install.php:282 -msgid "Please select a default timezone for your website" +#: ../../mod/profile_photo.php:204 +msgid "Upload Profile Photo" msgstr "" -#: ../../mod/install.php:269 -msgid "Site settings" +#: ../../mod/profile_photo.php:205 +msgid "Upload" msgstr "" -#: ../../mod/install.php:322 -msgid "Could not find a command line version of PHP in the web server PATH." +#: ../../mod/profile_photo.php:206 +msgid "skip this step" msgstr "" -#: ../../mod/install.php:325 -msgid "PHP executable path" +#: ../../mod/profile_photo.php:206 +msgid "select a photo from your photo albums" msgstr "" -#: ../../mod/install.php:325 -msgid "Enter full path to php executable" +#: ../../mod/profile_photo.php:219 +msgid "Crop Image" msgstr "" -#: ../../mod/install.php:330 -msgid "Command line PHP" +#: ../../mod/profile_photo.php:220 +msgid "Please adjust the image cropping for optimum viewing." msgstr "" -#: ../../mod/install.php:339 -msgid "" -"The command line version of PHP on your system does not have " -"\"register_argc_argv\" enabled." +#: ../../mod/profile_photo.php:221 +msgid "Done Editing" msgstr "" -#: ../../mod/install.php:340 -msgid "This is required for message delivery to work." +#: ../../mod/profile_photo.php:249 +msgid "Image uploaded successfully." msgstr "" -#: ../../mod/install.php:342 -msgid "PHP \"register_argc_argv\"" +#: ../../mod/hcard.php:10 +msgid "No profile" msgstr "" -#: ../../mod/install.php:363 -msgid "" -"Error: the \"openssl_pkey_new\" function on this system is not able to " -"generate encryption keys" +#: ../../mod/removeme.php:45 ../../mod/removeme.php:48 +msgid "Remove My Account" msgstr "" -#: ../../mod/install.php:364 +#: ../../mod/removeme.php:46 msgid "" -"If running under Windows, please see \"http://www.php.net/manual/en/openssl." -"installation.php\"." -msgstr "" - -#: ../../mod/install.php:366 -msgid "Generate encryption keys" +"This will completely remove your account. Once this has been done it is not " +"recoverable." msgstr "" -#: ../../mod/install.php:373 -msgid "libCurl PHP module" +#: ../../mod/removeme.php:47 +msgid "Please enter your password for verification:" msgstr "" -#: ../../mod/install.php:374 -msgid "GD graphics PHP module" +#: ../../mod/message.php:23 +msgid "No recipient selected." msgstr "" -#: ../../mod/install.php:375 -msgid "OpenSSL PHP module" +#: ../../mod/message.php:26 +msgid "Unable to locate contact information." msgstr "" -#: ../../mod/install.php:376 -msgid "mysqli PHP module" +#: ../../mod/message.php:29 +msgid "Message could not be sent." msgstr "" -#: ../../mod/install.php:377 -msgid "mb_string PHP module" +#: ../../mod/message.php:32 +msgid "Message collection failure." msgstr "" -#: ../../mod/install.php:382 ../../mod/install.php:384 -msgid "Apace mod_rewrite module" +#: ../../mod/message.php:35 +msgid "Message sent." msgstr "" -#: ../../mod/install.php:382 -msgid "" -"Error: Apache webserver mod-rewrite module is required but not installed." +#: ../../mod/message.php:55 +msgid "Inbox" msgstr "" -#: ../../mod/install.php:389 -msgid "Error: libCURL PHP module required but not installed." +#: ../../mod/message.php:60 +msgid "Outbox" msgstr "" -#: ../../mod/install.php:393 -msgid "" -"Error: GD graphics PHP module with JPEG support required but not installed." +#: ../../mod/message.php:65 +msgid "New Message" msgstr "" -#: ../../mod/install.php:397 -msgid "Error: openssl PHP module required but not installed." +#: ../../mod/message.php:91 +msgid "Message deleted." msgstr "" -#: ../../mod/install.php:401 -msgid "Error: mysqli PHP module required but not installed." +#: ../../mod/message.php:121 +msgid "Conversation removed." msgstr "" -#: ../../mod/install.php:405 -msgid "Error: mb_string PHP module required but not installed." +#: ../../mod/message.php:137 ../../include/conversation.php:843 +msgid "Please enter a link URL:" msgstr "" -#: ../../mod/install.php:422 -msgid "" -"The web installer needs to be able to create a file called \".htconfig.php\" " -"in the top folder of your web server and it is unable to do so." +#: ../../mod/message.php:145 +msgid "Send Private Message" msgstr "" -#: ../../mod/install.php:423 -msgid "" -"This is most often a permission setting, as the web server may not be able " -"to write files in your folder - even if you can." +#: ../../mod/message.php:146 ../../mod/message.php:287 +msgid "To:" msgstr "" -#: ../../mod/install.php:424 -msgid "" -"Please check with your site documentation or support people to see if this " -"situation can be corrected." +#: ../../mod/message.php:147 ../../mod/message.php:288 +msgid "Subject:" msgstr "" -#: ../../mod/install.php:425 -msgid "" -"If not, you may be required to perform a manual installation. Please see the " -"file \"INSTALL.txt\" for instructions." +#: ../../mod/message.php:150 ../../mod/message.php:291 +#: ../../mod/invite.php:101 +msgid "Your message:" msgstr "" -#: ../../mod/install.php:428 -msgid ".htconfig.php is writable" +#: ../../mod/message.php:188 +msgid "No messages." msgstr "" -#: ../../mod/install.php:435 -msgid "" -"The database configuration file \".htconfig.php\" could not be written. " -"Please use the enclosed text to create a configuration file in your web " -"server root." +#: ../../mod/message.php:201 +msgid "Delete conversation" msgstr "" -#: ../../mod/install.php:460 -msgid "Errors encountered creating database tables." +#: ../../mod/message.php:204 +msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/community.php:21 -msgid "Not available." +#: ../../mod/message.php:239 +msgid "Message not available." msgstr "" -#: ../../mod/community.php:30 ../../include/nav.php:97 -msgid "Community" +#: ../../mod/message.php:276 +msgid "Delete message" msgstr "" -#: ../../mod/community.php:60 ../../mod/search.php:118 -msgid "No results." +#: ../../mod/message.php:286 +msgid "Send Reply" msgstr "" -#: ../../mod/community.php:87 -msgid "" -"Shared content is covered by the Creative Commons Attribution 3.0 license." +#: ../../mod/allfriends.php:34 +#, php-format +msgid "Friends of %s" msgstr "" -#: ../../mod/oexchange.php:27 -msgid "Post successful." +#: ../../mod/allfriends.php:40 +msgid "No friends to display." msgstr "" #: ../../mod/admin.php:59 ../../mod/admin.php:295 @@ -2619,7 +2785,7 @@ msgstr "" msgid "Advanced" msgstr "" -#: ../../mod/admin.php:304 ../../addon/statusnet/statusnet.php:477 +#: ../../mod/admin.php:304 ../../addon/statusnet/statusnet.php:486 msgid "Site name" msgstr "" @@ -2833,7 +2999,7 @@ msgstr "" msgid "Toggle" msgstr "" -#: ../../mod/admin.php:551 ../../include/nav.php:128 +#: ../../mod/admin.php:551 ../../include/nav.php:129 msgid "Settings" msgstr "" @@ -2883,1759 +3049,1849 @@ msgstr "" msgid "FTP Password" msgstr "" -#: ../../mod/suggest.php:38 ../../include/contact_widgets.php:35 -msgid "Friend Suggestions" +#: ../../mod/profile.php:15 ../../boot.php:841 +msgid "Requested profile is not available." msgstr "" -#: ../../mod/suggest.php:44 -msgid "" -"No suggestions available. If this is a new site, please try again in 24 " -"hours." +#: ../../mod/profile.php:111 ../../mod/display.php:66 +msgid "Access to this profile has been restricted." msgstr "" -#: ../../mod/suggest.php:59 ../../mod/match.php:58 -#: ../../include/contact_widgets.php:9 ../../boot.php:911 -msgid "Connect" +#: ../../mod/profile.php:131 +msgid "Tips for New Members" msgstr "" -#: ../../mod/suggest.php:61 -msgid "Ignore/Hide" +#: ../../mod/ping.php:148 +msgid "{0} wants to be your friend" msgstr "" -#: ../../mod/display.php:66 ../../mod/profile.php:111 -msgid "Access to this profile has been restricted." +#: ../../mod/ping.php:153 +msgid "{0} sent you a message" msgstr "" -#: ../../mod/display.php:108 -msgid "Item has been removed." +#: ../../mod/ping.php:158 +msgid "{0} requested registration" msgstr "" -#: ../../mod/like.php:144 ../../include/conversation.php:43 -#: ../../include/diaspora.php:1570 ../../addon/facebook/facebook.php:1088 -#: ../../addon/communityhome/communityhome.php:172 +#: ../../mod/ping.php:164 #, php-format -msgid "%1$s likes %2$s's %3$s" +msgid "{0} commented %s's post" msgstr "" -#: ../../mod/like.php:146 ../../include/conversation.php:46 +#: ../../mod/ping.php:169 #, php-format -msgid "%1$s doesn't like %2$s's %3$s" +msgid "{0} liked %s's post" msgstr "" -#: ../../mod/match.php:12 -msgid "Profile Match" +#: ../../mod/ping.php:174 +#, php-format +msgid "{0} disliked %s's post" msgstr "" -#: ../../mod/match.php:20 -msgid "No keywords to match. Please add keywords to your default profile." +#: ../../mod/ping.php:179 +#, php-format +msgid "{0} is now friends with %s" msgstr "" -#: ../../mod/match.php:57 -msgid "is interested in:" +#: ../../mod/ping.php:184 +msgid "{0} posted" msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1335 -msgid "Personal Notes" +#: ../../mod/ping.php:189 +#, php-format +msgid "{0} tagged %s's post with #%s" msgstr "" -#: ../../mod/notes.php:63 ../../include/text.php:635 -msgid "Save" +#: ../../mod/ping.php:195 +msgid "{0} mentioned you in a post" msgstr "" -#: ../../mod/help.php:30 -msgid "Help:" +#: ../../mod/openid.php:63 ../../mod/openid.php:77 ../../include/auth.php:90 +#: ../../include/auth.php:115 ../../include/auth.php:169 +msgid "Login failed." msgstr "" -#: ../../mod/help.php:34 ../../include/nav.php:82 -msgid "Help" +#: ../../mod/follow.php:27 +msgid "Connect URL missing." msgstr "" -#: ../../mod/help.php:38 ../../index.php:221 -msgid "Not Found" +#: ../../mod/follow.php:47 +msgid "" +"This site is not configured to allow communications with other networks." msgstr "" -#: ../../mod/help.php:41 ../../index.php:224 -msgid "Page not found." +#: ../../mod/follow.php:48 ../../mod/follow.php:58 +msgid "No compatible communication protocols or feeds were discovered." msgstr "" -#: ../../mod/dfrn_confirm.php:236 -msgid "Response from remote site was not understood." +#: ../../mod/follow.php:56 +msgid "The profile address specified does not provide adequate information." msgstr "" -#: ../../mod/dfrn_confirm.php:245 -msgid "Unexpected response from remote site: " +#: ../../mod/follow.php:60 +msgid "An author or name was not found." msgstr "" -#: ../../mod/dfrn_confirm.php:253 -msgid "Confirmation completed successfully." +#: ../../mod/follow.php:62 +msgid "No browser URL could be matched to this address." msgstr "" -#: ../../mod/dfrn_confirm.php:255 ../../mod/dfrn_confirm.php:269 -#: ../../mod/dfrn_confirm.php:276 -msgid "Remote site reported: " +#: ../../mod/follow.php:69 +msgid "" +"The profile address specified belongs to a network which has been disabled " +"on this site." msgstr "" -#: ../../mod/dfrn_confirm.php:267 -msgid "Temporary failure. Please wait and try again." +#: ../../mod/follow.php:74 +msgid "" +"Limited profile. This person will be unable to receive direct/personal " +"notifications from you." msgstr "" -#: ../../mod/dfrn_confirm.php:274 -msgid "Introduction failed or was revoked." +#: ../../mod/follow.php:144 +msgid "Unable to retrieve contact information." msgstr "" -#: ../../mod/dfrn_confirm.php:416 -msgid "Unable to set contact photo." +#: ../../mod/follow.php:190 +msgid "following" msgstr "" -#: ../../mod/dfrn_confirm.php:466 ../../include/conversation.php:79 -#: ../../include/diaspora.php:495 -#, php-format -msgid "%1$s is now friends with %2$s" +#: ../../mod/common.php:34 +msgid "Common Friends" msgstr "" -#: ../../mod/dfrn_confirm.php:537 -#, php-format -msgid "No user record found for '%s' " +#: ../../mod/common.php:42 +msgid "No friends in common." msgstr "" -#: ../../mod/dfrn_confirm.php:547 -msgid "Our site encryption key is apparently messed up." +#: ../../mod/display.php:109 +msgid "Item has been removed." msgstr "" -#: ../../mod/dfrn_confirm.php:558 -msgid "Empty site URL was provided or URL could not be decrypted by us." +#: ../../mod/apps.php:4 +msgid "Applications" msgstr "" -#: ../../mod/dfrn_confirm.php:579 -msgid "Contact record was not found for you on our site." +#: ../../mod/apps.php:7 +msgid "No installed applications." msgstr "" -#: ../../mod/dfrn_confirm.php:593 -#, php-format -msgid "Site public key not available in contact record for URL %s." +#: ../../mod/search.php:83 +msgid "Search This Site" msgstr "" -#: ../../mod/dfrn_confirm.php:613 -msgid "" -"The ID provided by your system is a duplicate on our system. It should work " -"if you try again." +#: ../../mod/profiles.php:21 ../../mod/profiles.php:239 +#: ../../mod/profiles.php:344 ../../mod/dfrn_confirm.php:62 +msgid "Profile not found." msgstr "" -#: ../../mod/dfrn_confirm.php:624 -msgid "Unable to set your contact credentials on our system." +#: ../../mod/profiles.php:28 +msgid "Profile Name is required." msgstr "" -#: ../../mod/dfrn_confirm.php:678 -msgid "Unable to update your contact profile details on our system" +#: ../../mod/profiles.php:198 +msgid "Profile updated." msgstr "" -#: ../../mod/dfrn_confirm.php:708 -#, php-format -msgid "Connection accepted at %s" +#: ../../mod/profiles.php:256 +msgid "Profile deleted." msgstr "" -#: ../../mod/profile.php:15 ../../boot.php:836 -msgid "Requested profile is not available." +#: ../../mod/profiles.php:272 ../../mod/profiles.php:303 +msgid "Profile-" msgstr "" -#: ../../mod/profile.php:131 -msgid "Tips for New Members" +#: ../../mod/profiles.php:291 ../../mod/profiles.php:330 +msgid "New profile created." msgstr "" -#: ../../mod/item.php:89 -msgid "Unable to locate original post." +#: ../../mod/profiles.php:309 +msgid "Profile unavailable to clone." msgstr "" -#: ../../mod/item.php:206 -msgid "Empty post discarded." +#: ../../mod/profiles.php:356 +msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/item.php:778 -msgid "System error. Post not saved." +#: ../../mod/profiles.php:374 +msgid "Edit Profile Details" msgstr "" -#: ../../mod/item.php:803 -#, php-format -msgid "" -"This message was sent to you by %s, a member of the Friendica social network." +#: ../../mod/profiles.php:376 +msgid "View this profile" msgstr "" -#: ../../mod/item.php:805 -#, php-format -msgid "You may visit them online at %s" +#: ../../mod/profiles.php:377 +msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/item.php:806 -msgid "" -"Please contact the sender by replying to this post if you do not wish to " -"receive these messages." +#: ../../mod/profiles.php:378 +msgid "Clone this profile" +msgstr "" + +#: ../../mod/profiles.php:379 +msgid "Delete this profile" +msgstr "" + +#: ../../mod/profiles.php:380 +msgid "Profile Name:" +msgstr "" + +#: ../../mod/profiles.php:381 +msgid "Your Full Name:" +msgstr "" + +#: ../../mod/profiles.php:382 +msgid "Title/Description:" +msgstr "" + +#: ../../mod/profiles.php:383 +msgid "Your Gender:" msgstr "" -#: ../../mod/item.php:808 +#: ../../mod/profiles.php:384 #, php-format -msgid "%s posted an update." +msgid "Birthday (%s):" msgstr "" -#: ../../mod/search.php:13 ../../mod/network.php:84 -msgid "Saved Searches" +#: ../../mod/profiles.php:385 +msgid "Street Address:" msgstr "" -#: ../../mod/search.php:16 ../../mod/network.php:75 -msgid "Remove term" +#: ../../mod/profiles.php:386 +msgid "Locality/City:" msgstr "" -#: ../../mod/search.php:83 -msgid "Search This Site" +#: ../../mod/profiles.php:387 +msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/photos.php:42 -msgid "Photo Albums" +#: ../../mod/profiles.php:388 +msgid "Country:" msgstr "" -#: ../../mod/photos.php:50 ../../mod/photos.php:146 ../../mod/photos.php:868 -#: ../../mod/photos.php:938 ../../mod/photos.php:953 ../../mod/photos.php:1354 -#: ../../mod/photos.php:1366 ../../addon/communityhome/communityhome.php:110 -msgid "Contact Photos" +#: ../../mod/profiles.php:389 +msgid "Region/State:" msgstr "" -#: ../../mod/photos.php:135 -msgid "Contact information unavailable" +#: ../../mod/profiles.php:390 +msgid "♥ Marital Status:" msgstr "" -#: ../../mod/photos.php:156 -msgid "Album not found." +#: ../../mod/profiles.php:391 +msgid "Who: (if applicable)" msgstr "" -#: ../../mod/photos.php:174 ../../mod/photos.php:947 -msgid "Delete Album" +#: ../../mod/profiles.php:392 +msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/photos.php:237 ../../mod/photos.php:1166 -msgid "Delete Photo" +#: ../../mod/profiles.php:393 ../../include/profile_advanced.php:43 +msgid "Sexual Preference:" msgstr "" -#: ../../mod/photos.php:524 -msgid "was tagged in a" +#: ../../mod/profiles.php:394 +msgid "Homepage URL:" msgstr "" -#: ../../mod/photos.php:524 -msgid "by" +#: ../../mod/profiles.php:395 ../../include/profile_advanced.php:49 +msgid "Political Views:" msgstr "" -#: ../../mod/photos.php:627 ../../addon/js_upload/js_upload.php:312 -msgid "Image exceeds size limit of " +#: ../../mod/profiles.php:396 +msgid "Religious Views:" msgstr "" -#: ../../mod/photos.php:635 -msgid "Image file is empty." +#: ../../mod/profiles.php:397 +msgid "Public Keywords:" +msgstr "" + +#: ../../mod/profiles.php:398 +msgid "Private Keywords:" +msgstr "" + +#: ../../mod/profiles.php:399 +msgid "Example: fishing photography software" +msgstr "" + +#: ../../mod/profiles.php:400 +msgid "(Used for suggesting potential friends, can be seen by others)" +msgstr "" + +#: ../../mod/profiles.php:401 +msgid "(Used for searching profiles, never shown to others)" +msgstr "" + +#: ../../mod/profiles.php:402 +msgid "Tell us about yourself..." +msgstr "" + +#: ../../mod/profiles.php:403 +msgid "Hobbies/Interests" msgstr "" -#: ../../mod/photos.php:764 -msgid "No photos selected" +#: ../../mod/profiles.php:404 +msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/photos.php:841 -msgid "Access to this item is restricted." +#: ../../mod/profiles.php:405 +msgid "Musical interests" msgstr "" -#: ../../mod/photos.php:895 -msgid "Upload Photos" +#: ../../mod/profiles.php:406 +msgid "Books, literature" msgstr "" -#: ../../mod/photos.php:898 ../../mod/photos.php:942 -msgid "New album name: " +#: ../../mod/profiles.php:407 +msgid "Television" msgstr "" -#: ../../mod/photos.php:899 -msgid "or existing album name: " +#: ../../mod/profiles.php:408 +msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/photos.php:900 -msgid "Do not show a status post for this upload" +#: ../../mod/profiles.php:409 +msgid "Love/romance" msgstr "" -#: ../../mod/photos.php:902 ../../mod/photos.php:1161 -msgid "Permissions" +#: ../../mod/profiles.php:410 +msgid "Work/employment" msgstr "" -#: ../../mod/photos.php:957 -msgid "Edit Album" +#: ../../mod/profiles.php:411 +msgid "School/education" msgstr "" -#: ../../mod/photos.php:967 ../../mod/photos.php:1379 -msgid "View Photo" +#: ../../mod/profiles.php:416 +msgid "" +"This is your public profile.
    It may " +"be visible to anybody using the internet." msgstr "" -#: ../../mod/photos.php:1002 -msgid "Permission denied. Access to this item may be restricted." +#: ../../mod/profiles.php:426 ../../mod/directory.php:122 +msgid "Age: " msgstr "" -#: ../../mod/photos.php:1004 -msgid "Photo not available" +#: ../../mod/profiles.php:461 +msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/photos.php:1054 -msgid "View photo" +#: ../../mod/profiles.php:462 ../../boot.php:942 +msgid "Change profile photo" msgstr "" -#: ../../mod/photos.php:1054 -msgid "Edit photo" +#: ../../mod/profiles.php:463 ../../boot.php:943 +msgid "Create New Profile" msgstr "" -#: ../../mod/photos.php:1055 -msgid "Use as profile photo" +#: ../../mod/profiles.php:473 ../../boot.php:953 +msgid "Profile Image" msgstr "" -#: ../../mod/photos.php:1061 ../../include/conversation.php:423 -msgid "Private Message" +#: ../../mod/profiles.php:475 ../../boot.php:956 +msgid "visible to everybody" msgstr "" -#: ../../mod/photos.php:1072 -msgid "View Full Size" +#: ../../mod/profiles.php:476 ../../boot.php:957 +msgid "Edit visibility" msgstr "" -#: ../../mod/photos.php:1140 -msgid "Tags: " +#: ../../mod/tagger.php:103 ../../include/conversation.php:116 +#, php-format +msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: ../../mod/photos.php:1143 -msgid "[Remove any tag]" +#: ../../mod/delegate.php:95 +msgid "No potential page delegates located." msgstr "" -#: ../../mod/photos.php:1154 -msgid "New album name" +#: ../../mod/delegate.php:121 +msgid "Delegate Page Management" msgstr "" -#: ../../mod/photos.php:1157 -msgid "Caption" +#: ../../mod/delegate.php:123 +msgid "" +"Delegates are able to manage all aspects of this account/page except for " +"basic account settings. Please do not delegate your personal account to " +"anybody that you do not trust completely." msgstr "" -#: ../../mod/photos.php:1159 -msgid "Add a Tag" +#: ../../mod/delegate.php:124 +msgid "Existing Page Managers" msgstr "" -#: ../../mod/photos.php:1163 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +#: ../../mod/delegate.php:126 +msgid "Existing Page Delegates" msgstr "" -#: ../../mod/photos.php:1183 ../../include/conversation.php:470 -msgid "I like this (toggle)" +#: ../../mod/delegate.php:128 +msgid "Potential Delegates" msgstr "" -#: ../../mod/photos.php:1184 ../../include/conversation.php:471 -msgid "I don't like this (toggle)" +#: ../../mod/delegate.php:131 +msgid "Add" msgstr "" -#: ../../mod/photos.php:1185 ../../include/conversation.php:862 -msgid "Share" +#: ../../mod/delegate.php:132 +msgid "No entries." msgstr "" -#: ../../mod/photos.php:1202 ../../mod/photos.php:1242 -#: ../../mod/photos.php:1273 ../../include/conversation.php:485 -msgid "This is you" +#: ../../mod/suggest.php:38 ../../include/contact_widgets.php:35 +msgid "Friend Suggestions" msgstr "" -#: ../../mod/photos.php:1204 ../../mod/photos.php:1244 -#: ../../mod/photos.php:1275 ../../include/conversation.php:487 -#: ../../boot.php:438 -msgid "Comment" +#: ../../mod/suggest.php:44 +msgid "" +"No suggestions available. If this is a new site, please try again in 24 " +"hours." msgstr "" -#: ../../mod/photos.php:1206 ../../include/conversation.php:489 -#: ../../include/conversation.php:897 -msgid "Preview" +#: ../../mod/suggest.php:61 +msgid "Ignore/Hide" msgstr "" -#: ../../mod/photos.php:1385 -msgid "View Album" +#: ../../mod/directory.php:49 +msgid "Global Directory" msgstr "" -#: ../../mod/photos.php:1394 -msgid "Recent Photos" +#: ../../mod/directory.php:55 +msgid "Normal site view" msgstr "" -#: ../../mod/photos.php:1396 -msgid "Upload New Photos" +#: ../../mod/directory.php:57 +msgid "Admin - View all site entries" msgstr "" -#: ../../mod/network.php:43 -msgid "Search Results For:" +#: ../../mod/directory.php:63 +msgid "Find on this site" msgstr "" -#: ../../mod/network.php:85 ../../include/group.php:216 -msgid "add" +#: ../../mod/directory.php:66 +msgid "Site Directory" msgstr "" -#: ../../mod/network.php:158 -msgid "Commented Order" +#: ../../mod/directory.php:125 +msgid "Gender: " msgstr "" -#: ../../mod/network.php:163 -msgid "Posted Order" +#: ../../mod/directory.php:151 +msgid "No entries (some entries may be hidden)." msgstr "" -#: ../../mod/network.php:174 -msgid "New" +#: ../../mod/invite.php:35 +#, php-format +msgid "%s : Not a valid email address." msgstr "" -#: ../../mod/network.php:179 -msgid "Starred" +#: ../../mod/invite.php:59 +#, php-format +msgid "Please join my network on %s" msgstr "" -#: ../../mod/network.php:184 -msgid "Bookmarks" +#: ../../mod/invite.php:69 +#, php-format +msgid "%s : Message delivery failed." msgstr "" -#: ../../mod/network.php:232 +#: ../../mod/invite.php:73 #, php-format -msgid "Warning: This group contains %s member from an insecure network." -msgid_plural "" -"Warning: This group contains %s members from an insecure network." +msgid "%d message sent." +msgid_plural "%d messages sent." msgstr[0] "" msgstr[1] "" -#: ../../mod/network.php:235 -msgid "Private messages to this group are at risk of public disclosure." +#: ../../mod/invite.php:92 +msgid "You have no more invitations available" msgstr "" -#: ../../mod/network.php:286 -msgid "No such group" +#: ../../mod/invite.php:99 +msgid "Send invitations" msgstr "" -#: ../../mod/network.php:297 -msgid "Group is empty" +#: ../../mod/invite.php:100 +msgid "Enter email addresses, one per line:" msgstr "" -#: ../../mod/network.php:301 -msgid "Group: " +#: ../../mod/invite.php:102 +#, php-format +msgid "Please join my social network on %s" msgstr "" -#: ../../mod/network.php:311 -msgid "Contact: " +#: ../../mod/invite.php:103 +msgid "To accept this invitation, please visit:" msgstr "" -#: ../../mod/network.php:313 -msgid "Private messages to this person are at risk of public disclosure." +#: ../../mod/invite.php:104 +msgid "You will need to supply this invitation code: $invite_code" msgstr "" -#: ../../mod/network.php:318 -msgid "Invalid contact." +#: ../../mod/invite.php:104 +msgid "" +"Once you have registered, please connect with me via my profile page at:" msgstr "" -#: ../../mod/api.php:76 ../../mod/api.php:102 -msgid "Authorize application connection" +#: ../../mod/dfrn_confirm.php:238 +msgid "Response from remote site was not understood." msgstr "" -#: ../../mod/api.php:77 -msgid "Return to your app and insert this Securty Code:" +#: ../../mod/dfrn_confirm.php:247 +msgid "Unexpected response from remote site: " msgstr "" -#: ../../mod/api.php:89 -msgid "Please login to continue." +#: ../../mod/dfrn_confirm.php:255 +msgid "Confirmation completed successfully." msgstr "" -#: ../../mod/api.php:104 -msgid "" -"Do you want to authorize this application to access your posts and contacts, " -"and/or create new posts for you?" +#: ../../mod/dfrn_confirm.php:257 ../../mod/dfrn_confirm.php:271 +#: ../../mod/dfrn_confirm.php:278 +msgid "Remote site reported: " msgstr "" -#: ../../mod/friendica.php:43 -msgid "This is Friendica, version" +#: ../../mod/dfrn_confirm.php:269 +msgid "Temporary failure. Please wait and try again." msgstr "" -#: ../../mod/friendica.php:44 -msgid "running at web location" +#: ../../mod/dfrn_confirm.php:276 +msgid "Introduction failed or was revoked." msgstr "" -#: ../../mod/friendica.php:46 -msgid "" -"Please visit Friendica.com to learn " -"more about the Friendica project." +#: ../../mod/dfrn_confirm.php:421 +msgid "Unable to set contact photo." msgstr "" -#: ../../mod/friendica.php:48 -msgid "Bug reports and issues: please visit" +#: ../../mod/dfrn_confirm.php:473 ../../include/diaspora.php:495 +#: ../../include/conversation.php:79 +#, php-format +msgid "%1$s is now friends with %2$s" msgstr "" -#: ../../mod/friendica.php:49 -msgid "" -"Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - " -"dot com" +#: ../../mod/dfrn_confirm.php:543 +#, php-format +msgid "No user record found for '%s' " msgstr "" -#: ../../mod/friendica.php:54 -msgid "Installed plugins/addons/apps" +#: ../../mod/dfrn_confirm.php:553 +msgid "Our site encryption key is apparently messed up." msgstr "" -#: ../../mod/friendica.php:62 -msgid "No installed plugins/addons/apps" +#: ../../mod/dfrn_confirm.php:564 +msgid "Empty site URL was provided or URL could not be decrypted by us." msgstr "" -#: ../../mod/attach.php:8 -msgid "Item not available." +#: ../../mod/dfrn_confirm.php:585 +msgid "Contact record was not found for you on our site." msgstr "" -#: ../../mod/attach.php:20 -msgid "Item was not found." +#: ../../mod/dfrn_confirm.php:599 +#, php-format +msgid "Site public key not available in contact record for URL %s." msgstr "" -#: ../../mod/viewcontacts.php:25 ../../include/text.php:574 -msgid "View Contacts" +#: ../../mod/dfrn_confirm.php:619 +msgid "" +"The ID provided by your system is a duplicate on our system. It should work " +"if you try again." msgstr "" -#: ../../mod/viewcontacts.php:40 -msgid "No contacts." +#: ../../mod/dfrn_confirm.php:630 +msgid "Unable to set your contact credentials on our system." msgstr "" -#: ../../mod/tagrm.php:41 -msgid "Tag removed" +#: ../../mod/dfrn_confirm.php:684 +msgid "Unable to update your contact profile details on our system" msgstr "" -#: ../../mod/tagrm.php:79 -msgid "Remove Item Tag" +#: ../../mod/dfrn_confirm.php:714 +#, php-format +msgid "Connection accepted at %s" msgstr "" -#: ../../mod/tagrm.php:81 -msgid "Select a tag to remove: " +#: ../../addon/facebook/facebook.php:337 +msgid "Facebook disabled" msgstr "" -#: ../../mod/tagrm.php:93 -msgid "Remove" +#: ../../addon/facebook/facebook.php:342 +msgid "Updating contacts" msgstr "" -#: ../../mod/group.php:27 -msgid "Group created." +#: ../../addon/facebook/facebook.php:351 +msgid "Facebook API key is missing." msgstr "" -#: ../../mod/group.php:33 -msgid "Could not create group." +#: ../../addon/facebook/facebook.php:358 +msgid "Facebook Connect" msgstr "" -#: ../../mod/group.php:43 ../../mod/group.php:123 -msgid "Group not found." +#: ../../addon/facebook/facebook.php:364 +msgid "Install Facebook connector for this account." msgstr "" -#: ../../mod/group.php:56 -msgid "Group name changed." +#: ../../addon/facebook/facebook.php:371 +msgid "Remove Facebook connector" msgstr "" -#: ../../mod/group.php:67 ../../mod/profperm.php:19 ../../index.php:287 -msgid "Permission denied" +#: ../../addon/facebook/facebook.php:376 +msgid "" +"Re-authenticate [This is necessary whenever your Facebook password is " +"changed.]" msgstr "" -#: ../../mod/group.php:82 -msgid "Create a group of contacts/friends." +#: ../../addon/facebook/facebook.php:383 +msgid "Post to Facebook by default" msgstr "" -#: ../../mod/group.php:83 ../../mod/group.php:166 -msgid "Group Name: " +#: ../../addon/facebook/facebook.php:387 +msgid "Link all your Facebook friends and conversations on this website" msgstr "" -#: ../../mod/group.php:98 -msgid "Group removed." +#: ../../addon/facebook/facebook.php:389 +msgid "" +"Facebook conversations consist of your profile wall and your friend " +"stream." msgstr "" -#: ../../mod/group.php:100 -msgid "Unable to remove group." +#: ../../addon/facebook/facebook.php:390 +msgid "On this website, your Facebook friend stream is only visible to you." msgstr "" -#: ../../mod/group.php:164 ../../mod/profperm.php:105 -msgid "Click on a contact to add or remove." +#: ../../addon/facebook/facebook.php:391 +msgid "" +"The following settings determine the privacy of your Facebook profile wall " +"on this website." +msgstr "" + +#: ../../addon/facebook/facebook.php:395 +msgid "" +"On this website your Facebook profile wall conversations will only be " +"visible to you" msgstr "" -#: ../../mod/group.php:165 -msgid "Group Editor" +#: ../../addon/facebook/facebook.php:400 +msgid "Do not import your Facebook profile wall conversations" msgstr "" -#: ../../mod/group.php:179 -msgid "Members" +#: ../../addon/facebook/facebook.php:402 +msgid "" +"If you choose to link conversations and leave both of these boxes unchecked, " +"your Facebook profile wall will be merged with your profile wall on this " +"website and your privacy settings on this website will be used to determine " +"who may see the conversations." msgstr "" -#: ../../mod/group.php:194 -msgid "All Contacts" +#: ../../addon/facebook/facebook.php:407 +msgid "Comma separated applications to ignore" msgstr "" -#: ../../mod/events.php:61 -msgid "Event description and start time are required." +#: ../../addon/facebook/facebook.php:475 +#: ../../include/contact_selectors.php:81 +msgid "Facebook" msgstr "" -#: ../../mod/events.php:117 ../../include/nav.php:50 ../../boot.php:1330 -msgid "Events" +#: ../../addon/facebook/facebook.php:476 +msgid "Facebook Connector Settings" msgstr "" -#: ../../mod/events.php:207 -msgid "Create New Event" +#: ../../addon/facebook/facebook.php:490 +msgid "Post to Facebook" msgstr "" -#: ../../mod/events.php:210 -msgid "Previous" +#: ../../addon/facebook/facebook.php:581 +msgid "" +"Post to Facebook cancelled because of multi-network access permission " +"conflict." msgstr "" -#: ../../mod/events.php:220 -msgid "l, F j" +#: ../../addon/facebook/facebook.php:650 +msgid "Image: " msgstr "" -#: ../../mod/events.php:235 -msgid "Edit event" +#: ../../addon/facebook/facebook.php:727 +msgid "View on Friendica" msgstr "" -#: ../../mod/events.php:237 ../../include/text.php:867 -msgid "link to source" +#: ../../addon/facebook/facebook.php:751 +msgid "Facebook post failed. Queued for retry." msgstr "" -#: ../../mod/events.php:305 -msgid "hour:minute" +#: ../../addon/facebook/facebook.php:876 ../../addon/facebook/facebook.php:885 +#: ../../include/bb2diaspora.php:113 +msgid "link" msgstr "" -#: ../../mod/events.php:314 -msgid "Event details" -msgstr "" +#: ../../addon/widgets/widget_like.php:58 +#, php-format +msgid "%d person likes this" +msgid_plural "%d people like this" +msgstr[0] "" +msgstr[1] "" -#: ../../mod/events.php:315 +#: ../../addon/widgets/widget_like.php:61 #, php-format -msgid "Format is %s %s. Starting date and Description are required." -msgstr "" +msgid "%d person doesn't like this" +msgid_plural "%d people don't like this" +msgstr[0] "" +msgstr[1] "" -#: ../../mod/events.php:316 -msgid "Event Starts:" +#: ../../addon/widgets/widgets.php:55 +msgid "Generate new key" msgstr "" -#: ../../mod/events.php:319 -msgid "Finish date/time is not known or not relevant" +#: ../../addon/widgets/widgets.php:58 +msgid "Widgets key" msgstr "" -#: ../../mod/events.php:321 -msgid "Event Finishes:" +#: ../../addon/widgets/widgets.php:60 +msgid "Widgets available" msgstr "" -#: ../../mod/events.php:324 -msgid "Adjust for viewer timezone" +#: ../../addon/widgets/widget_friends.php:40 +msgid "Connect on Friendica!" msgstr "" -#: ../../mod/events.php:326 -msgid "Description:" +#: ../../addon/yourls/yourls.php:55 +msgid "YourLS Settings" msgstr "" -#: ../../mod/events.php:328 ../../include/event.php:37 -#: ../../include/bb2diaspora.php:259 ../../boot.php:961 -msgid "Location:" +#: ../../addon/yourls/yourls.php:57 +msgid "URL: http://" msgstr "" -#: ../../mod/events.php:330 -msgid "Share this event" +#: ../../addon/yourls/yourls.php:62 +msgid "Username:" msgstr "" -#: ../../mod/profperm.php:25 ../../mod/profperm.php:55 -msgid "Invalid profile identifier." +#: ../../addon/yourls/yourls.php:67 +msgid "Password:" msgstr "" -#: ../../mod/profperm.php:101 -msgid "Profile Visibility Editor" +#: ../../addon/yourls/yourls.php:72 +msgid "Use SSL " msgstr "" -#: ../../mod/profperm.php:103 ../../include/nav.php:48 -#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 -#: ../../boot.php:1317 -msgid "Profile" +#: ../../addon/yourls/yourls.php:92 +msgid "yourls Settings saved." msgstr "" -#: ../../mod/profperm.php:114 -msgid "Visible To" +#: ../../addon/nsfw/nsfw.php:47 +msgid "\"Not Safe For Work\" Settings" msgstr "" -#: ../../mod/profperm.php:130 -msgid "All Contacts (with secure profile access)" +#: ../../addon/nsfw/nsfw.php:50 +msgid "Enable NSFW filter" msgstr "" -#: ../../mod/dfrn_poll.php:90 ../../mod/dfrn_poll.php:516 -#, php-format -msgid "%s welcomes %s" +#: ../../addon/nsfw/nsfw.php:53 +msgid "Comma separated words to treat as NSFW" msgstr "" -#: ../../mod/lockview.php:39 -msgid "Remote privacy information not available." +#: ../../addon/nsfw/nsfw.php:58 +msgid "Use /expression/ to provide regular expressions" msgstr "" -#: ../../mod/lockview.php:43 -msgid "Visible to:" +#: ../../addon/nsfw/nsfw.php:74 +msgid "NSFW Settings saved." msgstr "" -#: ../../mod/home.php:26 ../../addon/communityhome/communityhome.php:179 +#: ../../addon/nsfw/nsfw.php:120 #, php-format -msgid "Welcome to %s" +msgid "%s - Click to open/close" msgstr "" -#: ../../include/datetime.php:43 ../../include/datetime.php:45 -msgid "Miscellaneous" +#: ../../addon/communityhome/communityhome.php:28 +#: ../../addon/communityhome/communityhome.php:34 ../../include/nav.php:62 +#: ../../boot.php:706 +msgid "Login" msgstr "" -#: ../../include/datetime.php:121 ../../include/datetime.php:253 -msgid "year" +#: ../../addon/communityhome/communityhome.php:29 +msgid "OpenID" msgstr "" -#: ../../include/datetime.php:126 ../../include/datetime.php:254 -msgid "month" +#: ../../addon/communityhome/communityhome.php:38 +msgid "Last users" msgstr "" -#: ../../include/datetime.php:131 ../../include/datetime.php:256 -msgid "day" +#: ../../addon/communityhome/communityhome.php:81 +msgid "Most active users" msgstr "" -#: ../../include/datetime.php:244 -msgid "never" +#: ../../addon/communityhome/communityhome.php:98 +msgid "Last photos" msgstr "" -#: ../../include/datetime.php:250 -msgid "less than a second ago" +#: ../../addon/communityhome/communityhome.php:133 +msgid "Last likes" msgstr "" -#: ../../include/datetime.php:253 -msgid "years" +#: ../../addon/communityhome/communityhome.php:155 +#: ../../include/conversation.php:23 ../../include/conversation.php:96 +msgid "event" msgstr "" -#: ../../include/datetime.php:254 -msgid "months" +#: ../../addon/uhremotestorage/uhremotestorage.php:84 +#, php-format +msgid "" +"Allow to use your friendica id (%s) to connecto to external unhosted-enabled " +"storage (like ownCloud). See RemoteStorage WebFinger" msgstr "" -#: ../../include/datetime.php:255 -msgid "week" +#: ../../addon/uhremotestorage/uhremotestorage.php:85 +msgid "Template URL (with {category})" msgstr "" -#: ../../include/datetime.php:255 -msgid "weeks" +#: ../../addon/uhremotestorage/uhremotestorage.php:86 +msgid "OAuth end-point" msgstr "" -#: ../../include/datetime.php:256 -msgid "days" +#: ../../addon/uhremotestorage/uhremotestorage.php:87 +msgid "Api" msgstr "" -#: ../../include/datetime.php:257 -msgid "hour" +#: ../../addon/membersince/membersince.php:18 +msgid "Member since:" msgstr "" -#: ../../include/datetime.php:257 -msgid "hours" +#: ../../addon/tictac/tictac.php:20 +msgid "Three Dimensional Tic-Tac-Toe" msgstr "" -#: ../../include/datetime.php:258 -msgid "minute" +#: ../../addon/tictac/tictac.php:53 +msgid "3D Tic-Tac-Toe" msgstr "" -#: ../../include/datetime.php:258 -msgid "minutes" +#: ../../addon/tictac/tictac.php:58 +msgid "New game" msgstr "" -#: ../../include/datetime.php:259 -msgid "second" +#: ../../addon/tictac/tictac.php:59 +msgid "New game with handicap" msgstr "" -#: ../../include/datetime.php:259 -msgid "seconds" +#: ../../addon/tictac/tictac.php:60 +msgid "" +"Three dimensional tic-tac-toe is just like the traditional game except that " +"it is played on multiple levels simultaneously. " msgstr "" -#: ../../include/datetime.php:266 -msgid " ago" +#: ../../addon/tictac/tictac.php:61 +msgid "" +"In this case there are three levels. You win by getting three in a row on " +"any level, as well as up, down, and diagonally across the different levels." msgstr "" -#: ../../include/datetime.php:437 ../../include/profile_advanced.php:30 -#: ../../include/items.php:1285 -msgid "Birthday:" +#: ../../addon/tictac/tictac.php:63 +msgid "" +"The handicap game disables the center position on the middle level because " +"the player claiming this square often has an unfair advantage." msgstr "" -#: ../../include/dba.php:39 -#, php-format -msgid "Cannot locate DNS info for database server '%s'" +#: ../../addon/tictac/tictac.php:182 +msgid "You go first..." msgstr "" -#: ../../include/text.php:232 -msgid "prev" +#: ../../addon/tictac/tictac.php:187 +msgid "I'm going first this time..." msgstr "" -#: ../../include/text.php:234 -msgid "first" +#: ../../addon/tictac/tictac.php:193 +msgid "You won!" msgstr "" -#: ../../include/text.php:263 -msgid "last" +#: ../../addon/tictac/tictac.php:199 ../../addon/tictac/tictac.php:224 +msgid "\"Cat\" game!" msgstr "" -#: ../../include/text.php:266 -msgid "next" +#: ../../addon/tictac/tictac.php:222 +msgid "I won!" msgstr "" -#: ../../include/text.php:553 -msgid "No contacts" +#: ../../addon/randplace/randplace.php:171 +msgid "Randplace Settings" msgstr "" -#: ../../include/text.php:562 -#, php-format -msgid "%d Contact" -msgid_plural "%d Contacts" -msgstr[0] "" -msgstr[1] "" +#: ../../addon/randplace/randplace.php:173 +msgid "Enable Randplace Plugin" +msgstr "" -#: ../../include/text.php:633 ../../include/nav.php:87 -msgid "Search" +#: ../../addon/drpost/drpost.php:35 +msgid "Post to Drupal" msgstr "" -#: ../../include/text.php:719 -msgid "Monday" +#: ../../addon/drpost/drpost.php:72 +msgid "Drupal Post Settings" msgstr "" -#: ../../include/text.php:719 -msgid "Tuesday" +#: ../../addon/drpost/drpost.php:74 +msgid "Enable Drupal Post Plugin" msgstr "" -#: ../../include/text.php:719 -msgid "Wednesday" +#: ../../addon/drpost/drpost.php:79 +msgid "Drupal username" msgstr "" -#: ../../include/text.php:719 -msgid "Thursday" +#: ../../addon/drpost/drpost.php:84 +msgid "Drupal password" msgstr "" -#: ../../include/text.php:719 -msgid "Friday" +#: ../../addon/drpost/drpost.php:89 +msgid "Post Type - article,page,or blog" msgstr "" -#: ../../include/text.php:719 -msgid "Saturday" +#: ../../addon/drpost/drpost.php:94 +msgid "Drupal site URL" msgstr "" -#: ../../include/text.php:719 -msgid "Sunday" +#: ../../addon/drpost/drpost.php:99 +msgid "Drupal site uses clean URLS" msgstr "" -#: ../../include/text.php:723 -msgid "January" +#: ../../addon/drpost/drpost.php:104 +msgid "Post to Drupal by default" msgstr "" -#: ../../include/text.php:723 -msgid "February" +#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:172 +#: ../../addon/posterous/posterous.php:173 +msgid "Post from Friendica" msgstr "" -#: ../../include/text.php:723 -msgid "March" +#: ../../addon/geonames/geonames.php:143 +msgid "Geonames settings updated." msgstr "" -#: ../../include/text.php:723 -msgid "April" +#: ../../addon/geonames/geonames.php:179 +msgid "Geonames Settings" msgstr "" -#: ../../include/text.php:723 -msgid "May" +#: ../../addon/geonames/geonames.php:181 +msgid "Enable Geonames Plugin" msgstr "" -#: ../../include/text.php:723 -msgid "June" +#: ../../addon/js_upload/js_upload.php:43 +msgid "Upload a file" msgstr "" -#: ../../include/text.php:723 -msgid "July" +#: ../../addon/js_upload/js_upload.php:44 +msgid "Drop files here to upload" msgstr "" -#: ../../include/text.php:723 -msgid "August" +#: ../../addon/js_upload/js_upload.php:46 +msgid "Failed" msgstr "" -#: ../../include/text.php:723 -msgid "September" +#: ../../addon/js_upload/js_upload.php:294 +msgid "No files were uploaded." msgstr "" -#: ../../include/text.php:723 -msgid "October" +#: ../../addon/js_upload/js_upload.php:300 +msgid "Uploaded file is empty" msgstr "" -#: ../../include/text.php:723 -msgid "November" +#: ../../addon/js_upload/js_upload.php:323 +msgid "File has an invalid extension, it should be one of " msgstr "" -#: ../../include/text.php:723 -msgid "December" +#: ../../addon/js_upload/js_upload.php:334 +msgid "Upload was cancelled, or server error encountered" msgstr "" -#: ../../include/text.php:793 -msgid "bytes" +#: ../../addon/oembed.old/oembed.php:30 +msgid "OEmbed settings updated" msgstr "" -#: ../../include/text.php:885 -msgid "Select an alternate language" +#: ../../addon/oembed.old/oembed.php:43 +msgid "Use OEmbed for YouTube videos" msgstr "" -#: ../../include/text.php:897 -msgid "default" +#: ../../addon/oembed.old/oembed.php:71 +msgid "URL to embed:" msgstr "" -#: ../../include/poller.php:459 -msgid "From: " +#: ../../addon/impressum/impressum.php:25 +msgid "Impressum" msgstr "" -#: ../../include/nav.php:44 ../../boot.php:700 -msgid "Logout" +#: ../../addon/impressum/impressum.php:38 +#: ../../addon/impressum/impressum.php:40 +#: ../../addon/impressum/impressum.php:70 +msgid "Site Owner" msgstr "" -#: ../../include/nav.php:44 -msgid "End this session" +#: ../../addon/impressum/impressum.php:38 +#: ../../addon/impressum/impressum.php:74 +msgid "Email Address" msgstr "" -#: ../../include/nav.php:47 ../../boot.php:1312 -msgid "Status" +#: ../../addon/impressum/impressum.php:43 +#: ../../addon/impressum/impressum.php:72 +msgid "Postal Address" msgstr "" -#: ../../include/nav.php:47 ../../include/nav.php:111 -msgid "Your posts and conversations" +#: ../../addon/impressum/impressum.php:49 +msgid "" +"The impressum addon needs to be configured!
    Please add at least the " +"owner variable to your config file. For other variables please " +"refer to the README file of the addon." msgstr "" -#: ../../include/nav.php:48 -msgid "Your profile page" +#: ../../addon/impressum/impressum.php:71 +msgid "Site Owners Profile" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1322 -msgid "Photos" +#: ../../addon/impressum/impressum.php:73 +msgid "Notes" msgstr "" -#: ../../include/nav.php:49 -msgid "Your photos" +#: ../../addon/buglink/buglink.php:15 +msgid "Report Bug" msgstr "" -#: ../../include/nav.php:50 -msgid "Your events" +#: ../../addon/blockem/blockem.php:51 +msgid "\"Blockem\" Settings" msgstr "" -#: ../../include/nav.php:51 -msgid "Personal notes" +#: ../../addon/blockem/blockem.php:53 +msgid "Comma separated profile URLS to block" msgstr "" -#: ../../include/nav.php:51 -msgid "Your personal photos" +#: ../../addon/blockem/blockem.php:70 +msgid "BLOCKEM Settings saved." msgstr "" -#: ../../include/nav.php:62 ../../addon/communityhome/communityhome.php:28 -#: ../../addon/communityhome/communityhome.php:34 ../../boot.php:701 -msgid "Login" +#: ../../addon/blockem/blockem.php:105 +#, php-format +msgid "Blocked %s - Click to open/close" msgstr "" -#: ../../include/nav.php:62 -msgid "Sign in" +#: ../../addon/blockem/blockem.php:160 +msgid "Unblock Author" msgstr "" -#: ../../include/nav.php:73 -msgid "Home Page" +#: ../../addon/blockem/blockem.php:162 +msgid "Block Author" msgstr "" -#: ../../include/nav.php:77 -msgid "Create an account" +#: ../../addon/blockem/blockem.php:194 +msgid "blockem settings updated" msgstr "" -#: ../../include/nav.php:82 -msgid "Help and documentation" +#: ../../addon/editplain/editplain.php:46 +msgid "Editplain settings updated." msgstr "" -#: ../../include/nav.php:85 -msgid "Apps" +#: ../../addon/editplain/editplain.php:76 +msgid "Editplain Settings" msgstr "" -#: ../../include/nav.php:85 -msgid "Addon applications, utilities, games" +#: ../../addon/editplain/editplain.php:78 +msgid "Disable richtext status editor" msgstr "" -#: ../../include/nav.php:87 -msgid "Search site content" +#: ../../addon/pageheader/pageheader.php:47 +msgid "\"pageheader\" Settings" msgstr "" -#: ../../include/nav.php:97 -msgid "Conversations on this site" +#: ../../addon/pageheader/pageheader.php:65 +msgid "pageheader Settings saved." msgstr "" -#: ../../include/nav.php:99 -msgid "Directory" +#: ../../addon/viewsrc/viewsrc.php:25 +msgid "View Source" msgstr "" -#: ../../include/nav.php:99 -msgid "People directory" +#: ../../addon/statusnet/statusnet.php:140 +msgid "Post to StatusNet" msgstr "" -#: ../../include/nav.php:109 -msgid "Conversations from your friends" +#: ../../addon/statusnet/statusnet.php:182 +msgid "" +"Please contact your site administrator.
    The provided API URL is not " +"valid." msgstr "" -#: ../../include/nav.php:117 -msgid "Friend Requests" +#: ../../addon/statusnet/statusnet.php:210 +msgid "We could not contact the StatusNet API with the Path you entered." msgstr "" -#: ../../include/nav.php:122 -msgid "Private mail" +#: ../../addon/statusnet/statusnet.php:236 +msgid "StatusNet settings updated." msgstr "" -#: ../../include/nav.php:125 -msgid "Manage" +#: ../../addon/statusnet/statusnet.php:259 +msgid "StatusNet Posting Settings" msgstr "" -#: ../../include/nav.php:125 -msgid "Manage other pages" +#: ../../addon/statusnet/statusnet.php:273 +msgid "Globally Available StatusNet OAuthKeys" msgstr "" -#: ../../include/nav.php:129 ../../boot.php:921 -msgid "Profiles" +#: ../../addon/statusnet/statusnet.php:274 +msgid "" +"There are preconfigured OAuth key pairs for some StatusNet servers " +"available. If you are useing one of them, please use these credentials. If " +"not feel free to connect to any other StatusNet instance (see below)." msgstr "" -#: ../../include/nav.php:129 ../../boot.php:921 -msgid "Manage/edit profiles" +#: ../../addon/statusnet/statusnet.php:282 +msgid "Provide your own OAuth Credentials" msgstr "" -#: ../../include/nav.php:130 -msgid "Manage/edit friends and contacts" +#: ../../addon/statusnet/statusnet.php:283 +msgid "" +"No consumer key pair for StatusNet found. Register your Friendica Account as " +"an desktop client on your StatusNet account, copy the consumer key pair here " +"and enter the API base root.
    Before you register your own OAuth key " +"pair ask the administrator if there is already a key pair for this Friendica " +"installation at your favorited StatusNet installation." msgstr "" -#: ../../include/nav.php:137 -msgid "Admin" +#: ../../addon/statusnet/statusnet.php:285 +msgid "OAuth Consumer Key" msgstr "" -#: ../../include/nav.php:137 -msgid "Site setup and configuration" +#: ../../addon/statusnet/statusnet.php:288 +msgid "OAuth Consumer Secret" msgstr "" -#: ../../include/nav.php:160 -msgid "Nothing new here" +#: ../../addon/statusnet/statusnet.php:291 +msgid "Base API Path (remember the trailing /)" msgstr "" -#: ../../include/message.php:14 -msgid "[no subject]" +#: ../../addon/statusnet/statusnet.php:312 +msgid "" +"To connect to your StatusNet account click the button below to get a " +"security code from StatusNet which you have to copy into the input box below " +"and submit the form. Only your public posts will be posted " +"to StatusNet." msgstr "" -#: ../../include/profile_advanced.php:17 ../../boot.php:963 -msgid "Gender:" +#: ../../addon/statusnet/statusnet.php:313 +msgid "Log in with StatusNet" msgstr "" -#: ../../include/profile_advanced.php:22 -msgid "j F, Y" +#: ../../addon/statusnet/statusnet.php:315 +msgid "Copy the security code from StatusNet here" msgstr "" -#: ../../include/profile_advanced.php:23 -msgid "j F" +#: ../../addon/statusnet/statusnet.php:321 +msgid "Cancel Connection Process" msgstr "" -#: ../../include/profile_advanced.php:34 -msgid "Age:" +#: ../../addon/statusnet/statusnet.php:323 +msgid "Current StatusNet API is" msgstr "" -#: ../../include/profile_advanced.php:37 ../../boot.php:966 -msgid "Status:" +#: ../../addon/statusnet/statusnet.php:324 +msgid "Cancel StatusNet Connection" msgstr "" -#: ../../include/profile_advanced.php:45 ../../boot.php:968 -msgid "Homepage:" +#: ../../addon/statusnet/statusnet.php:335 ../../addon/twitter/twitter.php:189 +msgid "Currently connected to: " msgstr "" -#: ../../include/profile_advanced.php:49 -msgid "Religion:" +#: ../../addon/statusnet/statusnet.php:336 +msgid "" +"If enabled all your public postings can be posted to the " +"associated StatusNet account. You can choose to do so by default (here) or " +"for every posting separately in the posting options when writing the entry." msgstr "" -#: ../../include/profile_advanced.php:51 -msgid "About:" +#: ../../addon/statusnet/statusnet.php:338 +msgid "Allow posting to StatusNet" msgstr "" -#: ../../include/profile_advanced.php:53 -msgid "Hobbies/Interests:" +#: ../../addon/statusnet/statusnet.php:341 +msgid "Send public postings to StatusNet by default" msgstr "" -#: ../../include/profile_advanced.php:55 -msgid "Contact information and Social Networks:" +#: ../../addon/statusnet/statusnet.php:346 ../../addon/twitter/twitter.php:200 +msgid "Clear OAuth configuration" msgstr "" -#: ../../include/profile_advanced.php:57 -msgid "Musical interests:" +#: ../../addon/statusnet/statusnet.php:487 +msgid "API URL" msgstr "" -#: ../../include/profile_advanced.php:59 -msgid "Books, literature:" +#: ../../addon/tumblr/tumblr.php:36 +msgid "Post to Tumblr" msgstr "" -#: ../../include/profile_advanced.php:61 -msgid "Television:" +#: ../../addon/tumblr/tumblr.php:67 +msgid "Tumblr Post Settings" msgstr "" -#: ../../include/profile_advanced.php:63 -msgid "Film/dance/culture/entertainment:" +#: ../../addon/tumblr/tumblr.php:69 +msgid "Enable Tumblr Post Plugin" msgstr "" -#: ../../include/profile_advanced.php:65 -msgid "Love/Romance:" +#: ../../addon/tumblr/tumblr.php:74 +msgid "Tumblr login" msgstr "" -#: ../../include/profile_advanced.php:67 -msgid "Work/employment:" +#: ../../addon/tumblr/tumblr.php:79 +msgid "Tumblr password" msgstr "" -#: ../../include/profile_advanced.php:69 -msgid "School/education:" +#: ../../addon/tumblr/tumblr.php:84 +msgid "Post to Tumblr by default" msgstr "" -#: ../../include/event.php:17 ../../include/bb2diaspora.php:243 -msgid "Starts:" +#: ../../addon/numfriends/numfriends.php:46 +msgid "Numfriends settings updated." msgstr "" -#: ../../include/event.php:27 ../../include/bb2diaspora.php:251 -msgid "Finishes:" +#: ../../addon/numfriends/numfriends.php:77 +msgid "Numfriends Settings" msgstr "" -#: ../../include/items.php:2413 -msgid "A new person is sharing with you at " +#: ../../addon/numfriends/numfriends.php:79 +msgid "How many contacts to display on profile sidebar" msgstr "" -#: ../../include/items.php:2413 -msgid "You have a new follower at " +#: ../../addon/wppost/wppost.php:42 +msgid "Post to Wordpress" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Male" +#: ../../addon/wppost/wppost.php:74 +msgid "WordPress Post Settings" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Female" +#: ../../addon/wppost/wppost.php:76 +msgid "Enable WordPress Post Plugin" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Currently Male" +#: ../../addon/wppost/wppost.php:81 +msgid "WordPress username" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Currently Female" +#: ../../addon/wppost/wppost.php:86 +msgid "WordPress password" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Mostly Male" +#: ../../addon/wppost/wppost.php:91 +msgid "WordPress API URL" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Mostly Female" +#: ../../addon/wppost/wppost.php:96 +msgid "Post to WordPress by default" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Transgender" +#: ../../addon/piwik/piwik.php:70 +msgid "" +"This website is tracked using the Piwik " +"analytics tool." msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Intersex" +#: ../../addon/piwik/piwik.php:73 +#, php-format +msgid "" +"If you do not want that your visits are logged this way you can " +"set a cookie to prevent Piwik from tracking further visits of the site " +"(opt-out)." msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Transsexual" +#: ../../addon/piwik/piwik.php:82 +msgid "Piwik Base URL" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Hermaphrodite" +#: ../../addon/piwik/piwik.php:83 +msgid "Site ID" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Neuter" +#: ../../addon/piwik/piwik.php:84 +msgid "Show opt-out cookie link?" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Non-specific" +#: ../../addon/twitter/twitter.php:78 +msgid "Post to Twitter" msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Other" +#: ../../addon/twitter/twitter.php:124 +msgid "Twitter settings updated." msgstr "" -#: ../../include/profile_selectors.php:6 -msgid "Undecided" +#: ../../addon/twitter/twitter.php:146 +msgid "Twitter Posting Settings" msgstr "" -#: ../../include/profile_selectors.php:19 -msgid "Males" +#: ../../addon/twitter/twitter.php:153 +msgid "" +"No consumer key pair for Twitter found. Please contact your site " +"administrator." msgstr "" -#: ../../include/profile_selectors.php:19 -msgid "Females" +#: ../../addon/twitter/twitter.php:172 +msgid "" +"At this Friendica instance the Twitter plugin was enabled but you have not " +"yet connected your account to your Twitter account. To do so click the " +"button below to get a PIN from Twitter which you have to copy into the input " +"box below and submit the form. Only your public posts will " +"be posted to Twitter." msgstr "" -#: ../../include/profile_selectors.php:19 -msgid "Gay" +#: ../../addon/twitter/twitter.php:173 +msgid "Log in with Twitter" msgstr "" -#: ../../include/profile_selectors.php:19 -msgid "Lesbian" +#: ../../addon/twitter/twitter.php:175 +msgid "Copy the PIN from Twitter here" msgstr "" -#: ../../include/profile_selectors.php:19 -msgid "No Preference" +#: ../../addon/twitter/twitter.php:190 +msgid "" +"If enabled all your public postings can be posted to the " +"associated Twitter account. You can choose to do so by default (here) or for " +"every posting separately in the posting options when writing the entry." msgstr "" -#: ../../include/profile_selectors.php:19 -msgid "Bisexual" +#: ../../addon/twitter/twitter.php:192 +msgid "Allow posting to Twitter" msgstr "" -#: ../../include/profile_selectors.php:19 -msgid "Autosexual" +#: ../../addon/twitter/twitter.php:195 +msgid "Send public postings to Twitter by default" msgstr "" -#: ../../include/profile_selectors.php:19 -msgid "Abstinent" +#: ../../addon/twitter/twitter.php:317 +msgid "Consumer key" msgstr "" -#: ../../include/profile_selectors.php:19 -msgid "Virgin" +#: ../../addon/twitter/twitter.php:318 +msgid "Consumer secret" msgstr "" -#: ../../include/profile_selectors.php:19 -msgid "Deviant" +#: ../../addon/posterous/posterous.php:36 +msgid "Post to Posterous" msgstr "" -#: ../../include/profile_selectors.php:19 -msgid "Fetish" +#: ../../addon/posterous/posterous.php:67 +msgid "Posterous Post Settings" msgstr "" -#: ../../include/profile_selectors.php:19 -msgid "Oodles" +#: ../../addon/posterous/posterous.php:69 +msgid "Enable Posterous Post Plugin" msgstr "" -#: ../../include/profile_selectors.php:19 -msgid "Nonsexual" +#: ../../addon/posterous/posterous.php:74 +msgid "Posterous login" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Single" +#: ../../addon/posterous/posterous.php:79 +msgid "Posterous password" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Lonely" +#: ../../addon/posterous/posterous.php:84 +msgid "Post to Posterous by default" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Available" +#: ../../include/profile_advanced.php:17 ../../boot.php:978 +msgid "Gender:" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Unavailable" +#: ../../include/profile_advanced.php:22 +msgid "j F, Y" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Dating" +#: ../../include/profile_advanced.php:23 +msgid "j F" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Unfaithful" +#: ../../include/profile_advanced.php:30 ../../include/datetime.php:438 +#: ../../include/items.php:1318 +msgid "Birthday:" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Sex Addict" +#: ../../include/profile_advanced.php:34 +msgid "Age:" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Friends" +#: ../../include/profile_advanced.php:37 ../../boot.php:981 +msgid "Status:" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Friends/Benefits" +#: ../../include/profile_advanced.php:45 ../../boot.php:983 +msgid "Homepage:" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Casual" +#: ../../include/profile_advanced.php:47 +msgid "Tags:" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Engaged" +#: ../../include/profile_advanced.php:51 +msgid "Religion:" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Married" +#: ../../include/profile_advanced.php:53 +msgid "About:" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Partners" +#: ../../include/profile_advanced.php:55 +msgid "Hobbies/Interests:" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Cohabiting" +#: ../../include/profile_advanced.php:57 +msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Happy" +#: ../../include/profile_advanced.php:59 +msgid "Musical interests:" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Not Looking" +#: ../../include/profile_advanced.php:61 +msgid "Books, literature:" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Swinger" +#: ../../include/profile_advanced.php:63 +msgid "Television:" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Betrayed" +#: ../../include/profile_advanced.php:65 +msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Separated" +#: ../../include/profile_advanced.php:67 +msgid "Love/Romance:" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Unstable" +#: ../../include/profile_advanced.php:69 +msgid "Work/employment:" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Divorced" +#: ../../include/profile_advanced.php:71 +msgid "School/education:" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Widowed" +#: ../../include/contact_selectors.php:32 +msgid "Unknown | Not categorised" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Uncertain" +#: ../../include/contact_selectors.php:33 +msgid "Block immediately" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Complicated" +#: ../../include/contact_selectors.php:34 +msgid "Shady, spammer, self-marketer" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Don't care" +#: ../../include/contact_selectors.php:35 +msgid "Known to me, but no opinion" msgstr "" -#: ../../include/profile_selectors.php:33 -msgid "Ask me" +#: ../../include/contact_selectors.php:36 +msgid "OK, probably harmless" msgstr "" -#: ../../include/Contact.php:125 ../../include/conversation.php:723 -msgid "View status" +#: ../../include/contact_selectors.php:37 +msgid "Reputable, has my trust" msgstr "" -#: ../../include/Contact.php:126 ../../include/conversation.php:724 -msgid "View profile" +#: ../../include/contact_selectors.php:56 +msgid "Frequently" msgstr "" -#: ../../include/Contact.php:127 ../../include/conversation.php:725 -msgid "View photos" +#: ../../include/contact_selectors.php:57 +msgid "Hourly" msgstr "" -#: ../../include/Contact.php:128 ../../include/Contact.php:141 -#: ../../include/conversation.php:726 -msgid "View recent" +#: ../../include/contact_selectors.php:58 +msgid "Twice daily" msgstr "" -#: ../../include/Contact.php:130 ../../include/Contact.php:141 -#: ../../include/conversation.php:728 -msgid "Send PM" +#: ../../include/contact_selectors.php:59 +msgid "Daily" msgstr "" -#: ../../include/conversation.php:23 ../../include/conversation.php:96 -#: ../../addon/communityhome/communityhome.php:155 -msgid "event" +#: ../../include/contact_selectors.php:60 +msgid "Weekly" msgstr "" -#: ../../include/conversation.php:252 ../../include/conversation.php:508 -msgid "Select" +#: ../../include/contact_selectors.php:61 +msgid "Monthly" msgstr "" -#: ../../include/conversation.php:267 ../../include/conversation.php:602 -#: ../../include/conversation.php:603 -#, php-format -msgid "View %s's profile @ %s" +#: ../../include/contact_selectors.php:77 +msgid "OStatus" msgstr "" -#: ../../include/conversation.php:276 ../../include/conversation.php:614 -#, php-format -msgid "%s from %s" +#: ../../include/contact_selectors.php:78 +msgid "RSS/Atom" msgstr "" -#: ../../include/conversation.php:292 -msgid "View in context" +#: ../../include/contact_selectors.php:82 +msgid "Zot!" msgstr "" -#: ../../include/conversation.php:407 -#, php-format -msgid "%d comment" -msgid_plural "%d comments" -msgstr[0] "" -msgstr[1] "" +#: ../../include/contact_selectors.php:83 +msgid "LinkedIn" +msgstr "" -#: ../../include/conversation.php:410 ../../boot.php:439 -msgid "show more" +#: ../../include/contact_selectors.php:84 +msgid "XMPP/IM" msgstr "" -#: ../../include/conversation.php:470 -msgid "like" +#: ../../include/contact_selectors.php:85 +msgid "MySpace" msgstr "" -#: ../../include/conversation.php:471 -msgid "dislike" +#: ../../include/profile_selectors.php:6 +msgid "Male" msgstr "" -#: ../../include/conversation.php:473 -msgid "Share this" +#: ../../include/profile_selectors.php:6 +msgid "Female" msgstr "" -#: ../../include/conversation.php:473 -msgid "share" +#: ../../include/profile_selectors.php:6 +msgid "Currently Male" msgstr "" -#: ../../include/conversation.php:518 -msgid "add star" +#: ../../include/profile_selectors.php:6 +msgid "Currently Female" msgstr "" -#: ../../include/conversation.php:519 -msgid "remove star" +#: ../../include/profile_selectors.php:6 +msgid "Mostly Male" msgstr "" -#: ../../include/conversation.php:520 -msgid "toggle star status" +#: ../../include/profile_selectors.php:6 +msgid "Mostly Female" msgstr "" -#: ../../include/conversation.php:523 -msgid "starred" +#: ../../include/profile_selectors.php:6 +msgid "Transgender" msgstr "" -#: ../../include/conversation.php:524 -msgid "add tag" +#: ../../include/profile_selectors.php:6 +msgid "Intersex" msgstr "" -#: ../../include/conversation.php:604 -msgid "to" +#: ../../include/profile_selectors.php:6 +msgid "Transsexual" msgstr "" -#: ../../include/conversation.php:605 -msgid "Wall-to-Wall" +#: ../../include/profile_selectors.php:6 +msgid "Hermaphrodite" msgstr "" -#: ../../include/conversation.php:606 -msgid "via Wall-To-Wall:" +#: ../../include/profile_selectors.php:6 +msgid "Neuter" msgstr "" -#: ../../include/conversation.php:648 -msgid "Delete Selected Items" +#: ../../include/profile_selectors.php:6 +msgid "Non-specific" msgstr "" -#: ../../include/conversation.php:778 -#, php-format -msgid "%s likes this." +#: ../../include/profile_selectors.php:6 +msgid "Other" msgstr "" -#: ../../include/conversation.php:778 -#, php-format -msgid "%s doesn't like this." +#: ../../include/profile_selectors.php:6 +msgid "Undecided" msgstr "" -#: ../../include/conversation.php:782 -#, php-format -msgid "%2$d people like this." +#: ../../include/profile_selectors.php:19 +msgid "Males" msgstr "" -#: ../../include/conversation.php:784 -#, php-format -msgid "%2$d people don't like this." +#: ../../include/profile_selectors.php:19 +msgid "Females" msgstr "" -#: ../../include/conversation.php:790 -msgid "and" +#: ../../include/profile_selectors.php:19 +msgid "Gay" msgstr "" -#: ../../include/conversation.php:793 -#, php-format -msgid ", and %d other people" +#: ../../include/profile_selectors.php:19 +msgid "Lesbian" msgstr "" -#: ../../include/conversation.php:794 -#, php-format -msgid "%s like this." +#: ../../include/profile_selectors.php:19 +msgid "No Preference" msgstr "" -#: ../../include/conversation.php:794 -#, php-format -msgid "%s don't like this." +#: ../../include/profile_selectors.php:19 +msgid "Bisexual" msgstr "" -#: ../../include/conversation.php:814 -msgid "Visible to everybody" +#: ../../include/profile_selectors.php:19 +msgid "Autosexual" msgstr "" -#: ../../include/conversation.php:816 -msgid "Please enter a video link/URL:" +#: ../../include/profile_selectors.php:19 +msgid "Abstinent" msgstr "" -#: ../../include/conversation.php:817 -msgid "Please enter an audio link/URL:" +#: ../../include/profile_selectors.php:19 +msgid "Virgin" msgstr "" -#: ../../include/conversation.php:818 -msgid "Tag term:" +#: ../../include/profile_selectors.php:19 +msgid "Deviant" msgstr "" -#: ../../include/conversation.php:819 -msgid "Where are you right now?" +#: ../../include/profile_selectors.php:19 +msgid "Fetish" msgstr "" -#: ../../include/conversation.php:820 -msgid "Enter a title for this item" +#: ../../include/profile_selectors.php:19 +msgid "Oodles" msgstr "" -#: ../../include/conversation.php:864 -msgid "upload photo" +#: ../../include/profile_selectors.php:19 +msgid "Nonsexual" msgstr "" -#: ../../include/conversation.php:866 -msgid "attach file" +#: ../../include/profile_selectors.php:33 +msgid "Single" msgstr "" -#: ../../include/conversation.php:868 -msgid "web link" +#: ../../include/profile_selectors.php:33 +msgid "Lonely" msgstr "" -#: ../../include/conversation.php:869 -msgid "Insert video link" +#: ../../include/profile_selectors.php:33 +msgid "Available" msgstr "" -#: ../../include/conversation.php:870 -msgid "video link" +#: ../../include/profile_selectors.php:33 +msgid "Unavailable" msgstr "" -#: ../../include/conversation.php:871 -msgid "Insert audio link" +#: ../../include/profile_selectors.php:33 +msgid "Dating" msgstr "" -#: ../../include/conversation.php:872 -msgid "audio link" +#: ../../include/profile_selectors.php:33 +msgid "Unfaithful" msgstr "" -#: ../../include/conversation.php:874 -msgid "set location" +#: ../../include/profile_selectors.php:33 +msgid "Sex Addict" msgstr "" -#: ../../include/conversation.php:876 -msgid "clear location" +#: ../../include/profile_selectors.php:33 +msgid "Friends" msgstr "" -#: ../../include/conversation.php:878 -msgid "Set title" +#: ../../include/profile_selectors.php:33 +msgid "Friends/Benefits" msgstr "" -#: ../../include/conversation.php:881 -msgid "permissions" +#: ../../include/profile_selectors.php:33 +msgid "Casual" msgstr "" -#: ../../include/notifier.php:628 ../../include/delivery.php:415 -msgid "(no subject)" +#: ../../include/profile_selectors.php:33 +msgid "Engaged" msgstr "" -#: ../../include/notifier.php:635 ../../include/enotify.php:16 -msgid "noreply" +#: ../../include/profile_selectors.php:33 +msgid "Married" msgstr "" -#: ../../include/diaspora.php:570 -msgid "Sharing notification from Diaspora network" +#: ../../include/profile_selectors.php:33 +msgid "Partners" msgstr "" -#: ../../include/diaspora.php:1862 -msgid "Attachments:" +#: ../../include/profile_selectors.php:33 +msgid "Cohabiting" msgstr "" -#: ../../include/diaspora.php:2045 -#, php-format -msgid "[Relayed] Comment authored by %s from network %s" +#: ../../include/profile_selectors.php:33 +msgid "Happy" msgstr "" -#: ../../include/bb2diaspora.php:53 -msgid "view full size" +#: ../../include/profile_selectors.php:33 +msgid "Not Looking" msgstr "" -#: ../../include/bb2diaspora.php:102 ../../include/bb2diaspora.php:112 -msgid "image/photo" +#: ../../include/profile_selectors.php:33 +msgid "Swinger" msgstr "" -#: ../../include/bb2diaspora.php:102 ../../addon/facebook/facebook.php:869 -#: ../../addon/facebook/facebook.php:878 -msgid "link" +#: ../../include/profile_selectors.php:33 +msgid "Betrayed" msgstr "" -#: ../../include/acl_selectors.php:279 -msgid "Visible to everybody" +#: ../../include/profile_selectors.php:33 +msgid "Separated" msgstr "" -#: ../../include/acl_selectors.php:280 -msgid "show" +#: ../../include/profile_selectors.php:33 +msgid "Unstable" msgstr "" -#: ../../include/acl_selectors.php:281 -msgid "don't show" +#: ../../include/profile_selectors.php:33 +msgid "Divorced" msgstr "" -#: ../../include/enotify.php:8 -msgid "Friendica Notification" +#: ../../include/profile_selectors.php:33 +msgid "Widowed" msgstr "" -#: ../../include/enotify.php:11 -msgid "Thank You," +#: ../../include/profile_selectors.php:33 +msgid "Uncertain" msgstr "" -#: ../../include/enotify.php:13 -#, php-format -msgid "%s Administrator" +#: ../../include/profile_selectors.php:33 +msgid "Complicated" msgstr "" -#: ../../include/enotify.php:28 -#, php-format -msgid "New mail received at %s" +#: ../../include/profile_selectors.php:33 +msgid "Don't care" msgstr "" -#: ../../include/enotify.php:30 -#, php-format -msgid "%s sent you a new private message at %s." +#: ../../include/profile_selectors.php:33 +msgid "Ask me" msgstr "" -#: ../../include/enotify.php:32 -#, php-format -msgid "Please visit %s to view and/or reply to your private messages." +#: ../../include/event.php:17 ../../include/bb2diaspora.php:255 +msgid "Starts:" msgstr "" -#: ../../include/enotify.php:40 -#, php-format -msgid "%s commented on an item at %s" +#: ../../include/event.php:27 ../../include/bb2diaspora.php:263 +msgid "Finishes:" msgstr "" -#: ../../include/enotify.php:41 -#, php-format -msgid "%s commented on an item/conversation you have been following." +#: ../../include/delivery.php:416 ../../include/notifier.php:629 +msgid "(no subject)" msgstr "" -#: ../../include/enotify.php:42 ../../include/enotify.php:51 -#, php-format -msgid "Please visit %s to view and/or reply to the conversation." +#: ../../include/delivery.php:423 ../../include/enotify.php:16 +#: ../../include/notifier.php:636 +msgid "noreply" msgstr "" -#: ../../include/enotify.php:49 -#, php-format -msgid "%s posted to your profile wall at %s" +#: ../../include/text.php:232 +msgid "prev" msgstr "" -#: ../../include/enotify.php:58 -#, php-format -msgid "Introduction received at %s" +#: ../../include/text.php:234 +msgid "first" msgstr "" -#: ../../include/enotify.php:59 -#, php-format -msgid "You've received an introduction from '%s' at %s" +#: ../../include/text.php:263 +msgid "last" msgstr "" -#: ../../include/enotify.php:60 ../../include/enotify.php:73 -#, php-format -msgid "You may visit their profile at %s" +#: ../../include/text.php:266 +msgid "next" msgstr "" -#: ../../include/enotify.php:62 -#, php-format -msgid "Please visit %s to approve or reject the introduction." +#: ../../include/text.php:557 +msgid "No contacts" msgstr "" -#: ../../include/enotify.php:69 +#: ../../include/text.php:566 #, php-format -msgid "Friend suggestion received at %s" +msgid "%d Contact" +msgid_plural "%d Contacts" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/text.php:637 ../../include/nav.php:87 +msgid "Search" msgstr "" -#: ../../include/enotify.php:70 -#, php-format -msgid "You've received a friend suggestion from '%s' at %s" +#: ../../include/text.php:735 +msgid "Monday" msgstr "" -#: ../../include/enotify.php:71 -msgid "Name:" +#: ../../include/text.php:735 +msgid "Tuesday" msgstr "" -#: ../../include/enotify.php:72 -msgid "Photo:" +#: ../../include/text.php:735 +msgid "Wednesday" msgstr "" -#: ../../include/enotify.php:75 -#, php-format -msgid "Please visit %s to approve or reject the suggestion." +#: ../../include/text.php:735 +msgid "Thursday" msgstr "" -#: ../../include/bbcode.php:166 ../../include/bbcode.php:225 -msgid "Image/photo" +#: ../../include/text.php:735 +msgid "Friday" msgstr "" -#: ../../include/contact_selectors.php:32 -msgid "Unknown | Not categorised" +#: ../../include/text.php:735 +msgid "Saturday" msgstr "" -#: ../../include/contact_selectors.php:33 -msgid "Block immediately" +#: ../../include/text.php:735 +msgid "Sunday" msgstr "" -#: ../../include/contact_selectors.php:34 -msgid "Shady, spammer, self-marketer" +#: ../../include/text.php:739 +msgid "January" msgstr "" -#: ../../include/contact_selectors.php:35 -msgid "Known to me, but no opinion" +#: ../../include/text.php:739 +msgid "February" msgstr "" -#: ../../include/contact_selectors.php:36 -msgid "OK, probably harmless" +#: ../../include/text.php:739 +msgid "March" msgstr "" -#: ../../include/contact_selectors.php:37 -msgid "Reputable, has my trust" +#: ../../include/text.php:739 +msgid "April" msgstr "" -#: ../../include/contact_selectors.php:56 -msgid "Frequently" +#: ../../include/text.php:739 +msgid "May" msgstr "" -#: ../../include/contact_selectors.php:57 -msgid "Hourly" +#: ../../include/text.php:739 +msgid "June" msgstr "" -#: ../../include/contact_selectors.php:58 -msgid "Twice daily" +#: ../../include/text.php:739 +msgid "July" msgstr "" -#: ../../include/contact_selectors.php:59 -msgid "Daily" +#: ../../include/text.php:739 +msgid "August" msgstr "" -#: ../../include/contact_selectors.php:60 -msgid "Weekly" +#: ../../include/text.php:739 +msgid "September" msgstr "" -#: ../../include/contact_selectors.php:61 -msgid "Monthly" +#: ../../include/text.php:739 +msgid "October" msgstr "" -#: ../../include/contact_selectors.php:77 -msgid "OStatus" +#: ../../include/text.php:739 +msgid "November" msgstr "" -#: ../../include/contact_selectors.php:78 -msgid "RSS/Atom" +#: ../../include/text.php:739 +msgid "December" msgstr "" -#: ../../include/contact_selectors.php:81 -#: ../../addon/facebook/facebook.php:475 -msgid "Facebook" +#: ../../include/text.php:809 +msgid "bytes" msgstr "" -#: ../../include/contact_selectors.php:82 -msgid "Zot!" +#: ../../include/text.php:901 +msgid "Select an alternate language" msgstr "" -#: ../../include/contact_selectors.php:83 -msgid "LinkedIn" +#: ../../include/text.php:913 +msgid "default" msgstr "" -#: ../../include/contact_selectors.php:84 -msgid "XMPP/IM" +#: ../../include/diaspora.php:570 +msgid "Sharing notification from Diaspora network" msgstr "" -#: ../../include/contact_selectors.php:85 -msgid "MySpace" +#: ../../include/diaspora.php:1895 +msgid "Attachments:" msgstr "" -#: ../../include/auth.php:27 -msgid "Logged out." +#: ../../include/diaspora.php:2078 +#, php-format +msgid "[Relayed] Comment authored by %s from network %s" msgstr "" #: ../../include/oembed.php:128 @@ -4673,746 +4929,698 @@ msgstr "" msgid "Create a new group" msgstr "" -#: ../../include/contact_widgets.php:6 -msgid "Add New Contact" -msgstr "" - -#: ../../include/contact_widgets.php:7 -msgid "Enter address or web location" -msgstr "" - -#: ../../include/contact_widgets.php:8 -msgid "Example: bob@example.com, http://example.com/barbara" -msgstr "" - -#: ../../include/contact_widgets.php:18 -msgid "Invite Friends" +#: ../../include/nav.php:44 ../../boot.php:705 +msgid "Logout" msgstr "" -#: ../../include/contact_widgets.php:24 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/contact_widgets.php:30 -msgid "Find People" +#: ../../include/nav.php:44 +msgid "End this session" msgstr "" -#: ../../include/contact_widgets.php:31 -msgid "Enter name or interest" +#: ../../include/nav.php:47 ../../boot.php:1327 +msgid "Status" msgstr "" -#: ../../include/contact_widgets.php:32 -msgid "Connect/Follow" +#: ../../include/nav.php:47 ../../include/nav.php:111 +msgid "Your posts and conversations" msgstr "" -#: ../../include/contact_widgets.php:33 -msgid "Examples: Robert Morgenstein, Fishing" +#: ../../include/nav.php:48 +msgid "Your profile page" msgstr "" -#: ../../include/contact_widgets.php:36 -msgid "Similar Interests" +#: ../../include/nav.php:49 ../../boot.php:1337 +msgid "Photos" msgstr "" -#: ../../include/contact_widgets.php:68 -msgid "Networks" +#: ../../include/nav.php:49 +msgid "Your photos" msgstr "" -#: ../../include/contact_widgets.php:71 -msgid "All Networks" +#: ../../include/nav.php:50 +msgid "Your events" msgstr "" -#: ../../addon/facebook/facebook.php:337 -msgid "Facebook disabled" +#: ../../include/nav.php:51 +msgid "Personal notes" msgstr "" -#: ../../addon/facebook/facebook.php:342 -msgid "Updating contacts" +#: ../../include/nav.php:51 +msgid "Your personal photos" msgstr "" -#: ../../addon/facebook/facebook.php:351 -msgid "Facebook API key is missing." +#: ../../include/nav.php:62 +msgid "Sign in" msgstr "" -#: ../../addon/facebook/facebook.php:358 -msgid "Facebook Connect" +#: ../../include/nav.php:73 +msgid "Home Page" msgstr "" -#: ../../addon/facebook/facebook.php:364 -msgid "Install Facebook connector for this account." +#: ../../include/nav.php:77 +msgid "Create an account" msgstr "" -#: ../../addon/facebook/facebook.php:371 -msgid "Remove Facebook connector" +#: ../../include/nav.php:82 +msgid "Help and documentation" msgstr "" -#: ../../addon/facebook/facebook.php:376 -msgid "" -"Re-authenticate [This is necessary whenever your Facebook password is " -"changed.]" +#: ../../include/nav.php:85 +msgid "Apps" msgstr "" -#: ../../addon/facebook/facebook.php:383 -msgid "Post to Facebook by default" +#: ../../include/nav.php:85 +msgid "Addon applications, utilities, games" msgstr "" -#: ../../addon/facebook/facebook.php:387 -msgid "Link all your Facebook friends and conversations on this website" +#: ../../include/nav.php:87 +msgid "Search site content" msgstr "" -#: ../../addon/facebook/facebook.php:389 -msgid "" -"Facebook conversations consist of your profile wall and your friend " -"stream." +#: ../../include/nav.php:97 +msgid "Conversations on this site" msgstr "" -#: ../../addon/facebook/facebook.php:390 -msgid "On this website, your Facebook friend stream is only visible to you." +#: ../../include/nav.php:99 +msgid "Directory" msgstr "" -#: ../../addon/facebook/facebook.php:391 -msgid "" -"The following settings determine the privacy of your Facebook profile wall " -"on this website." +#: ../../include/nav.php:99 +msgid "People directory" msgstr "" -#: ../../addon/facebook/facebook.php:395 -msgid "" -"On this website your Facebook profile wall conversations will only be " -"visible to you" +#: ../../include/nav.php:109 +msgid "Conversations from your friends" msgstr "" -#: ../../addon/facebook/facebook.php:400 -msgid "Do not import your Facebook profile wall conversations" +#: ../../include/nav.php:117 +msgid "Friend Requests" msgstr "" -#: ../../addon/facebook/facebook.php:402 -msgid "" -"If you choose to link conversations and leave both of these boxes unchecked, " -"your Facebook profile wall will be merged with your profile wall on this " -"website and your privacy settings on this website will be used to determine " -"who may see the conversations." +#: ../../include/nav.php:119 +msgid "See all notifications" msgstr "" -#: ../../addon/facebook/facebook.php:407 -msgid "Comma separated applications to ignore" +#: ../../include/nav.php:123 +msgid "Private mail" msgstr "" -#: ../../addon/facebook/facebook.php:476 -msgid "Facebook Connector Settings" +#: ../../include/nav.php:126 +msgid "Manage" msgstr "" -#: ../../addon/facebook/facebook.php:490 -msgid "Post to Facebook" +#: ../../include/nav.php:126 +msgid "Manage other pages" msgstr "" -#: ../../addon/facebook/facebook.php:581 -msgid "" -"Post to Facebook cancelled because of multi-network access permission " -"conflict." +#: ../../include/nav.php:130 ../../boot.php:936 +msgid "Profiles" msgstr "" -#: ../../addon/facebook/facebook.php:644 -msgid "Image: " +#: ../../include/nav.php:130 ../../boot.php:936 +msgid "Manage/edit profiles" msgstr "" -#: ../../addon/facebook/facebook.php:720 -msgid "View on Friendica" +#: ../../include/nav.php:131 +msgid "Manage/edit friends and contacts" msgstr "" -#: ../../addon/facebook/facebook.php:744 -msgid "Facebook post failed. Queued for retry." +#: ../../include/nav.php:138 +msgid "Admin" msgstr "" -#: ../../addon/wppost/wppost.php:41 -msgid "Post to Wordpress" +#: ../../include/nav.php:138 +msgid "Site setup and configuration" msgstr "" -#: ../../addon/wppost/wppost.php:73 -msgid "WordPress Post Settings" +#: ../../include/nav.php:161 +msgid "Nothing new here" msgstr "" -#: ../../addon/wppost/wppost.php:75 -msgid "Enable WordPress Post Plugin" +#: ../../include/contact_widgets.php:6 +msgid "Add New Contact" msgstr "" -#: ../../addon/wppost/wppost.php:80 -msgid "WordPress username" +#: ../../include/contact_widgets.php:7 +msgid "Enter address or web location" msgstr "" -#: ../../addon/wppost/wppost.php:85 -msgid "WordPress password" +#: ../../include/contact_widgets.php:8 +msgid "Example: bob@example.com, http://example.com/barbara" msgstr "" -#: ../../addon/wppost/wppost.php:90 -msgid "WordPress API URL" +#: ../../include/contact_widgets.php:18 +msgid "Invite Friends" msgstr "" -#: ../../addon/wppost/wppost.php:95 -msgid "Post to WordPress by default" +#: ../../include/contact_widgets.php:24 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/contact_widgets.php:30 +msgid "Find People" msgstr "" -#: ../../addon/wppost/wppost.php:171 ../../addon/tumblr/tumblr.php:174 -#: ../../addon/posterous/posterous.php:172 -msgid "Post from Friendica" +#: ../../include/contact_widgets.php:31 +msgid "Enter name or interest" msgstr "" -#: ../../addon/uhremotestorage/uhremotestorage.php:56 -#, php-format -msgid "" -"Allow to use your friendika id (%s) to connecto to external unhosted-enabled " -"storage (like ownCloud)" +#: ../../include/contact_widgets.php:32 +msgid "Connect/Follow" msgstr "" -#: ../../addon/uhremotestorage/uhremotestorage.php:57 -msgid "Unhosted DAV storage url" +#: ../../include/contact_widgets.php:33 +msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../addon/tumblr/tumblr.php:35 -msgid "Post to Tumblr" +#: ../../include/contact_widgets.php:36 +msgid "Similar Interests" msgstr "" -#: ../../addon/tumblr/tumblr.php:66 -msgid "Tumblr Post Settings" +#: ../../include/contact_widgets.php:68 +msgid "Networks" msgstr "" -#: ../../addon/tumblr/tumblr.php:68 -msgid "Enable Tumblr Post Plugin" +#: ../../include/contact_widgets.php:71 +msgid "All Networks" msgstr "" -#: ../../addon/tumblr/tumblr.php:73 -msgid "Tumblr login" +#: ../../include/auth.php:29 +msgid "Logged out." msgstr "" -#: ../../addon/tumblr/tumblr.php:78 -msgid "Tumblr password" +#: ../../include/datetime.php:43 ../../include/datetime.php:45 +msgid "Miscellaneous" msgstr "" -#: ../../addon/tumblr/tumblr.php:83 -msgid "Post to Tumblr by default" +#: ../../include/datetime.php:121 ../../include/datetime.php:253 +msgid "year" msgstr "" -#: ../../addon/oembed/oembed.php:30 -msgid "OEmbed settings updated" +#: ../../include/datetime.php:126 ../../include/datetime.php:254 +msgid "month" msgstr "" -#: ../../addon/oembed/oembed.php:43 -msgid "Use OEmbed for YouTube videos" +#: ../../include/datetime.php:131 ../../include/datetime.php:256 +msgid "day" msgstr "" -#: ../../addon/oembed/oembed.php:71 -msgid "URL to embed:" +#: ../../include/datetime.php:244 +msgid "never" msgstr "" -#: ../../addon/posterous/posterous.php:35 -msgid "Post to Posterous" +#: ../../include/datetime.php:250 +msgid "less than a second ago" msgstr "" -#: ../../addon/posterous/posterous.php:66 -msgid "Posterous Post Settings" +#: ../../include/datetime.php:253 +msgid "years" msgstr "" -#: ../../addon/posterous/posterous.php:68 -msgid "Enable Posterous Post Plugin" +#: ../../include/datetime.php:254 +msgid "months" msgstr "" -#: ../../addon/posterous/posterous.php:73 -msgid "Posterous login" +#: ../../include/datetime.php:255 +msgid "week" msgstr "" -#: ../../addon/posterous/posterous.php:78 -msgid "Posterous password" +#: ../../include/datetime.php:255 +msgid "weeks" msgstr "" -#: ../../addon/posterous/posterous.php:83 -msgid "Post to Posterous by default" +#: ../../include/datetime.php:256 +msgid "days" msgstr "" -#: ../../addon/js_upload/js_upload.php:43 -msgid "Upload a file" +#: ../../include/datetime.php:257 +msgid "hour" msgstr "" -#: ../../addon/js_upload/js_upload.php:44 -msgid "Drop files here to upload" +#: ../../include/datetime.php:257 +msgid "hours" msgstr "" -#: ../../addon/js_upload/js_upload.php:46 -msgid "Failed" +#: ../../include/datetime.php:258 +msgid "minute" msgstr "" -#: ../../addon/js_upload/js_upload.php:294 -msgid "No files were uploaded." +#: ../../include/datetime.php:258 +msgid "minutes" msgstr "" -#: ../../addon/js_upload/js_upload.php:300 -msgid "Uploaded file is empty" +#: ../../include/datetime.php:259 +msgid "second" msgstr "" -#: ../../addon/js_upload/js_upload.php:323 -msgid "File has an invalid extension, it should be one of " +#: ../../include/datetime.php:259 +msgid "seconds" msgstr "" -#: ../../addon/js_upload/js_upload.php:334 -msgid "Upload was cancelled, or server error encountered" +#: ../../include/datetime.php:267 +#, php-format +msgid "%1$d %2$s ago" msgstr "" -#: ../../addon/buglink/buglink.php:15 -msgid "Report Bug" +#: ../../include/poller.php:459 +msgid "From: " msgstr "" -#: ../../addon/statusnet/statusnet.php:141 -msgid "Post to StatusNet" +#: ../../include/bbcode.php:166 ../../include/bbcode.php:225 +msgid "Image/photo" msgstr "" -#: ../../addon/statusnet/statusnet.php:183 -msgid "" -"Please contact your site administrator.
    The provided API URL is not " -"valid." +#: ../../include/dba.php:39 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../addon/statusnet/statusnet.php:211 -msgid "We could not contact the StatusNet API with the Path you entered." +#: ../../include/message.php:14 +msgid "[no subject]" msgstr "" -#: ../../addon/statusnet/statusnet.php:238 -msgid "StatusNet settings updated." +#: ../../include/acl_selectors.php:279 +msgid "Visible to everybody" msgstr "" -#: ../../addon/statusnet/statusnet.php:261 -msgid "StatusNet Posting Settings" +#: ../../include/acl_selectors.php:280 +msgid "show" msgstr "" -#: ../../addon/statusnet/statusnet.php:275 -msgid "Globally Available StatusNet OAuthKeys" +#: ../../include/acl_selectors.php:281 +msgid "don't show" msgstr "" -#: ../../addon/statusnet/statusnet.php:276 -msgid "" -"There are preconfigured OAuth key pairs for some StatusNet servers " -"available. If you are useing one of them, please use these credentials. If " -"not feel free to connect to any other StatusNet instance (see below)." +#: ../../include/enotify.php:8 +msgid "Friendica Notification" msgstr "" -#: ../../addon/statusnet/statusnet.php:284 -msgid "Provide your own OAuth Credentials" +#: ../../include/enotify.php:11 +msgid "Thank You," msgstr "" -#: ../../addon/statusnet/statusnet.php:285 -msgid "" -"No consumer key pair for StatusNet found. Register your Friendica Account as " -"an desktop client on your StatusNet account, copy the consumer key pair here " -"and enter the API base root.
    Before you register your own OAuth key " -"pair ask the administrator if there is already a key pair for this Friendica " -"installation at your favorited StatusNet installation." +#: ../../include/enotify.php:13 +#, php-format +msgid "%s Administrator" msgstr "" -#: ../../addon/statusnet/statusnet.php:287 -msgid "OAuth Consumer Key" +#: ../../include/enotify.php:28 +#, php-format +msgid "New mail received at %s" msgstr "" -#: ../../addon/statusnet/statusnet.php:290 -msgid "OAuth Consumer Secret" +#: ../../include/enotify.php:30 +#, php-format +msgid "%s sent you a new private message at %s." msgstr "" -#: ../../addon/statusnet/statusnet.php:293 -msgid "Base API Path (remember the trailing /)" +#: ../../include/enotify.php:32 +#, php-format +msgid "Please visit %s to view and/or reply to your private messages." msgstr "" -#: ../../addon/statusnet/statusnet.php:314 -msgid "" -"To connect to your StatusNet account click the button below to get a " -"security code from StatusNet which you have to copy into the input box below " -"and submit the form. Only your public posts will be posted " -"to StatusNet." +#: ../../include/enotify.php:40 +#, php-format +msgid "%s commented on an item at %s" msgstr "" -#: ../../addon/statusnet/statusnet.php:315 -msgid "Log in with StatusNet" +#: ../../include/enotify.php:41 +#, php-format +msgid "%s commented on an item/conversation you have been following." msgstr "" -#: ../../addon/statusnet/statusnet.php:317 -msgid "Copy the security code from StatusNet here" +#: ../../include/enotify.php:42 ../../include/enotify.php:51 +#: ../../include/enotify.php:60 ../../include/enotify.php:69 +#, php-format +msgid "Please visit %s to view and/or reply to the conversation." msgstr "" -#: ../../addon/statusnet/statusnet.php:323 -msgid "Cancel Connection Process" +#: ../../include/enotify.php:49 +#, php-format +msgid "%s posted to your profile wall at %s" msgstr "" -#: ../../addon/statusnet/statusnet.php:325 -msgid "Current StatusNet API is" +#: ../../include/enotify.php:58 +#, php-format +msgid "%s tagged you at %s" msgstr "" -#: ../../addon/statusnet/statusnet.php:326 -msgid "Cancel StatusNet Connection" +#: ../../include/enotify.php:67 +#, php-format +msgid "%s tagged your post at %s" msgstr "" -#: ../../addon/statusnet/statusnet.php:337 ../../addon/twitter/twitter.php:188 -msgid "Currently connected to: " +#: ../../include/enotify.php:76 +#, php-format +msgid "Introduction received at %s" msgstr "" -#: ../../addon/statusnet/statusnet.php:338 -msgid "" -"If enabled all your public postings can be posted to the " -"associated StatusNet account. You can choose to do so by default (here) or " -"for every posting separately in the posting options when writing the entry." +#: ../../include/enotify.php:77 +#, php-format +msgid "You've received an introduction from '%s' at %s" msgstr "" -#: ../../addon/statusnet/statusnet.php:340 -msgid "Allow posting to StatusNet" +#: ../../include/enotify.php:78 ../../include/enotify.php:91 +#, php-format +msgid "You may visit their profile at %s" msgstr "" -#: ../../addon/statusnet/statusnet.php:343 -msgid "Send public postings to StatusNet by default" +#: ../../include/enotify.php:80 +#, php-format +msgid "Please visit %s to approve or reject the introduction." msgstr "" -#: ../../addon/statusnet/statusnet.php:348 ../../addon/twitter/twitter.php:199 -msgid "Clear OAuth configuration" +#: ../../include/enotify.php:87 +#, php-format +msgid "Friend suggestion received at %s" msgstr "" -#: ../../addon/statusnet/statusnet.php:478 -msgid "API URL" +#: ../../include/enotify.php:88 +#, php-format +msgid "You've received a friend suggestion from '%s' at %s" msgstr "" -#: ../../addon/widgets/widgets.php:55 -msgid "Generate new key" +#: ../../include/enotify.php:89 +msgid "Name:" msgstr "" -#: ../../addon/widgets/widgets.php:58 -msgid "Widgets key" +#: ../../include/enotify.php:90 +msgid "Photo:" msgstr "" -#: ../../addon/widgets/widgets.php:60 -msgid "Widgets available" +#: ../../include/enotify.php:93 +#, php-format +msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../addon/widgets/widget_friends.php:40 -msgid "Connect on Friendica!" +#: ../../include/items.php:2450 +msgid "A new person is sharing with you at " msgstr "" -#: ../../addon/widgets/widget_like.php:58 -#, php-format -msgid "%d person likes this" -msgid_plural "%d people like this" -msgstr[0] "" -msgstr[1] "" - -#: ../../addon/widgets/widget_like.php:61 -#, php-format -msgid "%d person doesn't like this" -msgid_plural "%d people don't like this" -msgstr[0] "" -msgstr[1] "" +#: ../../include/items.php:2450 +msgid "You have a new follower at " +msgstr "" -#: ../../addon/twitter/twitter.php:78 -msgid "Post to Twitter" +#: ../../include/bb2diaspora.php:64 +msgid "view full size" msgstr "" -#: ../../addon/twitter/twitter.php:123 -msgid "Twitter settings updated." +#: ../../include/bb2diaspora.php:113 ../../include/bb2diaspora.php:123 +#: ../../include/bb2diaspora.php:124 +msgid "image/photo" msgstr "" -#: ../../addon/twitter/twitter.php:145 -msgid "Twitter Posting Settings" +#: ../../include/security.php:20 +msgid "Welcome " msgstr "" -#: ../../addon/twitter/twitter.php:152 -msgid "" -"No consumer key pair for Twitter found. Please contact your site " -"administrator." +#: ../../include/security.php:21 +msgid "Please upload a profile photo." msgstr "" -#: ../../addon/twitter/twitter.php:171 -msgid "" -"At this Friendica instance the Twitter plugin was enabled but you have not " -"yet connected your account to your Twitter account. To do so click the " -"button below to get a PIN from Twitter which you have to copy into the input " -"box below and submit the form. Only your public posts will " -"be posted to Twitter." +#: ../../include/security.php:24 +msgid "Welcome back " msgstr "" -#: ../../addon/twitter/twitter.php:172 -msgid "Log in with Twitter" +#: ../../include/Contact.php:131 ../../include/conversation.php:744 +msgid "View status" msgstr "" -#: ../../addon/twitter/twitter.php:174 -msgid "Copy the PIN from Twitter here" +#: ../../include/Contact.php:132 ../../include/conversation.php:745 +msgid "View profile" msgstr "" -#: ../../addon/twitter/twitter.php:189 -msgid "" -"If enabled all your public postings can be posted to the " -"associated Twitter account. You can choose to do so by default (here) or for " -"every posting separately in the posting options when writing the entry." +#: ../../include/Contact.php:133 ../../include/conversation.php:746 +msgid "View photos" msgstr "" -#: ../../addon/twitter/twitter.php:191 -msgid "Allow posting to Twitter" +#: ../../include/Contact.php:134 ../../include/Contact.php:147 +#: ../../include/conversation.php:747 +msgid "View recent" msgstr "" -#: ../../addon/twitter/twitter.php:194 -msgid "Send public postings to Twitter by default" +#: ../../include/Contact.php:136 ../../include/Contact.php:147 +#: ../../include/conversation.php:749 +msgid "Send PM" msgstr "" -#: ../../addon/twitter/twitter.php:301 -msgid "Consumer key" +#: ../../include/conversation.php:141 +msgid "post/item" msgstr "" -#: ../../addon/twitter/twitter.php:302 -msgid "Consumer secret" +#: ../../include/conversation.php:142 +#, php-format +msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../addon/impressum/impressum.php:25 -msgid "Impressum" +#: ../../include/conversation.php:279 ../../include/conversation.php:535 +msgid "Select" msgstr "" -#: ../../addon/impressum/impressum.php:38 -#: ../../addon/impressum/impressum.php:40 -#: ../../addon/impressum/impressum.php:70 -msgid "Site Owner" +#: ../../include/conversation.php:294 ../../include/conversation.php:623 +#: ../../include/conversation.php:624 +#, php-format +msgid "View %s's profile @ %s" msgstr "" -#: ../../addon/impressum/impressum.php:38 -#: ../../addon/impressum/impressum.php:74 -msgid "Email Address" +#: ../../include/conversation.php:303 ../../include/conversation.php:635 +#, php-format +msgid "%s from %s" msgstr "" -#: ../../addon/impressum/impressum.php:43 -#: ../../addon/impressum/impressum.php:72 -msgid "Postal Address" +#: ../../include/conversation.php:319 +msgid "View in context" msgstr "" -#: ../../addon/impressum/impressum.php:49 -msgid "" -"The impressum addon needs to be configured!
    Please add at least the " -"owner variable to your config file. For other variables please " -"refer to the README file of the addon." +#: ../../include/conversation.php:434 +#, php-format +msgid "%d comment" +msgid_plural "%d comments" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/conversation.php:437 ../../boot.php:444 +msgid "show more" msgstr "" -#: ../../addon/impressum/impressum.php:71 -msgid "Site Owners Profile" +#: ../../include/conversation.php:497 +msgid "like" msgstr "" -#: ../../addon/impressum/impressum.php:73 -msgid "Notes" +#: ../../include/conversation.php:498 +msgid "dislike" msgstr "" -#: ../../addon/tictac/tictac.php:20 -msgid "Three Dimensional Tic-Tac-Toe" +#: ../../include/conversation.php:500 +msgid "Share this" msgstr "" -#: ../../addon/tictac/tictac.php:53 -msgid "3D Tic-Tac-Toe" +#: ../../include/conversation.php:500 +msgid "share" msgstr "" -#: ../../addon/tictac/tictac.php:58 -msgid "New game" +#: ../../include/conversation.php:545 +msgid "add star" msgstr "" -#: ../../addon/tictac/tictac.php:59 -msgid "New game with handicap" +#: ../../include/conversation.php:546 +msgid "remove star" msgstr "" -#: ../../addon/tictac/tictac.php:60 -msgid "" -"Three dimensional tic-tac-toe is just like the traditional game except that " -"it is played on multiple levels simultaneously. " +#: ../../include/conversation.php:547 +msgid "toggle star status" msgstr "" -#: ../../addon/tictac/tictac.php:61 -msgid "" -"In this case there are three levels. You win by getting three in a row on " -"any level, as well as up, down, and diagonally across the different levels." +#: ../../include/conversation.php:550 +msgid "starred" msgstr "" -#: ../../addon/tictac/tictac.php:63 -msgid "" -"The handicap game disables the center position on the middle level because " -"the player claiming this square often has an unfair advantage." +#: ../../include/conversation.php:551 +msgid "add tag" msgstr "" -#: ../../addon/tictac/tictac.php:182 -msgid "You go first..." +#: ../../include/conversation.php:625 +msgid "to" msgstr "" -#: ../../addon/tictac/tictac.php:187 -msgid "I'm going first this time..." +#: ../../include/conversation.php:626 +msgid "Wall-to-Wall" msgstr "" -#: ../../addon/tictac/tictac.php:193 -msgid "You won!" +#: ../../include/conversation.php:627 +msgid "via Wall-To-Wall:" msgstr "" -#: ../../addon/tictac/tictac.php:199 ../../addon/tictac/tictac.php:224 -msgid "\"Cat\" game!" +#: ../../include/conversation.php:669 +msgid "Delete Selected Items" msgstr "" -#: ../../addon/tictac/tictac.php:222 -msgid "I won!" +#: ../../include/conversation.php:801 +#, php-format +msgid "%s likes this." msgstr "" -#: ../../addon/piwik/piwik.php:70 -msgid "" -"This website is tracked using the Piwik " -"analytics tool." +#: ../../include/conversation.php:801 +#, php-format +msgid "%s doesn't like this." msgstr "" -#: ../../addon/piwik/piwik.php:73 +#: ../../include/conversation.php:805 #, php-format -msgid "" -"If you do not want that your visits are logged this way you can " -"set a cookie to prevent Piwik from tracking further visits of the site " -"(opt-out)." +msgid "%2$d people like this." msgstr "" -#: ../../addon/piwik/piwik.php:82 -msgid "Piwik Base URL" +#: ../../include/conversation.php:807 +#, php-format +msgid "%2$d people don't like this." msgstr "" -#: ../../addon/piwik/piwik.php:83 -msgid "Site ID" +#: ../../include/conversation.php:813 +msgid "and" msgstr "" -#: ../../addon/piwik/piwik.php:84 -msgid "Show opt-out cookie link?" +#: ../../include/conversation.php:816 +#, php-format +msgid ", and %d other people" msgstr "" -#: ../../addon/membersince/membersince.php:17 +#: ../../include/conversation.php:817 #, php-format -msgid " - Member since: %s" +msgid "%s like this." msgstr "" -#: ../../addon/communityhome/communityhome.php:29 -msgid "OpenID" +#: ../../include/conversation.php:817 +#, php-format +msgid "%s don't like this." msgstr "" -#: ../../addon/communityhome/communityhome.php:38 -msgid "Last users" +#: ../../include/conversation.php:842 +msgid "Visible to everybody" msgstr "" -#: ../../addon/communityhome/communityhome.php:81 -msgid "Most active users" +#: ../../include/conversation.php:844 +msgid "Please enter a video link/URL:" msgstr "" -#: ../../addon/communityhome/communityhome.php:98 -msgid "Last photos" +#: ../../include/conversation.php:845 +msgid "Please enter an audio link/URL:" msgstr "" -#: ../../addon/communityhome/communityhome.php:133 -msgid "Last likes" +#: ../../include/conversation.php:846 +msgid "Tag term:" msgstr "" -#: ../../addon/pageheader/pageheader.php:47 -msgid "\"pageheader\" Settings" +#: ../../include/conversation.php:847 +msgid "Where are you right now?" msgstr "" -#: ../../addon/pageheader/pageheader.php:65 -msgid "pageheader Settings saved." +#: ../../include/conversation.php:848 +msgid "Enter a title for this item" msgstr "" -#: ../../addon/randplace/randplace.php:170 -msgid "Randplace Settings" +#: ../../include/conversation.php:891 +msgid "upload photo" msgstr "" -#: ../../addon/randplace/randplace.php:172 -msgid "Enable Randplace Plugin" +#: ../../include/conversation.php:893 +msgid "attach file" msgstr "" -#: ../../addon/blockem/blockem.php:47 -msgid "\"Blockem\" Settings" +#: ../../include/conversation.php:895 +msgid "web link" msgstr "" -#: ../../addon/blockem/blockem.php:49 -msgid "Comma separated profile URLS to block" +#: ../../include/conversation.php:896 +msgid "Insert video link" msgstr "" -#: ../../addon/blockem/blockem.php:66 -msgid "BLOCKEM Settings saved." +#: ../../include/conversation.php:897 +msgid "video link" msgstr "" -#: ../../addon/blockem/blockem.php:104 -#, php-format -msgid "Blocked %s - Click to open/close" +#: ../../include/conversation.php:898 +msgid "Insert audio link" msgstr "" -#: ../../addon/nsfw/nsfw.php:47 -msgid "\"Not Safe For Work\" Settings" +#: ../../include/conversation.php:899 +msgid "audio link" msgstr "" -#: ../../addon/nsfw/nsfw.php:49 -msgid "Comma separated words to treat as NSFW" +#: ../../include/conversation.php:901 +msgid "set location" msgstr "" -#: ../../addon/nsfw/nsfw.php:66 -msgid "NSFW Settings saved." +#: ../../include/conversation.php:903 +msgid "clear location" msgstr "" -#: ../../addon/nsfw/nsfw.php:102 -#, php-format -msgid "%s - Click to open/close" +#: ../../include/conversation.php:908 +msgid "permissions" msgstr "" -#: ../../boot.php:437 +#: ../../boot.php:442 msgid "Delete this item?" msgstr "" -#: ../../boot.php:440 +#: ../../boot.php:445 msgid "show fewer" msgstr "" -#: ../../boot.php:683 +#: ../../boot.php:688 msgid "Create a New Account" msgstr "" -#: ../../boot.php:703 +#: ../../boot.php:708 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:704 +#: ../../boot.php:709 msgid "Password: " msgstr "" -#: ../../boot.php:707 +#: ../../boot.php:712 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:713 +#: ../../boot.php:718 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:860 +#: ../../boot.php:875 msgid "Edit profile" msgstr "" -#: ../../boot.php:1027 ../../boot.php:1098 +#: ../../boot.php:1042 ../../boot.php:1113 msgid "g A l F d" msgstr "" -#: ../../boot.php:1028 ../../boot.php:1099 +#: ../../boot.php:1043 ../../boot.php:1114 msgid "F d" msgstr "" -#: ../../boot.php:1053 +#: ../../boot.php:1068 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1054 +#: ../../boot.php:1069 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1077 ../../boot.php:1141 +#: ../../boot.php:1092 ../../boot.php:1156 msgid "[today]" msgstr "" -#: ../../boot.php:1122 +#: ../../boot.php:1137 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1123 +#: ../../boot.php:1138 msgid "Events this week:" msgstr "" -#: ../../boot.php:1135 +#: ../../boot.php:1150 msgid "[No description]" msgstr "" -- cgit v1.2.3 From 135005571f4cfe3170b2f2ce0ea94b39a75c111a Mon Sep 17 00:00:00 2001 From: "Abinoam P. Marques Jr" Date: Sun, 12 Feb 2012 17:27:08 -0800 Subject: Added [th] bbcode tag support. --- include/bbcode.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/bbcode.php b/include/bbcode.php index 1d11f687d..9c70cb494 100755 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -165,6 +165,7 @@ lower-alpha;">$2' ,$Text); $Text = preg_replace("/\[list=((?-i)A)\](.*?)\[\/list\]/ism", '
      $2
    ' ,$Text); + $Text = preg_replace("/\[th\](.*?)\[\/th\]/sm", '$1' ,$Text); $Text = preg_replace("/\[td\](.*?)\[\/td\]/sm", '$1' ,$Text); $Text = preg_replace("/\[tr\](.*?)\[\/tr\]/sm", '$1' ,$Text); $Text = preg_replace("/\[table\](.*?)\[\/table\]/sm", '$1
    ' ,$Text); -- cgit v1.2.3 From 85c831bcbf6f4cc2793d91e4e3fb3da5828a3f60 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 12 Feb 2012 20:56:44 -0800 Subject: finish translation of 'xxxxx wrote:' --- include/bbcode.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index a4a651027..118be1298 100755 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -195,9 +195,11 @@ upper-alpha;">$2' ,$Text); $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/ism","$QuoteLayout", $Text); // Check for [quote=Author] text - $t_wrote = t("wrote"); + + $t_wrote = t('$1 wrote:'); + $Text = preg_replace("/\[quote=[\"\']*(.*?)[\"\']*\](.*?)\[\/quote\]/ism", - "
    $1 wrote: $2
    ", + "
    " . $t_wrote . " $2
    ", $Text); // [img=widthxheight]image source[/img] -- cgit v1.2.3