Move English messages from po/en_US to po/en

When using gettext, the bot will look for English messages in the 'en'
locale, rather than en_US. This causes some Ruby GetText version to
not find the .mo files, which used to be stored as en_US instead. Since
Ruby's GetText seems to be too stupid to fall back to en_US when en is
not found, we move the messages to en.

This is also probably more correct from a linguistic standpoint, since
the messages are actually mostly British English due to the bot origin.

82 files changed, 1 insertions, 1 deletions

diff --git a/Rakefile b/Rakefile
index 435e6265..b54728f3 100644
--- a/Rakefile
+++ b/Rakefile
@@ -97,7 +97,7 @@ task :define_po_rules do
   end
 
   # generate English po files
-  file(%r'^po/en_US/.+\.po$' => pot_for_po) do |t|
+  file(%r'^po/en/.+\.po$' => pot_for_po) do |t|
     po_file, pot_file = t.name, t.source
     if MSGEN
       sh "#{MSGEN} --output-file=#{po_file} #{pot_file}"
diff --git a/po/en_US/rbot-alias.po b/po/en/rbot-alias.po
index ec0830d3..ec0830d3 100644
--- a/po/en_US/rbot-alias.po
+++ b/po/en/rbot-alias.po
diff --git a/po/en_US/rbot-autoop.po b/po/en/rbot-autoop.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-autoop.po
+++ b/po/en/rbot-autoop.po
diff --git a/po/en_US/rbot-autorejoin.po b/po/en/rbot-autorejoin.po
index 1a0617af..1a0617af 100644
--- a/po/en_US/rbot-autorejoin.po
+++ b/po/en/rbot-autorejoin.po
diff --git a/po/en_US/rbot-azgame.po b/po/en/rbot-azgame.po
index d4c06c25..d4c06c25 100644
--- a/po/en_US/rbot-azgame.po
+++ b/po/en/rbot-azgame.po
diff --git a/po/en_US/rbot-bans.po b/po/en/rbot-bans.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-bans.po
+++ b/po/en/rbot-bans.po
diff --git a/po/en_US/rbot-bash.po b/po/en/rbot-bash.po
index 0f22c5d9..0f22c5d9 100644
--- a/po/en_US/rbot-bash.po
+++ b/po/en/rbot-bash.po
diff --git a/po/en_US/rbot-botsnack.po b/po/en/rbot-botsnack.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-botsnack.po
+++ b/po/en/rbot-botsnack.po
diff --git a/po/en_US/rbot-cal.po b/po/en/rbot-cal.po
index e0c74fd6..e0c74fd6 100644
--- a/po/en_US/rbot-cal.po
+++ b/po/en/rbot-cal.po
diff --git a/po/en_US/rbot-chanserv.po b/po/en/rbot-chanserv.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-chanserv.po
+++ b/po/en/rbot-chanserv.po
diff --git a/po/en_US/rbot-chucknorris.po b/po/en/rbot-chucknorris.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-chucknorris.po
+++ b/po/en/rbot-chucknorris.po
diff --git a/po/en_US/rbot-debugger.po b/po/en/rbot-debugger.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-debugger.po
+++ b/po/en/rbot-debugger.po
diff --git a/po/en_US/rbot-deepthoughts.po b/po/en/rbot-deepthoughts.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-deepthoughts.po
+++ b/po/en/rbot-deepthoughts.po
diff --git a/po/en_US/rbot-delicious.po b/po/en/rbot-delicious.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-delicious.po
+++ b/po/en/rbot-delicious.po
diff --git a/po/en_US/rbot-dice.po b/po/en/rbot-dice.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-dice.po
+++ b/po/en/rbot-dice.po
diff --git a/po/en_US/rbot-dict.po b/po/en/rbot-dict.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-dict.po
+++ b/po/en/rbot-dict.po
diff --git a/po/en_US/rbot-dictclient.po b/po/en/rbot-dictclient.po
index 7b94c09d..7b94c09d 100644
--- a/po/en_US/rbot-dictclient.po
+++ b/po/en/rbot-dictclient.po
diff --git a/po/en_US/rbot-digg.po b/po/en/rbot-digg.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-digg.po
+++ b/po/en/rbot-digg.po
diff --git a/po/en_US/rbot-eightball.po b/po/en/rbot-eightball.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-eightball.po
+++ b/po/en/rbot-eightball.po
diff --git a/po/en_US/rbot-excuse.po b/po/en/rbot-excuse.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-excuse.po
+++ b/po/en/rbot-excuse.po
diff --git a/po/en_US/rbot-factoids.po b/po/en/rbot-factoids.po
index a266c2df..a266c2df 100644
--- a/po/en_US/rbot-factoids.po
+++ b/po/en/rbot-factoids.po
diff --git a/po/en_US/rbot-figlet.po b/po/en/rbot-figlet.po
index 22abda98..22abda98 100644
--- a/po/en_US/rbot-figlet.po
+++ b/po/en/rbot-figlet.po
diff --git a/po/en_US/rbot-fish.po b/po/en/rbot-fish.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-fish.po
+++ b/po/en/rbot-fish.po
diff --git a/po/en_US/rbot-forecast.po b/po/en/rbot-forecast.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-forecast.po
+++ b/po/en/rbot-forecast.po
diff --git a/po/en_US/rbot-fortune.po b/po/en/rbot-fortune.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-fortune.po
+++ b/po/en/rbot-fortune.po
diff --git a/po/en_US/rbot-freshmeat.po b/po/en/rbot-freshmeat.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-freshmeat.po
+++ b/po/en/rbot-freshmeat.po
diff --git a/po/en_US/rbot-geoip.po b/po/en/rbot-geoip.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-geoip.po
+++ b/po/en/rbot-geoip.po
diff --git a/po/en_US/rbot-googlefight.po b/po/en/rbot-googlefight.po
index 86614efb..86614efb 100644
--- a/po/en_US/rbot-googlefight.po
+++ b/po/en/rbot-googlefight.po
diff --git a/po/en_US/rbot-grouphug.po b/po/en/rbot-grouphug.po
index 9c68e8c9..9c68e8c9 100644
--- a/po/en_US/rbot-grouphug.po
+++ b/po/en/rbot-grouphug.po
diff --git a/po/en_US/rbot-hangman.po b/po/en/rbot-hangman.po
index 33c0f286..33c0f286 100644
--- a/po/en_US/rbot-hangman.po
+++ b/po/en/rbot-hangman.po
diff --git a/po/en_US/rbot-hl2.po b/po/en/rbot-hl2.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-hl2.po
+++ b/po/en/rbot-hl2.po
diff --git a/po/en_US/rbot-host.po b/po/en/rbot-host.po
index d118bfe8..d118bfe8 100644
--- a/po/en_US/rbot-host.po
+++ b/po/en/rbot-host.po
diff --git a/po/en_US/rbot-imdb.po b/po/en/rbot-imdb.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-imdb.po
+++ b/po/en/rbot-imdb.po
diff --git a/po/en_US/rbot-insult.po b/po/en/rbot-insult.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-insult.po
+++ b/po/en/rbot-insult.po
diff --git a/po/en_US/rbot-iplookup.po b/po/en/rbot-iplookup.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-iplookup.po
+++ b/po/en/rbot-iplookup.po
diff --git a/po/en_US/rbot-karma.po b/po/en/rbot-karma.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-karma.po
+++ b/po/en/rbot-karma.po
diff --git a/po/en_US/rbot-keywords.po b/po/en/rbot-keywords.po
index f9d03ce3..f9d03ce3 100644
--- a/po/en_US/rbot-keywords.po
+++ b/po/en/rbot-keywords.po
diff --git a/po/en_US/rbot-lart.po b/po/en/rbot-lart.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-lart.po
+++ b/po/en/rbot-lart.po
diff --git a/po/en_US/rbot-lastfm.po b/po/en/rbot-lastfm.po
index d638ef81..d638ef81 100644
--- a/po/en_US/rbot-lastfm.po
+++ b/po/en/rbot-lastfm.po
diff --git a/po/en_US/rbot-linkbot.po b/po/en/rbot-linkbot.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-linkbot.po
+++ b/po/en/rbot-linkbot.po
diff --git a/po/en_US/rbot-markov.po b/po/en/rbot-markov.po
index da2addbc..da2addbc 100644
--- a/po/en_US/rbot-markov.po
+++ b/po/en/rbot-markov.po
diff --git a/po/en_US/rbot-math.po b/po/en/rbot-math.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-math.po
+++ b/po/en/rbot-math.po
diff --git a/po/en_US/rbot-modes.po b/po/en/rbot-modes.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-modes.po
+++ b/po/en/rbot-modes.po
diff --git a/po/en_US/rbot-nickrecover.po b/po/en/rbot-nickrecover.po
index fae49fb0..fae49fb0 100644
--- a/po/en_US/rbot-nickrecover.po
+++ b/po/en/rbot-nickrecover.po
diff --git a/po/en_US/rbot-nickserv.po b/po/en/rbot-nickserv.po
index 51ba7394..51ba7394 100644
--- a/po/en_US/rbot-nickserv.po
+++ b/po/en/rbot-nickserv.po
diff --git a/po/en_US/rbot-nslookup.po b/po/en/rbot-nslookup.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-nslookup.po
+++ b/po/en/rbot-nslookup.po
diff --git a/po/en_US/rbot-quakeauth.po b/po/en/rbot-quakeauth.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-quakeauth.po
+++ b/po/en/rbot-quakeauth.po
diff --git a/po/en_US/rbot-quiz.po b/po/en/rbot-quiz.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-quiz.po
+++ b/po/en/rbot-quiz.po
diff --git a/po/en_US/rbot-quotes.po b/po/en/rbot-quotes.po
index af96ef75..af96ef75 100644
--- a/po/en_US/rbot-quotes.po
+++ b/po/en/rbot-quotes.po
diff --git a/po/en_US/rbot-reaction.po b/po/en/rbot-reaction.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-reaction.po
+++ b/po/en/rbot-reaction.po
diff --git a/po/en_US/rbot-remind.po b/po/en/rbot-remind.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-remind.po
+++ b/po/en/rbot-remind.po
diff --git a/po/en_US/rbot-remotectl.po b/po/en/rbot-remotectl.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-remotectl.po
+++ b/po/en/rbot-remotectl.po
diff --git a/po/en_US/rbot-ri.po b/po/en/rbot-ri.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-ri.po
+++ b/po/en/rbot-ri.po
diff --git a/po/en_US/rbot-roshambo.po b/po/en/rbot-roshambo.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-roshambo.po
+++ b/po/en/rbot-roshambo.po
diff --git a/po/en_US/rbot-rot13.po b/po/en/rbot-rot13.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-rot13.po
+++ b/po/en/rbot-rot13.po
diff --git a/po/en_US/rbot-roulette.po b/po/en/rbot-roulette.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-roulette.po
+++ b/po/en/rbot-roulette.po
diff --git a/po/en_US/rbot-rss.po b/po/en/rbot-rss.po
index 8d266bf6..8d266bf6 100644
--- a/po/en_US/rbot-rss.po
+++ b/po/en/rbot-rss.po
diff --git a/po/en_US/rbot-salut.po b/po/en/rbot-salut.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-salut.po
+++ b/po/en/rbot-salut.po
diff --git a/po/en_US/rbot-script.po b/po/en/rbot-script.po
index 258444eb..258444eb 100644
--- a/po/en_US/rbot-script.po
+++ b/po/en/rbot-script.po
diff --git a/po/en_US/rbot-search.po b/po/en/rbot-search.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-search.po
+++ b/po/en/rbot-search.po
diff --git a/po/en_US/rbot-seen.po b/po/en/rbot-seen.po
index 6e199bfe..6e199bfe 100644
--- a/po/en_US/rbot-seen.po
+++ b/po/en/rbot-seen.po
diff --git a/po/en_US/rbot-shiritori.po b/po/en/rbot-shiritori.po
index 52608576..52608576 100644
--- a/po/en_US/rbot-shiritori.po
+++ b/po/en/rbot-shiritori.po
diff --git a/po/en_US/rbot-shortenurls.po b/po/en/rbot-shortenurls.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-shortenurls.po
+++ b/po/en/rbot-shortenurls.po
diff --git a/po/en_US/rbot-slashdot.po b/po/en/rbot-slashdot.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-slashdot.po
+++ b/po/en/rbot-slashdot.po
diff --git a/po/en_US/rbot-spell.po b/po/en/rbot-spell.po
index a68af1e4..a68af1e4 100644
--- a/po/en_US/rbot-spell.po
+++ b/po/en/rbot-spell.po
diff --git a/po/en_US/rbot-theyfightcrime.po b/po/en/rbot-theyfightcrime.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-theyfightcrime.po
+++ b/po/en/rbot-theyfightcrime.po
diff --git a/po/en_US/rbot-threat.po b/po/en/rbot-threat.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-threat.po
+++ b/po/en/rbot-threat.po
diff --git a/po/en_US/rbot-time.po b/po/en/rbot-time.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-time.po
+++ b/po/en/rbot-time.po
diff --git a/po/en_US/rbot-topic.po b/po/en/rbot-topic.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-topic.po
+++ b/po/en/rbot-topic.po
diff --git a/po/en_US/rbot-translator.po b/po/en/rbot-translator.po
index 0da3b087..0da3b087 100644
--- a/po/en_US/rbot-translator.po
+++ b/po/en/rbot-translator.po
diff --git a/po/en_US/rbot-tube.po b/po/en/rbot-tube.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-tube.po
+++ b/po/en/rbot-tube.po
diff --git a/po/en_US/rbot-twitter.po b/po/en/rbot-twitter.po
index 5afae1d4..5afae1d4 100644
--- a/po/en_US/rbot-twitter.po
+++ b/po/en/rbot-twitter.po
diff --git a/po/en_US/rbot-uno.po b/po/en/rbot-uno.po
index 16a61f00..16a61f00 100644
--- a/po/en_US/rbot-uno.po
+++ b/po/en/rbot-uno.po
diff --git a/po/en_US/rbot-urban.po b/po/en/rbot-urban.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-urban.po
+++ b/po/en/rbot-urban.po
diff --git a/po/en_US/rbot-url.po b/po/en/rbot-url.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-url.po
+++ b/po/en/rbot-url.po
diff --git a/po/en_US/rbot-usermodes.po b/po/en/rbot-usermodes.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-usermodes.po
+++ b/po/en/rbot-usermodes.po
diff --git a/po/en_US/rbot-weather.po b/po/en/rbot-weather.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-weather.po
+++ b/po/en/rbot-weather.po
diff --git a/po/en_US/rbot-wheelfortune.po b/po/en/rbot-wheelfortune.po
index f3950a69..f3950a69 100644
--- a/po/en_US/rbot-wheelfortune.po
+++ b/po/en/rbot-wheelfortune.po
diff --git a/po/en_US/rbot-wow.po b/po/en/rbot-wow.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-wow.po
+++ b/po/en/rbot-wow.po
diff --git a/po/en_US/rbot-wserver.po b/po/en/rbot-wserver.po
index e69de29b..e69de29b 100644
--- a/po/en_US/rbot-wserver.po
+++ b/po/en/rbot-wserver.po
diff --git a/po/en_US/rbot-youtube.po b/po/en/rbot-youtube.po
index 3a4cb656..3a4cb656 100644
--- a/po/en_US/rbot-youtube.po
+++ b/po/en/rbot-youtube.po
diff --git a/po/en_US/rbot.po b/po/en/rbot.po
index 46cf12fd..46cf12fd 100644
--- a/po/en_US/rbot.po
+++ b/po/en/rbot.po