From d6ca4a1b42083319945cbbeb0affca78e084e63b Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 19 May 2012 14:51:10 +0100 Subject: [PATCH 01/50] Give Darkzero some loving. Everything that used to be hidden with light text on light backgrounds is legible now. --- view/theme/darkzero/style.css | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css index a3df740eba..5a0559e3d7 100644 --- a/view/theme/darkzero/style.css +++ b/view/theme/darkzero/style.css @@ -22,7 +22,11 @@ div.wall-item-content-wrapper.shiny { background-image: url('shiny.png'); } nav #banner #logo-text a { color: #ffffff; } -.wall-item-content-wrapper { border: 1px solid #444444; } +.wall-item-content-wrapper { +border: 1px solid #444444; +background: #444; + +} .wall-item-tools { background-color: #444444; background-image: none;} .comment-wwedit-wrapper{ background-color: #333333; } .comment-edit-preview{ color: #000000; } @@ -118,4 +122,17 @@ input#acl-search { #nav-notifications-menu li:hover { background: #444; +} + +.acpopupitem{ + background:#2e2f2e; +} + +code { + background:#2e2f2e !important; +} + +blockquote { + background:#2e2f2e !important; + color:#eec !important; } \ No newline at end of file From a1b96d11a72a28915725cee898edb461b0a2dd23 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 19 May 2012 15:17:35 +0100 Subject: [PATCH 02/50] Okay, so maybe not *everything* --- view/theme/darkzero/style.css | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css index 5a0559e3d7..a1a684355d 100644 --- a/view/theme/darkzero/style.css +++ b/view/theme/darkzero/style.css @@ -103,7 +103,7 @@ blockquote { } .acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net { - color: #000000; + color: #eec; } input#acl-search { @@ -135,4 +135,13 @@ code { blockquote { background:#2e2f2e !important; color:#eec !important; -} \ No newline at end of file +} + +.group-selected, .nets-selected, .fileas-selected, .categories-selected { + background:#2e2f2e; +} + +#fancybox-content{ + background:#444; +} + From b1c58511ad65b0701db881124cbdf5e414643616 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 19 May 2012 17:20:27 +0100 Subject: [PATCH 03/50] Diabook-dark - some more cleaning up --- view/theme/diabook/diabook-dark/style-network.css | 7 ++++--- view/theme/diabook/diabook-dark/style-profile.css | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css index 678e8597c7..ee2e76d3b0 100644 --- a/view/theme/diabook/diabook-dark/style-network.css +++ b/view/theme/diabook/diabook-dark/style-network.css @@ -464,7 +464,7 @@ code { position: absolute; width: 12em; background: #2e2f2e; - color: #2e2f2e; + color: #eec; margin: 0px; padding: 1em; list-style: none; @@ -667,7 +667,7 @@ nav .nav-menu-icon:hover { } nav .nav-menu-icon.selected { - background-color: #fff; + background-color: #308dbf; } nav .nav-menu-icon img { width: 22px; @@ -1434,7 +1434,8 @@ transition: all 0.2s ease-in-out; } .wall-item-comment-wrapper textarea { height: 2.0em; - width: 100%; + /**No idea what's going on here, but at 100%, it's fugly **/ + width: 98% !important; font-size: 10px; color: #999999; border: 1px solid #2e2e2f; diff --git a/view/theme/diabook/diabook-dark/style-profile.css b/view/theme/diabook/diabook-dark/style-profile.css index 4b6bc15b5b..216ccfc58b 100644 --- a/view/theme/diabook/diabook-dark/style-profile.css +++ b/view/theme/diabook/diabook-dark/style-profile.css @@ -1216,7 +1216,7 @@ right_aside { /* background: #F1F1F1; */ } -right_aside a{color: #1872A2;} +right_aside a{color: #88a9d2;} right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; margin-top:30px;} right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; } From 4484bd0e9736c2ba86900120012b779d51a39df6 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 19 May 2012 17:30:55 +0100 Subject: [PATCH 04/50] Darkzero, another missing part of "everything" --- view/theme/darkzero/style.css | 1 + 1 file changed, 1 insertion(+) diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css index a1a684355d..6f238bec60 100644 --- a/view/theme/darkzero/style.css +++ b/view/theme/darkzero/style.css @@ -130,6 +130,7 @@ input#acl-search { code { background:#2e2f2e !important; + color:#fff !important; } blockquote { From dd86f40f9608afe7b58784530bd2cf117397c59b Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 19 May 2012 16:42:24 -0700 Subject: [PATCH 06/50] set comment permissions explicitly to parent permissions --- boot.php | 2 +- mod/item.php | 19 ++++++++++++++----- util/messages.po | 48 ++++++++++++++++++++++++++++++++++-------------- 3 files changed, 49 insertions(+), 20 deletions(-) diff --git a/boot.php b/boot.php index 7174b68224..f56a703196 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1346' ); +define ( 'FRIENDICA_VERSION', '3.0.1347' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1144 ); diff --git a/mod/item.php b/mod/item.php index 639379fe0e..9f6b2aef43 100644 --- a/mod/item.php +++ b/mod/item.php @@ -218,14 +218,23 @@ function item_post(&$a) { $private = ((strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) ? 1 : 0); - if(($parent_item) && - (($parent_item['private']) + // If this is a comment, set the permissions from the parent. + + if($parent_item) { + $private = 0; + + if(($parent_item['private']) || strlen($parent_item['allow_cid']) || strlen($parent_item['allow_gid']) || strlen($parent_item['deny_cid']) - || strlen($parent_item['deny_gid']) - )) { - $private = 1; + || strlen($parent_item['deny_gid'])) { + $private = 1; + } + + $str_contact_allow = $parent_item['allow_cid']; + $str_group_allow = $parent_item['allow_gid']; + $str_contact_deny = $parent_item['deny_cid']; + $str_group_deny = $parent_item['deny_gid']; } $pubmail_enable = ((x($_REQUEST,'pubmail_enable') && intval($_REQUEST['pubmail_enable']) && (! $private)) ? 1 : 0); diff --git a/util/messages.po b/util/messages.po index cf2f02d4e3..456f50cda5 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1346\n" +"Project-Id-Version: 3.0.1347\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-18 10:00-0700\n" +"POT-Creation-Date: 2012-05-19 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -577,7 +577,7 @@ msgstr "" msgid "Community" msgstr "" -#: ../../mod/community.php:61 ../../mod/search.php:128 +#: ../../mod/community.php:61 ../../mod/search.php:134 msgid "No results." msgstr "" @@ -1691,7 +1691,8 @@ msgstr "" #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752 #: ../../addon/facebook/facebook.php:688 #: ../../addon/facebook/facebook.php:1178 -#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2738 +#: ../../addon/public_server/public_server.php:62 +#: ../../addon/testdrive/testdrive.php:61 ../../include/items.php:2738 #: ../../boot.php:696 msgid "Administrator" msgstr "" @@ -3833,6 +3834,11 @@ msgstr "" msgid "%1$s changed %2$s to “%3$s”" msgstr "" +#: ../../mod/profiles.php:332 +#, php-format +msgid " - Visit %1$s's %2$s" +msgstr "" + #: ../../mod/profiles.php:335 #, php-format msgid "%1$s has an updated %2$s, changing %3$s." @@ -4857,6 +4863,25 @@ msgstr "" msgid "Enable Geonames Plugin" msgstr "" +#: ../../addon/public_server/public_server.php:126 +#: ../../addon/testdrive/testdrive.php:88 +#, php-format +msgid "Your account on %s will expire in a few days." +msgstr "" + +#: ../../addon/public_server/public_server.php:127 +msgid "Your Friendica account is about to expire." +msgstr "" + +#: ../../addon/public_server/public_server.php:128 +#, php-format +msgid "" +"Hi %1$s,\n" +"\n" +"Your account on %2$s will expire in less than five days. You may keep your " +"account by logging in at least once every 30 days" +msgstr "" + #: ../../addon/js_upload/js_upload.php:43 msgid "Upload a file" msgstr "" @@ -5116,16 +5141,11 @@ msgstr "" msgid "Gravatar settings updated." msgstr "" -#: ../../addon/testdrive/testdrive.php:85 -#, php-format -msgid "Your account on %s will expire in a few days." -msgstr "" - -#: ../../addon/testdrive/testdrive.php:86 +#: ../../addon/testdrive/testdrive.php:89 msgid "Your Friendica test account is about to expire." msgstr "" -#: ../../addon/testdrive/testdrive.php:87 +#: ../../addon/testdrive/testdrive.php:90 #, php-format msgid "" "Hi %1$s,\n" @@ -6201,12 +6221,12 @@ msgstr "" msgid "Finishes:" msgstr "" -#: ../../include/delivery.php:452 ../../include/notifier.php:652 +#: ../../include/delivery.php:455 ../../include/notifier.php:659 msgid "(no subject)" msgstr "" -#: ../../include/delivery.php:459 ../../include/enotify.php:23 -#: ../../include/notifier.php:659 +#: ../../include/delivery.php:462 ../../include/enotify.php:23 +#: ../../include/notifier.php:666 msgid "noreply" msgstr "" From c6104fb856cfe282cd56a29d4007903382f960e0 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sun, 20 May 2012 01:44:07 +0100 Subject: [PATCH 07/50] Darkzero-NS + 'Friendicaland' countries. --- js/country.js | 6 +-- view/theme/darkzero-NS/style.css | 75 ++++++++++++++++++++++++++++---- 2 files changed, 69 insertions(+), 12 deletions(-) diff --git a/js/country.js b/js/country.js index 1c75055801..8d218bde68 100644 --- a/js/country.js +++ b/js/country.js @@ -9,7 +9,7 @@ // var gLngMaxStateLength=0; var gLngMaxCountryLength=0; -var gLngNumberCountries=252; +var gLngNumberCountries=253; var gLngNumberStates=0; var gLngSelectedCountry=0; var gLngSelectedState=0; @@ -17,7 +17,7 @@ var gArCountryInfo; var gArStateInfo; // NOTE: // Some editors may exhibit problems viewing 2803 characters... -var sCountryString = "|Afghanistan|Albania|Algeria|American Samoa|Angola|Anguilla|Antartica|Antigua and Barbuda|Argentina|Armenia|Aruba|Ashmore and Cartier Island|Australia|Austria|Azerbaijan|Bahamas|Bahrain|Bangladesh|Barbados|Belarus|Belgium|Belize|Benin|Bermuda|Bhutan|Bolivia|Bosnia and Herzegovina|Botswana|Brazil|British Virgin Islands|Brunei|Bulgaria|Burkina Faso|Burma|Burundi|Cambodia|Cameroon|Canada|Cape Verde|Cayman Islands|Central African Republic|Chad|Chile|China|Christmas Island|Clipperton Island|Cocos (Keeling) Islands|Colombia|Comoros|Congo, Democratic Republic of the|Congo, Republic of the|Cook Islands|Costa Rica|Cote d'Ivoire|Croatia|Cuba|Cyprus|Czech Republic|Denmark|Djibouti|Dominica|Dominican Republic|Ecuador|Egypt|El Salvador|Equatorial Guinea|Eritrea|Estonia|Ethiopia|Europa Island|Falkland Islands (Islas Malvinas)|Faroe Islands|Fiji|Finland|France|French Guiana|French Polynesia|French Southern and Antarctic Lands|Gabon|Gambia, The|Gaza Strip|Georgia|Germany|Ghana|Gibraltar|Glorioso Islands|Greece|Greenland|Grenada|Guadeloupe|Guam|Guatemala|Guernsey|Guinea|Guinea-Bissau|Guyana|Haiti|Heard Island and McDonald Islands|Holy See (Vatican City)|Honduras|Hong Kong|Howland Island|Hungary|Iceland|India|Indonesia|Iran|Iraq|Ireland|Ireland, Northern|Israel|Italy|Jamaica|Jan Mayen|Japan|Jarvis Island|Jersey|Johnston Atoll|Jordan|Juan de Nova Island|Kazakhstan|Kenya|Kiribati|Korea, North|Korea, South|Kuwait|Kyrgyzstan|Laos|Latvia|Lebanon|Lesotho|Liberia|Libya|Liechtenstein|Lithuania|Luxembourg|Macau|Macedonia, Former Yugoslav Republic of|Madagascar|Malawi|Malaysia|Maldives|Mali|Malta|Man, Isle of|Marshall Islands|Martinique|Mauritania|Mauritius|Mayotte|Mexico|Micronesia, Federated States of|Midway Islands|Moldova|Monaco|Mongolia|Montserrat|Morocco|Mozambique|Namibia|Nauru|Nepal|Netherlands|Netherlands Antilles|New Caledonia|New Zealand|Nicaragua|Niger|Nigeria|Niue|Norfolk Island|Northern Mariana Islands|Norway|Oman|Pakistan|Palau|Panama|Papua New Guinea|Paraguay|Peru|Philippines|Pitcaim Islands|Poland|Portugal|Puerto Rico|Qatar|Reunion|Romainia|Russia|Rwanda|Saint Helena|Saint Kitts and Nevis|Saint Lucia|Saint Pierre and Miquelon|Saint Vincent and the Grenadines|Samoa|San Marino|Sao Tome and Principe|Saudi Arabia|Scotland|Senegal|Seychelles|Sierra Leone|Singapore|Slovakia|Slovenia|Solomon Islands|Somalia|South Africa|South Georgia and South Sandwich Islands|Spain|Spratly Islands|Sri Lanka|Sudan|Suriname|Svalbard|Swaziland|Sweden|Switzerland|Syria|Taiwan|Tajikistan|Tanzania|Thailand|Tobago|Toga|Tokelau|Tonga|Trinidad|Tunisia|Turkey|Turkmenistan|Tuvalu|Uganda|Ukraine|United Arab Emirates|United Kingdom|Uruguay|USA|Uzbekistan|Vanuatu|Venezuela|Vietnam|Virgin Islands|Wales|Wallis and Futuna|West Bank|Western Sahara|Yemen|Yugoslavia|Zambia|Zimbabwe"; +var sCountryString = "|Afghanistan|Albania|Algeria|American Samoa|Angola|Anguilla|Antartica|Antigua and Barbuda|Argentina|Armenia|Aruba|Ashmore and Cartier Island|Australia|Austria|Azerbaijan|Bahamas|Bahrain|Bangladesh|Barbados|Belarus|Belgium|Belize|Benin|Bermuda|Bhutan|Bolivia|Bosnia and Herzegovina|Botswana|Brazil|British Virgin Islands|Brunei|Bulgaria|Burkina Faso|Burma|Burundi|Cambodia|Cameroon|Canada|Cape Verde|Cayman Islands|Central African Republic|Chad|Chile|China|Christmas Island|Clipperton Island|Cocos (Keeling) Islands|Colombia|Comoros|Congo, Democratic Republic of the|Congo, Republic of the|Cook Islands|Costa Rica|Cote d'Ivoire|Croatia|Cuba|Cyprus|Czech Republic|Denmark|Djibouti|Dominica|Dominican Republic|Ecuador|Egypt|El Salvador|Equatorial Guinea|Eritrea|Estonia|Ethiopia|Europa Island|Falkland Islands (Islas Malvinas)|Faroe Islands|Fiji|Finland|France|French Guiana|French Polynesia|French Southern and Antarctic Lands|Gabon|Gambia, The|Gaza Strip|Georgia|Germany|Ghana|Gibraltar|Glorioso Islands|Greece|Greenland|Grenada|Guadeloupe|Guam|Guatemala|Guernsey|Guinea|Guinea-Bissau|Guyana|Haiti|Heard Island and McDonald Islands|Holy See (Vatican City)|Honduras|Hong Kong|Howland Island|Hungary|Iceland|India|Indonesia|Iran|Iraq|Ireland|Ireland, Northern|Israel|Italy|Jamaica|Jan Mayen|Japan|Jarvis Island|Jersey|Johnston Atoll|Jordan|Juan de Nova Island|Kazakhstan|Kenya|Kiribati|Korea, North|Korea, South|Kuwait|Kyrgyzstan|Laos|Latvia|Lebanon|Lesotho|Liberia|Libya|Liechtenstein|Lithuania|Luxembourg|Macau|Macedonia, Former Yugoslav Republic of|Madagascar|Malawi|Malaysia|Maldives|Mali|Malta|Man, Isle of|Marshall Islands|Martinique|Mauritania|Mauritius|Mayotte|Mexico|Micronesia, Federated States of|Midway Islands|Moldova|Monaco|Mongolia|Montserrat|Morocco|Mozambique|Namibia|Nauru|Nepal|Netherlands|Netherlands Antilles|New Caledonia|New Zealand|Nicaragua|Niger|Nigeria|Niue|Norfolk Island|Northern Mariana Islands|Norway|Oman|Pakistan|Palau|Panama|Papua New Guinea|Paraguay|Peru|Philippines|Pitcaim Islands|Poland|Portugal|Puerto Rico|Qatar|Reunion|Romainia|Russia|Rwanda|Saint Helena|Saint Kitts and Nevis|Saint Lucia|Saint Pierre and Miquelon|Saint Vincent and the Grenadines|Samoa|San Marino|Sao Tome and Principe|Saudi Arabia|Scotland|Senegal|Seychelles|Sierra Leone|Singapore|Slovakia|Slovenia|Solomon Islands|Somalia|South Africa|South Georgia and South Sandwich Islands|Spain|Spratly Islands|Sri Lanka|Sudan|Suriname|Svalbard|Swaziland|Sweden|Switzerland|Syria|Taiwan|Tajikistan|Tanzania|Thailand|Tobago|Toga|Tokelau|Tonga|Trinidad|Tunisia|Turkey|Turkmenistan|Tuvalu|Uganda|Ukraine|United Arab Emirates|United Kingdom|Uruguay|USA|Uzbekistan|Vanuatu|Venezuela|Vietnam|Virgin Islands|Wales|Wallis and Futuna|West Bank|Western Sahara|Yemen|Yugoslavia|Zambia|Zimbabwe|Friendicaland" var aStates = new Array(); aStates[0]=""; @@ -275,7 +275,7 @@ aStates[249]="|'Adan|'Ataq|Abyan|Al Bayda'|Al Hudaydah|Al Jawf|Al Mahrah|Al Mahw aStates[250]="|Kosovo|Montenegro|Serbia|Vojvodina"; aStates[251]="|Central|Copperbelt|Eastern|Luapula|Lusaka|North-Western|Northern|Southern|Western"; aStates[252]="|Bulawayo|Harare|ManicalandMashonaland Central|Mashonaland East|Mashonaland West|Masvingo|Matabeleland North|Matabeleland South|Midlands"; - +aStates[253]="Self Hosted|Private Server|Architects Of Sleep|DFRN|Distributed Friend Network|Free-Beer.ch|Foojbook|Free-Haven|Friendica.eu|Friendika.me.4.it|Friendika - I Ask Questions|Frndc.com|Hipatia|Hungerfreunde|Kaluguran Community|Kak Ste?|Karl.Markx.pm|Loozah Social Club|MyFriendica.net|MyFriendNetwork|Oi!|OpenMindSpace|Oradons Friendica|Recolutionari.es|Sysfu Social Club|theshi.re|Tumpambae|Uzmiac|Other"; /* * gArCountryInfo * (0) Country name diff --git a/view/theme/darkzero-NS/style.css b/view/theme/darkzero-NS/style.css index 047381a92e..1efe093ed0 100644 --- a/view/theme/darkzero-NS/style.css +++ b/view/theme/darkzero-NS/style.css @@ -22,9 +22,14 @@ div.wall-item-content-wrapper.shiny { background-image: url('shiny.png'); } nav #banner #logo-text a { color: #ffffff; } -.wall-item-content-wrapper { border: 1px solid #444444; } +.wall-item-content-wrapper { +border: 1px solid #444444; +background: #444; + +} .wall-item-tools { background-color: #444444; background-image: none;} -.comment-edit-wrapper{ background-color: #333333; } +.comment-wwedit-wrapper{ background-color: #333333; } +.comment-edit-preview{ color: #000000; } .wall-item-content-wrapper.comment { background-color: #444444; border: 0px;} .photo-top-album-name{ background-color: #333333; } .photo-album-image-wrapper .caption { background-color: rgba(51, 51, 51, 0.8); color: #FFFFFF; } @@ -75,25 +80,77 @@ input#dfrn-url { } -#jot-title { +#jot-title, #jot-category { background-color: #333333; border: 1px solid #333333; } #jot-title::-webkit-input-placeholder{ color: #555555!important;} #jot-title:-moz-placeholder{color: #555555!important;} +#jot-category::-webkit-input-placeholder{ color: #555555!important;} +#jot-category:-moz-placeholder{color: #555555!important;} #jot-title:hover, -#jot-title:focus { +#jot-title:focus, +#jot-category:hover, +#jot-category:focus { border: 1px solid #cccccc; } - -.wall-item-content { - max-height: 20000px; - overflow: none; -} blockquote { background: #ddd; color: #000; } + +.acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net { + color: #eec; +} + +input#acl-search { + background-color: #aaa; +} + + + +.notify-seen { + background:#666; +} + +#nav-notifications-menu { + background: #2e2e2f; +} + +#nav-notifications-menu li:hover { + background: #444; +} + +.acpopupitem{ + background:#2e2f2e; +} + +code { + background:#2e2f2e !important; + color:#fff !important; +} + +blockquote { + background:#2e2f2e !important; + color:#eec !important; +} + +.group-selected, .nets-selected, .fileas-selected, .categories-selected { + background:#2e2f2e; +} + +#fancybox-content{ + background:#444; +} + + + + + +.wall-item-content { + max-height: 20000px; + overflow: none; +} \ No newline at end of file From f16a1199408d167bbc7c52dc408ef02b36808317 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 19 May 2012 21:53:27 -0700 Subject: [PATCH 08/50] search with leading @ performs directory search (# for tag search), nothing for text search --- mod/dirfind.php | 3 +++ mod/search.php | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/mod/dirfind.php b/mod/dirfind.php index 34c54dd918..5c5d0e933a 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -17,6 +17,9 @@ function dirfind_init(&$a) { function dirfind_content(&$a) { $search = notags(trim($_REQUEST['search'])); + + if(strpos($search,'@') === 0) + $search = substr($search,1); $o = ''; diff --git a/mod/search.php b/mod/search.php index 635c87b705..3e6bf68aa6 100644 --- a/mod/search.php +++ b/mod/search.php @@ -80,7 +80,7 @@ function search_content(&$a) { $o = '' . "\r\n"; - $o .= '

' . t('Search This Site') . '

'; + $o .= '

' . t('Search') . '

'; if(x($a->data,'search')) $search = notags(trim($a->data['search'])); @@ -101,6 +101,10 @@ function search_content(&$a) { $tag = true; $search = substr($search,1); } + if(strpos($search,'@') === 0) { + require_once('mod/dirfind.php'); + return dirfind_content($a); + } if(! $search) return $o; From 2ac55c9f21f859e626da94fd6c87015c066603ee Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Sun, 20 May 2012 14:37:20 -0400 Subject: [PATCH 09/50] fix dispy light Signed-off-by: Simon L'nu --- view/theme/dispy/light/style.css | 2 +- view/theme/dispy/light/style.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index 1099f0913b..eb6abee71a 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -56,7 +56,7 @@ h6{font-size:xx-small;} .tool{margin:5px 0;list-style:none;} #articlemain{width:100%;height:100%;margin:0 auto;} .button,#profile-listing-desc{color:#111111;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;} -.button a,#profile-listing-desc a{color:#eeeeec;font-weight:bold;} +.button a,#profile-listing-desc a{color:#111111;font-weight:bold;} [class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#111111;border:1px outset #eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} .intro-approve-as-friend-desc{margin-top:10px;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index 4e1b850312..ed9dfdd698 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -295,7 +295,7 @@ h6 { .box_shadow(4px, 4px, 7px); } a { - color: @bg_colour; + color: @main_colour; // font-size: smaller; font-weight: bold; } From afaf9ec74fe0662de76deabd11d630f871802579 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 20 May 2012 18:30:02 -0700 Subject: [PATCH 10/50] rev update --- boot.php | 21 ++++++- include/crypto.php | 36 +++++++++++- include/delivery.php | 2 +- include/notifier.php | 32 ++++++++--- mod/dfrn_confirm.php | 15 ++--- mod/hostxrd.php | 22 +------- mod/register.php | 37 +++---------- util/messages.po | 128 +++++++++++++++++++++---------------------- 8 files changed, 158 insertions(+), 135 deletions(-) diff --git a/boot.php b/boot.php index f56a703196..4b4788dbde 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1347' ); +define ( 'FRIENDICA_VERSION', '3.0.1348' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1144 ); @@ -1323,6 +1323,25 @@ if(! function_exists('proc_run')) { $a = get_app(); $args = func_get_args(); + + $newargs = array(); + if(! count($args)) + return; + + // expand any arrays + + foreach($args as $arg) { + if(is_array($arg)) { + foreach($arg as $n) { + $newargs[] = $n; + } + } + else + $newargs[] = $arg; + } + + $args = $newargs; + $arr = array('args' => $args, 'run_cmd' => true); call_hooks("proc_run", $arr); diff --git a/include/crypto.php b/include/crypto.php index 0feb45c247..6fc9a287e4 100644 --- a/include/crypto.php +++ b/include/crypto.php @@ -292,4 +292,38 @@ function zot_unencapsulate($data,$prvkey) { $ret['sender'] = $s; $ret['data'] = aes_unencapsulate($x,$prvkey); return $ret; -} \ No newline at end of file +} + +function new_keypair($bits) { + + $openssl_options = array( + 'digest_alg' => 'sha1', + 'private_key_bits' => $bits, + 'encrypt_key' => false + ); + + $conf = get_config('system','openssl_conf_file'); + if($conf) + $openssl_options['config'] = $conf; + + $result = openssl_pkey_new($openssl_options); + + if(empty($result)) { + logger('new_keypair: failed'); + return false; + } + + // Get private key + + $response = array('prvkey' => '', 'pubkey' => ''); + + openssl_pkey_export($result, $response['prvkey']); + + // Get public key + $pkey = openssl_pkey_get_details($result); + $response['pubkey'] = $pkey["key"]; + + return $response; + +} + diff --git a/include/delivery.php b/include/delivery.php index 1cee2d697b..61b0bd33a5 100644 --- a/include/delivery.php +++ b/include/delivery.php @@ -41,7 +41,7 @@ function delivery_run($argv, $argc){ for($x = 3; $x < $argc; $x ++) { - $contact_id = intval($argv[x]); + $contact_id = intval($argv[$x]); // Some other process may have delivered this item already. diff --git a/include/notifier.php b/include/notifier.php index 8b904dbcd1..cb4fb2a31c 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -478,24 +478,42 @@ function notifier_run($argv, $argc){ } } + + // This controls the number of deliveries to execute with each separate delivery process. + // By default we'll perform one delivery per process. Assuming a hostile shared hosting + // provider, this provides the greatest chance of deliveries if processes start getting + // killed. We can also space them out with the delivery_interval to also help avoid them + // getting whacked. + + // If $deliveries_per_process > 1, we will chain this number of multiple deliveries + // together into a single process. This will reduce the overall number of processes + // spawned for each delivery, but they will run longer. + $deliveries_per_process = intval(get_config('system','delivery_batch_count')); if($deliveries_per_process <= 0) $deliveries_per_process = 1; $this_batch = array(); - foreach($r as $contact) { + for($x = 0; $x < count($r); $x ++) { + $contact = $r[$x]; + if($contact['self']) continue; // potentially more than one recipient. Start a new process and space them out a bit. - // we will deliver single recipient types of message and email receipients here. - + // we will deliver single recipient types of message and email recipients here. + if((! $mail) && (! $fsuggest) && (! $followup)) { - // deliveries per process not yet implemented, 1 delivery per process. - proc_run('php','include/delivery.php',$cmd,$item_id,$contact['id']); - if($interval) - @time_sleep_until(microtime(true) + (float) $interval); + + $this_batch[] = $contact['id']; + + if(count($this_batch) == $deliveries_per_process) { + proc_run('php','include/delivery.php',$cmd,$item_id,$this_batch); + $this_batch = array(); + if($interval) + @time_sleep_until(microtime(true) + (float) $interval); + } continue; } diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 227d72cbfb..093993bbc4 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -144,19 +144,12 @@ function dfrn_confirm_post(&$a,$handsfree = null) { * worried about key leakage than anybody cracking it. * */ + require_once('include/crypto.php'); - $res = openssl_pkey_new(array( - 'digest_alg' => 'sha1', - 'private_key_bits' => 4096, - 'encrypt_key' => false ) - ); + $res = new_keypair(1024); - $private_key = ''; - - openssl_pkey_export($res, $private_key); - - $pubkey = openssl_pkey_get_details($res); - $public_key = $pubkey["key"]; + $private_key = $res['prvkey']; + $public_key = $res['pubkey']; // Save the private key. Send them the public key. diff --git a/mod/hostxrd.php b/mod/hostxrd.php index fe61a874c3..9b2411f266 100644 --- a/mod/hostxrd.php +++ b/mod/hostxrd.php @@ -8,26 +8,10 @@ function hostxrd_init(&$a) { $pubkey = get_config('system','site_pubkey'); if(! $pubkey) { + $res = new_keypair(1024); - // should only have to ever do this once. - - $res=openssl_pkey_new(array( - 'digest_alg' => 'sha1', - 'private_key_bits' => 4096, - 'encrypt_key' => false )); - - - $prvkey = ''; - - openssl_pkey_export($res, $prvkey); - - // Get public key - - $pkey = openssl_pkey_get_details($res); - $pubkey = $pkey["key"]; - - set_config('system','site_prvkey', $prvkey); - set_config('system','site_pubkey', $pubkey); + set_config('system','site_prvkey', $res['prvkey']); + set_config('system','site_pubkey', $res['pubkey']); } $tpl = file_get_contents('view/xrd_host.tpl'); diff --git a/mod/register.php b/mod/register.php index b60707d457..58bba85333 100644 --- a/mod/register.php +++ b/mod/register.php @@ -171,26 +171,17 @@ function register_post(&$a) { $new_password = autoname(6) . mt_rand(100,9999); $new_password_encoded = hash('whirlpool',$new_password); - $res=openssl_pkey_new(array( - 'digest_alg' => 'sha1', - 'private_key_bits' => 4096, - 'encrypt_key' => false )); + require_once('include/crypto.php'); - // Get private key + $result = new_keypair(1024); - if(empty($res)) { + if($result === false) { notice( t('SERIOUS ERROR: Generation of security keys failed.') . EOL); return; } - $prvkey = ''; - - openssl_pkey_export($res, $prvkey); - - // Get public key - - $pkey = openssl_pkey_get_details($res); - $pubkey = $pkey["key"]; + $prvkey = $result['prvkey']; + $pubkey = $result['pubkey']; /** * @@ -203,21 +194,9 @@ function register_post(&$a) { * */ - $sres=openssl_pkey_new(array( - 'digest_alg' => 'sha1', - 'private_key_bits' => 512, - 'encrypt_key' => false )); - - // Get private key - - $sprvkey = ''; - - openssl_pkey_export($sres, $sprvkey); - - // Get public key - - $spkey = openssl_pkey_get_details($sres); - $spubkey = $spkey["key"]; + $sres = new_keypair(512); + $sprvkey = $sres['prvkey']; + $spubkey = $sres['pubkey']; $r = q("INSERT INTO `user` ( `guid`, `username`, `password`, `email`, `openid`, `nickname`, `pubkey`, `prvkey`, `spubkey`, `sprvkey`, `register_date`, `verified`, `blocked`, `timezone` ) diff --git a/util/messages.po b/util/messages.po index 456f50cda5..65674774a9 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1347\n" +"Project-Id-Version: 3.0.1348\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-19 10:00-0700\n" +"POT-Creation-Date: 2012-05-20 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -330,7 +330,7 @@ msgstr "" #: ../../mod/settings.php:910 ../../mod/settings.php:916 #: ../../mod/settings.php:952 ../../mod/settings.php:953 #: ../../mod/settings.php:954 ../../mod/settings.php:955 -#: ../../mod/register.php:532 ../../mod/profiles.php:511 +#: ../../mod/register.php:511 ../../mod/profiles.php:511 msgid "Yes" msgstr "" @@ -341,7 +341,7 @@ msgstr "" #: ../../mod/settings.php:910 ../../mod/settings.php:916 #: ../../mod/settings.php:952 ../../mod/settings.php:953 #: ../../mod/settings.php:954 ../../mod/settings.php:955 -#: ../../mod/register.php:533 ../../mod/profiles.php:512 +#: ../../mod/register.php:512 ../../mod/profiles.php:512 msgid "No" msgstr "" @@ -369,8 +369,8 @@ msgid "Contact information unavailable" msgstr "" #: ../../mod/photos.php:151 ../../mod/photos.php:597 ../../mod/photos.php:950 -#: ../../mod/photos.php:965 ../../mod/register.php:335 -#: ../../mod/register.php:342 ../../mod/register.php:349 +#: ../../mod/photos.php:965 ../../mod/register.php:314 +#: ../../mod/register.php:321 ../../mod/register.php:328 #: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67 #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 @@ -577,7 +577,7 @@ msgstr "" msgid "Community" msgstr "" -#: ../../mod/community.php:61 ../../mod/search.php:134 +#: ../../mod/community.php:61 ../../mod/search.php:138 msgid "No results." msgstr "" @@ -1170,7 +1170,7 @@ msgstr "" msgid "Connect" msgstr "" -#: ../../mod/match.php:65 ../../mod/dirfind.php:57 +#: ../../mod/match.php:65 ../../mod/dirfind.php:60 msgid "No matches" msgstr "" @@ -1687,8 +1687,8 @@ msgid "Password reset requested at %s" msgstr "" #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 -#: ../../mod/register.php:388 ../../mod/register.php:442 -#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:752 +#: ../../mod/register.php:367 ../../mod/register.php:421 +#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:745 #: ../../addon/facebook/facebook.php:688 #: ../../addon/facebook/facebook.php:1178 #: ../../addon/public_server/public_server.php:62 @@ -2686,7 +2686,7 @@ msgid "" "must also begin with a letter." msgstr "" -#: ../../mod/register.php:153 ../../mod/register.php:264 +#: ../../mod/register.php:153 ../../mod/register.php:243 msgid "Nickname is already registered. Please choose another." msgstr "" @@ -2696,107 +2696,107 @@ msgid "" "another." msgstr "" -#: ../../mod/register.php:182 +#: ../../mod/register.php:179 msgid "SERIOUS ERROR: Generation of security keys failed." msgstr "" -#: ../../mod/register.php:250 +#: ../../mod/register.php:229 msgid "An error occurred during registration. Please try again." msgstr "" -#: ../../mod/register.php:286 +#: ../../mod/register.php:265 msgid "An error occurred creating your default profile. Please try again." msgstr "" -#: ../../mod/register.php:386 ../../mod/regmod.php:52 +#: ../../mod/register.php:365 ../../mod/regmod.php:52 #, php-format msgid "Registration details for %s" msgstr "" -#: ../../mod/register.php:394 +#: ../../mod/register.php:373 msgid "" "Registration successful. Please check your email for further instructions." msgstr "" -#: ../../mod/register.php:398 +#: ../../mod/register.php:377 msgid "Failed to send email message. Here is the message that failed." msgstr "" -#: ../../mod/register.php:403 +#: ../../mod/register.php:382 msgid "Your registration can not be processed." msgstr "" -#: ../../mod/register.php:440 +#: ../../mod/register.php:419 #, php-format msgid "Registration request at %s" msgstr "" -#: ../../mod/register.php:449 +#: ../../mod/register.php:428 msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../mod/register.php:487 +#: ../../mod/register.php:466 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "" -#: ../../mod/register.php:513 +#: ../../mod/register.php:492 msgid "" "You may (optionally) fill in this form via OpenID by supplying your OpenID " "and clicking 'Register'." msgstr "" -#: ../../mod/register.php:514 +#: ../../mod/register.php:493 msgid "" "If you are not familiar with OpenID, please leave that field blank and fill " "in the rest of the items." msgstr "" -#: ../../mod/register.php:515 +#: ../../mod/register.php:494 msgid "Your OpenID (optional): " msgstr "" -#: ../../mod/register.php:529 +#: ../../mod/register.php:508 msgid "Include your profile in member directory?" msgstr "" -#: ../../mod/register.php:549 +#: ../../mod/register.php:528 msgid "Membership on this site is by invitation only." msgstr "" -#: ../../mod/register.php:550 +#: ../../mod/register.php:529 msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:553 ../../mod/admin.php:405 +#: ../../mod/register.php:532 ../../mod/admin.php:405 msgid "Registration" msgstr "" -#: ../../mod/register.php:561 +#: ../../mod/register.php:540 msgid "Your Full Name (e.g. Joe Smith): " msgstr "" -#: ../../mod/register.php:562 +#: ../../mod/register.php:541 msgid "Your Email Address: " msgstr "" -#: ../../mod/register.php:563 +#: ../../mod/register.php:542 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:564 +#: ../../mod/register.php:543 msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:794 +#: ../../mod/register.php:546 ../../include/nav.php:81 ../../boot.php:794 msgid "Register" msgstr "" -#: ../../mod/dirfind.php:23 +#: ../../mod/dirfind.php:26 msgid "People Search" msgstr "" @@ -2860,38 +2860,38 @@ msgstr "" msgid "Unable to locate original post." msgstr "" -#: ../../mod/item.php:249 +#: ../../mod/item.php:258 msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:372 ../../mod/wall_upload.php:99 +#: ../../mod/item.php:381 ../../mod/wall_upload.php:99 #: ../../mod/wall_upload.php:108 ../../mod/wall_upload.php:115 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "" -#: ../../mod/item.php:781 +#: ../../mod/item.php:790 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:806 +#: ../../mod/item.php:815 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendica social network." msgstr "" -#: ../../mod/item.php:808 +#: ../../mod/item.php:817 #, php-format msgid "You may visit them online at %s" msgstr "" -#: ../../mod/item.php:809 +#: ../../mod/item.php:818 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "" -#: ../../mod/item.php:811 +#: ../../mod/item.php:820 #, php-format msgid "%s posted an update." msgstr "" @@ -3764,8 +3764,8 @@ msgstr "" msgid "No installed applications." msgstr "" -#: ../../mod/search.php:83 -msgid "Search This Site" +#: ../../mod/search.php:83 ../../include/text.php:650 ../../include/nav.php:91 +msgid "Search" msgstr "" #: ../../mod/profiles.php:21 ../../mod/profiles.php:375 @@ -4220,83 +4220,83 @@ msgid "" "has already been approved." msgstr "" -#: ../../mod/dfrn_confirm.php:242 +#: ../../mod/dfrn_confirm.php:235 msgid "Response from remote site was not understood." msgstr "" -#: ../../mod/dfrn_confirm.php:251 +#: ../../mod/dfrn_confirm.php:244 msgid "Unexpected response from remote site: " msgstr "" -#: ../../mod/dfrn_confirm.php:259 +#: ../../mod/dfrn_confirm.php:252 msgid "Confirmation completed successfully." msgstr "" -#: ../../mod/dfrn_confirm.php:261 ../../mod/dfrn_confirm.php:275 -#: ../../mod/dfrn_confirm.php:282 +#: ../../mod/dfrn_confirm.php:254 ../../mod/dfrn_confirm.php:268 +#: ../../mod/dfrn_confirm.php:275 msgid "Remote site reported: " msgstr "" -#: ../../mod/dfrn_confirm.php:273 +#: ../../mod/dfrn_confirm.php:266 msgid "Temporary failure. Please wait and try again." msgstr "" -#: ../../mod/dfrn_confirm.php:280 +#: ../../mod/dfrn_confirm.php:273 msgid "Introduction failed or was revoked." msgstr "" -#: ../../mod/dfrn_confirm.php:425 +#: ../../mod/dfrn_confirm.php:418 msgid "Unable to set contact photo." msgstr "" -#: ../../mod/dfrn_confirm.php:482 ../../include/diaspora.php:507 +#: ../../mod/dfrn_confirm.php:475 ../../include/diaspora.php:507 #: ../../include/conversation.php:101 #, php-format msgid "%1$s is now friends with %2$s" msgstr "" -#: ../../mod/dfrn_confirm.php:564 +#: ../../mod/dfrn_confirm.php:557 #, php-format msgid "No user record found for '%s' " msgstr "" -#: ../../mod/dfrn_confirm.php:574 +#: ../../mod/dfrn_confirm.php:567 msgid "Our site encryption key is apparently messed up." msgstr "" -#: ../../mod/dfrn_confirm.php:585 +#: ../../mod/dfrn_confirm.php:578 msgid "Empty site URL was provided or URL could not be decrypted by us." msgstr "" -#: ../../mod/dfrn_confirm.php:606 +#: ../../mod/dfrn_confirm.php:599 msgid "Contact record was not found for you on our site." msgstr "" -#: ../../mod/dfrn_confirm.php:620 +#: ../../mod/dfrn_confirm.php:613 #, php-format msgid "Site public key not available in contact record for URL %s." msgstr "" -#: ../../mod/dfrn_confirm.php:640 +#: ../../mod/dfrn_confirm.php:633 msgid "" "The ID provided by your system is a duplicate on our system. It should work " "if you try again." msgstr "" -#: ../../mod/dfrn_confirm.php:651 +#: ../../mod/dfrn_confirm.php:644 msgid "Unable to set your contact credentials on our system." msgstr "" -#: ../../mod/dfrn_confirm.php:716 +#: ../../mod/dfrn_confirm.php:709 msgid "Unable to update your contact profile details on our system" msgstr "" -#: ../../mod/dfrn_confirm.php:750 +#: ../../mod/dfrn_confirm.php:743 #, php-format msgid "Connection accepted at %s" msgstr "" -#: ../../mod/dfrn_confirm.php:799 +#: ../../mod/dfrn_confirm.php:792 #, php-format msgid "%1$s has joined %2$s" msgstr "" @@ -6257,10 +6257,6 @@ msgid_plural "%d Contacts" msgstr[0] "" msgstr[1] "" -#: ../../include/text.php:650 ../../include/nav.php:91 -msgid "Search" -msgstr "" - #: ../../include/text.php:831 msgid "Monday" msgstr "" From cb2702249fd80ce4e9d82f98a9a152f82e123dc7 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Mon, 21 May 2012 02:47:43 -0400 Subject: [PATCH 12/50] fix dumb mistake in light Signed-off-by: Simon L'nu --- view/theme/dispy/light/style.css | 6 +++--- view/theme/dispy/light/style.less | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index eb6abee71a..5c6545a589 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -13,7 +13,7 @@ audio,canvas,video,time{display:inline-block;*display:inline;*zoom:1;} audio:not([controls]),[hidden]{display:none;} html{font-size:100%;overflow-y:scroll;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;-o-text-size-adjust:100%;font-size-adjust:100%;} body{margin:0;padding:0;font-size:14pt;line-height:1.1em;font-family:sans-serif;color:#111111;background-color:#eeeeec;} -button,input,select,textarea{color:#111111;background-color:#eeeeec;} +button,input,select,textarea{color:#111111;background-color:white;} select{border:1px dotted #555555;padding:1px;margin:3px;color:#111111;background:#eeeeec;max-width:85%;min-width:85px;} option{padding:1px;color:#111111;background:#eeeeec;}option[selected="selected"]{color:#eeeeec;background:#2e3436;} tr:nth-child(even){background-color:#d6d6d1;} @@ -57,7 +57,7 @@ h6{font-size:xx-small;} #articlemain{width:100%;height:100%;margin:0 auto;} .button,#profile-listing-desc{color:#111111;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;} .button a,#profile-listing-desc a{color:#111111;font-weight:bold;} -[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#111111;border:1px outset #eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} +[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#2e3436;border:1px outset #eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} .intro-approve-as-friend-desc{margin-top:10px;} .intro-desc{margin-bottom:20px;font-weight:bold;} @@ -211,7 +211,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;} .wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;} .wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#888b85;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;} -.wall-item-author,.wall-item-actions-author,.wall-item-ago{clear:left;float:left;color:#eeeeec;line-height:1;display:inline-block;font-size:0.75em;margin:0.5em auto 0;} +.wall-item-author,.wall-item-actions-author,.wall-item-ago{clear:left;float:left;color:#111111;line-height:1;display:inline-block;font-size:0.75em;margin:0.5em auto 0;} .wall-item-author,.wall-item-actions-author{margin:0.5em auto 0;font-size:0.75em;font-weight:bold;} .wall-item-location{margin-top:15px;width:100px;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;} .wall-item-location>a,.wall-item-location .smalltext{margin-left:25px;font-size:0.7em;display:block;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index ed9dfdd698..86a30109b0 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -62,7 +62,7 @@ input, select, textarea { color: @main_colour; - background-color: @bg_colour; + background-color: white; } select { .borders(1px, dotted, darken(@main_alt_colour, 26.8%)); @@ -303,7 +303,7 @@ h6 { [class$="-desc"], [id$="-desc"] { color: @bg_colour; - background: @main_colour; + background: @dk_bg_colour; .borders(1px, outset, @bg_colour); .rounded_corners; // .box_shadow(3px, 3px, 5px); @@ -1377,7 +1377,7 @@ nav #nav-notifications-linkmenu { .wall-item-ago { clear: left; float: left; - color: @bg_colour; + color: @main_colour; line-height: 1; display: inline-block; font-size: 0.75em; From 627367e1ee241fcd3508dd5e8c0e021316420787 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Mon, 21 May 2012 06:48:08 -0400 Subject: [PATCH 13/50] more light fixes Signed-off-by: Simon L'nu --- view/theme/dispy/light/style.css | 2 +- view/theme/dispy/light/style.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index 5c6545a589..bd4088b06b 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -210,7 +210,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .wall-item-title{font-size:1.2em;font-weight:bold;margin-bottom:1.4em;} .wall-item-body{margin:15px 10px 10px 0px;text-align:left;overflow-x:auto;} .wall-item-lock-wrapper{float:right;width:22px;height:22px;margin:0 -5px 0 0;opacity:1;} -.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#888b85;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;} +.wall-item-dislike,.wall-item-like{clear:left;font-size:0.8em;color:#111111;margin:5px 0 5px 10.2em;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;opacity:0.5;}.wall-item-dislike:hover,.wall-item-like:hover{opacity:1;} .wall-item-author,.wall-item-actions-author,.wall-item-ago{clear:left;float:left;color:#111111;line-height:1;display:inline-block;font-size:0.75em;margin:0.5em auto 0;} .wall-item-author,.wall-item-actions-author{margin:0.5em auto 0;font-size:0.75em;font-weight:bold;} .wall-item-location{margin-top:15px;width:100px;overflow:hidden;-moz-text-overflow:ellipsis;-ms-text-verflow:ellipsis;-o-text-overflow:ellipsis;-webkit-text-overflow:ellipsis;text-overflow:ellipsis;}.wall-item-location .icon{float:left;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index 86a30109b0..92c8547eec 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -1364,7 +1364,7 @@ nav #nav-notifications-linkmenu { .wall-item-like { clear: left; font-size: 0.8em; - color: lighten(@menu_bg_colour, 20%); + color: @main_colour; margin: 5px 0 5px 10.2em; .transition; opacity: 0.5; From 54e2c1ca81b99d4ac418e9287e00440de1fdc664 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 21 May 2012 16:40:11 -0700 Subject: [PATCH 15/50] rev update, bug 428, 429, and ability to block globaldir submissions from demo sites --- INSTALL.txt | 47 ++++++++++++++ boot.php | 2 +- include/directory.php | 10 ++- mod/admin.php | 2 +- mod/photos.php | 14 ++++ util/messages.po | 102 +++++++++++++++--------------- view/photo_album.tpl | 2 +- view/photo_top.tpl | 4 +- view/photos_recent.tpl | 1 + view/theme/duepuntozero/style.css | 25 +++++--- view/theme/slackr/style.css | 62 +++++++++++++++++- 11 files changed, 205 insertions(+), 66 deletions(-) diff --git a/INSTALL.txt b/INSTALL.txt index 574e90975b..86076a09ae 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -222,3 +222,50 @@ Retry the installation. As soon as the database has been created, % chmod 755 .htconfig.php +##################################################################### +- Some congiurations with "suhosin" security are configured without +an ability to run external processes. Friendica requires this ability. +Following are some notes provided by one of our members. +##################################################################### + +On my server I use the php protection system Suhosin +[http://www.hardened-php.net/suhosin/]. One of the things it does is to block +certain functions like proc_open, as configured in /etc/php5/conf.d/suhosin.ini: + + suhosin.executor.func.blacklist = proc_open, ... + +For those sites like Friendica that really need these functions they can be +enabled, e.g. in /etc/apache2/sites-available/friendica: + + + php_admin_value suhosin.executor.func.blacklist none + php_admin_value suhosin.executor.eval.blacklist none + + +This enables every function for Friendica if accessed via browser, but not for +the cronjob that is called via php command line. I attempted to enable it for +cron by using something like + + */10 * * * * cd /var/www/friendica/friendica/ && sudo -u www-data /usr/bin/php +-d suhosin.executor.func.blacklist=none -d suhosin.executor.eval.blacklist=none +-f include/poller.php + +This worked well for simple test cases, but the friendica-cron still failed with +a fatal error: +suhosin[22962]: ALERT - function within blacklist called: proc_open() (attacker +'REMOTE_ADDR not set', file '/var/www/friendica/friendica/boot.php', line 1341) + +After a while I noticed, that include/poller.php calls further php script via +proc_open. These scripts themselves also use proc_open and fail, because they +are NOT called with -d suhosin.executor.func.blacklist=none. + +So the simple solution is to put the correct parameters into .htconfig.php: + // Location of PHP command line processor + $a->config['php_path'] = '/usr/bin/php -d suhosin.executor.func.blacklist=none +-d suhosin.executor.eval.blacklist=none'; + + +This is obvious as soon as you notice that the friendica-cron uses proc_open to +execute php-scripts that also use proc_open, but it took me quite some time to +find that out. I hope this saves some time for other people using suhosin with +function blacklists. diff --git a/boot.php b/boot.php index 4b4788dbde..798362d25e 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1348' ); +define ( 'FRIENDICA_VERSION', '3.0.1349' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1144 ); diff --git a/include/directory.php b/include/directory.php index cae78adb4e..45386183c6 100644 --- a/include/directory.php +++ b/include/directory.php @@ -24,6 +24,9 @@ function directory_run($argv, $argc){ load_config('system'); + load_hooks(); + + $a->set_baseurl(get_config('system','url')); $dir = get_config('system','directory_submit_url'); @@ -31,7 +34,12 @@ function directory_run($argv, $argc){ if(! strlen($dir)) return; - fetch_url($dir . '?url=' . bin2hex($argv[1])); + $arr = array('url' => $argv[1]); + + call_hooks('globaldir_update', $arr); + + if(strlen($arr['url'])) + fetch_url($dir . '?url=' . bin2hex($arr['url'])); return; } diff --git a/mod/admin.php b/mod/admin.php index 2810c8a8ab..1f53f112da 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -417,7 +417,7 @@ function admin_page_site(&$a) { '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), '$register_policy' => array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices), - '$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES), t("Will be displayed prominently on the registration page.")), + '$register_text' => array('register_text', t("Register text"), htmlentities($a->config['register_text'], ENT_QUOTES, 'UTF-8'), t("Will be displayed prominently on the registration page.")), '$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')), '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")), '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")), diff --git a/mod/photos.php b/mod/photos.php index 8da94841e6..082947bdbf 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -977,9 +977,16 @@ function photos_content(&$a) { $tpl = get_markup_template('photo_album.tpl'); if(count($r)) + $twist = 'rotright'; foreach($r as $rr) { + if($twist == 'rotright') + $twist = 'rotleft'; + else + $twist = 'rotright'; + $o .= replace_macros($tpl,array( '$id' => $rr['id'], + '$twist' => ' ' . $twist . rand(2,4), '$photolink' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'], '$phototitle' => t('View Photo'), '$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.jpg', @@ -1400,9 +1407,16 @@ function photos_content(&$a) { $photos = array(); if(count($r)) { + $twist = 'rotright'; foreach($r as $rr) { + if($twist == 'rotright') + $twist = 'rotleft'; + else + $twist = 'rotright'; + $photos[] = array( 'id' => $rr['id'], + 'twist' => ' ' . $twist . rand(2,4), 'link' => $a->get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/image/' . $rr['resource-id'], 'title' => t('View Photo'), 'src' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . ((($rr['scale']) == 6) ? 4 : $rr['scale']) . '.jpg', diff --git a/util/messages.po b/util/messages.po index 65674774a9..2edd9c2815 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1348\n" +"Project-Id-Version: 3.0.1349\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-20 10:00-0700\n" +"POT-Creation-Date: 2012-05-21 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -123,8 +123,8 @@ msgstr "" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 #: ../../mod/events.php:428 ../../mod/photos.php:900 ../../mod/photos.php:958 -#: ../../mod/photos.php:1193 ../../mod/photos.php:1233 -#: ../../mod/photos.php:1273 ../../mod/photos.php:1304 +#: ../../mod/photos.php:1200 ../../mod/photos.php:1240 +#: ../../mod/photos.php:1280 ../../mod/photos.php:1311 #: ../../mod/install.php:251 ../../mod/install.php:289 #: ../../mod/localtime.php:45 ../../mod/contacts.php:322 #: ../../mod/settings.php:553 ../../mod/settings.php:699 @@ -220,7 +220,7 @@ msgid "link to source" msgstr "" #: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:126 -#: ../../include/nav.php:52 ../../boot.php:1503 +#: ../../include/nav.php:52 ../../boot.php:1522 msgid "Events" msgstr "" @@ -345,18 +345,18 @@ msgstr "" msgid "No" msgstr "" -#: ../../mod/photos.php:43 ../../boot.php:1497 +#: ../../mod/photos.php:43 ../../boot.php:1516 msgid "Photo Albums" msgstr "" #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879 -#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382 -#: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110 +#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1389 +#: ../../mod/photos.php:1401 ../../addon/communityhome/communityhome.php:110 #: ../../view/theme/diabook/theme.php:593 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:58 ../../mod/photos.php:975 ../../mod/photos.php:1424 +#: ../../mod/photos.php:58 ../../mod/photos.php:975 ../../mod/photos.php:1438 msgid "Upload New Photos" msgstr "" @@ -387,7 +387,7 @@ msgstr "" msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:242 ../../mod/photos.php:1194 +#: ../../mod/photos.php:242 ../../mod/photos.php:1201 msgid "Delete Photo" msgstr "" @@ -455,7 +455,7 @@ msgstr "" msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/photos.php:914 ../../mod/photos.php:1189 +#: ../../mod/photos.php:914 ../../mod/photos.php:1196 msgid "Permissions" msgstr "" @@ -463,108 +463,108 @@ msgstr "" msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:984 ../../mod/photos.php:1407 +#: ../../mod/photos.php:991 ../../mod/photos.php:1421 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:1019 +#: ../../mod/photos.php:1026 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:1021 +#: ../../mod/photos.php:1028 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:1071 +#: ../../mod/photos.php:1078 msgid "View photo" msgstr "" -#: ../../mod/photos.php:1071 +#: ../../mod/photos.php:1078 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:1072 +#: ../../mod/photos.php:1079 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:1078 ../../include/conversation.php:483 +#: ../../mod/photos.php:1085 ../../include/conversation.php:483 msgid "Private Message" msgstr "" -#: ../../mod/photos.php:1100 +#: ../../mod/photos.php:1107 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:1168 +#: ../../mod/photos.php:1175 msgid "Tags: " msgstr "" -#: ../../mod/photos.php:1171 +#: ../../mod/photos.php:1178 msgid "[Remove any tag]" msgstr "" -#: ../../mod/photos.php:1182 +#: ../../mod/photos.php:1189 msgid "New album name" msgstr "" -#: ../../mod/photos.php:1185 +#: ../../mod/photos.php:1192 msgid "Caption" msgstr "" -#: ../../mod/photos.php:1187 +#: ../../mod/photos.php:1194 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:1191 +#: ../../mod/photos.php:1198 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1211 ../../include/conversation.php:532 +#: ../../mod/photos.php:1218 ../../include/conversation.php:532 msgid "I like this (toggle)" msgstr "" -#: ../../mod/photos.php:1212 ../../include/conversation.php:533 +#: ../../mod/photos.php:1219 ../../include/conversation.php:533 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1213 ../../include/conversation.php:967 +#: ../../mod/photos.php:1220 ../../include/conversation.php:967 msgid "Share" msgstr "" -#: ../../mod/photos.php:1214 ../../mod/editpost.php:104 +#: ../../mod/photos.php:1221 ../../mod/editpost.php:104 #: ../../mod/wallmessage.php:145 ../../mod/message.php:214 #: ../../mod/message.php:408 ../../include/conversation.php:364 #: ../../include/conversation.php:709 ../../include/conversation.php:986 msgid "Please wait" msgstr "" -#: ../../mod/photos.php:1230 ../../mod/photos.php:1270 -#: ../../mod/photos.php:1301 ../../include/conversation.php:555 +#: ../../mod/photos.php:1237 ../../mod/photos.php:1277 +#: ../../mod/photos.php:1308 ../../include/conversation.php:555 msgid "This is you" msgstr "" -#: ../../mod/photos.php:1232 ../../mod/photos.php:1272 -#: ../../mod/photos.php:1303 ../../include/conversation.php:557 +#: ../../mod/photos.php:1239 ../../mod/photos.php:1279 +#: ../../mod/photos.php:1310 ../../include/conversation.php:557 #: ../../boot.php:516 msgid "Comment" msgstr "" -#: ../../mod/photos.php:1234 ../../mod/editpost.php:125 +#: ../../mod/photos.php:1241 ../../mod/editpost.php:125 #: ../../include/conversation.php:567 ../../include/conversation.php:1004 msgid "Preview" msgstr "" -#: ../../mod/photos.php:1331 ../../mod/settings.php:616 +#: ../../mod/photos.php:1338 ../../mod/settings.php:616 #: ../../mod/settings.php:697 ../../mod/group.php:168 ../../mod/admin.php:647 #: ../../include/conversation.php:321 ../../include/conversation.php:587 msgid "Delete" msgstr "" -#: ../../mod/photos.php:1413 +#: ../../mod/photos.php:1427 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1422 +#: ../../mod/photos.php:1436 msgid "Recent Photos" msgstr "" @@ -1692,7 +1692,7 @@ msgstr "" #: ../../addon/facebook/facebook.php:688 #: ../../addon/facebook/facebook.php:1178 #: ../../addon/public_server/public_server.php:62 -#: ../../addon/testdrive/testdrive.php:61 ../../include/items.php:2738 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2738 #: ../../boot.php:696 msgid "Administrator" msgstr "" @@ -2369,7 +2369,7 @@ msgstr "" msgid "Invalid contact." msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1509 +#: ../../mod/notes.php:44 ../../boot.php:1528 msgid "Personal Notes" msgstr "" @@ -2620,7 +2620,7 @@ msgstr "" #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:123 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 -#: ../../include/nav.php:50 ../../boot.php:1488 +#: ../../include/nav.php:50 ../../boot.php:1507 msgid "Profile" msgstr "" @@ -2835,7 +2835,7 @@ msgid "Access denied." msgstr "" #: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:125 -#: ../../include/nav.php:51 ../../boot.php:1494 +#: ../../include/nav.php:51 ../../boot.php:1513 msgid "Photos" msgstr "" @@ -4864,7 +4864,7 @@ msgid "Enable Geonames Plugin" msgstr "" #: ../../addon/public_server/public_server.php:126 -#: ../../addon/testdrive/testdrive.php:88 +#: ../../addon/testdrive/testdrive.php:94 #, php-format msgid "Your account on %s will expire in a few days." msgstr "" @@ -5141,11 +5141,11 @@ msgstr "" msgid "Gravatar settings updated." msgstr "" -#: ../../addon/testdrive/testdrive.php:89 +#: ../../addon/testdrive/testdrive.php:95 msgid "Your Friendica test account is about to expire." msgstr "" -#: ../../addon/testdrive/testdrive.php:90 +#: ../../addon/testdrive/testdrive.php:96 #, php-format msgid "" "Hi %1$s,\n" @@ -6221,12 +6221,12 @@ msgstr "" msgid "Finishes:" msgstr "" -#: ../../include/delivery.php:455 ../../include/notifier.php:659 +#: ../../include/delivery.php:455 ../../include/notifier.php:677 msgid "(no subject)" msgstr "" #: ../../include/delivery.php:462 ../../include/enotify.php:23 -#: ../../include/notifier.php:666 +#: ../../include/notifier.php:684 msgid "noreply" msgstr "" @@ -6449,7 +6449,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:49 ../../boot.php:1482 +#: ../../include/nav.php:49 ../../boot.php:1501 msgid "Status" msgstr "" @@ -7278,18 +7278,18 @@ msgstr "" msgid "Events this week:" msgstr "" -#: ../../boot.php:1485 +#: ../../boot.php:1504 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1491 +#: ../../boot.php:1510 msgid "Profile Details" msgstr "" -#: ../../boot.php:1506 +#: ../../boot.php:1525 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1512 +#: ../../boot.php:1531 msgid "Only You Can See This" msgstr "" diff --git a/view/photo_album.tpl b/view/photo_album.tpl index 3ab9fe7235..cc3dcfb9cc 100644 --- a/view/photo_album.tpl +++ b/view/photo_album.tpl @@ -1,6 +1,6 @@ diff --git a/view/photo_top.tpl b/view/photo_top.tpl index 04a054b520..155cab51d5 100644 --- a/view/photo_top.tpl +++ b/view/photo_top.tpl @@ -1,7 +1,7 @@ -
+ diff --git a/view/photos_recent.tpl b/view/photos_recent.tpl index b8cb924b79..1df78cb7be 100644 --- a/view/photos_recent.tpl +++ b/view/photos_recent.tpl @@ -8,3 +8,4 @@ {{ inc photo_top.tpl }}{{ endinc }} {{ endfor }}
+
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 826acc7ef3..c556dcead4 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -1963,23 +1963,29 @@ aside input[type='text'] { } -.photos { +/*.photos { height: auto; overflow: auto; +}*/ + +.photos-end { + clear: both; + margin-bottom: 25px; } .photo-album-image-wrapper { float: left; margin-top: 15px; margin-right: 15px; - width: 200px; height: 200px; + margin-left: 15px; +/* width: 200px; height: 200px; overflow: hidden; - position: relative; + position: relative; */ } .photo-album-image-wrapper .caption { display: none; width: 100%; - position: absolute; +/* position: absolute; */ bottom: 0px; padding: 0.5em 0.5em 0px 0.5em; background-color: rgba(245, 245, 255, 0.8); @@ -1992,20 +1998,23 @@ aside input[type='text'] { #photo-album-end { clear: both; + margin-bottom: 25px; } .photo-top-image-wrapper { - position: relative; +/* position: relative; */ float: left; margin-top: 15px; margin-right: 15px; - width: 200px; height: 200px; - overflow: hidden; + margin-left: 15px; + margin-bottom: 15px; +/* width: 200px; height: 200px; + overflow: hidden; */ } .photo-top-album-name { width: 100%; min-height: 2em; - position: absolute; +/* position: absolute; */ bottom: 0px; padding: 0px 3px; padding-top: 0.5em; diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css index abb431ab94..41f4e58eea 100644 --- a/view/theme/slackr/style.css +++ b/view/theme/slackr/style.css @@ -52,10 +52,70 @@ nav #site-location { box-shadow: 3px 3px 10px -2px #000000; } -.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img { +.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo { border-radius: 3px; -moz-border-radius: 3px; box-shadow: 3px 3px 10px 0 #000000; } +.photo-top-photo, .photo-album-photo { + padding: 10px; + max-width: 300px; +} + +.rotleft1 { +-webkit-transform: rotate(-1deg); +-moz-transform: rotate(-1deg); +-ms-transform: rotate(-1deg); +-o-transform: rotate(-1deg); +} + +.rotleft2 { +-webkit-transform: rotate(-2deg); +-moz-transform: rotate(-2deg); +-ms-transform: rotate(-2deg); +-o-transform: rotate(-2deg); +} + +.rotleft3 { +-webkit-transform: rotate(-3deg); +-moz-transform: rotate(-3deg); +-ms-transform: rotate(-3deg); +-o-transform: rotate(-3deg); +} + +.rotleft4 { +-webkit-transform: rotate(-4deg); +-moz-transform: rotate(-4deg); +-ms-transform: rotate(-4deg); +-o-transform: rotate(-4deg); +} + +.rotright1 { +-webkit-transform: rotate(1deg); +-moz-transform: rotate(1deg); +-ms-transform: rotate(1deg); +-o-transform: rotate(1deg); +} + +.rotright2 { +-webkit-transform: rotate(2deg); +-moz-transform: rotate(2deg); +-ms-transform: rotate(2deg); +-o-transform: rotate(2deg); +} + +.rotright3 { +-webkit-transform: rotate(3deg); +-moz-transform: rotate(3deg); +-ms-transform: rotate(3deg); +-o-transform: rotate(3deg); +} + +.rotright4 { +-webkit-transform: rotate(4deg); +-moz-transform: rotate(4deg); +-ms-transform: rotate(4deg); +-o-transform: rotate(4deg); +} From bd3c0edf34488736e04bb04d02e4bc393cbbd13a Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Mon, 21 May 2012 21:29:18 -0400 Subject: [PATCH 16/50] updates to dispy family; fix typo in INSTALL.txt Signed-off-by: Simon L'nu --- INSTALL.txt | 2 +- view/theme/dispy/dark/style.css | 45 ++++---- view/theme/dispy/dark/style.less | 156 ++++++++++++++-------------- view/theme/dispy/dark/theme.php | 16 +-- view/theme/dispy/light/_base.less | 3 +- view/theme/dispy/light/connect.png | Bin 443 -> 0 bytes view/theme/dispy/light/style.css | 45 ++++---- view/theme/dispy/light/style.less | 159 +++++++++++++++-------------- view/theme/dispy/light/theme.php | 12 +-- 9 files changed, 226 insertions(+), 212 deletions(-) delete mode 100644 view/theme/dispy/light/connect.png diff --git a/INSTALL.txt b/INSTALL.txt index 86076a09ae..c36c846a18 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -223,7 +223,7 @@ Retry the installation. As soon as the database has been created, % chmod 755 .htconfig.php ##################################################################### -- Some congiurations with "suhosin" security are configured without +- Some configurations with "suhosin" security are configured without an ability to run external processes. Friendica requires this ability. Following are some notes provided by one of our members. ##################################################################### diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index 3bb30be830..59c8931768 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -37,8 +37,9 @@ img{border:0 none;} a{color:#88a9d2;text-decoration:none;margin-bottom:1px;}a:hover{color:#638ec4;border-bottom:1px dotted #638ec4;} a:hover img{text-decoration:none;} blockquote{background:#444444;color:#eeeecc;text-indent:5px;padding:5px;border:1px solid #9a9a9a;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} -label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #2e2f2e;padding:5px;background:#eeeecc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;} -input{width:250px;height:25px;border:1px solid #999999;}input[type="checkbox"],input[type="radio"]{margin:0;width:15px;height:15px;} +label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #2e2f2e;padding:3px 5px;background:#eeeecc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;} +input{width:250px;height:25px;border:1px solid #999999;width:17em;}input[type="checkbox"],input[type="radio"]{width:15px;height:15px;margin:0;} +input[type="radio"]{margin:5px 0;} input[type="submit"],input[type="button"]{background-color:#eeeeee;border:2px outset #b1b1b1;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:1px 3px 4px 0 #111111;-o-box-shadow:1px 3px 4px 0 #111111;-webkit-box-shadow:1px 3px 4px 0 #111111;-ms-box-shadow:1px 3px 4px 0 #111111;box-shadow:1px 3px 4px 0 #111111;color:#2e302e;cursor:pointer;font-weight:bold;width:auto;-moz-text-shadow:1px 1px #111111;-o-text-shadow:1px 1px #111111;-webkit-text-shadow:1px 1px #111111;-ms-text-shadow:1px 1px #111111;text-shadow:1px 1px #111111;} input[type="submit"]:active,input[type="button"]:active{-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;} h1,h2,h3,h4,h5,h6{margin:10px 0px;font-weight:bold;border-bottom:1px solid #638ec4;} @@ -55,9 +56,9 @@ h6{font-size:xx-small;} .action{margin:5px 0;} .tool{margin:5px 0;list-style:none;} #articlemain{width:100%;height:100%;margin:0 auto;} -.button,#profile-listing-desc{color:#eeeecc;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;} -.button a,#profile-listing-desc a{color:#eeeecc;font-weight:bold;} -[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:1px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} +.button{color:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#eeeecc;font-weight:bold;} +#profile-listing-desc a{color:#eeeecc;font-weight:bold;} +[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:3px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} .intro-approve-as-friend-desc{margin-top:10px;} .intro-desc{margin-bottom:20px;font-weight:bold;} @@ -105,9 +106,9 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;} .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;} .search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} -#search-text,#mini-search-text{background:#2e2f2e;color:#eeeecc;margin:8px;} -#search-text{border:1px solid #eeeecc;} -#mini-search-text{font-size:8pt;height:14px;width:10em;} +#search-text,#mini-search-text{background:white;color:#eeeecc;margin:8px;} +#search-text{border:1px solid #eeeeee;margin:8px 0;} +#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;} #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;} #user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:75%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;} #user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;} @@ -120,7 +121,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #intro-update{background-position:-120px 0px;} #lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;} #language-selector{position:fixed;bottom:2px;left:52px;z-index:10;} -.menu-popup{position:absolute;display:none;width:11em;background:white;color:#2e2f2e;margin:0px;padding:0px;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;} +.menu-popup{position:absolute;display:none;background:white;color:#2e2f2e;margin:0px;padding:0px;font-size:small;line-height:1.1;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;} .menu-popup .menu-sep{border-top:1px solid #4e4f4e;} .menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;} .menu-popup .empty{padding:5px;text-align:center;color:#9ea8ac;} @@ -155,7 +156,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #profile-jot-text_tbl{margin-bottom:10px;background:#777777;} #profile-jot-text_ifr{width:99.900002% !important;} #profile-jot-text_toolbargroup,.mceCenter tr{background:#777777;} -[id$="jot-text_ifr"]{width:99.900002% !important;color:#2e2f2e;background:#eeeecc;}[id$="jot-text_ifr"] .mceContentBody{color:#2e2f2e;background:#eeeecc;} +[id$="jot-text_ifr"]{color:#2e2f2e;background:#eeeecc;}[id$="jot-text_ifr"] .mceContentBody{color:#2e2f2e;background:#eeeecc;} .defaultSkin tr.mceFirst{background:#777777;} .defaultSkin td.mceFirst,.defaultSkin td.mceLast{background-color:#eeeecc;} .defaultSkin span.mceIcon,.defaultSkin img.mceIcon,.defaultSkin .mceButtonDisabled .mceIcon{background-color:#eeeecc;} @@ -187,10 +188,10 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #jot-preview-content{background-color:#2e3436;color:#eeeecc;border:1px solid #2e2f2e;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;} #sectionmain{margin:20px;font-size:0.8em;min-width:475px;width:67%;float:left;display:inline;} .tabs{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:10px 0;}.tabs li{display:inline;font-size:smaller;} -.tab{border:1px solid #638ec4;padding:4px;}.tab:hover,.tab:active{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} -.tab.active{background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;}.tab.active:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} -.tab.active a{color:#2e2f2e;text-decoration:none;} +.tab{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab:active,.tab:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} .tab a{border:0;text-decoration:none;} +.tab.active{background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab.active:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} +.tab.active a{color:#2e2f2e;text-decoration:none;} .wall-item-outside-wrapper{border:1px solid #a9a9a9;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:6px 1px 10px -2px #111111;-o-box-shadow:6px 1px 10px -2px #111111;-webkit-box-shadow:6px 1px 10px -2px #111111;-ms-box-shadow:6px 1px 10px -2px #111111;box-shadow:6px 1px 10px -2px #111111;}.wall-item-outside-wrapper.comment{margin-top:5px;} .wall-item-content-wrapper{position:relative;padding:0.75em;width:auto;} .wall-item-outside-wrapper .wall-item-comment-wrapper{} @@ -243,7 +244,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .comment-edit-submit{height:22px;background-color:#555753;color:#eeeeee;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:0;} .wall-item-body code{background-color:#444444;border-bottom:1px dashed #cccccc;border-left:5px solid #cccccc;border-top:1px dashed #cccccc;color:#eeeecc;display:block;overflow-x:auto;padding:5px 0 15px 10px;width:95%;}.wall-item-body code a{color:#adc4e0;} div[id$="text"]{font-weight:bold;border-bottom:1px solid #cccccc;} -div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;} +div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;} .icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;} [id$="-end"],[class$="-end"]{clear:both;margin:0 0 10px 0;} @@ -317,17 +318,16 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le #contact-edit-last-update-text{margin-bottom:15px;} #contact-edit-last-updated{font-weight:bold;} #contact-edit-poll-text{display:inline;} -#contact-edit-info_tbl,#contact-edit-info_parent,.mceLayout{width:100%;} #contact-edit-end{clear:both;margin-bottom:65px;} .contact-photo-menu-button{position:absolute;background:url("dark/photo-menu.jpg") top left no-repeat transparent;margin:0px;padding:0px;width:16px;height:16px;top:64px;left:0px;overflow:hidden;text-indent:40px;display:none;} -.contact-photo-menu{width:auto;border:2px solid #444444;background:#2e2f2e;color:#eeeecc;position:absolute;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:2px;}.contact-photo-menu li a:hover{color:white;background:#3465A4;text-decoration:none;} +.contact-photo-menu{width:auto;border:2px solid #88a9d2;background:#2e2f2e;color:#eeeecc;position:absolute;font-size:smaller;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:4px;color:#88a9d2;background:#eeeecc;line-height:1;}.contact-photo-menu li a:hover{background:#88a9d2;color:#eeeecc;text-decoration:none;} #id_openid_url{background:url(dark/login-bg.gif) no-repeat;background-position:0 50%;padding-left:18px;} #settings-default-perms{margin-bottom:20px;} #register-form div,#profile-edit-form div{clear:both;} .settings-block label{clear:left;} .settings-block input{margin:10px 5px;} -#register-form label,#profile-edit-form label{width:300px;float:left;} -#register-form span,#profile-edit-form span{color:#555753;display:block;margin-bottom:20px;} +#register-form label,#profile-edit-form label{width:23em;} +#register-form span,#profile-edit-form span{color:#555753;display:inline-block;margin-bottom:20px;} #profile-edit-marital-label span{margin:-4px;} .settings-submit-wrapper,.profile-edit-submit-wrapper{margin:0 0 30px;} .profile-edit-side-div{display:none;} @@ -389,18 +389,19 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le .fc-state-highlight{background:#eeeecc;color:#2e2f2e;} .directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;} #group-sidebar{margin-bottom:10px;} -.group-selected,.nets-selected,.fileas-selected{padding:3px;color:#2e2f2e;background:#eeeecc;border:1px solid #88a9d2;} -.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{padding:3px;color:#88a9d2;background:#2e2f2e;border:1px solid #88a9d2;} +.group-selected,.nets-selected,.fileas-selected{background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} +.group-selected a,.nets-selected a,.fileas-selected a{color:#2e2f2e;text-decoration:none;} .groupsideedit{margin-right:10px;} #sidebar-group-ul{padding-left:0;} #sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;} #sidebar-group-list .icon{display:inline-block;width:12px;height:12px;} -.sidebar-group-element{padding:3px;}.sidebar-group-element:hover{color:#eeeecc;background:#2e3436;border:1px solid #638ec4;padding:3px;} +.sidebar-group-element{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} +.sidebar-group-element a{border:0;text-decoration:none;} #sidebar-new-group{margin:auto;display:inline-block;color:#eeeeee;text-decoration:none;text-align:center;} #peoplefind-sidebar form{margin-bottom:10px;} #sidebar-new-group:hover{} #sidebar-new-group:active{position:relative;top:1px;} -#side-peoplefind-url{background-color:#2e2f2e;color:#eeeecc;border:1px solid #999999;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#eeeeee;color:#222222;border:1px solid #333333;} +#side-peoplefind-url{border:1px solid #999999;margin-right:3px;width:75%;} .nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.nets-ul li{margin:10px 0 0;} .nets-link,.nets-all{margin-left:0px;} #netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index 4967ac9c2c..a9b881c554 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -190,7 +190,7 @@ label { font-size: small; margin: 0 10px 1em 0; .borders(1px, solid, @bg_colour); - padding: 5px; + padding: 3px 5px; background: @main_colour; color: darken(@main_alt_colour, 86.5%); .box_shadow(3px, 3px, 5px); @@ -198,10 +198,14 @@ label { input { .box(250px, 25px); .borders(1px, solid, darken(@main_alt_colour, 33.5%)); + width: 17em; &[type="checkbox"], &[type="radio"] { - margin: 0; .box(15px, 15px); + margin: 0; + } + &[type="radio"] { + margin: 5px 0; } &[type="submit"], &[type="button"] { @@ -280,30 +284,35 @@ h6 { .box(100%, 100%); margin: 0 auto; } -.button, -#profile-listing-desc { +.button { // .box(25%, auto); // background: @menu_bg_colour; color: @main_colour; // .borders(2px, outset, darken(@menu_bg_colour, 20%)); - // .rounded_corners; + .rounded_corners; padding: 5px; // font-size: smaller; cursor: pointer; - &.active { - .box_shadow(4px, 4px, 7px); - } + // &.active { + // .box_shadow(4px, 4px, 7px); + // } a { color: @main_colour; // font-size: smaller; font-weight: bold; } } +#profile-listing-desc { + a { + color: @main_colour; + font-weight: bold; + } +} [class$="-desc"], [id$="-desc"] { color: @main_colour; background: @bg_colour; - .borders(1px, outset, @main_colour); + .borders(3px, outset, @main_colour); .rounded_corners; // .box_shadow(3px, 3px, 5px); margin: 3px 10px 7px 0; @@ -658,17 +667,19 @@ nav #nav-notifications-linkmenu { } #search-text, #mini-search-text { - background: @bg_colour; + background: white; color: @main_colour; margin: 8px; } #search-text { - .borders; + .borders(1px, solid, @main_alt_colour); + margin: 8px 0; } #mini-search-text { font-size: 8pt; height: 14px; width: 10em; + margin: 5px; } #scrollup { position: fixed; @@ -754,11 +765,13 @@ nav #nav-notifications-linkmenu { .menu-popup { position: absolute; display: none; - width: 11em; + // width: 11em; background: white; color: @bg_colour; margin: 0px; padding: 0px; + font-size: small; + line-height: 1.1; .borders(3px, solid, @link_colour); .rounded_corners; z-index: 100000; @@ -1016,7 +1029,7 @@ nav #nav-notifications-linkmenu { background: darken(@main_alt_colour, 46.8%); } [id$="jot-text_ifr"] { - width: 99.900002% !important; + // width: 99.900002% !important; color: @bg_colour; background: @main_colour; .mceContentBody { @@ -1226,34 +1239,45 @@ nav #nav-notifications-linkmenu { font-size: smaller; } } -.tab { +.multibutton () { .borders(1px, solid, @hover_colour); padding: 4px; - &:hover, - &:active { + .rounded_corners; + &:active, + &:hover { background: @shiny_colour; color: @main_colour; .borders(1px, solid, @hover_colour); } - &.active { - background: @main_colour; - color: @bg_colour; - .borders(1px, solid, @hover_colour); - &:hover { - background: @shiny_colour; - color: @main_colour; - .borders(1px, solid, @hover_colour); - } - a { - color: @bg_colour; - text-decoration: none; - } - } a { border: 0; text-decoration: none; } } +.multibutton_active () { + background: @main_colour; + color: @bg_colour; + .borders(1px, solid, @hover_colour); + padding: 4px; + .rounded_corners; + &:hover { + background: @shiny_colour; + color: @main_colour; + .borders(1px, solid, @hover_colour); + } + a { + color: @bg_colour; + text-decoration: none; + } +} +.tab { + .multibutton; +} +.tab { + &.active { + .multibutton_active; + } +} /** @@ -1595,7 +1619,6 @@ div { } &[id$="wrapper"] { height: 100%; - margin-bottom: 1em; br { clear: left; } @@ -1933,11 +1956,6 @@ div { #contact-edit-poll-text { display: inline; } -#contact-edit-info_tbl, -#contact-edit-info_parent, -.mceLayout { - width: 100%; -} #contact-edit-end { clear: both; margin-bottom: 65px; @@ -1956,20 +1974,25 @@ div { } .contact-photo-menu { width: auto; - .borders(2px, solid, darken(@main_alt_colour, 66.5%)); + .borders(2px, solid, @link_colour); background: @bg_colour; color: @main_colour; position: absolute; + font-size: smaller; + .rounded_corners; left: 0px; top: 90px; display: none; z-index: 10000; li a { display: block; - padding: 2px; + padding: 4px; + color: @link_colour; + background: @main_colour; + line-height: 1; &:hover { - color: white; - background: #3465A4; + background: @link_colour; + color: @main_colour; text-decoration: none; } } @@ -2001,13 +2024,12 @@ div { } #register-form label, #profile-edit-form label { - width: 300px; - float: left; + width: 23em; } #register-form span, #profile-edit-form span { color: @menu_bg_colour; - display: block; + display: inline-block; margin-bottom: 20px; } #profile-edit-marital-label span { @@ -2020,12 +2042,6 @@ div { .profile-edit-side-div { display: none; } -/*.profile-edit-side-div:hover { - display: block; -} -.profile-edit-side-link { - margin: 3px 0px 0px 70px; -}*/ #profiles-menu-trigger { margin: 0px 0px 0px 25px; } @@ -2320,19 +2336,20 @@ div { .group-selected, .nets-selected, .fileas-selected { - padding: 3px; - color: @bg_colour; - background: @main_colour; - .borders(1px, solid, @link_colour); -} -.group-selected:hover, -.nets-selected:hover, -.fileas-selected:hover { - padding: 3px; - color: @link_colour; - background: @bg_colour; - .borders(1px, solid, @link_colour); + // padding: 4px; + // color: @bg_colour; + // background: @main_colour; + // .borders(1px, solid, @link_colour); + .multibutton_active; } +// .group-selected:hover, +// .nets-selected:hover, +// .fileas-selected:hover { +// padding: 4px; +// color: @link_colour; +// background: @bg_colour; +// .borders(1px, solid, @link_colour); +// } .groupsideedit { margin-right: 10px; } @@ -2350,13 +2367,8 @@ div { } } .sidebar-group-element { - padding: 3px; - &:hover { - color: @main_colour; - background: @shiny_colour; - .borders(1px, solid, @hover_colour); - padding: 3px; - } + .multibutton; + .rounded_corners; } #sidebar-new-group { margin: auto; @@ -2380,17 +2392,9 @@ div { } } #side-peoplefind-url { - background-color: @bg_colour; - color: @main_colour; .borders(1px, solid, darken(@main_alt_colour, 33.5%)); margin-right: 3px; width: 75%; - &:hover, - &:focus { - background-color: @main_alt_colour; - color: darken(@main_alt_colour, 80%); - .borders(1px, solid, darken(@main_alt_colour, 73.5%)); - } } .nets-ul { .list_reset; diff --git a/view/theme/dispy/dark/theme.php b/view/theme/dispy/dark/theme.php index 339c477a02..e156b6a7db 100644 --- a/view/theme/dispy/dark/theme.php +++ b/view/theme/dispy/dark/theme.php @@ -1,19 +1,19 @@ -* Maintainer: Simon -* Screenshot: Screenshot -*/ + * Name: Dispy Dark + * Description: Dispy Dark: Dark, Spartan, Sleek, and Functional + * Version: 1.2.1 + * Author: Simon + * Maintainer: Simon + * Screenshot: Screenshot + */ $a = get_app(); $a->theme_info = array( 'family' => 'dispy', 'name' => 'dark', - 'version' => '1.2' + 'version' => '1.2.1' ); function dispy_dark_init(&$a) { diff --git a/view/theme/dispy/light/_base.less b/view/theme/dispy/light/_base.less index 70576145cd..3046c1bacf 100644 --- a/view/theme/dispy/light/_base.less +++ b/view/theme/dispy/light/_base.less @@ -59,7 +59,8 @@ @dk_main_colour: darken(@bg_colour, 10%); //* links */ -@link_colour: #3465a4; +// yes our link colour is "friendica blue" ;) +@link_colour: @friendica_blue; @dk_link_colour: darken(@link_colour, 10%); @lt_link_colour: lighten(@link_colour, 10%); //@hover_colour: #729fcf; diff --git a/view/theme/dispy/light/connect.png b/view/theme/dispy/light/connect.png deleted file mode 100644 index b76fc13dce9eee21d5a9449f80e21444c801cabe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 443 zcmV;s0Yv_ZP)!~>``3MAvsy{nQinWJDuHZx1&Pfqp!=gT=cM`lKyLI}%}9ZNh)BkQeJ zD-LE{Z8zYYZ2}8steO=om6>6HveX4oNah=j|4kQ32q`FWJ0A6G+T71AW8BLI{g#n%)co^zxF;6@}Xd-KJ@J z*f;V#UviF9U;=aoESTAybB*10yM6x+81~9Q^J{Dah|#Y}+9^vDFbnMc2B?x^%wK^~ l;NdT49F&>aKJXyv-~)f?rYbayUt9nH002ovPDHLkV1mQvvw#2q diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css index bd4088b06b..bd3da31892 100644 --- a/view/theme/dispy/light/style.css +++ b/view/theme/dispy/light/style.css @@ -37,8 +37,9 @@ img{border:0 none;} a{color:#3465a4;text-decoration:none;margin-bottom:1px;}a:hover{color:#284d7d;border-bottom:1px dotted #284d7d;} a:hover img{text-decoration:none;} blockquote{background:#aaaaaa;color:#111111;text-indent:5px;padding:5px;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} -label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #eeeeec;padding:5px;background:#cccccc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;} -input{width:250px;height:25px;border:1px solid #444444;}input[type="checkbox"],input[type="radio"]{margin:0;width:15px;height:15px;} +label{width:38%;display:inline-block;font-size:small;margin:0 10px 1em 0;border:1px solid #eeeeec;padding:3px 5px;background:#cccccc;color:#111111;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;} +input{width:250px;height:25px;border:1px solid #444444;width:17em;}input[type="checkbox"],input[type="radio"]{width:15px;height:15px;margin:0;} +input[type="radio"]{margin:5px 0;} input[type="submit"],input[type="button"]{background-color:#555753;border:2px outset #444444;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:1px 3px 4px 0 #111111;-o-box-shadow:1px 3px 4px 0 #111111;-webkit-box-shadow:1px 3px 4px 0 #111111;-ms-box-shadow:1px 3px 4px 0 #111111;box-shadow:1px 3px 4px 0 #111111;color:#eeeeec;cursor:pointer;font-weight:bold;width:auto;-moz-text-shadow:1px 1px #111111;-o-text-shadow:1px 1px #111111;-webkit-text-shadow:1px 1px #111111;-ms-text-shadow:1px 1px #111111;text-shadow:1px 1px #111111;} input[type="submit"]:active,input[type="button"]:active{-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;} h1,h2,h3,h4,h5,h6{margin:10px 0px;font-weight:bold;border-bottom:1px solid #284d7d;} @@ -55,9 +56,9 @@ h6{font-size:xx-small;} .action{margin:5px 0;} .tool{margin:5px 0;list-style:none;} #articlemain{width:100%;height:100%;margin:0 auto;} -.button,#profile-listing-desc{color:#111111;padding:5px;cursor:pointer;}.button.active,#profile-listing-desc.active{-moz-box-shadow:4px 4px 7px 0px #111111;-o-box-shadow:4px 4px 7px 0px #111111;-webkit-box-shadow:4px 4px 7px 0px #111111;-ms-box-shadow:4px 4px 7px 0px #111111;box-shadow:4px 4px 7px 0px #111111;} -.button a,#profile-listing-desc a{color:#111111;font-weight:bold;} -[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#2e3436;border:1px outset #eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} +.button{color:#111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#111111;font-weight:bold;} +#profile-listing-desc a{color:#eeeeec;font-weight:bold;} +[class$="-desc"],[id$="-desc"]{color:#eeeeec;background:#2e3436;border:3px outset #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} .intro-approve-as-friend-desc{margin-top:10px;} .intro-desc{margin-bottom:20px;font-weight:bold;} @@ -106,8 +107,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(light/icons.png) -190px -60px no-repeat;} .search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#2e3436;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} #search-text,#mini-search-text{background:white;color:#111111;margin:8px;} -#search-text{border:1px solid #999999;} -#mini-search-text{font-size:8pt;height:14px;width:10em;} +#search-text{border:1px solid #999999;margin:8px 0;} +#mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;} #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;} #user-menu{-moz-box-shadow:5px 0 10px 0 #111111;-o-box-shadow:5px 0 10px 0 #111111;-webkit-box-shadow:5px 0 10px 0 #111111;-ms-box-shadow:5px 0 10px 0 #111111;box-shadow:5px 0 10px 0 #111111;display:block;width:75%;margin:3px 0 0 0;position:relative;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;background-color:#555753;background-image:url("data:image/jpeg;base64,/9j/4AAQSkZJRgABAQEASABIAAD//gATQ3JlYXRlZCB3aXRoIEdJTVD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCAAIAAwDASIAAhEBAxEB/8QAFgABAQEAAAAAAAAAAAAAAAAAAAMH/8QAIhAAAQMEAgIDAAAAAAAAAAAAAQIDBAAFBhESIQdBMVFh/8QAFQEBAQAAAAAAAAAAAAAAAAAAAgP/xAAXEQEBAQEAAAAAAAAAAAAAAAABAAIR/9oADAMBAAIRAxEAPwCXiHO8dbsEi35BEhIehNlbUhxhBU82O+G9bKgToD2D+VlmZX9OWZBJuAiMxGlni0w0gJCED4HXv7pSi6eFML//2Q==");background-position:98% center;background-repeat:no-repeat;clear:both;top:4px;left:10px;padding:2px;}#user-menu>a{vertical-align:top;outline:0 none;} #user-menu-label{font-size:small;padding:3px 20px 9px 5px;height:10px;} @@ -120,7 +121,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #intro-update{background-position:-120px 0px;} #lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;} #language-selector{position:fixed;bottom:2px;left:52px;z-index:10;} -.menu-popup{position:absolute;display:none;width:11em;background:white;color:#111111;margin:0px;padding:0px;border:3px solid #3465a4;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#111111;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeeec;background-color:#3465a4;} +.menu-popup{position:absolute;display:none;background:white;color:#111111;margin:0px;padding:0px;font-size:small;line-height:1.1;border:3px solid #3465a4;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#111111;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeeec;background-color:#3465a4;} .menu-popup .menu-sep{border-top:1px solid #4e4f4e;} .menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;} .menu-popup .empty{padding:5px;text-align:center;color:#ffffff;} @@ -140,7 +141,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;} .aprofile dt{background:transparent;color:#666666;font-weight:bold;-moz-box-shadow:3px 3px 5px 0px #111111;-o-box-shadow:3px 3px 5px 0px #111111;-webkit-box-shadow:3px 3px 5px 0px #111111;-ms-box-shadow:3px 3px 5px 0px #111111;box-shadow:3px 3px 5px 0px #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:15px 0 5px;padding-left:5px;} #profile-extra-links ul{margin-left:0px;padding-left:0px;list-style:none;} -#dfrn-request-link{-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#111111;display:block;font-size:1.2em;padding:0.2em 0.5em;background-color:#3465a4;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII=");background-repeat:no-repeat;background-position:95% center;} +#dfrn-request-link{-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#eeeeec;display:block;font-size:1.2em;padding:0.2em 0.5em;background-color:#3465a4;background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII=");background-repeat:no-repeat;background-position:95% center;} #wallmessage-link{color:#eeeeec;display:block;font-size:1.2em;padding:0.2em 0.5em;} .ttright{margin:0px;} .contact-block-div{width:50px;height:50px;float:left;} @@ -155,7 +156,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #profile-jot-text_tbl{margin-bottom:10px;background:#808080;} #profile-jot-text_ifr{width:99.900002% !important;} #profile-jot-text_toolbargroup,.mceCenter tr{background:#808080;} -[id$="jot-text_ifr"]{width:99.900002% !important;color:#111111;background:#eeeeec;}[id$="jot-text_ifr"] .mceContentBody{color:#111111;background:#eeeeec;} +[id$="jot-text_ifr"]{color:#111111;background:#eeeeec;}[id$="jot-text_ifr"] .mceContentBody{color:#111111;background:#eeeeec;} .defaultSkin tr.mceFirst{background:#808080;} .defaultSkin td.mceFirst,.defaultSkin td.mceLast{background-color:#eeeeec;} .defaultSkin span.mceIcon,.defaultSkin img.mceIcon,.defaultSkin .mceButtonDisabled .mceIcon{background-color:#eeeeec;} @@ -187,10 +188,10 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #jot-preview-content{background-color:#f2f2c3;color:#111111;border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;} #sectionmain{margin:20px;font-size:0.8em;min-width:475px;width:67%;float:left;display:inline;} .tabs{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:10px 0;}.tabs li{display:inline;font-size:smaller;} -.tab{border:1px solid #284d7d;padding:4px;}.tab:hover,.tab:active{background:#f2f2c3;color:#111111;border:1px solid #284d7d;} -.tab.active{background:#2e3436;color:#eeeeec;border:1px solid #284d7d;}.tab.active:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;} -.tab.active a{color:#eeeeec;text-decoration:none;} +.tab{border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab:active,.tab:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;} .tab a{border:0;text-decoration:none;} +.tab.active{background:#2e3436;color:#eeeeec;border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab.active:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;} +.tab.active a{color:#eeeeec;text-decoration:none;} .wall-item-outside-wrapper{border:1px solid #545454;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:6px 1px 10px -2px #111111;-o-box-shadow:6px 1px 10px -2px #111111;-webkit-box-shadow:6px 1px 10px -2px #111111;-ms-box-shadow:6px 1px 10px -2px #111111;box-shadow:6px 1px 10px -2px #111111;}.wall-item-outside-wrapper.comment{margin-top:5px;} .wall-item-content-wrapper{position:relative;padding:0.75em;width:auto;} .wall-item-outside-wrapper .wall-item-comment-wrapper{} @@ -243,7 +244,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm .comment-edit-submit{height:22px;background-color:#555753;color:#eeeeec;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;border:0;} .wall-item-body code{background-color:#dddddd;border-bottom:1px dashed #888888;border-left:5px solid #888888;border-top:1px dashed #888888;color:#191919;display:block;overflow-x:auto;padding:5px 0 15px 10px;width:95%;}.wall-item-body code a{color:#477ec4;} div[id$="text"]{font-weight:bold;border-bottom:1px solid #eeeeec;} -div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:left;} +div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .profile-match-wrapper{float:left;margin:0 5px 40px 0;width:120px;height:120px;padding:3px;position:relative;} .icon.drophide.profile-match-ignore{margin:0 6px 0 -3px;} [id$="-end"],[class$="-end"]{clear:both;margin:0 0 10px 0;} @@ -317,17 +318,16 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le #contact-edit-last-update-text{margin-bottom:15px;} #contact-edit-last-updated{font-weight:bold;} #contact-edit-poll-text{display:inline;} -#contact-edit-info_tbl,#contact-edit-info_parent,.mceLayout{width:100%;} #contact-edit-end{clear:both;margin-bottom:65px;} .contact-photo-menu-button{position:absolute;background:url("light/photo-menu.jpg") top left no-repeat transparent;margin:0px;padding:0px;width:16px;height:16px;top:64px;left:0px;overflow:hidden;text-indent:40px;display:none;} -.contact-photo-menu{width:auto;border:2px solid #444444;background:#eeeeec;color:#111111;position:absolute;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:2px;}.contact-photo-menu li a:hover{color:white;background:#3465A4;text-decoration:none;} +.contact-photo-menu{width:auto;border:2px solid #3465a4;background:#eeeeec;color:#111111;position:absolute;font-size:smaller;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;left:0px;top:90px;display:none;z-index:10000;}.contact-photo-menu li a{display:block;padding:4px;color:#3465a4;background:#eeeeec;line-height:1;}.contact-photo-menu li a:hover{background:#3465a4;color:#eeeeec;text-decoration:none;} #id_openid_url{background:url(light/login-bg.gif) no-repeat;background-position:0 50%;padding-left:18px;} #settings-default-perms{margin-bottom:20px;} #register-form div,#profile-edit-form div{clear:both;} .settings-block label{clear:left;} .settings-block input{margin:10px 5px;} -#register-form label,#profile-edit-form label{width:300px;float:left;} -#register-form span,#profile-edit-form span{color:#555753;display:block;margin-bottom:20px;} +#register-form label,#profile-edit-form label{width:23em;} +#register-form span,#profile-edit-form span{color:#555753;display:inline-block;margin-bottom:20px;} #profile-edit-marital-label span{margin:-4px;} .settings-submit-wrapper,.profile-edit-submit-wrapper{margin:0 0 30px;} .profile-edit-side-div{display:none;} @@ -389,18 +389,19 @@ div[id$="wrapper"]{height:100%;margin-bottom:1em;}div[id$="wrapper"] br{clear:le .fc-state-highlight{background:#eeeeec;color:#111111;} .directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;} #group-sidebar{margin-bottom:10px;} -.group-selected,.nets-selected,.fileas-selected{padding:3px;color:#eeeeec;background:#2e3436;border:1px solid #3465a4;} -.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{padding:3px;color:#3465a4;background:#eeeeec;border:1px solid #3465a4;} +.group-selected,.nets-selected,.fileas-selected{background:#2e3436;color:#eeeeec;border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;} +.group-selected a,.nets-selected a,.fileas-selected a{color:#eeeeec;text-decoration:none;} .groupsideedit{margin-right:10px;} #sidebar-group-ul{padding-left:0;} #sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;} #sidebar-group-list .icon{display:inline-block;width:12px;height:12px;} -.sidebar-group-element{padding:3px;}.sidebar-group-element:hover{color:#111111;background:#f2f2c3;border:1px solid #284d7d;padding:3px;} +.sidebar-group-element{border:1px solid #284d7d;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#f2f2c3;color:#111111;border:1px solid #284d7d;} +.sidebar-group-element a{border:0;text-decoration:none;} #sidebar-new-group{margin:auto;display:inline-block;color:#eeeeec;text-decoration:none;text-align:center;} #peoplefind-sidebar form{margin-bottom:10px;} #sidebar-new-group:hover{} #sidebar-new-group:active{position:relative;top:1px;} -#side-peoplefind-url{background-color:#eeeeec;color:#666666;border:1px solid #666666;margin-right:3px;width:75%;}#side-peoplefind-url:hover,#side-peoplefind-url:focus{background-color:#999999;color:#eeeeec;border:1px solid #111111;} +#side-peoplefind-url{border:1px solid #666666;margin-right:3px;width:75%;} .nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.nets-ul li{margin:10px 0 0;} .nets-link,.nets-all{margin-left:0px;} #netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;} diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less index 92c8547eec..d8bd922ccf 100644 --- a/view/theme/dispy/light/style.less +++ b/view/theme/dispy/light/style.less @@ -191,7 +191,7 @@ label { font-size: small; margin: 0 10px 1em 0; .borders(1px, solid, @bg_colour); - padding: 5px; + padding: 3px 5px; background: lighten(@main_alt_colour, 20%); color: @main_colour; .box_shadow(3px, 3px, 5px); @@ -199,10 +199,14 @@ label { input { .box(250px, 25px); .borders(1px, solid, darken(@main_alt_colour, 33.5%)); + width: 17em; &[type="checkbox"], &[type="radio"] { - margin: 0; .box(15px, 15px); + margin: 0; + } + &[type="radio"] { + margin: 5px 0; } &[type="submit"], &[type="button"] { @@ -281,30 +285,35 @@ h6 { .box(100%, 100%); margin: 0 auto; } -.button, -#profile-listing-desc { +.button { // .box(25%, auto); // background: @menu_bg_colour; color: @main_colour; // .borders(2px, outset, darken(@menu_bg_colour, 20%)); - // .rounded_corners; + .rounded_corners; padding: 5px; // font-size: smaller; cursor: pointer; - &.active { - .box_shadow(4px, 4px, 7px); - } + // &.active { + // .box_shadow(4px, 4px, 7px); + // } a { color: @main_colour; // font-size: smaller; font-weight: bold; } } +#profile-listing-desc { + a { + color: @bg_colour; + font-weight: bold; + } +} [class$="-desc"], [id$="-desc"] { color: @bg_colour; background: @dk_bg_colour; - .borders(1px, outset, @bg_colour); + .borders(3px, outset, @main_colour); .rounded_corners; // .box_shadow(3px, 3px, 5px); margin: 3px 10px 7px 0; @@ -569,6 +578,9 @@ div.jGrowl div { padding-left: 58px; margin-top: 50px; } + // &.jGrowl-message { + + // } } #nav-notifications-menu { margin: 30px 0 0 -20px; @@ -662,11 +674,13 @@ nav #nav-notifications-linkmenu { } #search-text { .borders(1px, solid, @main_alt_colour); + margin: 8px 0; } #mini-search-text { font-size: 8pt; height: 14px; width: 10em; + margin: 5px; } #scrollup { position: fixed; @@ -752,11 +766,13 @@ nav #nav-notifications-linkmenu { .menu-popup { position: absolute; display: none; - width: 11em; + // width: 11em; background: white; color: @main_colour; margin: 0px; padding: 0px; + font-size: small; + line-height: 1.1; .borders(3px, solid, @link_colour); .rounded_corners; z-index: 100000; @@ -904,11 +920,11 @@ nav #nav-notifications-linkmenu { } #dfrn-request-link { .rounded_corners; - color: @main_colour; + color: @bg_colour; display: block; font-size: 1.2em; padding: 0.2em 0.5em; - background-color: @friendica_blue; + background-color: @link_colour; // background-image: url(icons/connect.png); background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAOCAYAAAAmL5yKAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAE4SURBVCiRpZKxLgRRFIa//64dKruZFRIlolBviFKiVHsHrRaFikTCC+hEQtRegMQDqDUKJOPOvauSMJmjYEU2M0viT071/+fLOTlHZkadQgjLkh1LPEoj661WKw5mXG034JxtAgtmrJoVK5WZYYCy1AVQSOYbjeSqMmRmQ8v755Ne77lb5w+d4HMNJopCT7X+bwDQZKfTyf4BIAHeawHe+/kQ/FGM+QagvpFl2VSM/tyMmV7PV14AYMQ5nUp0AULIp0HXzpVvSdLYMmNVAjNdAuNAUQHgxy/ZvEQTSMw0A33DxkIIi2ma3gwC9PKSzRWF2wbdpml62DfyPF9yjlNgAnQGLJjZnXON3Xa7ff8NGPbKQPNrbAOI0a9J2ilLEzAL7P0GqJJizF+BUeDhL2cclJnZPvAg6eADf+imKjSMX1wAAAAASUVORK5CYII="); background-repeat: no-repeat; @@ -1014,7 +1030,7 @@ nav #nav-notifications-linkmenu { background: darken(@main_alt_colour, 10%); } [id$="jot-text_ifr"] { - width: 99.900002% !important; + // width: 99.900002% !important; color: @main_colour; background: @bg_colour; .mceContentBody { @@ -1224,34 +1240,45 @@ nav #nav-notifications-linkmenu { font-size: smaller; } } -.tab { +.multibutton () { .borders(1px, solid, @hover_colour); padding: 4px; - &:hover, - &:active { + .rounded_corners; + &:active, + &:hover { background: @shiny_colour; color: @main_colour; .borders(1px, solid, @hover_colour); } - &.active { - background: @dk_bg_colour; - color: @bg_colour; - .borders(1px, solid, @hover_colour); - &:hover { - background: @shiny_colour; - color: @main_colour; - .borders(1px, solid, @hover_colour); - } - a { - color: @bg_colour; - text-decoration: none; - } - } a { border: 0; text-decoration: none; } } +.multibutton_active () { + background: @dk_bg_colour; + color: @bg_colour; + .borders(1px, solid, @hover_colour); + padding: 4px; + .rounded_corners; + &:hover { + background: @shiny_colour; + color: @main_colour; + .borders(1px, solid, @hover_colour); + } + a { + color: @bg_colour; + text-decoration: none; + } +} +.tab { + .multibutton; +} +.tab { + &.active { + .multibutton_active; + } +} /** @@ -1593,7 +1620,6 @@ div { } &[id$="wrapper"] { height: 100%; - margin-bottom: 1em; br { clear: left; } @@ -1931,11 +1957,6 @@ div { #contact-edit-poll-text { display: inline; } -#contact-edit-info_tbl, -#contact-edit-info_parent, -.mceLayout { - width: 100%; -} #contact-edit-end { clear: both; margin-bottom: 65px; @@ -1954,20 +1975,25 @@ div { } .contact-photo-menu { width: auto; - .borders(2px, solid, darken(@main_alt_colour, 33.5%)); + .borders(2px, solid, @link_colour); background: @bg_colour; color: @main_colour; position: absolute; + font-size: smaller; + .rounded_corners; left: 0px; top: 90px; display: none; z-index: 10000; li a { display: block; - padding: 2px; + padding: 4px; + color: @link_colour; + background: @bg_colour; + line-height: 1; &:hover { - color: white; - background: #3465A4; + background: @link_colour; + color: @bg_colour; text-decoration: none; } } @@ -1999,13 +2025,12 @@ div { } #register-form label, #profile-edit-form label { - width: 300px; - float: left; + width: 23em; } #register-form span, #profile-edit-form span { color: @menu_bg_colour; - display: block; + display: inline-block; margin-bottom: 20px; } #profile-edit-marital-label span { @@ -2018,12 +2043,6 @@ div { .profile-edit-side-div { display: none; } -/*.profile-edit-side-div:hover { - display: block; -} -.profile-edit-side-link { - margin: 3px 0px 0px 70px; -}*/ #profiles-menu-trigger { margin: 0px 0px 0px 25px; } @@ -2318,19 +2337,20 @@ div { .group-selected, .nets-selected, .fileas-selected { - padding: 3px; - color: @bg_colour; - background: @dk_bg_colour; - .borders(1px, solid, @link_colour); -} -.group-selected:hover, -.nets-selected:hover, -.fileas-selected:hover { - padding: 3px; - color: @link_colour; - background: @bg_colour; - .borders(1px, solid, @link_colour); + // padding: 4px; + // color: @bg_colour; + // background: @dk_bg_colour; + // .borders(1px, solid, @hover_colour); + .multibutton_active; } +// .group-selected:hover, +// .nets-selected:hover, +// .fileas-selected:hover { +// padding: 4px; +// color: @link_colour; +// background: @bg_colour; +// .borders(1px, solid, @link_colour); +// } .groupsideedit { margin-right: 10px; } @@ -2348,13 +2368,8 @@ div { } } .sidebar-group-element { - padding: 3px; - &:hover { - color: @main_colour; - background: @shiny_colour; - .borders(1px, solid, @hover_colour); - padding: 3px; - } + .multibutton; + .rounded_corners; } #sidebar-new-group { margin: auto; @@ -2378,17 +2393,9 @@ div { } } #side-peoplefind-url { - background-color: @bg_colour; - color: darken(@main_alt_colour, 20%); .borders(1px, solid, darken(@main_alt_colour, 20%)); margin-right: 3px; width: 75%; - &:hover, - &:focus { - background-color: @main_alt_colour; - color: @bg_colour; - .borders(1px, solid, @main_colour); - } } .nets-ul { .list_reset; diff --git a/view/theme/dispy/light/theme.php b/view/theme/dispy/light/theme.php index 2b37c06718..df3cca042d 100644 --- a/view/theme/dispy/light/theme.php +++ b/view/theme/dispy/light/theme.php @@ -1,9 +1,9 @@ Dispy: Light, Spartan, Sleek, and Functional
Dispy Dark: Dark, Spartan, Sleek, and Functional

- * Version: 1.2 + * Name: Dispy Light + * Description: Dispy Light: Light, Spartan, Sleek, and Functional + * Version: 1.2.1 * Author: Simon * Maintainer: Simon * Screenshot: Screenshot @@ -13,7 +13,7 @@ $a = get_app(); $a->theme_info = array( 'family' => 'dispy', 'name' => 'light', - 'version' => '1.2' + 'version' => '1.2.1' ); function dispy_light_init(&$a) { @@ -21,10 +21,10 @@ function dispy_light_init(&$a) { /** @purpose set some theme defaults */ $cssFile = null; - $colour = false; $colour = 'light'; + $colour_path = "/light/"; - // custom css + // set css if (!is_null($cssFile)) { $a->page['htmlhead'] .= sprintf('', $cssFile); } From d466c9ab08bb843d0f31d3b555ada738d8dd0a0e Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Mon, 21 May 2012 21:38:53 -0400 Subject: [PATCH 17/50] fix (min-)search-text text Signed-off-by: Simon L'nu --- view/theme/dispy/dark/style.css | 2 +- view/theme/dispy/dark/style.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index 59c8931768..6f29ef1f45 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -106,7 +106,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #nav-buttons{clear:both;list-style:none;padding:0px;margin:0px;height:25px;}#nav-buttons>li{padding:0;display:inline-block;margin:0px -4px 0px 0px;} .floaterflip{display:block;position:fixed;z-index:110;top:56px;right:19px;width:22px;height:22px;overflow:hidden;margin:0px;background:transparent url(dark/icons.png) -190px -60px no-repeat;} .search-box{display:inline-block;margin:5px;position:fixed;right:0px;bottom:0px;z-index:100;background:#1d1f1d;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;} -#search-text,#mini-search-text{background:white;color:#eeeecc;margin:8px;} +#search-text,#mini-search-text{background:white;color:#2e2f2e;margin:8px;} #search-text{border:1px solid #eeeeee;margin:8px 0;} #mini-search-text{font-size:8pt;height:14px;width:10em;margin:5px;} #scrollup{position:fixed;right:5px;bottom:40px;z-index:100;}#scrollup a:hover{text-decoration:none;border:0;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index a9b881c554..000918a9b5 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -668,7 +668,7 @@ nav #nav-notifications-linkmenu { #search-text, #mini-search-text { background: white; - color: @main_colour; + color: @bg_colour; margin: 8px; } #search-text { From a16382529135a76c5afaf4d4189856734a8e7f58 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 21 May 2012 22:54:39 -0700 Subject: [PATCH 18/50] redir links for permission controlled attachments --- include/conversation.php | 1 + include/text.php | 38 ++++++++++++++++++++++---------------- mod/item.php | 16 ++++++---------- mod/redir.php | 2 +- 4 files changed, 30 insertions(+), 27 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index 6bf673b97f..dc574ddff8 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -174,6 +174,7 @@ function localize_item(&$item){ } } + } /** diff --git a/include/text.php b/include/text.php index e3c6833387..e93c24ef4c 100644 --- a/include/text.php +++ b/include/text.php @@ -901,24 +901,30 @@ function prepare_body($item,$attach = false) { foreach($arr as $r) { $matches = false; $icon = ''; - $cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches); + $cnt = preg_match_all('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches, PREG_SET_ORDER); if($cnt) { - $icontype = strtolower(substr($matches[3],0,strpos($matches[3],'/'))); - switch($icontype) { - case 'video': - case 'audio': - case 'image': - case 'text': - $icon = '
'; - break; - default: - $icon = '
'; - break; - } - $title = ((strlen(trim($matches[4]))) ? escape_tags(trim($matches[4])) : escape_tags($matches[1])); - $title .= ' ' . $matches[2] . ' ' . t('bytes'); + foreach($matches as $mtch) { + $icontype = strtolower(substr($mtch[3],0,strpos($mtch[3],'/'))); + switch($icontype) { + case 'video': + case 'audio': + case 'image': + case 'text': + $icon = '
'; + break; + default: + $icon = '
'; + break; + } + $title = ((strlen(trim($mtch[4]))) ? escape_tags(trim($mtch[4])) : escape_tags($mtch[1])); + $title .= ' ' . $mtch[2] . ' ' . t('bytes'); + if((local_user() == $item['uid']) && $item['contact-id'] != $a->contact['id']) + $the_url = $a->get_baseurl() . '/redir/' . $item['contact-id'] . '?f=1&url=' . $mtch[1]; + else + $the_url = $mtch[1]; - $s .= '' . $icon . ''; + $s .= '' . $icon . ''; + } } } $s .= '
'; diff --git a/mod/item.php b/mod/item.php index 9f6b2aef43..81dd553cdb 100644 --- a/mod/item.php +++ b/mod/item.php @@ -290,18 +290,16 @@ function item_post(&$a) { $author = null; $self = false; - if(($_SESSION['uid']) && ($_SESSION['uid'] == $profile_uid)) { + if((local_user()) && (local_user() == $profile_uid)) { $self = true; $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1", intval($_SESSION['uid']) ); } - else { - if((x($_SESSION,'visitor_id')) && (intval($_SESSION['visitor_id']))) { - $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", - intval($_SESSION['visitor_id']) - ); - } + elseif(remote_user()) { + $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", + intval(remote_user()) + ); } if(count($r)) { @@ -311,7 +309,7 @@ function item_post(&$a) { // get contact info for owner - if($profile_uid == $_SESSION['uid']) { + if($profile_uid == local_user()) { $contact_record = $author; } else { @@ -322,8 +320,6 @@ function item_post(&$a) { $contact_record = $r[0]; } - - $post_type = notags(trim($_REQUEST['type'])); if($post_type === 'net-comment') { diff --git a/mod/redir.php b/mod/redir.php index 9223e5483c..0f7b5cc23f 100644 --- a/mod/redir.php +++ b/mod/redir.php @@ -6,7 +6,7 @@ function redir_init(&$a) { // traditional DFRN - if(local_user() && $a->argc == 2 && intval($a->argv[1])) { + if(local_user() && $a->argc > 1 && intval($a->argv[1])) { $cid = $a->argv[1]; From 5dad99888d4d67fd10e777b074a77f01f65018aa Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 22 May 2012 11:56:49 +0200 Subject: [PATCH 19/50] fix setting array values to config items --- include/config.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/config.php b/include/config.php index 4cff38090c..12fc9cafc9 100644 --- a/include/config.php +++ b/include/config.php @@ -77,11 +77,9 @@ function get_config($family, $key, $instore = false) { if(! function_exists('set_config')) { function set_config($family,$key,$value) { global $a; - // manage array value $dbvalue = (is_array($value)?serialize($value):$value); - $dbvalue = (is_bool($value) ? intval($value) : $value); - + $dbvalue = (is_bool($dbvalue) ? intval($dbvalue) : $dbvalue); if(get_config($family,$key,true) === false) { $a->config[$family][$key] = $value; $ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ", From be64437b147259d6eac0d5455de7c435eee450e6 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 22 May 2012 12:17:01 +0200 Subject: [PATCH 20/50] DE: update to the strings and some mail templates --- view/de/intro_complete_eml.tpl | 16 +- view/de/messages.po | 871 +++++++++++++++++---------------- view/de/register_open_eml.tpl | 28 +- view/de/strings.php | 103 ++-- 4 files changed, 535 insertions(+), 483 deletions(-) diff --git a/view/de/intro_complete_eml.tpl b/view/de/intro_complete_eml.tpl index de85c8a798..9d47a6fb18 100644 --- a/view/de/intro_complete_eml.tpl +++ b/view/de/intro_complete_eml.tpl @@ -1,19 +1,19 @@ Hallo $[username], - '$[fn]' auf '$[dfrn_url]' wurde akzeptiert -Deine Verbindungsanfrage auf '$[sitename]'. + '$[fn]' auf '$[dfrn_url]' hat deine Verbindungsanfrage +auf '$[sitename]' akzeptiert. - '$[fn]' hat entschieden Dich als "Fan" zu akzeptieren, was ein -paar Formen der Kommunikation einschränkt - wie das schreiben von privaten Nachrichten und einige Profil -Interaktionen. Wenn das ein Promi-Konto oder eine Forum-Seite ist, werden die Einstellungen -automatisch angewendet. + '$[fn]' hat entschieden Dich als "Fan" zu akzeptieren, was zu einigen +Einschränkungen bei der Kommunikation führt - wie zB das Schreiben von privaten Nachrichten und einige Profil +Interaktionen. Sollte dies ein Promi-Konto oder eine Forum-Seite sein, werden die Einstellungen +automatisch angewandt. '$[fn]' kann wählen, ob die Freundschaft in eine beidseitige oder alles erlaubende Beziehung in der Zukunft erweitert wird. - Du empfängst jetzt die öffentlichen Beiträge von '$[fn]', -welche auf der "Netzwerk" Seite erscheinen werden + Du empfängst ab sofort die öffentlichen Beiträge von '$[fn]', +auf deiner "Netzwerk" Seite. $[siteurl] diff --git a/view/de/messages.po b/view/de/messages.po index 52b127f395..9de04e8604 100644 --- a/view/de/messages.po +++ b/view/de/messages.po @@ -8,7 +8,7 @@ # Fabian Dost , 2012. # , 2012. # , 2012. -# , 2011. +# , 2011, 2012. # , 2012. # , 2012. # Martin Schmitt , 2012. @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: friendica\n" "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n" -"POT-Creation-Date: 2012-05-14 10:00-0700\n" -"PO-Revision-Date: 2012-05-15 08:40+0000\n" +"POT-Creation-Date: 2012-05-21 10:00-0700\n" +"PO-Revision-Date: 2012-05-22 07:02+0000\n" "Last-Translator: bavatar \n" "Language-Team: German (http://www.transifex.net/projects/p/friendica/language/de/)\n" "MIME-Version: 1.0\n" @@ -51,8 +51,8 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:865 #: ../../mod/editpost.php:10 ../../mod/install.php:171 #: ../../mod/notifications.php:66 ../../mod/contacts.php:125 -#: ../../mod/settings.php:104 ../../mod/settings.php:521 -#: ../../mod/settings.php:526 ../../mod/manage.php:86 ../../mod/network.php:6 +#: ../../mod/settings.php:104 ../../mod/settings.php:535 +#: ../../mod/settings.php:540 ../../mod/manage.php:86 ../../mod/network.php:6 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33 @@ -66,8 +66,8 @@ msgstr "Konnte den Kontakt nicht aktualisieren." #: ../../mod/follow.php:8 ../../mod/display.php:138 ../../mod/profiles.php:7 #: ../../mod/profiles.php:365 ../../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:495 -#: ../../include/items.php:3202 ../../index.php:306 +#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:503 +#: ../../include/items.php:3214 ../../index.php:306 msgid "Permission denied." msgstr "Zugriff verweigert." @@ -78,7 +78,7 @@ msgstr "Kontakt nicht gefunden." #: ../../mod/crepair.php:135 msgid "Repair Contact Settings" -msgstr "Kontakt-Einstellungen reparieren" +msgstr "Kontakteinstellungen reparieren" #: ../../mod/crepair.php:137 msgid "" @@ -96,8 +96,8 @@ msgstr "Bitte nutze den Zurück-Button deines Browsers jetzt, w msgid "Return to contact editor" msgstr "Zurück zum Kontakteditor" -#: ../../mod/crepair.php:148 ../../mod/settings.php:541 -#: ../../mod/settings.php:567 ../../mod/admin.php:643 ../../mod/admin.php:652 +#: ../../mod/crepair.php:148 ../../mod/settings.php:555 +#: ../../mod/settings.php:581 ../../mod/admin.php:643 ../../mod/admin.php:652 msgid "Name" msgstr "Name" @@ -135,16 +135,16 @@ msgstr "Neues Foto von dieser URL" #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 #: ../../mod/events.php:428 ../../mod/photos.php:900 ../../mod/photos.php:958 -#: ../../mod/photos.php:1193 ../../mod/photos.php:1233 -#: ../../mod/photos.php:1273 ../../mod/photos.php:1304 +#: ../../mod/photos.php:1200 ../../mod/photos.php:1240 +#: ../../mod/photos.php:1280 ../../mod/photos.php:1311 #: ../../mod/install.php:251 ../../mod/install.php:289 #: ../../mod/localtime.php:45 ../../mod/contacts.php:322 -#: ../../mod/settings.php:539 ../../mod/settings.php:685 -#: ../../mod/settings.php:746 ../../mod/settings.php:940 +#: ../../mod/settings.php:553 ../../mod/settings.php:699 +#: ../../mod/settings.php:760 ../../mod/settings.php:964 #: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:404 #: ../../mod/admin.php:640 ../../mod/admin.php:776 ../../mod/admin.php:975 #: ../../mod/admin.php:1062 ../../mod/profiles.php:534 -#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:597 +#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:605 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 #: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158 #: ../../addon/uhremotestorage/uhremotestorage.php:89 @@ -162,11 +162,11 @@ msgstr "Neues Foto von dieser URL" #: ../../addon/statusnet/statusnet.php:318 #: ../../addon/statusnet/statusnet.php:325 #: ../../addon/statusnet/statusnet.php:353 -#: ../../addon/statusnet/statusnet.php:553 ../../addon/tumblr/tumblr.php:90 +#: ../../addon/statusnet/statusnet.php:561 ../../addon/tumblr/tumblr.php:90 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88 -#: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48 +#: ../../addon/wppost/wppost.php:109 ../../addon/showmore/showmore.php:48 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180 -#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375 +#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:381 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102 #: ../../addon/posterous/posterous.php:103 #: ../../view/theme/cleanzero/config.php:80 @@ -217,7 +217,7 @@ msgstr "Schlage %s einen Kontakt vor" #: ../../mod/events.php:65 msgid "Event description and start time are required." -msgstr "Ereignis Beschreibung und Startzeit sind erforderlich." +msgstr "Ereignisbeschreibung und Startzeit sind erforderlich." #: ../../mod/events.php:258 msgid "l, F j" @@ -232,7 +232,7 @@ msgid "link to source" msgstr "Link zum Originalbeitrag" #: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:126 -#: ../../include/nav.php:52 ../../boot.php:1503 +#: ../../include/nav.php:52 ../../boot.php:1522 msgid "Events" msgstr "Veranstaltungen" @@ -291,8 +291,8 @@ msgid "Share this event" msgstr "Veranstaltung teilen" #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 -#: ../../mod/dfrn_request.php:818 ../../mod/settings.php:540 -#: ../../mod/settings.php:566 ../../addon/js_upload/js_upload.php:45 +#: ../../mod/dfrn_request.php:826 ../../mod/settings.php:554 +#: ../../mod/settings.php:580 ../../addon/js_upload/js_upload.php:45 msgid "Cancel" msgstr "Abbrechen" @@ -335,40 +335,40 @@ msgid "" " and/or create new posts for you?" msgstr "Möchtest du dieser Anwendung den Zugriff auf deine Beiträge und Kontakte, sowie das Erstellen neuer Beiträge in deinem Namen gestatten?" -#: ../../mod/api.php:105 ../../mod/dfrn_request.php:806 -#: ../../mod/settings.php:854 ../../mod/settings.php:860 -#: ../../mod/settings.php:868 ../../mod/settings.php:872 -#: ../../mod/settings.php:877 ../../mod/settings.php:883 -#: ../../mod/settings.php:889 ../../mod/settings.php:895 -#: ../../mod/settings.php:931 ../../mod/settings.php:932 -#: ../../mod/settings.php:933 ../../mod/settings.php:934 -#: ../../mod/register.php:532 ../../mod/profiles.php:511 +#: ../../mod/api.php:105 ../../mod/dfrn_request.php:814 +#: ../../mod/settings.php:875 ../../mod/settings.php:881 +#: ../../mod/settings.php:889 ../../mod/settings.php:893 +#: ../../mod/settings.php:898 ../../mod/settings.php:904 +#: ../../mod/settings.php:910 ../../mod/settings.php:916 +#: ../../mod/settings.php:952 ../../mod/settings.php:953 +#: ../../mod/settings.php:954 ../../mod/settings.php:955 +#: ../../mod/register.php:511 ../../mod/profiles.php:511 msgid "Yes" msgstr "Ja" -#: ../../mod/api.php:106 ../../mod/dfrn_request.php:807 -#: ../../mod/settings.php:854 ../../mod/settings.php:860 -#: ../../mod/settings.php:868 ../../mod/settings.php:872 -#: ../../mod/settings.php:877 ../../mod/settings.php:883 -#: ../../mod/settings.php:889 ../../mod/settings.php:895 -#: ../../mod/settings.php:931 ../../mod/settings.php:932 -#: ../../mod/settings.php:933 ../../mod/settings.php:934 -#: ../../mod/register.php:533 ../../mod/profiles.php:512 +#: ../../mod/api.php:106 ../../mod/dfrn_request.php:815 +#: ../../mod/settings.php:875 ../../mod/settings.php:881 +#: ../../mod/settings.php:889 ../../mod/settings.php:893 +#: ../../mod/settings.php:898 ../../mod/settings.php:904 +#: ../../mod/settings.php:910 ../../mod/settings.php:916 +#: ../../mod/settings.php:952 ../../mod/settings.php:953 +#: ../../mod/settings.php:954 ../../mod/settings.php:955 +#: ../../mod/register.php:512 ../../mod/profiles.php:512 msgid "No" msgstr "Nein" -#: ../../mod/photos.php:43 ../../boot.php:1497 +#: ../../mod/photos.php:43 ../../boot.php:1516 msgid "Photo Albums" msgstr "Fotoalben" #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879 -#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382 -#: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110 +#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1389 +#: ../../mod/photos.php:1401 ../../addon/communityhome/communityhome.php:110 #: ../../view/theme/diabook/theme.php:593 msgid "Contact Photos" msgstr "Kontaktbilder" -#: ../../mod/photos.php:58 ../../mod/photos.php:975 ../../mod/photos.php:1424 +#: ../../mod/photos.php:58 ../../mod/photos.php:975 ../../mod/photos.php:1438 msgid "Upload New Photos" msgstr "Weitere Fotos hochladen" @@ -381,8 +381,8 @@ msgid "Contact information unavailable" msgstr "Kontaktinformationen nicht verfügbar" #: ../../mod/photos.php:151 ../../mod/photos.php:597 ../../mod/photos.php:950 -#: ../../mod/photos.php:965 ../../mod/register.php:335 -#: ../../mod/register.php:342 ../../mod/register.php:349 +#: ../../mod/photos.php:965 ../../mod/register.php:314 +#: ../../mod/register.php:321 ../../mod/register.php:328 #: ../../mod/profile_photo.php:60 ../../mod/profile_photo.php:67 #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261 @@ -399,7 +399,7 @@ msgstr "Album nicht gefunden." msgid "Delete Album" msgstr "Album löschen" -#: ../../mod/photos.php:242 ../../mod/photos.php:1194 +#: ../../mod/photos.php:242 ../../mod/photos.php:1201 msgid "Delete Photo" msgstr "Foto löschen" @@ -410,7 +410,7 @@ msgstr "wurde getaggt in einem" #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 #: ../../view/theme/diabook/theme.php:565 ../../include/text.php:1305 -#: ../../include/diaspora.php:1654 ../../include/conversation.php:53 +#: ../../include/diaspora.php:1662 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" msgstr "Foto" @@ -438,7 +438,7 @@ msgid "Image upload failed." msgstr "Hochladen des Bildes gescheitert." #: ../../mod/photos.php:759 ../../mod/community.php:16 -#: ../../mod/dfrn_request.php:732 ../../mod/viewcontacts.php:17 +#: ../../mod/dfrn_request.php:740 ../../mod/viewcontacts.php:17 #: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29 msgid "Public access denied." msgstr "Öffentlicher Zugriff verweigert." @@ -467,7 +467,7 @@ msgstr "oder existierender Albumname: " msgid "Do not show a status post for this upload" msgstr "Keine Status-Mitteilung für diesen Beitrag anzeigen" -#: ../../mod/photos.php:914 ../../mod/photos.php:1189 +#: ../../mod/photos.php:914 ../../mod/photos.php:1196 msgid "Permissions" msgstr "Berechtigungen" @@ -475,109 +475,109 @@ msgstr "Berechtigungen" msgid "Edit Album" msgstr "Album bearbeiten" -#: ../../mod/photos.php:984 ../../mod/photos.php:1407 +#: ../../mod/photos.php:991 ../../mod/photos.php:1421 msgid "View Photo" msgstr "Fotos betrachten" -#: ../../mod/photos.php:1019 +#: ../../mod/photos.php:1026 msgid "Permission denied. Access to this item may be restricted." msgstr "Zugriff verweigert. Zugriff zu diesem Eintrag könnte eingeschränkt sein." -#: ../../mod/photos.php:1021 +#: ../../mod/photos.php:1028 msgid "Photo not available" msgstr "Foto nicht verfügbar" -#: ../../mod/photos.php:1071 +#: ../../mod/photos.php:1078 msgid "View photo" msgstr "Fotos ansehen" -#: ../../mod/photos.php:1071 +#: ../../mod/photos.php:1078 msgid "Edit photo" msgstr "Foto bearbeiten" -#: ../../mod/photos.php:1072 +#: ../../mod/photos.php:1079 msgid "Use as profile photo" msgstr "Als Profilbild verwenden" -#: ../../mod/photos.php:1078 ../../include/conversation.php:483 +#: ../../mod/photos.php:1085 ../../include/conversation.php:483 msgid "Private Message" msgstr "Private Nachricht" -#: ../../mod/photos.php:1100 +#: ../../mod/photos.php:1107 msgid "View Full Size" msgstr "Betrachte Originalgröße" -#: ../../mod/photos.php:1168 +#: ../../mod/photos.php:1175 msgid "Tags: " msgstr "Tags: " -#: ../../mod/photos.php:1171 +#: ../../mod/photos.php:1178 msgid "[Remove any tag]" msgstr "[Tag entfernen]" -#: ../../mod/photos.php:1182 +#: ../../mod/photos.php:1189 msgid "New album name" msgstr "Name des neuen Albums" -#: ../../mod/photos.php:1185 +#: ../../mod/photos.php:1192 msgid "Caption" msgstr "Bildunterschrift" -#: ../../mod/photos.php:1187 +#: ../../mod/photos.php:1194 msgid "Add a Tag" msgstr "Tag hinzufügen" -#: ../../mod/photos.php:1191 +#: ../../mod/photos.php:1198 msgid "" "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -#: ../../mod/photos.php:1211 ../../include/conversation.php:532 +#: ../../mod/photos.php:1218 ../../include/conversation.php:532 msgid "I like this (toggle)" msgstr "Ich mag das (toggle)" -#: ../../mod/photos.php:1212 ../../include/conversation.php:533 +#: ../../mod/photos.php:1219 ../../include/conversation.php:533 msgid "I don't like this (toggle)" msgstr "Ich mag das nicht (toggle)" -#: ../../mod/photos.php:1213 ../../include/conversation.php:967 +#: ../../mod/photos.php:1220 ../../include/conversation.php:967 msgid "Share" msgstr "Teilen" -#: ../../mod/photos.php:1214 ../../mod/editpost.php:104 +#: ../../mod/photos.php:1221 ../../mod/editpost.php:104 #: ../../mod/wallmessage.php:145 ../../mod/message.php:214 #: ../../mod/message.php:408 ../../include/conversation.php:364 #: ../../include/conversation.php:709 ../../include/conversation.php:986 msgid "Please wait" msgstr "Bitte warten" -#: ../../mod/photos.php:1230 ../../mod/photos.php:1270 -#: ../../mod/photos.php:1301 ../../include/conversation.php:555 +#: ../../mod/photos.php:1237 ../../mod/photos.php:1277 +#: ../../mod/photos.php:1308 ../../include/conversation.php:555 msgid "This is you" msgstr "Das bist du" -#: ../../mod/photos.php:1232 ../../mod/photos.php:1272 -#: ../../mod/photos.php:1303 ../../include/conversation.php:557 +#: ../../mod/photos.php:1239 ../../mod/photos.php:1279 +#: ../../mod/photos.php:1310 ../../include/conversation.php:557 #: ../../boot.php:516 msgid "Comment" msgstr "Kommentar" -#: ../../mod/photos.php:1234 ../../mod/editpost.php:125 +#: ../../mod/photos.php:1241 ../../mod/editpost.php:125 #: ../../include/conversation.php:567 ../../include/conversation.php:1004 msgid "Preview" msgstr "Vorschau" -#: ../../mod/photos.php:1331 ../../mod/settings.php:602 -#: ../../mod/settings.php:683 ../../mod/group.php:168 ../../mod/admin.php:647 +#: ../../mod/photos.php:1338 ../../mod/settings.php:616 +#: ../../mod/settings.php:697 ../../mod/group.php:168 ../../mod/admin.php:647 #: ../../include/conversation.php:321 ../../include/conversation.php:587 msgid "Delete" msgstr "Löschen" -#: ../../mod/photos.php:1413 +#: ../../mod/photos.php:1427 msgid "View Album" msgstr "Album betrachten" -#: ../../mod/photos.php:1422 +#: ../../mod/photos.php:1436 msgid "Recent Photos" msgstr "Neueste Fotos" @@ -590,7 +590,7 @@ msgstr "Nicht verfügbar." msgid "Community" msgstr "Gemeinschaft" -#: ../../mod/community.php:61 ../../mod/search.php:128 +#: ../../mod/community.php:61 ../../mod/search.php:138 msgid "No results." msgstr "Keine Ergebnisse." @@ -606,7 +606,7 @@ msgstr "die unter folgender Webadresse zu finden ist" msgid "" "Please visit Friendica.com to learn " "more about the Friendica project." -msgstr "Bitte besuche Friendica.com um mehr über das Friendica Projekt zu erfahren." +msgstr "Bitte besuche Friendica.com, um mehr über das Friendica Projekt zu erfahren." #: ../../mod/friendica.php:60 msgid "Bug reports and issues: please visit" @@ -638,7 +638,7 @@ msgstr "Beitrag bearbeiten" msgid "Post to Email" msgstr "An E-Mail senden" -#: ../../mod/editpost.php:95 ../../mod/settings.php:601 +#: ../../mod/editpost.php:95 ../../mod/settings.php:615 #: ../../include/conversation.php:574 msgid "Edit" msgstr "Bearbeiten" @@ -707,19 +707,19 @@ msgstr "Z.B.: bob@example.com, mary@example.com" msgid "This introduction has already been accepted." msgstr "Diese Kontaktanfrage wurde bereits akzeptiert." -#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:487 +#: ../../mod/dfrn_request.php:117 ../../mod/dfrn_request.php:495 msgid "Profile location is not valid or does not contain profile information." msgstr "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung." -#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:492 +#: ../../mod/dfrn_request.php:122 ../../mod/dfrn_request.php:500 msgid "Warning: profile location has no identifiable owner name." msgstr "Warnung: Es konnte kein Name des Besitzers von der angegebenen Profiladresse gefunden werden." -#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:494 +#: ../../mod/dfrn_request.php:124 ../../mod/dfrn_request.php:502 msgid "Warning: profile location has no profile photo." msgstr "Warnung: Es konnte kein Profilbild bei der angegebenen Profiladresse gefunden werden." -#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:497 +#: ../../mod/dfrn_request.php:127 ../../mod/dfrn_request.php:505 #, 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" @@ -763,128 +763,128 @@ msgstr "Ungültige E-Mail Adresse." msgid "This account has not been configured for email. Request failed." msgstr "Dieses Konto ist nicht für Email konfiguriert. Anfrage fehlgeschlagen." -#: ../../mod/dfrn_request.php:432 +#: ../../mod/dfrn_request.php:440 msgid "Unable to resolve your name at the provided location." msgstr "Konnte deinen Namen an der angegebenen Stelle nicht finden." -#: ../../mod/dfrn_request.php:445 +#: ../../mod/dfrn_request.php:453 msgid "You have already introduced yourself here." msgstr "Du hast dich hier bereits vorgestellt." -#: ../../mod/dfrn_request.php:449 +#: ../../mod/dfrn_request.php:457 #, php-format msgid "Apparently you are already friends with %s." msgstr "Es scheint so, als ob du bereits mit %s befreundet bist." -#: ../../mod/dfrn_request.php:470 +#: ../../mod/dfrn_request.php:478 msgid "Invalid profile URL." msgstr "Ungültige Profil-URL." -#: ../../mod/dfrn_request.php:476 ../../mod/follow.php:23 +#: ../../mod/dfrn_request.php:484 ../../mod/follow.php:23 msgid "Disallowed profile URL." msgstr "Nicht erlaubte Profil-URL." -#: ../../mod/dfrn_request.php:545 ../../mod/contacts.php:102 +#: ../../mod/dfrn_request.php:553 ../../mod/contacts.php:102 msgid "Failed to update contact record." msgstr "Aktualisierung der Kontaktdaten fehlgeschlagen." -#: ../../mod/dfrn_request.php:566 +#: ../../mod/dfrn_request.php:574 msgid "Your introduction has been sent." msgstr "Deine Kontaktanfrage wurde gesendet." -#: ../../mod/dfrn_request.php:619 +#: ../../mod/dfrn_request.php:627 msgid "Please login to confirm introduction." msgstr "Bitte melde dich an, um die Kontaktanfrage zu bestätigen." -#: ../../mod/dfrn_request.php:633 +#: ../../mod/dfrn_request.php:641 msgid "" "Incorrect identity currently logged in. Please login to " "this profile." msgstr "Momentan bist du mit einer anderen Identität angemeldet. Bitte melde Dich mit diesem Profil an." -#: ../../mod/dfrn_request.php:645 +#: ../../mod/dfrn_request.php:653 #, php-format msgid "Welcome home %s." msgstr "Willkommen zurück %s." -#: ../../mod/dfrn_request.php:646 +#: ../../mod/dfrn_request.php:654 #, php-format msgid "Please confirm your introduction/connection request to %s." msgstr "Bitte bestätige deine Kontaktanfrage bei %s." -#: ../../mod/dfrn_request.php:647 +#: ../../mod/dfrn_request.php:655 msgid "Confirm" msgstr "Bestätigen" -#: ../../mod/dfrn_request.php:688 ../../include/items.php:2717 +#: ../../mod/dfrn_request.php:696 ../../include/items.php:2729 msgid "[Name Withheld]" msgstr "[Name unterdrückt]" -#: ../../mod/dfrn_request.php:781 +#: ../../mod/dfrn_request.php:789 msgid "" "Please enter your 'Identity Address' from one of the following supported " "communications networks:" msgstr "Bitte gib die Adresse deines Profils in einem der unterstützten sozialen Netzwerke an:" -#: ../../mod/dfrn_request.php:797 +#: ../../mod/dfrn_request.php:805 msgid "Connect as an email follower (Coming soon)" msgstr "Als E-Mail-Kontakt verbinden (In Kürze verfügbar)" -#: ../../mod/dfrn_request.php:799 +#: ../../mod/dfrn_request.php:807 msgid "" "If you are not yet a member of the free social web, follow this link to find a public" " Friendica site and join us today." msgstr "Wenn du noch kein Mitglied dieses freien sozialen Netzwerks bist, folge diesem Link um einen öffentlichen Friendica-Server zu finden und beizutreten." -#: ../../mod/dfrn_request.php:802 +#: ../../mod/dfrn_request.php:810 msgid "Friend/Connection Request" msgstr "Freundschafts-/Kontaktanfrage" -#: ../../mod/dfrn_request.php:803 +#: ../../mod/dfrn_request.php:811 msgid "" "Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, " "testuser@identi.ca" msgstr "Beispiele: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca" -#: ../../mod/dfrn_request.php:804 +#: ../../mod/dfrn_request.php:812 msgid "Please answer the following:" msgstr "Bitte beantworte Folgendes:" -#: ../../mod/dfrn_request.php:805 +#: ../../mod/dfrn_request.php:813 #, php-format msgid "Does %s know you?" msgstr "Kennt %s dich?" -#: ../../mod/dfrn_request.php:808 +#: ../../mod/dfrn_request.php:816 msgid "Add a personal note:" msgstr "Eine persönliche Notiz beifügen:" -#: ../../mod/dfrn_request.php:810 ../../include/contact_selectors.php:76 +#: ../../mod/dfrn_request.php:818 ../../include/contact_selectors.php:76 msgid "Friendica" msgstr "Friendica" -#: ../../mod/dfrn_request.php:811 +#: ../../mod/dfrn_request.php:819 msgid "StatusNet/Federated Social Web" msgstr "StatusNet/Federated Social Web" -#: ../../mod/dfrn_request.php:812 ../../mod/settings.php:636 +#: ../../mod/dfrn_request.php:820 ../../mod/settings.php:650 #: ../../include/contact_selectors.php:80 msgid "Diaspora" msgstr "Diaspora" -#: ../../mod/dfrn_request.php:813 +#: ../../mod/dfrn_request.php:821 #, php-format msgid "" " - please do not use this form. Instead, enter %s into your Diaspora search" " bar." msgstr " - bitte verwende dieses Formular nicht. Stattdessen suche nach %s in deiner Diaspora Suchleiste." -#: ../../mod/dfrn_request.php:814 +#: ../../mod/dfrn_request.php:822 msgid "Your Identity Address:" msgstr "Adresse deines Profils:" -#: ../../mod/dfrn_request.php:817 +#: ../../mod/dfrn_request.php:825 msgid "Submit Request" msgstr "Anfrage abschicken" @@ -895,7 +895,7 @@ msgstr "Friendica-Server für soziale Netzwerke – Setup" #: ../../mod/install.php:117 ../../mod/install.php:157 #: ../../mod/install.php:230 msgid "Database connection" -msgstr "Datenbank-Verbindung" +msgstr "Datenbankverbindung" #: ../../mod/install.php:124 msgid "Could not connect to database." @@ -1127,7 +1127,7 @@ 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 "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text um die Datei im Stammverzeichnis deiner Friendica-Installation zu erzeugen." +msgstr "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis deiner Friendica-Installation zu erzeugen." #: ../../mod/install.php:461 msgid "Errors encountered creating database tables." @@ -1184,7 +1184,7 @@ msgstr "ist interessiert an:" msgid "Connect" msgstr "Verbinden" -#: ../../mod/match.php:65 ../../mod/dirfind.php:57 +#: ../../mod/match.php:65 ../../mod/dirfind.php:60 msgid "No matches" msgstr "Keine Übereinstimmungen" @@ -1364,11 +1364,11 @@ msgstr "Netzwerk Benachrichtigungen" #: ../../mod/notifications.php:328 ../../mod/notify.php:61 msgid "No more system notifications." -msgstr "Keine weiteren System Benachrichtigungen." +msgstr "Keine weiteren Systembenachrichtigungen." #: ../../mod/notifications.php:332 ../../mod/notify.php:65 msgid "System Notifications" -msgstr "System Benachrichtigungen" +msgstr "Systembenachrichtigungen" #: ../../mod/notifications.php:423 msgid "No more personal notifications." @@ -1489,7 +1489,7 @@ msgstr "Sperren" #: ../../mod/contacts.php:293 msgid "Toggle Blocked status" -msgstr "Geblockt-Sttaus ein-/ausschalten" +msgstr "Geblockt-Status ein-/ausschalten" #: ../../mod/contacts.php:296 ../../mod/contacts.php:348 msgid "Unignore" @@ -1525,7 +1525,7 @@ msgstr "Kontakt Editor" #: ../../mod/contacts.php:323 msgid "Profile Visibility" -msgstr "Profil Anzeige" +msgstr "Profil-Sichtbarkeit" #: ../../mod/contacts.php:324 #, php-format @@ -1701,11 +1701,12 @@ msgid "Password reset requested at %s" msgstr "Anfrage zum Zurücksetzen des Passworts auf %s erhalten" #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107 -#: ../../mod/register.php:388 ../../mod/register.php:442 -#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:742 -#: ../../addon/facebook/facebook.php:680 -#: ../../addon/facebook/facebook.php:1170 -#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2726 +#: ../../mod/register.php:367 ../../mod/register.php:421 +#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:745 +#: ../../addon/facebook/facebook.php:688 +#: ../../addon/facebook/facebook.php:1178 +#: ../../addon/public_server/public_server.php:62 +#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2738 #: ../../boot.php:696 msgid "Administrator" msgstr "Administrator" @@ -1762,11 +1763,11 @@ msgstr "Zurücksetzen" #: ../../mod/settings.php:49 ../../include/nav.php:137 msgid "Account settings" -msgstr "Account Einstellungen" +msgstr "Account-Einstellungen" #: ../../mod/settings.php:54 msgid "Display settings" -msgstr "Anzeige Einstellungen" +msgstr "Anzeige-Einstellungen" #: ../../mod/settings.php:60 msgid "Connector settings" @@ -1798,7 +1799,7 @@ msgstr "Einstellungen" msgid "Missing some important data!" msgstr "Wichtige Daten fehlen!" -#: ../../mod/settings.php:134 ../../mod/settings.php:565 +#: ../../mod/settings.php:134 ../../mod/settings.php:579 msgid "Update" msgstr "Aktualisierungen" @@ -1842,418 +1843,434 @@ msgstr " Keine gültige E-Mail." msgid " Cannot change to that email." msgstr "Ändern der E-Mail nicht möglich. " -#: ../../mod/settings.php:468 ../../addon/facebook/facebook.php:480 +#: ../../mod/settings.php:448 +msgid "Private forum has no privacy permissions. Using default privacy group." +msgstr "" + +#: ../../mod/settings.php:452 +msgid "Private forum has no privacy permissions and no default privacy group." +msgstr "" + +#: ../../mod/settings.php:482 ../../addon/facebook/facebook.php:488 #: ../../addon/impressum/impressum.php:77 #: ../../addon/openstreetmap/openstreetmap.php:80 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105 -#: ../../addon/twitter/twitter.php:370 +#: ../../addon/twitter/twitter.php:376 msgid "Settings updated." msgstr "Einstellungen aktualisiert." -#: ../../mod/settings.php:538 ../../mod/settings.php:564 -#: ../../mod/settings.php:600 +#: ../../mod/settings.php:552 ../../mod/settings.php:578 +#: ../../mod/settings.php:614 msgid "Add application" msgstr "Programm hinzufügen" -#: ../../mod/settings.php:542 ../../mod/settings.php:568 -#: ../../addon/statusnet/statusnet.php:547 +#: ../../mod/settings.php:556 ../../mod/settings.php:582 +#: ../../addon/statusnet/statusnet.php:555 msgid "Consumer Key" msgstr "Consumer Key" -#: ../../mod/settings.php:543 ../../mod/settings.php:569 -#: ../../addon/statusnet/statusnet.php:546 +#: ../../mod/settings.php:557 ../../mod/settings.php:583 +#: ../../addon/statusnet/statusnet.php:554 msgid "Consumer Secret" msgstr "Consumer Secret" -#: ../../mod/settings.php:544 ../../mod/settings.php:570 +#: ../../mod/settings.php:558 ../../mod/settings.php:584 msgid "Redirect" msgstr "Umleiten" -#: ../../mod/settings.php:545 ../../mod/settings.php:571 +#: ../../mod/settings.php:559 ../../mod/settings.php:585 msgid "Icon url" msgstr "Icon URL" -#: ../../mod/settings.php:556 +#: ../../mod/settings.php:570 msgid "You can't edit this application." msgstr "Du kannst dieses Programm nicht bearbeiten." -#: ../../mod/settings.php:599 +#: ../../mod/settings.php:613 msgid "Connected Apps" msgstr "Verbundene Programme" -#: ../../mod/settings.php:603 +#: ../../mod/settings.php:617 msgid "Client key starts with" -msgstr "Anwender Schlüssel beginnt mit" +msgstr "Anwenderschlüssel beginnt mit" -#: ../../mod/settings.php:604 +#: ../../mod/settings.php:618 msgid "No name" msgstr "Kein Name" -#: ../../mod/settings.php:605 +#: ../../mod/settings.php:619 msgid "Remove authorization" msgstr "Autorisierung entziehen" -#: ../../mod/settings.php:616 +#: ../../mod/settings.php:630 msgid "No Plugin settings configured" msgstr "Keine Plugin-Einstellungen konfiguriert" -#: ../../mod/settings.php:624 ../../addon/widgets/widgets.php:123 +#: ../../mod/settings.php:638 ../../addon/widgets/widgets.php:123 msgid "Plugin Settings" msgstr "Plugin-Einstellungen" -#: ../../mod/settings.php:636 ../../mod/settings.php:637 +#: ../../mod/settings.php:650 ../../mod/settings.php:651 #, php-format msgid "Built-in support for %s connectivity is %s" msgstr "Eingebaute Unterstützung für Verbindungen zu %s ist %s" -#: ../../mod/settings.php:636 ../../mod/settings.php:637 +#: ../../mod/settings.php:650 ../../mod/settings.php:651 msgid "enabled" msgstr "eingeschaltet" -#: ../../mod/settings.php:636 ../../mod/settings.php:637 +#: ../../mod/settings.php:650 ../../mod/settings.php:651 msgid "disabled" msgstr "ausgeschaltet" -#: ../../mod/settings.php:637 +#: ../../mod/settings.php:651 msgid "StatusNet" msgstr "StatusNet" -#: ../../mod/settings.php:667 +#: ../../mod/settings.php:681 msgid "Connector Settings" msgstr "Verbindungs-Einstellungen" -#: ../../mod/settings.php:672 +#: ../../mod/settings.php:686 msgid "Email/Mailbox Setup" msgstr "E-Mail/Postfach-Einstellungen" -#: ../../mod/settings.php:673 +#: ../../mod/settings.php:687 msgid "" "If you wish to communicate with email contacts using this service " "(optional), please specify how to connect to your mailbox." msgstr "Wenn du mit E-Mail-Kontakten über diesen Service kommunizieren möchtest (optional), gib bitte die Einstellungen für dein Postfach an." -#: ../../mod/settings.php:674 +#: ../../mod/settings.php:688 msgid "Last successful email check:" msgstr "Letzter erfolgreicher Email Check" -#: ../../mod/settings.php:675 +#: ../../mod/settings.php:689 msgid "Email access is disabled on this site." msgstr "Zugriff auf E-Mails für diese Seite deaktiviert." -#: ../../mod/settings.php:676 +#: ../../mod/settings.php:690 msgid "IMAP server name:" msgstr "IMAP-Server-Name:" -#: ../../mod/settings.php:677 +#: ../../mod/settings.php:691 msgid "IMAP port:" msgstr "IMAP-Port:" -#: ../../mod/settings.php:678 +#: ../../mod/settings.php:692 msgid "Security:" msgstr "Sicherheit:" -#: ../../mod/settings.php:678 ../../mod/settings.php:683 +#: ../../mod/settings.php:692 ../../mod/settings.php:697 msgid "None" msgstr "Keine" -#: ../../mod/settings.php:679 +#: ../../mod/settings.php:693 msgid "Email login name:" msgstr "E-Mail-Login-Name:" -#: ../../mod/settings.php:680 +#: ../../mod/settings.php:694 msgid "Email password:" msgstr "E-Mail-Passwort:" -#: ../../mod/settings.php:681 +#: ../../mod/settings.php:695 msgid "Reply-to address:" msgstr "Reply-to Adresse:" -#: ../../mod/settings.php:682 +#: ../../mod/settings.php:696 msgid "Send public posts to all email contacts:" msgstr "Sende öffentliche Beiträge an alle E-Mail-Kontakte:" -#: ../../mod/settings.php:683 +#: ../../mod/settings.php:697 msgid "Action after import:" msgstr "Aktion nach Import:" -#: ../../mod/settings.php:683 +#: ../../mod/settings.php:697 msgid "Mark as seen" msgstr "Als gelesen markieren" -#: ../../mod/settings.php:683 +#: ../../mod/settings.php:697 msgid "Move to folder" msgstr "In einen Ordner verschieben" -#: ../../mod/settings.php:684 +#: ../../mod/settings.php:698 msgid "Move to folder:" msgstr "In diesen Ordner verschieben:" -#: ../../mod/settings.php:744 +#: ../../mod/settings.php:758 msgid "Display Settings" -msgstr "Anzeige Einstellungen" +msgstr "Anzeige-Einstellungen" -#: ../../mod/settings.php:750 +#: ../../mod/settings.php:764 msgid "Display Theme:" msgstr "Theme:" -#: ../../mod/settings.php:751 +#: ../../mod/settings.php:765 msgid "Update browser every xx seconds" msgstr "Browser alle xx Sekunden aktualisieren" -#: ../../mod/settings.php:751 +#: ../../mod/settings.php:765 msgid "Minimum of 10 seconds, no maximum" msgstr "Minimal 10 Sekunden, kein Maximum" -#: ../../mod/settings.php:752 +#: ../../mod/settings.php:766 msgid "Number of items to display on the network page:" msgstr "Zahl der Beiträge, die pro Netzwerkseite angezeigt werden sollen: " -#: ../../mod/settings.php:752 +#: ../../mod/settings.php:766 msgid "Maximum of 100 items" msgstr "Maximal 100 Beiträge" -#: ../../mod/settings.php:753 +#: ../../mod/settings.php:767 msgid "Don't show emoticons" msgstr "Keine Smilies anzeigen" -#: ../../mod/settings.php:821 ../../mod/admin.php:180 ../../mod/admin.php:621 +#: ../../mod/settings.php:835 ../../mod/admin.php:180 ../../mod/admin.php:621 msgid "Normal Account" msgstr "Normaler Account" -#: ../../mod/settings.php:822 +#: ../../mod/settings.php:836 msgid "This account is a normal personal profile" msgstr "Dieser Account ist ein normales persönliches Profil" -#: ../../mod/settings.php:825 ../../mod/admin.php:181 ../../mod/admin.php:622 +#: ../../mod/settings.php:839 ../../mod/admin.php:181 ../../mod/admin.php:622 msgid "Soapbox Account" msgstr "Sandkasten-Account" -#: ../../mod/settings.php:826 +#: ../../mod/settings.php:840 msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert" -#: ../../mod/settings.php:829 ../../mod/admin.php:182 ../../mod/admin.php:623 +#: ../../mod/settings.php:843 ../../mod/admin.php:182 ../../mod/admin.php:623 msgid "Community/Celebrity Account" -msgstr "Gemeinschafts/Promi-Account" +msgstr "Gemeinschafts-/Promi-Account" -#: ../../mod/settings.php:830 +#: ../../mod/settings.php:844 msgid "" "Automatically approve all connection/friend requests as read-write fans" msgstr "Kontaktanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert" -#: ../../mod/settings.php:833 ../../mod/admin.php:183 ../../mod/admin.php:624 +#: ../../mod/settings.php:847 ../../mod/admin.php:183 ../../mod/admin.php:624 msgid "Automatic Friend Account" msgstr "Automatischer Freundesaccount" -#: ../../mod/settings.php:834 +#: ../../mod/settings.php:848 msgid "Automatically approve all connection/friend requests as friends" msgstr "Kontaktanfragen werden automatisch als Freund akzeptiert" -#: ../../mod/settings.php:844 +#: ../../mod/settings.php:851 +msgid "Private Forum" +msgstr "" + +#: ../../mod/settings.php:852 +msgid "Private forum - approved members only [Experimental]" +msgstr "" + +#: ../../mod/settings.php:865 msgid "OpenID:" msgstr "OpenID:" -#: ../../mod/settings.php:844 +#: ../../mod/settings.php:865 msgid "(Optional) Allow this OpenID to login to this account." msgstr "(Optional) Erlaube die Anmeldung für diesen Account mit dieser OpenID." -#: ../../mod/settings.php:854 +#: ../../mod/settings.php:875 msgid "Publish your default profile in your local site directory?" msgstr "Veröffentliche dein Standardprofil im Verzeichnis der lokalen Seite?" -#: ../../mod/settings.php:860 +#: ../../mod/settings.php:881 msgid "Publish your default profile in the global social directory?" msgstr "Veröffentliche dein Standardprofil im weltweiten Verzeichnis?" -#: ../../mod/settings.php:868 +#: ../../mod/settings.php:889 msgid "Hide your contact/friend list from viewers of your default profile?" msgstr "Liste der Kontakte vor Betrachtern des Standardprofils verbergen?" -#: ../../mod/settings.php:872 +#: ../../mod/settings.php:893 msgid "Hide your profile details from unknown viewers?" msgstr "Profil-Details vor unbekannten Betrachtern verbergen?" -#: ../../mod/settings.php:877 +#: ../../mod/settings.php:898 msgid "Allow friends to post to your profile page?" msgstr "Deinen Kontakten erlauben, auf deine Pinnwand zu schreiben?" -#: ../../mod/settings.php:883 +#: ../../mod/settings.php:904 msgid "Allow friends to tag your posts?" msgstr "Deinen Kontakten erlauben, deine Beiträge mit Schlagwörtern zu versehen?" -#: ../../mod/settings.php:889 +#: ../../mod/settings.php:910 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "Erlaube uns dich als potentiellen Kontakt für neue Mitglieder vorzuschlagen?" -#: ../../mod/settings.php:895 +#: ../../mod/settings.php:916 msgid "Permit unknown people to send you private mail?" msgstr "Erlaube es Unbekannten dir private Nachrichten zu schicken?" -#: ../../mod/settings.php:906 +#: ../../mod/settings.php:927 msgid "Profile is not published." msgstr "Profil ist nicht veröffentlicht." -#: ../../mod/settings.php:912 ../../mod/profile_photo.php:211 +#: ../../mod/settings.php:933 ../../mod/profile_photo.php:211 msgid "or" msgstr "oder" -#: ../../mod/settings.php:917 +#: ../../mod/settings.php:938 msgid "Your Identity Address is" msgstr "Die Adresse deines Profils lautet:" -#: ../../mod/settings.php:928 +#: ../../mod/settings.php:949 msgid "Automatically expire posts after this many days:" msgstr "Beiträge verfallen automatisch nach dieser Anzahl von Tagen" -#: ../../mod/settings.php:928 +#: ../../mod/settings.php:949 msgid "If empty, posts will not expire. Expired posts will be deleted" msgstr "Wenn leer verfallen Beiträge nie automatisch. Verfallene Beiträge werden gelöscht." -#: ../../mod/settings.php:929 +#: ../../mod/settings.php:950 msgid "Advanced expiration settings" msgstr "Erweiterte Verfallseinstellungen" -#: ../../mod/settings.php:930 +#: ../../mod/settings.php:951 msgid "Advanced Expiration" msgstr "Erweitertes Verfallen" -#: ../../mod/settings.php:931 +#: ../../mod/settings.php:952 msgid "Expire posts:" msgstr "Beiträge verfallen lassen:" -#: ../../mod/settings.php:932 +#: ../../mod/settings.php:953 msgid "Expire personal notes:" msgstr "Persönliche Notizen verfallen lassen:" -#: ../../mod/settings.php:933 +#: ../../mod/settings.php:954 msgid "Expire starred posts:" msgstr "Markierte Beiträge verfallen lassen:" -#: ../../mod/settings.php:934 +#: ../../mod/settings.php:955 msgid "Expire photos:" msgstr "Fotos verfallen lassen:" -#: ../../mod/settings.php:938 +#: ../../mod/settings.php:962 msgid "Account Settings" msgstr "Account-Einstellungen" -#: ../../mod/settings.php:947 +#: ../../mod/settings.php:970 msgid "Password Settings" msgstr "Passwort-Einstellungen" -#: ../../mod/settings.php:948 +#: ../../mod/settings.php:971 msgid "New Password:" msgstr "Neues Passwort:" -#: ../../mod/settings.php:949 +#: ../../mod/settings.php:972 msgid "Confirm:" msgstr "Bestätigen:" -#: ../../mod/settings.php:949 +#: ../../mod/settings.php:972 msgid "Leave password fields blank unless changing" msgstr "Lass die Passwort-Felder leer, außer du willst das Passwort ändern" -#: ../../mod/settings.php:953 +#: ../../mod/settings.php:976 msgid "Basic Settings" msgstr "Grundeinstellungen" -#: ../../mod/settings.php:954 ../../include/profile_advanced.php:15 +#: ../../mod/settings.php:977 ../../include/profile_advanced.php:15 msgid "Full Name:" msgstr "Kompletter Name:" -#: ../../mod/settings.php:955 +#: ../../mod/settings.php:978 msgid "Email Address:" msgstr "Emailadresse:" -#: ../../mod/settings.php:956 +#: ../../mod/settings.php:979 msgid "Your Timezone:" msgstr "Deine Zeitzone:" -#: ../../mod/settings.php:957 +#: ../../mod/settings.php:980 msgid "Default Post Location:" msgstr "Standardstandort:" -#: ../../mod/settings.php:958 +#: ../../mod/settings.php:981 msgid "Use Browser Location:" msgstr "Verwende den Standort des Browsers:" -#: ../../mod/settings.php:961 +#: ../../mod/settings.php:984 msgid "Security and Privacy Settings" msgstr "Sicherheits- und Privatsphäre-Einstellungen" -#: ../../mod/settings.php:963 +#: ../../mod/settings.php:986 msgid "Maximum Friend Requests/Day:" msgstr "Maximale Anzahl von Freundschaftsanfragen/Tag:" -#: ../../mod/settings.php:963 ../../mod/settings.php:978 +#: ../../mod/settings.php:986 ../../mod/settings.php:1005 msgid "(to prevent spam abuse)" msgstr "(um SPAM zu vermeiden)" -#: ../../mod/settings.php:964 +#: ../../mod/settings.php:987 msgid "Default Post Permissions" msgstr "Standard-Zugriffsrechte für Beiträge" -#: ../../mod/settings.php:965 +#: ../../mod/settings.php:988 msgid "(click to open/close)" msgstr "(klicke zum öffnen/schließen)" -#: ../../mod/settings.php:978 +#: ../../mod/settings.php:1005 msgid "Maximum private messages per day from unknown people:" msgstr "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:" -#: ../../mod/settings.php:981 +#: ../../mod/settings.php:1008 msgid "Notification Settings" msgstr "Benachrichtigungseinstellungen" -#: ../../mod/settings.php:982 +#: ../../mod/settings.php:1009 msgid "By default post a status message when:" -msgstr "Standardmäßig eine Status-Nachricht posten wenn:" +msgstr "Standardmäßig eine Statusnachricht posten, wenn:" -#: ../../mod/settings.php:983 +#: ../../mod/settings.php:1010 msgid "accepting a friend request" msgstr "– du eine Kontaktanfrage akzeptierst" -#: ../../mod/settings.php:984 +#: ../../mod/settings.php:1011 msgid "joining a forum/community" msgstr "– du einem Forum/einer Gemeinschaftsseite beitrittst" -#: ../../mod/settings.php:985 +#: ../../mod/settings.php:1012 msgid "making an interesting profile change" msgstr "– du eine interessante Änderung an deinem Profil durchführst" -#: ../../mod/settings.php:986 +#: ../../mod/settings.php:1013 msgid "Send a notification email when:" msgstr "Benachrichtigungs-E-Mail senden wenn:" -#: ../../mod/settings.php:987 +#: ../../mod/settings.php:1014 msgid "You receive an introduction" msgstr "– du eine Kontaktanfrage erhältst" -#: ../../mod/settings.php:988 +#: ../../mod/settings.php:1015 msgid "Your introductions are confirmed" msgstr "– eine deiner Kontaktanfragen akzeptiert wurde" -#: ../../mod/settings.php:989 +#: ../../mod/settings.php:1016 msgid "Someone writes on your profile wall" msgstr "– jemand etwas auf deine Pinnwand schreibt" -#: ../../mod/settings.php:990 +#: ../../mod/settings.php:1017 msgid "Someone writes a followup comment" msgstr "– jemand auch einen Kommentar verfasst" -#: ../../mod/settings.php:991 +#: ../../mod/settings.php:1018 msgid "You receive a private message" msgstr "– du eine private Nachricht erhältst" -#: ../../mod/settings.php:992 +#: ../../mod/settings.php:1019 msgid "You receive a friend suggestion" msgstr "- du eine Empfehlung erhältst" -#: ../../mod/settings.php:993 +#: ../../mod/settings.php:1020 msgid "You are tagged in a post" msgstr "- du in einem Beitrag erwähnt wurdest" -#: ../../mod/settings.php:996 +#: ../../mod/settings.php:1023 msgid "Advanced Page Settings" msgstr "Erweiterte Seiten-Einstellungen" @@ -2283,7 +2300,7 @@ msgstr "Begriff entfernen" msgid "Saved Searches" msgstr "Gespeicherte Suchen" -#: ../../mod/network.php:92 ../../include/group.php:217 +#: ../../mod/network.php:92 ../../include/group.php:244 msgid "add" msgstr "hinzufügen" @@ -2367,12 +2384,12 @@ msgstr "Private Nachrichten an diese Person könnten an die Öffentlichkeit gela msgid "Invalid contact." msgstr "Ungültiger Kontakt." -#: ../../mod/notes.php:44 ../../boot.php:1509 +#: ../../mod/notes.php:44 ../../boot.php:1528 msgid "Personal Notes" msgstr "Persönliche Notizen" #: ../../mod/notes.php:63 ../../mod/filer.php:30 -#: ../../addon/facebook/facebook.php:748 +#: ../../addon/facebook/facebook.php:756 #: ../../addon/privacy_image_cache/privacy_image_cache.php:147 #: ../../include/text.php:652 msgid "Save" @@ -2537,7 +2554,7 @@ msgid "" "interest, and provide suggestions based on network relationships. On a brand" " new site, friend suggestions will usually begin to be populated within 24 " "hours." -msgstr "Im seitlichen Bedienfeld der Kontakte-Seite gibt es diverse Werkzeuge, um neue Freunde zu finden. Wir können Menschen mit den gleichen Interessen finden, anhand von Namen oder Interessen suchen oder aber aufgrund vorhandener Kontakte neue Freunde vorschlagen.\nAuf einer brandneuen - soeben erstellten - Seite starten die Kontaktvorschläge innerhalb von 24 Stunden." +msgstr "Im seitlichen Bedienfeld der Kontakteseite gibt es diverse Werkzeuge, um neue Freunde zu finden. Wir können Menschen mit den gleichen Interessen finden, anhand von Namen oder Interessen suchen oder aber aufgrund vorhandener Kontakte neue Freunde vorschlagen.\nAuf einer brandneuen - soeben erstellten - Seite starten die Kontaktvorschläge innerhalb von 24 Stunden." #: ../../mod/newmember.php:44 msgid "" @@ -2618,7 +2635,7 @@ msgstr "Editor für die Profil-Sichtbarkeit" #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:123 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 -#: ../../include/nav.php:50 ../../boot.php:1488 +#: ../../include/nav.php:50 ../../boot.php:1507 msgid "Profile" msgstr "Profil" @@ -2684,7 +2701,7 @@ msgid "" "must also begin with a letter." msgstr "Dein Spitzname darf nur aus Buchstaben und Zahlen (\"a-z\",\"0-9\", \"_\" und \"-\") bestehen, außerdem muss er mit einem Buchstaben beginnen." -#: ../../mod/register.php:153 ../../mod/register.php:264 +#: ../../mod/register.php:153 ../../mod/register.php:243 msgid "Nickname is already registered. Please choose another." msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen." @@ -2694,124 +2711,124 @@ msgid "" "another." msgstr "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen." -#: ../../mod/register.php:182 +#: ../../mod/register.php:179 msgid "SERIOUS ERROR: Generation of security keys failed." msgstr "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden." -#: ../../mod/register.php:250 +#: ../../mod/register.php:229 msgid "An error occurred during registration. Please try again." msgstr "Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal." -#: ../../mod/register.php:286 +#: ../../mod/register.php:265 msgid "An error occurred creating your default profile. Please try again." -msgstr "Bei der Erstellung des Standard-Profils ist ein Fehler aufgetreten. Bitte versuche es noch einmal." +msgstr "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal." -#: ../../mod/register.php:386 ../../mod/regmod.php:52 +#: ../../mod/register.php:365 ../../mod/regmod.php:52 #, php-format msgid "Registration details for %s" msgstr "Details der Registration von %s" -#: ../../mod/register.php:394 +#: ../../mod/register.php:373 msgid "" "Registration successful. Please check your email for further instructions." msgstr "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet." -#: ../../mod/register.php:398 +#: ../../mod/register.php:377 msgid "Failed to send email message. Here is the message that failed." msgstr "Konnte die E-Mail nicht versenden. Hier ist die Nachricht, die nicht gesendet werden konnte." -#: ../../mod/register.php:403 +#: ../../mod/register.php:382 msgid "Your registration can not be processed." msgstr "Deine Registrierung konnte nicht verarbeitet werden." -#: ../../mod/register.php:440 +#: ../../mod/register.php:419 #, php-format msgid "Registration request at %s" msgstr "Registrierungsanfrage auf %s" -#: ../../mod/register.php:449 +#: ../../mod/register.php:428 msgid "Your registration is pending approval by the site owner." msgstr "Deine Registrierung muss noch vom Betreiber der Seite freigegeben werden." -#: ../../mod/register.php:487 +#: ../../mod/register.php:466 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "Die maximale Anzahl täglicher Registrierungen auf dieser Seite wurde überschritten. Bitte versuche es morgen noch einmal." -#: ../../mod/register.php:513 +#: ../../mod/register.php:492 msgid "" "You may (optionally) fill in this form via OpenID by supplying your OpenID " "and clicking 'Register'." msgstr "Du kannst dieses Formular auch (optional) mit deiner OpenID ausfüllen, indem du deine OpenID angibst und 'Registrieren' klickst." -#: ../../mod/register.php:514 +#: ../../mod/register.php:493 msgid "" "If you are not familiar with OpenID, please leave that field blank and fill " "in the rest of the items." msgstr "Wenn du nicht mit OpenID vertraut bist, lass dieses Feld bitte leer und fülle die restlichen Felder aus." -#: ../../mod/register.php:515 +#: ../../mod/register.php:494 msgid "Your OpenID (optional): " msgstr "Deine OpenID (optional): " -#: ../../mod/register.php:529 +#: ../../mod/register.php:508 msgid "Include your profile in member directory?" msgstr "Soll dein Profil im Nutzerverzeichnis angezeigt werden?" -#: ../../mod/register.php:549 +#: ../../mod/register.php:528 msgid "Membership on this site is by invitation only." msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich." -#: ../../mod/register.php:550 +#: ../../mod/register.php:529 msgid "Your invitation ID: " msgstr "ID deiner Einladung: " -#: ../../mod/register.php:553 ../../mod/admin.php:405 +#: ../../mod/register.php:532 ../../mod/admin.php:405 msgid "Registration" msgstr "Registrierung" -#: ../../mod/register.php:561 +#: ../../mod/register.php:540 msgid "Your Full Name (e.g. Joe Smith): " msgstr "Vollständiger Name (z.B. Max Mustermann): " -#: ../../mod/register.php:562 +#: ../../mod/register.php:541 msgid "Your Email Address: " msgstr "Deine E-Mail-Adresse: " -#: ../../mod/register.php:563 +#: ../../mod/register.php:542 msgid "" "Choose a profile nickname. This must begin with a text character. Your " "profile address on this site will then be " "'nickname@$sitename'." msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse deines Profils auf dieser Seite wird 'spitzname@$sitename' sein." -#: ../../mod/register.php:564 +#: ../../mod/register.php:543 msgid "Choose a nickname: " msgstr "Spitznamen wählen: " -#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:794 +#: ../../mod/register.php:546 ../../include/nav.php:81 ../../boot.php:794 msgid "Register" msgstr "Registrieren" -#: ../../mod/dirfind.php:23 +#: ../../mod/dirfind.php:26 msgid "People Search" msgstr "Personen Suche" #: ../../mod/like.php:127 ../../mod/tagger.php:70 -#: ../../addon/facebook/facebook.php:1564 +#: ../../addon/facebook/facebook.php:1572 #: ../../addon/communityhome/communityhome.php:158 #: ../../addon/communityhome/communityhome.php:167 #: ../../view/theme/diabook/theme.php:560 -#: ../../view/theme/diabook/theme.php:569 ../../include/diaspora.php:1654 +#: ../../view/theme/diabook/theme.php:569 ../../include/diaspora.php:1662 #: ../../include/conversation.php:48 ../../include/conversation.php:57 #: ../../include/conversation.php:121 ../../include/conversation.php:130 msgid "status" msgstr "Status" -#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1568 +#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1576 #: ../../addon/communityhome/communityhome.php:172 -#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1670 +#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1678 #: ../../include/conversation.php:65 #, php-format msgid "%1$s likes %2$s's %3$s" @@ -2824,7 +2841,7 @@ msgstr "%1$s mag %2$ss %3$s nicht" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:156 #: ../../mod/admin.php:684 ../../mod/admin.php:883 ../../mod/display.php:37 -#: ../../mod/display.php:142 ../../include/items.php:3084 +#: ../../mod/display.php:142 ../../include/items.php:3096 msgid "Item not found." msgstr "Beitrag nicht gefunden." @@ -2833,7 +2850,7 @@ msgid "Access denied." msgstr "Zugriff verweigert." #: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:125 -#: ../../include/nav.php:51 ../../boot.php:1494 +#: ../../include/nav.php:51 ../../boot.php:1513 msgid "Photos" msgstr "Bilder" @@ -2858,39 +2875,39 @@ msgstr "Bitte melde dich an." msgid "Unable to locate original post." msgstr "Konnte den Originalbeitrag nicht finden." -#: ../../mod/item.php:249 +#: ../../mod/item.php:258 msgid "Empty post discarded." msgstr "Leerer Beitrag wurde verworfen." -#: ../../mod/item.php:372 ../../mod/wall_upload.php:99 +#: ../../mod/item.php:381 ../../mod/wall_upload.php:99 #: ../../mod/wall_upload.php:108 ../../mod/wall_upload.php:115 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "Pinnwand-Bilder" -#: ../../mod/item.php:781 +#: ../../mod/item.php:790 msgid "System error. Post not saved." msgstr "Systemfehler. Beitrag konnte nicht gespeichert werden." -#: ../../mod/item.php:806 +#: ../../mod/item.php:815 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendica social " "network." msgstr "Diese Nachricht wurde dir von %s geschickt, einem Mitglied des Sozialen Netzwerks Friendica." -#: ../../mod/item.php:808 +#: ../../mod/item.php:817 #, php-format msgid "You may visit them online at %s" msgstr "Du kannst sie online unter %s besuchen" -#: ../../mod/item.php:809 +#: ../../mod/item.php:818 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "Falls du diese Beiträge nicht erhalten möchtest, kontaktiere bitte den Autor, indem du auf diese Nachricht antwortest." -#: ../../mod/item.php:811 +#: ../../mod/item.php:820 #, php-format msgid "%s posted an update." msgstr "%s hat ein Update veröffentlicht." @@ -3053,7 +3070,7 @@ msgstr "Keine Freunde zum Anzeigen." #: ../../mod/admin.php:55 msgid "Theme settings updated." -msgstr "Themen Einstellungen aktualisiert." +msgstr "Themeneinstellungen aktualisiert." #: ../../mod/admin.php:96 ../../mod/admin.php:403 msgid "Site" @@ -3153,7 +3170,7 @@ msgstr "Regeln" msgid "Advanced" msgstr "Erweitert" -#: ../../mod/admin.php:412 ../../addon/statusnet/statusnet.php:544 +#: ../../mod/admin.php:412 ../../addon/statusnet/statusnet.php:552 msgid "Site name" msgstr "Seitenname" @@ -3203,7 +3220,7 @@ msgstr "Registrierungstext" #: ../../mod/admin.php:420 msgid "Will be displayed prominently on the registration page." -msgstr "Wird gut sichtbar auf der Registrierungs-Seite angezeigt." +msgstr "Wird gut sichtbar auf der Registrierungsseite angezeigt." #: ../../mod/admin.php:421 msgid "Accounts abandoned after x days" @@ -3345,7 +3362,7 @@ msgstr "SSL Überprüfen" msgid "" "If you wish, you can turn on strict certificate checking. This will mean you" " cannot connect (at all) to self-signed SSL sites." -msgstr "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann." +msgstr "Wenn gewollt, kann man hier eine strenge Zertifikatkontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann." #: ../../mod/admin.php:437 msgid "Proxy user" @@ -3372,17 +3389,17 @@ msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." -msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server." +msgstr "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server." #: ../../mod/admin.php:441 msgid "Poll interval" -msgstr "Abfrage Intervall" +msgstr "Abfrageintervall" #: ../../mod/admin.php:441 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." -msgstr "Verzögere Hintergrundprozesse um diese Anzahl an Sekunden um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet." +msgstr "Verzögere Hintergrundprozesse, um diese Anzahl an Sekunden um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet." #: ../../mod/admin.php:442 msgid "Maximum Load Average" @@ -3478,7 +3495,7 @@ msgstr "Neuanmeldungen, die auf deine Bestätigung warten" #: ../../mod/admin.php:643 msgid "Request date" -msgstr "Anfrage Datum" +msgstr "Anfragedatum" #: ../../mod/admin.php:643 ../../mod/admin.php:652 #: ../../include/contact_selectors.php:79 @@ -3735,11 +3752,11 @@ msgid "" "notifications from you." msgstr "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von dir erhalten können." -#: ../../mod/follow.php:160 +#: ../../mod/follow.php:161 msgid "Unable to retrieve contact information." msgstr "Konnte die Kontaktinformationen nicht empfangen." -#: ../../mod/follow.php:206 +#: ../../mod/follow.php:216 msgid "following" msgstr "folgen" @@ -3763,9 +3780,9 @@ msgstr "Anwendungen" msgid "No installed applications." msgstr "Keine Applikationen installiert." -#: ../../mod/search.php:83 -msgid "Search This Site" -msgstr "Diese Seite durchsuchen" +#: ../../mod/search.php:83 ../../include/text.php:650 ../../include/nav.php:91 +msgid "Search" +msgstr "Suche" #: ../../mod/profiles.php:21 ../../mod/profiles.php:375 #: ../../mod/profiles.php:489 ../../mod/dfrn_confirm.php:62 @@ -3833,6 +3850,11 @@ msgstr "öffentliches Profil" msgid "%1$s changed %2$s to “%3$s”" msgstr "%1$s hat %2$s geändert auf “%3$s”" +#: ../../mod/profiles.php:332 +#, php-format +msgid " - Visit %1$s's %2$s" +msgstr "" + #: ../../mod/profiles.php:335 #, php-format msgid "%1$s has an updated %2$s, changing %3$s." @@ -3961,7 +3983,7 @@ msgstr "Beispiel: Fischen Fotografie Software" #: ../../mod/profiles.php:559 msgid "(Used for suggesting potential friends, can be seen by others)" -msgstr "(Wird verwendet um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)" +msgstr "(Wird verwendet, um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)" #: ../../mod/profiles.php:560 msgid "(Used for searching profiles, never shown to others)" @@ -4214,164 +4236,164 @@ msgid "" " has already been approved." msgstr "Das kann passieren, wenn sich zwei Kontakte gegenseitig eingeladen haben und bereits einer angenommen wurde." -#: ../../mod/dfrn_confirm.php:242 +#: ../../mod/dfrn_confirm.php:235 msgid "Response from remote site was not understood." msgstr "Antwort der Gegenstelle unverständlich." -#: ../../mod/dfrn_confirm.php:251 +#: ../../mod/dfrn_confirm.php:244 msgid "Unexpected response from remote site: " msgstr "Unerwartete Antwort der Gegenstelle: " -#: ../../mod/dfrn_confirm.php:259 +#: ../../mod/dfrn_confirm.php:252 msgid "Confirmation completed successfully." msgstr "Bestätigung erfolgreich abgeschlossen." -#: ../../mod/dfrn_confirm.php:261 ../../mod/dfrn_confirm.php:275 -#: ../../mod/dfrn_confirm.php:282 +#: ../../mod/dfrn_confirm.php:254 ../../mod/dfrn_confirm.php:268 +#: ../../mod/dfrn_confirm.php:275 msgid "Remote site reported: " msgstr "Gegenstelle meldet: " -#: ../../mod/dfrn_confirm.php:273 +#: ../../mod/dfrn_confirm.php:266 msgid "Temporary failure. Please wait and try again." msgstr "Zeitweiser Fehler. Bitte warte einige Momente und versuche es dann noch einmal." -#: ../../mod/dfrn_confirm.php:280 +#: ../../mod/dfrn_confirm.php:273 msgid "Introduction failed or was revoked." msgstr "Kontaktanfrage schlug fehl oder wurde zurück gezogen." -#: ../../mod/dfrn_confirm.php:425 +#: ../../mod/dfrn_confirm.php:418 msgid "Unable to set contact photo." msgstr "Konnte das Bild des Kontakts nicht speichern." -#: ../../mod/dfrn_confirm.php:482 ../../include/diaspora.php:507 +#: ../../mod/dfrn_confirm.php:475 ../../include/diaspora.php:507 #: ../../include/conversation.php:101 #, php-format msgid "%1$s is now friends with %2$s" msgstr "%1$s ist nun mit %2$s befreundet" -#: ../../mod/dfrn_confirm.php:554 +#: ../../mod/dfrn_confirm.php:557 #, php-format msgid "No user record found for '%s' " msgstr "Für '%s' wurde kein Nutzer gefunden" -#: ../../mod/dfrn_confirm.php:564 +#: ../../mod/dfrn_confirm.php:567 msgid "Our site encryption key is apparently messed up." msgstr "Der Verschlüsselungsschlüssel unserer Seite ist anscheinend im Arsch." -#: ../../mod/dfrn_confirm.php:575 +#: ../../mod/dfrn_confirm.php:578 msgid "Empty site URL was provided or URL could not be decrypted by us." msgstr "Leere URL für die Seite erhalten oder die URL konnte nicht entschlüsselt werden." -#: ../../mod/dfrn_confirm.php:596 +#: ../../mod/dfrn_confirm.php:599 msgid "Contact record was not found for you on our site." msgstr "Für diesen Kontakt wurde auf unserer Seite kein Eintrag gefunden." -#: ../../mod/dfrn_confirm.php:610 +#: ../../mod/dfrn_confirm.php:613 #, php-format msgid "Site public key not available in contact record for URL %s." msgstr "Die Kontaktdaten für URL %s enthalten keinen Public Key für den Server." -#: ../../mod/dfrn_confirm.php:630 +#: ../../mod/dfrn_confirm.php:633 msgid "" "The ID provided by your system is a duplicate on our system. It should work " "if you try again." msgstr "Die ID, die uns dein System angeboten hat, ist hier bereits vergeben. Bitte versuche es noch einmal." -#: ../../mod/dfrn_confirm.php:641 +#: ../../mod/dfrn_confirm.php:644 msgid "Unable to set your contact credentials on our system." msgstr "Deine Kontaktreferenzen konnten nicht in unserem System gespeichert werden." -#: ../../mod/dfrn_confirm.php:706 +#: ../../mod/dfrn_confirm.php:709 msgid "Unable to update your contact profile details on our system" msgstr "Die Updates für dein Profil konnten nicht gespeichert werden" -#: ../../mod/dfrn_confirm.php:740 +#: ../../mod/dfrn_confirm.php:743 #, php-format msgid "Connection accepted at %s" msgstr "Auf %s wurde die Verbindung akzeptiert" -#: ../../mod/dfrn_confirm.php:789 +#: ../../mod/dfrn_confirm.php:792 #, php-format msgid "%1$s has joined %2$s" msgstr "%1$s ist %2$s beigetreten" -#: ../../addon/facebook/facebook.php:501 +#: ../../addon/facebook/facebook.php:509 msgid "Facebook disabled" msgstr "Facebook deaktiviert" -#: ../../addon/facebook/facebook.php:506 +#: ../../addon/facebook/facebook.php:514 msgid "Updating contacts" msgstr "Aktualisiere Kontakte" -#: ../../addon/facebook/facebook.php:529 +#: ../../addon/facebook/facebook.php:537 msgid "Facebook API key is missing." msgstr "Facebook-API-Schlüssel nicht gefunden" -#: ../../addon/facebook/facebook.php:536 +#: ../../addon/facebook/facebook.php:544 msgid "Facebook Connect" msgstr "Mit Facebook verbinden" -#: ../../addon/facebook/facebook.php:542 +#: ../../addon/facebook/facebook.php:550 msgid "Install Facebook connector for this account." msgstr "Facebook-Connector für diesen Account installieren." -#: ../../addon/facebook/facebook.php:549 +#: ../../addon/facebook/facebook.php:557 msgid "Remove Facebook connector" msgstr "Facebook-Connector entfernen" -#: ../../addon/facebook/facebook.php:554 +#: ../../addon/facebook/facebook.php:562 msgid "" "Re-authenticate [This is necessary whenever your Facebook password is " "changed.]" msgstr "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]" -#: ../../addon/facebook/facebook.php:561 +#: ../../addon/facebook/facebook.php:569 msgid "Post to Facebook by default" msgstr "Veröffentliche standardmäßig bei Facebook" -#: ../../addon/facebook/facebook.php:567 +#: ../../addon/facebook/facebook.php:575 msgid "" "Facebook friend linking has been disabled on this site. The following " "settings will have no effect." -msgstr "Das verlinken von Facebook-Kontakten wurde auf dieser Seite deaktiviert. Die folgenden Einstellungen haben keinen Effekt." +msgstr "Das Verlinken von Facebookkontakten wurde auf dieser Seite deaktiviert. Die folgenden Einstellungen haben keinen Effekt." -#: ../../addon/facebook/facebook.php:571 +#: ../../addon/facebook/facebook.php:579 msgid "" "Facebook friend linking has been disabled on this site. If you disable it, " "you will be unable to re-enable it." -msgstr "Das verlinken von Facebook-Kontakten wurde auf dieser Seite deaktiviert. Wenn du es ausgeschaltet hast, kannst du es nicht wieder aktivieren." +msgstr "Das Verlinken von Facebookkontakten wurde auf dieser Seite deaktiviert. Wenn du es ausgeschaltet hast, kannst du es nicht wieder aktivieren." -#: ../../addon/facebook/facebook.php:574 +#: ../../addon/facebook/facebook.php:582 msgid "Link all your Facebook friends and conversations on this website" msgstr "All meine Facebook-Kontakte und -Konversationen hier auf diese Website importieren" -#: ../../addon/facebook/facebook.php:576 +#: ../../addon/facebook/facebook.php:584 msgid "" "Facebook conversations consist of your profile wall and your friend" " stream." msgstr "Facebook-Konversationen bestehen aus deinen Beiträgen auf deinerPinnwand, sowie den Beiträgen deiner Freunde Stream." -#: ../../addon/facebook/facebook.php:577 +#: ../../addon/facebook/facebook.php:585 msgid "On this website, your Facebook friend stream is only visible to you." msgstr "Hier auf dieser Webseite kannst nur du die Beiträge Deiner Facebook-Freunde (Stream) sehen." -#: ../../addon/facebook/facebook.php:578 +#: ../../addon/facebook/facebook.php:586 msgid "" "The following settings determine the privacy of your Facebook profile wall " "on this website." msgstr "Mit den folgenden Einstellungen kannst Du die Privatsphäre der Kopie Deiner Facebook-Pinnwand hier auf dieser Seite einstellen." -#: ../../addon/facebook/facebook.php:582 +#: ../../addon/facebook/facebook.php:590 msgid "" "On this website your Facebook profile wall conversations will only be " "visible to you" msgstr "Meine Facebook-Pinnwand hier auf dieser Webseite nur für mich sichtbar machen" -#: ../../addon/facebook/facebook.php:587 +#: ../../addon/facebook/facebook.php:595 msgid "Do not import your Facebook profile wall conversations" msgstr "Facebook-Pinnwand nicht importieren" -#: ../../addon/facebook/facebook.php:589 +#: ../../addon/facebook/facebook.php:597 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 " @@ -4379,120 +4401,120 @@ msgid "" "who may see the conversations." msgstr "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann." -#: ../../addon/facebook/facebook.php:594 +#: ../../addon/facebook/facebook.php:602 msgid "Comma separated applications to ignore" -msgstr "Komma separiert Anwendungen, die ignoriert werden sollen" +msgstr "Kommaseparierte Anwendungen, die ignoriert werden sollen" -#: ../../addon/facebook/facebook.php:678 +#: ../../addon/facebook/facebook.php:686 msgid "Problems with Facebook Real-Time Updates" msgstr "Probleme mit Facebook Echtzeit-Updates" -#: ../../addon/facebook/facebook.php:706 +#: ../../addon/facebook/facebook.php:714 #: ../../include/contact_selectors.php:81 msgid "Facebook" msgstr "Facebook" -#: ../../addon/facebook/facebook.php:707 +#: ../../addon/facebook/facebook.php:715 msgid "Facebook Connector Settings" msgstr "Facebook-Verbindungseinstellungen" -#: ../../addon/facebook/facebook.php:722 +#: ../../addon/facebook/facebook.php:730 msgid "Facebook API Key" msgstr "Facebook API Schlüssel" -#: ../../addon/facebook/facebook.php:732 +#: ../../addon/facebook/facebook.php:740 msgid "" "Error: it appears that you have specified the App-ID and -Secret in your " ".htconfig.php file. As long as they are specified there, they cannot be set " "using this form.

" msgstr "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.

" -#: ../../addon/facebook/facebook.php:737 +#: ../../addon/facebook/facebook.php:745 msgid "" "Error: the given API Key seems to be incorrect (the application access token" " could not be retrieved)." msgstr "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden)." -#: ../../addon/facebook/facebook.php:739 +#: ../../addon/facebook/facebook.php:747 msgid "The given API Key seems to work correctly." msgstr "Der angegebene API Schlüssel scheint korrekt zu funktionieren." -#: ../../addon/facebook/facebook.php:741 +#: ../../addon/facebook/facebook.php:749 msgid "" "The correctness of the API Key could not be detected. Somthing strange's " "going on." msgstr "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange." -#: ../../addon/facebook/facebook.php:744 +#: ../../addon/facebook/facebook.php:752 msgid "App-ID / API-Key" msgstr "App-ID / API-Key" -#: ../../addon/facebook/facebook.php:745 +#: ../../addon/facebook/facebook.php:753 msgid "Application secret" msgstr "Anwendungs-Geheimnis" -#: ../../addon/facebook/facebook.php:746 +#: ../../addon/facebook/facebook.php:754 #, php-format msgid "Polling Interval in minutes (minimum %1$s minutes)" -msgstr "Abfrage-Intervall in Minuten (min %1$s Minuten)" +msgstr "Abfrageintervall in Minuten (min %1$s Minuten)" -#: ../../addon/facebook/facebook.php:747 +#: ../../addon/facebook/facebook.php:755 msgid "" "Synchronize comments (no comments on Facebook are missed, at the cost of " "increased system load)" -msgstr "Kommentare synchronisieren (Kein Kommentar von Facebook geht verlohren, verursacht höhere Last auf dem Server)" +msgstr "Kommentare synchronisieren (Kein Kommentar von Facebook geht verloren, verursacht höhere Last auf dem Server)" -#: ../../addon/facebook/facebook.php:751 +#: ../../addon/facebook/facebook.php:759 msgid "Real-Time Updates" -msgstr "Echt-Zeit Aktualisierungen" +msgstr "Echtzeit Aktualisierungen" -#: ../../addon/facebook/facebook.php:755 +#: ../../addon/facebook/facebook.php:763 msgid "Real-Time Updates are activated." msgstr "Echtzeit-Updates sind aktiviert." -#: ../../addon/facebook/facebook.php:756 +#: ../../addon/facebook/facebook.php:764 msgid "Deactivate Real-Time Updates" msgstr "Echtzeit-Updates deaktivieren" -#: ../../addon/facebook/facebook.php:758 +#: ../../addon/facebook/facebook.php:766 msgid "Real-Time Updates not activated." msgstr "Echtzeit-Updates nicht aktiviert." -#: ../../addon/facebook/facebook.php:758 +#: ../../addon/facebook/facebook.php:766 msgid "Activate Real-Time Updates" msgstr "Echtzeit-Updates aktivieren" -#: ../../addon/facebook/facebook.php:777 +#: ../../addon/facebook/facebook.php:785 msgid "The new values have been saved." msgstr "Die neuen Einstellungen wurden gespeichert." -#: ../../addon/facebook/facebook.php:801 +#: ../../addon/facebook/facebook.php:809 msgid "Post to Facebook" msgstr "Bei Facebook veröffentlichen" -#: ../../addon/facebook/facebook.php:899 +#: ../../addon/facebook/facebook.php:907 msgid "" "Post to Facebook cancelled because of multi-network access permission " "conflict." msgstr "Beitrag wurde nicht bei Facebook veröffentlicht, da Konflikte bei den Multi-Netzwerk-Zugriffsrechten vorliegen." -#: ../../addon/facebook/facebook.php:1119 +#: ../../addon/facebook/facebook.php:1127 msgid "View on Friendica" msgstr "In Friendica betrachten" -#: ../../addon/facebook/facebook.php:1152 +#: ../../addon/facebook/facebook.php:1160 msgid "Facebook post failed. Queued for retry." msgstr "Veröffentlichung bei Facebook gescheitert. Wir versuchen es später erneut." -#: ../../addon/facebook/facebook.php:1192 +#: ../../addon/facebook/facebook.php:1200 msgid "Your Facebook connection became invalid. Please Re-authenticate." msgstr "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich." -#: ../../addon/facebook/facebook.php:1193 +#: ../../addon/facebook/facebook.php:1201 msgid "Facebook connection became invalid" msgstr "Facebook Anmeldedaten sind ungültig geworden" -#: ../../addon/facebook/facebook.php:1194 +#: ../../addon/facebook/facebook.php:1202 #, php-format msgid "" "Hi %1$s,\n" @@ -4614,7 +4636,7 @@ msgid "" "setting. It is polite and recommended to tag any content containing nudity " "with #NSFW. This filter can also match any other word/text you specify, and" " can thereby be used as a general purpose content filter." -msgstr "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Su kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden." +msgstr "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Du kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden." #: ../../addon/nsfw/nsfw.php:50 msgid "Enable Content filter" @@ -4839,7 +4861,7 @@ msgstr "Drupal Seite verwendet bereinigte URLs" msgid "Post to Drupal by default" msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Drupal" -#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190 +#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:198 #: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:192 msgid "Post from Friendica" msgstr "Beitrag via Friendica" @@ -4856,6 +4878,24 @@ msgstr "Geonames Einstellungen" msgid "Enable Geonames Plugin" msgstr "Geonames Plugin aktivieren" +#: ../../addon/public_server/public_server.php:126 +#: ../../addon/testdrive/testdrive.php:94 +#, php-format +msgid "Your account on %s will expire in a few days." +msgstr "Dein Konto auf %s wird in ein paar Tagen verfallen." + +#: ../../addon/public_server/public_server.php:127 +msgid "Your Friendica account is about to expire." +msgstr "" + +#: ../../addon/public_server/public_server.php:128 +#, php-format +msgid "" +"Hi %1$s,\n" +"\n" +"Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days" +msgstr "" + #: ../../addon/js_upload/js_upload.php:43 msgid "Upload a file" msgstr "Datei hochladen" @@ -4925,7 +4965,7 @@ msgstr "Das Impressums-Plugin muss noch konfiguriert werden.
Bitte gebe min #: ../../addon/impressum/impressum.php:83 msgid "The page operators name." -msgstr "Name des Server-Administrators" +msgstr "Name des Serveradministrators" #: ../../addon/impressum/impressum.php:84 msgid "Site Owners Profile" @@ -4933,7 +4973,7 @@ msgstr "Profil des Seitenbetreibers" #: ../../addon/impressum/impressum.php:84 msgid "Profile address of the operator." -msgstr "Profil-Adresse des Server-Administrators" +msgstr "Profil-Adresse des Serveradministrators" #: ../../addon/impressum/impressum.php:85 msgid "How to contact the operator via snail mail. You can use BBCode here." @@ -4951,7 +4991,7 @@ msgstr "Zusätzliche Informationen die neben den Kontaktmöglichkeiten angezeigt #: ../../addon/impressum/impressum.php:87 msgid "How to contact the operator via email. (will be displayed obfuscated)" -msgstr "Wie erreichts man den Betreiber per Email. (Adresse wird verschleiert dargestellt)" +msgstr "Wie man den Betreiber per Email erreicht. (Adresse wird verschleiert dargestellt)" #: ../../addon/impressum/impressum.php:88 msgid "Footer note" @@ -5014,7 +5054,7 @@ msgstr "Schnell-Kommentar Einstellungen" msgid "" "Quick comments are found near comment boxes, sometimes hidden. Click them to" " provide simple replies." -msgstr "Kurz-Kommentare findet man in der Nähe der Kommentar-Boxen. Ein Klick darauf erstellt einfache Antworten." +msgstr "Kurzkommentare findet man in der Nähe der Kommentarboxen. Ein Klick darauf erstellt einfache Antworten." #: ../../addon/qcomment/qcomment.php:57 msgid "Enter quick comments, one per line" @@ -5047,7 +5087,7 @@ msgid "" "The MathJax addon renders mathematical formulae written using the LaTeX " "syntax surrounded by the usual $$ or an eqnarray block in the postings of " "your wall,network tab and private mail." -msgstr "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerk-Stream sowie privaten Nachrichten gerendert." +msgstr "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerkstream sowie privaten Nachrichten gerendert." #: ../../addon/mathjax/mathjax.php:38 msgid "Use the MathJax renderer" @@ -5115,16 +5155,11 @@ msgstr "Wähle eine angemessene Bildbewertung für Deinen Server. Schaue auch so msgid "Gravatar settings updated." msgstr "Gravatar Einstellungen aktualisiert." -#: ../../addon/testdrive/testdrive.php:85 -#, php-format -msgid "Your account on %s will expire in a few days." -msgstr "Dein Konto auf %s wird in ein paar Tagen verfallen." - -#: ../../addon/testdrive/testdrive.php:86 +#: ../../addon/testdrive/testdrive.php:95 msgid "Your Friendica test account is about to expire." msgstr "Dein Friendica Test Konto wird bald verfallen." -#: ../../addon/testdrive/testdrive.php:87 +#: ../../addon/testdrive/testdrive.php:96 #, php-format msgid "" "Hi %1$s,\n" @@ -5282,14 +5317,14 @@ msgid "Send public postings to StatusNet by default" msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet" #: ../../addon/statusnet/statusnet.php:345 -msgid "Send #tag links to StatusNet" -msgstr "#Tags nach StatusNet senden" +msgid "Send linked #-tags and @-names to StatusNet" +msgstr "Sende verlinkte #-Tags und @-Namen nach StatusNet" #: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206 msgid "Clear OAuth configuration" msgstr "OAuth-Konfiguration löschen" -#: ../../addon/statusnet/statusnet.php:545 +#: ../../addon/statusnet/statusnet.php:553 msgid "API URL" msgstr "API-URL" @@ -5356,30 +5391,38 @@ msgstr "[Friendica Meldung] Kommentar zum Beitrag #%d" msgid "Post to Wordpress" msgstr "Bei WordPress veröffentlichen" -#: ../../addon/wppost/wppost.php:74 +#: ../../addon/wppost/wppost.php:76 msgid "WordPress Post Settings" msgstr "WordPress-Beitragseinstellungen" -#: ../../addon/wppost/wppost.php:76 +#: ../../addon/wppost/wppost.php:78 msgid "Enable WordPress Post Plugin" msgstr "WordPress-Plugin aktivieren." -#: ../../addon/wppost/wppost.php:81 +#: ../../addon/wppost/wppost.php:83 msgid "WordPress username" msgstr "WordPress-Benutzername" -#: ../../addon/wppost/wppost.php:86 +#: ../../addon/wppost/wppost.php:88 msgid "WordPress password" msgstr "WordPress-Passwort" -#: ../../addon/wppost/wppost.php:91 +#: ../../addon/wppost/wppost.php:93 msgid "WordPress API URL" msgstr "WordPress-API-URL" -#: ../../addon/wppost/wppost.php:96 +#: ../../addon/wppost/wppost.php:98 msgid "Post to WordPress by default" msgstr "Standardmäßig auf WordPress veröffentlichen" +#: ../../addon/wppost/wppost.php:102 +msgid "Provide a backlink to the Friendica post" +msgstr "" + +#: ../../addon/wppost/wppost.php:204 +msgid "Read the original post and comment stream on Friendica" +msgstr "" + #: ../../addon/showmore/showmore.php:38 msgid "\"Show more\" Settings" msgstr "\"Mehr zeigen\" Einstellungen" @@ -5491,14 +5534,14 @@ msgid "Send public postings to Twitter by default" msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter" #: ../../addon/twitter/twitter.php:201 -msgid "Send #tag links to Twitter" -msgstr "#Tags nach Twitter senden" +msgid "Send linked #-tags and @-names to Twitter" +msgstr "Sende verlinkte #-Tags und @-Namen nach Twitter" -#: ../../addon/twitter/twitter.php:377 +#: ../../addon/twitter/twitter.php:383 msgid "Consumer key" msgstr "Consumer Key" -#: ../../addon/twitter/twitter.php:378 +#: ../../addon/twitter/twitter.php:384 msgid "Consumer secret" msgstr "Consumer Secret" @@ -5590,7 +5633,7 @@ msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous" #: ../../view/theme/diabook/config.php:192 #: ../../view/theme/quattro/config.php:54 ../../view/theme/dispy/config.php:72 msgid "Theme settings" -msgstr "Themen Einstellungen" +msgstr "Themeneinstellungen" #: ../../view/theme/cleanzero/config.php:83 msgid "Set resize level for images in posts and comments (width and height)" @@ -5811,7 +5854,7 @@ msgid "j F" msgstr "j F" #: ../../include/profile_advanced.php:30 ../../include/datetime.php:448 -#: ../../include/items.php:1413 +#: ../../include/items.php:1419 msgid "Birthday:" msgstr "Geburtstag:" @@ -6187,12 +6230,12 @@ msgstr "Beginnt:" msgid "Finishes:" msgstr "Endet:" -#: ../../include/delivery.php:452 ../../include/notifier.php:652 +#: ../../include/delivery.php:455 ../../include/notifier.php:677 msgid "(no subject)" msgstr "(kein Betreff)" -#: ../../include/delivery.php:459 ../../include/enotify.php:23 -#: ../../include/notifier.php:659 +#: ../../include/delivery.php:462 ../../include/enotify.php:23 +#: ../../include/notifier.php:684 msgid "noreply" msgstr "noreply" @@ -6223,10 +6266,6 @@ msgid_plural "%d Contacts" msgstr[0] "%d Kontakt" msgstr[1] "%d Kontakte" -#: ../../include/text.php:650 ../../include/nav.php:91 -msgid "Search" -msgstr "Suche" - #: ../../include/text.php:831 msgid "Monday" msgstr "Montag" @@ -6351,15 +6390,15 @@ msgstr "Beitrag" msgid "Item filed" msgstr "Beitrag abgelegt" -#: ../../include/diaspora.php:582 +#: ../../include/diaspora.php:590 msgid "Sharing notification from Diaspora network" msgstr "Freigabe-Benachrichtigung von Diaspora" -#: ../../include/diaspora.php:1969 +#: ../../include/diaspora.php:1977 msgid "Attachments:" msgstr "Anhänge:" -#: ../../include/diaspora.php:2152 +#: ../../include/diaspora.php:2160 #, php-format msgid "[Relayed] Comment authored by %s from network %s" msgstr "[Weitergeleitet] Kommentar von %s aus dem %s Netzwerk" @@ -6383,27 +6422,31 @@ msgid "" "not what you intended, please create another group with a different name." msgstr "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen könnten auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen." -#: ../../include/group.php:168 +#: ../../include/group.php:176 +msgid "Default privacy group for new contacts" +msgstr "" + +#: ../../include/group.php:195 msgid "Everybody" msgstr "Alle Kontakte" -#: ../../include/group.php:191 +#: ../../include/group.php:218 msgid "edit" msgstr "bearbeiten" -#: ../../include/group.php:212 +#: ../../include/group.php:239 msgid "Groups" msgstr "Gruppen" -#: ../../include/group.php:213 +#: ../../include/group.php:240 msgid "Edit group" msgstr "Gruppe bearbeiten" -#: ../../include/group.php:214 +#: ../../include/group.php:241 msgid "Create a new group" msgstr "Neue Gruppe erstellen" -#: ../../include/group.php:215 +#: ../../include/group.php:242 msgid "Contacts not in any group" msgstr "Kontakte in keiner Gruppe" @@ -6415,7 +6458,7 @@ msgstr "Abmelden" msgid "End this session" msgstr "Diese Sitzung beenden" -#: ../../include/nav.php:49 ../../boot.php:1482 +#: ../../include/nav.php:49 ../../boot.php:1501 msgid "Status" msgstr "Status" @@ -6473,7 +6516,7 @@ msgstr "Alle Benachrichtigungen anzeigen" #: ../../include/nav.php:124 msgid "Mark all system notifications seen" -msgstr "Markiere alle System-Benachrichtigungen als gelesen" +msgstr "Markiere alle Systembenachrichtigungen als gelesen" #: ../../include/nav.php:128 msgid "Private mail" @@ -6586,7 +6629,7 @@ msgstr "Abgemeldet." msgid "" "We encountered a problem while logging in with the OpenID you provided. " "Please check the correct spelling of the ID." -msgstr "Beim versuch dich mit der von dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe dass du die OpenID richtig geschrieben hast." +msgstr "Beim Versuch dich mit der von dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass du die OpenID richtig geschrieben hast." #: ../../include/auth.php:106 msgid "The error message was:" @@ -6878,11 +6921,11 @@ msgstr "Foto:" msgid "Please visit %s to approve or reject the suggestion." msgstr "Bitte besuche %s, um den Vorschlag zu akzeptieren oder abzulehnen." -#: ../../include/items.php:2724 +#: ../../include/items.php:2736 msgid "A new person is sharing with you at " msgstr "Eine neue Person teilt mit dir auf " -#: ../../include/items.php:2724 +#: ../../include/items.php:2736 msgid "You have a new follower at " msgstr "Du hast einen neuen Kontakt auf " @@ -6911,7 +6954,7 @@ msgstr "Willkommen zurück " msgid "" "The form security token was not correct. This probably happened because the " "form has been opened for too long (>3 hours) before submitting it." -msgstr "Das Sicherheits-Merkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)." +msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)." #: ../../include/Contact.php:111 msgid "stopped following" @@ -6932,7 +6975,7 @@ msgstr "Bilder anschauen" #: ../../include/Contact.php:206 ../../include/Contact.php:219 #: ../../include/conversation.php:823 msgid "Network Posts" -msgstr "Netzwerk-Beiträge" +msgstr "Netzwerkbeiträge" #: ../../include/Contact.php:207 ../../include/Contact.php:219 #: ../../include/conversation.php:824 @@ -7244,18 +7287,18 @@ msgstr "Veranstaltungserinnerungen" msgid "Events this week:" msgstr "Veranstaltungen diese Woche" -#: ../../boot.php:1485 +#: ../../boot.php:1504 msgid "Status Messages and Posts" msgstr "Statusnachrichten und Beiträge" -#: ../../boot.php:1491 +#: ../../boot.php:1510 msgid "Profile Details" msgstr "Profildetails" -#: ../../boot.php:1506 +#: ../../boot.php:1525 msgid "Events and Calendar" msgstr "Ereignisse und Kalender" -#: ../../boot.php:1512 +#: ../../boot.php:1531 msgid "Only You Can See This" msgstr "Nur Du Kannst Das Sehen" diff --git a/view/de/register_open_eml.tpl b/view/de/register_open_eml.tpl index fffee2247d..f217decd37 100644 --- a/view/de/register_open_eml.tpl +++ b/view/de/register_open_eml.tpl @@ -1,32 +1,32 @@ Hallo $[username], Danke für deine Anmeldung auf $[sitename]. Dein Account wurde angelegt. -Die Login Details sind die folgenden: +Hier die Login Details: Adresse der Seite: $[siteurl] Login Name: $[email] Passwort: $[password] -Du kannst das Passwort in den "Einstellungen" zu deinem Account ändern -nachdem du dich eingeloggt hast. +Du kannst und solltest das Passwort in den "Einstellungen" zu deinem Account ändern, +nachdem du dich erstmalig eingeloggt hast. -Bitte nimm dir einige Augenblicke Zeit um die anderen Einstellungen auf der Seite zu überprüfen. +Bitte nimm dir einige Augenblicke Zeit um die anderen Einstellungen auf der Seite kennenzulernen und zu überprüfen. -Eventuell möchtest du außerdem einige grundlegenden Informationen in dein Standart-Profil eintragen -(auf der "Profile" Seite) damit andere Leute dich einfacher finden können. +Eventuell möchtest du außerdem einige grundlegenden Informationen in deinem Standart-Profil (auf der "Profile" Seite) eintragen, +damit andere Leute dich einfacher finden können. -Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profil-Foto, -ein paar "Profil-Schlüsselwörter" anzugeben (damit man leichter Gleichinteressierte finden kann) - und -natürlich in welchen Land Du lebst; wenn Du es nicht genauer angeben möchtest -dann das. +Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profil-Bild hochzuladen, +sowie ein paar "Profil-Schlüsselwörter" einzutragen (um leichter Menschen mit gleichen Interessen zu finden) - und +vielleicht auch in welchen Land Du lebst; falls du nicht konkreter +werden möchtest. -Wir respektieren Ihr Recht auf Privatsphäre, und keines dieser Elemente sind notwendig. -Wenn Du hier neu bist und keinen kennst, wird man Dir helfen -ein paar neue und interessante Freunde zu finden. +Wir respektieren dein Recht auf Privatsphäre und keine dieser Angaben ist notwendig. +Wenn Du ganz neu bei Friendica bist und niemanden kennst, werden sie dir aber helfen +ein paar neue und interessante Freunde zu finden. -Danke dir und willkommen auf $[sitename]. +Danke und willkommen auf $[sitename]. Beste Grüße, $[sitename] Administrator diff --git a/view/de/strings.php b/view/de/strings.php index f6336ef682..7c127894aa 100644 --- a/view/de/strings.php +++ b/view/de/strings.php @@ -10,7 +10,7 @@ $a->strings["Contact settings applied."] = "Einstellungen zum Kontakt angewandt. $a->strings["Contact update failed."] = "Konnte den Kontakt nicht aktualisieren."; $a->strings["Permission denied."] = "Zugriff verweigert."; $a->strings["Contact not found."] = "Kontakt nicht gefunden."; -$a->strings["Repair Contact Settings"] = "Kontakt-Einstellungen reparieren"; +$a->strings["Repair Contact Settings"] = "Kontakteinstellungen reparieren"; $a->strings["WARNING: This is highly advanced and if you enter incorrect information your communications with this contact may stop working."] = "ACHTUNG: Das sind Experten-Einstellungen! Wenn Du etwas Falsches eingibst, funktioniert die Kommunikation mit diesem Kontakt evtl. nicht mehr."; $a->strings["Please use your browser 'Back' button now if you are uncertain what to do on this page."] = "Bitte nutze den Zurück-Button deines Browsers jetzt, wenn du dir unsicher bist, was du tun willst."; $a->strings["Return to contact editor"] = "Zurück zum Kontakteditor"; @@ -33,7 +33,7 @@ $a->strings["File upload failed."] = "Hochladen der Datei fehlgeschlagen."; $a->strings["Friend suggestion sent."] = "Kontaktvorschlag gesendet."; $a->strings["Suggest Friends"] = "Kontakte vorschlagen"; $a->strings["Suggest a friend for %s"] = "Schlage %s einen Kontakt vor"; -$a->strings["Event description and start time are required."] = "Ereignis Beschreibung und Startzeit sind erforderlich."; +$a->strings["Event description and start time are required."] = "Ereignisbeschreibung und Startzeit sind erforderlich."; $a->strings["l, F j"] = "l, F j"; $a->strings["Edit event"] = "Veranstaltung bearbeiten"; $a->strings["link to source"] = "Link zum Originalbeitrag"; @@ -117,7 +117,7 @@ $a->strings["Community"] = "Gemeinschaft"; $a->strings["No results."] = "Keine Ergebnisse."; $a->strings["This is Friendica, version"] = "Dies ist Friendica, Version"; $a->strings["running at web location"] = "die unter folgender Webadresse zu finden ist"; -$a->strings["Please visit Friendica.com to learn more about the Friendica project."] = "Bitte besuche Friendica.com um mehr über das Friendica Projekt zu erfahren."; +$a->strings["Please visit Friendica.com to learn more about the Friendica project."] = "Bitte besuche Friendica.com, um mehr über das Friendica Projekt zu erfahren."; $a->strings["Bug reports and issues: please visit"] = "Probleme oder Fehler gefunden? Bitte besuche"; $a->strings["Suggestions, praise, donations, etc. - please email \"Info\" at Friendica - dot com"] = "Vorschläge, Lob, Spenden usw.: E-Mail an \"Info\" at Friendica - dot com"; $a->strings["Installed plugins/addons/apps:"] = "Installierte Plugins/Erweiterungen/Apps"; @@ -185,7 +185,7 @@ $a->strings[" - please do not use this form. Instead, enter %s into your Diaspo $a->strings["Your Identity Address:"] = "Adresse deines Profils:"; $a->strings["Submit Request"] = "Anfrage abschicken"; $a->strings["Friendica Social Communications Server - Setup"] = "Friendica-Server für soziale Netzwerke – Setup"; -$a->strings["Database connection"] = "Datenbank-Verbindung"; +$a->strings["Database connection"] = "Datenbankverbindung"; $a->strings["Could not connect to database."] = "Verbindung zur Datenbank gescheitert"; $a->strings["Could not create table."] = "Konnte Tabelle nicht erstellen."; $a->strings["Your Friendica site database has been installed."] = "Die Datenbank deiner Friendica Seite wurde installiert."; @@ -235,7 +235,7 @@ $a->strings["This is most often a permission setting, as the web server may not $a->strings["Please check with your site documentation or support people to see if this situation can be corrected."] = "Bitte überprüfe die Einstellungen und frage im Zweifelsfall dein Support Team, um diese Situation zu beheben."; $a->strings["If not, you may be required to perform a manual installation. Please see the file \"INSTALL.txt\" for instructions."] = "Sollte dies nicht möglich sein, musst du die Installation manuell durchführen. Lies dazu bitte in der Datei \"INSTALL.txt\"."; $a->strings[".htconfig.php is writable"] = "Schreibrechte auf .htconfig.php"; -$a->strings["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."] = "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text um die Datei im Stammverzeichnis deiner Friendica-Installation zu erzeugen."; +$a->strings["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."] = "Die Konfigurationsdatei \".htconfig.php\" konnte nicht angelegt werden. Bitte verwende den angefügten Text, um die Datei im Stammverzeichnis deiner Friendica-Installation zu erzeugen."; $a->strings["Errors encountered creating database tables."] = "Fehler aufgetreten während der Erzeugung der Datenbanktabellen."; $a->strings["l F d, Y \\@ g:i A"] = "l F d, Y \\@ g:i A"; $a->strings["Time Conversion"] = "Zeitumrechnung"; @@ -288,8 +288,8 @@ $a->strings["%s created a new post"] = "%s hat einen neuen Beitrag erstellt"; $a->strings["%s commented on %s's post"] = "%s hat %ss Beitrag kommentiert"; $a->strings["No more network notifications."] = "Keine weiteren Netzwerk-Benachrichtigungen."; $a->strings["Network Notifications"] = "Netzwerk Benachrichtigungen"; -$a->strings["No more system notifications."] = "Keine weiteren System Benachrichtigungen."; -$a->strings["System Notifications"] = "System Benachrichtigungen"; +$a->strings["No more system notifications."] = "Keine weiteren Systembenachrichtigungen."; +$a->strings["System Notifications"] = "Systembenachrichtigungen"; $a->strings["No more personal notifications."] = "Keine weiteren persönlichen Benachrichtigungen"; $a->strings["Personal Notifications"] = "Persönliche Benachrichtigungen"; $a->strings["No more home notifications."] = "Keine weiteren Pinnwand-Benachrichtigungen"; @@ -320,7 +320,7 @@ $a->strings["%d contact in common"] = array( $a->strings["View all contacts"] = "Alle Kontakte anzeigen"; $a->strings["Unblock"] = "Entsperren"; $a->strings["Block"] = "Sperren"; -$a->strings["Toggle Blocked status"] = "Geblockt-Sttaus ein-/ausschalten"; +$a->strings["Toggle Blocked status"] = "Geblockt-Status ein-/ausschalten"; $a->strings["Unignore"] = "Ignorieren aufheben"; $a->strings["Toggle Ignored status"] = "Ignoriert-Status ein-/ausschalten"; $a->strings["Unarchive"] = "Unarchivieren"; @@ -329,7 +329,7 @@ $a->strings["Toggle Archive status"] = "Archiviert-Status ein-/ausschalten"; $a->strings["Repair"] = "Reparieren"; $a->strings["Advanced Contact Settings"] = "Fortgeschrittene Kontakteinstellungen"; $a->strings["Contact Editor"] = "Kontakt Editor"; -$a->strings["Profile Visibility"] = "Profil Anzeige"; +$a->strings["Profile Visibility"] = "Profil-Sichtbarkeit"; $a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = "Bitte wähle eines deiner Profile das angezeigt werden soll, wenn %s dein Profil aufruft."; $a->strings["Contact Information / Notes"] = "Kontakt Informationen / Notizen"; $a->strings["Edit contact notes"] = "Notizen zum Kontakt bearbiten"; @@ -383,8 +383,8 @@ $a->strings["Forgot your Password?"] = "Hast du dein Passwort vergessen?"; $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine Email-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet."; $a->strings["Nickname or Email: "] = "Spitzname oder Email:"; $a->strings["Reset"] = "Zurücksetzen"; -$a->strings["Account settings"] = "Account Einstellungen"; -$a->strings["Display settings"] = "Anzeige Einstellungen"; +$a->strings["Account settings"] = "Account-Einstellungen"; +$a->strings["Display settings"] = "Anzeige-Einstellungen"; $a->strings["Connector settings"] = "Connector-Einstellungen"; $a->strings["Plugin settings"] = "Plugin-Einstellungen"; $a->strings["Connected apps"] = "Verbundene Programme"; @@ -403,6 +403,8 @@ $a->strings[" Please use a shorter name."] = " Bitte verwende einen kürzeren Na $a->strings[" Name too short."] = " Name ist zu kurz."; $a->strings[" Not valid email."] = " Keine gültige E-Mail."; $a->strings[" Cannot change to that email."] = "Ändern der E-Mail nicht möglich. "; +$a->strings["Private forum has no privacy permissions. Using default privacy group."] = ""; +$a->strings["Private forum has no privacy permissions and no default privacy group."] = ""; $a->strings["Settings updated."] = "Einstellungen aktualisiert."; $a->strings["Add application"] = "Programm hinzufügen"; $a->strings["Consumer Key"] = "Consumer Key"; @@ -411,7 +413,7 @@ $a->strings["Redirect"] = "Umleiten"; $a->strings["Icon url"] = "Icon URL"; $a->strings["You can't edit this application."] = "Du kannst dieses Programm nicht bearbeiten."; $a->strings["Connected Apps"] = "Verbundene Programme"; -$a->strings["Client key starts with"] = "Anwender Schlüssel beginnt mit"; +$a->strings["Client key starts with"] = "Anwenderschlüssel beginnt mit"; $a->strings["No name"] = "Kein Name"; $a->strings["Remove authorization"] = "Autorisierung entziehen"; $a->strings["No Plugin settings configured"] = "Keine Plugin-Einstellungen konfiguriert"; @@ -437,7 +439,7 @@ $a->strings["Action after import:"] = "Aktion nach Import:"; $a->strings["Mark as seen"] = "Als gelesen markieren"; $a->strings["Move to folder"] = "In einen Ordner verschieben"; $a->strings["Move to folder:"] = "In diesen Ordner verschieben:"; -$a->strings["Display Settings"] = "Anzeige Einstellungen"; +$a->strings["Display Settings"] = "Anzeige-Einstellungen"; $a->strings["Display Theme:"] = "Theme:"; $a->strings["Update browser every xx seconds"] = "Browser alle xx Sekunden aktualisieren"; $a->strings["Minimum of 10 seconds, no maximum"] = "Minimal 10 Sekunden, kein Maximum"; @@ -448,10 +450,12 @@ $a->strings["Normal Account"] = "Normaler Account"; $a->strings["This account is a normal personal profile"] = "Dieser Account ist ein normales persönliches Profil"; $a->strings["Soapbox Account"] = "Sandkasten-Account"; $a->strings["Automatically approve all connection/friend requests as read-only fans"] = "Kontaktanfragen werden automatisch als Nurlese-Fans akzeptiert"; -$a->strings["Community/Celebrity Account"] = "Gemeinschafts/Promi-Account"; +$a->strings["Community/Celebrity Account"] = "Gemeinschafts-/Promi-Account"; $a->strings["Automatically approve all connection/friend requests as read-write fans"] = "Kontaktanfragen werden automatisch als Lese-und-Schreib-Fans akzeptiert"; $a->strings["Automatic Friend Account"] = "Automatischer Freundesaccount"; $a->strings["Automatically approve all connection/friend requests as friends"] = "Kontaktanfragen werden automatisch als Freund akzeptiert"; +$a->strings["Private Forum"] = ""; +$a->strings["Private forum - approved members only [Experimental]"] = ""; $a->strings["OpenID:"] = "OpenID:"; $a->strings["(Optional) Allow this OpenID to login to this account."] = "(Optional) Erlaube die Anmeldung für diesen Account mit dieser OpenID."; $a->strings["Publish your default profile in your local site directory?"] = "Veröffentliche dein Standardprofil im Verzeichnis der lokalen Seite?"; @@ -491,7 +495,7 @@ $a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträg $a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)"; $a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:"; $a->strings["Notification Settings"] = "Benachrichtigungseinstellungen"; -$a->strings["By default post a status message when:"] = "Standardmäßig eine Status-Nachricht posten wenn:"; +$a->strings["By default post a status message when:"] = "Standardmäßig eine Statusnachricht posten, wenn:"; $a->strings["accepting a friend request"] = "– du eine Kontaktanfrage akzeptierst"; $a->strings["joining a forum/community"] = "– du einem Forum/einer Gemeinschaftsseite beitrittst"; $a->strings["making an interesting profile change"] = "– du eine interessante Änderung an deinem Profil durchführst"; @@ -562,7 +566,7 @@ $a->strings["Edit your default profile to your liking. Review t $a->strings["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."] = "Trage ein paar öffentliche Stichwörter in dein Standardprofil ein, die deine Interessen beschreiben. Eventuell sind wir in der Lage Leute zu finden, die deine Interessen teilen und können dir dann Kontakte vorschlagen."; $a->strings["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."] = "Die Kontakte-Seite ist die Einstiegsseite, von der aus du Kontakte verwalten und dich mit Freunden in anderen Netzwerken verbinden kannst. Normalerweise gibst du dazu einfach ihre Adresse oder die URL der Seite im Kasten Neuen Kontakt hinzufügen ein."; $a->strings["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."] = "Über die Verzeichnisseite kannst du andere Personen auf diesem Server oder anderen verknüpften Seiten finden. Halte nach einem Verbinden oder Folgen Link auf deren Profilseiten Ausschau und gib deine eigene Profiladresse an, falls du danach gefragt wirst."; -$a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "Im seitlichen Bedienfeld der Kontakte-Seite gibt es diverse Werkzeuge, um neue Freunde zu finden. Wir können Menschen mit den gleichen Interessen finden, anhand von Namen oder Interessen suchen oder aber aufgrund vorhandener Kontakte neue Freunde vorschlagen.\nAuf einer brandneuen - soeben erstellten - Seite starten die Kontaktvorschläge innerhalb von 24 Stunden."; +$a->strings["On the side panel of the Contacts page are several tools to find new friends. We can match people by interest, look up people by name or interest, and provide suggestions based on network relationships. On a brand new site, friend suggestions will usually begin to be populated within 24 hours."] = "Im seitlichen Bedienfeld der Kontakteseite gibt es diverse Werkzeuge, um neue Freunde zu finden. Wir können Menschen mit den gleichen Interessen finden, anhand von Namen oder Interessen suchen oder aber aufgrund vorhandener Kontakte neue Freunde vorschlagen.\nAuf einer brandneuen - soeben erstellten - Seite starten die Kontaktvorschläge innerhalb von 24 Stunden."; $a->strings["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."] = "Sobald du einige Freunde gefunden hast, organisiere sie in Gruppen zur privaten Kommunikation im Seitenmenü der Kontakte-Seite. Du kannst dann mit jeder dieser Gruppen von der Netzwerkseite aus privat interagieren."; $a->strings["Our help pages may be consulted for detail on other program features and resources."] = "Unsere Hilfe Seiten können herangezogen werden, um weitere Einzelheiten zu andern Programm Features zu erhalten."; $a->strings["Item not available."] = "Beitrag nicht verfügbar."; @@ -601,7 +605,7 @@ $a->strings["Nickname is already registered. Please choose another."] = "Dieser $a->strings["Nickname was once registered here and may not be re-used. Please choose another."] = "Dieser Spitzname ist bereits vergeben. Bitte wähle einen anderen."; $a->strings["SERIOUS ERROR: Generation of security keys failed."] = "FATALER FEHLER: Sicherheitsschlüssel konnten nicht erzeugt werden."; $a->strings["An error occurred during registration. Please try again."] = "Wärend der Anmeldung ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; -$a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standard-Profils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; +$a->strings["An error occurred creating your default profile. Please try again."] = "Bei der Erstellung des Standardprofils ist ein Fehler aufgetreten. Bitte versuche es noch einmal."; $a->strings["Registration details for %s"] = "Details der Registration von %s"; $a->strings["Registration successful. Please check your email for further instructions."] = "Registrierung erfolgreich. Eine E-Mail mit weiteren Anweisungen wurde an dich gesendet."; $a->strings["Failed to send email message. Here is the message that failed."] = "Konnte die E-Mail nicht versenden. Hier ist die Nachricht, die nicht gesendet werden konnte."; @@ -678,7 +682,7 @@ $a->strings["No secure communications available. You may be abl $a->strings["Send Reply"] = "Antwort senden"; $a->strings["Friends of %s"] = "Freunde von %s"; $a->strings["No friends to display."] = "Keine Freunde zum Anzeigen."; -$a->strings["Theme settings updated."] = "Themen Einstellungen aktualisiert."; +$a->strings["Theme settings updated."] = "Themeneinstellungen aktualisiert."; $a->strings["Site"] = "Seite"; $a->strings["Users"] = "Nutzer"; $a->strings["Plugins"] = "Plugins"; @@ -714,7 +718,7 @@ $a->strings["Maximum image size"] = "Maximale Größe von Bildern"; $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = "Maximale Upload-Größe von Bildern in Bytes. Standard ist 0, d.h. ohne Limit."; $a->strings["Register policy"] = "Registrierungsmethode"; $a->strings["Register text"] = "Registrierungstext"; -$a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungs-Seite angezeigt."; +$a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungsseite angezeigt."; $a->strings["Accounts abandoned after x days"] = "Accounts gelten nach x Tagen als unbenutzt"; $a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit."; $a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte"; @@ -744,15 +748,15 @@ $a->strings["Provide built-in Diaspora network compatibility."] = "Verwende die $a->strings["Only allow Friendica contacts"] = "Nur Friendica-Kontakte erlauben"; $a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert."; $a->strings["Verify SSL"] = "SSL Überprüfen"; -$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann."; +$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Wenn gewollt, kann man hier eine strenge Zertifikatkontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann."; $a->strings["Proxy user"] = "Proxy Nutzer"; $a->strings["Proxy URL"] = "Proxy URL"; $a->strings["Network timeout"] = "Netzwerk Wartezeit"; $a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)."; $a->strings["Delivery interval"] = "Zustellungsintervall"; -$a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."; -$a->strings["Poll interval"] = "Abfrage Intervall"; -$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Verzögere Hintergrundprozesse um diese Anzahl an Sekunden um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet."; +$a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden, um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server."; +$a->strings["Poll interval"] = "Abfrageintervall"; +$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Verzögere Hintergrundprozesse, um diese Anzahl an Sekunden um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet."; $a->strings["Maximum Load Average"] = "Maximum Load Average"; $a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50"; $a->strings["Update has been marked successful"] = "Update wurde als erfolgreich markiert"; @@ -778,7 +782,7 @@ $a->strings["User '%s' unblocked"] = "Nutzer '%s' entsperrt"; $a->strings["User '%s' blocked"] = "Nutzer '%s' gesperrt"; $a->strings["select all"] = "Alle auswählen"; $a->strings["User registrations waiting for confirm"] = "Neuanmeldungen, die auf deine Bestätigung warten"; -$a->strings["Request date"] = "Anfrage Datum"; +$a->strings["Request date"] = "Anfragedatum"; $a->strings["Email"] = "Email"; $a->strings["No registrations."] = "Keine Neuanmeldungen."; $a->strings["Deny"] = "Verwehren"; @@ -844,7 +848,7 @@ $a->strings["No contacts in common."] = "Keine gemeinsamen Kontakte."; $a->strings["Item has been removed."] = "Eintrag wurde entfernt."; $a->strings["Applications"] = "Anwendungen"; $a->strings["No installed applications."] = "Keine Applikationen installiert."; -$a->strings["Search This Site"] = "Diese Seite durchsuchen"; +$a->strings["Search"] = "Suche"; $a->strings["Profile not found."] = "Profil nicht gefunden."; $a->strings["Profile Name is required."] = "Profilname ist erforderlich."; $a->strings["Marital Status"] = "Familienstand"; @@ -861,6 +865,7 @@ $a->strings["Profile updated."] = "Profil aktualisiert."; $a->strings[" and "] = " und "; $a->strings["public profile"] = "öffentliches Profil"; $a->strings["%1\$s changed %2\$s to “%3\$s”"] = "%1\$s hat %2\$s geändert auf “%3\$s”"; +$a->strings[" - Visit %1\$s's %2\$s"] = ""; $a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "%1\$s hat folgendes aktualisiert %2\$s, verändert wurde %3\$s."; $a->strings["Profile deleted."] = "Profil gelöscht."; $a->strings["Profile-"] = "Profil-"; @@ -892,7 +897,7 @@ $a->strings["Religious Views:"] = "Religiöse Ansichten:"; $a->strings["Public Keywords:"] = "Öffentliche Schlüsselwörter:"; $a->strings["Private Keywords:"] = "Private Schlüsselwörter:"; $a->strings["Example: fishing photography software"] = "Beispiel: Fischen Fotografie Software"; -$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)"; +$a->strings["(Used for suggesting potential friends, can be seen by others)"] = "(Wird verwendet, um potentielle Freunde zu finden, könnte von Fremden eingesehen werden)"; $a->strings["(Used for searching profiles, never shown to others)"] = "(Wird für die Suche nach Profilen verwendet und niemals veröffentlicht)"; $a->strings["Tell us about yourself..."] = "Erzähle uns ein bisschen von dir …"; $a->strings["Hobbies/Interests"] = "Hobbies/Interessen"; @@ -976,8 +981,8 @@ $a->strings["Install Facebook connector for this account."] = "Facebook-Connecto $a->strings["Remove Facebook connector"] = "Facebook-Connector entfernen"; $a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]"; $a->strings["Post to Facebook by default"] = "Veröffentliche standardmäßig bei Facebook"; -$a->strings["Facebook friend linking has been disabled on this site. The following settings will have no effect."] = "Das verlinken von Facebook-Kontakten wurde auf dieser Seite deaktiviert. Die folgenden Einstellungen haben keinen Effekt."; -$a->strings["Facebook friend linking has been disabled on this site. If you disable it, you will be unable to re-enable it."] = "Das verlinken von Facebook-Kontakten wurde auf dieser Seite deaktiviert. Wenn du es ausgeschaltet hast, kannst du es nicht wieder aktivieren."; +$a->strings["Facebook friend linking has been disabled on this site. The following settings will have no effect."] = "Das Verlinken von Facebookkontakten wurde auf dieser Seite deaktiviert. Die folgenden Einstellungen haben keinen Effekt."; +$a->strings["Facebook friend linking has been disabled on this site. If you disable it, you will be unable to re-enable it."] = "Das Verlinken von Facebookkontakten wurde auf dieser Seite deaktiviert. Wenn du es ausgeschaltet hast, kannst du es nicht wieder aktivieren."; $a->strings["Link all your Facebook friends and conversations on this website"] = "All meine Facebook-Kontakte und -Konversationen hier auf diese Website importieren"; $a->strings["Facebook conversations consist of your profile wall and your friend stream."] = "Facebook-Konversationen bestehen aus deinen Beiträgen auf deinerPinnwand, sowie den Beiträgen deiner Freunde Stream."; $a->strings["On this website, your Facebook friend stream is only visible to you."] = "Hier auf dieser Webseite kannst nur du die Beiträge Deiner Facebook-Freunde (Stream) sehen."; @@ -985,7 +990,7 @@ $a->strings["The following settings determine the privacy of your Facebook profi $a->strings["On this website your Facebook profile wall conversations will only be visible to you"] = "Meine Facebook-Pinnwand hier auf dieser Webseite nur für mich sichtbar machen"; $a->strings["Do not import your Facebook profile wall conversations"] = "Facebook-Pinnwand nicht importieren"; $a->strings["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."] = "Wenn Du Facebook-Konversationen importierst und diese beiden Häkchen nicht setzt, wird Deine Facebook-Pinnwand mit der Pinnwand hier auf dieser Webseite vereinigt. Die Privatsphäre-Einstellungen für Deine Pinnwand auf dieser Webseite geben dann an, wer die Konversationen sehen kann."; -$a->strings["Comma separated applications to ignore"] = "Komma separiert Anwendungen, die ignoriert werden sollen"; +$a->strings["Comma separated applications to ignore"] = "Kommaseparierte Anwendungen, die ignoriert werden sollen"; $a->strings["Problems with Facebook Real-Time Updates"] = "Probleme mit Facebook Echtzeit-Updates"; $a->strings["Facebook"] = "Facebook"; $a->strings["Facebook Connector Settings"] = "Facebook-Verbindungseinstellungen"; @@ -996,9 +1001,9 @@ $a->strings["The given API Key seems to work correctly."] = "Der angegebene API $a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange."; $a->strings["App-ID / API-Key"] = "App-ID / API-Key"; $a->strings["Application secret"] = "Anwendungs-Geheimnis"; -$a->strings["Polling Interval in minutes (minimum %1\$s minutes)"] = "Abfrage-Intervall in Minuten (min %1\$s Minuten)"; -$a->strings["Synchronize comments (no comments on Facebook are missed, at the cost of increased system load)"] = "Kommentare synchronisieren (Kein Kommentar von Facebook geht verlohren, verursacht höhere Last auf dem Server)"; -$a->strings["Real-Time Updates"] = "Echt-Zeit Aktualisierungen"; +$a->strings["Polling Interval in minutes (minimum %1\$s minutes)"] = "Abfrageintervall in Minuten (min %1\$s Minuten)"; +$a->strings["Synchronize comments (no comments on Facebook are missed, at the cost of increased system load)"] = "Kommentare synchronisieren (Kein Kommentar von Facebook geht verloren, verursacht höhere Last auf dem Server)"; +$a->strings["Real-Time Updates"] = "Echtzeit Aktualisierungen"; $a->strings["Real-Time Updates are activated."] = "Echtzeit-Updates sind aktiviert."; $a->strings["Deactivate Real-Time Updates"] = "Echtzeit-Updates deaktivieren"; $a->strings["Real-Time Updates not activated."] = "Echtzeit-Updates nicht aktiviert."; @@ -1042,7 +1047,7 @@ $a->strings["LiveJournal username"] = "LiveJournal Benutzername"; $a->strings["LiveJournal password"] = "LiveJournal Passwort"; $a->strings["Post to LiveJournal by default"] = "Standardmäßig bei LiveJournal veröffentlichen"; $a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Not Safe for Work (allg. Filter für ungewollte Inhalte) Einstellungen:"; -$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Su kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden."; +$a->strings["This plugin looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW. This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Dieses Plugin sucht in Beiträgen nach Wörtern oder Textbauteilen die du weiter unten eingibst, findet es diese Bausteine, dann wird der entsprechende Beitrag zusammengefaltet dargestellt. Auf diese Weise wird verhindert, dass Inhalte, wie z.B. sexuelle Anspielungen, in unpassenden Momenten angezeigt werden. Du solltest den #NSFW Tag für Beiträge verwenden von denen du ausgehen kannst, dass andere sie anstößig finden könnten. Du kannst beliebige Wörter in der Filterliste angeben und ihn so als allgemeinen Filter verwenden."; $a->strings["Enable Content filter"] = "Aktiviere den Inhaltsfilter"; $a->strings["Comma separated list of keywords to hide"] = "Durch Komma getrennte Liste von Schlüsselwörtern die verborgen werden sollen"; $a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expression/ um reguläre Ausdrücke zu verwenden"; @@ -1097,6 +1102,9 @@ $a->strings["Post from Friendica"] = "Beitrag via Friendica"; $a->strings["Geonames settings updated."] = "Geonames Einstellungen aktualisiert"; $a->strings["Geonames Settings"] = "Geonames Einstellungen"; $a->strings["Enable Geonames Plugin"] = "Geonames Plugin aktivieren"; +$a->strings["Your account on %s will expire in a few days."] = "Dein Konto auf %s wird in ein paar Tagen verfallen."; +$a->strings["Your Friendica account is about to expire."] = ""; +$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = ""; $a->strings["Upload a file"] = "Datei hochladen"; $a->strings["Drop files here to upload"] = "Ziehe Dateien hierher, um sie hochzuladen"; $a->strings["Failed"] = "Fehlgeschlagen"; @@ -1112,13 +1120,13 @@ $a->strings["Site Owner"] = "Betreiber der Seite"; $a->strings["Email Address"] = "Email Adresse"; $a->strings["Postal Address"] = "Postalische Anschrift"; $a->strings["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."] = "Das Impressums-Plugin muss noch konfiguriert werden.
Bitte gebe mindestens den Betreiber in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert."; -$a->strings["The page operators name."] = "Name des Server-Administrators"; +$a->strings["The page operators name."] = "Name des Serveradministrators"; $a->strings["Site Owners Profile"] = "Profil des Seitenbetreibers"; -$a->strings["Profile address of the operator."] = "Profil-Adresse des Server-Administrators"; +$a->strings["Profile address of the operator."] = "Profil-Adresse des Serveradministrators"; $a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Kontaktmöglichkeiten zum Administrator via Schneckenpost. Du kannst BBCode verwenden."; $a->strings["Notes"] = "Hinweise"; $a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Zusätzliche Informationen die neben den Kontaktmöglichkeiten angezeigt werden. Du kannst BBCode verwenden."; -$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Wie erreichts man den Betreiber per Email. (Adresse wird verschleiert dargestellt)"; +$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Wie man den Betreiber per Email erreicht. (Adresse wird verschleiert dargestellt)"; $a->strings["Footer note"] = "Fußnote"; $a->strings["Text for the footer. You can use BBCode here."] = "Text für die Fußzeile. Du kannst BBCode verwenden."; $a->strings["Report Bug"] = "Fehlerreport erstellen"; @@ -1133,14 +1141,14 @@ $a->strings[":-)"] = ":-)"; $a->strings[":-("] = ":-("; $a->strings["lol"] = "lol"; $a->strings["Quick Comment Settings"] = "Schnell-Kommentar Einstellungen"; -$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Kurz-Kommentare findet man in der Nähe der Kommentar-Boxen. Ein Klick darauf erstellt einfache Antworten."; +$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Kurzkommentare findet man in der Nähe der Kommentarboxen. Ein Klick darauf erstellt einfache Antworten."; $a->strings["Enter quick comments, one per line"] = "Gib einen Schnell-Kommentar pro Zeile ein"; $a->strings["Quick Comment settings saved."] = "Schnell-Kommentare Einstellungen gespeichert"; $a->strings["Tile Server URL"] = "Tile Server URL"; $a->strings["A list of public tile servers"] = "Eine Liste öffentlicher Tile Server"; $a->strings["Default zoom"] = "Standard Zoom"; $a->strings["The default zoom level. (1:world, 18:highest)"] = "Standard Zoomlevel (1: Welt; 18: höchstes)"; -$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerk-Stream sowie privaten Nachrichten gerendert."; +$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerkstream sowie privaten Nachrichten gerendert."; $a->strings["Use the MathJax renderer"] = "MathJax verwenden"; $a->strings["MathJax Base URL"] = "MathJax Basis-URL"; $a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "Die URL der MathJax Javascript-Datei, die verwendet werden soll. Diese kann entweder aus der MathJax CDN oder einer anderen Quelle stammen."; @@ -1157,7 +1165,6 @@ $a->strings["Select default avatar image if none was found at Gravatar. See READ $a->strings["Rating of images"] = "Bildbewertung"; $a->strings["Select the appropriate avatar rating for your site. See README"] = "Wähle eine angemessene Bildbewertung für Deinen Server. Schaue auch sonst im README nach."; $a->strings["Gravatar settings updated."] = "Gravatar Einstellungen aktualisiert."; -$a->strings["Your account on %s will expire in a few days."] = "Dein Konto auf %s wird in ein paar Tagen verfallen."; $a->strings["Your Friendica test account is about to expire."] = "Dein Friendica Test Konto wird bald verfallen."; $a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Hallo %1\$s,\n\ndein Test-Konto auf %2\$s wird in weniger als fünf Tagen verfallen. Wir hoffen, dass dir dieser Testlauf gefallen hat, so dass du die Gelegenheit nutzt und dir eine feste Friendica-Site für deine integrierte Social-Network-Kommunikation suchst. Eine Liste öffentlicher Sites findest du auf http://dir.friendica.com/siteinfo. Um mehr Information darüber zu bekommen, wie man einen eigenen Friendica-Server aufsetzt, kannst du auch einen Blick auf die Friendica Projektseite werfen: http://friendica.com"; $a->strings["\"pageheader\" Settings"] = "\"pageheader\"-Einstellungen"; @@ -1192,7 +1199,7 @@ $a->strings["If enabled all your public postings can be posted $a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an deinen StatusNet Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."; $a->strings["Allow posting to StatusNet"] = "Veröffentlichung bei StatusNet erlauben"; $a->strings["Send public postings to StatusNet by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei StatusNet"; -$a->strings["Send #tag links to StatusNet"] = "#Tags nach StatusNet senden"; +$a->strings["Send linked #-tags and @-names to StatusNet"] = "Sende verlinkte #-Tags und @-Namen nach StatusNet"; $a->strings["Clear OAuth configuration"] = "OAuth-Konfiguration löschen"; $a->strings["API URL"] = "API-URL"; $a->strings["Post to Tumblr"] = "Bei Tumblr veröffentlichen"; @@ -1216,6 +1223,8 @@ $a->strings["WordPress username"] = "WordPress-Benutzername"; $a->strings["WordPress password"] = "WordPress-Passwort"; $a->strings["WordPress API URL"] = "WordPress-API-URL"; $a->strings["Post to WordPress by default"] = "Standardmäßig auf WordPress veröffentlichen"; +$a->strings["Provide a backlink to the Friendica post"] = ""; +$a->strings["Read the original post and comment stream on Friendica"] = ""; $a->strings["\"Show more\" Settings"] = "\"Mehr zeigen\" Einstellungen"; $a->strings["Enable Show More"] = "Aktiviere \"Mehr zeigen\""; $a->strings["Cutting posts after how much characters"] = "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben"; @@ -1238,7 +1247,7 @@ $a->strings["If enabled all your public postings can be posted $a->strings["Note: Due your privacy settings (Hide your profile details from unknown viewers?) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "Hinweis: Aufgrund deiner Privatsphären-Einstellungen (Profil-Details vor unbekannten Betrachtern verbergen?) wird der Link, der eventuell an an deinen Twitter Account angehängt wird, um auf den original Artikel zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."; $a->strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlauben"; $a->strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter"; -$a->strings["Send #tag links to Twitter"] = "#Tags nach Twitter senden"; +$a->strings["Send linked #-tags and @-names to Twitter"] = "Sende verlinkte #-Tags und @-Namen nach Twitter"; $a->strings["Consumer key"] = "Consumer Key"; $a->strings["Consumer secret"] = "Consumer Secret"; $a->strings["IRC Settings"] = "IRC Einstellungen"; @@ -1262,7 +1271,7 @@ $a->strings["Posterous password"] = "Posterous-Passwort"; $a->strings["Posterous site ID"] = "Posterous site ID"; $a->strings["Posterous API token"] = "Posterous API token"; $a->strings["Post to Posterous by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous"; -$a->strings["Theme settings"] = "Themen Einstellungen"; +$a->strings["Theme settings"] = "Themeneinstellungen"; $a->strings["Set resize level for images in posts and comments (width and height)"] = "Wähle das Vergrößerungsmaß für Bilder in Beiträgen und Kommentaren (Höhe und Breite)"; $a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare festlegen"; $a->strings["Set theme width"] = "Theme Breite festlegen"; @@ -1411,7 +1420,6 @@ $a->strings["%d Contact"] = array( 0 => "%d Kontakt", 1 => "%d Kontakte", ); -$a->strings["Search"] = "Suche"; $a->strings["Monday"] = "Montag"; $a->strings["Tuesday"] = "Dienstag"; $a->strings["Wednesday"] = "Mittwoch"; @@ -1450,6 +1458,7 @@ $a->strings["view full size"] = "Volle Größe anzeigen"; $a->strings["Embedded content"] = "Eingebetteter Inhalt"; $a->strings["Embedding disabled"] = "Einbettungen deaktiviert"; $a->strings["A deleted group with this name was revived. Existing item permissions may apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = "Eine gelöschte Gruppe mit diesem Namen wurde wiederbelebt. Bestehende Berechtigungseinstellungen könnten auf diese Gruppe oder zukünftige Mitglieder angewandt werden. Falls du dies nicht möchtest, erstelle bitte eine andere Gruppe mit einem anderen Namen."; +$a->strings["Default privacy group for new contacts"] = ""; $a->strings["Everybody"] = "Alle Kontakte"; $a->strings["edit"] = "bearbeiten"; $a->strings["Groups"] = "Gruppen"; @@ -1472,7 +1481,7 @@ $a->strings["People directory"] = "Nutzerverzeichnis"; $a->strings["Conversations from your friends"] = "Unterhaltungen deiner Kontakte"; $a->strings["Friend Requests"] = "Kontaktanfragen"; $a->strings["See all notifications"] = "Alle Benachrichtigungen anzeigen"; -$a->strings["Mark all system notifications seen"] = "Markiere alle System-Benachrichtigungen als gelesen"; +$a->strings["Mark all system notifications seen"] = "Markiere alle Systembenachrichtigungen als gelesen"; $a->strings["Private mail"] = "Private Email"; $a->strings["Inbox"] = "Eingang"; $a->strings["Outbox"] = "Ausgang"; @@ -1502,7 +1511,7 @@ $a->strings["Saved Folders"] = "Gespeicherte Ordner"; $a->strings["Everything"] = "Alles"; $a->strings["Categories"] = "Kategorien"; $a->strings["Logged out."] = "Abgemeldet."; -$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim versuch dich mit der von dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe dass du die OpenID richtig geschrieben hast."; +$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = "Beim Versuch dich mit der von dir angegebenen OpenID anzumelden trat ein Problem auf. Bitte überprüfe, dass du die OpenID richtig geschrieben hast."; $a->strings["The error message was:"] = "Die Fehlermeldung lautete:"; $a->strings["Miscellaneous"] = "Verschiedenes"; $a->strings["year"] = "Jahr"; @@ -1575,12 +1584,12 @@ $a->strings["link"] = "Verweis"; $a->strings["Welcome "] = "Willkommen "; $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch."; $a->strings["Welcome back "] = "Willkommen zurück "; -$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheits-Merkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."; +$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."; $a->strings["stopped following"] = "wird nicht mehr gefolgt"; $a->strings["View Status"] = "Pinnwand anschauen"; $a->strings["View Profile"] = "Profil anschauen"; $a->strings["View Photos"] = "Bilder anschauen"; -$a->strings["Network Posts"] = "Netzwerk-Beiträge"; +$a->strings["Network Posts"] = "Netzwerkbeiträge"; $a->strings["Edit Contact"] = "Kontakt bearbeiten"; $a->strings["Send PM"] = "Private Nachricht senden"; $a->strings["post/item"] = "Nachricht/Beitrag"; From f29f861d25c443075c1bd310313aaf52596402a3 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 22 May 2012 03:44:03 -0700 Subject: [PATCH 21/50] add queue totals to admin summary page --- mod/admin.php | 15 ++++++++++++++- view/admin_summary.tpl | 4 ++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/mod/admin.php b/mod/admin.php index 1f53f112da..d19118b78c 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -115,7 +115,7 @@ function admin_content(&$a) { $aside['logs'] = Array($a->get_baseurl(true)."/admin/logs/", t("Logs"), "logs"); $t = get_markup_template("admin_aside.tpl"); - $a->page['aside'] = replace_macros( $t, array( + $a->page['aside'] .= replace_macros( $t, array( '$admin' => $aside, '$h_pending' => t('User registrations waiting for confirmation'), '$admurl'=> $a->get_baseurl(true)."/admin/" @@ -182,6 +182,7 @@ function admin_page_summary(&$a) { Array( t('Community/Celebrity Account'), 0), Array( t('Automatic Friend Account'), 0) ); + $users=0; foreach ($r as $u){ $accounts[$u['page-flags']][1] = $u['count']; $users+= $u['count']; } @@ -190,10 +191,22 @@ function admin_page_summary(&$a) { $r = q("SELECT COUNT(id) as `count` FROM `register`"); $pending = $r[0]['count']; + $r = q("select count(*) as total from deliverq where 1"); + $deliverq = (($r) ? $r[0]['total'] : 0); + + $r = q("select count(*) as total from queue where 1"); + $queue = (($r) ? $r[0]['total'] : 0); + + // We can do better, but this is a quick queue status + + $queues = array( 'label' => t('Message queues'), 'deliverq' => $deliverq, 'queue' => $queue ); + + $t = get_markup_template("admin_summary.tpl"); return replace_macros($t, array( '$title' => t('Administration'), '$page' => t('Summary'), + '$queues' => $queues, '$users' => Array( t('Registered users'), $users), '$accounts' => $accounts, '$pending' => Array( t('Pending registrations'), $pending), diff --git a/view/admin_summary.tpl b/view/admin_summary.tpl index eed71fbe0e..4efe1960c5 100644 --- a/view/admin_summary.tpl +++ b/view/admin_summary.tpl @@ -1,6 +1,10 @@

$title - $page

+
+
$queues.label
+
$queues.deliverq - $queues.queue
+
$pending.0
$pending.1 From 3ce06caeed2e817fe401c4d8283beea17d8a34e4 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 22 May 2012 03:55:11 -0700 Subject: [PATCH 22/50] cause of bogus wall-to-wall posts found --- include/items.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 91c9056fe8..e5b640fd23 100644 --- a/include/items.php +++ b/include/items.php @@ -1010,7 +1010,7 @@ function tag_deliver($uid,$item_id) { 'otype' => 'item' )); - if((! $community_page) && (! prvgroup)) + if((! $community_page) && (! $prvgroup)) return; From 18983bb932209336aa4b0e804c936c74e37e4260 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 22 May 2012 19:14:58 +0100 Subject: [PATCH 23/50] Fix darkzero/ns BB icon background colours. --- view/theme/darkzero-NS/style.css | 8 ++++---- view/theme/darkzero/style.css | 9 +++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/view/theme/darkzero-NS/style.css b/view/theme/darkzero-NS/style.css index 1efe093ed0..6dc788f353 100644 --- a/view/theme/darkzero-NS/style.css +++ b/view/theme/darkzero-NS/style.css @@ -146,11 +146,11 @@ blockquote { background:#444; } - - - - .wall-item-content { max-height: 20000px; overflow: none; +} + +.editicon:hover { + background-color: #ccc; } \ No newline at end of file diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css index 6f238bec60..e0155144db 100644 --- a/view/theme/darkzero/style.css +++ b/view/theme/darkzero/style.css @@ -146,3 +146,12 @@ blockquote { background:#444; } +.editicon { + background-color: #333; +} + +/* This seems okay to me...we might not need a new iconset, lets see how people react */ + +.editicon:hover { + background-color: #ccc; +} \ No newline at end of file From b962559570fe3a7381c7721a62989072661f01e9 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Tue, 22 May 2012 19:19:36 +0100 Subject: [PATCH 24/50] Oops - but lets commit the right revision, sorry. There's a spare line in the last one. --- view/theme/darkzero/style.css | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css index e0155144db..77650a91ad 100644 --- a/view/theme/darkzero/style.css +++ b/view/theme/darkzero/style.css @@ -146,12 +146,7 @@ blockquote { background:#444; } +/* This seems okay to me...we might not need a new iconset, lets see how people react */ .editicon { background-color: #333; -} - -/* This seems okay to me...we might not need a new iconset, lets see how people react */ - -.editicon:hover { - background-color: #ccc; } \ No newline at end of file From e70573f34cb6729f45cb020ee9349c8ff948ff3b Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 22 May 2012 16:01:07 -0700 Subject: [PATCH 25/50] if identity (uid) changes - reload any other open browser windows on next ping. --- boot.php | 3 +- js/main.js | 6 +- mod/ping.php | 8 + util/messages.po | 498 ++++++++++++++++++++++++----------------------- view/head.tpl | 1 + 5 files changed, 267 insertions(+), 249 deletions(-) diff --git a/boot.php b/boot.php index 798362d25e..e60c60c3b2 100644 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1349' ); +define ( 'FRIENDICA_VERSION', '3.0.1350' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1144 ); @@ -511,6 +511,7 @@ if(! class_exists('App')) { $tpl = file_get_contents('view/head.tpl'); $this->page['htmlhead'] = replace_macros($tpl,array( '$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!! + '$local_user' => local_user(), '$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION, '$delitem' => t('Delete this item?'), '$comment' => t('Comment'), diff --git a/js/main.js b/js/main.js index 6a26324419..885e042aa3 100644 --- a/js/main.js +++ b/js/main.js @@ -117,6 +117,9 @@ /* nav update event */ $('nav').bind('nav-update', function(e,data){; + var invalid = $(data).find('invalid').text(); + if(invalid == 1) { window.location.href=window.location.href } + var net = $(data).find('net').text(); if(net == 0) { net = ''; $('#net-update').removeClass('show') } else { $('#net-update').addClass('show') } $('#net-update').html(net); @@ -211,7 +214,8 @@ function NavUpdate() { if(! stopped) { - $.get("ping",function(data) { + var pingCmd = 'ping' + ((localUser != 0) ? '?f=&uid=' + localUser : ''); + $.get(pingCmd,function(data) { $(data).find('result').each(function() { // send nav-update event $('nav').trigger('nav-update', this); diff --git a/mod/ping.php b/mod/ping.php index 63aaa0f45f..55dcb26bb5 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -10,8 +10,16 @@ function ping_init(&$a) { "; $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">"; + if(local_user()){ + // Different login session than the page that is calling us. + + if(intval($_GET['uid']) && intval($_GET['uid']) != local_user()) { + echo '1'; + killme(); + } + $firehose = intval(get_pconfig(local_user(),'system','notify_full')); $t = q("select count(*) as total from notify where uid = %d and seen = 0", diff --git a/util/messages.po b/util/messages.po index 2edd9c2815..c5749f0adc 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1349\n" +"Project-Id-Version: 3.0.1350\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-05-21 10:00-0700\n" +"POT-Creation-Date: 2012-05-22 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -85,7 +85,7 @@ msgid "Return to contact editor" msgstr "" #: ../../mod/crepair.php:148 ../../mod/settings.php:555 -#: ../../mod/settings.php:581 ../../mod/admin.php:643 ../../mod/admin.php:652 +#: ../../mod/settings.php:581 ../../mod/admin.php:656 ../../mod/admin.php:665 msgid "Name" msgstr "" @@ -129,9 +129,9 @@ msgstr "" #: ../../mod/localtime.php:45 ../../mod/contacts.php:322 #: ../../mod/settings.php:553 ../../mod/settings.php:699 #: ../../mod/settings.php:760 ../../mod/settings.php:964 -#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:404 -#: ../../mod/admin.php:640 ../../mod/admin.php:776 ../../mod/admin.php:975 -#: ../../mod/admin.php:1062 ../../mod/profiles.php:534 +#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:417 +#: ../../mod/admin.php:653 ../../mod/admin.php:789 ../../mod/admin.php:988 +#: ../../mod/admin.php:1075 ../../mod/profiles.php:534 #: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:605 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93 #: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158 @@ -161,7 +161,7 @@ msgstr "" #: ../../view/theme/diabook/theme.php:752 #: ../../view/theme/diabook/config.php:190 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70 -#: ../../include/conversation.php:558 +#: ../../include/conversation.php:559 msgid "Submit" msgstr "" @@ -215,7 +215,7 @@ msgstr "" msgid "Edit event" msgstr "" -#: ../../mod/events.php:300 ../../include/text.php:1054 +#: ../../mod/events.php:300 ../../include/text.php:1060 msgid "link to source" msgstr "" @@ -397,7 +397,7 @@ msgstr "" #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70 #: ../../addon/communityhome/communityhome.php:163 -#: ../../view/theme/diabook/theme.php:565 ../../include/text.php:1305 +#: ../../view/theme/diabook/theme.php:565 ../../include/text.php:1311 #: ../../include/diaspora.php:1662 ../../include/conversation.php:53 #: ../../include/conversation.php:126 msgid "photo" @@ -487,7 +487,7 @@ msgstr "" msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:1085 ../../include/conversation.php:483 +#: ../../mod/photos.php:1085 ../../include/conversation.php:484 msgid "Private Message" msgstr "" @@ -519,44 +519,44 @@ msgstr "" msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1218 ../../include/conversation.php:532 +#: ../../mod/photos.php:1218 ../../include/conversation.php:533 msgid "I like this (toggle)" msgstr "" -#: ../../mod/photos.php:1219 ../../include/conversation.php:533 +#: ../../mod/photos.php:1219 ../../include/conversation.php:534 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1220 ../../include/conversation.php:967 +#: ../../mod/photos.php:1220 ../../include/conversation.php:968 msgid "Share" msgstr "" #: ../../mod/photos.php:1221 ../../mod/editpost.php:104 #: ../../mod/wallmessage.php:145 ../../mod/message.php:214 -#: ../../mod/message.php:408 ../../include/conversation.php:364 -#: ../../include/conversation.php:709 ../../include/conversation.php:986 +#: ../../mod/message.php:408 ../../include/conversation.php:365 +#: ../../include/conversation.php:710 ../../include/conversation.php:987 msgid "Please wait" msgstr "" #: ../../mod/photos.php:1237 ../../mod/photos.php:1277 -#: ../../mod/photos.php:1308 ../../include/conversation.php:555 +#: ../../mod/photos.php:1308 ../../include/conversation.php:556 msgid "This is you" msgstr "" #: ../../mod/photos.php:1239 ../../mod/photos.php:1279 -#: ../../mod/photos.php:1310 ../../include/conversation.php:557 +#: ../../mod/photos.php:1310 ../../include/conversation.php:558 #: ../../boot.php:516 msgid "Comment" msgstr "" #: ../../mod/photos.php:1241 ../../mod/editpost.php:125 -#: ../../include/conversation.php:567 ../../include/conversation.php:1004 +#: ../../include/conversation.php:568 ../../include/conversation.php:1005 msgid "Preview" msgstr "" #: ../../mod/photos.php:1338 ../../mod/settings.php:616 -#: ../../mod/settings.php:697 ../../mod/group.php:168 ../../mod/admin.php:647 -#: ../../include/conversation.php:321 ../../include/conversation.php:587 +#: ../../mod/settings.php:697 ../../mod/group.php:168 ../../mod/admin.php:660 +#: ../../include/conversation.php:322 ../../include/conversation.php:588 msgid "Delete" msgstr "" @@ -621,28 +621,28 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:80 ../../include/conversation.php:953 +#: ../../mod/editpost.php:80 ../../include/conversation.php:954 msgid "Post to Email" msgstr "" #: ../../mod/editpost.php:95 ../../mod/settings.php:615 -#: ../../include/conversation.php:574 +#: ../../include/conversation.php:575 msgid "Edit" msgstr "" #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 #: ../../mod/message.php:212 ../../mod/message.php:406 -#: ../../include/conversation.php:968 +#: ../../include/conversation.php:969 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:97 ../../include/conversation.php:970 +#: ../../mod/editpost.php:97 ../../include/conversation.php:971 msgid "Attach file" msgstr "" #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 #: ../../mod/message.php:213 ../../mod/message.php:407 -#: ../../include/conversation.php:972 +#: ../../include/conversation.php:973 msgid "Insert web link" msgstr "" @@ -658,35 +658,35 @@ msgstr "" msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/editpost.php:102 ../../include/conversation.php:978 +#: ../../mod/editpost.php:102 ../../include/conversation.php:979 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:103 ../../include/conversation.php:980 +#: ../../mod/editpost.php:103 ../../include/conversation.php:981 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:105 ../../include/conversation.php:987 +#: ../../mod/editpost.php:105 ../../include/conversation.php:988 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:113 ../../include/conversation.php:996 +#: ../../mod/editpost.php:113 ../../include/conversation.php:997 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:114 ../../include/conversation.php:997 +#: ../../mod/editpost.php:114 ../../include/conversation.php:998 msgid "Public post" msgstr "" -#: ../../mod/editpost.php:117 ../../include/conversation.php:983 +#: ../../mod/editpost.php:117 ../../include/conversation.php:984 msgid "Set title" msgstr "" -#: ../../mod/editpost.php:119 ../../include/conversation.php:985 +#: ../../mod/editpost.php:119 ../../include/conversation.php:986 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/editpost.php:120 ../../include/conversation.php:999 +#: ../../mod/editpost.php:120 ../../include/conversation.php:1000 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -1263,7 +1263,7 @@ msgid "if applicable" msgstr "" #: ../../mod/notifications.php:157 ../../mod/notifications.php:204 -#: ../../mod/admin.php:645 +#: ../../mod/admin.php:658 msgid "Approve" msgstr "" @@ -1464,12 +1464,12 @@ msgid "View all contacts" msgstr "" #: ../../mod/contacts.php:290 ../../mod/contacts.php:347 -#: ../../mod/admin.php:649 +#: ../../mod/admin.php:662 msgid "Unblock" msgstr "" #: ../../mod/contacts.php:290 ../../mod/contacts.php:347 -#: ../../mod/admin.php:648 +#: ../../mod/admin.php:661 msgid "Block" msgstr "" @@ -1562,7 +1562,7 @@ msgstr "" msgid "Update public posts" msgstr "" -#: ../../mod/contacts.php:344 ../../mod/admin.php:1120 +#: ../../mod/contacts.php:344 ../../mod/admin.php:1133 msgid "Update now" msgstr "" @@ -1775,7 +1775,7 @@ msgstr "" msgid "Remove account" msgstr "" -#: ../../mod/settings.php:88 ../../mod/admin.php:735 ../../mod/admin.php:940 +#: ../../mod/settings.php:88 ../../mod/admin.php:748 ../../mod/admin.php:953 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:638 #: ../../view/theme/diabook/theme.php:768 ../../include/nav.php:137 msgid "Settings" @@ -2011,7 +2011,7 @@ msgstr "" msgid "Don't show emoticons" msgstr "" -#: ../../mod/settings.php:835 ../../mod/admin.php:180 ../../mod/admin.php:621 +#: ../../mod/settings.php:835 ../../mod/admin.php:180 ../../mod/admin.php:634 msgid "Normal Account" msgstr "" @@ -2019,7 +2019,7 @@ msgstr "" msgid "This account is a normal personal profile" msgstr "" -#: ../../mod/settings.php:839 ../../mod/admin.php:181 ../../mod/admin.php:622 +#: ../../mod/settings.php:839 ../../mod/admin.php:181 ../../mod/admin.php:635 msgid "Soapbox Account" msgstr "" @@ -2027,7 +2027,7 @@ msgstr "" msgid "Automatically approve all connection/friend requests as read-only fans" msgstr "" -#: ../../mod/settings.php:843 ../../mod/admin.php:182 ../../mod/admin.php:623 +#: ../../mod/settings.php:843 ../../mod/admin.php:182 ../../mod/admin.php:636 msgid "Community/Celebrity Account" msgstr "" @@ -2035,7 +2035,7 @@ msgstr "" msgid "Automatically approve all connection/friend requests as read-write fans" msgstr "" -#: ../../mod/settings.php:847 ../../mod/admin.php:183 ../../mod/admin.php:624 +#: ../../mod/settings.php:847 ../../mod/admin.php:183 ../../mod/admin.php:637 msgid "Automatic Friend Account" msgstr "" @@ -2410,7 +2410,7 @@ msgid "No recipient." msgstr "" #: ../../mod/wallmessage.php:124 ../../mod/message.php:171 -#: ../../include/conversation.php:921 +#: ../../include/conversation.php:922 msgid "Please enter a link URL:" msgstr "" @@ -2769,7 +2769,7 @@ msgstr "" msgid "Your invitation ID: " msgstr "" -#: ../../mod/register.php:532 ../../mod/admin.php:405 +#: ../../mod/register.php:532 ../../mod/admin.php:418 msgid "Registration" msgstr "" @@ -2825,7 +2825,7 @@ msgid "%1$s doesn't like %2$s's %3$s" msgstr "" #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:156 -#: ../../mod/admin.php:684 ../../mod/admin.php:883 ../../mod/display.php:37 +#: ../../mod/admin.php:697 ../../mod/admin.php:896 ../../mod/display.php:37 #: ../../mod/display.php:142 ../../include/items.php:3096 msgid "Item not found." msgstr "" @@ -2864,34 +2864,34 @@ msgstr "" msgid "Empty post discarded." msgstr "" -#: ../../mod/item.php:381 ../../mod/wall_upload.php:99 +#: ../../mod/item.php:377 ../../mod/wall_upload.php:99 #: ../../mod/wall_upload.php:108 ../../mod/wall_upload.php:115 #: ../../include/message.php:144 msgid "Wall Photos" msgstr "" -#: ../../mod/item.php:790 +#: ../../mod/item.php:786 msgid "System error. Post not saved." msgstr "" -#: ../../mod/item.php:815 +#: ../../mod/item.php:811 #, php-format msgid "" "This message was sent to you by %s, a member of the Friendica social network." msgstr "" -#: ../../mod/item.php:817 +#: ../../mod/item.php:813 #, php-format msgid "You may visit them online at %s" msgstr "" -#: ../../mod/item.php:818 +#: ../../mod/item.php:814 msgid "" "Please contact the sender by replying to this post if you do not wish to " "receive these messages." msgstr "" -#: ../../mod/item.php:820 +#: ../../mod/item.php:816 #, php-format msgid "%s posted an update." msgstr "" @@ -3056,19 +3056,19 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: ../../mod/admin.php:96 ../../mod/admin.php:403 +#: ../../mod/admin.php:96 ../../mod/admin.php:416 msgid "Site" msgstr "" -#: ../../mod/admin.php:97 ../../mod/admin.php:639 ../../mod/admin.php:651 +#: ../../mod/admin.php:97 ../../mod/admin.php:652 ../../mod/admin.php:664 msgid "Users" msgstr "" -#: ../../mod/admin.php:98 ../../mod/admin.php:733 ../../mod/admin.php:775 +#: ../../mod/admin.php:98 ../../mod/admin.php:746 ../../mod/admin.php:788 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:99 ../../mod/admin.php:938 ../../mod/admin.php:974 +#: ../../mod/admin.php:99 ../../mod/admin.php:951 ../../mod/admin.php:987 msgid "Themes" msgstr "" @@ -3080,7 +3080,7 @@ msgstr "" msgid "Software Update" msgstr "" -#: ../../mod/admin.php:115 ../../mod/admin.php:1061 +#: ../../mod/admin.php:115 ../../mod/admin.php:1074 msgid "Logs" msgstr "" @@ -3088,529 +3088,533 @@ msgstr "" msgid "User registrations waiting for confirmation" msgstr "" -#: ../../mod/admin.php:195 ../../mod/admin.php:402 ../../mod/admin.php:638 -#: ../../mod/admin.php:732 ../../mod/admin.php:774 ../../mod/admin.php:937 -#: ../../mod/admin.php:973 ../../mod/admin.php:1060 +#: ../../mod/admin.php:202 +msgid "Message queues" +msgstr "" + +#: ../../mod/admin.php:207 ../../mod/admin.php:415 ../../mod/admin.php:651 +#: ../../mod/admin.php:745 ../../mod/admin.php:787 ../../mod/admin.php:950 +#: ../../mod/admin.php:986 ../../mod/admin.php:1073 msgid "Administration" msgstr "" -#: ../../mod/admin.php:196 +#: ../../mod/admin.php:208 msgid "Summary" msgstr "" -#: ../../mod/admin.php:197 +#: ../../mod/admin.php:210 msgid "Registered users" msgstr "" -#: ../../mod/admin.php:199 +#: ../../mod/admin.php:212 msgid "Pending registrations" msgstr "" -#: ../../mod/admin.php:200 +#: ../../mod/admin.php:213 msgid "Version" msgstr "" -#: ../../mod/admin.php:202 +#: ../../mod/admin.php:215 msgid "Active plugins" msgstr "" -#: ../../mod/admin.php:341 +#: ../../mod/admin.php:354 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:389 +#: ../../mod/admin.php:402 msgid "Closed" msgstr "" -#: ../../mod/admin.php:390 +#: ../../mod/admin.php:403 msgid "Requires approval" msgstr "" -#: ../../mod/admin.php:391 +#: ../../mod/admin.php:404 msgid "Open" msgstr "" -#: ../../mod/admin.php:395 +#: ../../mod/admin.php:408 msgid "No SSL policy, links will track page SSL state" msgstr "" -#: ../../mod/admin.php:396 +#: ../../mod/admin.php:409 msgid "Force all links to use SSL" msgstr "" -#: ../../mod/admin.php:397 +#: ../../mod/admin.php:410 msgid "Self-signed certificate, use SSL for local links only (discouraged)" msgstr "" -#: ../../mod/admin.php:406 +#: ../../mod/admin.php:419 msgid "File upload" msgstr "" -#: ../../mod/admin.php:407 +#: ../../mod/admin.php:420 msgid "Policies" msgstr "" -#: ../../mod/admin.php:408 +#: ../../mod/admin.php:421 msgid "Advanced" msgstr "" -#: ../../mod/admin.php:412 ../../addon/statusnet/statusnet.php:552 +#: ../../mod/admin.php:425 ../../addon/statusnet/statusnet.php:552 msgid "Site name" msgstr "" -#: ../../mod/admin.php:413 +#: ../../mod/admin.php:426 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:414 +#: ../../mod/admin.php:427 msgid "System language" msgstr "" -#: ../../mod/admin.php:415 +#: ../../mod/admin.php:428 msgid "System theme" msgstr "" -#: ../../mod/admin.php:415 +#: ../../mod/admin.php:428 msgid "" "Default system theme - may be over-ridden by user profiles - change theme settings" msgstr "" -#: ../../mod/admin.php:416 +#: ../../mod/admin.php:429 msgid "SSL link policy" msgstr "" -#: ../../mod/admin.php:416 +#: ../../mod/admin.php:429 msgid "Determines whether generated links should be forced to use SSL" msgstr "" -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:430 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:417 +#: ../../mod/admin.php:430 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:419 +#: ../../mod/admin.php:432 msgid "Register policy" msgstr "" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:433 msgid "Register text" msgstr "" -#: ../../mod/admin.php:420 +#: ../../mod/admin.php:433 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:434 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:421 +#: ../../mod/admin.php:434 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:435 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:422 +#: ../../mod/admin.php:435 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:436 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:423 +#: ../../mod/admin.php:436 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:437 msgid "Block public" msgstr "" -#: ../../mod/admin.php:424 +#: ../../mod/admin.php:437 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:438 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:438 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:439 msgid "Global directory update URL" msgstr "" -#: ../../mod/admin.php:426 +#: ../../mod/admin.php:439 msgid "" "URL to update the global directory. If this is not set, the global directory " "is completely unavailable to the application." msgstr "" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:441 msgid "Block multiple registrations" msgstr "" -#: ../../mod/admin.php:428 +#: ../../mod/admin.php:441 msgid "Disallow users to register additional accounts for use as pages." msgstr "" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:442 msgid "OpenID support" msgstr "" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:442 msgid "OpenID support for registration and logins." msgstr "" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:443 msgid "Fullname check" msgstr "" -#: ../../mod/admin.php:430 +#: ../../mod/admin.php:443 msgid "" "Force users to register with a space between firstname and lastname in Full " "name, as an antispam measure" msgstr "" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:444 msgid "UTF-8 Regular expressions" msgstr "" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:444 msgid "Use PHP UTF8 regular expressions" msgstr "" -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:445 msgid "Show Community Page" msgstr "" -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:445 msgid "" "Display a Community page showing all recent public postings on this site." msgstr "" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:446 msgid "Enable OStatus support" msgstr "" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:446 msgid "" "Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All " "communications in OStatus are public, so privacy warnings will be " "occasionally displayed." msgstr "" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:447 msgid "Enable Diaspora support" msgstr "" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:447 msgid "Provide built-in Diaspora network compatibility." msgstr "" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:448 msgid "Only allow Friendica contacts" msgstr "" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:448 msgid "" "All contacts must use Friendica protocols. All other built-in communication " "protocols disabled." msgstr "" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:449 msgid "Verify SSL" msgstr "" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:449 msgid "" "If you wish, you can turn on strict certificate checking. This will mean you " "cannot connect (at all) to self-signed SSL sites." msgstr "" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:450 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:451 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:452 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:439 +#: ../../mod/admin.php:452 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:440 +#: ../../mod/admin.php:453 msgid "Delivery interval" msgstr "" -#: ../../mod/admin.php:440 +#: ../../mod/admin.php:453 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../mod/admin.php:441 +#: ../../mod/admin.php:454 msgid "Poll interval" msgstr "" -#: ../../mod/admin.php:441 +#: ../../mod/admin.php:454 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:455 msgid "Maximum Load Average" msgstr "" -#: ../../mod/admin.php:442 +#: ../../mod/admin.php:455 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../mod/admin.php:456 +#: ../../mod/admin.php:469 msgid "Update has been marked successful" msgstr "" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:479 #, php-format msgid "Executing %s failed. Check system logs." msgstr "" -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:482 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:486 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:489 #, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../mod/admin.php:491 +#: ../../mod/admin.php:504 msgid "No failed updates." msgstr "" -#: ../../mod/admin.php:495 +#: ../../mod/admin.php:508 msgid "Failed Updates" msgstr "" -#: ../../mod/admin.php:496 +#: ../../mod/admin.php:509 msgid "" "This does not include updates prior to 1139, which did not return a status." msgstr "" -#: ../../mod/admin.php:497 +#: ../../mod/admin.php:510 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../mod/admin.php:498 +#: ../../mod/admin.php:511 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../mod/admin.php:523 +#: ../../mod/admin.php:536 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:530 +#: ../../mod/admin.php:543 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:569 +#: ../../mod/admin.php:582 #, php-format msgid "User '%s' deleted" msgstr "" -#: ../../mod/admin.php:577 +#: ../../mod/admin.php:590 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:577 +#: ../../mod/admin.php:590 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:641 +#: ../../mod/admin.php:654 msgid "select all" msgstr "" -#: ../../mod/admin.php:642 +#: ../../mod/admin.php:655 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:643 +#: ../../mod/admin.php:656 msgid "Request date" msgstr "" -#: ../../mod/admin.php:643 ../../mod/admin.php:652 +#: ../../mod/admin.php:656 ../../mod/admin.php:665 #: ../../include/contact_selectors.php:79 msgid "Email" msgstr "" -#: ../../mod/admin.php:644 +#: ../../mod/admin.php:657 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:646 +#: ../../mod/admin.php:659 msgid "Deny" msgstr "" -#: ../../mod/admin.php:652 +#: ../../mod/admin.php:665 msgid "Register date" msgstr "" -#: ../../mod/admin.php:652 +#: ../../mod/admin.php:665 msgid "Last login" msgstr "" -#: ../../mod/admin.php:652 +#: ../../mod/admin.php:665 msgid "Last item" msgstr "" -#: ../../mod/admin.php:652 +#: ../../mod/admin.php:665 msgid "Account" msgstr "" -#: ../../mod/admin.php:654 +#: ../../mod/admin.php:667 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:655 +#: ../../mod/admin.php:668 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:696 +#: ../../mod/admin.php:709 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:700 +#: ../../mod/admin.php:713 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:710 ../../mod/admin.php:908 +#: ../../mod/admin.php:723 ../../mod/admin.php:921 msgid "Disable" msgstr "" -#: ../../mod/admin.php:712 ../../mod/admin.php:910 +#: ../../mod/admin.php:725 ../../mod/admin.php:923 msgid "Enable" msgstr "" -#: ../../mod/admin.php:734 ../../mod/admin.php:939 +#: ../../mod/admin.php:747 ../../mod/admin.php:952 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:742 ../../mod/admin.php:949 +#: ../../mod/admin.php:755 ../../mod/admin.php:962 msgid "Author: " msgstr "" -#: ../../mod/admin.php:743 ../../mod/admin.php:950 +#: ../../mod/admin.php:756 ../../mod/admin.php:963 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:872 +#: ../../mod/admin.php:885 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:931 +#: ../../mod/admin.php:944 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:979 +#: ../../mod/admin.php:992 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:980 +#: ../../mod/admin.php:993 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1007 +#: ../../mod/admin.php:1020 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1063 +#: ../../mod/admin.php:1076 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1069 +#: ../../mod/admin.php:1082 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1070 +#: ../../mod/admin.php:1083 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1070 +#: ../../mod/admin.php:1083 msgid "" "Must be writable by web server. Relative to your Friendica top-level " "directory." msgstr "" -#: ../../mod/admin.php:1071 +#: ../../mod/admin.php:1084 msgid "Log level" msgstr "" -#: ../../mod/admin.php:1121 +#: ../../mod/admin.php:1134 msgid "Close" msgstr "" -#: ../../mod/admin.php:1127 +#: ../../mod/admin.php:1140 msgid "FTP Host" msgstr "" -#: ../../mod/admin.php:1128 +#: ../../mod/admin.php:1141 msgid "FTP Path" msgstr "" -#: ../../mod/admin.php:1129 +#: ../../mod/admin.php:1142 msgid "FTP User" msgstr "" -#: ../../mod/admin.php:1130 +#: ../../mod/admin.php:1143 msgid "FTP Password" msgstr "" @@ -4047,7 +4051,7 @@ msgstr "" msgid "Edit visibility" msgstr "" -#: ../../mod/filer.php:29 ../../include/conversation.php:925 +#: ../../mod/filer.php:29 ../../include/conversation.php:926 msgid "Save to Folder:" msgstr "" @@ -4650,7 +4654,7 @@ msgid "Forums" msgstr "" #: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87 -#: ../../include/contact_widgets.php:188 ../../include/conversation.php:469 +#: ../../include/contact_widgets.php:188 ../../include/conversation.php:470 #: ../../boot.php:517 msgid "show more" msgstr "" @@ -4695,7 +4699,7 @@ msgid "Latest likes" msgstr "" #: ../../addon/communityhome/communityhome.php:155 -#: ../../view/theme/diabook/theme.php:557 ../../include/text.php:1303 +#: ../../view/theme/diabook/theme.php:557 ../../include/text.php:1309 #: ../../include/conversation.php:45 ../../include/conversation.php:118 msgid "event" msgstr "" @@ -6333,51 +6337,51 @@ msgstr "" msgid "December" msgstr "" -#: ../../include/text.php:919 +#: ../../include/text.php:920 msgid "bytes" msgstr "" -#: ../../include/text.php:934 ../../include/text.php:949 +#: ../../include/text.php:940 ../../include/text.php:955 msgid "remove" msgstr "" -#: ../../include/text.php:934 ../../include/text.php:949 +#: ../../include/text.php:940 ../../include/text.php:955 msgid "[remove]" msgstr "" -#: ../../include/text.php:937 +#: ../../include/text.php:943 msgid "Categories:" msgstr "" -#: ../../include/text.php:952 +#: ../../include/text.php:958 msgid "Filed under:" msgstr "" -#: ../../include/text.php:968 ../../include/text.php:980 +#: ../../include/text.php:974 ../../include/text.php:986 msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1085 +#: ../../include/text.php:1091 msgid "default" msgstr "" -#: ../../include/text.php:1097 +#: ../../include/text.php:1103 msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1307 +#: ../../include/text.php:1313 msgid "activity" msgstr "" -#: ../../include/text.php:1309 +#: ../../include/text.php:1315 msgid "comment" msgstr "" -#: ../../include/text.php:1310 +#: ../../include/text.php:1316 msgid "post" msgstr "" -#: ../../include/text.php:1465 +#: ../../include/text.php:1471 msgid "Item filed" msgstr "" @@ -6951,30 +6955,30 @@ msgstr "" msgid "stopped following" msgstr "" -#: ../../include/Contact.php:203 ../../include/conversation.php:820 +#: ../../include/Contact.php:203 ../../include/conversation.php:821 msgid "View Status" msgstr "" -#: ../../include/Contact.php:204 ../../include/conversation.php:821 +#: ../../include/Contact.php:204 ../../include/conversation.php:822 msgid "View Profile" msgstr "" -#: ../../include/Contact.php:205 ../../include/conversation.php:822 +#: ../../include/Contact.php:205 ../../include/conversation.php:823 msgid "View Photos" msgstr "" #: ../../include/Contact.php:206 ../../include/Contact.php:219 -#: ../../include/conversation.php:823 +#: ../../include/conversation.php:824 msgid "Network Posts" msgstr "" #: ../../include/Contact.php:207 ../../include/Contact.php:219 -#: ../../include/conversation.php:824 +#: ../../include/conversation.php:825 msgid "Edit Contact" msgstr "" #: ../../include/Contact.php:208 ../../include/Contact.php:219 -#: ../../include/conversation.php:825 +#: ../../include/conversation.php:826 msgid "Send PM" msgstr "" @@ -6987,216 +6991,216 @@ msgstr "" msgid "%1$s marked %2$s's %3$s as favorite" msgstr "" -#: ../../include/conversation.php:320 ../../include/conversation.php:586 +#: ../../include/conversation.php:321 ../../include/conversation.php:587 msgid "Select" msgstr "" -#: ../../include/conversation.php:337 ../../include/conversation.php:679 -#: ../../include/conversation.php:680 +#: ../../include/conversation.php:338 ../../include/conversation.php:680 +#: ../../include/conversation.php:681 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:347 ../../include/conversation.php:691 +#: ../../include/conversation.php:348 ../../include/conversation.php:692 #, php-format msgid "%s from %s" msgstr "" -#: ../../include/conversation.php:362 +#: ../../include/conversation.php:363 msgid "View in context" msgstr "" -#: ../../include/conversation.php:468 +#: ../../include/conversation.php:469 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:532 +#: ../../include/conversation.php:533 msgid "like" msgstr "" -#: ../../include/conversation.php:533 +#: ../../include/conversation.php:534 msgid "dislike" msgstr "" -#: ../../include/conversation.php:535 +#: ../../include/conversation.php:536 msgid "Share this" msgstr "" -#: ../../include/conversation.php:535 +#: ../../include/conversation.php:536 msgid "share" msgstr "" -#: ../../include/conversation.php:559 +#: ../../include/conversation.php:560 msgid "Bold" msgstr "" -#: ../../include/conversation.php:560 +#: ../../include/conversation.php:561 msgid "Italic" msgstr "" -#: ../../include/conversation.php:561 +#: ../../include/conversation.php:562 msgid "Underline" msgstr "" -#: ../../include/conversation.php:562 +#: ../../include/conversation.php:563 msgid "Quote" msgstr "" -#: ../../include/conversation.php:563 +#: ../../include/conversation.php:564 msgid "Code" msgstr "" -#: ../../include/conversation.php:564 +#: ../../include/conversation.php:565 msgid "Image" msgstr "" -#: ../../include/conversation.php:565 +#: ../../include/conversation.php:566 msgid "Link" msgstr "" -#: ../../include/conversation.php:566 +#: ../../include/conversation.php:567 msgid "Video" msgstr "" -#: ../../include/conversation.php:599 +#: ../../include/conversation.php:600 msgid "add star" msgstr "" -#: ../../include/conversation.php:600 +#: ../../include/conversation.php:601 msgid "remove star" msgstr "" -#: ../../include/conversation.php:601 +#: ../../include/conversation.php:602 msgid "toggle star status" msgstr "" -#: ../../include/conversation.php:604 +#: ../../include/conversation.php:605 msgid "starred" msgstr "" -#: ../../include/conversation.php:605 +#: ../../include/conversation.php:606 msgid "add tag" msgstr "" -#: ../../include/conversation.php:609 +#: ../../include/conversation.php:610 msgid "save to folder" msgstr "" -#: ../../include/conversation.php:681 +#: ../../include/conversation.php:682 msgid "to" msgstr "" -#: ../../include/conversation.php:682 +#: ../../include/conversation.php:683 msgid "Wall-to-Wall" msgstr "" -#: ../../include/conversation.php:683 +#: ../../include/conversation.php:684 msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/conversation.php:728 +#: ../../include/conversation.php:729 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:879 +#: ../../include/conversation.php:880 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:879 +#: ../../include/conversation.php:880 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:883 +#: ../../include/conversation.php:884 #, php-format msgid "%2$d people like this." msgstr "" -#: ../../include/conversation.php:885 +#: ../../include/conversation.php:886 #, php-format msgid "%2$d people don't like this." msgstr "" -#: ../../include/conversation.php:891 +#: ../../include/conversation.php:892 msgid "and" msgstr "" -#: ../../include/conversation.php:894 +#: ../../include/conversation.php:895 #, php-format msgid ", and %d other people" msgstr "" -#: ../../include/conversation.php:895 +#: ../../include/conversation.php:896 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:895 +#: ../../include/conversation.php:896 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:920 +#: ../../include/conversation.php:921 msgid "Visible to everybody" msgstr "" -#: ../../include/conversation.php:922 +#: ../../include/conversation.php:923 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:923 +#: ../../include/conversation.php:924 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:924 +#: ../../include/conversation.php:925 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:926 +#: ../../include/conversation.php:927 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:969 +#: ../../include/conversation.php:970 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:971 +#: ../../include/conversation.php:972 msgid "attach file" msgstr "" -#: ../../include/conversation.php:973 +#: ../../include/conversation.php:974 msgid "web link" msgstr "" -#: ../../include/conversation.php:974 +#: ../../include/conversation.php:975 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:975 +#: ../../include/conversation.php:976 msgid "video link" msgstr "" -#: ../../include/conversation.php:976 +#: ../../include/conversation.php:977 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:977 +#: ../../include/conversation.php:978 msgid "audio link" msgstr "" -#: ../../include/conversation.php:979 +#: ../../include/conversation.php:980 msgid "set location" msgstr "" -#: ../../include/conversation.php:981 +#: ../../include/conversation.php:982 msgid "clear location" msgstr "" -#: ../../include/conversation.php:988 +#: ../../include/conversation.php:989 msgid "permissions" msgstr "" diff --git a/view/head.tpl b/view/head.tpl index dfb626ebc9..0fffc13443 100644 --- a/view/head.tpl +++ b/view/head.tpl @@ -29,6 +29,7 @@ + +
+
From 8ffb65ceef4de1b1088ace577682812cba6016af Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 22 May 2012 22:34:35 -0700 Subject: [PATCH 31/50] event calendar theming --- view/theme/slackr/style.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css index 41f4e58eea..635f5bcf0e 100644 --- a/view/theme/slackr/style.css +++ b/view/theme/slackr/style.css @@ -40,6 +40,9 @@ nav #site-location { right: 36px; } +.fc-event-skin { + background-color: #3465a4 !important; +} .wall-item-photo, .photo, .contact-block-img, .my-comment-photo { border-radius: 3px; -moz-border-radius: 3px; From 61dba985c14ebcfd20d18b579aee9b781f98bc23 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 23 May 2012 01:01:04 -0700 Subject: [PATCH 32/50] photo rotation --- include/Photo.php | 6 ++++ mod/photos.php | 58 ++++++++++++++++++++++++++++++- view/photo_edit.tpl | 5 +++ view/theme/duepuntozero/style.css | 10 ++++-- 4 files changed, 75 insertions(+), 4 deletions(-) diff --git a/include/Photo.php b/include/Photo.php index 4d02b5c651..fce5599996 100644 --- a/include/Photo.php +++ b/include/Photo.php @@ -87,6 +87,12 @@ class Photo { } + public function rotate($degrees) { + $this->image = imagerotate($this->image,$degrees,0); + $this->width = imagesx($this->image); + $this->height = imagesy($this->image); + } + public function scaleImageUp($min) { diff --git a/mod/photos.php b/mod/photos.php index 082947bdbf..3ce6f9934d 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -287,6 +287,7 @@ function photos_post(&$a) { if(($a->argc > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false)) || (x($_POST,'albname') !== false)) { + $desc = ((x($_POST,'desc')) ? notags(trim($_POST['desc'])) : ''); $rawtags = ((x($_POST,'newtag')) ? notags(trim($_POST['newtag'])) : ''); $item_id = ((x($_POST,'item_id')) ? intval($_POST['item_id']) : 0); @@ -300,7 +301,61 @@ function photos_post(&$a) { if(! strlen($albname)) $albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y'); + + + if((x($_POST,'rotate') !== false) && (intval($_POST['rotate']) == 1)) { + logger('rotate'); + + $r = q("select * from photo where `resource-id` = '%s' and uid = %d and scale = 0 limit 1", + dbesc($resource_id), + intval($page_owner_uid) + ); + if(count($r)) { + $ph = new Photo($r[0]['data']); + if($ph->is_valid()) { + $ph->rotate(270); + + $width = $ph->getWidth(); + $height = $ph->getHeight(); + + $x = q("update photo set data = '%s', height = %d, width = %d where `resource-id` = '%s' and uid = %d and scale = 0 limit 1", + dbesc($ph->imageString()), + intval($height), + intval($width), + dbesc($resource_id), + intval($page_owner_uid) + ); + + if($width > 640 || $height > 640) { + $ph->scaleImage(640); + $width = $ph->getWidth(); + $height = $ph->getHeight(); + $x = q("update photo set data = '%s', height = %d, width = %d where `resource-id` = '%s' and uid = %d and scale = 1 limit 1", + dbesc($ph->imageString()), + intval($height), + intval($width), + dbesc($resource_id), + intval($page_owner_uid) + ); + } + + if($width > 320 || $height > 320) { + $ph->scaleImage(320); + $width = $ph->getWidth(); + $height = $ph->getHeight(); + + $x = q("update photo set data = '%s', height = %d, width = %d where `resource-id` = '%s' and uid = %d and scale = 2 limit 1", + dbesc($ph->imageString()), + intval($height), + intval($width), + dbesc($resource_id), + intval($page_owner_uid) + ); + } + } + } + } $p = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ORDER BY `scale` DESC", dbesc($resource_id), @@ -1105,7 +1160,7 @@ function photos_content(&$a) { $photo = array( 'href' => $a->get_baseurl() . '/photo/' . $hires['resource-id'] . '-' . $hires['scale'] . '.jpg', 'title'=> t('View Full Size'), - 'src' => $a->get_baseurl() . '/photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.jpg' + 'src' => $a->get_baseurl() . '/photo/' . $lores['resource-id'] . '-' . $lores['scale'] . '.jpg' . '?f=&_u=' . datetime_convert('','','','ymdhis') ); if($nextlink) @@ -1185,6 +1240,7 @@ function photos_content(&$a) { $edit_tpl = get_markup_template('photo_edit.tpl'); $edit = replace_macros($edit_tpl, array( '$id' => $ph[0]['id'], + '$rotate' => t('Rotate CW'), '$album' => template_escape($ph[0]['album']), '$newalbum' => t('New album name'), '$nickname' => $a->data['user']['nickname'], diff --git a/view/photo_edit.tpl b/view/photo_edit.tpl index 9950cc4aca..f6059a7ecc 100644 --- a/view/photo_edit.tpl +++ b/view/photo_edit.tpl @@ -17,6 +17,11 @@
+
+
$rotate
+ +
+
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index c556dcead4..fca935dee5 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2118,7 +2118,7 @@ aside input[type='text'] { margin-bottom: 15px; } -#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label { +#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label, #photo-edit-rotate-label { float: left; width: 150px; } @@ -2127,7 +2127,7 @@ aside input[type='text'] { margin-bottom: 15px; } -#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname { +#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname, #photo-edit-rotate { float: left; margin-bottom: 25px; } @@ -2138,10 +2138,14 @@ aside input[type='text'] { margin-bottom: 25px; } -#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end { +#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end, #photo-edit-rotate-end { clear: both; } +#photo-edit-rotate-end { + margin-bottom: 15px; +} + #photo-edit-delete-button { margin-left: 200px; } From 325343a4922543a0043b91054984354624cf5504 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 23 May 2012 07:38:31 -0400 Subject: [PATCH 33/50] Update install wizard - writable .htconfig.php not required - add test for working .htaccess/mod_rewrite configuration - fix last pass: create tables, eventually show config text and print a "What next" section --- images/icons.png | Bin 12389 -> 12608 bytes mod/install.php | 87 ++++++++++++++++++------------ view/install_checks.tpl | 6 +-- view/theme/duepuntozero/style.css | 1 + 4 files changed, 56 insertions(+), 38 deletions(-) diff --git a/images/icons.png b/images/icons.png index dd3af3aee3b9c2e1269e9e82c8c9742bb988df15..0ff5c430c5c3a33b92556249ccb6af1b80f84f8a 100644 GIT binary patch literal 12608 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 X1do|Pbpdho00000NkvXXu0mjfc&TV* diff --git a/mod/install.php b/mod/install.php index 6f5552076c..1bdb792a9c 100644 --- a/mod/install.php +++ b/mod/install.php @@ -4,6 +4,12 @@ $install_wizard_pass=1; function install_init(&$a){ + + // $baseurl/install/testrwrite to test if rewite in .htaccess is working + if ($a->argc==2 && $a->argv[1]=="testrewrite") { + echo "ok"; + killme(); + } global $install_wizard_pass; if (x($_POST,'pass')) $install_wizard_pass = intval($_POST['pass']); @@ -110,14 +116,7 @@ function install_content(&$a) { $wizard_status = ""; $install_title = t('Friendica Social Communications Server - Setup'); - if(x($a->data,'txt') && strlen($a->data['txt'])) { - $tpl = get_markup_template('install.tpl'); - return replace_macros($tpl, array( - '$title' => $install_title, - '$pass' => t('Database connection'), - '$text' => manual_config($a), - )); - } + if(x($a->data,'db_conn_failed')) { $install_wizard_pass = 2; @@ -128,39 +127,20 @@ function install_content(&$a) { $wizard_status = t('Could not create table.'); } + $db_return_text=""; if(x($a->data,'db_installed')) { $txt = '

'; $txt .= t('Your Friendica site database has been installed.') . EOL; - $txt .= t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') . EOL ; - $txt .= t('Please see the file "INSTALL.txt".') . EOL ; - $txt .= '
'; - $txt .= '' . t('Proceed to registration') . '' ; - $txt .= '

'; - - $tpl = get_markup_template('install.tpl'); - return replace_macros($tpl, array( - '$title' => $install_title, - '$pass' => t('Proceed with Installation'), - '$text' => $txt, - )); - + $db_return_text .= $txt; } if(x($a->data,'db_failed')) { $txt = t('You may need to import the file "database.sql" manually using phpmyadmin or mysql.') . EOL; $txt .= t('Please see the file "INSTALL.txt".') . EOL ."
" ; $txt .= "
".$a->data['db_failed'] . "
". EOL ; - - $tpl = get_markup_template('install.tpl'); - return replace_macros($tpl, array( - '$title' => $install_title, - '$pass' => t('Database connection'), - '$status' => t('Database import failed.'), - '$text' => $txt, - )); - + $db_return_text .= $txt; } - + if($db && $db->connected) { $r = q("SELECT COUNT(*) as `total` FROM `user`"); if($r && count($r) && $r[0]['total']) { @@ -174,6 +154,19 @@ function install_content(&$a) { } } + if(x($a->data,'txt') && strlen($a->data['txt'])) { + $tpl = get_markup_template('install.tpl'); + $db_return_text .= manual_config($a); + } + + if ($db_return_text!="") { + return replace_macros($tpl, array( + '$title' => $install_title, + '$pass' => "", + '$text' => $db_return_text . what_next(), + )); + } + switch ($install_wizard_pass){ case 1: { // System check @@ -191,7 +184,8 @@ function install_content(&$a) { check_php($phpath, $checks); - + check_htaccess($checks); + function check_passed($v, $c){ if ($c['required']) $v = $v && $c['status']; @@ -422,14 +416,26 @@ function check_htconfig(&$checks) { $status=false; $help = t('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.') .EOL; $help .= t('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.').EOL; - $help .= t('Please check with your site documentation or support people to see if this situation can be corrected.').EOL; - $help .= t('If not, you may be required to perform a manual installation. Please see the file "INSTALL.txt" for instructions.').EOL; + $help .= t('At the end of this procedure, we will give you a text to save in a file named .htconfig.php in your Friendica top folder.').EOL; + $help .= t('You can alternatively skip this procedure and perform a manual installation. Please see the file "INSTALL.txt" for instructions.').EOL; } - check_add($checks, t('.htconfig.php is writable'), $status, true, $help); + check_add($checks, t('.htconfig.php is writable'), $status, false, $help); } +function check_htaccess(&$checks) { + $a = get_app(); + $status = true; + $help = ""; + $test = fetch_url($a->get_baseurl()."/install/testrewrite"); + if ($test!="ok") { + $status = false; + $help = t('Url rewrite in .htconfig is not working. Check your server configuration.'); + } + check_add($checks, t('Url rewrite is working'), $status, true, $help); +} + function manual_config(&$a) { $data = htmlentities($a->data['txt']); @@ -465,5 +471,16 @@ function load_database($db) { return $errors; } +function what_next() { + $a = get_app(); + $baseurl = $a->get_baseurl(); + return + t('

What next

') + ."

".t('IMPORTANT: You will need to [manually] setup a scheduled task for the poller.') + .t('Please see the file "INSTALL.txt".') + ."

" + .t("Go to your new Firendica node registration page and register as new user. Remember to use the same email you have entered as administrator email. This will allow you to enter the site admin panel.") + ."

"; +} diff --git a/view/install_checks.tpl b/view/install_checks.tpl index a1a75ade60..8a76c454c2 100644 --- a/view/install_checks.tpl +++ b/view/install_checks.tpl @@ -3,9 +3,9 @@
{{ for $checks as $check }} - + {{if $check.help }} - + {{endif}} {{ endfor }}
$check.title {{if $check.required}}(required){{endif}}
$check.title {{if $check.required}}(required){{endif}}
$check.help
$check.help
@@ -19,6 +19,6 @@ {{ else }} - + {{ endif }}
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index fca935dee5..f984cab689 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -2950,6 +2950,7 @@ aside input[type='text'] { .starred { background-position: -16px -48px; } .unstarred { background-position: -32px -48px; } .tagged { background-position: -48px -48px; } +.yellow { background-position: -64px -48px; } .filer-icon { From 789063da399675575f61e150f11dbe534d7db3c5 Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Wed, 23 May 2012 15:58:22 -0400 Subject: [PATCH 34/50] add a placeholder attribute on search-text; dispy fixes Signed-off-by: Simon L'nu --- include/text.php | 2 +- view/theme/darkbubble/unsupported | 0 view/theme/dispy/dark/style.css | 18 ++++++++++-------- view/theme/dispy/dark/style.less | 31 +++++++++++++++++++++---------- view/theme/dispy/group_side.tpl | 5 ++--- view/theme/dispy/light/style.css | 6 +++--- view/theme/dispy/light/style.less | 31 +++++++++++++++++++++---------- 7 files changed, 58 insertions(+), 35 deletions(-) delete mode 100644 view/theme/darkbubble/unsupported diff --git a/include/text.php b/include/text.php index e93c24ef4c..d6a9ef5d3a 100644 --- a/include/text.php +++ b/include/text.php @@ -646,7 +646,7 @@ function search($s,$id='search-box',$url='/search',$save = false) { $a = get_app(); $o = '
'; $o .= '
'; - $o .= ''; + $o .= ''; $o .= ''; if($save) $o .= ''; diff --git a/view/theme/darkbubble/unsupported b/view/theme/darkbubble/unsupported deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css index 6f29ef1f45..612c24f5ca 100644 --- a/view/theme/dispy/dark/style.css +++ b/view/theme/dispy/dark/style.css @@ -58,7 +58,7 @@ h6{font-size:xx-small;} #articlemain{width:100%;height:100%;margin:0 auto;} .button{color:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#eeeecc;font-weight:bold;} #profile-listing-desc a{color:#eeeecc;font-weight:bold;} -[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:3px outset #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} +[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:3px ridge #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;} #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;} .intro-approve-as-friend-desc{margin-top:10px;} .intro-desc{margin-bottom:20px;font-weight:bold;} @@ -121,7 +121,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #intro-update{background-position:-120px 0px;} #lang-select-icon{cursor:pointer;position:fixed;left:28px;bottom:6px;z-index:10;} #language-selector{position:fixed;bottom:2px;left:52px;z-index:10;} -.menu-popup{position:absolute;display:none;background:white;color:#2e2f2e;margin:0px;padding:0px;font-size:small;line-height:1.1;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;} +.menu-popup{position:absolute;display:none;background:white;color:#2e2f2e;margin:0px;padding:0px;font-size:small;line-height:1.2;border:3px solid #88a9d2;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;z-index:100000;-moz-box-shadow:5px 5px 5px 0px #111111;-o-box-shadow:5px 5px 5px 0px #111111;-webkit-box-shadow:5px 5px 5px 0px #111111;-ms-box-shadow:5px 5px 5px 0px #111111;box-shadow:5px 5px 5px 0px #111111;}.menu-popup a{display:block;color:#2e2f2e;padding:5px 10px;text-decoration:none;}.menu-popup a:hover{color:#eeeecc;background-color:#88a9d2;} .menu-popup .menu-sep{border-top:1px solid #4e4f4e;} .menu-popup li{float:none;overflow:auto;height:auto;display:block;}.menu-popup li img{float:left;width:16px;height:16px;padding-right:5px;} .menu-popup .empty{padding:5px;text-align:center;color:#9ea8ac;} @@ -135,7 +135,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm #asidemain{float:left;font-size:small;margin:20px 0 20px 35px;width:25%;display:inline;} #asideright,#asideleft{display:none;} .vcard .fn{font-size:1.5em;font-weight:bold;border-bottom:1px solid #638ec4;padding-bottom:3px;} -.vcard #profile-photo-wrapper{margin:20px;}.vcard #profile-photo-wrapper img{-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;} +.vcard #profile-photo-wrapper{margin:20px 0;background-color:#555753;padding:5px;width:175px;height:175px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;} #asidemain h4{font-size:1.2em;} #asidemain #viewcontacts{text-align:right;} #asidemain #contact-block{width:99%;}#asidemain #contact-block .contact-block-content{width:99%;}#asidemain #contact-block .contact-block-content .contact-block-div{float:left;margin:0 5px 5px 0;width:50px;height:50px;padding:3px;position:relative;} @@ -389,21 +389,23 @@ div[id$="wrapper"]{height:100%;}div[id$="wrapper"] br{clear:left;} .fc-state-highlight{background:#eeeecc;color:#2e2f2e;} .directory-item{float:left;margin:0 5px 4px 0;padding:3px;width:180px;height:250px;position:relative;} #group-sidebar{margin-bottom:10px;} -.group-selected,.nets-selected,.fileas-selected{background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} -.group-selected a,.nets-selected a,.fileas-selected a{color:#2e2f2e;text-decoration:none;} +.categories-selected,.group-selected,.nets-selected,.fileas-selected{color:#2e2f2e;background:#eeeecc;color:#2e2f2e;border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.categories-selected:hover,.group-selected:hover,.nets-selected:hover,.fileas-selected:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} +.categories-selected a,.group-selected a,.nets-selected a,.fileas-selected a{color:#2e2f2e;text-decoration:none;} .groupsideedit{margin-right:10px;} #sidebar-group-ul{padding-left:0;} #sidebar-group-list{margin:0 0 5px 0;}#sidebar-group-list li{margin-top:10px;} #sidebar-group-list .icon{display:inline-block;width:12px;height:12px;} -.sidebar-group-element{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} +.sidebar-group-element{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;color:#eeeecc;}.sidebar-group-element:active,.sidebar-group-element:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} .sidebar-group-element a{border:0;text-decoration:none;} +.sidebar-group-element.group-selected{color:#2e2f2e;} #sidebar-new-group{margin:auto;display:inline-block;color:#eeeeee;text-decoration:none;text-align:center;} #peoplefind-sidebar form{margin-bottom:10px;} #sidebar-new-group:hover{} #sidebar-new-group:active{position:relative;top:1px;} #side-peoplefind-url{border:1px solid #999999;margin-right:3px;width:75%;} -.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.nets-ul li{margin:10px 0 0;} -.nets-link,.nets-all{margin-left:0px;} +.categories-ul,.nets-ul{margin:0px;padding:0px;list-style:none;list-style-position:inside;}.categories-ul li,.nets-ul li{margin:10px 0 0;} +.categories-link,.nets-link,.nets-all{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin-left:0px;}.categories-link:active,.nets-link:active,.nets-all:active,.categories-link:hover,.nets-link:hover,.nets-all:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;} +.categories-link a,.nets-link a,.nets-all a{border:0;text-decoration:none;} #netsearch-box{margin:20px 0px 30px;width:135px;}#netsearch-box #search-submit{margin:5px 5px 0px 0px;} #pending-update{float:right;color:white;font-weight:bold;background-color:red;padding:0 0.3em;} .admin.linklist{border:0;padding:0;} diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less index 000918a9b5..51bf7ca300 100644 --- a/view/theme/dispy/dark/style.less +++ b/view/theme/dispy/dark/style.less @@ -312,7 +312,7 @@ h6 { [id$="-desc"] { color: @main_colour; background: @bg_colour; - .borders(3px, outset, @main_colour); + .borders(3px, ridge, @main_colour); .rounded_corners; // .box_shadow(3px, 3px, 5px); margin: 3px 10px 7px 0; @@ -510,7 +510,8 @@ nav .nav-link { background-position: -44px -190px; } } -#nav-login-link, #nav-logout-link { +#nav-login-link, +#nav-logout-link { background-position: 0 -88px; &:hover { background-position: -22px -88px; @@ -669,11 +670,10 @@ nav #nav-notifications-linkmenu { #mini-search-text { background: white; color: @bg_colour; - margin: 8px; } #search-text { .borders(1px, solid, @main_alt_colour); - margin: 8px 0; + margin: 5px 0; } #mini-search-text { font-size: 8pt; @@ -771,7 +771,7 @@ nav #nav-notifications-linkmenu { margin: 0px; padding: 0px; font-size: small; - line-height: 1.1; + line-height: 1.2; .borders(3px, solid, @link_colour); .rounded_corners; z-index: 100000; @@ -880,10 +880,12 @@ nav #nav-notifications-linkmenu { padding-bottom: 3px; } #profile-photo-wrapper { - margin: 20px; - img { - .box_shadow(3px, 3px, 10px, 0); - } + margin: 20px 0; + background-color: @menu_bg_colour; + padding: 5px; + .box(175px, 175px); + .rounded_corners; + .box_shadow(3px, 3px, 10px, 0); } } #asidemain { @@ -2333,11 +2335,12 @@ div { #group-sidebar { margin-bottom: 10px; } +.categories-selected, .group-selected, .nets-selected, .fileas-selected { // padding: 4px; - // color: @bg_colour; + color: @bg_colour; // background: @main_colour; // .borders(1px, solid, @link_colour); .multibutton_active; @@ -2369,6 +2372,10 @@ div { .sidebar-group-element { .multibutton; .rounded_corners; + color: @main_colour; + &.group-selected { + color: @bg_colour; + } } #sidebar-new-group { margin: auto; @@ -2396,14 +2403,18 @@ div { margin-right: 3px; width: 75%; } +.categories-ul, .nets-ul { .list_reset; li { margin: 10px 0 0; } } +.categories-link, .nets-link, .nets-all { + .multibutton; + .rounded_corners; margin-left: 0px; } #netsearch-box { diff --git a/view/theme/dispy/group_side.tpl b/view/theme/dispy/group_side.tpl index 10ecec2e85..be8e23de09 100644 --- a/view/theme/dispy/group_side.tpl +++ b/view/theme/dispy/group_side.tpl @@ -5,10 +5,9 @@