[geeklog-cvs] geeklog: Merged with Dirk's latest changes

geeklog-cvs at lists.geeklog.net geeklog-cvs at lists.geeklog.net
Fri Apr 22 17:46:18 EDT 2011


changeset 8250:a3758165ce03
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/a3758165ce03
user: Tom <websitemaster at cogeco.net>
date: Fri Apr 22 17:45:06 2011 -0400
description:
Merged with Dirk's latest changes

diffstat:

 language/afrikaans.php                          |    8 +-
 language/afrikaans_utf-8.php                    |    8 +-
 language/bosnian.php                            |    8 +-
 language/bosnian_utf-8.php                      |    8 +-
 language/bulgarian.php                          |    8 +-
 language/bulgarian_utf-8.php                    |    8 +-
 language/catalan.php                            |    8 +-
 language/catalan_utf-8.php                      |    8 +-
 language/chinese_simplified_utf-8.php           |    8 +-
 language/chinese_traditional_utf-8.php          |    8 +-
 language/croatian.php                           |    8 +-
 language/croatian_utf-8.php                     |    8 +-
 language/czech.php                              |    8 +-
 language/czech_utf-8.php                        |    8 +-
 language/danish.php                             |    8 +-
 language/danish_utf-8.php                       |    8 +-
 language/dutch.php                              |    8 +-
 language/dutch_utf-8.php                        |    8 +-
 language/estonian.php                           |    8 +-
 language/estonian_utf-8.php                     |    8 +-
 language/farsi_utf-8.php                        |    8 +-
 language/finnish.php                            |    8 +-
 language/finnish_utf-8.php                      |    8 +-
 language/french_canada.php                      |    8 +-
 language/french_canada_utf-8.php                |    8 +-
 language/french_france.php                      |    8 +-
 language/french_france_utf-8.php                |    8 +-
 language/german.php                             |    8 +-
 language/german_formal.php                      |    8 +-
 language/german_formal_utf-8.php                |    8 +-
 language/german_utf-8.php                       |    8 +-
 language/hebrew_utf-8.php                       |    8 +-
 language/hellenic.php                           |    8 +-
 language/hellenic_utf-8.php                     |    8 +-
 language/indonesian.php                         |    8 +-
 language/indonesian_utf-8.php                   |    8 +-
 language/italian.php                            |    8 +-
 language/italian_utf-8.php                      |    8 +-
 language/japanese_utf-8.php                     |  322 +++++-----
 language/korean.php                             |    8 +-
 language/korean_utf-8.php                       |    8 +-
 language/norwegian.php                          |    8 +-
 language/norwegian_utf-8.php                    |    8 +-
 language/polish.php                             |    8 +-
 language/polish_utf-8.php                       |    8 +-
 language/portuguese.php                         |    8 +-
 language/portuguese_brazil.php                  |    8 +-
 language/portuguese_brazil_utf-8.php            |    8 +-
 language/portuguese_utf-8.php                   |    8 +-
 language/romanian.php                           |    8 +-
 language/romanian_utf-8.php                     |    8 +-
 language/russian.php                            |    8 +-
 language/russian_utf-8.php                      |    8 +-
 language/serbian.php                            |    8 +-
 language/serbian_utf-8.php                      |    8 +-
 language/slovak.php                             |    8 +-
 language/slovak_utf-8.php                       |    8 +-
 language/slovenian.php                          |    8 +-
 language/slovenian_utf-8.php                    |    8 +-
 language/spanish.php                            |    8 +-
 language/spanish_argentina.php                  |    8 +-
 language/spanish_argentina_utf-8.php            |    8 +-
 language/spanish_utf-8.php                      |    8 +-
 language/swedish.php                            |    8 +-
 language/swedish_utf-8.php                      |    8 +-
 language/turkish.php                            |    8 +-
 language/turkish_utf-8.php                      |    8 +-
 language/ukrainian.php                          |    8 +-
 language/ukrainian_koi8-u.php                   |    8 +-
 language/ukrainian_utf-8.php                    |    8 +-
 plugins/calendar/language/japanese_utf-8.php    |   16 +-
 plugins/links/language/japanese_utf-8.php       |   26 +-
 plugins/polls/language/japanese_utf-8.php       |   22 +-
 plugins/spamx/language/japanese_utf-8.php       |    4 +-
 plugins/staticpages/language/japanese_utf-8.php |   38 +-
 plugins/xmlsitemap/language/japanese_utf-8.php  |   10 +-
 public_html/docs/history                        |    6 +
 public_html/docs/japanese/changes.html          |   88 +++-
 public_html/docs/japanese/config.html           |  174 ++++-
 public_html/docs/japanese/history.html          |  670 ++++++++++++++++-------
 public_html/docs/japanese/index.html            |   12 +-
 public_html/docs/japanese/install.html          |   28 +-
 public_html/docs/japanese/links.html            |    8 +-
 public_html/docs/japanese/polls.html            |   12 +-
 public_html/docs/japanese/spamx.html            |    6 +-
 public_html/docs/japanese/staticpages.html      |    8 +-
 public_html/docs/japanese/theme.html            |  324 +++++++----
 public_html/docs/japanese/themevars.html        |    7 +-
 88 files changed, 1551 insertions(+), 782 deletions(-)

diffs (truncated from 5158 to 300 lines):

diff -r 5d70b2f5264f -r a3758165ce03 language/afrikaans.php
--- a/language/afrikaans.php	Fri Apr 22 17:34:32 2011 -0400
+++ b/language/afrikaans.php	Fri Apr 22 17:45:06 2011 -0400
@@ -175,7 +175,11 @@
     132 => 'Information',
     133 => 'Critical',
     134 => 'Help',
-    135 => 'Warning'
+    135 => 'Warning',
+    136 => 'Warning: Javascript recommended for enhanced functionality',
+    137 => 'Warning: Javascript required to enable functionality',
+    138 => "Click <a href=\"{$_CONF['site_url']}/usersettings.php\" rel=\"nofollow\">here</a> to disable the advanced editor and use the default editor which does not require JavaScript",
+    139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage"
 );
 
 ###############################################################################
@@ -381,7 +385,7 @@
     147 => 'Edit your account password, email and autologin feature. You will need to enter the same password or email address twice as a confirmation.',
     148 => 'User Information',
     149 => 'Modify your user information that will be shown to other users.<li>The signature will be added to any comments or forum posts you made</li><li>The BIO is a brief summary of yourself to share</li><li>Share your PGP Key</li>',
-    150 => 'Warning: Javascript recommended for enhanced functionality',
+    150 => '',
     156 => 'Delete Account',
     157 => 'Delete Option',
     158 => 'Time Zone',
diff -r 5d70b2f5264f -r a3758165ce03 language/afrikaans_utf-8.php
--- a/language/afrikaans_utf-8.php	Fri Apr 22 17:34:32 2011 -0400
+++ b/language/afrikaans_utf-8.php	Fri Apr 22 17:45:06 2011 -0400
@@ -175,7 +175,11 @@
     132 => 'Information',
     133 => 'Critical',
     134 => 'Help',
-    135 => 'Warning'
+    135 => 'Warning',
+    136 => 'Warning: Javascript recommended for enhanced functionality',
+    137 => 'Warning: Javascript required to enable functionality',
+    138 => "Click <a href=\"{$_CONF['site_url']}/usersettings.php\" rel=\"nofollow\">here</a> to disable the advanced editor and use the default editor which does not require JavaScript",
+    139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage"
 );
 
 ###############################################################################
@@ -381,7 +385,7 @@
     147 => 'Edit your account password, email and autologin feature. You will need to enter the same password or email address twice as a confirmation.',
     148 => 'User Information',
     149 => 'Modify your user information that will be shown to other users.<li>The signature will be added to any comments or forum posts you made</li><li>The BIO is a brief summary of yourself to share</li><li>Share your PGP Key</li>',
-    150 => 'Warning: Javascript recommended for enhanced functionality',
+    150 => '',
     156 => 'Delete Account',
     157 => 'Delete Option',
     158 => 'Time Zone',
diff -r 5d70b2f5264f -r a3758165ce03 language/bosnian.php
--- a/language/bosnian.php	Fri Apr 22 17:34:32 2011 -0400
+++ b/language/bosnian.php	Fri Apr 22 17:45:06 2011 -0400
@@ -179,7 +179,11 @@
     132 => 'Information',
     133 => 'Critical',
     134 => 'Help',
-    135 => 'Warning'
+    135 => 'Warning',
+    136 => 'Warning: Javascript recommended for enhanced functionality',
+    137 => 'Warning: Javascript required to enable functionality',
+    138 => "Click <a href=\"{$_CONF['site_url']}/usersettings.php\" rel=\"nofollow\">here</a> to disable the advanced editor and use the default editor which does not require JavaScript",
+    139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage"
 );
 
 ###############################################################################
@@ -385,7 +389,7 @@
     147 => 'Edit your account password, email and autologin feature. You will need to enter the same password or email address twice as a confirmation.',
     148 => 'User Information',
     149 => 'Modify your user information that will be shown to other users.<li>The signature will be added to any comments or forum posts you made</li><li>The BIO is a brief summary of yourself to share</li><li>Share your PGP Key</li>',
-    150 => 'Warning: Javascript recommended for enhanced functionality',
+    150 => '',
     156 => 'Delete Account',
     157 => 'Delete Option',
     158 => 'Time Zone',
diff -r 5d70b2f5264f -r a3758165ce03 language/bosnian_utf-8.php
--- a/language/bosnian_utf-8.php	Fri Apr 22 17:34:32 2011 -0400
+++ b/language/bosnian_utf-8.php	Fri Apr 22 17:45:06 2011 -0400
@@ -179,7 +179,11 @@
     132 => 'Information',
     133 => 'Critical',
     134 => 'Help',
-    135 => 'Warning'
+    135 => 'Warning',
+    136 => 'Warning: Javascript recommended for enhanced functionality',
+    137 => 'Warning: Javascript required to enable functionality',
+    138 => "Click <a href=\"{$_CONF['site_url']}/usersettings.php\" rel=\"nofollow\">here</a> to disable the advanced editor and use the default editor which does not require JavaScript",
+    139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage"
 );
 
 ###############################################################################
@@ -385,7 +389,7 @@
     147 => 'Edit your account password, email and autologin feature. You will need to enter the same password or email address twice as a confirmation.',
     148 => 'User Information',
     149 => 'Modify your user information that will be shown to other users.<li>The signature will be added to any comments or forum posts you made</li><li>The BIO is a brief summary of yourself to share</li><li>Share your PGP Key</li>',
-    150 => 'Warning: Javascript recommended for enhanced functionality',
+    150 => '',
     156 => 'Delete Account',
     157 => 'Delete Option',
     158 => 'Time Zone',
diff -r 5d70b2f5264f -r a3758165ce03 language/bulgarian.php
--- a/language/bulgarian.php	Fri Apr 22 17:34:32 2011 -0400
+++ b/language/bulgarian.php	Fri Apr 22 17:45:06 2011 -0400
@@ -175,7 +175,11 @@
     132 => 'Information',
     133 => 'Critical',
     134 => 'Help',
-    135 => 'Warning'
+    135 => 'Warning',
+    136 => 'Warning: Javascript recommended for enhanced functionality',
+    137 => 'Warning: Javascript required to enable functionality',
+    138 => "Click <a href=\"{$_CONF['site_url']}/usersettings.php\" rel=\"nofollow\">here</a> to disable the advanced editor and use the default editor which does not require JavaScript",
+    139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage"
 );
 
 ###############################################################################
@@ -381,7 +385,7 @@
     147 => 'Edit your account password, email and autologin feature. You will need to enter the same password or email address twice as a confirmation.',
     148 => 'User Information',
     149 => 'Modify your user information that will be shown to other users.<li>The signature will be added to any comments or forum posts you made</li><li>The BIO is a brief summary of yourself to share</li><li>Share your PGP Key</li>',
-    150 => 'Warning: Javascript recommended for enhanced functionality',
+    150 => '',
     156 => 'Delete Account',
     157 => 'Delete Option',
     158 => 'Time Zone',
diff -r 5d70b2f5264f -r a3758165ce03 language/bulgarian_utf-8.php
--- a/language/bulgarian_utf-8.php	Fri Apr 22 17:34:32 2011 -0400
+++ b/language/bulgarian_utf-8.php	Fri Apr 22 17:45:06 2011 -0400
@@ -175,7 +175,11 @@
     132 => 'Information',
     133 => 'Critical',
     134 => 'Help',
-    135 => 'Warning'
+    135 => 'Warning',
+    136 => 'Warning: Javascript recommended for enhanced functionality',
+    137 => 'Warning: Javascript required to enable functionality',
+    138 => "Click <a href=\"{$_CONF['site_url']}/usersettings.php\" rel=\"nofollow\">here</a> to disable the advanced editor and use the default editor which does not require JavaScript",
+    139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage"
 );
 
 ###############################################################################
@@ -381,7 +385,7 @@
     147 => 'Edit your account password, email and autologin feature. You will need to enter the same password or email address twice as a confirmation.',
     148 => 'User Information',
     149 => 'Modify your user information that will be shown to other users.<li>The signature will be added to any comments or forum posts you made</li><li>The BIO is a brief summary of yourself to share</li><li>Share your PGP Key</li>',
-    150 => 'Warning: Javascript recommended for enhanced functionality',
+    150 => '',
     156 => 'Delete Account',
     157 => 'Delete Option',
     158 => 'Time Zone',
diff -r 5d70b2f5264f -r a3758165ce03 language/catalan.php
--- a/language/catalan.php	Fri Apr 22 17:34:32 2011 -0400
+++ b/language/catalan.php	Fri Apr 22 17:45:06 2011 -0400
@@ -173,7 +173,11 @@
     132 => 'Information',
     133 => 'Critical',
     134 => 'Help',
-    135 => 'Warning'
+    135 => 'Warning',
+    136 => 'Warning: Javascript recommended for enhanced functionality',
+    137 => 'Warning: Javascript required to enable functionality',
+    138 => "Click <a href=\"{$_CONF['site_url']}/usersettings.php\" rel=\"nofollow\">here</a> to disable the advanced editor and use the default editor which does not require JavaScript",
+    139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage"
 );
 
 ###############################################################################
@@ -379,7 +383,7 @@
     147 => 'Edit your account password, email and autologin feature. You will need to enter the same password or email address twice as a confirmation.',
     148 => 'User Information',
     149 => 'Modify your user information that will be shown to other users.<li>The signature will be added to any comments or forum posts you made</li><li>The BIO is a brief summary of yourself to share</li><li>Share your PGP Key</li>',
-    150 => 'Warning: Javascript recommended for enhanced functionality',
+    150 => '',
     156 => 'Delete Account',
     157 => 'Delete Option',
     158 => 'Time Zone',
diff -r 5d70b2f5264f -r a3758165ce03 language/catalan_utf-8.php
--- a/language/catalan_utf-8.php	Fri Apr 22 17:34:32 2011 -0400
+++ b/language/catalan_utf-8.php	Fri Apr 22 17:45:06 2011 -0400
@@ -173,7 +173,11 @@
     132 => 'Information',
     133 => 'Critical',
     134 => 'Help',
-    135 => 'Warning'
+    135 => 'Warning',
+    136 => 'Warning: Javascript recommended for enhanced functionality',
+    137 => 'Warning: Javascript required to enable functionality',
+    138 => "Click <a href=\"{$_CONF['site_url']}/usersettings.php\" rel=\"nofollow\">here</a> to disable the advanced editor and use the default editor which does not require JavaScript",
+    139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage"
 );
 
 ###############################################################################
@@ -379,7 +383,7 @@
     147 => 'Edit your account password, email and autologin feature. You will need to enter the same password or email address twice as a confirmation.',
     148 => 'User Information',
     149 => 'Modify your user information that will be shown to other users.<li>The signature will be added to any comments or forum posts you made</li><li>The BIO is a brief summary of yourself to share</li><li>Share your PGP Key</li>',
-    150 => 'Warning: Javascript recommended for enhanced functionality',
+    150 => '',
     156 => 'Delete Account',
     157 => 'Delete Option',
     158 => 'Time Zone',
diff -r 5d70b2f5264f -r a3758165ce03 language/chinese_simplified_utf-8.php
--- a/language/chinese_simplified_utf-8.php	Fri Apr 22 17:34:32 2011 -0400
+++ b/language/chinese_simplified_utf-8.php	Fri Apr 22 17:45:06 2011 -0400
@@ -178,7 +178,11 @@
     132 => 'Information',
     133 => 'Critical',
     134 => 'Help',
-    135 => 'Warning'
+    135 => 'Warning',
+    136 => 'Warning: Javascript recommended for enhanced functionality',
+    137 => 'Warning: Javascript required to enable functionality',
+    138 => "Click <a href=\"{$_CONF['site_url']}/usersettings.php\" rel=\"nofollow\">here</a> to disable the advanced editor and use the default editor which does not require JavaScript",
+    139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage"
 );
 
 ###############################################################################
@@ -384,7 +388,7 @@
     147 => '修改你的用户密码,电信,和自动登å
¥ä½œç”¨ã€‚你需要输å
¥ä½ çš„密码或电信地址两次来避å
é”™è¯¯ã€‚',
     148 => '用户信息',
     149 => '修改要显示给å
¶ä»–用户的你的用户信息.<li>你的签名会显示在你的评论或论坛标语的下面</li><li>个人简历是用来分享你自己的简介</li><li>分享你得 PGP 钥匙</li>',
-    150 => '注意: 建议用Javascript 来提高功能',
+    150 => '',
     156 => '删除用户',
     157 => '删除选项',
     158 => '时区',
diff -r 5d70b2f5264f -r a3758165ce03 language/chinese_traditional_utf-8.php
--- a/language/chinese_traditional_utf-8.php	Fri Apr 22 17:34:32 2011 -0400
+++ b/language/chinese_traditional_utf-8.php	Fri Apr 22 17:45:06 2011 -0400
@@ -178,7 +178,11 @@
     132 => 'Information',
     133 => 'Critical',
     134 => 'Help',
-    135 => 'Warning'
+    135 => 'Warning',
+    136 => 'Warning: Javascript recommended for enhanced functionality',
+    137 => 'Warning: Javascript required to enable functionality',
+    138 => "Click <a href=\"{$_CONF['site_url']}/usersettings.php\" rel=\"nofollow\">here</a> to disable the advanced editor and use the default editor which does not require JavaScript",
+    139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage"
 );
 
 ###############################################################################
@@ -384,7 +388,7 @@
     147 => '修改你的用戶密碼,電信,和自動登å
¥ä½œç”¨ã€‚你需要輸å
¥ä½ çš„密碼或電信位址å
©æ¬¡ä¾†é¿å
éŒ¯èª¤ã€‚',
     148 => '用戶資訊',
     149 => '修改要顯示給å
¶ä»–用戶的你的用戶資訊.<li>你的簽名會顯示在你的評論或論壇標語的下面</li><li>個人簡歷是用來分享你自己的簡介</li><li>分享你得 PGP 鑰匙</li>',
-    150 => '注意: 建議用Javascript 來提高功能',
+    150 => '',
     156 => '刪除用戶',
     157 => '刪除選é 
',
     158 => '時區',
diff -r 5d70b2f5264f -r a3758165ce03 language/croatian.php
--- a/language/croatian.php	Fri Apr 22 17:34:32 2011 -0400
+++ b/language/croatian.php	Fri Apr 22 17:45:06 2011 -0400
@@ -175,7 +175,11 @@
     132 => 'Information',
     133 => 'Critical',
     134 => 'Help',
-    135 => 'Warning'
+    135 => 'Warning',
+    136 => 'Warning: Javascript recommended for enhanced functionality',
+    137 => 'Warning: Javascript required to enable functionality',
+    138 => "Click <a href=\"{$_CONF['site_url']}/usersettings.php\" rel=\"nofollow\">here</a> to disable the advanced editor and use the default editor which does not require JavaScript",
+    139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage"
 );
 
 ###############################################################################
@@ -381,7 +385,7 @@
     147 => 'Edit your account password, email and autologin feature. You will need to enter the same password or email address twice as a confirmation.',
     148 => 'User Information',
     149 => 'Modify your user information that will be shown to other users.<li>The signature will be added to any comments or forum posts you made</li><li>The BIO is a brief summary of yourself to share</li><li>Share your PGP Key</li>',
-    150 => 'Warning: Javascript recommended for enhanced functionality',
+    150 => '',
     156 => 'Delete Account',
     157 => 'Delete Option',
     158 => 'Time Zone',
diff -r 5d70b2f5264f -r a3758165ce03 language/croatian_utf-8.php
--- a/language/croatian_utf-8.php	Fri Apr 22 17:34:32 2011 -0400
+++ b/language/croatian_utf-8.php	Fri Apr 22 17:45:06 2011 -0400
@@ -177,7 +177,11 @@
     132 => 'Information',
     133 => 'Critical',
     134 => 'Help',
-    135 => 'Warning'
+    135 => 'Warning',
+    136 => 'Warning: Javascript recommended for enhanced functionality',
+    137 => 'Warning: Javascript required to enable functionality',
+    138 => "Click <a href=\"{$_CONF['site_url']}/usersettings.php\" rel=\"nofollow\">here</a> to disable the advanced editor and use the default editor which does not require JavaScript",
+    139 => "Click <a href=\"{$_CONF['site_url']}/\" rel=\"nofollow\">here</a> to return to the homepage"
 );
 
 ###############################################################################
@@ -383,7 +387,7 @@
     147 => 'Edit your account password, email and autologin feature. You will need to enter the same password or email address twice as a confirmation.',
     148 => 'User Information',
     149 => 'Modify your user information that will be shown to other users.<li>The signature will be added to any comments or forum posts you made</li><li>The BIO is a brief summary of yourself to share</li><li>Share your PGP Key</li>',
-    150 => 'Warning: Javascript recommended for enhanced functionality',
+    150 => '',
     156 => 'Delete Account',
     157 => 'Delete Option',
     158 => 'Time Zone',



More information about the geeklog-cvs mailing list