diff --git a/gajim/data/gui/account_creation_wizard_window.ui b/gajim/data/gui/account_creation_wizard_window.ui
index 6cfaa4adeff6805bf3de6aaf5eca8b667d829747..3356400b198e654bfba880bf8f4424473c524c16 100644
--- a/gajim/data/gui/account_creation_wizard_window.ui
+++ b/gajim/data/gui/account_creation_wizard_window.ui
@@ -68,7 +68,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">You need to have an account in order to connect
-to the Jabber network.</property>
+to the XMPP network.</property>
</object>
<packing>
<property name="expand">False</property>
@@ -184,7 +184,7 @@ to the Jabber network.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Jabber ID:</property>
+ <property name="label" translatable="yes">_XMPP Address:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">username_entry</property>
</object>
diff --git a/gajim/data/gui/add_new_contact_window.ui b/gajim/data/gui/add_new_contact_window.ui
index c11d0dc4001c142486c66b645b3377624835b93c..d6f6c3ba20385338377edc895c9ca05977e16a5f 100644
--- a/gajim/data/gui/add_new_contact_window.ui
+++ b/gajim/data/gui/add_new_contact_window.ui
@@ -81,7 +81,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">_Jabber ID</property>
+ <property name="label" translatable="yes">_XMPP Address</property>
<property name="use_underline">True</property>
<style>
<class name="dim-label"/>
diff --git a/gajim/data/gui/blocking_list.ui b/gajim/data/gui/blocking_list.ui
index 84dfb3b1460e053eff0c8fcbc6c9b32cd9d82c9d..39b36ad299579257128ca0a17f087abfee71ccc0 100644
--- a/gajim/data/gui/blocking_list.ui
+++ b/gajim/data/gui/blocking_list.ui
@@ -112,7 +112,7 @@
</child>
<child>
<object class="GtkTreeViewColumn" id="treeviewcolumn1">
- <property name="title" translatable="yes">Jabber ID</property>
+ <property name="title" translatable="yes">XMPP Address</property>
<property name="expand">True</property>
<property name="clickable">True</property>
<property name="sort_indicator">True</property>
diff --git a/gajim/data/gui/groupchat_config.ui b/gajim/data/gui/groupchat_config.ui
index 317fc0eb07a0ab21ed3d8c55a48a61bcf3a1cda5..8be0ad3abf76787cf9070aa9fdfae1eee10e11d8 100644
--- a/gajim/data/gui/groupchat_config.ui
+++ b/gajim/data/gui/groupchat_config.ui
@@ -52,7 +52,7 @@
<property name="margin_right">12</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
- <property name="label" translatable="yes"><b>Jabber-ID</b>
+ <property name="label" translatable="yes"><b>XMPP Address</b>
&lt;user@domain/resource&gt; (only that resource matches)
&lt;user@domain&gt; (any resource matches)
&lt;domain/resource&gt; (only that resource matches)
@@ -298,7 +298,7 @@
<object class="GtkTreeViewColumn">
<property name="resizable">True</property>
<property name="sizing">autosize</property>
- <property name="title">Jabber-ID</property>
+ <property name="title">XMPP Address</property>
<property name="expand">True</property>
<property name="sort_indicator">True</property>
<property name="sort_column_id">0</property>
@@ -417,7 +417,7 @@
<object class="GtkTreeViewColumn">
<property name="resizable">True</property>
<property name="sizing">autosize</property>
- <property name="title">Jabber-ID</property>
+ <property name="title">XMPP Address</property>
<property name="expand">True</property>
<property name="sort_indicator">True</property>
<property name="sort_column_id">0</property>
diff --git a/gajim/data/gui/mam_preferences.ui b/gajim/data/gui/mam_preferences.ui
index 00c4dfb517a9ce967d1879af87e59e3d193e38d4..d4ed9d212b00079f33ca2c23c479a7b4663e29b5 100644
--- a/gajim/data/gui/mam_preferences.ui
+++ b/gajim/data/gui/mam_preferences.ui
@@ -114,7 +114,7 @@
</child>
<child>
<object class="GtkTreeViewColumn">
- <property name="title" translatable="yes">Jabber ID</property>
+ <property name="title" translatable="yes">XMPP Address</property>
<property name="expand">True</property>
<property name="clickable">True</property>
<property name="sort_indicator">True</property>
diff --git a/gajim/data/gui/privacy_list_window.ui b/gajim/data/gui/privacy_list_window.ui
index 58ba7a9b64e43744ef784ca05c37ee095e350a5e..eb88e3131f29ca2dc56cfdf1285840dcfb951b3f 100644
--- a/gajim/data/gui/privacy_list_window.ui
+++ b/gajim/data/gui/privacy_list_window.ui
@@ -314,7 +314,7 @@
<property name="border_width">5</property>
<child>
<object class="GtkRadioButton" id="edit_type_jabberid_radiobutton">
- <property name="label" translatable="yes">JabberID</property>
+ <property name="label" translatable="yes">XMPP Address</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
diff --git a/gajim/data/gui/profile_window.ui b/gajim/data/gui/profile_window.ui
index 837d1cded2cd272775d2d6ade98fd3a44d1037cd..0c7eb2e390501151e0b94f449d20c3233ff25345 100644
--- a/gajim/data/gui/profile_window.ui
+++ b/gajim/data/gui/profile_window.ui
@@ -401,7 +401,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
- <property name="label" translatable="yes">Jabber ID</property>
+ <property name="label" translatable="yes">XMPP Address</property>
<property name="use_markup">True</property>
<property name="justify">right</property>
<style>
diff --git a/gajim/data/gui/vcard_information_window.ui b/gajim/data/gui/vcard_information_window.ui
index b9e771298e31831bb2b0c23185d31ca18dd414a6..c08fe8c568bd5dc1e9eb47c1f9c3c375eecb39af 100644
--- a/gajim/data/gui/vcard_information_window.ui
+++ b/gajim/data/gui/vcard_information_window.ui
@@ -52,7 +52,7 @@
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">start</property>
- <property name="label" translatable="yes">Jabber ID</property>
+ <property name="label" translatable="yes">XMPP Address</property>
<property name="use_markup">True</property>
<style>
<class name="dim-label"/>
diff --git a/gajim/data/gui/zeroconf_information_window.ui b/gajim/data/gui/zeroconf_information_window.ui
index 7f3813b3ac012e75e16180ec6c95ae9459f1f780..99499af4ff442533002995f5425a9fafa0f6d311 100644
--- a/gajim/data/gui/zeroconf_information_window.ui
+++ b/gajim/data/gui/zeroconf_information_window.ui
@@ -257,7 +257,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">Jabber ID:</property>
+ <property name="label" translatable="yes">XMPP Address:</property>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/gajim/gtk/accounts.py b/gajim/gtk/accounts.py
index a54052ab2c0641c7fd53911e16548a5e5001e6bb..0c40d845f004ae0a68330f8ac770888891613ace 100644
--- a/gajim/gtk/accounts.py
+++ b/gajim/gtk/accounts.py
@@ -801,7 +801,7 @@ def __init__(self, account, parent):
Setting(SettingKind.ENTRY, _('Last Name'),
SettingType.ACCOUNT_CONFIG, 'zeroconf_last_name'),
- Setting(SettingKind.ENTRY, _('Jabber ID'),
+ Setting(SettingKind.ENTRY, _('XMPP Address'),
SettingType.ACCOUNT_CONFIG, 'zeroconf_jabber_id'),
Setting(SettingKind.ENTRY, _('Email'),
diff --git a/gajim/gtk/add_contact.py b/gajim/gtk/add_contact.py
index 99b4ca51eb560f88dd4769ba1398088a11aaf1f6..6152167df4493f48dafc4ee234552a45a0b1c261 100644
--- a/gajim/gtk/add_contact.py
+++ b/gajim/gtk/add_contact.py
@@ -27,7 +27,7 @@
class AddNewContactWindow(Gtk.ApplicationWindow):
- uid_labels = {'jabber': _('Jabber ID'),
+ uid_labels = {'jabber': _('XMPP Address'),
'gadu-gadu': _('GG Number'),
'icq': _('ICQ Number')}
diff --git a/gajim/gtk/groupchat_config.py b/gajim/gtk/groupchat_config.py
index 91a14450e940f521e0c0918daa9645aa4ef3324b..0f4a05e2b82033843671b26a4be8c5e940ed5623 100644
--- a/gajim/gtk/groupchat_config.py
+++ b/gajim/gtk/groupchat_config.py
@@ -396,4 +396,4 @@ def _on_affiliations_received(self, result, affiliation):
@staticmethod
def _raise_error():
ErrorDialog(_('Error'),
- _('An entry with this Jabber-ID already exists'))
+ _('An entry with this XMPP Address already exists'))