diff options
author | Christian Schneppe <christian@pix-art.de> | 2016-05-27 20:44:02 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2016-05-27 20:44:02 +0200 |
commit | 25547747b37770b6ca8227c784488dd4deb5436f (patch) | |
tree | 04274e9063bd17c8d09b1d4663f035d0d8a2ae8f /src/main/res | |
parent | 5edcb7714985e24e0a068eb0970135170f9a17ed (diff) | |
parent | 25f6651848b67d225967cf1bb35e037c998a5682 (diff) |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/res')
-rw-r--r-- | src/main/res/layout/create_conference_dialog.xml | 42 | ||||
-rw-r--r-- | src/main/res/menu/start_conversation.xml | 14 | ||||
-rw-r--r-- | src/main/res/values-de/strings.xml | 25 | ||||
-rw-r--r-- | src/main/res/values/strings.xml | 13 |
4 files changed, 82 insertions, 12 deletions
diff --git a/src/main/res/layout/create_conference_dialog.xml b/src/main/res/layout/create_conference_dialog.xml new file mode 100644 index 000000000..cab2ac578 --- /dev/null +++ b/src/main/res/layout/create_conference_dialog.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingBottom="8dp" + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:paddingTop="16dp"> + + <TextView + android:id="@+id/your_account" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/your_account" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <Spinner + android:id="@+id/account" + android:layout_width="fill_parent" + android:layout_height="wrap_content" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="@string/conference_subject" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" /> + + <EditText + android:id="@+id/subject" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:hint="@string/edit_subject_hint" + android:inputType="textAutoComplete" + android:textColor="@color/black87" + android:textColorHint="@color/black54" + android:textSize="?attr/TextSizeBody"/> + +</LinearLayout>
\ No newline at end of file diff --git a/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml index b0472af05..305ffd223 100644 --- a/src/main/res/menu/start_conversation.xml +++ b/src/main/res/menu/start_conversation.xml @@ -13,10 +13,20 @@ android:showAsAction="always" android:title="@string/create_contact" /> <item - android:id="@+id/action_join_conference" + android:id="@+id/action_conference" android:icon="?attr/icon_add_group" android:showAsAction="always" - android:title="@string/join_conference" /> + android:title="@string/join_or_create_conference"> + <menu> + <item + android:id="@+id/action_join_conference" + android:title="@string/join_conference"/> + <item + android:id="@+id/action_create_conference" + android:title="@string/create_conference"/> + + </menu> + </item> <item android:id="@+id/action_scan_qr_code" android:showAsAction="never" diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml index 4ff75a9be..83f04e9d8 100644 --- a/src/main/res/values-de/strings.xml +++ b/src/main/res/values-de/strings.xml @@ -155,9 +155,8 @@ <string name="mgmt_account_delete">Löschen</string> <string name="mgmt_account_publish_avatar">Profilbild veröffentlichen</string> <string name="mgmt_account_publish_pgp">Öffentlichen OpenPGP-Schlüssel veröffentlichen</string> - <string name="openpgp_has_been_published">Öffentlicher OpenPGP Schlüssel wurde veröffentlicht.</string> - <string name="republish_pgp_keys">Deine öffentliche OpenPGP Schlüssel müssen veröffentlicht werden!</string> - <string name="mgmt_account_enable">Konto aktivieren </string> + <string name="openpgp_has_been_published">Öffentlicher OpenPGP-Schlüssel wurde veröffentlicht.</string> + <string name="republish_pgp_keys">Deine öffentliche OpenPGP-Schlüssel müssen veröffentlicht werden!</string> <string name="mgmt_account_are_you_sure">Bist du dir sicher?</string> <string name="mgmt_account_delete_confirm_text">Wenn du dein Profil löschst, gehen alle Gesprächsverläufe verloren</string> <string name="attach_record_voice">Sprache aufzeichnen</string> @@ -225,7 +224,7 @@ <string name="delete_bookmark">Von Kontaktliste entfernen</string> <string name="bookmark_already_exists">Die Konferenz befindet sich bereits auf deiner Kontaktliste</string> <string name="action_edit_subject">Konferenz-Thema bearbeiten</string> - <string name="joining_conference">Konferenz wird betreten…</string> + <string name="joining_conference">Konferenz wird beigetreten…</string> <string name="leave">Verlassen</string> <string name="contact_added_you">Der Kontakt hat dich zur Kontaktliste hinzugefügt</string> <string name="add_back">Auch hinzufügen</string> @@ -339,8 +338,9 @@ <string name="enable_notifications">Benachrichtigungen aktivieren</string> <string name="no_conference_server_found">Kein Konferenz-Server gefunden</string> <string name="conference_creation_failed">Erstellen der Konferenz fehlgeschlagen!</string> - <string name="conference_created">Konferenz erstellt!</string> <string name="account_image_description">Profilbild</string> + <string name="secret_accepted">Schlüssel akzeptiert!</string> + <string name="reset">Zurücksetzen</string> <string name="copy_otr_clipboard_description">OTR-Fingerabdruck in Zwischenablage kopieren</string> <string name="copy_omemo_clipboard_description">OMEMO-Fingerabdruck in Zwischenablage kopieren</string> <string name="regenerate_omemo_key">OMEMO-Schlüssel erneuern</string> @@ -448,7 +448,7 @@ <string name="pref_quick_action">Schnell-Tasten</string> <string name="none">keine</string> <string name="recently_used">zuletzt verwendet</string> - <string name="choose_quick_action">wähle Schnell-Taste</string> + <string name="choose_quick_action">Schnell-Taste auswähle</string> <string name="search_for_contacts_or_groups">Nach Kontakten oder Konferenzen suchen</string> <string name="elv_undo">Rückgängig</string> <string name="send_private_message">Private Nachricht senden</string> @@ -490,7 +490,7 @@ <string name="fetching_mam_prefs">Archivierungseinstellungen werden abgerufen. Bitte warten …</string> <string name="unable_to_fetch_mam_prefs">Archivierungseinstellungen konnten nicht abgerufen werden</string> <string name="captcha_required">Captcha erforderlich</string> - <string name="captcha_hint">Gib den Text vom obigen Bild ein</string> + <string name="captcha_hint">Gib den Text von obigem Bild ein</string> <string name="certificate_chain_is_not_trusted">Zertifikat wird nicht vertraut</string> <string name="jid_does_not_match_certificate">Jabber-ID stimmt nicht dem Zertifikat überein</string> <string name="action_renew_certificate">Zertifikat erneuern</string> @@ -589,7 +589,7 @@ <string name="presence_xa">Nicht verfügbar</string> <string name="presence_dnd">Beschäftigt</string> <string name="secure_password_generated">Ein sicheres Passwort wurde erstellt</string> - <string name="device_does_not_support_battery_op">Dein Gerät unterstützt keine Batterieoptimierungen</string> + <string name="device_does_not_support_battery_op">Dein Gerät unterstützt kein Ausschalten der Batterieoptimierung</string> <string name="locating">Lokalisiere…</string> <string name="location_sharing_disabled">GPS ist in den Android-Einstellungen deaktiviert</string> <string name="share">Teilen</string> @@ -600,4 +600,13 @@ <string name="default_resource"></string> <string name="leave_conference_warning">Willst du die Konferenz wirklich verlassen? Du wirst keine neuen Nachrichten mehr bekommen, bis du der Konferenz erneut beitrittst.</string> <string name="show_password">Passwort anzeigen</string> + <string name="choose_participants">Mitglieder auswählen</string> + <string name="conference_subject">Titel</string> + <string name="create_conference">Konferenz erstellen</string> + <string name="creating_conference">Erstelle Konferenz…</string> + <string name="edit_subject_hint">Der Titel dieser Konferenz</string> + <string name="join_or_create_conference">Konferenz beitreten oder erstellen</string> + <string name="mgmt_account_enable"></string> + <string name="registration_please_wait">Registrierung fehlgeschlagen: Bitte später versuchen</string> + <string name="send_message_to_x">Nachricht an %s senden</string> </resources> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 5185f37aa..f25918008 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -79,6 +79,7 @@ <string name="also_end_conversation">End this conversation afterwards</string> <string name="choose_presence">Choose presence to contact</string> <string name="send_unencrypted_message">Send unencrypted message</string> + <string name="send_message_to_x">Send message to %s</string> <string name="send_otr_message">Send OTR encrypted message</string> <string name="send_omemo_message">Send OMEMO encrypted message</string> <string name="send_omemo_x509_message">Send v\\OMEMO encrypted message</string> @@ -230,6 +231,7 @@ <string name="delete_bookmark">Delete bookmark</string> <string name="bookmark_already_exists">This bookmark already exists</string> <string name="action_edit_subject">Edit conference subject</string> + <string name="edit_subject_hint">The subject of this conference</string> <string name="joining_conference">Joining conference…</string> <string name="leave">Leave</string> <string name="contact_added_you">Contact added you to contact list</string> @@ -387,8 +389,9 @@ <string name="pref_show_dynamic_tags_summary">Display read-only tags underneath contacts</string> <string name="enable_notifications">Enable notifications</string> <string name="no_conference_server_found">No conference server found</string> - <string name="conference_creation_failed">Conference creation failed!</string> - <string name="conference_created">Conference created!</string> + <string name="conference_creation_failed">Conference creation failed!</string>s + <string name="secret_accepted">Secret accepted!</string> + <string name="reset">Reset</string> <string name="account_image_description">Account avatar</string> <string name="copy_otr_clipboard_description">Copy OTR fingerprint to clipboard</string> <string name="copy_omemo_clipboard_description">Copy OMEMO fingerprint to clipboard</string> @@ -633,5 +636,11 @@ <string name="action_end_conversation_muc">Leave conference</string> <string name="leave_conference_warning">Do you really want to leave this conference? You will no longer be notified of new messages until joining the conference again.</string> <string name="show_password">Show password</string> + <string name="registration_please_wait">Registration failed: Try again later</string> + <string name="create_conference">Create conference</string> + <string name="join_or_create_conference">Join or create conference</string> + <string name="conference_subject">Subject</string> + <string name="choose_participants">Choose participants</string> + <string name="creating_conference">Creating conference…</string> </resources> |