diff --git a/history.txt b/history.txt
index 507a10e75..0be42d01d 100644
--- a/history.txt
+++ b/history.txt
@@ -1,5 +1,7 @@
 2010-03-05 zzz
-    * Console: Tag reseed messages
+    * Console:
+      - Tag reseed messages
+      - Translate country names on flag popups
     * I2PSOCKSIRCTunnel:
       - New, for filtering IRC client traffic when using SOCKS
     * I2PTunnelIRCClient:
diff --git a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
index a49caec72..0eb2110d0 100644
--- a/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
+++ b/router/java/src/net/i2p/router/transport/CommSystemFacadeImpl.java
@@ -33,6 +33,7 @@ import net.i2p.router.transport.udp.UDPTransport;
 import net.i2p.util.Log;
 import net.i2p.util.SimpleScheduler;
 import net.i2p.util.SimpleTimer;
+import net.i2p.util.Translate;
 
 public class CommSystemFacadeImpl extends CommSystemFacade {
     private Log _log;
@@ -475,6 +476,8 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
         return n;
     }
 
+    private static final String BUNDLE_NAME = "net.i2p.router.web.messages";
+
     /** Provide a consistent "look" for displaying router IDs in the console */
     @Override
     public String renderPeerHTML(Hash peer) {
@@ -482,8 +485,11 @@ public class CommSystemFacadeImpl extends CommSystemFacade {
         StringBuilder buf = new StringBuilder(128);
         String c = getCountry(peer);
         if (c != null) {
+            String countryName = getCountryName(c);
+            if (countryName.length() > 2)
+                countryName = Translate.getString(countryName, _context, BUNDLE_NAME);
             buf.append("<img height=\"11\" width=\"16\" alt=\"").append(c.toUpperCase()).append("\" title=\"");
-            buf.append(getCountryName(c));
+            buf.append(countryName);
             buf.append("\" src=\"/flags.jsp?c=").append(c).append("\"> ");
         }
         buf.append("<tt>");