Merge branch 'development' of github.com:siacs/Conversations into development

9 files changed, 88 insertions, 55 deletions

diff --git a/res/layout/server_info.xml b/res/layout/server_info.xml
index 25e5a471..499a20de 100644
--- a/res/layout/server_info.xml
+++ b/res/layout/server_info.xml
@@ -12,14 +12,14 @@
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:paddingBottom="8dp"
-        android:text="Statistics" />
+        android:text="@string/server_info_statistics" />
     
     <TextView
         android:layout_below="@+id/stats_header"
         android:id="@+id/textView1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Connection age"
+        android:text="@string/server_info_connection_age"
         android:textSize="18sp"/>
      <TextView
         android:id="@+id/connection"
@@ -36,7 +36,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/textView1"
-        android:text="Session age"
+        android:text="@string/server_info_session_age"
         android:textSize="18sp"/>
         <TextView
         android:id="@+id/session"
@@ -53,7 +53,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/textView2"
-        android:text="Packets sent"
+        android:text="@string/server_info_packets_sent"
         android:textSize="18sp"/>
        <TextView
         android:id="@+id/pcks_sent"
@@ -69,7 +69,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/textView3"
-        android:text="Packets received"
+        android:text="@string/server_info_packets_received"
         android:textSize="18sp"/>
     <TextView
         android:id="@+id/pcks_received"
@@ -85,7 +85,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@+id/textView4"
-        android:text="Connected accounts"
+        android:text="@string/server_info_connected_accounts"
         android:textSize="18sp"/>
     <TextView
         android:id="@+id/number_presences"
@@ -103,14 +103,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="8dp"
-        android:text="Server Features" />
+        android:text="@string/server_info_server_features" />
 
     <TextView
         android:layout_below="@+id/features_header"
         android:id="@+id/textView5"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Roster Versioning"
+        android:text="@string/server_info_roster_versioning"
         android:textSize="18sp"/>
      <TextView
         android:id="@+id/roster"
@@ -127,7 +127,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/textView5"
-        android:text="Carbon Messages"
+        android:text="@string/server_info_carbon_messages"
         android:textSize="18sp"/>
         <TextView
         android:id="@+id/carbon"
@@ -144,7 +144,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_below="@+id/textView6"
-        android:text="Stream Managment"
+        android:text="@string/server_info_stream_management"
         android:textSize="18sp"/>
        <TextView
         android:id="@+id/stream"
diff --git a/res/layout/share_with.xml b/res/layout/share_with.xml
index ae73a688..a578b2cb 100644
--- a/res/layout/share_with.xml
+++ b/res/layout/share_with.xml
@@ -12,7 +12,7 @@
                 android:id="@+id/conversations_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Active Conversations"
+                android:text="@string/share_with_active_conversations"
                 style="@style/sectionHeader"
                 android:paddingLeft="8dp"
                 android:paddingTop="8dp"
@@ -32,7 +32,7 @@
                 android:id="@+id/contacts_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="Contacts"
+                android:text="@string/contacts"
                 style="@style/sectionHeader"
                 android:paddingLeft="8dp"
                 android:paddingTop="8dp"
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 4d7bc6cc..2b64d0b0 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -63,7 +63,7 @@
     <string name="send_message_to_conference">Enviar missatge a conferència</string>
     <string name="send_plain_text_message">Enviar missatge de text</string>
     <string name="send_otr_message">Enviar missatge xifrat amb OTR</string>
-    <string name="send_pgp_message">Enviar missatge xifrat amb openPGP</string>
+    <string name="send_pgp_message">Enviar missatge xifrat amb OpenPGP</string>
     <string name="your_nick_has_been_changed">El teu sobrenom s\'ha modificat</string>
     <string name="download_image">Descarregar imatge</string>
     <string name="error_loading_image">Error carregant imatge (Fitxer no trobat)</string>
@@ -84,14 +84,14 @@
     <string name="restart">Reiniciar</string>
     <string name="install">Instal·lar</string>
     <string name="offering">oferint&#8230;</string>
-    <string name="no_pgp_key">Clau openPGP no trobada</string>
-    <string name="contact_has_no_pgp_key">Conversations no ha pogut xifrar els teus missatges perquè el teu contacte no està anunciant la seva clau pública.\n\n<small>Si us plau, demana al teu contacte que configuri openPGP.</small></string>
+    <string name="no_pgp_key">Clau OpenPGP no trobada</string>
+    <string name="contact_has_no_pgp_key">Conversations no ha pogut xifrar els teus missatges perquè el teu contacte no està anunciant la seva clau pública.\n\n<small>Si us plau, demana al teu contacte que configuri OpenPGP.</small></string>
     <string name="encrypted_message_received"><i>Missatge xifrat rebut. Prem per desxifrar i veure-ho.</i></string>
     <string name="encrypted_image_received"><i>Imatge xifrada rebuda. Prem per desxifrar i veure-la.</i></string>
     <string name="image_file"><i>Imatge rebuda. Prem per veure</i></string>
     <string name="otr_file_transfer">Xifratge amb OTR no disponible</string>
-    <string name="otr_file_transfer_msg">Malauradament el xifratge amb OTR no està disponible per transferència de fitxers. Pots seleccionar xifratge amb openPGP o no usar xifratge.</string>
-    <string name="use_pgp_encryption">Usa xifratge amb openPGP</string>
+    <string name="otr_file_transfer_msg">Malauradament el xifratge amb OTR no està disponible per transferència de fitxers. Pots seleccionar xifratge amb OpenPGP o no usar xifratge.</string>
+    <string name="use_pgp_encryption">Usa xifratge amb OpenPGP</string>
 	<string name="pref_xmpp_resource">Recursos XMPP</string>
     <string name="pref_xmpp_resource_summary">El nom que identifica aquest client amb</string>
     <string name="pref_accept_files">Acceptar fitxers</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 292a81e8..e5f095da 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -66,7 +66,7 @@
     <string name="send_message_to_conference">Nachricht an Konferenz schicken</string>
     <string name="send_plain_text_message">Unverschlüsselt schreiben</string>
     <string name="send_otr_message">OTR-verschlüsselt schreiben</string>
-    <string name="send_pgp_message">openPGP-verschlüsselt schreiben</string>
+    <string name="send_pgp_message">OpenPGP-verschlüsselt schreiben</string>
     <string name="your_nick_has_been_changed">Dein Nickname wurde geändert</string>
     <string name="download_image">Bild herunter laden</string>
     <string name="error_loading_image">Fehler beim laden des Bildes. (Datei wurde nicht gefunden)</string>
@@ -87,14 +87,14 @@
     <string name="restart">Neustarten</string>
     <string name="install">Installieren</string>
     <string name="offering">angeboten&#8230;</string>
-    <string name="no_pgp_key">Kein openPGP Schlüssel gefunden</string>
-    <string name="contact_has_no_pgp_key">Conversations ist nicht in der Lage deine Nachrichten zu verschlüsseln weil dein Kontakt sein oder ihren Schlüssel nicht preis gibt.\n\n<small>Bitte sag deinem Kontakt er oder sie möge bitte openPGP einrichten.</small></string>
+    <string name="no_pgp_key">Kein OpenPGP Schlüssel gefunden</string>
+    <string name="contact_has_no_pgp_key">Conversations ist nicht in der Lage deine Nachrichten zu verschlüsseln weil dein Kontakt sein oder ihren Schlüssel nicht preis gibt.\n\n<small>Bitte sag deinem Kontakt er oder sie möge bitte OpenPGP einrichten.</small></string>
     <string name="encrypted_message_received"><i>Verschlüsselte Nachricht erhalten. Drücke hier um sie anzuzeigen und zu entschlüsseln.</i></string>
     <string name="encrypted_image_received"><i>Verschlüsseltes Bild erhalten. Drücke hier um es anzuzeigen und zu entschlüsseln.</i></string>
     <string name="image_file"><i>Bild erhalten. Drücke hier um es anzuzeigen.</i></string>
     <string name="otr_file_transfer">OTR-Verschlüsselung nicht verfügbar</string>
-    <string name="otr_file_transfer_msg">Es ist nicht möglich Datein mitels OTR zu verschlüsseln. Du kannst entweder openPGP wählen oder die Datei nicht verschlüsseln.</string>
-    <string name="use_pgp_encryption">openPGP verwenden</string>
+    <string name="otr_file_transfer_msg">Es ist nicht möglich Datein mitels OTR zu verschlüsseln. Du kannst entweder OpenPGP wählen oder die Datei nicht verschlüsseln.</string>
+    <string name="use_pgp_encryption">OpenPGP verwenden</string>
     <string name="pref_xmpp_resource">XMPP resource</string>
     <string name="pref_xmpp_resource_summary">Der Name mit dem sich der Client selber identifiziert</string>
     <string name="pref_accept_files">Dateiannahme</string>
@@ -158,7 +158,7 @@
     <string name="certif_trust">Dem Zertifikat vertrauen</string>
     <string name="encryption_choice_none">Klartext</string>
     <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">openPGP</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
     <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>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index ce4db1fb..02e7bd27 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -20,6 +20,7 @@
     <string name="title_activity_conference_details">Detalles de Conferencia</string>
     <string name="title_activity_contact_details">Detalles de Contacto</string>
     <string name="title_activity_conversations">Conversations</string>
+    <string name="title_activity_sharewith">Compartir con Conversación</string>
     <string name="just_now">ahora</string>
     <string name="minutes_ago">min</string>
     <string name="unread_conversations">conversaciones por leer</string>
@@ -61,6 +62,7 @@
     <string name="no">No</string>
     <string name="ok">Ok</string>
     <string name="done">Hecho</string>
+    <string name="hide">Ocultar</string>
     <string name="create_invite">Crear \u0026 Invitar</string>
     <string name="new_conference_explained">¿Quieres crear una nueva conferencia con una dirección generada aleatoriamente e invitar a los contactos seleccionados a ella?</string>
     <string name="no_open_mucs">No hay conferencias existentes</string>
@@ -90,7 +92,7 @@
     <string name="send_message_to_conference">Enviar mensaje a conferencia</string>
     <string name="send_plain_text_message">Enviar mensaje de texto</string>
     <string name="send_otr_message">Enviar mensaje encriptado con OTR</string>
-    <string name="send_pgp_message">Enviar mensaje encriptado con openPGP</string>
+    <string name="send_pgp_message">Enviar mensaje encriptado con OpenPGP</string>
     <string name="your_nick_has_been_changed">Tu apodo se ha modificado</string>
     <string name="download_image">Descargar imagen</string>
     <string name="error_loading_image">Error cargando imagen (Archivo no encontrado)</string>
@@ -111,18 +113,18 @@
     <string name="restart">Reiniciar</string>
     <string name="install">Instalar</string>
     <string name="offering">ofreciendo&#8230;</string>
-    <string name="no_pgp_key">Clave openPGP no encontrada</string>
-    <string name="contact_has_no_pgp_key">Conversations no ha podido encriptar tus mensajes porque el contacto no está anunciando su clave publica.\n\n<small>Por favor, pide a tu contacto que configure openPGP.</small></string>
+    <string name="no_pgp_key">Clave OpenPGP no encontrada</string>
+    <string name="contact_has_no_pgp_key">Conversations no ha podido encriptar tus mensajes porque el contacto no está anunciando su clave publica.\n\n<small>Por favor, pide a tu contacto que configure OpenPGP.</small></string>
     <string name="encrypted_message_received"><i>Mensaje encriptado recibido. Pulsa para ver.</i></string>
     <string name="encrypted_image_received"><i>Imagen encriptada recibida. Pulsa para ver.</i></string>
     <string name="image_file"><i>Imagen recibida. Pulsa para ver</i></string>
     <string name="otr_file_transfer">Encriptación con OTR no disponible</string>
-    <string name="otr_file_transfer_msg">Desafortunadamente la encriptación con OTR no está disponible para transferencia de archivos. Puedes selecionar encriptación con openPGP o no usar encriptación.</string>
-    <string name="use_pgp_encryption">Usa encriptación con openPGP</string>
+    <string name="otr_file_transfer_msg">Desafortunadamente la encriptación con OTR no está disponible para transferencia de archivos. Puedes selecionar encriptación con OpenPGP o no usar encriptación.</string>
+    <string name="use_pgp_encryption">Usa encriptación con OpenPGP</string>
     <string name="pref_xmpp_resource">Recurso</string>
     <string name="pref_xmpp_resource_summary">El nombre que identifica el cliente que estás utilizando</string>
     <string name="pref_accept_files">Aceptar archivos</string>
-    <string name="pref_accept_files_summary">De forma automática aceptar archivos menores de&#8230;</string>
+    <string name="pref_accept_files_summary">De forma automática aceptar archivos menores que&#8230;</string>
     <string name="pref_notification_settings">Ajustes de notificación</string>
     <string name="pref_notifications">Notificaciones</string>
     <string name="pref_notifications_summary">Notifica cuando llega un nuevo mensaje</string>
@@ -184,13 +186,14 @@
     <string name="certif_trust">Confiar en el certificado</string>
     <string name="encryption_choice_none">Texto plano</string>
     <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">openPGP</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="mgmt_account_edit">Editar cuenta</string>
     <string name="mgmt_account_delete">Eliminar cuenta</string>
     <string name="mgmt_account_disable">Deshabilitar temporalmente</string>
     <string name="mgmt_account_enable">Habilitar</string>
     <string name="mgmt_account_are_you_sure">¿Estás seguro?</string>
     <string name="mgmt_account_delete_confirm_text">Si eliminas tu cuenta tu historial completo de conversaciones se perderá</string>
+    <string name="mgmt_account_account_offline">La cuenta está desconectada</string>
     <string name="attach_record_voice">Grabar audio</string>
     <string name="account_settings">Configuración de cuenta</string>
     <string name="account_settings_jabber_id">Identificador Jabber:</string>
@@ -206,11 +209,25 @@
     <string name="contact_status_online">Disponible</string>
     <string name="contact_status_free_to_chat">Hablador</string>
     <string name="contact_status_away">Ausente</string>
-    <string name="contact_status_extended_away">Ausencia ext.</string>
+    <string name="contact_status_extended_away">Ausencia extendida</string>
     <string name="contact_status_do_not_disturb">No molestar</string>
     <string name="contact_status_offline">Desconectado</string>
     <string name="muc_details_conference">Conferencia</string>
     <string name="muc_details_conference_subject">Ausnto de la Conferencia</string>
     <string name="muc_details_your_nickname">Tu apodo</string>
     <string name="muc_details_other_members">Otros Miembros</string>
+    <string name="subscription_not_updated_offline">Cuenta desconectada. No se puede actualizar suscripciones</string>
+    <string name="share_with_active_conversations">Conversaciones Activas</string>
+    <string name="server_info_statistics">Estadísticas</string>
+    <string name="server_info_connection_age">Tiempo de conexión</string>
+    <string name="server_info_session_age">Duración de la sesión</string>
+    <string name="server_info_packets_sent">Paquetes enviados</string>
+    <string name="server_info_packets_received">Paquetes recibidos</string>
+    <string name="server_info_connected_accounts">Cuentas conectadas</string>
+    <string name="server_info_server_features">Características del Servidor</string>
+    <string name="server_info_roster_versioning">Roster Versioning</string>
+    <string name="server_info_carbon_messages">Mensajes Carbon</string>
+    <string name="server_info_stream_management">Stream Management</string>
+    <string name="hours">horas</string>
+    <string name="mins">mins</string>
 </resources>
\ No newline at end of file
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 71fd22b1..9c3db1de 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -90,7 +90,7 @@
   	<string name="send_message_to_conference">Mezua konferentziara bidali</string>
   	<string name="send_plain_text_message">Testu mezua bidali</string>
   	<string name="send_otr_message">OTRz enkriptatutako mezua bidali</string>
-  	<string name="send_pgp_message">openPGPz enkriptatutako mezua bidali</string>
+  	<string name="send_pgp_message">OpenPGPz enkriptatutako mezua bidali</string>
   	<string name="your_nick_has_been_changed">Zure ezizena aldatu da</string>
   	<string name="download_image">Irudia deskargatu</string>
   	<string name="error_loading_image">Akatsa irudia kargatzen (fitxategia ez da aurkitu)</string>
@@ -111,8 +111,8 @@
 	<string name="restart">Berrabiarazi</string>
 	<string name="install">Instalatu</string>
 	<string name="offering">eskeintzen&#8230;</string>
-  	<string name="no_pgp_key">Ez da openPGP gakorik aurkitu</string>
-  	<string name="contact_has_no_pgp_key">Conversations ez da zure mezuak enkriptatzeko gai zure kontaktua bere gako publikoa jakinarazten ez dagoelako.\n\n<small>Mesedez eskatu ezaiozu zure kontaktuari openPGP konfigura dezan.</small></string>
+  	<string name="no_pgp_key">Ez da OpenPGP gakorik aurkitu</string>
+  	<string name="contact_has_no_pgp_key">Conversations ez da zure mezuak enkriptatzeko gai zure kontaktua bere gako publikoa jakinarazten ez dagoelako.\n\n<small>Mesedez eskatu ezaiozu zure kontaktuari OpenPGP konfigura dezan.</small></string>
   	<string name="encrypted_message_received"><i>Enkriptatutako mezua jaso da. Ukitu ikusi eta desenkriptatzeko.</i></string>
 	<string name="encrypted_image_received"><i>Enkriptatutako irudia jaso da. Ukitu ikusi eta desenkriptatzeko.</i></string>
 	<string name="image_file"><i>Irudia jaso da. Ukitu ikusteko</i></string>
@@ -184,7 +184,7 @@
 	<string name="certif_trust">Ziurtagiriaz fidatu</string>
 	<string name="encryption_choice_none">Testu laua</string>
 	<string name="encryption_choice_otr">OTR</string>
-	<string name="encryption_choice_pgp">openPGP</string>
+	<string name="encryption_choice_pgp">OpenPGP</string>
 	<string name="mgmt_account_edit">Kontua editatu</string>	
 	<string name="mgmt_account_delete">Ezabatu</string>	
 	<string name="mgmt_account_disable">Aldi baterako ezgaitu</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index daa4fa78..0d721ac5 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -66,7 +66,7 @@
     <string name="send_message_to_conference">Envoyer un message à la conférence</string>
     <string name="send_plain_text_message">Envoyer un message</string>
     <string name="send_otr_message">Envoyer un message sécurisé par OTR</string>
-    <string name="send_pgp_message">Envoyer un message sécurisé par openPGP</string>
+    <string name="send_pgp_message">Envoyer un message sécurisé par OpenPGP</string>
     <string name="your_nick_has_been_changed">Votre identifiant a été changé</string>
     <string name="download_image">Télécharger l\'image</string>
     <string name="error_loading_image">Impossible de télécharger l\'image (Fichier non trouvé)</string>
@@ -87,14 +87,14 @@
     <string name="restart">Redémarrer</string>
     <string name="install">Installer</string>
 	<string name="offering">Proposition&#8230;</string>
-    <string name="no_pgp_key">Aucune clef openPGP trouvée.</string>
-    <string name="contact_has_no_pgp_key">Conversations ne peut chiffrer vos messages car votre correspondant n\'a pas communiqué sa clef publique.\n\n<small>Merci de demander à votre correspondant de configurer openPGP.</small></string>
+    <string name="no_pgp_key">Aucune clef OpenPGP trouvée.</string>
+    <string name="contact_has_no_pgp_key">Conversations ne peut chiffrer vos messages car votre correspondant n\'a pas communiqué sa clef publique.\n\n<small>Merci de demander à votre correspondant de configurer OpenPGP.</small></string>
     <string name="encrypted_message_received"><i>Message chiffré reçu. Appuyez pour le déchiffrer.</i></string>
     <string name="encrypted_image_received"><i>Image chiffrée reçue. Appuyez pour la déchiffrer.</i></string>
     <string name="image_file"><i>Image reçue. Appuyez pour visualiser.</i></string>
     <string name="otr_file_transfer">Chiffrement OTR non disponible</string>
-    <string name="otr_file_transfer_msg">Malheureusement le chiffrement OTR n\'est pas disponible pour le transfert de fichiers. Vous pouvez utiliser openPGP ou envoyer vos fichiers non chiffrés.</string>
-    <string name="use_pgp_encryption">Utiliser le chiffrement openPGP</string>
+    <string name="otr_file_transfer_msg">Malheureusement le chiffrement OTR n\'est pas disponible pour le transfert de fichiers. Vous pouvez utiliser OpenPGP ou envoyer vos fichiers non chiffrés.</string>
+    <string name="use_pgp_encryption">Utiliser le chiffrement OpenPGP</string>
     <string name="pref_xmpp_resource">Ressource XMPP</string>
     <string name="pref_xmpp_resource_summary">Nom permettant d\'identifier ce client XMPP</string>
     <string name="pref_accept_files">Accepter les fichiers</string>
@@ -158,7 +158,7 @@
 	<string name="certif_trust">Croire ce certificat</string>
 	<string name="encryption_choice_none">Texte clair</string>
 	<string name="encryption_choice_otr">OTR</string>
-	<string name="encryption_choice_pgp">openPGP</string>
+	<string name="encryption_choice_pgp">OpenPGP</string>
 	<string name="mgmt_account_edit">Modifier le compte</string>	
 	<string name="mgmt_account_delete">Supprimer</string>	
 	<string name="mgmt_account_disable">Désactiver temporairement</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index fe1d4fd4..512bef5c 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -68,7 +68,7 @@
     <string name="send_message_to_conference">Enviar mensaxe a conferencia</string>
     <string name="send_plain_text_message">Enviar mensaxe de texto</string>
     <string name="send_otr_message">Enviar mensaxe cifrado con OTR</string>
-    <string name="send_pgp_message">Enviar mensaxe cifrado con openPGP</string>
+    <string name="send_pgp_message">Enviar mensaxe cifrado con OpenPGP</string>
     <string name="your_nick_has_been_changed">Modificouse o teu apodo</string>
     <string name="download_image">Descargar imaxe</string>
     <string name="error_loading_image">Erro na carga da imaxen (Arquivo non atopado)</string>
@@ -89,14 +89,14 @@
     <string name="restart">Reiniciar</string>
     <string name="install">Instalar</string>
     <string name="offering">ofrecendo&#8230;</string>
-    <string name="no_pgp_key">Clave openPGP non atopada</string>
-    <string name="contact_has_no_pgp_key">Conversations non foi quen de cifrar as túas mensaxes porque o teu contactos non está anunciando a súa clave pública.\n\n<small>Por favor, pídelle ao teu contacto que configure openPGP.</small></string>
+    <string name="no_pgp_key">Clave OpenPGP non atopada</string>
+    <string name="contact_has_no_pgp_key">Conversations non foi quen de cifrar as túas mensaxes porque o teu contactos non está anunciando a súa clave pública.\n\n<small>Por favor, pídelle ao teu contacto que configure OpenPGP.</small></string>
     <string name="encrypted_message_received"><i>Mensaxe cifrado recibido. Pulsa para ver.</i></string>
     <string name="encrypted_image_received"><i>Imaxe cifrada recibida. Pulsa para ver.</i></string>
     <string name="image_file"><i>Imaxe recibida. Pulsa para ver</i></string>
     <string name="otr_file_transfer">Cifrado con OTR non disponible</string>
-    <string name="otr_file_transfer_msg">É unha pena, pero o cifrado con OTR non está disponible para transferencia de arquivos. Podes selecionar cifrado con openPGP ou enviar os datos sen cifrar.</string>
-    <string name="use_pgp_encryption">Usa cifrado con openPGP</string>
+    <string name="otr_file_transfer_msg">É unha pena, pero o cifrado con OTR non está disponible para transferencia de arquivos. Podes selecionar cifrado con OpenPGP ou enviar os datos sen cifrar.</string>
+    <string name="use_pgp_encryption">Usa cifrado con OpenPGP</string>
     <string name="pref_xmpp_resource">Recurso</string>
     <string name="pref_xmpp_resource_summary">O nome que identifica o cliente que estás a empregar</string>
     <string name="pref_accept_files">Aceptar arquivos</string>
@@ -160,7 +160,7 @@
     <string name="certif_trust">Confiar no certificado</string>
     <string name="encryption_choice_none">Texto plano</string>
     <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">openPGP</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="mgmt_account_edit">Editar conta</string>
     <string name="mgmt_account_delete">Eliminar conta</string>
     <string name="mgmt_account_disable">Deshabilitar temporalmente</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 13e43f5f..fef874b0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,6 +20,7 @@
     <string name="title_activity_conference_details">Conference Details</string>
     <string name="title_activity_contact_details">Contact Details</string>
     <string name="title_activity_conversations">Conversations</string>
+    <string name="title_activity_sharewith">Share with Conversation</string>
     <string name="just_now">just now</string>
     <string name="minutes_ago">min ago</string>
     <string name="unread_conversations">unread Conversations</string>
@@ -34,7 +35,7 @@
     <string name="participant">Participant</string>
     <string name="visitor">Visitor</string>
     <string name="enter_new_name">Enter a new name:</string>
-    <string name="remove_contact_text">Do you want to delete %s from your roster. The conversation associated with this account will not be removed.</string>
+    <string name="remove_contact_text">Do you want to delete %s from your roster? The conversation associated with this account will not be removed.</string>
     <string name="untrusted_cert_hint">The server %s presented you with an untrusted, possible self signed, certificate.</string>
     <string name="account_info">Server Info</string>
     <string name="register_account">Register new account on server</string>
@@ -61,6 +62,7 @@
     <string name="no">No</string>
     <string name="ok">Ok</string>
     <string name="done">Done</string>
+    <string name="hide">Hide</string>
     <string name="create_invite">Create \u0026 Invite</string>
     <string name="new_conference_explained">Do you want to create a new conference with a randomly generated address and invite the selected contacts to it?</string>
     <string name="no_open_mucs">No existing conferences</string>
@@ -77,7 +79,7 @@
     <string name="attach_file">Attach file</string>
     <string name="not_in_roster">The contact is not in your roster. Would you like to add it?</string>
     <string name="add_contact">Add contact</string>
-    <string name="send_failed">unsuccessful delivery</string>
+    <string name="send_failed">delivery failed</string>
     <string name="send_rejected">rejected</string>
     <string name="receiving_image">Receiving image file. Please wait&#8230;</string>
     <string name="preparing_image">Preparing image for transmission</string>
@@ -90,7 +92,7 @@
     <string name="send_message_to_conference">Send message to conference</string>
     <string name="send_plain_text_message">Send plain text message</string>
     <string name="send_otr_message">Send OTR encrypted message</string>
-    <string name="send_pgp_message">Send openPGP encrypted message</string>
+    <string name="send_pgp_message">Send OpenPGP encrypted message</string>
     <string name="your_nick_has_been_changed">Your nickname has been changed</string>
     <string name="download_image">Download Image</string>
     <string name="error_loading_image">Error loading image (File not found)</string>
@@ -111,14 +113,14 @@
     <string name="restart">Restart</string>
     <string name="install">Install</string>
     <string name="offering">offering&#8230;</string>
-    <string name="no_pgp_key">No openPGP Key found</string>
-    <string name="contact_has_no_pgp_key">Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\n<small>Please ask your contact to setup openPGP.</small></string>
+    <string name="no_pgp_key">No OpenPGP Key found</string>
+    <string name="contact_has_no_pgp_key">Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\n<small>Please ask your contact to setup OpenPGP.</small></string>
     <string name="encrypted_message_received"><i>Encrypted message received. Touch to view and decrypt.</i></string>
     <string name="encrypted_image_received"><i>Encrypted image received. Touch to view and decrypt.</i></string>
     <string name="image_file"><i>Image received. Touch to view</i></string>
     <string name="otr_file_transfer">OTR encryption not available</string>
-    <string name="otr_file_transfer_msg">Unfortunaly OTR encryption is not available for file transfer. You can choose either openPGP or no encryption.</string>
-    <string name="use_pgp_encryption">Use openPGP encryption</string>
+    <string name="otr_file_transfer_msg">Unfortunaly OTR encryption is not available for file transfer. You can choose either OpenPGP or no encryption.</string>
+    <string name="use_pgp_encryption">Use OpenPGP encryption</string>
     <string name="pref_xmpp_resource">XMPP resource</string>
     <string name="pref_xmpp_resource_summary">The name this client identifies itself with</string>
     <string name="pref_accept_files">Accept files</string>
@@ -184,13 +186,14 @@
     <string name="certif_trust">Trust certificate</string>
     <string name="encryption_choice_none">Plain text</string>
     <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">openPGP</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="mgmt_account_edit">Edit account</string>
     <string name="mgmt_account_delete">Delete</string>
     <string name="mgmt_account_disable">Temporarily disable</string>
     <string name="mgmt_account_enable">Enable</string>
     <string name="mgmt_account_are_you_sure">Are you sure?</string>
     <string name="mgmt_account_delete_confirm_text">If you delete your account your entire conversation history will be lost</string>
+    <string name="mgmt_account_account_offline">Account is offline</string>
     <string name="attach_record_voice">Record voice</string>
     <string name="account_settings">Account Settings</string>
     <string name="account_settings_jabber_id">Jabber ID:</string>
@@ -214,4 +217,17 @@
     <string name="muc_details_your_nickname">Your nickname</string>
     <string name="muc_details_other_members">Other Members</string>
     <string name="subscription_not_updated_offline">Account offline. Could not update subscription</string>
+    <string name="share_with_active_conversations">Active Conversations</string>
+    <string name="server_info_statistics">Statistics</string>
+    <string name="server_info_connection_age">Connection age</string>
+    <string name="server_info_session_age">Session age</string>
+    <string name="server_info_packets_sent">Packets sent</string>
+    <string name="server_info_packets_received">Packets received</string>
+    <string name="server_info_connected_accounts">Connected accounts</string>
+    <string name="server_info_server_features">Server Features</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="hours">hours</string>
+    <string name="mins">mins</string>
 </resources>
\ No newline at end of file