[geeklog-hg] geeklog: Merged with upstream
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Mon Jul 2 09:28:43 EDT 2012
changeset 8756:069f7307dfd3
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/069f7307dfd3
user: Tom <websitemaster at cogeco.net>
date: Mon Jul 02 09:26:30 2012 -0400
description:
Merged with upstream
diffstat:
language/afrikaans.php | 6 +-
language/afrikaans_utf-8.php | 6 +-
language/bosnian.php | 6 +-
language/bosnian_utf-8.php | 6 +-
language/bulgarian.php | 6 +-
language/bulgarian_utf-8.php | 6 +-
language/catalan.php | 6 +-
language/catalan_utf-8.php | 6 +-
language/chinese_simplified_utf-8.php | 6 +-
language/chinese_traditional_utf-8.php | 6 +-
language/croatian.php | 6 +-
language/croatian_utf-8.php | 6 +-
language/czech.php | 6 +-
language/czech_utf-8.php | 6 +-
language/danish.php | 6 +-
language/danish_utf-8.php | 6 +-
language/dutch.php | 6 +-
language/dutch_utf-8.php | 6 +-
language/estonian.php | 6 +-
language/estonian_utf-8.php | 6 +-
language/farsi_utf-8.php | 6 +-
language/finnish.php | 6 +-
language/finnish_utf-8.php | 6 +-
language/french_canada.php | 6 +-
language/french_canada_utf-8.php | 6 +-
language/french_france.php | 6 +-
language/french_france_utf-8.php | 6 +-
language/german.php | 6 +-
language/german_formal.php | 6 +-
language/german_formal_utf-8.php | 6 +-
language/german_utf-8.php | 6 +-
language/hebrew_utf-8.php | 6 +-
language/hellenic.php | 6 +-
language/hellenic_utf-8.php | 6 +-
language/indonesian.php | 6 +-
language/indonesian_utf-8.php | 6 +-
language/italian.php | 6 +-
language/italian_utf-8.php | 6 +-
language/japanese_utf-8.php | 6 +-
language/korean.php | 6 +-
language/korean_utf-8.php | 6 +-
language/norwegian.php | 6 +-
language/norwegian_utf-8.php | 6 +-
language/polish.php | 6 +-
language/polish_utf-8.php | 6 +-
language/portuguese.php | 6 +-
language/portuguese_brazil.php | 6 +-
language/portuguese_brazil_utf-8.php | 6 +-
language/portuguese_utf-8.php | 6 +-
language/romanian.php | 6 +-
language/romanian_utf-8.php | 6 +-
language/russian.php | 6 +-
language/russian_utf-8.php | 6 +-
language/serbian.php | 6 +-
language/serbian_utf-8.php | 6 +-
language/slovak.php | 6 +-
language/slovak_utf-8.php | 6 +-
language/slovenian.php | 6 +-
language/slovenian_utf-8.php | 6 +-
language/spanish.php | 6 +-
language/spanish_argentina.php | 6 +-
language/spanish_argentina_utf-8.php | 6 +-
language/spanish_utf-8.php | 6 +-
language/swedish.php | 6 +-
language/swedish_utf-8.php | 6 +-
language/turkish.php | 6 +-
language/turkish_utf-8.php | 6 +-
language/ukrainian.php | 6 +-
language/ukrainian_koi8-u.php | 6 +-
language/ukrainian_utf-8.php | 6 +-
plugins/links/sql/pgsql_updates.php | 4 +-
public_html/admin/story.php | 2 +-
public_html/docs/english/install.html | 2 +
public_html/index.php | 2 +-
public_html/layout/denim/admin/trackback/pingbackform.thtml | 2 -
public_html/layout/denim/admin/trackback/pingform.thtml | 2 -
public_html/layout/modern_curve/admin/trackback/pingbackform.thtml | 2 -
public_html/layout/modern_curve/admin/trackback/pingform.thtml | 2 -
public_html/layout/modern_curve/admin/user/batchdelete.thtml | 1 -
public_html/layout/modern_curve/preferences/resynch.thtml | 13 +-
public_html/layout/modern_curve/users/profile.thtml | 4 +-
public_html/layout/professional_css/admin/common/edit_topics.thtml | 5 +
public_html/layout/professional_css/admin/config/config_element_2.thtml | 83 +++++++
public_html/layout/professional_css/admin/config/configuration.thtml | 16 +-
public_html/layout/professional_css/admin/trackback/pingbackform.thtml | 2 -
public_html/layout/professional_css/admin/trackback/pingform.thtml | 2 -
public_html/layout/professional_css/admin/user/batchdelete.thtml | 1 -
public_html/layout/professional_css/admin/user/password.thtml | 5 +
public_html/layout/professional_css/breadcrumbs/breadcrumb.thtml | 4 +
public_html/layout/professional_css/breadcrumbs/breadcrumb_child.thtml | 5 +
public_html/layout/professional_css/breadcrumbs/breadcrumb_nolink.thtml | 5 +
public_html/layout/professional_css/breadcrumbs/breadcrumb_root.thtml | 5 +
public_html/layout/professional_css/breadcrumbs/breadcrumbs.thtml | 5 +
public_html/layout/professional_css/css/admin/configuration.css | 112 ++++-----
public_html/layout/professional_css/css/comment/comment.css | 4 +-
public_html/layout/professional_css/css/common.css | 2 -
public_html/layout/professional_css/css/compatible.css | 5 +-
public_html/layout/professional_css/css/form.css | 24 ++
public_html/layout/professional_css/css/tooltips/tooltips.css | 37 ++-
public_html/layout/professional_css/featuredstorytext.thtml | 1 -
public_html/layout/professional_css/functions.php | 5 +-
public_html/layout/professional_css/header.thtml | 3 +-
public_html/layout/professional_css/javascript/fix_html.js | 46 +--
public_html/layout/professional_css/jquery_ui/jquery.ui.geeklog.css | 29 ++-
public_html/layout/professional_css/noscript.thtml | 7 +-
public_html/layout/professional_css/preferences/commentblock.thtml | 2 +-
public_html/layout/professional_css/preferences/current_password.thtml | 5 +
public_html/layout/professional_css/preferences/password.thtml | 4 +
public_html/layout/professional_css/preferences/resynch.thtml | 13 +-
public_html/layout/professional_css/storytext.thtml | 1 -
public_html/layout/professional_css/topicoption_off.thtml | 2 +-
public_html/lib-common.php | 20 +-
sql/pgsql_tableanddata.php | 16 +-
system/classes/config.class.php | 2 +-
system/classes/search.class.php | 2 +-
system/lib-plugins.php | 4 +-
system/lib-security.php | 4 +-
system/lib-story.php | 15 +-
system/lib-syndication.php | 2 +-
119 files changed, 635 insertions(+), 326 deletions(-)
diffs (truncated from 2748 to 300 lines):
diff -r ba34a3370b9a -r 069f7307dfd3 language/afrikaans.php
--- a/language/afrikaans.php Fri Jun 29 20:26:14 2012 -0400
+++ b/language/afrikaans.php Mon Jul 02 09:26:30 2012 -0400
@@ -908,7 +908,8 @@
46 => 'Your parent topic cannot be the Archive topic. Please choose a different Parent Topic.',
47 => 'An Archive Topic cannot have any child topics. Please remove any child topics before making a topic the Archive Topic.',
48 => 'Parent Topic Id not found.',
- 'breadcrumb_separator' => '>'
+ 'breadcrumb_separator' => '>',
+ 'breadcrumb_root' => 'Home'
);
###############################################################################
@@ -2013,7 +2014,8 @@
'multiple_breadcrumbs' => 'Multiple Breadcrumbs',
'disable_breadcrumbs_topics' => 'Disable Topic Breadcrumbs',
'disable_breadcrumbs_articles' => 'Disable Article Breadcrumbs',
- 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs'
+ 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs',
+ 'breadcrumb_root_site_name' => 'Site Name as Breadcrumb Root?'
);
$LANG_configsubgroups['Core'] = array(
diff -r ba34a3370b9a -r 069f7307dfd3 language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php Fri Jun 29 20:26:14 2012 -0400
+++ b/language/afrikaans_utf-8.php Mon Jul 02 09:26:30 2012 -0400
@@ -908,7 +908,8 @@
46 => 'Your parent topic cannot be the Archive topic. Please choose a different Parent Topic.',
47 => 'An Archive Topic cannot have any child topics. Please remove any child topics before making a topic the Archive Topic.',
48 => 'Parent Topic Id not found.',
- 'breadcrumb_separator' => '>'
+ 'breadcrumb_separator' => '>',
+ 'breadcrumb_root' => 'Home'
);
###############################################################################
@@ -2013,7 +2014,8 @@
'multiple_breadcrumbs' => 'Multiple Breadcrumbs',
'disable_breadcrumbs_topics' => 'Disable Topic Breadcrumbs',
'disable_breadcrumbs_articles' => 'Disable Article Breadcrumbs',
- 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs'
+ 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs',
+ 'breadcrumb_root_site_name' => 'Site Name as Breadcrumb Root?'
);
$LANG_configsubgroups['Core'] = array(
diff -r ba34a3370b9a -r 069f7307dfd3 language/bosnian.php
--- a/language/bosnian.php Fri Jun 29 20:26:14 2012 -0400
+++ b/language/bosnian.php Mon Jul 02 09:26:30 2012 -0400
@@ -912,7 +912,8 @@
46 => 'Your parent topic cannot be the Archive topic. Please choose a different Parent Topic.',
47 => 'An Archive Topic cannot have any child topics. Please remove any child topics before making a topic the Archive Topic.',
48 => 'Parent Topic Id not found.',
- 'breadcrumb_separator' => '>'
+ 'breadcrumb_separator' => '>',
+ 'breadcrumb_root' => 'Home'
);
###############################################################################
@@ -2017,7 +2018,8 @@
'multiple_breadcrumbs' => 'Multiple Breadcrumbs',
'disable_breadcrumbs_topics' => 'Disable Topic Breadcrumbs',
'disable_breadcrumbs_articles' => 'Disable Article Breadcrumbs',
- 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs'
+ 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs',
+ 'breadcrumb_root_site_name' => 'Site Name as Breadcrumb Root?'
);
$LANG_configsubgroups['Core'] = array(
diff -r ba34a3370b9a -r 069f7307dfd3 language/bosnian_utf-8.php
--- a/language/bosnian_utf-8.php Fri Jun 29 20:26:14 2012 -0400
+++ b/language/bosnian_utf-8.php Mon Jul 02 09:26:30 2012 -0400
@@ -912,7 +912,8 @@
46 => 'Your parent topic cannot be the Archive topic. Please choose a different Parent Topic.',
47 => 'An Archive Topic cannot have any child topics. Please remove any child topics before making a topic the Archive Topic.',
48 => 'Parent Topic Id not found.',
- 'breadcrumb_separator' => '>'
+ 'breadcrumb_separator' => '>',
+ 'breadcrumb_root' => 'Home'
);
###############################################################################
@@ -2017,7 +2018,8 @@
'multiple_breadcrumbs' => 'Multiple Breadcrumbs',
'disable_breadcrumbs_topics' => 'Disable Topic Breadcrumbs',
'disable_breadcrumbs_articles' => 'Disable Article Breadcrumbs',
- 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs'
+ 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs',
+ 'breadcrumb_root_site_name' => 'Site Name as Breadcrumb Root?'
);
$LANG_configsubgroups['Core'] = array(
diff -r ba34a3370b9a -r 069f7307dfd3 language/bulgarian.php
--- a/language/bulgarian.php Fri Jun 29 20:26:14 2012 -0400
+++ b/language/bulgarian.php Mon Jul 02 09:26:30 2012 -0400
@@ -908,7 +908,8 @@
46 => 'Your parent topic cannot be the Archive topic. Please choose a different Parent Topic.',
47 => 'An Archive Topic cannot have any child topics. Please remove any child topics before making a topic the Archive Topic.',
48 => 'Parent Topic Id not found.',
- 'breadcrumb_separator' => '>'
+ 'breadcrumb_separator' => '>',
+ 'breadcrumb_root' => 'Home'
);
###############################################################################
@@ -2013,7 +2014,8 @@
'multiple_breadcrumbs' => 'Multiple Breadcrumbs',
'disable_breadcrumbs_topics' => 'Disable Topic Breadcrumbs',
'disable_breadcrumbs_articles' => 'Disable Article Breadcrumbs',
- 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs'
+ 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs',
+ 'breadcrumb_root_site_name' => 'Site Name as Breadcrumb Root?'
);
$LANG_configsubgroups['Core'] = array(
diff -r ba34a3370b9a -r 069f7307dfd3 language/bulgarian_utf-8.php
--- a/language/bulgarian_utf-8.php Fri Jun 29 20:26:14 2012 -0400
+++ b/language/bulgarian_utf-8.php Mon Jul 02 09:26:30 2012 -0400
@@ -908,7 +908,8 @@
46 => 'Your parent topic cannot be the Archive topic. Please choose a different Parent Topic.',
47 => 'An Archive Topic cannot have any child topics. Please remove any child topics before making a topic the Archive Topic.',
48 => 'Parent Topic Id not found.',
- 'breadcrumb_separator' => '>'
+ 'breadcrumb_separator' => '>',
+ 'breadcrumb_root' => 'Home'
);
###############################################################################
@@ -2013,7 +2014,8 @@
'multiple_breadcrumbs' => 'Multiple Breadcrumbs',
'disable_breadcrumbs_topics' => 'Disable Topic Breadcrumbs',
'disable_breadcrumbs_articles' => 'Disable Article Breadcrumbs',
- 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs'
+ 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs',
+ 'breadcrumb_root_site_name' => 'Site Name as Breadcrumb Root?'
);
$LANG_configsubgroups['Core'] = array(
diff -r ba34a3370b9a -r 069f7307dfd3 language/catalan.php
--- a/language/catalan.php Fri Jun 29 20:26:14 2012 -0400
+++ b/language/catalan.php Mon Jul 02 09:26:30 2012 -0400
@@ -906,7 +906,8 @@
46 => 'Your parent topic cannot be the Archive topic. Please choose a different Parent Topic.',
47 => 'An Archive Topic cannot have any child topics. Please remove any child topics before making a topic the Archive Topic.',
48 => 'Parent Topic Id not found.',
- 'breadcrumb_separator' => '>'
+ 'breadcrumb_separator' => '>',
+ 'breadcrumb_root' => 'Home'
);
###############################################################################
@@ -2011,7 +2012,8 @@
'multiple_breadcrumbs' => 'Multiple Breadcrumbs',
'disable_breadcrumbs_topics' => 'Disable Topic Breadcrumbs',
'disable_breadcrumbs_articles' => 'Disable Article Breadcrumbs',
- 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs'
+ 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs',
+ 'breadcrumb_root_site_name' => 'Site Name as Breadcrumb Root?'
);
$LANG_configsubgroups['Core'] = array(
diff -r ba34a3370b9a -r 069f7307dfd3 language/catalan_utf-8.php
--- a/language/catalan_utf-8.php Fri Jun 29 20:26:14 2012 -0400
+++ b/language/catalan_utf-8.php Mon Jul 02 09:26:30 2012 -0400
@@ -906,7 +906,8 @@
46 => 'Your parent topic cannot be the Archive topic. Please choose a different Parent Topic.',
47 => 'An Archive Topic cannot have any child topics. Please remove any child topics before making a topic the Archive Topic.',
48 => 'Parent Topic Id not found.',
- 'breadcrumb_separator' => '>'
+ 'breadcrumb_separator' => '>',
+ 'breadcrumb_root' => 'Home'
);
###############################################################################
@@ -2011,7 +2012,8 @@
'multiple_breadcrumbs' => 'Multiple Breadcrumbs',
'disable_breadcrumbs_topics' => 'Disable Topic Breadcrumbs',
'disable_breadcrumbs_articles' => 'Disable Article Breadcrumbs',
- 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs'
+ 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs',
+ 'breadcrumb_root_site_name' => 'Site Name as Breadcrumb Root?'
);
$LANG_configsubgroups['Core'] = array(
diff -r ba34a3370b9a -r 069f7307dfd3 language/chinese_simplified_utf-8.php
--- a/language/chinese_simplified_utf-8.php Fri Jun 29 20:26:14 2012 -0400
+++ b/language/chinese_simplified_utf-8.php Mon Jul 02 09:26:30 2012 -0400
@@ -911,7 +911,8 @@
46 => 'Your parent topic cannot be the Archive topic. Please choose a different Parent Topic.',
47 => 'An Archive Topic cannot have any child topics. Please remove any child topics before making a topic the Archive Topic.',
48 => 'Parent Topic Id not found.',
- 'breadcrumb_separator' => '>'
+ 'breadcrumb_separator' => '>',
+ 'breadcrumb_root' => 'Home'
);
###############################################################################
@@ -2016,7 +2017,8 @@
'multiple_breadcrumbs' => 'Multiple Breadcrumbs',
'disable_breadcrumbs_topics' => 'Disable Topic Breadcrumbs',
'disable_breadcrumbs_articles' => 'Disable Article Breadcrumbs',
- 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs'
+ 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs',
+ 'breadcrumb_root_site_name' => 'Site Name as Breadcrumb Root?'
);
$LANG_configsubgroups['Core'] = array(
diff -r ba34a3370b9a -r 069f7307dfd3 language/chinese_traditional_utf-8.php
--- a/language/chinese_traditional_utf-8.php Fri Jun 29 20:26:14 2012 -0400
+++ b/language/chinese_traditional_utf-8.php Mon Jul 02 09:26:30 2012 -0400
@@ -911,7 +911,8 @@
46 => 'Your parent topic cannot be the Archive topic. Please choose a different Parent Topic.',
47 => 'An Archive Topic cannot have any child topics. Please remove any child topics before making a topic the Archive Topic.',
48 => 'Parent Topic Id not found.',
- 'breadcrumb_separator' => '>'
+ 'breadcrumb_separator' => '>',
+ 'breadcrumb_root' => 'Home'
);
###############################################################################
@@ -2016,7 +2017,8 @@
'multiple_breadcrumbs' => 'Multiple Breadcrumbs',
'disable_breadcrumbs_topics' => 'Disable Topic Breadcrumbs',
'disable_breadcrumbs_articles' => 'Disable Article Breadcrumbs',
- 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs'
+ 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs',
+ 'breadcrumb_root_site_name' => 'Site Name as Breadcrumb Root?'
);
$LANG_configsubgroups['Core'] = array(
diff -r ba34a3370b9a -r 069f7307dfd3 language/croatian.php
--- a/language/croatian.php Fri Jun 29 20:26:14 2012 -0400
+++ b/language/croatian.php Mon Jul 02 09:26:30 2012 -0400
@@ -908,7 +908,8 @@
46 => 'Your parent topic cannot be the Archive topic. Please choose a different Parent Topic.',
47 => 'An Archive Topic cannot have any child topics. Please remove any child topics before making a topic the Archive Topic.',
48 => 'Parent Topic Id not found.',
- 'breadcrumb_separator' => '>'
+ 'breadcrumb_separator' => '>',
+ 'breadcrumb_root' => 'Home'
);
###############################################################################
@@ -2013,7 +2014,8 @@
'multiple_breadcrumbs' => 'Multiple Breadcrumbs',
'disable_breadcrumbs_topics' => 'Disable Topic Breadcrumbs',
'disable_breadcrumbs_articles' => 'Disable Article Breadcrumbs',
- 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs'
+ 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs',
+ 'breadcrumb_root_site_name' => 'Site Name as Breadcrumb Root?'
);
$LANG_configsubgroups['Core'] = array(
diff -r ba34a3370b9a -r 069f7307dfd3 language/croatian_utf-8.php
--- a/language/croatian_utf-8.php Fri Jun 29 20:26:14 2012 -0400
+++ b/language/croatian_utf-8.php Mon Jul 02 09:26:30 2012 -0400
@@ -910,7 +910,8 @@
46 => 'Your parent topic cannot be the Archive topic. Please choose a different Parent Topic.',
47 => 'An Archive Topic cannot have any child topics. Please remove any child topics before making a topic the Archive Topic.',
48 => 'Parent Topic Id not found.',
- 'breadcrumb_separator' => '>'
+ 'breadcrumb_separator' => '>',
+ 'breadcrumb_root' => 'Home'
);
###############################################################################
@@ -2015,7 +2016,8 @@
'multiple_breadcrumbs' => 'Multiple Breadcrumbs',
'disable_breadcrumbs_topics' => 'Disable Topic Breadcrumbs',
'disable_breadcrumbs_articles' => 'Disable Article Breadcrumbs',
- 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs'
+ 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs',
+ 'breadcrumb_root_site_name' => 'Site Name as Breadcrumb Root?'
);
$LANG_configsubgroups['Core'] = array(
diff -r ba34a3370b9a -r 069f7307dfd3 language/czech.php
--- a/language/czech.php Fri Jun 29 20:26:14 2012 -0400
+++ b/language/czech.php Mon Jul 02 09:26:30 2012 -0400
@@ -907,7 +907,8 @@
46 => 'Your parent topic cannot be the Archive topic. Please choose a different Parent Topic.',
47 => 'An Archive Topic cannot have any child topics. Please remove any child topics before making a topic the Archive Topic.',
48 => 'Parent Topic Id not found.',
- 'breadcrumb_separator' => '>'
+ 'breadcrumb_separator' => '>',
+ 'breadcrumb_root' => 'Home'
);
###############################################################################
@@ -2012,7 +2013,8 @@
'multiple_breadcrumbs' => 'Multiple Breadcrumbs',
'disable_breadcrumbs_topics' => 'Disable Topic Breadcrumbs',
'disable_breadcrumbs_articles' => 'Disable Article Breadcrumbs',
- 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs'
+ 'disable_breadcrumbs_plugins' => 'Disable Plugins Breadcrumbs',
+ 'breadcrumb_root_site_name' => 'Site Name as Breadcrumb Root?'
);
$LANG_configsubgroups['Core'] = array(
diff -r ba34a3370b9a -r 069f7307dfd3 language/czech_utf-8.php
More information about the geeklog-cvs
mailing list