diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 82507c7b8..6be07fadb 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -9,21 +9,54 @@
   <string name="action_secure">Conversa segura</string>
   <string name="action_add_account">Engadir conta</string>
   <string name="action_edit_contact">Editar contacto</string>
+  <string name="action_add_phone_book">Engadir a libreta de enderezos</string>
   <string name="action_delete_contact">Eliminar contacto da lista</string>
+  <string name="action_block_contact">Bloquear contacto</string>
+  <string name="action_unblock_contact">Desbloquear contacto</string>
+  <string name="action_block_domain">Bloquear dominio</string>
+  <string name="action_unblock_domain">Desbloquear dominio</string>
+  <string name="title_activity_manage_accounts">Xestionar contas</string>
+  <string name="title_activity_settings">Axustes</string>
+  <string name="title_activity_conference_details">Detalles da conferencia</string>
+  <string name="title_activity_contact_details">Detalles do contacto</string>
+  <string name="title_activity_sharewith">Compartir na conversa</string>
+  <string name="title_activity_start_conversation">Iniciar conversa</string>
+  <string name="title_activity_choose_contact">Escoller contacto</string>
+  <string name="title_activity_block_list">Lista de bloqueo</string>
   <string name="just_now">agora</string>
+  <string name="minute_ago">Hai 1 min</string>
   <string name="minutes_ago">min</string>
   <string name="unread_conversations">conversas sen ler</string>
   <string name="sending">enviando…</string>
+  <string name="message_decrypting">Descifrando a mensaxe. Por favor agarde...</string>
+  <string name="pgp_message">Mensaxe cifrado con OpenPGP</string>
   <string name="nick_in_use">O apodo xa está en uso</string>
+  <string name="admin">Admin</string>
+  <string name="owner">Dono</string>
   <string name="moderator">Moderador</string>
   <string name="participant">Participante</string>
   <string name="visitor">Visitante</string>
   <string name="remove_contact_text">¿Queres eliminar a %s da túa lista?. A conversa asociada a esta conta non se eliminará.</string>
+  <string name="block_contact_text">Desexa evitar que 1%s lle envíe mensaxes?</string>
+  <string name="unblock_contact_text">Desexa desbloquear 1%s e permitirlles que lle envíen mensaxes?</string>
+  <string name="block_domain_text">Bloquear todos os contactos desde 1%s?</string>
+  <string name="unblock_domain_text">Desbloquear todos os contactos desde 1%s?</string>
+  <string name="contact_blocked">Contacto bloqueado</string>
   <string name="register_account">Rexistrar nova conta no servidor</string>
+  <string name="change_password_on_server">Cambiar o contrasinal no servidor</string>
   <string name="share_with">Compartir con</string>
   <string name="start_conversation">Comeza conversa</string>
+  <string name="invite_contact">Invitar ao contacto</string>
+  <string name="contacts">Contactos</string>
   <string name="cancel">Cancelar</string>
+  <string name="set">Establecer</string>
+  <string name="add">Engadir</string>
+  <string name="edit">Editar</string>
+  <string name="delete">Eliminar</string>
+  <string name="block">Bloquear</string>
+  <string name="unblock">Desbloquear</string>
   <string name="save">Gardar</string>
+  <string name="ok">OK</string>
   <string name="crash_report_title">Conversations deteuse.</string>
   <string name="crash_report_message">Enviando volcados de pilas axudas ao desenrolo de Conversations\n<b>Aviso:</b> Isto empregará a túa conta XMPP para enviar o volcado de pila ao desenrolador.</string>
   <string name="send_now">Enviar agora</string>
@@ -37,11 +70,20 @@
   <string name="send_failed">Erro ao enviar</string>
   <string name="send_rejected">rechazado</string>
   <string name="preparing_image">Preparando imaxe para enviar</string>
+  <string name="preparing_images">Preparando as imaxes para transmitilas</string>
+  <string name="sharing_files_please_wait">Compartindo ficheiros. Por favor agarde...</string>
   <string name="action_clear_history">Limpar historial</string>
   <string name="clear_conversation_history">Limpar historial de conversa</string>
   <string name="clear_histor_msg">¿Queres borrar todas as mensaxes desta conversa?\n\n<b>Ollo:</b> Isto non afectará ás mensaxes gardadas noutros dispositivos ou servidores.</string>
   <string name="delete_messages">Borrar mensaxes</string>
+  <string name="also_end_conversation">Finalizar esta conversación tras o proceso</string>
+  <string name="choose_presence">Escoller dispositivo</string>
+  <string name="send_unencrypted_message">Enviar mensaxe non cifrada</string>
+  <string name="send_message">Enviar mensaxe</string>
+  <string name="send_message_to_x">Enviar mensaxe a 1%s</string>
   <string name="send_otr_message">Enviar mensaxe cifrado con OTR</string>
+  <string name="send_omemo_message">Enviar mensaxe cifrada con OMEMO</string>
+  <string name="send_omemo_x509_message">Enviar mensaxe cifrada v\\OMEMO</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="send_unencrypted">Enviar sen cifrar</string>
@@ -50,18 +92,37 @@
   <string name="openkeychain_required_long">Conversations emprega unha aplicación de terceiros chamada <b>OpenKeychain</b> para cifrar e descifrar mensaxes e xestionar as túas claves públicas.\n\nOpenKeychain está publicado baixo licencia GPLv3 e disponible en F-Droid e Google Play.\n\n<small>(Por favor, reinicie Conversations despois.)</small></string>
   <string name="restart">Reiniciar</string>
   <string name="install">Instalar</string>
+  <string name="openkeychain_not_installed">Por favor instale OpenKeychain</string>
   <string name="offering">ofrecendo…</string>
+  <string name="waiting">agardando...</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_keys">Non se atoparon chaves OpenPGP</string>
+  <string name="contacts_have_no_pgp_keys">Conversations non pode cifrar a súa mensaxe porque os seus contactos no publicaron a súa chave pública.\n\n <small>Por favor solicite aos seus contactos que configuren OpenPGP.</small></string>
+  <string name="pref_general">Xeral</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>
   <string name="pref_accept_files_summary">De forma automática aceptar arquivos menores de…</string>
+  <string name="pref_attachments">Engadidos</string>
+  <string name="pref_return_to_previous">Compartición rápida</string>
+  <string name="pref_notification_settings">Notificación</string>
   <string name="pref_notifications">Notificacións</string>
   <string name="pref_notifications_summary">Notifica cuando chega unha nova mensaxe</string>
   <string name="pref_vibrate">Tremer</string>
+  <string name="pref_vibrate_summary">Vibrar cando chegue unha nova mensaxe</string>
+  <string name="pref_led">Notificación LED</string>
+  <string name="pref_led_summary">Luz pestanexante cando chegue unha nova mensaxe</string>
+  <string name="pref_sound">Ton de aviso</string>
+  <string name="pref_sound_summary">Emitir son cando chegue unha nova mensaxe</string>
+  <string name="pref_notification_grace_period">Período de graza</string>
+  <string name="pref_notification_grace_period_summary">O tempo que Conversations permanece silente despois de ver actividade en outro dispositivo</string>
+  <string name="pref_advanced_options">Avanzado</string>
   <string name="pref_never_send_crash">Nunca enviar informe de erros</string>
   <string name="pref_never_send_crash_summary">Enviando volcados de pilas axudas al desenrolo de Conversations</string>
+  <string name="pref_confirm_messages">Confirmación de mensaxes</string>
+  <string name="pref_confirm_messages_summary">Permitir aos seus contactos saber si recibeu e leu as súas mensaxes</string>
+  <string name="pref_ui_options">IU</string>
   <string name="openpgp_error">OpenKeychain reportou un erro</string>
   <string name="error_decrypting_file">I/O Erro descifrando arquivo</string>
   <string name="accept">Aceptar</string>
@@ -93,13 +154,105 @@
   <string name="account_status_regis_conflict">O identificador xa está en uso</string>
   <string name="account_status_regis_success">Rexistro completado</string>
   <string name="account_status_regis_not_sup">O servidor non soporta rexistros</string>
+  <string name="account_status_tls_error">Fallo a negociación TLS</string>
+  <string name="account_status_policy_violation">Violación da política</string>
+  <string name="account_status_incompatible_server">Servidor incompatible</string>
+  <string name="account_status_stream_error">Erro de fluxo</string>
+  <string name="encryption_choice_unencrypted">Non cifrado</string>
   <string name="encryption_choice_otr">OTR</string>
   <string name="encryption_choice_pgp">OpenPGP</string>
+  <string name="encryption_choice_omemo">OMEMO</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>
+  <string name="mgmt_account_publish_avatar">Publicar avatar</string>
+  <string name="mgmt_account_publish_pgp">Publicar chave pública OpenPGP</string>
+  <string name="unpublish_pgp">Eliminar a chave pública OpenPGP</string>
+  <string name="unpublish_pgp_message">Está seguro de que quere eliminar a súa chave pública OpenPGP do seu anuncio de presencia? \nOs seus contactos non poderán enviarlle mensaxes cifradas con OpenPGP.</string>
+  <string name="openpgp_has_been_published">Publicouse a chave pública OpenPGP</string>
+  <string name="republish_pgp_keys">Lembre voltar a publicar a súas chaves OpenPGP!</string>
   <string name="mgmt_account_enable">Habilitar</string>
+  <string name="mgmt_account_are_you_sure">Seguro?</string>
+  <string name="mgmt_account_delete_confirm_text">Si elimina a conta perderá todo o historial de conversas</string>
   <string name="attach_record_voice">Grabar audio</string>
+  <string name="account_settings_jabber_id">ID Jabber</string>
+  <string name="block_jabber_id">Bloquear ID Jabber</string>
+  <string name="account_settings_password">Contrasinal</string>
+  <string name="account_settings_example_jabber_id">usuario@exemplo.com</string>
+  <string name="account_settings_confirm_password">Confirmar contrasinal</string>
+  <string name="password">Contrasinal</string>
+  <string name="confirm_password">Confirmar contrasinal</string>
   <string name="passwords_do_not_match">As contrasinais non coinciden</string>
   <string name="invalid_jid">O identificador non é un identificador de Jabber válido</string>
+  <string name="error_out_of_memory">Exceso de memoria. A imaxe é demasiado grande</string>
+  <string name="add_phone_book_text">Quere engadir a 1%s a súa libreta de enderezos?</string>
+  <string name="contact_status_online">en liña</string>
+  <string name="contact_status_free_to_chat">libre para conversar</string>
+  <string name="contact_status_away">non dispoñible</string>
+  <string name="contact_status_extended_away">hai moito que non está dispoñible</string>
+  <string name="contact_status_do_not_disturb">non molestar</string>
+  <string name="contact_status_offline">fora de liña</string>
+  <string name="muc_details_conference">Conferencia</string>
+  <string name="muc_details_other_members">Outros membros</string>
+  <string name="server_info_show_more">Info do servidor</string>
+  <string name="server_info_mam">XEP-0313: MAM</string>
+  <string name="server_info_carbon_messages">XEP-0280: Copia de mensaxes</string>
+  <string name="server_info_csi">XEP-0352: Indicativo do estado do cliente</string>
+  <string name="server_info_blocking">XEP-0191: Bloqueo de ordes</string>
+  <string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
+  <string name="server_info_available">dispoñible</string>
+  <string name="server_info_unavailable">non dispoñible</string>
+  <string name="missing_public_keys">Anuncios de chave pública non notificados</string>
+  <string name="last_seen_now">acaba de estar dispoñible</string>
+  <string name="last_seen_min">visto hai 1 minuto</string>
+  <string name="last_seen_mins">visto hai 1%d minutos</string>
+  <string name="last_seen_hour">visto hai 1 hora</string>
+  <string name="last_seen_hours">visto hai 1%d horas</string>
+  <string name="last_seen_day">última vez hai 1 día</string>
+  <string name="last_seen_days">última conexión hai 1%d días</string>
+  <string name="never_seen">nunca conectado</string>
+  <string name="install_openkeychain">Mensaxe cifrada. Por favor instale OpenKeychain para descifrala.</string>
+  <string name="unknown_otr_fingerprint">Pegada OTR descoñecida</string>
+  <string name="openpgp_messages_found">Atopáronse mensaxes cifradas con OpenPGP</string>
+  <string name="reception_failed">Erro ao recibir</string>
+  <string name="your_fingerprint">A súa pegada</string>
+  <string name="otr_fingerprint">Pegada OTR</string>
+  <string name="otr_fingerprint_selected_message">Pegada OTR da mensaxe</string>
+  <string name="openpgp_key_id">ID da chave OpenPGP</string>
+  <string name="omemo_fingerprint">Pegada OMEMO</string>
+  <string name="omemo_fingerprint_x509">v\\pegada OMEMO </string>
+  <string name="omemo_fingerprint_selected_message">Pegada OMEMO da mensaxe</string>
+  <string name="omemo_fingerprint_x509_selected_message">v\\Pegada OMEMO da mensaxe</string>
+  <string name="this_device_omemo_fingerprint">Pegada OMEMO propia</string>
+  <string name="other_devices">Outros dispositivos</string>
+  <string name="trust_omemo_fingerprints">Confiar en pegadas OMEMO</string>
+  <string name="fetching_keys">Obtendo chaves...</string>
+  <string name="done">Feito</string>
+  <string name="verify">Verificar</string>
+  <string name="decrypt">Descifrar</string>
+  <string name="conferences">Conferencias</string>
+  <string name="search">Buscar</string>
+  <string name="create_contact">Crear contacto</string>
+  <string name="enter_contact">Introducir contacto</string>
+  <string name="join_conference">Unirsa a conferencia</string>
+  <string name="delete_contact">Eliminar contacto</string>
+  <string name="view_contact_details">Ver os detalles do contacto</string>
+  <string name="block_contact">Bloquear contacto</string>
+  <string name="unblock_contact">Desbloquear contacto</string>
+  <string name="create">Crear</string>
+  <string name="select">Selecionar</string>
+  <string name="contact_already_exists">Xa existe o contacto</string>
+  <string name="join">Unirse</string>
+  <string name="conference_address">Enderezo da conferencia</string>
+  <string name="conference_address_example">sala@conferencia.exemplo.com/nick</string>
+  <string name="save_as_bookmark">Gardar como marcador</string>
+  <string name="delete_bookmark">Eliminar marcador</string>
+  <string name="bookmark_already_exists">Este marcador xa existe</string>
+  <string name="you">Vostede</string>
+  <string name="action_edit_subject">Editar o tema da conferencia</string>
+  <string name="edit_subject_hint">O tema de esta conferencia</string>
+  <string name="joining_conference">Uníndose a conferencia...</string>
+  <string name="leave">Saír</string>
+  <string name="contact_added_you">Contacto engadido a súa lista de contactos</string>
+  <string name="add_back">Voltar a engadir</string>
 </resources>