Fix conflict

This commit is contained in:
xmd5a 2018-11-02 11:28:49 +03:00
parent 2de7d4ff8e
commit 49ef980909

View file

@ -15,6 +15,8 @@
<string name="sharing_enabled">Compartir: Activado</string> <string name="sharing_enabled">Compartir: Activado</string>
<string name="shared_string_status">Estado</string> <string name="shared_string_status">Estado</string>
<string name="no_gps_connection">Sin conexión GPS</string> <string name="no_gps_connection">Sin conexión GPS</string>
<string name="sharing_success">Enviado y actualizado</string>
<string name="not_possible_to_send_to_chats">Imposible enviar a los chats:</string>
<string name="no_internet_connection">Sin conexión a Internet</string> <string name="no_internet_connection">Sin conexión a Internet</string>
<string name="shared_string_disable">Desactivar</string> <string name="shared_string_disable">Desactivar</string>
<string name="add_device">Añadir dispositivo</string> <string name="add_device">Añadir dispositivo</string>