diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-08-24 17:18:10 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-08-24 17:18:10 +0200 |
| commit | dce001369dd420a4ddc58018c5ba2e692a9e094f (patch) | |
| tree | 1f16cee9ed660d9c432bc001abce26fbe16666b9 /res/values-de/strings.xml | |
| parent | a30bc8a3e275890b9f39be56c1588aca34188dd4 (diff) | |
| parent | 74f8e655a2024bead50d32c24a05ba23fd8f983a (diff) | |
Merge branch 'development' of github.com:siacs/Conversations into development
Diffstat (limited to 'res/values-de/strings.xml')
| -rw-r--r-- | res/values-de/strings.xml | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 9f9d63cc..76f312ee 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -186,8 +186,9 @@ <string name="mgmt_account_edit">Konto bearbeiten</string> <string name="mgmt_account_delete">Löschen</string> <string name="mgmt_account_disable">Vorübergehend abschalten</string> - <string name="mgmt_account_enable">Anschalten</string> <string name="mgmt_account_publish_avatar">Avatar veröffentlichen</string> + <string name="mgmt_account_publish_pgp">OpenPGP Public Key veröffentlichen</string> + <string name="mgmt_account_enable">Anschalten</string> <string name="mgmt_account_are_you_sure">Bist du dir sicher?</string> <string name="mgmt_account_delete_confirm_text">Wenn du dein Konto löscht, gehen alle Gesprächsverläufe verloren</string> <string name="mgmt_account_account_offline">Das Konto ist offline</string> @@ -215,16 +216,11 @@ <string name="muc_details_other_members">Andere Mitglieder</string> <string name="subscription_not_updated_offline">Der Account ist offline. Die Abonnements konnten nicht aktualisiert werden</string> <string name="share_with_active_conversations">Aktive Gespräche</string> - <string name="server_info_statistics">Statistiken</string> - <string name="server_info_connection_age">Verbindungsdauer</string> - <string name="server_info_session_age">Sitzungsdauer</string> - <string name="server_info_packets_sent">Gesendete Pakete</string> - <string name="server_info_packets_received">Empfangene Pakete</string> - <string name="server_info_connected_accounts">Verbundene Konten</string> - <string name="server_info_server_features">Serverfunktionen</string> - <string name="server_info_roster_versioning">Roster Versioning</string> - <string name="server_info_carbon_messages">Carbon Messages</string> - <string name="server_info_stream_management">Stream Management</string> + <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string> + <string name="server_info_stream_management">XEP-0198: Stream Management</string> + <string name="server_info_pep">XEP-0163: PEP (Avatars)</string> + <string name="server_info_available">verfügabr</string> + <string name="server_info_unavailable">nicht verfügbar</string> <string name="hours">Stunden</string> <string name="mins">Minuten</string> <string name="missing_public_keys">Öffentlicher Schlüssel fehlt</string> @@ -280,4 +276,9 @@ <string name="private_message">private Nachricht</string> <string name="private_message_to">private Nachricht an %s</string> <string name="send_private_message_to">Sende private Nachricht an %s</string> + <string name="connect">Verbinden</string> + <string name="account_already_exists">Der Account existiert bereits</string> + <string name="next">Weiter</string> + <string name="server_info_session_established">Aktuelle Sitzung wiederhergestellt</string> + <string name="additional_information">Zusätzliche Informationen</string> </resources> |