[geeklog-cvs] geeklog: Merged Stan's PostgreSQL branch with HEAD as of 2010-01-10

geeklog-cvs at lists.geeklog.net geeklog-cvs at lists.geeklog.net
Tue Jan 26 15:54:20 EST 2010


changeset 7660:3f3700aee0c2
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/3f3700aee0c2
user: Dirk Haun <dirk at haun-online.de>
date: Sat Jan 16 12:44:07 2010 +0100
description:
Merged Stan's PostgreSQL branch with HEAD as of 2010-01-10

diffstat:

 .hgignore                                                                                     |     2 +
 .hgtags                                                                                       |     8 +
 language/afrikaans.php                                                                        |    71 +-
 language/afrikaans_utf-8.php                                                                  |    71 +-
 language/bosnian.php                                                                          |    71 +-
 language/bosnian_utf-8.php                                                                    |    71 +-
 language/bulgarian.php                                                                        |    71 +-
 language/bulgarian_utf-8.php                                                                  |    71 +-
 language/catalan.php                                                                          |    71 +-
 language/catalan_utf-8.php                                                                    |    71 +-
 language/chinese_simplified_utf-8.php                                                         |    69 +-
 language/chinese_traditional_utf-8.php                                                        |    69 +-
 language/croatian.php                                                                         |    71 +-
 language/croatian_utf-8.php                                                                   |    71 +-
 language/czech.php                                                                            |    71 +-
 language/czech_utf-8.php                                                                      |    71 +-
 language/danish.php                                                                           |    71 +-
 language/danish_utf-8.php                                                                     |    71 +-
 language/dutch.php                                                                            |    69 +-
 language/dutch_utf-8.php                                                                      |    69 +-
 language/english.php                                                                          |    86 +-
 language/english_utf-8.php                                                                    |    86 +-
 language/estonian.php                                                                         |   261 +-
 language/estonian_utf-8.php                                                                   |   261 +-
 language/farsi_utf-8.php                                                                      |    71 +-
 language/finnish.php                                                                          |    71 +-
 language/finnish_utf-8.php                                                                    |    71 +-
 language/french_canada.php                                                                    |    69 +-
 language/french_canada_utf-8.php                                                              |    71 +-
 language/french_france.php                                                                    |    71 +-
 language/french_france_utf-8.php                                                              |    71 +-
 language/german.php                                                                           |   487 +-
 language/german_formal.php                                                                    |   481 +-
 language/german_formal_utf-8.php                                                              |   479 +-
 language/german_utf-8.php                                                                     |   487 +-
 language/hebrew_utf-8.php                                                                     |   317 +-
 language/hellenic.php                                                                         |    71 +-
 language/hellenic_utf-8.php                                                                   |    71 +-
 language/indonesian.php                                                                       |    71 +-
 language/indonesian_utf-8.php                                                                 |    71 +-
 language/italian.php                                                                          |    71 +-
 language/italian_utf-8.php                                                                    |    71 +-
 language/japanese_utf-8.php                                                                   |   521 +-
 language/korean.php                                                                           |    69 +-
 language/korean_utf-8.php                                                                     |    69 +-
 language/norwegian.php                                                                        |    71 +-
 language/norwegian_utf-8.php                                                                  |    71 +-
 language/polish.php                                                                           |    71 +-
 language/polish_utf-8.php                                                                     |    71 +-
 language/portuguese.php                                                                       |    71 +-
 language/portuguese_brazil.php                                                                |    71 +-
 language/portuguese_brazil_utf-8.php                                                          |    71 +-
 language/portuguese_utf-8.php                                                                 |    71 +-
 language/romanian.php                                                                         |    71 +-
 language/romanian_utf-8.php                                                                   |    71 +-
 language/russian.php                                                                          |    71 +-
 language/russian_utf-8.php                                                                    |    71 +-
 language/serbian.php                                                                          |    69 +-
 language/serbian_utf-8.php                                                                    |    69 +-
 language/slovak.php                                                                           |    71 +-
 language/slovak_utf-8.php                                                                     |    71 +-
 language/slovenian.php                                                                        |    69 +-
 language/slovenian_utf-8.php                                                                  |    69 +-
 language/spanish.php                                                                          |    69 +-
 language/spanish_argentina.php                                                                |    71 +-
 language/spanish_argentina_utf-8.php                                                          |    71 +-
 language/spanish_utf-8.php                                                                    |    69 +-
 language/swedish.php                                                                          |    71 +-
 language/swedish_utf-8.php                                                                    |    71 +-
 language/turkish.php                                                                          |    71 +-
 language/turkish_utf-8.php                                                                    |    71 +-
 language/ukrainian.php                                                                        |    69 +-
 language/ukrainian_koi8-u.php                                                                 |    69 +-
 language/ukrainian_utf-8.php                                                                  |    69 +-
 plugins/calendar/autoinstall.php                                                              |    16 +-
 plugins/calendar/functions.inc                                                                |   301 +-
 plugins/calendar/language/czech.php                                                           |     2 +-
 plugins/calendar/language/czech_utf-8.php                                                     |     2 +-
 plugins/calendar/language/danish.php                                                          |     2 +-
 plugins/calendar/language/danish_utf-8.php                                                    |     2 +-
 plugins/calendar/language/dutch.php                                                           |     2 +-
 plugins/calendar/language/dutch_utf-8.php                                                     |     2 +-
 plugins/calendar/language/estonian.php                                                        |     4 +-
 plugins/calendar/language/estonian_utf-8.php                                                  |     4 +-
 plugins/calendar/language/french_canada.php                                                   |     2 +-
 plugins/calendar/language/french_canada_utf-8.php                                             |     2 +-
 plugins/calendar/language/german.php                                                          |     4 +-
 plugins/calendar/language/german_formal.php                                                   |     4 +-
 plugins/calendar/language/german_formal_utf-8.php                                             |     4 +-
 plugins/calendar/language/german_utf-8.php                                                    |     4 +-
 plugins/calendar/language/hebrew_utf-8.php                                                    |    14 +-
 plugins/calendar/language/japanese_utf-8.php                                                  |    28 +-
 plugins/calendar/language/korean.php                                                          |     2 +-
 plugins/calendar/language/korean_utf-8.php                                                    |     2 +-
 plugins/calendar/language/russian.php                                                         |     2 +-
 plugins/calendar/language/russian_utf-8.php                                                   |     2 +-
 plugins/calendar/language/slovenian.php                                                       |     2 +-
 plugins/calendar/language/slovenian_utf-8.php                                                 |     2 +-
 plugins/calendar/language/spanish.php                                                         |     2 +-
 plugins/calendar/language/spanish_utf-8.php                                                   |     2 +-
 plugins/calendar/language/ukrainian.php                                                       |     2 +-
 plugins/calendar/language/ukrainian_koi8-u.php                                                |     2 +-
 plugins/calendar/language/ukrainian_utf-8.php                                                 |     2 +-
 plugins/calendar/sql/mssql_install.php                                                        |     7 +-
 plugins/calendar/sql/mssql_updates.php                                                        |    43 +
 plugins/calendar/sql/mysql_install.php                                                        |    13 +-
 plugins/calendar/sql/mysql_updates.php                                                        |    43 +
 plugins/links/autoinstall.php                                                                 |    10 +-
 plugins/links/functions.inc                                                                   |    24 +-
 plugins/links/language/chinese_simplified_utf-8.php                                           |     5 +-
 plugins/links/language/chinese_traditional_utf-8.php                                          |     5 +-
 plugins/links/language/czech.php                                                              |     5 +-
 plugins/links/language/czech_utf-8.php                                                        |     5 +-
 plugins/links/language/dutch.php                                                              |     5 +-
 plugins/links/language/dutch_utf-8.php                                                        |     5 +-
 plugins/links/language/english.php                                                            |     3 +-
 plugins/links/language/english_utf-8.php                                                      |     3 +-
 plugins/links/language/estonian.php                                                           |    11 +-
 plugins/links/language/estonian_utf-8.php                                                     |    13 +-
 plugins/links/language/french_canada.php                                                      |     5 +-
 plugins/links/language/french_canada_utf-8.php                                                |     5 +-
 plugins/links/language/german.php                                                             |     7 +-
 plugins/links/language/german_formal.php                                                      |     7 +-
 plugins/links/language/german_formal_utf-8.php                                                |     7 +-
 plugins/links/language/german_utf-8.php                                                       |     7 +-
 plugins/links/language/hebrew_utf-8.php                                                       |    25 +-
 plugins/links/language/japanese_utf-8.php                                                     |    45 +-
 plugins/links/language/korean.php                                                             |     5 +-
 plugins/links/language/korean_utf-8.php                                                       |     5 +-
 plugins/links/language/polish.php                                                             |     5 +-
 plugins/links/language/polish_utf-8.php                                                       |     5 +-
 plugins/links/language/russian.php                                                            |     5 +-
 plugins/links/language/russian_utf-8.php                                                      |     5 +-
 plugins/links/language/slovenian.php                                                          |     5 +-
 plugins/links/language/slovenian_utf-8.php                                                    |     5 +-
 plugins/links/language/spanish.php                                                            |     5 +-
 plugins/links/language/spanish_utf-8.php                                                      |     5 +-
 plugins/links/language/ukrainian.php                                                          |     5 +-
 plugins/links/language/ukrainian_koi8-u.php                                                   |     5 +-
 plugins/links/language/ukrainian_utf-8.php                                                    |     5 +-
 plugins/links/sql/mysql_install.php                                                           |    10 +-
 plugins/links/templates/admin/categoryeditor.thtml                                            |     6 +-
 plugins/links/templates/admin/linkeditor.thtml                                                |     3 +-
 plugins/polls/autoinstall.php                                                                 |    12 +-
 plugins/polls/functions.inc                                                                   |   225 +-
 plugins/polls/install_defaults.php                                                            |     6 +
 plugins/polls/language/chinese_simplified_utf-8.php                                           |    10 +-
 plugins/polls/language/chinese_traditional_utf-8.php                                          |    10 +-
 plugins/polls/language/dutch.php                                                              |    10 +-
 plugins/polls/language/dutch_utf-8.php                                                        |    10 +-
 plugins/polls/language/english.php                                                            |     8 +-
 plugins/polls/language/english_utf-8.php                                                      |     8 +-
 plugins/polls/language/estonian.php                                                           |    12 +-
 plugins/polls/language/estonian_utf-8.php                                                     |    14 +-
 plugins/polls/language/french_canada.php                                                      |    10 +-
 plugins/polls/language/french_canada_utf-8.php                                                |    10 +-
 plugins/polls/language/german.php                                                             |    16 +-
 plugins/polls/language/german_formal.php                                                      |    16 +-
 plugins/polls/language/german_formal_utf-8.php                                                |    16 +-
 plugins/polls/language/german_utf-8.php                                                       |    16 +-
 plugins/polls/language/hebrew_utf-8.php                                                       |    26 +-
 plugins/polls/language/japanese_utf-8.php                                                     |    18 +-
 plugins/polls/language/korean.php                                                             |    10 +-
 plugins/polls/language/korean_utf-8.php                                                       |    10 +-
 plugins/polls/language/russian.php                                                            |    10 +-
 plugins/polls/language/russian_utf-8.php                                                      |    10 +-
 plugins/polls/language/slovenian.php                                                          |    10 +-
 plugins/polls/language/slovenian_utf-8.php                                                    |    10 +-
 plugins/polls/language/spanish.php                                                            |    10 +-
 plugins/polls/language/spanish_utf-8.php                                                      |    10 +-
 plugins/polls/language/ukrainian.php                                                          |    10 +-
 plugins/polls/language/ukrainian_koi8-u.php                                                   |    10 +-
 plugins/polls/language/ukrainian_utf-8.php                                                    |    10 +-
 plugins/polls/sql/mssql_install.php                                                           |    18 +-
 plugins/polls/sql/mssql_updates.php                                                           |    35 +-
 plugins/polls/sql/mysql_install.php                                                           |    28 +-
 plugins/polls/sql/mysql_updates.php                                                           |    29 +-
 plugins/polls/templates/admin/polleditor.thtml                                                |    17 +-
 plugins/spamx/BlackList.Examine.class.php                                                     |     2 +-
 plugins/spamx/DeleteComment.Action.class.php                                                  |     2 +-
 plugins/spamx/EditBlackList.Admin.class.php                                                   |     2 +-
 plugins/spamx/EditHeader.Admin.class.php                                                      |     2 +-
 plugins/spamx/EditIP.Admin.class.php                                                          |     2 +-
 plugins/spamx/EditIPofURL.Admin.class.php                                                     |     2 +-
 plugins/spamx/Header.Examine.class.php                                                        |     2 +-
 plugins/spamx/IP.Examine.class.php                                                            |    78 +-
 plugins/spamx/IPofUrl.Examine.class.php                                                       |     2 +-
 plugins/spamx/Import.Admin.class.php                                                          |     2 +-
 plugins/spamx/LogView.Admin.class.php                                                         |     2 +-
 plugins/spamx/MTBlackList.Examine.class.php                                                   |     2 +-
 plugins/spamx/MailAdmin.Action.class.php                                                      |     2 +-
 plugins/spamx/MassDelTrackback.Admin.class.php                                                |     2 +-
 plugins/spamx/MassDelete.Admin.class.php                                                      |     2 +-
 plugins/spamx/SLV.Examine.class.php                                                           |     2 +-
 plugins/spamx/SLVbase.class.php                                                               |     2 +-
 plugins/spamx/SLVreport.Action.class.php                                                      |     2 +-
 plugins/spamx/SLVwhitelist.Admin.class.php                                                    |     2 +-
 plugins/spamx/functions.inc                                                                   |     2 +-
 plugins/spamx/language/estonian.php                                                           |     2 +-
 plugins/spamx/language/estonian_utf-8.php                                                     |     2 +-
 plugins/spamx/language/farsi_utf-8.php                                                        |     2 +-
 plugins/spamx/language/french_canada.php                                                      |     2 +-
 plugins/spamx/language/french_canada_utf-8.php                                                |     2 +-
 plugins/spamx/language/french_france.php                                                      |     2 +-
 plugins/spamx/language/french_france_utf-8.php                                                |     2 +-
 plugins/spamx/language/hebrew_utf-8.php                                                       |    10 +-
 plugins/spamx/language/italian.php                                                            |     2 +-
 plugins/spamx/language/italian_utf-8.php                                                      |     2 +-
 plugins/spamx/language/japanese_utf-8.php                                                     |    32 +-
 plugins/spamx/language/russian.php                                                            |     2 +-
 plugins/spamx/language/russian_utf-8.php                                                      |     2 +-
 plugins/spamx/language/slovenian.php                                                          |     2 +-
 plugins/spamx/language/slovenian_utf-8.php                                                    |     2 +-
 plugins/spamx/language/spanish.php                                                            |     2 +-
 plugins/spamx/language/spanish_utf-8.php                                                      |     2 +-
 plugins/spamx/language/ukrainian.php                                                          |     2 +-
 plugins/spamx/language/ukrainian_koi8-u.php                                                   |     2 +-
 plugins/spamx/language/ukrainian_utf-8.php                                                    |     2 +-
 plugins/spamx/sql/mysql_install.php                                                           |     4 +-
 plugins/staticpages/autoinstall.php                                                           |    14 +-
 plugins/staticpages/functions.inc                                                             |   812 +-
 plugins/staticpages/install_defaults.php                                                      |    66 +-
 plugins/staticpages/language/chinese_simplified_utf-8.php                                     |    33 +-
 plugins/staticpages/language/chinese_traditional_utf-8.php                                    |    33 +-
 plugins/staticpages/language/czech.php                                                        |    33 +-
 plugins/staticpages/language/czech_utf-8.php                                                  |    33 +-
 plugins/staticpages/language/danish.php                                                       |    33 +-
 plugins/staticpages/language/danish_utf-8.php                                                 |    33 +-
 plugins/staticpages/language/dutch.php                                                        |    33 +-
 plugins/staticpages/language/dutch_utf-8.php                                                  |    33 +-
 plugins/staticpages/language/english.php                                                      |    31 +-
 plugins/staticpages/language/english_utf-8.php                                                |    31 +-
 plugins/staticpages/language/estonian.php                                                     |    39 +-
 plugins/staticpages/language/estonian_utf-8.php                                               |    41 +-
 plugins/staticpages/language/farsi_utf-8.php                                                  |    33 +-
 plugins/staticpages/language/french_canada.php                                                |    33 +-
 plugins/staticpages/language/french_canada_utf-8.php                                          |    33 +-
 plugins/staticpages/language/german.php                                                       |    43 +-
 plugins/staticpages/language/german_formal.php                                                |    43 +-
 plugins/staticpages/language/german_formal_utf-8.php                                          |    43 +-
 plugins/staticpages/language/german_utf-8.php                                                 |    43 +-
 plugins/staticpages/language/hebrew_utf-8.php                                                 |    53 +-
 plugins/staticpages/language/italian.php                                                      |    33 +-
 plugins/staticpages/language/italian_utf-8.php                                                |    33 +-
 plugins/staticpages/language/japanese_utf-8.php                                               |    53 +-
 plugins/staticpages/language/korean.php                                                       |    33 +-
 plugins/staticpages/language/korean_utf-8.php                                                 |    33 +-
 plugins/staticpages/language/polish.php                                                       |    33 +-
 plugins/staticpages/language/polish_utf-8.php                                                 |    33 +-
 plugins/staticpages/language/portuguese_brazil.php                                            |    33 +-
 plugins/staticpages/language/portuguese_brazil_utf-8.php                                      |    33 +-
 plugins/staticpages/language/slovenian.php                                                    |    33 +-
 plugins/staticpages/language/slovenian_utf-8.php                                              |    33 +-
 plugins/staticpages/language/spanish.php                                                      |    33 +-
 plugins/staticpages/language/spanish_utf-8.php                                                |    33 +-
 plugins/staticpages/language/swedish.php                                                      |    33 +-
 plugins/staticpages/language/swedish_utf-8.php                                                |    33 +-
 plugins/staticpages/language/turkish.php                                                      |    33 +-
 plugins/staticpages/language/turkish_utf-8.php                                                |    33 +-
 plugins/staticpages/language/ukrainian.php                                                    |    33 +-
 plugins/staticpages/language/ukrainian_koi8-u.php                                             |    33 +-
 plugins/staticpages/language/ukrainian_utf-8.php                                              |    33 +-
 plugins/staticpages/services.inc.php                                                          |   189 +-
 plugins/staticpages/sql/mssql_install.php                                                     |    16 +-
 plugins/staticpages/sql/mssql_updates.php                                                     |   126 +
 plugins/staticpages/sql/mysql_install.php                                                     |    19 +-
 plugins/staticpages/sql/mysql_updates.php                                                     |   128 +
 plugins/staticpages/templates/admin/editor.thtml                                              |    40 +-
 plugins/staticpages/templates/admin/editor_advanced.thtml                                     |    46 +-
 plugins/staticpages/templates/printable.thtml                                                 |     2 +-
 plugins/xmlsitemap/autoinstall.php                                                            |     2 +-
 plugins/xmlsitemap/functions.inc                                                              |    43 +-
 plugins/xmlsitemap/install_defaults.php                                                       |     8 +-
 plugins/xmlsitemap/language/estonian.php                                                      |    71 +
 plugins/xmlsitemap/language/estonian_utf-8.php                                                |    71 +
 plugins/xmlsitemap/language/hebrew_utf-8.php                                                  |    71 +
 plugins/xmlsitemap/language/japanese_utf-8.php                                                |    36 +-
 plugins/xmlsitemap/sql/mssql_install.php                                                      |     3 +
 plugins/xmlsitemap/sql/mysql_install.php                                                      |     3 +
 public_html/admin/auth.inc.php                                                                |     9 +-
 public_html/admin/block.php                                                                   |   128 +-
 public_html/admin/configuration.php                                                           |    63 +-
 public_html/admin/database.php                                                                |   528 +-
 public_html/admin/group.php                                                                   |   252 +-
 public_html/admin/install/bigdump.php                                                         |    15 +-
 public_html/admin/install/config-install.php                                                  |    19 +-
 public_html/admin/install/help.php                                                            |     1 +
 public_html/admin/install/index.php                                                           |   171 +-
 public_html/admin/install/install-plugins.php                                                 |    10 +-
 public_html/admin/install/language/chinese_simplified_utf-8.php                               |    19 +-
 public_html/admin/install/language/chinese_traditional_utf-8.php                              |    19 +-
 public_html/admin/install/language/english.php                                                |    19 +-
 public_html/admin/install/language/german.php                                                 |   247 +-
 public_html/admin/install/language/hebrew_utf-8.php                                           |   273 +-
 public_html/admin/install/language/japanese_utf-8.php                                         |   355 +-
 public_html/admin/install/language/polish.php                                                 |    27 +-
 public_html/admin/install/lib-install.php                                                     |    86 +-
 public_html/admin/install/lib-upgrade.php                                                     |    73 +-
 public_html/admin/install/migrate.php                                                         |   131 +-
 public_html/admin/install/success.php                                                         |     2 +-
 public_html/admin/install/toinnodb.php                                                        |   107 -
 public_html/admin/mail.php                                                                    |    50 +-
 public_html/admin/moderation.php                                                              |    45 +-
 public_html/admin/plugins.php                                                                 |   114 +-
 public_html/admin/plugins/calendar/index.php                                                  |    29 +-
 public_html/admin/plugins/links/category.php                                                  |    15 +-
 public_html/admin/plugins/links/index.php                                                     |    14 +-
 public_html/admin/plugins/polls/index.php                                                     |    91 +-
 public_html/admin/plugins/staticpages/index.php                                               |   947 +-
 public_html/admin/sectest.php                                                                 |    19 +-
 public_html/admin/story.php                                                                   |   160 +-
 public_html/admin/syndication.php                                                             |    98 +-
 public_html/admin/topic.php                                                                   |    82 +-
 public_html/admin/trackback.php                                                               |    31 +-
 public_html/admin/user.php                                                                    |    81 +-
 public_html/article.php                                                                       |    45 +-
 public_html/calendar/event.php                                                                |    43 +-
 public_html/calendar/index.php                                                                |    13 +-
 public_html/comment.php                                                                       |    29 +-
 public_html/directory.php                                                                     |    11 +-
 public_html/docs/english/calendar.html                                                        |    22 +-
 public_html/docs/english/changes.html                                                         |   104 +-
 public_html/docs/english/config.html                                                          |    86 +-
 public_html/docs/english/index.html                                                           |    18 +-
 public_html/docs/english/install.html                                                         |    28 +-
 public_html/docs/english/links.html                                                           |    23 +-
 public_html/docs/english/plugin.html                                                          |   566 -
 public_html/docs/english/polls.html                                                           |    25 +-
 public_html/docs/english/spamx.html                                                           |     2 +-
 public_html/docs/english/staticpages.html                                                     |   136 +-
 public_html/docs/english/support.html                                                         |    16 +-
 public_html/docs/english/theme.html                                                           |   152 +-
 public_html/docs/english/themevars.html                                                       |    36 +-
 public_html/docs/english/trackback.html                                                       |     2 +-
 public_html/docs/history                                                                      |   446 +-
 public_html/docs/japanese/calendar.html                                                       |   120 +
 public_html/docs/japanese/changes.html                                                        |   732 +
 public_html/docs/japanese/config.html                                                         |  1422 +++
 public_html/docs/japanese/docstyle.css                                                        |    37 +
 public_html/docs/japanese/history.html                                                        |  3782 +++++++++
 public_html/docs/japanese/index.html                                                          |   121 +
 public_html/docs/japanese/install.html                                                        |   251 +
 public_html/docs/japanese/links.html                                                          |   155 +
 public_html/docs/japanese/polls.html                                                          |   133 +
 public_html/docs/japanese/spamx.html                                                          |   218 +
 public_html/docs/japanese/staticpages.html                                                    |   236 +
 public_html/docs/japanese/support.html                                                        |   104 +
 public_html/docs/japanese/theme.html                                                          |   874 ++
 public_html/docs/japanese/themevars.html                                                      |   312 +
 public_html/docs/japanese/trackback.html                                                      |   103 +
 public_html/fckeditor/_documentation.html                                                     |     2 +-
 public_html/fckeditor/_upgrade.html                                                           |     2 +-
 public_html/fckeditor/_whatsnew.html                                                          |   175 +-
 public_html/fckeditor/_whatsnew_history.html                                                  |   139 +
 public_html/fckeditor/editor/_source/classes/fckdomrange_ie.js                                |     8 +-
 public_html/fckeditor/editor/_source/classes/fckeditingarea.js                                |     4 +
 public_html/fckeditor/editor/_source/classes/fckpanel.js                                      |     3 +
 public_html/fckeditor/editor/_source/commandclasses/fck_othercommands.js                      |     4 +-
 public_html/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js                    |     8 +-
 public_html/fckeditor/editor/_source/fckeditorapi.js                                          |     4 +-
 public_html/fckeditor/editor/_source/internals/fck.js                                         |    42 +-
 public_html/fckeditor/editor/_source/internals/fck_gecko.js                                   |    10 +
 public_html/fckeditor/editor/_source/internals/fck_ie.js                                      |    20 +-
 public_html/fckeditor/editor/_source/internals/fckcommands.js                                 |     3 +
 public_html/fckeditor/editor/_source/internals/fckconfig.js                                   |     2 +-
 public_html/fckeditor/editor/_source/internals/fckdialog.js                                   |     2 +-
 public_html/fckeditor/editor/_source/internals/fckdomtools.js                                 |    48 +-
 public_html/fckeditor/editor/_source/internals/fckregexlib.js                                 |     2 +-
 public_html/fckeditor/editor/_source/internals/fckselection_ie.js                             |     3 +-
 public_html/fckeditor/editor/_source/internals/fcktoolbaritems.js                             |     9 +-
 public_html/fckeditor/editor/_source/internals/fcktoolbarset.js                               |     2 +-
 public_html/fckeditor/editor/_source/internals/fckxhtml.js                                    |    17 +
 public_html/fckeditor/editor/_source/internals/fckxhtml_ie.js                                 |    36 +
 public_html/fckeditor/editor/dialog/fck_about.html                                            |    10 +-
 public_html/fckeditor/editor/dialog/fck_docprops.html                                         |    34 +-
 public_html/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html                    |     2 +-
 public_html/fckeditor/editor/dialog/fck_paste.html                                            |    12 +-
 public_html/fckeditor/editor/dialog/fck_table.html                                            |    45 +-
 public_html/fckeditor/editor/dialog/fck_tablecell.html                                        |     6 +-
 public_html/fckeditor/editor/dtd/fck_dtd_test.html                                            |    82 +-
 public_html/fckeditor/editor/fckdebug.html                                                    |   305 +-
 public_html/fckeditor/editor/fckeditor.html                                                   |   633 +-
 public_html/fckeditor/editor/fckeditor.original.html                                          |   848 +-
 public_html/fckeditor/editor/filemanager/browser/default/frmresourceslist.html                |     4 +-
 public_html/fckeditor/editor/filemanager/browser/default/images/icons/default.icon.gif0000644 |       
 public_html/fckeditor/editor/filemanager/connectors/php/basexml.php                           |    10 +-
 public_html/fckeditor/editor/filemanager/connectors/php/commands.php                          |    55 +-
 public_html/fckeditor/editor/filemanager/connectors/php/config.php                            |    29 +-
 public_html/fckeditor/editor/filemanager/connectors/php/connector.php                         |     2 +-
 public_html/fckeditor/editor/filemanager/connectors/php/io.php                                |    12 +-
 public_html/fckeditor/editor/filemanager/connectors/php/phpcompat.php                         |     2 +-
 public_html/fckeditor/editor/filemanager/connectors/php/upload.php                            |     4 +-
 public_html/fckeditor/editor/filemanager/connectors/php/util.php                              |     2 +-
 public_html/fckeditor/editor/js/fckeditorcode_gecko.js                                        |    31 +-
 public_html/fckeditor/editor/js/fckeditorcode_ie.js                                           |    37 +-
 public_html/fckeditor/editor/lang/_translationstatus.txt                                      |   112 +-
 public_html/fckeditor/editor/lang/af.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/ar.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/bg.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/bn.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/bs.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/ca.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/cs.js                                                       |    23 +-
 public_html/fckeditor/editor/lang/da.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/de.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/el.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/en-au.js                                                    |     7 +-
 public_html/fckeditor/editor/lang/en-ca.js                                                    |     7 +-
 public_html/fckeditor/editor/lang/en-uk.js                                                    |     7 +-
 public_html/fckeditor/editor/lang/en.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/eo.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/es.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/et.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/eu.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/fa.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/fi.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/fo.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/fr-ca.js                                                    |     7 +-
 public_html/fckeditor/editor/lang/fr.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/gl.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/gu.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/he.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/hi.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/hr.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/hu.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/is.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/it.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/ja.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/km.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/ko.js                                                       |     9 +-
 public_html/fckeditor/editor/lang/lt.js                                                       |   111 +-
 public_html/fckeditor/editor/lang/lv.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/mn.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/ms.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/nb.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/nl.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/no.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/pl.js                                                       |    11 +-
 public_html/fckeditor/editor/lang/pt-br.js                                                    |     7 +-
 public_html/fckeditor/editor/lang/pt.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/ro.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/ru.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/sk.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/sl.js                                                       |    37 +-
 public_html/fckeditor/editor/lang/sr-latn.js                                                  |     7 +-
 public_html/fckeditor/editor/lang/sr.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/sv.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/th.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/tr.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/uk.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/vi.js                                                       |     7 +-
 public_html/fckeditor/editor/lang/zh-cn.js                                                    |     7 +-
 public_html/fckeditor/editor/lang/zh.js                                                       |     7 +-
 public_html/fckeditor/fckconfig.js                                                            |     2 +-
 public_html/fckeditor/fckeditor.js                                                            |     4 +-
 public_html/fckeditor/fckeditor.php                                                           |     2 +-
 public_html/fckeditor/fckeditor_php4.php                                                      |     2 +-
 public_html/fckeditor/fckeditor_php5.php                                                      |     2 +-
 public_html/fckeditor/fckpackager.xml                                                         |     6 +-
 public_html/fckeditor/fckstyles.xml                                                           |     2 +-
 public_html/fckeditor/fcktemplates.xml                                                        |     2 +-
 public_html/fckeditor/license.txt                                                             |     2 +-
 public_html/getimage.php                                                                      |     2 +-
 public_html/help/advancedsearch.html                                                          |   107 +-
 public_html/help/cccommentsubmission.html                                                     |    62 +
 public_html/help/ccdraftsubmission.html                                                       |    48 +
 public_html/help/cceventsubmission.html                                                       |    68 +-
 public_html/help/cclinksubmission.html                                                        |    68 +-
 public_html/help/ccstorysubmission.html                                                       |    70 +-
 public_html/help/ccusersubmission.html                                                        |    51 +
 public_html/help/submitevent.html                                                             |    96 +-
 public_html/help/submitlink.html                                                              |    73 +-
 public_html/help/submitstory.html                                                             |   110 +-
 public_html/index.php                                                                         |    50 +-
 public_html/javascript/advanced_editor.js                                                     |    21 +-
 public_html/javascript/common.js                                                              |     6 +-
 public_html/javascript/configmanager.js                                                       |    34 +-
 public_html/javascript/moveusers.js                                                           |     6 +-
 public_html/javascript/profile_editor.js                                                      |    21 +-
 public_html/javascript/staticpages_fckeditor.js                                               |    23 +-
 public_html/javascript/storyeditor_fckeditor.js                                               |    26 +-
 public_html/javascript/submitcomment_fckeditor.js                                             |    23 +-
 public_html/javascript/submitstory_fckeditor.js                                               |    23 +-
 public_html/layout/professional/admin/block/blockeditor.thtml                                 |     2 +-
 public_html/layout/professional/admin/common/edit_permissions.thtml                           |    24 +-
 public_html/layout/professional/admin/config/config_element.thtml                             |    18 +-
 public_html/layout/professional/admin/config/configuration.thtml                              |     4 +-
 public_html/layout/professional/admin/config/menu_element.thtml                               |     4 +-
 public_html/layout/professional/admin/group/groupeditor.thtml                                 |    14 +-
 public_html/layout/professional/admin/mail/mailform.thtml                                     |    29 +-
 public_html/layout/professional/admin/story/storyeditor.thtml                                 |    12 +-
 public_html/layout/professional/admin/story/storyeditor_advanced.thtml                        |    22 +-
 public_html/layout/professional/admin/topic/topiceditor.thtml                                 |    18 +-
 public_html/layout/professional/admin/user/edituser.thtml                                     |     2 +-
 public_html/layout/professional/images/update.png                                             |       
 public_html/layout/professional/lists/inline/list.thtml                                       |    16 +-
 public_html/layout/professional/lists/inline/page_limit.thtml                                 |     2 +-
 public_html/layout/professional/lists/inline/page_sort.thtml                                  |     2 +-
 public_html/layout/professional/lists/table/list.thtml                                        |     8 +-
 public_html/layout/professional/lists/table/page_limit.thtml                                  |     2 +-
 public_html/layout/professional/lists/table/page_sort.thtml                                   |     2 +-
 public_html/layout/professional/preferences/displayblock.thtml                                |     1 +
 public_html/layout/professional/preferences/editor.thtml                                      |     4 +
 public_html/layout/professional/profiles/contactauthorform.thtml                              |    21 +-
 public_html/layout/professional/profiles/contactuserform.thtml                                |    28 +-
 public_html/layout/professional/search/searchform.thtml                                       |     2 +-
 public_html/layout/professional/style.css                                                     |    51 +-
 public_html/lib-common.php                                                                    |   784 +-
 public_html/links/index.php                                                                   |    27 +-
 public_html/pingback.php                                                                      |    39 +-
 public_html/polls/index.php                                                                   |    51 +-
 public_html/polls/style.css                                                                   |    21 +
 public_html/profiles.php                                                                      |   174 +-
 public_html/robots.txt                                                                        |     1 +
 public_html/siteconfig.php.dist                                                               |     2 +-
 public_html/staticpages/index.php                                                             |    10 +-
 public_html/stats.php                                                                         |     4 +-
 public_html/submit.php                                                                        |    35 +-
 public_html/users.php                                                                         |   360 +-
 public_html/usersettings.php                                                                  |   154 +-
 sql/mssql_tableanddata.php                                                                    |    36 +-
 sql/mysql_tableanddata.php                                                                    |   112 +-
 sql/updates/mssql_1.5.2_to_1.6.0.php                                                          |     5 +-
 sql/updates/mssql_1.6.0_to_1.6.1.php                                                          |    36 +
 sql/updates/mssql_1.6.1_to_1.6.2.php                                                          |    29 +
 sql/updates/mysql_1.5.2_to_1.6.0.php                                                          |     5 +-
 sql/updates/mysql_1.6.0_to_1.6.1.php                                                          |    39 +
 sql/updates/mysql_1.6.1_to_1.6.2.php                                                          |    29 +
 system/classes/calendar.class.php                                                             |    17 +-
 system/classes/config.class.php                                                               |   113 +-
 system/classes/downloader.class.php                                                           |     4 +-
 system/classes/listfactory.class.php                                                          |   338 +-
 system/classes/plugin.class.php                                                               |     3 +
 system/classes/search.class.php                                                               |   422 +-
 system/classes/searchcriteria.class.php                                                       |   118 +-
 system/classes/story.class.php                                                                |   268 +-
 system/classes/template.class.php                                                             |     8 +-
 system/classes/timezoneconfig.class.php                                                       |   300 +
 system/classes/unpacker.class.php                                                             |   952 +-
 system/classes/upload.class.php                                                               |    13 +-
 system/databases/mssql.class.php                                                              |     3 +-
 system/databases/mysql.class.php                                                              |     2 +-
 system/databases/pgsql.class.php                                                              |  1662 ++--
 system/lib-admin.php                                                                          |   376 +-
 system/lib-comment.php                                                                        |   338 +-
 system/lib-custom.php.dist                                                                    |    11 +
 system/lib-database.php                                                                       |     5 +-
 system/lib-mbyte.php                                                                          |    57 +-
 system/lib-pingback.php                                                                       |    23 +-
 system/lib-plugins.php                                                                        |    34 +-
 system/lib-security.php                                                                       |   511 +-
 system/lib-sessions.php                                                                       |     6 +-
 system/lib-story.php                                                                          |    31 +-
 system/lib-trackback.php                                                                      |     8 +-
 system/lib-user.php                                                                           |   101 +-
 555 files changed, 29337 insertions(+), 10473 deletions(-)

diffs (truncated from 66642 to 300 lines):

diff -r ec6ff9254174 -r 3f3700aee0c2 .hgignore
--- a/.hgignore	Mon Aug 31 17:44:16 2009 -0400
+++ b/.hgignore	Sat Jan 16 12:44:07 2010 +0100
@@ -17,6 +17,8 @@
 public_html/siteconfig.php
 system/lib-custom.php
 
+public_html/sitemap.xml
+
 config.php
 plugins/calendar/config.php
 plugins/links/config.php
diff -r ec6ff9254174 -r 3f3700aee0c2 .hgtags
--- a/.hgtags	Mon Aug 31 17:44:16 2009 -0400
+++ b/.hgtags	Sat Jan 16 12:44:07 2010 +0100
@@ -2,3 +2,11 @@
 8abbb13ee513b6cf2c76d702273c3fa118f9bf5c geeklog_1_5_1_stable
 0c7d10cbc6bf6c040842707763920ccd9dea6d15 geeklog_1_6_0b1
 b73a34f5e8e667c045173c9dd2a2f3a1b29a37bf geeklog_1_6_0b2
+c255cdae51b7fead30ea2b8e04350cc70561fcdd geeklog_1_6_0b3
+401071b8493d706c3cc69a7d7f578d626da70be3 geeklog_1_6_0rc1
+f63c5d515e67d58ec7cc232b3007d11b0bc65d1b geeklog_1_6_0rc2
+f461a0655b760ff2f58b440d18d45ca58e80e884 geeklog_1_6_0_stable
+f0de67e8e9304e43062f293941dee29def2ec8db geeklog_1_4_1_stable
+aa322b3c4d3debfac52df37fdd2cfedaba632480 geeklog_1_6_1b1
+029182f0ca35cca84d0b464c1ef56643e603cad5 geeklog_1_6_1rc1
+af66ab1075355a4c175edbaef724477cda350ef8 geeklog_1_6_1_stable
diff -r ec6ff9254174 -r 3f3700aee0c2 language/afrikaans.php
--- a/language/afrikaans.php	Mon Aug 31 17:44:16 2009 -0400
+++ b/language/afrikaans.php	Sat Jan 16 12:44:07 2010 +0100
@@ -80,7 +80,7 @@
     37 => 'Geen gebruiker artikels',
     38 => 'Inhoud Sindikasie',
     39 => 'Herlaai',
-    40 => 'Jou <tt>register_globals = Off</tt> in jou <tt>php.ini</tt>. Geekolog vereis egter dat <tt>register_globals</tt> <strong>aan</strong> is. Voordat jy verder gaan, stel dit na <strong>on</strong> en herlaai jou webblaaier.',
+    40 => '',
     41 => 'Besoekers',
     42 => 'Geskryf deur:',
     43 => 'Antwoord hierop',
@@ -365,7 +365,7 @@
     137 => 'Filter Story Content',
     138 => 'Misc Settings',
     139 => 'Layout and Language',
-    140 => '<li>No Topic Icons if checked will not display the story topic icons</li><li>No boxes if checked will only show the Admin Menu, User Menu and Topics<li>Set the maximum number of stories to show per page</li><li>Set your theme and perferred date format</li>',
+    140 => '<li>No Topic Icons if checked will not display the story topic icons</li><li>No boxes if checked will only show the Admin Menu, User Menu and Topics</li><li>Set the maximum number of stories to show per page</li><li>Set your theme, timezone and preferred date format</li>',
     141 => 'Privacy Settings',
     142 => 'The default setting is to allow users & admins to email fellow site members and show your status as online. Un-check these options to protect your privacy.',
     143 => 'Filter Block Content',
@@ -382,7 +382,10 @@
     159 => 'This email was generated automatically. Please do not reply to this email.',
     160 => '(max. %d x %d pixels, %d bytes; %s)',
     161 => 'will be scaled down',
-    162 => 'will not be scaled'
+    162 => 'will not be scaled',
+    163 => 'Re-Authentication Failed',
+    164 => 'You have exceeded the number of allowed attempts for re-authentication. The operation has been aborted and your recent changes were lost, sorry.',
+    165 => 'Use Advanced Editor'
 );
 
 ###############################################################################
@@ -529,7 +532,9 @@
     67 => 'Show %d Results',
     68 => 'Sort By',
     69 => 'Titles Only',
-    70 => 'Not available ...'
+    70 => 'Not available ...',
+    71 => 'asc',
+    72 => 'desc'
 );
 
 ###############################################################################
@@ -824,7 +829,10 @@
     85 => 'Wys Alles',
     86 => 'Advanced Editor',
     87 => 'Story Stats',
-    88 => 'Wiki-style format'
+    88 => 'Wiki-style format',
+    89 => 'Meta Description',
+    90 => 'Meta Keywords',
+    91 => 'You can always hit "Preview" to extend the expiry time.'
 );
 
 ###############################################################################
@@ -859,7 +867,8 @@
     26 => 'maak hierdie die standaard onderwerp vir die artikelargief. Slegs een onderwerp toegelaat.',
     27 => 'of Laai Onderwerp Ikoon',
     28 => 'Maksimum',
-    29 => 'Lêer Oplaai Foute'
+    29 => 'Lêer Oplaai Foute',
+    30 => 'Stories in Topic'
 );
 
 ###############################################################################
@@ -952,7 +961,10 @@
     84 => "Your login name is: %s  for our site: {$_CONF['site_url']}",
     85 => 'If you have forgotten the password use the following link: %s',
     86 => 'Include',
-    87 => 'Reminders'
+    87 => 'Reminders',
+    88 => 'Default Group',
+    89 => 'Check to make this a default group for new users',
+    90 => 'Apply "Default Group" change to existing user accounts'
 );
 
 ###############################################################################
@@ -1061,6 +1073,7 @@
     39 => 'Upload a plugin',
     40 => 'You can upload a plugin archive (.tar.gz, .tgz, .zip) directly here:',
     41 => 'Upload',
+    42 => 'Click to update',
     99 => 'An unknown error occured',
     100 => 'Ok.',
     101 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
@@ -1179,7 +1192,7 @@
     44 => 'Die prop is suksesvol gestoor!',
     45 => 'Die prop is suksesvol verwyder.',
     46 => '',
-    47 => 'Hierdie funksie werk slegs onder *nix stelsels.  Indien u wel \'n *nix bedryfstelsel gebruik is u kasgeheue suksesvol skoongevee. As u op Windows werk, moet u na lêers soek met die naam adodb_*.php en hulle handmatig verwyder.',
+    47 => '',
     48 => "Dankie vir u aansoek vir lidmaatskap tot {$_CONF['site_name']}. Ons span sal u aansoek nagaan.  Indien goedgekeur, sal u wagwoord gestuur word aan die epos adres wat u verskaf het.",
     49 => 'U groep is suksesvol gestoor.',
     50 => 'Die groep is suksesvol verwyder.',
@@ -1322,7 +1335,26 @@
     'size' => 'Grootte',
     'bytes' => 'Grepe',
     'total_number' => 'Totale aantal rugsteunings: %d',
-    'download' => 'Click to download this file'
+    'download' => 'Click to download this file',
+    'new_backup' => 'New Backup',
+    'delete_failure' => 'One or more backup files could not be deleted.',
+    'delete_success' => 'Backup file(s) successfully deleted.',
+    'convert_menu' => 'Convert to InnoDB',
+    'convert_title' => 'Convert to InnoDB tables',
+    'convert_button' => 'Convert',
+    'sorry_no_innodb' => 'Sorry, your version of MySQL does not support InnoDB tables.',
+    'innodb_explain' => 'InnoDB tables provide better performance on <em>really</em> large databases but make the backup process more complicated. Please <a href="http://dev.mysql.com/doc/mysql/en/innodb.html">read up</a> on the pros and cons of InnoDB tables before you perform this operation.',
+    'already_converted' => 'Note: It appears that all of the tables have already been converted to InnoDB.',
+    'conversion_patience' => 'Note: Conversion may take some time - please be patient.',
+    'innodb_success' => 'Successfully converted tables to InnoDB.',
+    'table_issues' => 'There may have been problems with some tables, though. Please check error.log for details.',
+    'optimize_menu' => 'Optimize Tables',
+    'optimize_title' => 'Optimize Tables',
+    'optimize_button' => 'Optimize',
+    'optimize_explain' => 'Optimizing tables may help to improve the performance of your site. The actual impact depends on the table usage and some tables may benefit from it more than others. Do no expect to see a huge difference in performance. The <a href="http://dev.mysql.com/doc/mysql/en/optimize-table.html">MySQL manual</a> states: <q>it is not likely that you need to do this more than once a week or month</q>.',
+    'last_optimization' => 'Last optimization',
+    'optimization_patience' => 'Note: Optimization may take some time - please be patient.',
+    'optimize_success' => 'Successfully optimized database tables.'
 );
 
 ###############################################################################
@@ -1471,7 +1503,7 @@
     'public_html' => '"public_html" should never be part of your site\'s URL.  Please read the part about public_html in the %s again and change your setup accordingly before you proceed.',
     'installation' => 'installation instructions',
     'directory' => 'directory',
-    'failed_bak' => 'Failed to create a temporary file in your data directory. Check your directory permissions!',
+    'failed_tmp' => 'Failed to create a temporary file in your %s directory. Check your directory permissions!',
     'fix_it' => 'This is a security risk and should be fixed!',
     'reachable' => 'Your %s is reachable from the web.',
     'not_reachable' => 'Good! Your %s is not reachable from the web.',
@@ -1571,7 +1603,13 @@
     'addchild' => 'Add child',
     'list' => 'list',
     'list_all' => 'List all',
-    'na' => 'N/A'
+    'meta_description' => 'Meta Description',
+    'meta_keywords' => 'Meta Keywords',
+    'na' => 'N/A',
+    'token_expiry' => 'You have until %s to make changes. After that time, the security token embedded into this page will expire and you will lose your changes.',
+    'token_expired' => 'The security token for this operation has expired. Please authenticate again to continue.',
+    'reauth_msg' => 'The security token for this operation has expired. If you want to continue with this operation, then please authenticate again below. This will ensure that the changes you just made will not be lost.',
+    'authenticate' => 'Authenticate'
 );
 
 # Localisation of the texts for the various drop-down menus that are actually
@@ -1837,17 +1875,22 @@
     'disable_autolinks' => 'Disable Autolinks?',
     'clickable_links' => 'Make URLs clickable?',
     'compressed_output' => 'Send compressed output?',
+    'frame_options' => 'Protection against "clickjacking"',
     'censormode' => 'Censor Mode?',
     'censorreplace' => 'Censor Replace Text',
     'censorlist' => 'Censor List',
     'ip_lookup' => 'IP Lookup',
     'url_rewrite' => 'Enable URL Rewrite',
+    'meta_tags' => 'Meta Tags',
+    'meta_description' => 'Default Meta Description',
+    'meta_keywords' => 'Default Meta Keywords',
     'default_permissions_block' => 'Block Default Permissions',
     'default_permissions_story' => 'Story Default Permissions',
     'default_permissions_topic' => 'Topic Default Permissions',
     'atom_max_stories' => 'Max. Stories in Webservices Feed',
     'disable_webservices' => 'Disable Webservices?',
     'restrict_webservices' => 'Restrict Webservices?',
+    'article_comment_close_enabled' => 'Automatically close comments (default)',
     'article_comment_close_days' => 'Days to close comments (default)',
     'comment_close_rec_stories' => 'Number of most recent stories enabled for comments',
     'allow_reply_notifications' => 'Allow comment reply notifications?',
@@ -1938,7 +1981,11 @@
     18 => array('Disabled' => 0, 'Enabled (Exact Match)' => 1, 'Enabled (Word Beginning)' => 2, 'Enabled (Word Fragment)' => 3),
     19 => array('Google' => 'google', 'Table' => 'table'),
     20 => array('Exact Phrase' => 'phrase', 'All of The Words' => 'all', 'Any of The Words' => 'any'),
-    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict')
+    21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict'),
+    22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
+    23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2),
+    24 => array('Contribute' => 'contribute', 'Home' => 'home', 'Advanced Search' => 'search', 'Directory' => 'directory', 'My Account' => 'prefs', 'Plugin Entries' => 'plugins', 'Custom Entries' => 'custom', 'Site Statistics' => 'stats'),
+    25 => array('New Stories' => 'story', 'New Comments' => 'comment', 'New Trackbacks' => 'trackback', 'New Pingbacks' => 'pingback', 'New Users' => 'user')
 );
 
 ?>
diff -r ec6ff9254174 -r 3f3700aee0c2 language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php	Mon Aug 31 17:44:16 2009 -0400
+++ b/language/afrikaans_utf-8.php	Sat Jan 16 12:44:07 2010 +0100
@@ -80,7 +80,7 @@
     37 => 'Geen gebruiker artikels',
     38 => 'Inhoud Sindikasie',
     39 => 'Herlaai',
-    40 => 'Jou <tt>register_globals = Off</tt> in jou <tt>php.ini</tt>. Geekolog vereis egter dat <tt>register_globals</tt> <strong>aan</strong> is. Voordat jy verder gaan, stel dit na <strong>on</strong> en herlaai jou webblaaier.',
+    40 => '',
     41 => 'Besoekers',
     42 => 'Geskryf deur:',
     43 => 'Antwoord hierop',
@@ -365,7 +365,7 @@
     137 => 'Filter Story Content',
     138 => 'Misc Settings',
     139 => 'Layout and Language',
-    140 => '<li>No Topic Icons if checked will not display the story topic icons</li><li>No boxes if checked will only show the Admin Menu, User Menu and Topics<li>Set the maximum number of stories to show per page</li><li>Set your theme and perferred date format</li>',
+    140 => '<li>No Topic Icons if checked will not display the story topic icons</li><li>No boxes if checked will only show the Admin Menu, User Menu and Topics</li><li>Set the maximum number of stories to show per page</li><li>Set your theme, timezone and preferred date format</li>',
     141 => 'Privacy Settings',
     142 => 'The default setting is to allow users & admins to email fellow site members and show your status as online. Un-check these options to protect your privacy.',
     143 => 'Filter Block Content',
@@ -382,7 +382,10 @@
     159 => 'This email was generated automatically. Please do not reply to this email.',
     160 => '(max. %d x %d pixels, %d bytes; %s)',
     161 => 'will be scaled down',
-    162 => 'will not be scaled'
+    162 => 'will not be scaled',
+    163 => 'Re-Authentication Failed',
+    164 => 'You have exceeded the number of allowed attempts for re-authentication. The operation has been aborted and your recent changes were lost, sorry.',
+    165 => 'Use Advanced Editor'
 );
 
 ###############################################################################
@@ -529,7 +532,9 @@
     67 => 'Show %d Results',
     68 => 'Sort By',
     69 => 'Titles Only',
-    70 => 'Not available ...'
+    70 => 'Not available ...',
+    71 => 'asc',
+    72 => 'desc'
 );
 
 ###############################################################################
@@ -824,7 +829,10 @@
     85 => 'Wys Alles',
     86 => 'Advanced Editor',
     87 => 'Story Stats',
-    88 => 'Wiki-style format'
+    88 => 'Wiki-style format',
+    89 => 'Meta Description',
+    90 => 'Meta Keywords',
+    91 => 'You can always hit "Preview" to extend the expiry time.'
 );
 
 ###############################################################################
@@ -859,7 +867,8 @@
     26 => 'maak hierdie die standaard onderwerp vir die artikelargief. Slegs een onderwerp toegelaat.',
     27 => 'of Laai Onderwerp Ikoon',
     28 => 'Maksimum',
-    29 => 'Lêer Oplaai Foute'
+    29 => 'Lêer Oplaai Foute',
+    30 => 'Stories in Topic'
 );
 
 ###############################################################################
@@ -952,7 +961,10 @@
     84 => "Your login name is: %s  for our site: {$_CONF['site_url']}",
     85 => 'If you have forgotten the password use the following link: %s',
     86 => 'Include',
-    87 => 'Reminders'
+    87 => 'Reminders',
+    88 => 'Default Group',
+    89 => 'Check to make this a default group for new users',
+    90 => 'Apply "Default Group" change to existing user accounts'
 );
 
 ###############################################################################
@@ -1061,6 +1073,7 @@
     39 => 'Upload a plugin',
     40 => 'You can upload a plugin archive (.tar.gz, .tgz, .zip) directly here:',
     41 => 'Upload',
+    42 => 'Click to update',
     99 => 'An unknown error occured',
     100 => 'Ok.',
     101 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
@@ -1179,7 +1192,7 @@
     44 => 'Die prop is suksesvol gestoor!',
     45 => 'Die prop is suksesvol verwyder.',
     46 => '',



More information about the geeklog-cvs mailing list