[geeklog-cvs] geeklog: Merged with "timezone" feature branch

geeklog-cvs at lists.geeklog.net geeklog-cvs at lists.geeklog.net
Sun Nov 1 04:05:58 EST 2009


changeset 7434:aa322b3c4d3d
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/aa322b3c4d3d
user: Dirk Haun <dirk at haun-online.de>
date: Sun Nov 01 09:43:28 2009 +0100
description:
Merged with "timezone" feature branch

diffstat:

 language/afrikaans.php                                                 |   46 +-
 language/afrikaans_utf-8.php                                           |   46 +-
 language/bosnian.php                                                   |   46 +-
 language/bosnian_utf-8.php                                             |   46 +-
 language/bulgarian.php                                                 |   46 +-
 language/bulgarian_utf-8.php                                           |   46 +-
 language/catalan.php                                                   |   46 +-
 language/catalan_utf-8.php                                             |   46 +-
 language/chinese_simplified_utf-8.php                                  |   46 +-
 language/chinese_traditional_utf-8.php                                 |   46 +-
 language/croatian.php                                                  |   46 +-
 language/croatian_utf-8.php                                            |   46 +-
 language/czech.php                                                     |   46 +-
 language/czech_utf-8.php                                               |   46 +-
 language/danish.php                                                    |   46 +-
 language/danish_utf-8.php                                              |   46 +-
 language/dutch.php                                                     |   46 +-
 language/dutch_utf-8.php                                               |   46 +-
 language/english.php                                                   |   45 +-
 language/english_utf-8.php                                             |   49 +-
 language/estonian.php                                                  |   50 +-
 language/estonian_utf-8.php                                            |   50 +-
 language/farsi_utf-8.php                                               |   46 +-
 language/finnish.php                                                   |   46 +-
 language/finnish_utf-8.php                                             |   46 +-
 language/french_canada.php                                             |   46 +-
 language/french_canada_utf-8.php                                       |   46 +-
 language/french_france.php                                             |   46 +-
 language/french_france_utf-8.php                                       |   46 +-
 language/german.php                                                    |   60 +-
 language/german_formal.php                                             |   58 +-
 language/german_formal_utf-8.php                                       |   58 +-
 language/german_utf-8.php                                              |   60 +-
 language/hebrew_utf-8.php                                              |   44 +-
 language/hellenic.php                                                  |   46 +-
 language/hellenic_utf-8.php                                            |   46 +-
 language/indonesian.php                                                |   46 +-
 language/indonesian_utf-8.php                                          |   46 +-
 language/italian.php                                                   |   46 +-
 language/italian_utf-8.php                                             |   46 +-
 language/japanese_utf-8.php                                            |  429 ++++---
 language/korean.php                                                    |   46 +-
 language/korean_utf-8.php                                              |   46 +-
 language/norwegian.php                                                 |   46 +-
 language/norwegian_utf-8.php                                           |   46 +-
 language/polish.php                                                    |   46 +-
 language/polish_utf-8.php                                              |   46 +-
 language/portuguese.php                                                |   46 +-
 language/portuguese_brazil.php                                         |   46 +-
 language/portuguese_brazil_utf-8.php                                   |   46 +-
 language/portuguese_utf-8.php                                          |   46 +-
 language/romanian.php                                                  |   46 +-
 language/romanian_utf-8.php                                            |   46 +-
 language/russian.php                                                   |   46 +-
 language/russian_utf-8.php                                             |   46 +-
 language/serbian.php                                                   |   46 +-
 language/serbian_utf-8.php                                             |   46 +-
 language/slovak.php                                                    |   46 +-
 language/slovak_utf-8.php                                              |   46 +-
 language/slovenian.php                                                 |   46 +-
 language/slovenian_utf-8.php                                           |   46 +-
 language/spanish.php                                                   |   46 +-
 language/spanish_argentina.php                                         |   46 +-
 language/spanish_argentina_utf-8.php                                   |   46 +-
 language/spanish_utf-8.php                                             |   46 +-
 language/swedish.php                                                   |   46 +-
 language/swedish_utf-8.php                                             |   46 +-
 language/turkish.php                                                   |   46 +-
 language/turkish_utf-8.php                                             |   46 +-
 language/ukrainian.php                                                 |   46 +-
 language/ukrainian_koi8-u.php                                          |   46 +-
 language/ukrainian_utf-8.php                                           |   46 +-
 plugins/calendar/autoinstall.php                                       |   16 +-
 plugins/calendar/functions.inc                                         |   91 +-
 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                                 |    2 +-
 plugins/calendar/language/french_canada.php                            |    2 +-
 plugins/calendar/language/french_canada_utf-8.php                      |    2 +-
 plugins/calendar/language/german.php                                   |    2 +-
 plugins/calendar/language/german_formal.php                            |    2 +-
 plugins/calendar/language/german_formal_utf-8.php                      |    2 +-
 plugins/calendar/language/german_utf-8.php                             |    2 +-
 plugins/calendar/language/japanese_utf-8.php                           |   16 +-
 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                                 |    5 +-
 plugins/calendar/sql/mssql_updates.php                                 |   43 +
 plugins/calendar/sql/mysql_install.php                                 |    3 +-
 plugins/calendar/sql/mysql_updates.php                                 |   43 +
 plugins/links/autoinstall.php                                          |    6 +-
 plugins/links/functions.inc                                            |   16 +-
 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                                    |    5 +-
 plugins/links/language/estonian_utf-8.php                              |    5 +-
 plugins/links/language/french_canada.php                               |    5 +-
 plugins/links/language/french_canada_utf-8.php                         |    5 +-
 plugins/links/language/german.php                                      |    5 +-
 plugins/links/language/german_formal.php                               |    5 +-
 plugins/links/language/german_formal_utf-8.php                         |    5 +-
 plugins/links/language/german_utf-8.php                                |    5 +-
 plugins/links/language/hebrew_utf-8.php                                |    3 +-
 plugins/links/language/japanese_utf-8.php                              |   23 +-
 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/templates/admin/categoryeditor.thtml                     |    4 +
 plugins/polls/autoinstall.php                                          |   10 +-
 plugins/polls/functions.inc                                            |   63 +-
 plugins/polls/language/chinese_simplified_utf-8.php                    |    7 +-
 plugins/polls/language/chinese_traditional_utf-8.php                   |    7 +-
 plugins/polls/language/dutch.php                                       |    7 +-
 plugins/polls/language/dutch_utf-8.php                                 |    7 +-
 plugins/polls/language/estonian.php                                    |    7 +-
 plugins/polls/language/estonian_utf-8.php                              |    5 +-
 plugins/polls/language/french_canada.php                               |    7 +-
 plugins/polls/language/french_canada_utf-8.php                         |    7 +-
 plugins/polls/language/german.php                                      |    7 +-
 plugins/polls/language/german_formal.php                               |    7 +-
 plugins/polls/language/german_formal_utf-8.php                         |    7 +-
 plugins/polls/language/german_utf-8.php                                |    7 +-
 plugins/polls/language/hebrew_utf-8.php                                |    5 +-
 plugins/polls/language/japanese_utf-8.php                              |   53 +-
 plugins/polls/language/korean.php                                      |    7 +-
 plugins/polls/language/korean_utf-8.php                                |    7 +-
 plugins/polls/language/russian.php                                     |    7 +-
 plugins/polls/language/russian_utf-8.php                               |    7 +-
 plugins/polls/language/slovenian.php                                   |    7 +-
 plugins/polls/language/slovenian_utf-8.php                             |    7 +-
 plugins/polls/language/spanish.php                                     |    7 +-
 plugins/polls/language/spanish_utf-8.php                               |    7 +-
 plugins/polls/language/ukrainian.php                                   |    7 +-
 plugins/polls/language/ukrainian_koi8-u.php                            |    7 +-
 plugins/polls/language/ukrainian_utf-8.php                             |    7 +-
 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                                     |    2 +-
 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/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/italian.php                                     |    2 +-
 plugins/spamx/language/italian_utf-8.php                               |    2 +-
 plugins/spamx/language/japanese_utf-8.php                              |    4 +-
 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/staticpages/autoinstall.php                                    |   12 +-
 plugins/staticpages/functions.inc                                      |  184 ++-
 plugins/staticpages/install_defaults.php                               |   51 +-
 plugins/staticpages/language/chinese_simplified_utf-8.php              |   19 +-
 plugins/staticpages/language/chinese_traditional_utf-8.php             |   19 +-
 plugins/staticpages/language/czech.php                                 |   19 +-
 plugins/staticpages/language/czech_utf-8.php                           |   19 +-
 plugins/staticpages/language/danish.php                                |   19 +-
 plugins/staticpages/language/danish_utf-8.php                          |   19 +-
 plugins/staticpages/language/dutch.php                                 |   19 +-
 plugins/staticpages/language/dutch_utf-8.php                           |   19 +-
 plugins/staticpages/language/english.php                               |   16 +-
 plugins/staticpages/language/english_utf-8.php                         |   16 +-
 plugins/staticpages/language/estonian.php                              |   19 +-
 plugins/staticpages/language/estonian_utf-8.php                        |   19 +-
 plugins/staticpages/language/farsi_utf-8.php                           |   19 +-
 plugins/staticpages/language/french_canada.php                         |   19 +-
 plugins/staticpages/language/french_canada_utf-8.php                   |   19 +-
 plugins/staticpages/language/german.php                                |   19 +-
 plugins/staticpages/language/german_formal.php                         |   19 +-
 plugins/staticpages/language/german_formal_utf-8.php                   |   19 +-
 plugins/staticpages/language/german_utf-8.php                          |   19 +-
 plugins/staticpages/language/hebrew_utf-8.php                          |   17 +-
 plugins/staticpages/language/italian.php                               |   19 +-
 plugins/staticpages/language/italian_utf-8.php                         |   19 +-
 plugins/staticpages/language/japanese_utf-8.php                        |   21 +-
 plugins/staticpages/language/korean.php                                |   19 +-
 plugins/staticpages/language/korean_utf-8.php                          |   19 +-
 plugins/staticpages/language/polish.php                                |   19 +-
 plugins/staticpages/language/polish_utf-8.php                          |   19 +-
 plugins/staticpages/language/portuguese_brazil.php                     |   19 +-
 plugins/staticpages/language/portuguese_brazil_utf-8.php               |   19 +-
 plugins/staticpages/language/slovenian.php                             |   19 +-
 plugins/staticpages/language/slovenian_utf-8.php                       |   19 +-
 plugins/staticpages/language/spanish.php                               |   19 +-
 plugins/staticpages/language/spanish_utf-8.php                         |   19 +-
 plugins/staticpages/language/swedish.php                               |   19 +-
 plugins/staticpages/language/swedish_utf-8.php                         |   19 +-
 plugins/staticpages/language/turkish.php                               |   19 +-
 plugins/staticpages/language/turkish_utf-8.php                         |   19 +-
 plugins/staticpages/language/ukrainian.php                             |   19 +-
 plugins/staticpages/language/ukrainian_koi8-u.php                      |   19 +-
 plugins/staticpages/language/ukrainian_utf-8.php                       |   19 +-
 plugins/staticpages/services.inc.php                                   |   11 +-
 plugins/staticpages/sql/mssql_updates.php                              |   39 +-
 plugins/staticpages/sql/mysql_updates.php                              |   39 +-
 plugins/staticpages/templates/admin/editor_advanced.thtml              |    2 +-
 plugins/xmlsitemap/language/estonian.php                               |   32 +-
 plugins/xmlsitemap/language/estonian_utf-8.php                         |   32 +-
 plugins/xmlsitemap/language/hebrew_utf-8.php                           |   28 +-
 plugins/xmlsitemap/language/japanese_utf-8.php                         |   36 +-
 public_html/admin/block.php                                            |   42 +-
 public_html/admin/configuration.php                                    |   13 +-
 public_html/admin/database.php                                         |  524 +++++++++-
 public_html/admin/group.php                                            |    8 +-
 public_html/admin/install/config-install.php                           |    1 +
 public_html/admin/install/language/hebrew_utf-8.php                    |    2 +-
 public_html/admin/install/language/japanese_utf-8.php                  |    2 +-
 public_html/admin/install/lib-install.php                              |   18 +-
 public_html/admin/install/toinnodb.php                                 |  116 --
 public_html/admin/mail.php                                             |    2 +-
 public_html/admin/moderation.php                                       |   22 +-
 public_html/admin/plugins.php                                          |  106 +-
 public_html/admin/plugins/calendar/index.php                           |   18 +-
 public_html/admin/plugins/links/category.php                           |   15 +-
 public_html/admin/plugins/links/index.php                              |   10 +-
 public_html/admin/plugins/polls/index.php                              |   65 +-
 public_html/admin/plugins/staticpages/index.php                        |   25 +-
 public_html/admin/story.php                                            |   42 +-
 public_html/admin/syndication.php                                      |   33 +-
 public_html/admin/topic.php                                            |   75 +-
 public_html/admin/trackback.php                                        |   12 +-
 public_html/admin/user.php                                             |   22 +-
 public_html/comment.php                                                |    5 +-
 public_html/docs/english/changes.html                                  |   34 +
 public_html/docs/english/config.html                                   |   44 +-
 public_html/docs/english/index.html                                    |    5 +-
 public_html/docs/english/staticpages.html                              |   71 +-
 public_html/docs/english/support.html                                  |    8 +-
 public_html/docs/english/theme.html                                    |   56 +-
 public_html/docs/english/themevars.html                                |   24 +-
 public_html/docs/history                                               |   84 +-
 public_html/javascript/storyeditor_fckeditor.js                        |    4 +-
 public_html/layout/professional/admin/mail/mailform.thtml              |   29 +-
 public_html/layout/professional/admin/story/storyeditor.thtml          |    4 +-
 public_html/layout/professional/admin/story/storyeditor_advanced.thtml |    6 +-
 public_html/layout/professional/admin/topic/topiceditor.thtml          |    4 +
 public_html/layout/professional/images/update.png                      |      
 public_html/layout/professional/profiles/contactauthorform.thtml       |   17 +-
 public_html/layout/professional/profiles/contactuserform.thtml         |   28 +-
 public_html/layout/professional/style.css                              |   38 +-
 public_html/lib-common.php                                             |   33 +-
 public_html/profiles.php                                               |   81 +-
 public_html/robots.txt                                                 |    1 +
 public_html/submit.php                                                 |    3 +-
 public_html/users.php                                                  |  127 +-
 public_html/usersettings.php                                           |   26 +-
 sql/mysql_tableanddata.php                                             |    2 +-
 sql/updates/mssql_1.6.0_to_1.6.1.php                                   |    3 +
 sql/updates/mysql_1.6.0_to_1.6.1.php                                   |    7 +-
 system/classes/listfactory.class.php                                   |  250 +++-
 system/classes/search.class.php                                        |  262 ++--
 system/classes/searchcriteria.class.php                                |  118 +-
 system/classes/story.class.php                                         |  135 +-
 system/classes/template.class.php                                      |    8 +-
 system/lib-admin.php                                                   |  299 +++--
 system/lib-comment.php                                                 |    3 +-
 system/lib-custom.php.dist                                             |   11 +
 system/lib-plugins.php                                                 |   15 -
 system/lib-security.php                                                |  127 ++
 312 files changed, 6688 insertions(+), 2258 deletions(-)

diffs (truncated from 19522 to 300 lines):

diff -r a8de0db60197 -r aa322b3c4d3d language/afrikaans.php
--- a/language/afrikaans.php	Sun Sep 20 19:11:47 2009 +0200
+++ b/language/afrikaans.php	Sun Nov 01 09:43:28 2009 +0100
@@ -824,7 +824,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 +862,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'
 );
 
 ###############################################################################
@@ -1061,6 +1065,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.',
@@ -1322,7 +1327,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 +1495,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 +1595,10 @@
     '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.'
 );
 
 # Localisation of the texts for the various drop-down menus that are actually
@@ -1843,12 +1870,16 @@
     '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?',
@@ -1940,7 +1971,8 @@
     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'),
-    22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '')
+    22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
+    23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2)
 );
 
-?>
\ No newline at end of file
+?>
diff -r a8de0db60197 -r aa322b3c4d3d language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php	Sun Sep 20 19:11:47 2009 +0200
+++ b/language/afrikaans_utf-8.php	Sun Nov 01 09:43:28 2009 +0100
@@ -824,7 +824,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 +862,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'
 );
 
 ###############################################################################
@@ -1061,6 +1065,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.',
@@ -1322,7 +1327,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 +1495,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 +1595,10 @@
     '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.'
 );
 
 # Localisation of the texts for the various drop-down menus that are actually
@@ -1843,12 +1870,16 @@
     '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?',
@@ -1940,7 +1971,8 @@
     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'),
-    22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => '')
+    22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
+    23 => array('Disabled' => 0, 'Enabled' => 1, 'Enabled (Default for Homepage only)' => 2)
 );
 
-?>
\ No newline at end of file
+?>
diff -r a8de0db60197 -r aa322b3c4d3d language/bosnian.php
--- a/language/bosnian.php	Sun Sep 20 19:11:47 2009 +0200
+++ b/language/bosnian.php	Sun Nov 01 09:43:28 2009 +0100
@@ -828,7 +828,10 @@
     85 => 'Show All',
     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.'
 );
 
 ###############################################################################
@@ -863,7 +866,8 @@
     26 => 'make this the default topic for archived stories. Only one topic allowed.',
     27 => 'Or Upload Topic Icon',
     28 => 'Maximum',
-    29 => 'File Upload Errors'
+    29 => 'File Upload Errors',
+    30 => 'Stories in Topic'
 );
 
 ###############################################################################
@@ -1065,6 +1069,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.',
@@ -1326,7 +1331,26 @@
     'size' => 'Velicina',
     'bytes' => 'Bytes',
     'total_number' => 'Ukupan broj sigurnosnih backupova: %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.'
 );
 
 ###############################################################################
@@ -1475,7 +1499,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.',
@@ -1575,7 +1599,10 @@
     'addchild' => 'Add child',
     'list' => 'list',
     'list_all' => 'List all',
-    'na' => 'N/A'
+    'meta_description' => 'Meta Description',
+    'meta_keywords' => 'Meta Keywords',
+    'na' => 'N/A',



More information about the geeklog-cvs mailing list