diff --git a/.tx/config b/.tx/config
index deab7201559b020a7fde7e96b8229abc53bfc246..befa61f59d896cd58ad0f4cf2ffe81d84385c8bb 100644
--- a/.tx/config
+++ b/.tx/config
@@ -33,7 +33,8 @@ trans.de = apps/i2ptunnel/locale-proxy/messages_de.po
 trans.es = apps/i2ptunnel/locale-proxy/messages_es.po
 trans.fr = apps/i2ptunnel/locale-proxy/messages_fr.po
 trans.hu = apps/i2ptunnel/locale-proxy/messages_hu.po
-trans.id = apps/i2ptunnel/locale-proxy/messages_id.po
+;; Java converts id to in
+trans.id = apps/i2ptunnel/locale-proxy/messages_in.po
 trans.it = apps/i2ptunnel/locale-proxy/messages_it.po
 trans.nb = apps/i2ptunnel/locale-proxy/messages_nb.po
 trans.nl = apps/i2ptunnel/locale-proxy/messages_nl.po
@@ -85,7 +86,8 @@ trans.es = apps/routerconsole/locale-news/messages_es.po
 trans.fi = apps/routerconsole/locale-news/messages_fi.po
 trans.fr = apps/routerconsole/locale-news/messages_fr.po
 trans.he = apps/routerconsole/locale-news/messages_he.po
-trans.id = apps/routerconsole/locale-news/messages_id.po
+;; Java converts id to in
+trans.id = apps/routerconsole/locale-news/messages_in.po
 trans.it = apps/routerconsole/locale-news/messages_it.po
 trans.ja = apps/routerconsole/locale-news/messages_ja.po
 trans.ko = apps/routerconsole/locale-news/messages_ko.po
@@ -217,7 +219,8 @@ trans.es = apps/susimail/locale/messages_es.po
 trans.fi = apps/susimail/locale/messages_fi.po
 trans.fr = apps/susimail/locale/messages_fr.po
 trans.hu = apps/susimail/locale/messages_hu.po
-trans.id = apps/susimail/locale/messages_id.po
+;; Java converts id to in
+trans.id = apps/susimail/locale/messages_in.po
 trans.it = apps/susimail/locale/messages_it.po
 trans.ja = apps/susimail/locale/messages_ja.po
 trans.mg = apps/susimail/locale/messages_mg.po
@@ -296,7 +299,8 @@ trans.de = core/java/src/gnu/getopt/MessagesBundle_de.properties
 trans.es = core/java/src/gnu/getopt/MessagesBundle_es.properties
 trans.fr = core/java/src/gnu/getopt/MessagesBundle_fr.properties
 trans.hu = core/java/src/gnu/getopt/MessagesBundle_hu.properties
-trans.id = core/java/src/gnu/getopt/MessagesBundle_id.properties
+;; Java converts id to in
+trans.id = core/java/src/gnu/getopt/MessagesBundle_in.properties
 trans.it = core/java/src/gnu/getopt/MessagesBundle_it.properties
 trans.ja = core/java/src/gnu/getopt/MessagesBundle_ja.properties
 trans.ko = core/java/src/gnu/getopt/MessagesBundle_ko.properties
@@ -321,7 +325,8 @@ source_lang = en
 trans.de = apps/ministreaming/locale/messages_de.po
 trans.es = apps/ministreaming/locale/messages_es.po
 trans.fr = apps/ministreaming/locale/messages_fr.po
-trans.id = apps/ministreaming/locale/messages_id.po
+;; Java converts id to in
+trans.id = apps/ministreaming/locale/messages_in.po
 trans.it = apps/ministreaming/locale/messages_it.po
 trans.nb = apps/ministreaming/locale/messages_nb.po
 trans.pl = apps/ministreaming/locale/messages_pl.po
diff --git a/apps/i2ptunnel/locale-proxy/messages_id.po b/apps/i2ptunnel/locale-proxy/messages_in.po
similarity index 100%
rename from apps/i2ptunnel/locale-proxy/messages_id.po
rename to apps/i2ptunnel/locale-proxy/messages_in.po
diff --git a/apps/ministreaming/locale/messages_id.po b/apps/ministreaming/locale/messages_in.po
similarity index 100%
rename from apps/ministreaming/locale/messages_id.po
rename to apps/ministreaming/locale/messages_in.po
diff --git a/apps/routerconsole/locale-news/messages_id.po b/apps/routerconsole/locale-news/messages_in.po
similarity index 100%
rename from apps/routerconsole/locale-news/messages_id.po
rename to apps/routerconsole/locale-news/messages_in.po
diff --git a/apps/susimail/locale/messages_id.po b/apps/susimail/locale/messages_in.po
similarity index 100%
rename from apps/susimail/locale/messages_id.po
rename to apps/susimail/locale/messages_in.po
diff --git a/core/java/src/gnu/getopt/MessagesBundle_id.properties b/core/java/src/gnu/getopt/MessagesBundle_in.properties
similarity index 100%
rename from core/java/src/gnu/getopt/MessagesBundle_id.properties
rename to core/java/src/gnu/getopt/MessagesBundle_in.properties