better jabber translations & german version

app/views/jabber/index.html.erb

@@ -4,7 +4,7 @@
 </p>
 <br/>
 <% unless @jids.empty? -%>
-<h4><%= t(:your_jabber_ids) %></h4>
+<h4><%= t(:account_list) %></h4>
 <table class="userlist">
   <thead>
     <tr>
@@ -50,7 +50,7 @@ end -%>
   <%= t(:create_public_jid_help) %>
   </p>
   <%= form_tag(jabber_path, method: "post") do %>
-    <%= label_tag(:jid_alias, t(:jid_alias)) %>
+    <%= label_tag(:jid_alias, t(:username)) %>
     <%= text_field_tag(:jid_alias) %>
     <%= label_tag(:domain, t(:domain)) %>
     <%= select_tag :domain, options_for_select(@public_jabber_domains) %>

config/environments/development.rb

@@ -41,8 +41,7 @@ Rails.application.configure do
 
   config.session_store :file_session_store
 
-  # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
+  config.i18n.fallbacks = true
 
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.

config/locales/de.yml

@@ -116,6 +116,27 @@ de:
   enter_captcha: "Bitte kopiere diese Buchstaben und Zahlen in das untere Feld."
   admin_lock: "Sperre Account"
 
+  services: Dienste
+
+  manage_jabber: "Jabber Konten"
+  manage_jabber_id: "Jabber Konto"
+  manage_jabber_short_help: "Jabber/XMPP ist ein instant messaging Dienst. Du kannst auf mehreren Geräten einfach mit Freunden mit immerda Jabber oder auch bei anderen Jabber anbietern kommunizieren."
+  jabber_help: "Jabber/XMPP ist ein instant messaging Dienst. Du kannst auf mehreren Geräten einfach mit Freunden mit immerda Jabber oder auch bei anderen Jabber anbietern kommunizieren. Es ist auch als XMPP bekannt. Dein Benutzernamen im Jabber Netzwerk ist eine Jabber Id (kurz Jid), welcher wie eine email addresse ausschaut. Du kannst ein Jabber Konto erstellen, das deiner Emailadresse entspricht. Zusätzlich kannst du weitere Konten mit beliebigen Namen erstellen.<br/><br/>Es gibt viele verschiedene Programme, um Jabber zu benutzen. Auf dem Desktop zum Beispiel <a href=\"https://gajim.org/\">Gajim</a> oder mobil <a href=\"https://conversations.im/\">Conversations</a> und <a href=\"https://chatsecure.org/\">ChatSecure</a>. Du kannst mehr über Jabber in unserem <a href=\"https://wiki.immerda.ch/index.php/immerda:Jabber\">Wiki</a> erfahren. Wir empfehlen dir sehr, Jabber immer mit end-zu-end verschlüsselung zu verwenden. Dazu eignet sich vorallem OMEMO. Dies ist bei conversations bereits dabei und lässt sich in Gajim als Plugin installieren. OMEMO ist zur Zeit die einzige Möglichkeit für verschlüsselte Gruppenchats.<br/><br/>Jabber kann auch Gruppenchats (genannt MUC für Multi User Chat). Du kannst beliebige neue Chaträume erstellen. Verwende dazu den Konferenz Server, für die entsprechende Jabber Domain. Diese lautet für @immerda.ch accounts conference.immerda.ch und allgemein converence.DOMAIN_NACH_AT_ZEICHEN. Du kannst Chaträume nach belieben Konfigurieren, zum Beispiel invite-only oder Passwort geschützt. Ein beliebter Chatraum ist der Raum des Projekts immerda: immerda@conference.imsg.ch - Wir freuen uns dich dort anzutreffen!"
+  account_list: Konten
+  jabber_id: Kontoname
+  actions: Aktionen
+  generate_new_password: Neues Passwort generieren
+  create_jid: Erstelle mein Jabber Konto
+  create_jid_help: "Du kannst ein Jabber Konto erstellen, der gleich heisst wie deine Emailadresse."
+  create_public_jid: Erstelle ein weiteres Jabber Konto
+  create_public_jid_help: 'Erstelle zusätzliche Jabber Konten. Die Namen werden "first come - first served" vergeben.'
+  username: Benutzername
+  domain: Domain
+  jabber_password: Jabber Passwort
+  jabber_password_help: Dieses Passwort funktioniert nur für dieses Jabber Konto. Wenn du das Konto auf mehreren Geräten verwenden willst, musst du das Passwort nun speichern. Du kannst auch später zurückkommen und es auf ein neues Zurücksetzen. Für Mobilgeräte kannst du den QR code mit dem Passwort scannen.
+  jid_exists_already: Dieser Name ist bereits vergeben
+  failed: Etwas ist schief gegangen!
+
   activerecord:
     errors:
       messages:

config/locales/en.yml

@@ -118,22 +118,23 @@ en:
 
   services: Services
 
-  manage_jabber: "Manage Jabber Ids"
-  manage_jabber_id: "Manage Jabber Id"
-  manage_jabber_short_help: "Jabber is a federated instant messaging service to easily chat with your friends on any device. Manage your accounts and create further identities."
-  jabber_help: "Jabber is a federated instant messaging service to easily chat with your friends on any device. It is also known as XMPP, though we favor the name jabber. Within the Jabber network you have a Jabber Id (short Jid), that looks similar to an emailaddress. You can create a Jabber Id connected to your account and hence matching your emailaddress. Additionally, you can also create additional identites dedicated domains.<br/><br/>A Jabber Id at immerda comes with a pre-generated and unique password, which can only be used for the given Jabber id. If you can't remember the pre-generated password, you can simply generate a new one.<br/><br/>To use Jabber, there are numerous desktop clients (e.g. <a href=\"https://gajim.org/\">Gajim</a>) or mobile clients (e.g. <a href=\"https://conversations.im/\">Conversations</a> or <a href=\"https://chatsecure.org/\">ChatSecure</a>). Find more options on our <a href=\"https://wiki.immerda.ch/index.php/immerda:Jabber\">Wiki</a>. We recommend you to use an additional end-to-end encryption to establish secure end-to-end connections with your friends. Like you would use OpenPGP for emails. Most common used ones are OTR or OMEMO and are fully supported by above clients.<br/><br/>Jabber also features multi-user chatrooms (called MUCs), so multiple folks can chat together on a topic. You are able to create such rooms on the conference server (conference.YOUR_JABBER_DOMAIN) and configure them according to your needs. E.g. you might want to keep it invite-only or password protected. A popular MUC is the one of the immerda project: immerda@conference.imsg.ch - join it once you activated and connected with your Jabber id. Happy to chat there with the community around our services!"
-  jabber_id: Jabber Id
+  manage_jabber: "Jabber accounts"
+  manage_jabber_id: "Jabber setting"
+  manage_jabber_short_help: "Jabber/XMPP is an instant messaging service to easily chat with your friends on any device and any other Jabber server."
+  jabber_help: "Jabber is an instant messaging service to easily chat with your friends on any device and any other Jabber server. It is also known as XMPP, though we favor the name jabber. Within the Jabber network your username is a Jabber Id (short Jid), that looks similar to an emailaddress. You can create a Jabber Id matching your emailaddress and, you can also create additional identites.<br/><br/>To use Jabber, there are numerous desktop clients (e.g. <a href=\"https://gajim.org/\">Gajim</a>) or mobile clients (e.g. <a href=\"https://conversations.im/\">Conversations</a> or <a href=\"https://chatsecure.org/\">ChatSecure</a>). Find more options on our <a href=\"https://wiki.immerda.ch/index.php/immerda:Jabber\">Wiki</a>. We highly recommend to use end-to-end encryption. We favor OMEMO, which comes preinstalled in conversations and as a plugin for Gajim. It is currently the only reliable option for group chats.<br/><br/>Jabber also features chatrooms (called MUCs). You are able to create such rooms on the conference server (conference.YOUR_JABBER_DOMAIN, e.g. conference.immerda.ch) and configure them according to your needs. For example you can make them invite-only or password protected. A popular MUC is the one of the immerda project: immerda@conference.imsg.ch - join it once you are ready. Happy to meet you there!"
+  account_list: Accounts
+  jabber_id: Account name
   actions: Actions
   generate_new_password: Generate new password
-  create_jid: Create Jabber Id
-  create_jid_help: "You can create a Jabber Id matching your email address. This makes it easy to connect both by email and jabber. You will receive a pre-generated password for your Jabber Id, which is only valid for the given identity. If you forget it, simply generate a new password and the old one will be gone."
-  create_public_jid: Create additional Jabber Ids
-  create_public_jid_help: 'While the Jabber Id matching your email address, might help to more easily connect with others, you might also not always want to reveal this connection. For that we are running dedicated Jabber domains, where no emailaddresses ever exist and you can create additional Jabber Ids for your needs. The principle is: "first come - first served."'
-  jid_alias: Jabber Id Alias
+  create_jid: Open my Jabber account
+  create_jid_help: "You can create a Jabber account matching your email address."
+  create_public_jid: Create additional Jabber accounts
+  create_public_jid_help: 'Create additional accounts on those public Jabber domains. The principle is: "first come - first served."'
+  username: Username
   domain: Domain
   jabber_password: Jabber Password
-  jabber_password_help: A Jabber Id at immerda comes with a pre-generated and unique password, which can only be used for the given Jabber Id. The new password is shown in the next section and you can copy it to your Jabber client. If you want to use your Jabber Id on multiple systems or devices, you must store this password now. We are not able to show it again to you later. You will have to create a new one, if you can't remember it. To make it easier to copy the password to mobile devices you can also scan a QR code.
-  jid_exists_already: Jabber Id is already taken
+  jabber_password_help: This password only works for this particular account. If you want to use your account on multiple devices you must store this password now. You can always come back and reset it to a new one. To set up a mobile device you can also scan the QR code.
+  jid_exists_already: This username is already taken
   failed: A failure happened!
 
   activerecord: