[geeklog-cvs] geeklog: Merge from HEAD to password_update
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Thu Feb 9 00:11:32 EST 2012
changeset 8489:79b7561187a2
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/79b7561187a2
user: vinny
date: Wed Feb 08 22:09:28 2012 -0700
description:
Merge from HEAD to password_update
diffstat:
language/afrikaans.php | 1 +
language/afrikaans_utf-8.php | 1 +
language/bosnian.php | 1 +
language/bosnian_utf-8.php | 1 +
language/bulgarian.php | 1 +
language/bulgarian_utf-8.php | 1 +
language/catalan.php | 1 +
language/catalan_utf-8.php | 1 +
language/chinese_simplified_utf-8.php | 1 +
language/chinese_traditional_utf-8.php | 1 +
language/croatian.php | 1 +
language/croatian_utf-8.php | 1 +
language/czech.php | 1 +
language/czech_utf-8.php | 1 +
language/danish.php | 1 +
language/danish_utf-8.php | 1 +
language/dutch.php | 1 +
language/dutch_utf-8.php | 1 +
language/english.php | 3 +
language/english_utf-8.php | 3 +
language/estonian.php | 1 +
language/estonian_utf-8.php | 1 +
language/farsi_utf-8.php | 1 +
language/finnish.php | 1 +
language/finnish_utf-8.php | 1 +
language/french_canada.php | 1 +
language/french_canada_utf-8.php | 1 +
language/german.php | 1 +
language/german_formal.php | 1 +
language/german_formal_utf-8.php | 1 +
language/german_utf-8.php | 1 +
language/hebrew_utf-8.php | 1 +
language/hellenic.php | 1 +
language/hellenic_utf-8.php | 1 +
language/indonesian.php | 1 +
language/indonesian_utf-8.php | 1 +
language/japanese_utf-8.php | 1 +
language/korean.php | 1 +
language/korean_utf-8.php | 1 +
language/norwegian.php | 1 +
language/norwegian_utf-8.php | 1 +
language/polish.php | 1 +
language/polish_utf-8.php | 1 +
language/portuguese.php | 1 +
language/portuguese_brazil.php | 1 +
language/portuguese_brazil_utf-8.php | 1 +
language/portuguese_utf-8.php | 1 +
language/romanian.php | 1 +
language/romanian_utf-8.php | 1 +
language/russian.php | 1 +
language/russian_utf-8.php | 1 +
language/serbian.php | 1 +
language/serbian_utf-8.php | 1 +
language/slovak.php | 1 +
language/slovak_utf-8.php | 1 +
language/slovenian.php | 1 +
language/slovenian_utf-8.php | 1 +
language/spanish.php | 1 +
language/spanish_argentina.php | 1 +
language/spanish_argentina_utf-8.php | 1 +
language/spanish_utf-8.php | 1 +
language/swedish.php | 1 +
language/swedish_utf-8.php | 1 +
language/turkish.php | 1 +
language/turkish_utf-8.php | 1 +
language/ukrainian.php | 1 +
language/ukrainian_koi8-u.php | 1 +
language/ukrainian_utf-8.php | 1 +
public_html/admin/configuration_validation.php | 1 +
public_html/admin/install/config-install.php | 3 +
public_html/admin/plugins/polls/index.php | 15 ++++-
public_html/docs/english/config.html | 11 +++
public_html/layout/professional/functions.php | 3 +
public_html/layout/professional/preferences/deleteaccount.thtml | 2 +-
public_html/layout/professional/profiles/contactauthorform.thtml | 2 +-
public_html/layout/professional/profiles/contactuserform.thtml | 2 +-
public_html/layout/professional_css/functions.php | 3 +
public_html/layout/professional_css/profiles/contactauthorform.thtml | 4 +-
public_html/layout/professional_css/profiles/contactuserform.thtml | 4 +-
public_html/lib-common.php | 20 ++++++-
public_html/profiles.php | 28 ++++++---
public_html/usersettings.php | 15 +++--
sql/updates/mssql_1.8.1_to_1.9.0.php | 7 ++
sql/updates/mysql_1.8.1_to_1.9.0.php | 9 ++-
sql/updates/pgsql_1.8.1_to_1.9.0.php | 9 ++-
system/classes/scripts.class.php | 15 ++--
system/lib-topic.php | 11 +++-
87 files changed, 197 insertions(+), 39 deletions(-)
diffs (truncated from 1239 to 300 lines):
diff -r 99f332cec84c -r 79b7561187a2 language/afrikaans.php
--- a/language/afrikaans.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/afrikaans.php Wed Feb 08 22:09:28 2012 -0700
@@ -1884,6 +1884,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
diff -r 99f332cec84c -r 79b7561187a2 language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/afrikaans_utf-8.php Wed Feb 08 22:09:28 2012 -0700
@@ -1884,6 +1884,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
diff -r 99f332cec84c -r 79b7561187a2 language/bosnian.php
--- a/language/bosnian.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/bosnian.php Wed Feb 08 22:09:28 2012 -0700
@@ -1888,6 +1888,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
diff -r 99f332cec84c -r 79b7561187a2 language/bosnian_utf-8.php
--- a/language/bosnian_utf-8.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/bosnian_utf-8.php Wed Feb 08 22:09:28 2012 -0700
@@ -1888,6 +1888,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
diff -r 99f332cec84c -r 79b7561187a2 language/bulgarian.php
--- a/language/bulgarian.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/bulgarian.php Wed Feb 08 22:09:28 2012 -0700
@@ -1884,6 +1884,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
diff -r 99f332cec84c -r 79b7561187a2 language/bulgarian_utf-8.php
--- a/language/bulgarian_utf-8.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/bulgarian_utf-8.php Wed Feb 08 22:09:28 2012 -0700
@@ -1884,6 +1884,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
diff -r 99f332cec84c -r 79b7561187a2 language/catalan.php
--- a/language/catalan.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/catalan.php Wed Feb 08 22:09:28 2012 -0700
@@ -1882,6 +1882,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
diff -r 99f332cec84c -r 79b7561187a2 language/catalan_utf-8.php
--- a/language/catalan_utf-8.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/catalan_utf-8.php Wed Feb 08 22:09:28 2012 -0700
@@ -1882,6 +1882,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
diff -r 99f332cec84c -r 79b7561187a2 language/chinese_simplified_utf-8.php
--- a/language/chinese_simplified_utf-8.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/chinese_simplified_utf-8.php Wed Feb 08 22:09:28 2012 -0700
@@ -1887,6 +1887,7 @@
'maximagesperarticle' => 'æ¯æ–‡ç« 的最多图åƒé™åº¦',
'limitnews' => 'æ¯é¡µæœ€å¤šæ–‡ç« 显示',
'minnews' => 'æ¯é¡µæœ€å°‘æ–‡ç« æ˜¾ç¤º',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => '显示 "æ交è€
"?',
'hideviewscount' => 'éšè—æ–‡ç« è§‚æ•°?',
'hideemailicon' => 'éšè—ç”µé‚®å›¾æ ‡?',
diff -r 99f332cec84c -r 79b7561187a2 language/chinese_traditional_utf-8.php
--- a/language/chinese_traditional_utf-8.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/chinese_traditional_utf-8.php Wed Feb 08 22:09:28 2012 -0700
@@ -1887,6 +1887,7 @@
'maximagesperarticle' => 'æ¯æ–‡ç« 的最多圖åƒé™åº¦',
'limitnews' => 'æ¯é æœ€å¤šæ–‡ç« é¡¯ç¤º',
'minnews' => 'æ¯é æœ€å°‘æ–‡ç« é¡¯ç¤º',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => '顯示 "æ交è€
"?',
'hideviewscount' => 'éš±è—æ–‡ç« è§€æ•¸?',
'hideemailicon' => 'éš±è—電郵圖示?',
diff -r 99f332cec84c -r 79b7561187a2 language/croatian.php
--- a/language/croatian.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/croatian.php Wed Feb 08 22:09:28 2012 -0700
@@ -1884,6 +1884,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
diff -r 99f332cec84c -r 79b7561187a2 language/croatian_utf-8.php
--- a/language/croatian_utf-8.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/croatian_utf-8.php Wed Feb 08 22:09:28 2012 -0700
@@ -1886,6 +1886,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
diff -r 99f332cec84c -r 79b7561187a2 language/czech.php
--- a/language/czech.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/czech.php Wed Feb 08 22:09:28 2012 -0700
@@ -1883,6 +1883,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
diff -r 99f332cec84c -r 79b7561187a2 language/czech_utf-8.php
--- a/language/czech_utf-8.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/czech_utf-8.php Wed Feb 08 22:09:28 2012 -0700
@@ -1883,6 +1883,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
diff -r 99f332cec84c -r 79b7561187a2 language/danish.php
--- a/language/danish.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/danish.php Wed Feb 08 22:09:28 2012 -0700
@@ -1883,6 +1883,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
diff -r 99f332cec84c -r 79b7561187a2 language/danish_utf-8.php
--- a/language/danish_utf-8.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/danish_utf-8.php Wed Feb 08 22:09:28 2012 -0700
@@ -1883,6 +1883,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
diff -r 99f332cec84c -r 79b7561187a2 language/dutch.php
--- a/language/dutch.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/dutch.php Wed Feb 08 22:09:28 2012 -0700
@@ -1890,6 +1890,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
diff -r 99f332cec84c -r 79b7561187a2 language/dutch_utf-8.php
--- a/language/dutch_utf-8.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/dutch_utf-8.php Wed Feb 08 22:09:28 2012 -0700
@@ -1890,6 +1890,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
diff -r 99f332cec84c -r 79b7561187a2 language/english.php
--- a/language/english.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/english.php Wed Feb 08 22:09:28 2012 -0700
@@ -1780,6 +1780,8 @@
'site_admin_url' => "Admin URL",
'site_mail' => "Site E-Mail",
'noreply_mail' => "No-Reply E-Mail",
+ 'mail_cc_enabled' => 'Allow to Send Carbon Copies',
+ 'mail_cc_default' => '"Carbon Copy" on by Default',
'site_name' => "Site Name",
'site_slogan' => "Slogan",
'owner_name' => "Owner Name",
@@ -1970,6 +1972,7 @@
'allowed_protocols' => "Allowed Protocols",
'disable_autolinks' => "Disable Autotags?",
'clickable_links' => 'Make URLs clickable?',
+ 'linktext_maxlen' => 'Max Link Text Length',
'compressed_output' => 'Send compressed output?',
'frame_options' => 'Protection against "clickjacking"',
'censormode' => "Censor Mode?",
diff -r 99f332cec84c -r 79b7561187a2 language/english_utf-8.php
--- a/language/english_utf-8.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/english_utf-8.php Wed Feb 08 22:09:28 2012 -0700
@@ -1780,6 +1780,8 @@
'site_admin_url' => "Admin URL",
'site_mail' => "Site E-Mail",
'noreply_mail' => "No-Reply E-Mail",
+ 'mail_cc_enabled' => 'Allow to Send Carbon Copies',
+ 'mail_cc_default' => '"Carbon Copy" on by Default',
'site_name' => "Site Name",
'site_slogan' => "Slogan",
'owner_name' => "Owner Name",
@@ -1970,6 +1972,7 @@
'allowed_protocols' => "Allowed Protocols",
'disable_autolinks' => "Disable Autotags?",
'clickable_links' => 'Make URLs clickable?',
+ 'linktext_maxlen' => 'Max Link Text Length',
'compressed_output' => 'Send compressed output?',
'frame_options' => 'Protection against "clickjacking"',
'censormode' => "Censor Mode?",
diff -r 99f332cec84c -r 79b7561187a2 language/estonian.php
--- a/language/estonian.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/estonian.php Wed Feb 08 22:09:28 2012 -0700
@@ -1885,6 +1885,7 @@
'maximagesperarticle' => 'Piltide maksimum loo kohta',
'limitnews' => 'Lugusid lehel',
'minnews' => 'Min. lugusid lehel',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => '"Näita postitajat?"',
'hideviewscount' => 'Peida vaatamiste arv',
'hideemailicon' => 'Peida link E-post?',
diff -r 99f332cec84c -r 79b7561187a2 language/estonian_utf-8.php
--- a/language/estonian_utf-8.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/estonian_utf-8.php Wed Feb 08 22:09:28 2012 -0700
@@ -1885,6 +1885,7 @@
'maximagesperarticle' => 'Piltide maksimum loo kohta',
'limitnews' => 'Lugusid lehel',
'minnews' => 'Min. lugusid lehel',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => '"Näita postitajat?"',
'hideviewscount' => 'Peida vaatamiste arv',
'hideemailicon' => 'Peida link E-post?',
diff -r 99f332cec84c -r 79b7561187a2 language/farsi_utf-8.php
--- a/language/farsi_utf-8.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/farsi_utf-8.php Wed Feb 08 22:09:28 2012 -0700
@@ -1872,6 +1872,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
diff -r 99f332cec84c -r 79b7561187a2 language/finnish.php
--- a/language/finnish.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/finnish.php Wed Feb 08 22:09:28 2012 -0700
@@ -1885,6 +1885,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
diff -r 99f332cec84c -r 79b7561187a2 language/finnish_utf-8.php
--- a/language/finnish_utf-8.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/finnish_utf-8.php Wed Feb 08 22:09:28 2012 -0700
@@ -1887,6 +1887,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
+ 'linktext_maxlen' => 'Max Link Text Length',
'contributedbyline' => 'Show "Contributed By"?"',
'hideviewscount' => 'Hide Views Count?',
'hideemailicon' => 'Hide E-Mail Icon?',
diff -r 99f332cec84c -r 79b7561187a2 language/french_canada.php
--- a/language/french_canada.php Wed Feb 08 20:36:25 2012 -0700
+++ b/language/french_canada.php Wed Feb 08 22:09:28 2012 -0700
@@ -1887,6 +1887,7 @@
'maximagesperarticle' => 'Max Images per Article',
'limitnews' => 'Stories per Page',
'minnews' => 'Min. Stories per Page',
More information about the geeklog-cvs
mailing list