[geeklog-cvs] geeklog: Merging heads

geeklog-cvs at lists.geeklog.net geeklog-cvs at lists.geeklog.net
Sun Jun 21 03:11:07 EDT 2009


details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/195d4ef428df
changeset: 7137:195d4ef428df
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jun 21 09:04:01 2009 +0200
description:
Merging heads

diffstat:

 .hgtags                                                           |     1 +
 language/afrikaans.php                                            |    12 +-
 language/afrikaans_utf-8.php                                      |    12 +-
 language/bosnian.php                                              |    12 +-
 language/bosnian_utf-8.php                                        |    12 +-
 language/bulgarian.php                                            |    12 +-
 language/bulgarian_utf-8.php                                      |    12 +-
 language/catalan.php                                              |    12 +-
 language/catalan_utf-8.php                                        |    12 +-
 language/chinese_simplified_utf-8.php                             |    12 +-
 language/chinese_traditional_utf-8.php                            |    12 +-
 language/croatian.php                                             |    12 +-
 language/croatian_utf-8.php                                       |    12 +-
 language/czech.php                                                |    12 +-
 language/czech_utf-8.php                                          |    12 +-
 language/danish.php                                               |    12 +-
 language/danish_utf-8.php                                         |    12 +-
 language/dutch.php                                                |    12 +-
 language/dutch_utf-8.php                                          |    12 +-
 language/english.php                                              |    10 +-
 language/english_utf-8.php                                        |    10 +-
 language/estonian.php                                             |    12 +-
 language/estonian_utf-8.php                                       |    12 +-
 language/farsi_utf-8.php                                          |    12 +-
 language/finnish.php                                              |    12 +-
 language/finnish_utf-8.php                                        |    12 +-
 language/french_canada.php                                        |    12 +-
 language/french_canada_utf-8.php                                  |    12 +-
 language/french_france.php                                        |    12 +-
 language/french_france_utf-8.php                                  |    12 +-
 language/german.php                                               |    14 +-
 language/german_formal.php                                        |    14 +-
 language/german_formal_utf-8.php                                  |    14 +-
 language/german_utf-8.php                                         |    14 +-
 language/hebrew_utf-8.php                                         |    12 +-
 language/hellenic.php                                             |    12 +-
 language/hellenic_utf-8.php                                       |    12 +-
 language/indonesian.php                                           |    12 +-
 language/indonesian_utf-8.php                                     |    12 +-
 language/italian.php                                              |    12 +-
 language/italian_utf-8.php                                        |    12 +-
 language/japanese_utf-8.php                                       |   261 +-
 language/korean.php                                               |    12 +-
 language/korean_utf-8.php                                         |    12 +-
 language/norwegian.php                                            |    12 +-
 language/norwegian_utf-8.php                                      |    12 +-
 language/polish.php                                               |    12 +-
 language/polish_utf-8.php                                         |    12 +-
 language/portuguese.php                                           |    12 +-
 language/portuguese_brazil.php                                    |    12 +-
 language/portuguese_brazil_utf-8.php                              |    12 +-
 language/portuguese_utf-8.php                                     |    12 +-
 language/romanian.php                                             |    12 +-
 language/romanian_utf-8.php                                       |    12 +-
 language/russian.php                                              |    12 +-
 language/russian_utf-8.php                                        |    12 +-
 language/serbian.php                                              |    10 +-
 language/serbian_utf-8.php                                        |    10 +-
 language/slovak.php                                               |    12 +-
 language/slovak_utf-8.php                                         |    12 +-
 language/slovenian.php                                            |    12 +-
 language/slovenian_utf-8.php                                      |    12 +-
 language/spanish.php                                              |   528 +-
 language/spanish_argentina.php                                    |    12 +-
 language/spanish_argentina_utf-8.php                              |    12 +-
 language/spanish_utf-8.php                                        |    12 +-
 language/swedish.php                                              |    12 +-
 language/swedish_utf-8.php                                        |    12 +-
 language/turkish.php                                              |    12 +-
 language/turkish_utf-8.php                                        |    12 +-
 language/ukrainian.php                                            |    12 +-
 language/ukrainian_koi8-u.php                                     |    12 +-
 language/ukrainian_utf-8.php                                      |    12 +-
 plugins/calendar/autoinstall.php                                  |     9 +
 plugins/calendar/functions.inc                                    |    52 +-
 plugins/links/autoinstall.php                                     |     9 +
 plugins/links/functions.inc                                       |    41 +-
 plugins/polls/autoinstall.php                                     |     9 +
 plugins/polls/functions.inc                                       |    70 +-
 plugins/polls/language/chinese_simplified_utf-8.php               |     1 +
 plugins/polls/language/chinese_traditional_utf-8.php              |     1 +
 plugins/polls/language/dutch.php                                  |     1 +
 plugins/polls/language/dutch_utf-8.php                            |     1 +
 plugins/polls/language/english.php                                |     1 +
 plugins/polls/language/english_utf-8.php                          |     1 +
 plugins/polls/language/estonian.php                               |     1 +
 plugins/polls/language/estonian_utf-8.php                         |     1 +
 plugins/polls/language/french_canada.php                          |     1 +
 plugins/polls/language/french_canada_utf-8.php                    |     1 +
 plugins/polls/language/german.php                                 |     1 +
 plugins/polls/language/german_formal.php                          |     1 +
 plugins/polls/language/german_formal_utf-8.php                    |     1 +
 plugins/polls/language/german_utf-8.php                           |     1 +
 plugins/polls/language/hebrew_utf-8.php                           |     1 +
 plugins/polls/language/japanese_utf-8.php                         |     1 +
 plugins/polls/language/korean.php                                 |     1 +
 plugins/polls/language/korean_utf-8.php                           |     1 +
 plugins/polls/language/russian.php                                |     1 +
 plugins/polls/language/russian_utf-8.php                          |     1 +
 plugins/polls/language/slovenian.php                              |     1 +
 plugins/polls/language/slovenian_utf-8.php                        |     1 +
 plugins/polls/language/spanish.php                                |     1 +
 plugins/polls/language/spanish_utf-8.php                          |     1 +
 plugins/polls/language/ukrainian.php                              |     1 +
 plugins/polls/language/ukrainian_koi8-u.php                       |     1 +
 plugins/polls/language/ukrainian_utf-8.php                        |     1 +
 plugins/spamx/autoinstall.php                                     |     9 +
 plugins/staticpages/autoinstall.php                               |     9 +
 plugins/staticpages/functions.inc                                 |   121 +-
 plugins/staticpages/language/chinese_simplified_utf-8.php         |     1 +
 plugins/staticpages/language/chinese_traditional_utf-8.php        |     1 +
 plugins/staticpages/language/czech.php                            |     3 +-
 plugins/staticpages/language/czech_utf-8.php                      |     3 +-
 plugins/staticpages/language/danish.php                           |     3 +-
 plugins/staticpages/language/danish_utf-8.php                     |     3 +-
 plugins/staticpages/language/dutch.php                            |     3 +-
 plugins/staticpages/language/dutch_utf-8.php                      |     3 +-
 plugins/staticpages/language/english.php                          |     1 +
 plugins/staticpages/language/english_utf-8.php                    |     1 +
 plugins/staticpages/language/estonian.php                         |     3 +-
 plugins/staticpages/language/estonian_utf-8.php                   |     3 +-
 plugins/staticpages/language/farsi_utf-8.php                      |     1 +
 plugins/staticpages/language/french_canada.php                    |     3 +-
 plugins/staticpages/language/french_canada_utf-8.php              |     3 +-
 plugins/staticpages/language/german.php                           |     3 +-
 plugins/staticpages/language/german_formal.php                    |     3 +-
 plugins/staticpages/language/german_formal_utf-8.php              |     3 +-
 plugins/staticpages/language/german_utf-8.php                     |     3 +-
 plugins/staticpages/language/hebrew_utf-8.php                     |     3 +-
 plugins/staticpages/language/italian.php                          |     3 +-
 plugins/staticpages/language/italian_utf-8.php                    |     3 +-
 plugins/staticpages/language/japanese_utf-8.php                   |    11 +-
 plugins/staticpages/language/korean.php                           |     3 +-
 plugins/staticpages/language/korean_utf-8.php                     |     3 +-
 plugins/staticpages/language/polish.php                           |     3 +-
 plugins/staticpages/language/polish_utf-8.php                     |     3 +-
 plugins/staticpages/language/portuguese_brazil.php                |     3 +-
 plugins/staticpages/language/portuguese_brazil_utf-8.php          |     3 +-
 plugins/staticpages/language/slovenian.php                        |     3 +-
 plugins/staticpages/language/slovenian_utf-8.php                  |     3 +-
 plugins/staticpages/language/spanish.php                          |     3 +-
 plugins/staticpages/language/spanish_utf-8.php                    |     3 +-
 plugins/staticpages/language/swedish.php                          |     3 +-
 plugins/staticpages/language/swedish_utf-8.php                    |     3 +-
 plugins/staticpages/language/turkish.php                          |     3 +-
 plugins/staticpages/language/turkish_utf-8.php                    |     3 +-
 plugins/staticpages/language/ukrainian.php                        |     3 +-
 plugins/staticpages/language/ukrainian_koi8-u.php                 |     3 +-
 plugins/staticpages/language/ukrainian_utf-8.php                  |     3 +-
 plugins/staticpages/services.inc.php                              |     7 +-
 plugins/xmlsitemap/autoinstall.php                                |    35 +-
 plugins/xmlsitemap/functions.inc                                  |   618 +-
 plugins/xmlsitemap/install_defaults.php                           |    21 +-
 plugins/xmlsitemap/language/english.php                           |     1 +
 plugins/xmlsitemap/language/english_utf-8.php                     |     1 +
 plugins/xmlsitemap/language/japanese_utf-8.php                    |     5 +-
 plugins/xmlsitemap/xmlsitemap.class.php                           |     2 +-
 public_html/admin/install/config-install.php                      |    24 +-
 public_html/admin/install/index.php                               |   138 +-
 public_html/admin/install/install-plugins.php                     |     5 +-
 public_html/admin/install/language/japanese_utf-8.php             |   306 +-
 public_html/admin/install/lib-install.php                         |    22 +-
 public_html/admin/install/lib-upgrade.php                         |     2 +-
 public_html/admin/install/migrate.php                             |    27 +-
 public_html/admin/moderation.php                                  |     2 +-
 public_html/admin/plugins.php                                     |     4 +
 public_html/admin/plugins/polls/index.php                         |     2 +
 public_html/admin/user.php                                        |    27 +-
 public_html/comment.php                                           |    11 +-
 public_html/docs/english/changes.html                             |     2 +-
 public_html/docs/english/config.html                              |    23 +-
 public_html/docs/english/index.html                               |     7 +-
 public_html/docs/english/plugin.html                              |   567 --
 public_html/docs/english/theme.html                               |    10 +
 public_html/docs/history                                          |    99 +-
 public_html/docs/japanese/calendar.html                           |   109 +
 public_html/docs/japanese/changes.html                            |   655 ++
 public_html/docs/japanese/config.html                             |  1302 ++++
 public_html/docs/japanese/docstyle.css                            |   117 +
 public_html/docs/japanese/history.html                            |  3108 ++++++++++
 public_html/docs/japanese/index.html                              |   121 +
 public_html/docs/japanese/install.html                            |   242 +
 public_html/docs/japanese/links.html                              |   141 +
 public_html/docs/japanese/plugin.html                             |   433 +
 public_html/docs/japanese/polls.html                              |   116 +
 public_html/docs/japanese/readme.html                             |   194 +
 public_html/docs/japanese/readme.ja.html                          |   195 +
 public_html/docs/japanese/spamx.html                              |   217 +
 public_html/docs/japanese/staticpages.html                        |   225 +
 public_html/docs/japanese/support.html                            |   100 +
 public_html/docs/japanese/theme.html                              |   830 ++
 public_html/docs/japanese/themevars.html                          |   311 +
 public_html/docs/japanese/trackback.html                          |   102 +
 public_html/index.php                                             |    29 +
 public_html/layout/professional/admin/config/config_element.thtml |     2 +-
 public_html/layout/professional/admin/config/configuration.thtml  |     4 +-
 public_html/layout/professional/article/printable.thtml           |     2 +-
 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/lib-common.php                                        |    57 +-
 public_html/polls/index.php                                       |    49 +-
 public_html/usersettings.php                                      |    12 +-
 sql/pgsql_tableanddata.php                                        |   813 ++
 sql/updates/mssql_1.5.2_to_1.6.0.php                              |    28 +-
 sql/updates/mysql_1.5.2_to_1.6.0.php                              |    28 +-
 system/classes/calendar.class.php                                 |    17 +-
 system/classes/config.class.php                                   |     4 +-
 system/classes/listfactory.class.php                              |    39 +-
 system/classes/search.class.php                                   |   142 +-
 system/classes/timer.class.php                                    |     2 +-
 system/databases/mssql.class.php                                  |     8 +-
 system/databases/mysql.class.php                                  |     2 +-
 system/databases/pgsql.class.php                                  |   804 ++
 system/lib-admin.php                                              |    11 +-
 system/lib-comment.php                                            |    85 +-
 system/lib-plugins.php                                            |   339 +-
 system/lib-security.php                                           |    33 +-
 system/lib-story.php                                              |    17 +-
 system/lib-syndication.php                                        |     9 +-
 223 files changed, 12708 insertions(+), 2450 deletions(-)

diffs (truncated from 22058 to 300 lines):

diff -r 1fa428bd1f68 -r 195d4ef428df .hgtags
--- a/.hgtags	Sun Jun 21 09:03:43 2009 +0200
+++ b/.hgtags	Sun Jun 21 09:04:01 2009 +0200
@@ -1,3 +1,4 @@
 f51a1417bd7041bea96370434142498438d4e558 geeklog_1_5_0_stable
 8abbb13ee513b6cf2c76d702273c3fa118f9bf5c geeklog_1_5_1_stable
 0c7d10cbc6bf6c040842707763920ccd9dea6d15 geeklog_1_6_0b1
+b73a34f5e8e667c045173c9dd2a2f3a1b29a37bf geeklog_1_6_0b2
diff -r 1fa428bd1f68 -r 195d4ef428df language/afrikaans.php
--- a/language/afrikaans.php	Sun Jun 21 09:03:43 2009 +0200
+++ b/language/afrikaans.php	Sun Jun 21 09:04:01 2009 +0200
@@ -523,12 +523,13 @@
     61 => 'Verfyn soektog',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );
 
 ###############################################################################
@@ -973,7 +974,7 @@
     18 => 'Epos',
     34 => 'Bestuur en Beheer',
     35 => 'Artikel Bydraes',
-    36 => 'Comment',
+    36 => 'Parent or Comment',
     37 => '',
     38 => 'Stuur',
     39 => 'Daar is geen bydraes op hierdie tydstip wat aksie vereis nie',
@@ -1836,6 +1837,7 @@
     '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',
@@ -1856,7 +1858,6 @@
     'search_show_type' => 'Show Result Type?',
     'search_show_sort' => 'Allow User to Sort Results?',
     'search_show_limit' => 'Show Page Limits?',
-    'search_no_data' => 'If No Data is Avaliable, Display',
     'search_separator' => 'Group Separator',
     'search_def_keytype' => 'Default Search Method'
 );
@@ -1938,7 +1939,8 @@
     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)' => '')
 );
 
 ?>
\ No newline at end of file
diff -r 1fa428bd1f68 -r 195d4ef428df language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php	Sun Jun 21 09:03:43 2009 +0200
+++ b/language/afrikaans_utf-8.php	Sun Jun 21 09:04:01 2009 +0200
@@ -523,12 +523,13 @@
     61 => 'Verfyn soektog',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );
 
 ###############################################################################
@@ -973,7 +974,7 @@
     18 => 'Epos',
     34 => 'Bestuur en Beheer',
     35 => 'Artikel Bydraes',
-    36 => 'Comment',
+    36 => 'Parent or Comment',
     37 => '',
     38 => 'Stuur',
     39 => 'Daar is geen bydraes op hierdie tydstip wat aksie vereis nie',
@@ -1836,6 +1837,7 @@
     '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',
@@ -1856,7 +1858,6 @@
     'search_show_type' => 'Show Result Type?',
     'search_show_sort' => 'Allow User to Sort Results?',
     'search_show_limit' => 'Show Page Limits?',
-    'search_no_data' => 'If No Data is Avaliable, Display',
     'search_separator' => 'Group Separator',
     'search_def_keytype' => 'Default Search Method'
 );
@@ -1938,7 +1939,8 @@
     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)' => '')
 );
 
 ?>
\ No newline at end of file
diff -r 1fa428bd1f68 -r 195d4ef428df language/bosnian.php
--- a/language/bosnian.php	Sun Jun 21 09:03:43 2009 +0200
+++ b/language/bosnian.php	Sun Jun 21 09:04:01 2009 +0200
@@ -527,12 +527,13 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );
 
 ###############################################################################
@@ -977,7 +978,7 @@
     18 => 'Email',
     34 => 'Command and Control',
     35 => 'Zahtjev za postavljanje teksta.',
-    36 => 'Comment',
+    36 => 'Parent or Comment',
     37 => '',
     38 => 'Potvrdi',
     39 => 'Trenutacno nema zahtjeva za administraciju-',
@@ -1840,6 +1841,7 @@
     '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',
@@ -1860,7 +1862,6 @@
     'search_show_type' => 'Show Result Type?',
     'search_show_sort' => 'Allow User to Sort Results?',
     'search_show_limit' => 'Show Page Limits?',
-    'search_no_data' => 'If No Data is Avaliable, Display',
     'search_separator' => 'Group Separator',
     'search_def_keytype' => 'Default Search Method'
 );
@@ -1942,7 +1943,8 @@
     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)' => '')
 );
 
 ?>
\ No newline at end of file
diff -r 1fa428bd1f68 -r 195d4ef428df language/bosnian_utf-8.php
--- a/language/bosnian_utf-8.php	Sun Jun 21 09:03:43 2009 +0200
+++ b/language/bosnian_utf-8.php	Sun Jun 21 09:04:01 2009 +0200
@@ -527,12 +527,13 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );
 
 ###############################################################################
@@ -977,7 +978,7 @@
     18 => 'Email',
     34 => 'Command and Control',
     35 => 'Zahtjev za postavljanje teksta.',
-    36 => 'Comment',
+    36 => 'Parent or Comment',
     37 => '',
     38 => 'Potvrdi',
     39 => 'Trenutacno nema zahtjeva za administraciju-',
@@ -1840,6 +1841,7 @@
     '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',
@@ -1860,7 +1862,6 @@
     'search_show_type' => 'Show Result Type?',
     'search_show_sort' => 'Allow User to Sort Results?',
     'search_show_limit' => 'Show Page Limits?',
-    'search_no_data' => 'If No Data is Avaliable, Display',
     'search_separator' => 'Group Separator',
     'search_def_keytype' => 'Default Search Method'
 );
@@ -1942,7 +1943,8 @@
     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)' => '')
 );
 
 ?>
\ No newline at end of file
diff -r 1fa428bd1f68 -r 195d4ef428df language/bulgarian.php
--- a/language/bulgarian.php	Sun Jun 21 09:03:43 2009 +0200
+++ b/language/bulgarian.php	Sun Jun 21 09:04:01 2009 +0200
@@ -523,12 +523,13 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );
 
 ###############################################################################
@@ -973,7 +974,7 @@
     18 => 'E-mail',
     34 => 'Admin Panel',
     35 => 'Èçïðàòåíè òåêñòîâå',
-    36 => 'Comment',
+    36 => 'Parent or Comment',
     37 => '',
     38 => 'Èçïðàòè',
     39 => 'Íÿìà èçïðàòåíè òåêñòîâå, êîèòî äà ïóáëèêóâàòå èëè èçòðèåòå.',
@@ -1836,6 +1837,7 @@
     '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',
@@ -1856,7 +1858,6 @@
     'search_show_type' => 'Show Result Type?',
     'search_show_sort' => 'Allow User to Sort Results?',
     'search_show_limit' => 'Show Page Limits?',
-    'search_no_data' => 'If No Data is Avaliable, Display',
     'search_separator' => 'Group Separator',
     'search_def_keytype' => 'Default Search Method'
 );
@@ -1938,7 +1939,8 @@
     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)' => '')
 );
 
 ?>
\ No newline at end of file
diff -r 1fa428bd1f68 -r 195d4ef428df language/bulgarian_utf-8.php
--- a/language/bulgarian_utf-8.php	Sun Jun 21 09:03:43 2009 +0200
+++ b/language/bulgarian_utf-8.php	Sun Jun 21 09:04:01 2009 +0200
@@ -523,12 +523,13 @@
     61 => 'Refine search',
     62 => '#',
     63 => 'Description',
-    64 => 'Showing %d - %d of %d results',
+    64 => 'Showing %1$d - %2$d of %3$d results',
     65 => 'Story',
     66 => 'Comment',
     67 => 'Show %d Results',
     68 => 'Sort By',
-    69 => 'Titles Only'
+    69 => 'Titles Only',
+    70 => 'Not available ...'
 );



More information about the geeklog-cvs mailing list