* fixed a typo in a message in shiritori

* regenerated messages

6 files changed, 42 insertions, 33 deletions

diff --git a/data/rbot/plugins/games/shiritori.rb b/data/rbot/plugins/games/shiritori.rb
index 250ff838..590e990d 100644
--- a/data/rbot/plugins/games/shiritori.rb
+++ b/data/rbot/plugins/games/shiritori.rb
@@ -284,7 +284,7 @@ class ShiritoriGame
       if !@players.include?(speaker)
         # A new player
         @players.unshift speaker
-        m.reply _("Welcome to shiritori, %{speaker}.") %
+        m.reply _("Welcome to shiritori, %{player}.") %
                 {:player => speaker}
       end
       next_player
diff --git a/po/en_US/rbot.po b/po/en_US/rbot.po
index 0569b200..8959293c 100644
--- a/po/en_US/rbot.po
+++ b/po/en_US/rbot.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rbot\n"
-"POT-Creation-Date: 2007-07-23 14:52-0400\n"
+"POT-Creation-Date: 2007-08-01 00:36-0400\n"
 "PO-Revision-Date: 2007-07-14 00:06-0400\n"
 "Last-Translator: Yaohan Chen <yaohan.chen@gmail.com>\n"
 "Language-Team: English\n"
@@ -110,8 +110,9 @@ msgid "no plugins failed to load"
 msgstr "no plugins failed to load"
 
 #: lib/rbot/plugins.rb:557
+#, fuzzy
 msgid ""
-"%{highlight}%{plugin}%{highlight} in %{dir}failed with error %{exception}: %"
+"%{highlight}%{plugin}%{highlight} in %{dir} failed with error %{exception}: %"
 "{reason}"
 msgstr ""
 "%{highlight}%{plugin}%{highlight} in %{dir}failed with error %{exception}: %"
@@ -149,7 +150,7 @@ msgstr ""
 "Set false to prevent new botusers from recognizing IRC users without a need "
 "to manually login"
 
-#: lib/rbot/botuser.rb:686
+#: lib/rbot/botuser.rb:690
 msgid "%{user}, you don't have '%{command}' permissions here"
 msgstr "%{user}, you don't have '%{command}' permissions here"
 
@@ -967,7 +968,8 @@ msgstr ""
 
 #: data/rbot/plugins/alias.rb:109
 msgid ""
-"Not all substitutions in command text have matching arguments in alias text"
+"The arguments in alias must match the substitutions in command, and vice "
+"versa"
 msgstr ""
 
 #: data/rbot/plugins/alias.rb:126
@@ -1034,7 +1036,8 @@ msgid "%{player} has given the first word: %{word}"
 msgstr "%{player} has given the first word: %{word}"
 
 #: data/rbot/plugins/games/shiritori.rb:287
-msgid "Welcome to shiritori, %{speaker}."
+#, fuzzy
+msgid "Welcome to shiritori, %{player}."
 msgstr "Welcome to shiritori, %{speaker}."
 
 #: data/rbot/plugins/games/shiritori.rb:292
diff --git a/po/ja/rbot.po b/po/ja/rbot.po
index ed944d18..c3a881aa 100644
--- a/po/ja/rbot.po
+++ b/po/ja/rbot.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rbot\n"
-"POT-Creation-Date: 2007-07-23 14:52-0400\n"
+"POT-Creation-Date: 2007-08-01 00:36-0400\n"
 "PO-Revision-Date: 2007-07-09 01:36-0400\n"
 "Last-Translator: Yaohan Chen <yaohan.chen@gmail.com>\n"
 "Language-Team: Japanese\n"
@@ -92,7 +92,7 @@ msgstr ""
 
 #: lib/rbot/plugins.rb:557
 msgid ""
-"%{highlight}%{plugin}%{highlight} in %{dir}failed with error %{exception}: %"
+"%{highlight}%{plugin}%{highlight} in %{dir} failed with error %{exception}: %"
 "{reason}"
 msgstr ""
 
@@ -124,7 +124,7 @@ msgid ""
 "to manually login"
 msgstr ""
 
-#: lib/rbot/botuser.rb:686
+#: lib/rbot/botuser.rb:690
 msgid "%{user}, you don't have '%{command}' permissions here"
 msgstr ""
 
@@ -851,7 +851,8 @@ msgstr ""
 
 #: data/rbot/plugins/alias.rb:109
 msgid ""
-"Not all substitutions in command text have matching arguments in alias text"
+"The arguments in alias must match the substitutions in command, and vice "
+"versa"
 msgstr ""
 
 #: data/rbot/plugins/alias.rb:126
@@ -897,29 +898,29 @@ msgid ""
 "Poor %{current_player} is playing alone! Anyone care to join? %"
 "{previous_word} -> %{current_word}"
 msgstr ""
-"%{current_player}さんは一人で寂しいでしょう。他の人もしりとりしませんか？"
+"%{current_player} さんは一人で寂しいでしょう。他の人もしりとりしませんか？%"
 "{previous_word} -> %{current_word}"
 
 #: data/rbot/plugins/games/shiritori.rb:240
 msgid "%{player} took too long and is out of the game. Try again next game!"
 msgstr ""
-"残念ですが%{player}さんはタイムアウトで負けです。今度のゲームがんばってね！"
+"残念ですが %{player} さんはタイムアウトで負けです。今度のゲームがんばってね！"
 
 #: data/rbot/plugins/games/shiritori.rb:245
 msgid "%{player} is the last remaining player and the winner! Congratulations!"
-msgstr "%{player}さんは勝者です！おめでとうございます！"
+msgstr "%{player} さんは勝者です！おめでとうございます！"
 
 #: data/rbot/plugins/games/shiritori.rb:253
 msgid "%{player} took too long and skipped the turn."
-msgstr "%{player}さんはタイムアウトで、番を飛びました。"
+msgstr "%{player} さんはタイムアウトで、番を飛びました。"
 
 #: data/rbot/plugins/games/shiritori.rb:281
 msgid "%{player} has given the first word: %{word}"
-msgstr "%{player}さんは始めの言葉を決めました：%{word}"
+msgstr "%{player} さんは始めの言葉を決めました：%{word}"
 
 #: data/rbot/plugins/games/shiritori.rb:287
-msgid "Welcome to shiritori, %{speaker}."
-msgstr "しりとりへようこそ、%{speaker}さん"
+msgid "Welcome to shiritori, %{player}."
+msgstr "しりとりへようこそ、%{player} さん"
 
 #: data/rbot/plugins/games/shiritori.rb:292
 msgid "The word %{used_word} has been used. Retry from %{word}"
@@ -932,7 +933,8 @@ msgid ""
 "It's impossible to continue the chain from %{word}. The game has ended. "
 "Thanks a lot, %{player}! :("
 msgstr ""
-"「%{word}」からしりとりが続けられないので、ゲームが終わってしまいました。"
+"%{player} さんが使った言葉「%{word}」からしりとりが続けられないので、ゲームが"
+"終わってしまいました。"
 
 #: data/rbot/plugins/games/shiritori.rb:301
 msgid ""
diff --git a/po/rbot.pot b/po/rbot.pot
index 9d94e159..92bd8edb 100644
--- a/po/rbot.pot
+++ b/po/rbot.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rbot\n"
-"POT-Creation-Date: 2007-07-23 14:52-0400\n"
+"POT-Creation-Date: 2007-08-01 00:36-0400\n"
 "PO-Revision-Date: 2007-07-09 01:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -101,7 +101,7 @@ msgstr ""
 
 #: lib/rbot/plugins.rb:557
 msgid ""
-"%{highlight}%{plugin}%{highlight} in %{dir}failed with error %{exception}: %"
+"%{highlight}%{plugin}%{highlight} in %{dir} failed with error %{exception}: %"
 "{reason}"
 msgstr ""
 
@@ -133,7 +133,7 @@ msgid ""
 "to manually login"
 msgstr ""
 
-#: lib/rbot/botuser.rb:686
+#: lib/rbot/botuser.rb:690
 msgid "%{user}, you don't have '%{command}' permissions here"
 msgstr ""
 
@@ -861,7 +861,8 @@ msgstr ""
 
 #: data/rbot/plugins/alias.rb:109
 msgid ""
-"Not all substitutions in command text have matching arguments in alias text"
+"The arguments in alias must match the substitutions in command, and vice "
+"versa"
 msgstr ""
 
 #: data/rbot/plugins/alias.rb:126
@@ -925,7 +926,7 @@ msgid "%{player} has given the first word: %{word}"
 msgstr ""
 
 #: data/rbot/plugins/games/shiritori.rb:287
-msgid "Welcome to shiritori, %{speaker}."
+msgid "Welcome to shiritori, %{player}."
 msgstr ""
 
 #: data/rbot/plugins/games/shiritori.rb:292
diff --git a/po/zh_CN/rbot.po b/po/zh_CN/rbot.po
index 93a555c9..c3e2a105 100644
--- a/po/zh_CN/rbot.po
+++ b/po/zh_CN/rbot.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rbot\n"
-"POT-Creation-Date: 2007-07-23 14:52-0400\n"
+"POT-Creation-Date: 2007-08-01 00:36-0400\n"
 "PO-Revision-Date: 2007-07-09 01:39-0400\n"
 "Last-Translator: Yaohan Chen <yaohan.chen@gmail.com>\n"
 "Language-Team: Chinese\n"
@@ -100,7 +100,7 @@ msgstr ""
 
 #: lib/rbot/plugins.rb:557
 msgid ""
-"%{highlight}%{plugin}%{highlight} in %{dir}failed with error %{exception}: %"
+"%{highlight}%{plugin}%{highlight} in %{dir} failed with error %{exception}: %"
 "{reason}"
 msgstr ""
 
@@ -132,7 +132,7 @@ msgid ""
 "to manually login"
 msgstr ""
 
-#: lib/rbot/botuser.rb:686
+#: lib/rbot/botuser.rb:690
 msgid "%{user}, you don't have '%{command}' permissions here"
 msgstr ""
 
@@ -860,7 +860,8 @@ msgstr ""
 
 #: data/rbot/plugins/alias.rb:109
 msgid ""
-"Not all substitutions in command text have matching arguments in alias text"
+"The arguments in alias must match the substitutions in command, and vice "
+"versa"
 msgstr ""
 
 #: data/rbot/plugins/alias.rb:126
@@ -924,7 +925,7 @@ msgid "%{player} has given the first word: %{word}"
 msgstr ""
 
 #: data/rbot/plugins/games/shiritori.rb:287
-msgid "Welcome to shiritori, %{speaker}."
+msgid "Welcome to shiritori, %{player}."
 msgstr ""
 
 #: data/rbot/plugins/games/shiritori.rb:292
diff --git a/po/zh_TW/rbot.po b/po/zh_TW/rbot.po
index 6e23ce0a..ebd4759a 100644
--- a/po/zh_TW/rbot.po
+++ b/po/zh_TW/rbot.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rbot\n"
-"POT-Creation-Date: 2007-07-23 14:52-0400\n"
+"POT-Creation-Date: 2007-08-01 00:36-0400\n"
 "PO-Revision-Date: 2007-07-09 01:24-0400\n"
 "Last-Translator: Liang-Bin Hsueh <hlb@handlino.com>\n"
 "Language-Team: Chinese\n"
@@ -95,8 +95,9 @@ msgid "no plugins failed to load"
 msgstr "沒有外掛程式載入失敗"
 
 #: lib/rbot/plugins.rb:557
+#, fuzzy
 msgid ""
-"%{highlight}%{plugin}%{highlight} in %{dir}failed with error %{exception}: %"
+"%{highlight}%{plugin}%{highlight} in %{dir} failed with error %{exception}: %"
 "{reason}"
 msgstr ""
 "%{dir} 的 %{highlight}%{plugin}%{highlight} 外掛程式發生錯誤 %{exception}: %"
@@ -134,7 +135,7 @@ msgstr ""
 "Set false to prevent new botusers from recognizing IRC users without a need "
 "to manually login"
 
-#: lib/rbot/botuser.rb:686
+#: lib/rbot/botuser.rb:690
 msgid "%{user}, you don't have '%{command}' permissions here"
 msgstr "%{user}，你並沒有 '%{command}' 權限"
 
@@ -869,7 +870,8 @@ msgstr ""
 
 #: data/rbot/plugins/alias.rb:109
 msgid ""
-"Not all substitutions in command text have matching arguments in alias text"
+"The arguments in alias must match the substitutions in command, and vice "
+"versa"
 msgstr ""
 
 #: data/rbot/plugins/alias.rb:126
@@ -933,7 +935,7 @@ msgid "%{player} has given the first word: %{word}"
 msgstr ""
 
 #: data/rbot/plugins/games/shiritori.rb:287
-msgid "Welcome to shiritori, %{speaker}."
+msgid "Welcome to shiritori, %{player}."
 msgstr ""
 
 #: data/rbot/plugins/games/shiritori.rb:292