aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/drawable-hdpi/ic_stat_communication_import_export.pngbin0 -> 620 bytes
-rw-r--r--src/main/res/drawable-mdpi/ic_stat_communication_import_export.pngbin0 -> 392 bytes
-rw-r--r--src/main/res/drawable-xhdpi/ic_stat_communication_import_export.pngbin0 -> 972 bytes
-rw-r--r--src/main/res/drawable-xxhdpi/ic_stat_communication_import_export.pngbin0 -> 1860 bytes
-rw-r--r--src/main/res/layout/activity_verify_otr.xml189
-rw-r--r--src/main/res/layout/dialog_verify_otr.xml60
-rw-r--r--src/main/res/menu/attachment_choices.xml3
-rw-r--r--src/main/res/menu/message_context.xml3
-rw-r--r--src/main/res/values-de/strings.xml15
-rw-r--r--src/main/res/values-es/strings.xml42
-rw-r--r--src/main/res/values-it/strings.xml4
-rw-r--r--src/main/res/values/strings.xml76
-rw-r--r--src/main/res/xml/preferences.xml5
13 files changed, 311 insertions, 86 deletions
diff --git a/src/main/res/drawable-hdpi/ic_stat_communication_import_export.png b/src/main/res/drawable-hdpi/ic_stat_communication_import_export.png
new file mode 100644
index 00000000..f929996e
--- /dev/null
+++ b/src/main/res/drawable-hdpi/ic_stat_communication_import_export.png
Binary files differ
diff --git a/src/main/res/drawable-mdpi/ic_stat_communication_import_export.png b/src/main/res/drawable-mdpi/ic_stat_communication_import_export.png
new file mode 100644
index 00000000..b581e174
--- /dev/null
+++ b/src/main/res/drawable-mdpi/ic_stat_communication_import_export.png
Binary files differ
diff --git a/src/main/res/drawable-xhdpi/ic_stat_communication_import_export.png b/src/main/res/drawable-xhdpi/ic_stat_communication_import_export.png
new file mode 100644
index 00000000..a1d62d41
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/ic_stat_communication_import_export.png
Binary files differ
diff --git a/src/main/res/drawable-xxhdpi/ic_stat_communication_import_export.png b/src/main/res/drawable-xxhdpi/ic_stat_communication_import_export.png
new file mode 100644
index 00000000..3539cd91
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/ic_stat_communication_import_export.png
Binary files differ
diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml
new file mode 100644
index 00000000..d907d871
--- /dev/null
+++ b/src/main/res/layout/activity_verify_otr.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:background="@color/secondarybackground">
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+ <TextView
+ android:id="@+id/error_no_session"
+ android:layout_margin="16dp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/no_otr_session_found"
+ android:layout_gravity="center_horizontal"
+ android:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeBody"
+ />
+ <RelativeLayout
+ android:id="@+id/verification_area_one"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:background="@drawable/infocard_border"
+ android:layout_margin="8dp">
+ <LinearLayout
+ android:id="@+id/fingerprint_area"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:padding="16dp"
+ android:orientation="vertical">
+ <TextView
+ android:id="@+id/remote_jid"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeHeadline"/>
+ <TextView
+ android:layout_marginTop="16dp"
+ android:id="@+id/your_fingerprint"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeBody"
+ android:typeface="monospace" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/secondarytext"
+ android:textSize="?attr/TextSizeInfo"
+ android:text="@string/your_fingerprint"/>
+ <TextView
+ android:layout_marginTop="16dp"
+ android:id="@+id/remote_fingerprint"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeBody"
+ android:typeface="monospace" />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/secondarytext"
+ android:textSize="?attr/TextSizeInfo"
+ android:text="@string/remote_fingerprint"/>
+ </LinearLayout>
+ <LinearLayout
+ android:layout_below="@+id/fingerprint_area"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="true" >
+
+ <Button
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:visibility="invisible" />
+
+ <View
+ android:layout_width="1dp"
+ android:layout_height="fill_parent"
+ android:layout_marginBottom="7dp"
+ android:layout_marginTop="7dp"
+ android:background="@color/divider"
+ android:visibility="invisible"/>
+
+ <Button
+ android:id="@+id/button_verify_fingerprint"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="@string/verify"
+ android:textColor="@color/primarytext" />
+ </LinearLayout>
+ </RelativeLayout>
+ <RelativeLayout
+ android:id="@+id/verification_area_two"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_margin="8dp"
+ android:background="@drawable/infocard_border">
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical"
+ android:id="@+id/shared_secret_box"
+ android:padding="16dp">
+ <TextView
+ android:text="@string/smp"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textColor="@color/primarytext"
+ android:textSize="?attr/TextSizeHeadline"
+ android:layout_marginBottom="16dp"
+ />
+ <TextView
+ android:id="@+id/status_message"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/verified"
+ android:layout_gravity="center_horizontal"
+ android:textSize="?attr/TextSizeHeadline"
+ android:textStyle="bold"
+ android:visibility="gone"/>
+ <EditText
+ android:id="@+id/shared_secret_hint"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="textAutoComplete"
+ android:hint="@string/shared_secret_hint"
+ android:textColor="@color/primarytext"
+ android:textColorHint="@color/secondarytext"
+ android:textSize="?attr/TextSizeBody"
+ android:layout_marginBottom="8dp"/>
+ <EditText
+ android:id="@+id/shared_secret_secret"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/shared_secret_secret"
+ android:inputType="textPassword"
+ android:textColor="@color/primarytext"
+ android:textColorHint="@color/secondarytext"
+ android:textSize="?attr/TextSizeBody" />
+ </LinearLayout>
+ <LinearLayout
+ android:layout_below="@+id/shared_secret_box"
+ android:id="@+id/button_bar"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="true" >
+
+ <Button
+ android:id="@+id/button_shared_secret_negative"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:enabled="false"
+ android:text="@string/cancel"
+ android:textColor="@color/secondarytext"/>
+
+ <View
+ android:layout_width="1dp"
+ android:layout_height="fill_parent"
+ android:layout_marginBottom="7dp"
+ android:layout_marginTop="7dp"
+ android:background="@color/divider" />
+
+ <Button
+ android:id="@+id/button_shared_secret_positive"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:text="@string/create"
+ android:textColor="@color/primarytext" />
+ </LinearLayout>
+ </RelativeLayout>
+ </LinearLayout>
+</ScrollView> \ No newline at end of file
diff --git a/src/main/res/layout/dialog_verify_otr.xml b/src/main/res/layout/dialog_verify_otr.xml
deleted file mode 100644
index 499ef6cd..00000000
--- a/src/main/res/layout/dialog_verify_otr.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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="16dp"
- android:paddingLeft="8dp"
- android:paddingRight="8dp" >
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="8dp"
- android:text="@string/account_settings_jabber_id"
- android:textColor="@color/primarytext"
- android:textSize="?attr/TextSizeHeadline" />
-
- <TextView
- android:id="@+id/verify_otr_jid"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="8dp"
- android:textColor="@color/secondarytext"
- android:textSize="?attr/TextSizeBody" />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="8dp"
- android:text="@string/otr_fingerprint"
- android:textColor="@color/primarytext"
- android:textSize="?attr/TextSizeHeadline" />
-
- <TextView
- android:id="@+id/verify_otr_fingerprint"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="8dp"
- android:textColor="@color/secondarytext"
- android:textSize="?attr/TextSizeBody"
- android:typeface="monospace" />
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingTop="8dp"
- android:text="@string/your_fingerprint"
- android:textColor="@color/primarytext"
- android:textSize="?attr/TextSizeHeadline" />
-
- <TextView
- android:id="@+id/verify_otr_yourprint"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="8dp"
- android:textColor="@color/secondarytext"
- android:textSize="?attr/TextSizeBody"
- android:typeface="monospace" />
-
-</LinearLayout> \ No newline at end of file
diff --git a/src/main/res/menu/attachment_choices.xml b/src/main/res/menu/attachment_choices.xml
index 20932489..12b37c08 100644
--- a/src/main/res/menu/attachment_choices.xml
+++ b/src/main/res/menu/attachment_choices.xml
@@ -9,7 +9,6 @@
android:title="@string/attach_take_picture"/>
<item
android:id="@+id/attach_record_voice"
- android:title="@string/attach_record_voice"
- android:visible="false"/>
+ android:title="@string/choose_file"/>
</menu> \ No newline at end of file
diff --git a/src/main/res/menu/message_context.xml b/src/main/res/menu/message_context.xml
index 80d4d196..3be52442 100644
--- a/src/main/res/menu/message_context.xml
+++ b/src/main/res/menu/message_context.xml
@@ -16,5 +16,8 @@
<item
android:id="@+id/download_image"
android:title="@string/download_image"/>
+ <item
+ android:id="@+id/cancel_transmission"
+ android:title="@string/cancel_transmission" />
</menu> \ No newline at end of file
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index ca190deb..6ec79a82 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -108,6 +108,7 @@
<string name="pref_never_send_crash_summary">Wenn du Absturzberichte einschickst, hilfst du Conversations stetig zu verbessern</string>
<string name="pref_confirm_messages">Lesebestätigung senden</string>
<string name="pref_confirm_messages_summary">Informiere deine Kontakte, wenn du eine Nachricht empfängst oder liest</string>
+ <string name="pref_ui_options">Benutzeroberfläche</string>
<string name="openpgp_error">Fehler mit OpenKeychain</string>
<string name="error_decrypting_file">Fehler beim Entschlüsseln der Datei</string>
<string name="accept">Annehmen</string>
@@ -231,9 +232,6 @@
<string name="server_info_session_established">Aktuelle Sitzung wiederhergestellt</string>
<string name="additional_information">Zusätzliche Informationen</string>
<string name="skip">Überspringen</string>
- <string name="pref_ui_options">Benutzeroberfläche</string>
- <string name="pref_use_indicate_received">Anfrage für Nachrichten Empfang</string>
- <string name="pref_use_indicate_received_summary">Empfangene Nachrichten werden mit einem grünen Häckchen markiert. Bitte beachte, dass dies nicht in allen Fällen funktioniert.</string>
<string name="disable_notifications">Benachrichtigungen deaktivieren</string>
<string name="disable_notifications_for_this_conversation">Benachrichtigungen für diese Unterhaltung deaktivieren</string>
<string name="notifications_disabled">Benachrichtigungen sind deaktiviert</string>
@@ -256,13 +254,17 @@
<string name="pref_enable_legacy_ssl_summary">Aktiviert SSLv3-Unterstützung für alte Server. Achtung: SSLv3 ist unsicher.</string>
<string name="pref_expert_options">Einstellungen für Experten</string>
<string name="pref_expert_options_summary">Hier bitte vorsichtig sein</string>
+ <string name="title_activity_about">Über Conversations</string>
+ <string name="pref_about_conversations_summary">Versions- und Lizenzinformationen</string>
<string name="pref_use_larger_font">Schrift vergrößern</string>
<string name="pref_use_larger_font_summary">Überall in der App eine größere Schrift verwenden</string>
<string name="pref_use_send_button_to_indicate_status">Absende-Knopf zeigt Online-Status an</string>
<string name="pref_use_send_button_to_indicate_status_summary">Absende-Knopf einfärben, um den Online-Status des Kontakts zu signalisieren</string>
+ <string name="pref_use_indicate_received">Anfrage für Nachrichten Empfang</string>
+ <string name="pref_use_indicate_received_summary">Empfangene Nachrichten werden mit einem grünen Häkchen markiert. Bitte beachte, dass dies nicht in allen Fällen funktioniert.</string>
<string name="pref_expert_options_other">Sonstiges</string>
<string name="pref_conference_name">Konferenz-Name</string>
- <string name="pref_conference_name_summary">Konferenz-Thema statt Raum-JID als Name verwenden</string>
+ <string name="pref_conference_name_summary">Konferenz-Thema statt Raum-JID als Namen verwenden</string>
<string name="toast_message_otr_fingerprint">OTR Fingerabdruck in die Zwischenablage kopiert!</string>
<string name="conference_banned">Du wurdest aus dem Konferenzraum verbannt</string>
<string name="conference_members_only">Der Konferenzraum ist nur für Mitglieder</string>
@@ -281,5 +283,8 @@
<string name="message_text">Nachrichtentext</string>
<string name="url_copied_to_clipboard">URL in Zwischenablage kopiert</string>
<string name="message_copied_to_clipboard">Nachricht in Zwischenablage kopiert</string>
-
+ <string name="image_transmission_failed">Bild-Übertragung fehlgeschlagen</string>
+ <string name="scan_qr_code">Scanne QR-Code</string>
+ <string name="show_qr_code">Zeige QR-Code</string>
+ <string name="account_details">Account Details</string>
</resources>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 47424d00..95a5b4d5 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -141,6 +141,8 @@
<string name="account_status_regis_conflict">El identificador ya está en uso</string>
<string name="account_status_regis_success">Registro completado</string>
<string name="account_status_regis_not_sup">El servidor no soporta registros</string>
+ <string name="account_status_security_error">Error de seguridad</string>
+ <string name="account_status_incompatible_server">Servidor incompatible</string>
<string name="encryption_choice_none">Texto plano</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
@@ -254,6 +256,8 @@
<string name="pref_enable_legacy_ssl_summary">Habilita soporte SSLv3 para servidores heredados. Advertencia: SSLv3 se considera no seguro.</string>
<string name="pref_expert_options">Ajustes avanzados</string>
<string name="pref_expert_options_summary">Por favor, cuidado con estas opciones</string>
+ <string name="title_activity_about">Acerca de Conversations</string>
+ <string name="pref_about_conversations_summary">Información de compilación y licencia</string>
<string name="pref_use_larger_font">Incrementar tamaño de fuente</string>
<string name="pref_use_larger_font_summary">Usar fuentes grandes en toda la aplicación</string>
<string name="pref_use_send_button_to_indicate_status">Botón enviar indica estado</string>
@@ -281,5 +285,41 @@
<string name="message_text">Mensaje de texto</string>
<string name="url_copied_to_clipboard">URL copiada al portapapeles</string>
<string name="message_copied_to_clipboard">Mensaje copiado al portapapeles</string>
-
+ <string name="image_transmission_failed">Falló la transferencia de la imagen</string>
+ <string name="scan_qr_code">Escanear código QR</string>
+ <string name="show_qr_code">Mostrar código QR</string>
+ <string name="account_details">Detalles de la cuenta</string>
+ <string name="verify_otr">Verificar OTR</string>
+ <string name="remote_fingerprint">Códigos OTR remotos</string>
+ <string name="scan">escanear</string>
+ <string name="or_touch_phones">(o une los teléfonos)</string>
+ <string name="smp">Protocolo del Socialista Millonario</string>
+ <string name="shared_secret_hint">Sugerencia o Pregunta</string>
+ <string name="shared_secret_secret">Compartir secreto</string>
+ <string name="confirm">Confirmar</string>
+ <string name="in_progress">En progreso</string>
+ <string name="respond">Responder</string>
+ <string name="failed">Falló</string>
+ <string name="secrets_do_not_match">Los secretos no coinciden</string>
+ <string name="try_again">Intentar de nuevo</string>;
+ <string name="finish">Terminar</string>
+ <string name="verified">Verificado!</string>
+ <string name="smp_requested">El contacto solicita verificación SMP</string>
+ <string name="no_otr_session_found">No se ha encontrado una sesión OTR válida!</string>
+ <string name="conversations_foreground_service">Conversations</string>
+ <string name="touch_to_disable">Pulsa para deshabilitar servicio en segundo plano</string>
+ <string name="pref_keep_foreground_service">Mantener servicio en segundo plano</string>
+ <string name="pref_keep_foreground_service_summary">Previene que el sistema cierre la conexión</string>
+ <string name="choose_file">Elige archivo</string>
+ <string name="receiving_file">Recibiendo archivo %1$s (%2$d%% completedo)</string>
+ <string name="download_file">Descargar archivo %s</string>
+ <string name="open_file">Abrir %s como archivo</string>
+ <string name="sending_file">Enviando (%1$d%% completedo)</string>
+ <string name="preparing_file">Preparando transferencia de archivo</string>
+ <string name="file_offered_for_download">Archivo ofrecido para descarga</string>
+ <string name="file">Archivo %s</string>
+ <string name="cancel_transmission">Cancelar transferencia</string>
+ <string name="file_transmission_failed">falló la transferencia del archivo</string>
+ <string name="file_deleted">El archivo ha sido eliminado</string>
+ <string name="no_application_found_to_open_file">No se ha encontrado ninguna aplicación para abrir el archivo</string>
</resources> \ No newline at end of file
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 0bb0e05e..3b613e9d 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -81,9 +81,9 @@
<string name="offering">offrendo&#8230;</string>
<string name="waiting">in attesa&#8230;</string>
<string name="no_pgp_key">Nessuna chiave OpenPGP trovata</string>
- <string name="contact_has_no_pgp_key">Conversations non è in grado di cifrare i tuoi messaggi perchè il contatto non sta annunciando la sua chiave pubblica.\n\n<small>Per favore chiedi al tuo contatto di configurare OpenPGP.</small></string>
+ <string name="contact_has_no_pgp_key">Conversations non è in grado di cifrare i tuoi messaggi perché il contatto non sta annunciando la sua chiave pubblica.\n\n<small>Per favore chiedi al tuo contatto di configurare OpenPGP.</small></string>
<string name="no_pgp_keys">Nessuna chiave OpenPGP trovata</string>
- <string name="contacts_have_no_pgp_keys">Conversations non è in grado di cifrare i tuoi messaggi perchè i contatti non stanno annunciando la propria chiave pubblica.\n\n<small>Per favore chiedi ai tuoi contatti di configurare OpenPGP.</small></string>
+ <string name="contacts_have_no_pgp_keys">Conversations non è in grado di cifrare i tuoi messaggi perché i contatti non stanno annunciando la propria chiave pubblica.\n\n<small>Per favore chiedi ai tuoi contatti di configurare OpenPGP.</small></string>
<string name="encrypted_message_received"><i>Messaggio cifrato ricevuto. Tocca per decifrare.</i></string>
<string name="encrypted_image_received"><i>Immagine cifrata ricevuta. Tocca per decifrare e mostrare.</i></string>
<string name="image_file"><i>Immagine ricevuta. Tocca per mostrare</i></string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 28a1e326..db9f95d4 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -58,7 +58,7 @@
<string name="add_contact">Add contact</string>
<string name="send_failed">delivery failed</string>
<string name="send_rejected">rejected</string>
- <string name="receiving_image">Receiving image file. Please wait…</string>
+ <string name="receiving_image">Receiving image file (%1$d%%)</string>
<string name="preparing_image">Preparing image for transmission</string>
<string name="action_clear_history">Clear history</string>
<string name="clear_conversation_history">Clear Conversation History</string>
@@ -141,6 +141,8 @@
<string name="account_status_regis_conflict">Username already in use</string>
<string name="account_status_regis_success">Registration completed</string>
<string name="account_status_regis_not_sup">Server does not support registration</string>
+ <string name="account_status_security_error">Security error</string>
+ <string name="account_status_incompatible_server">Incompatible server</string>
<string name="encryption_choice_none">Plain text</string>
<string name="encryption_choice_otr">OTR</string>
<string name="encryption_choice_pgp">OpenPGP</string>
@@ -256,21 +258,30 @@
<string name="pref_expert_options_summary">Please be careful with these</string>
<string name="title_activity_about">About Conversations</string>
<string name="pref_about_conversations_summary">Build and licensing information</string>
- <string name="pref_about_message">Conversations © 2014 Daniel Gultsch\n
- \nThis program is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License version 3 as published
- by the Free Software Foundation.
- \nhttps://www.gnu.org/licenses/gpl-3.0.html\n
- \nOpenPGP API is licensed under the Apache License, Version 2.0
- \nhttps://www.apache.org/licenses/LICENSE-2.0\n
- \nMinidns © 2014 Rene Treffer and is provided under the WTFPL
- \nhttp://wtfpl.org\n
- \nMemorizingTrustManager © 2010 Georg Lukas under the terms of the MIT
- License
- \nhttp://opensource.org/licenses/MIT\n
- \nDownload the full source code at
- \nhttps://github.com/siacs/Conversations
- </string>
+ <string name="pref_about_message" translatable="false">
+ Conversations • the very last word in instant messaging.
+ \n\nCopyright © 2014 Daniel Gultsch
+ \n\nThis program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ \n\nThis program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ \n\nYou should have received a copy of the GNU General Public License
+ along with this program. If not, see https://www.gnu.org/licenses
+ \n\nDownload the full source code at https://github.com/siacs/Conversations
+ \n\n\nLibraries
+ \n\nhttps://www.bouncycastle.org\n(The MIT License (MIT))
+ \n\nhttps://www.gnu.org/software/libidn\n(Apache License, Version 2.0)
+ \n\nhttps://github.com/ge0rg/MemorizingTrustManager\n(The MIT License (MIT))
+ \n\nhttps://github.com/rtreffer/minidns\n(WTFPL)
+ \n\nhttps://github.com/open-keychain/openkeychain-api-lib\n(Apache License, Version 2.0)
+ \n\nhttps://github.com/jitsi/otr4j\n(LGPL-3.0)
+ \n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0)
+ \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0)
+ </string>
<string name="pref_use_larger_font">Increase font size</string>
<string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>
<string name="pref_use_send_button_to_indicate_status">Send button indicates status</string>
@@ -302,4 +313,37 @@
<string name="scan_qr_code">Scan QR code</string>
<string name="show_qr_code">Show QR code</string>
<string name="account_details">Account details</string>
+ <string name="verify_otr">Verify OTR</string>
+ <string name="remote_fingerprint">Remote Fingerprint</string>
+ <string name="scan">scan</string>
+ <string name="or_touch_phones">(or touch phones)</string>
+ <string name="smp">Socialist Millionaire Protocol</string>
+ <string name="shared_secret_hint">Hint or Question</string>
+ <string name="shared_secret_secret">Shared Secret</string>
+ <string name="confirm">Confirm</string>
+ <string name="in_progress">In progress</string>
+ <string name="respond">Respond</string>
+ <string name="failed">Failed</string>
+ <string name="secrets_do_not_match">Secrets do not match</string>
+ <string name="try_again">Try again</string>;
+ <string name="finish">Finish</string>
+ <string name="verified">Verified!</string>
+ <string name="smp_requested">Contact requested SMP verification</string>
+ <string name="no_otr_session_found">No valid OTR session has been found!</string>
+ <string name="conversations_foreground_service">Conversations</string>
+ <string name="touch_to_disable">Touch to disable foreground service</string>
+ <string name="pref_keep_foreground_service">Keep service in foreground</string>
+ <string name="pref_keep_foreground_service_summary">Prevents the operating system from killing your connection</string>
+ <string name="choose_file">Choose file</string>
+ <string name="receiving_file">Receiving %1$s file (%2$d%% completed)</string>
+ <string name="download_file">Download %s file</string>
+ <string name="open_file">Open %s file</string>
+ <string name="sending_file">sending (%1$d%% completed)</string>
+ <string name="preparing_file">Preparing file for transmission</string>
+ <string name="file_offered_for_download">File offered for download</string>
+ <string name="file">%s file</string>
+ <string name="cancel_transmission">Cancel transmission</string>
+ <string name="file_transmission_failed">file transmission failed</string>
+ <string name="file_deleted">The file has been deleted</string>
+ <string name="no_application_found_to_open_file">No application found to open file</string>
</resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 15a61e87..3be65b7a 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -101,6 +101,11 @@
android:key="indicate_received"
android:summary="@string/pref_use_indicate_received_summary"
android:title="@string/pref_use_indicate_received" />
+ <CheckBoxPreference
+ android:defaultValue="false"
+ android:key="keep_foreground_service"
+ android:title="@string/pref_keep_foreground_service"
+ android:summary="@string/pref_keep_foreground_service_summary" />
</PreferenceCategory>
</PreferenceScreen>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-19 02:20:01 +0000