diff --git a/README-fr.md b/README-fr.md index de76eec09b..57300ff90a 100644 --- a/README-fr.md +++ b/README-fr.md @@ -50,7 +50,7 @@ Vous pouvez créer une demande de fusion et ajouter de nouvelles langues en tant ## Aidez-moi ! J'ai rencontré des problèmes ! La façon la plus simple d'obtenir de l'aide est de rejoindre notre support-MUC (en anglais et en allemand). -Lien d'invitation à la discussion de soutien : [support@conference.monocles.de] +Lien d'invitation à la discussion de soutien : [support@conference.monocles.eu] Si nous ne pouvons pas résoudre votre problème, vous pouvez ouvrir une question [ici](https://codeberg.org/Arne/monocles_chat/issues), en détaillant votre problème, comment le reproduire et en fournissant des journaux. Voir les instructions ci-dessous sur la façon de créer des fichiers journaux. diff --git a/README.md b/README.md index f2eb4b5bb7..9a1ba1948c 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ Du kannst einen Merge Request erstellen in dem du Verbesserungen oder neue Sprac #### Ich habe Probleme, was soll ich tun? Am einfachsten ist es, wenn du unserer Support-Gruppe beitrittst, dort werden deine Probleme mit Sicherheit schnell gelöst. -Support-Chat: [support@conference.monocles.de](https://monocles.chat) +Support-Chat: [support@conference.monocles.eu](https://monocles.chat) Development-Chat: [development@conference.monocles.de](https://monocles.chat) diff --git a/fastlane/metadata/android/de/description.txt b/fastlane/metadata/android/de/description.txt index 4870e23ab7..cb02d107cb 100644 --- a/fastlane/metadata/android/de/description.txt +++ b/fastlane/metadata/android/de/description.txt @@ -26,4 +26,4 @@ Features: * Status Nachrichten * tägliches Backup der Datenbank auf den lokalen Speicher -Benötigst du Hilfe? Bitte tritt doch einfach dem Support Gruppenchat support@conference.monocles.de bei. +Benötigst du Hilfe? Bitte tritt doch einfach dem Support Gruppenchat support@conference.monocles.eu bei. diff --git a/fastlane/metadata/android/en-US/description.txt b/fastlane/metadata/android/en-US/description.txt index c1be169147..c45a4b3fd8 100644 --- a/fastlane/metadata/android/en-US/description.txt +++ b/fastlane/metadata/android/en-US/description.txt @@ -23,4 +23,4 @@ Features: * Status messages * Daily backup of database to local storage -You need help? Please join our support group chat support@conference.monocles.de. +You need help? Please join our support group chat support@conference.monocles.de. diff --git a/monocles_chat.doap b/monocles_chat.doap index 205e9bcc39..e1b7a3d317 100644 --- a/monocles_chat.doap +++ b/monocles_chat.doap @@ -18,14 +18,14 @@ - + en - + @@ -46,7 +46,7 @@ Arne-Brün Vogelsang - + diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java index 6bd3b404e3..954fc19907 100644 --- a/src/main/java/eu/siacs/conversations/Config.java +++ b/src/main/java/eu/siacs/conversations/Config.java @@ -63,15 +63,15 @@ public final class Config { public static final String LOGTAG = BuildConfig.LOGTAG; - public static final Jid BUG_REPORTS = Jid.of("support@monocles.de"); + public static final Jid BUG_REPORTS = Jid.of("support@monocles.eu"); public static final Uri HELP = Uri.parse("https://monocles.wiki"); public static final String inviteUserURL = monocles() + "/chat/"; public static final String inviteMUCURL = monocles() + "/chat/"; public static final String inviteHostURL = monocles(); // without http(s) public static final String INVITE_DOMAIN = monocles(); - public static final String termsOfUseURL = "https://monocles.eu/legal-privacy/"; - public static final String privacyURL = "https://monocles.eu/legal-privacy/"; + public static final String termsOfUseURL = "https://monocles.eu/legal-privacy/#policies-section"; + public static final String privacyURL = "https://monocles.eu/legal-privacy/#policies-section"; public static final String migrationURL = Locale.getDefault().getLanguage().equalsIgnoreCase("de") ? "https://codeberg.org/Arne/monocles_chat" : "https://codeberg.org/Arne/monocles_chat"; public static final String CHANGELOG_URL = "https://codeberg.org/Arne/monocles_chat/src/branch/master/CHANGELOG.md"; @@ -181,7 +181,7 @@ public final class Config { public static final String UPDATE_URL = BuildConfig.UPDATE_URL; public static final long UPDATE_CHECK_TIMER = 24 * 60 * 60; // 24 h in seconds - public static final String ISSUE_URL = "xmpp:support@conference.monocles.de?join"; + public static final String ISSUE_URL = "xmpp:support@conference.monocles.eu?join"; //only allow secure tls chipers now public static final String[] ENABLED_CIPHERS = { diff --git a/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java b/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java index ef26ce7a7c..b75f2da41b 100644 --- a/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java +++ b/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java @@ -81,7 +81,7 @@ public class PresenceGenerator extends AbstractGenerator { Element cap = packet.addChild("c", "http://jabber.org/protocol/caps"); cap.setAttribute("hash", "sha-1"); - cap.setAttribute("node", "http://monocles.de"); + cap.setAttribute("node", "http://monocles.eu"); cap.setAttribute("ver", capHash); } return packet; diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index c0d49140a9..c05693d955 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -2505,7 +2505,7 @@ public class XmppConnectionService extends Service { } public void deleteBookmark(final Account account, final Bookmark bookmark) { - if (bookmark.getJid().toString().equals("support@conference.monocles.de")) { + if (bookmark.getJid().toString().equals("support@conference.monocles.eu")) { getPreferences().edit().putBoolean("monocles_support_bookmark_deleted", true).apply(); } /* //TODO: Add bridges as contacts @@ -5456,7 +5456,7 @@ public class XmppConnectionService extends Service { if (Config.MAGIC_CREATE_DOMAIN != null) { hosts.add(Config.MAGIC_CREATE_DOMAIN); } - hosts.add("monocles.de"); + hosts.add("monocles.eu"); return hosts; } diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java index bd2816fd25..246a060510 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java @@ -917,7 +917,7 @@ public class SettingsActivity extends XmppActivity implements OnSharedPreference try { Intent intent = new Intent(Intent.ACTION_SENDTO); intent.setData(Uri.parse("mailto:")); // only email apps should handle this - intent.putExtra(Intent.EXTRA_EMAIL, new String[] { "support@monocles.de" }); + intent.putExtra(Intent.EXTRA_EMAIL, new String[] { "support@monocles.eu" }); intent.putExtra(Intent.EXTRA_SUBJECT, "monocles chat - Issue report"); intent.putExtra(Intent.EXTRA_TEXT, R.string.describe_issue); startActivity(Intent.createChooser(intent, "")); diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java index fae05e8624..0f0dd69b95 100644 --- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java @@ -1173,7 +1173,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne for (Bookmark bookmark : account.getBookmarks()) { if (bookmark.match(this, needle)) { - if (bookmark.getJid().toString().equals("support@conference.monocles.de")) { + if (bookmark.getJid().toString().equals("support@conference.monocles.eu")) { foundSupport = true; } this.contacts.add(bookmark); @@ -1228,7 +1228,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne if (!supportDeleted && !foundSupport && (needle == null || needle.equals("")) && xmppConnectionService.getAccounts().size() > 0) { Bookmark bookmark = new Bookmark( xmppConnectionService.getAccounts().get(0), - Jid.of("support@conference.monocles.de") + Jid.of("support@conference.monocles.eu") ); bookmark.setBookmarkName("monocles support room"); bookmark.addChild("group").setContent("support"); diff --git a/src/main/java/eu/siacs/conversations/xmpp/Patches.java b/src/main/java/eu/siacs/conversations/xmpp/Patches.java index 8335625581..0a21ba1675 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/Patches.java +++ b/src/main/java/eu/siacs/conversations/xmpp/Patches.java @@ -6,6 +6,6 @@ import java.util.List; public class Patches { public static final List ENCRYPTION_EXCEPTIONS = Arrays.asList( - "support@monocles.de" + "support@monocles.eu" ); } diff --git a/src/main/res/values-es-rES/strings.xml b/src/main/res/values-es-rES/strings.xml index 8f7d20eb47..6abf6670e9 100644 --- a/src/main/res/values-es-rES/strings.xml +++ b/src/main/res/values-es-rES/strings.xml @@ -480,7 +480,7 @@ Cambia tu estado a \"no molestar\" cuando el dispositivo está en modo silencio Modo vibración como modo silencio Cambia tu estado a \"no molestar\" cuando el dispositivo está en modo vibración - monocles.de + monocles.eu Añadir cuenta con certificado No se ha podido leer el certificado Dejar vacío para autenticar certificado w/ diff --git a/src/main/res/values-gl-rES/strings.xml b/src/main/res/values-gl-rES/strings.xml index 45f88e77c8..5590d9e166 100644 --- a/src/main/res/values-gl-rES/strings.xml +++ b/src/main/res/values-gl-rES/strings.xml @@ -470,7 +470,7 @@ Marca o seu recurso como \"Non molestar\" cando o dispositivo está en modo silencioso Trata a vibración como modo silencioso Marca o seu recurso como \"Non molestar\" cando o dispositivo está en modo vibración - monocles.de + monocles.eu Engadir conta con certificado Non se puido procesar o certificado Deixar baldeiro autenticar con certificado diff --git a/src/main/res/values-uk-rUA/strings.xml b/src/main/res/values-uk-rUA/strings.xml index c021713377..8260c076a7 100644 --- a/src/main/res/values-uk-rUA/strings.xml +++ b/src/main/res/values-uk-rUA/strings.xml @@ -1206,7 +1206,7 @@ \nmonocles chat буде лише читати Ваші контакти і зіставляти їх локально, не завантажуючи їх на сервер. \n \nЗараз Вам буде запропоновано надати дозвіл на доступ до Ваших контактів. - monocles.de + monocles.eu Ви вийшли room@conference.example.com/nick Ви використовуєте неперевірені пристрої. Відскануйте QR-код на інших своїх пристроях, щоб виконати перевірку та запобігти активним атакам MITM. diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml index 0fc36c50c9..8f84f22b50 100644 --- a/src/main/res/values-zh-rCN/strings.xml +++ b/src/main/res/values-zh-rCN/strings.xml @@ -1268,7 +1268,7 @@ 下载失败：无效文件 %s 的头像 未找到应用程序 - monocles.de + monocles.eu 操作完成 多媒体文件 添加到主屏幕