[geeklog-hg] geeklog: Merged with upstream

[geeklog-cvs at lists.geeklog.net]

changeset 8826:ee78e844f08e
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/ee78e844f08e
user: Tom <websitemaster at cogeco.net>
date: Sat Sep 22 10:34:21 2012 -0400
description:
Merged with upstream

diffstat:

 language/japanese_utf-8.php                                      |  2 +-
 public_html/layout/professional/admin/config/configuration.thtml |  2 +-
 public_html/layout/professional/jquery_ui/jquery.ui.geeklog.css  |  7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diffs (39 lines):

diff -r 4384ab8898a4 -r ee78e844f08e language/japanese_utf-8.php
--- a/language/japanese_utf-8.php	Sat Sep 22 10:01:18 2012 -0400
+++ b/language/japanese_utf-8.php	Sat Sep 22 10:34:21 2012 -0400
@@ -2151,7 +2151,7 @@
     21 => array('HTML 4.01 Transitional' => 'html401transitional', 'HTML 4.01 Strict' => 'html401strict', 'XHTML 1.0 Transitional' => 'xhtml10transitional', 'XHTML 1.0 Strict' => 'xhtml10strict', 'HTML5' => 'html5', 'HTML5 with XHTML syntax' => 'xhtml5'),
     22 => array('Strict' => 'DENY', 'Same Origin' => 'SAMEORIGIN', '(disabled)' => ''),
     23 => array('無効にする' => 0, '有効にする' => 1, '有効にする(トップページにのみデフォルトを使用する)' => 2),
-    24 => array('投稿する' => 'contribute', 'Home' => 'home', '詳しい検索' => 'search', 'ディレクトリ' => 'directory', 'マイアカウント' => 'prefs', 'プラグインエントリ' => 'plugins', 'カスタムエントリ' => 'custom', 'サイトステータス' => 'stats'),
+    24 => array('記事投稿' => 'contribute', 'ホーム' => 'home', '検索オプション' => 'search', '記事一覧' => 'directory', 'マイアカウント' => 'prefs', 'プラグインエントリ' => 'plugins', 'カスタムエントリ' => 'custom', 'サイトæƒ
å ±' => 'stats'),
     25 => array('新着記事' => 'story', '新着コメント' => 'comment', '新着トラックバック' => 'trackback', '新着ピングバック' => 'pingback', '新着ユーザ' => 'user'),
     26 => array('G (一般向け)' => 'G', 'PG (保護è€
の指導が望ましい)' => 'PG', 'R (保護è€
同伴制限付き' => 'R', 'X (17歳未満利用禁止)' => 'X'),
     27 => array('閲覧数 (æ˜‡é †)' => 'hits|asc', '閲覧数 (é™é †)' => 'hits|desc', '日付 (æ˜‡é †)' => 'date|asc', '日付 (é™é †)' => 'date|desc', 'タイトル (æ˜‡é †)' => 'title|asc', 'タイトル (é™é †)' => 'title|desc', '所有è€
 (æ˜‡é †)' => 'uid|asc', '所有è€
 (é™é †)' => 'uid|desc'),
diff -r 4384ab8898a4 -r ee78e844f08e public_html/layout/professional/admin/config/configuration.thtml
--- a/public_html/layout/professional/admin/config/configuration.thtml	Sat Sep 22 10:01:18 2012 -0400
+++ b/public_html/layout/professional/admin/config/configuration.thtml	Sat Sep 22 10:34:21 2012 -0400
@@ -14,7 +14,7 @@
             </td>
             <td style="vertical-align:top; width: 100%">
             
-                <div class="saved_message pluginInfo{error_validation_class}" style="display:{show_changeblock}">
+                <div class="saved_message{error_validation_class}" style="display:{show_changeblock}">
                     {lang_changes_made}
                     {lang_error_validation_occurs}
                     {change_block}
diff -r 4384ab8898a4 -r ee78e844f08e public_html/layout/professional/jquery_ui/jquery.ui.geeklog.css
--- a/public_html/layout/professional/jquery_ui/jquery.ui.geeklog.css	Sat Sep 22 10:01:18 2012 -0400
+++ b/public_html/layout/professional/jquery_ui/jquery.ui.geeklog.css	Sat Sep 22 10:34:21 2012 -0400
@@ -77,4 +77,9 @@
 }
 .error_validation a {
     color: #FFFFBB;
-}
\ No newline at end of file
+}
+
+/* Layout helpers */
+.ui-helper-clearfix:before, .ui-helper-clearfix:after {
+    display: block;
+}