aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/values-es-rES
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2019-05-01 16:05:19 -0700
committerAllan Wang <me@allanwang.ca>2019-05-01 16:05:19 -0700
commit58f4f9298b09081b3c937227828824849057a835 (patch)
tree18d2bf44637b52c9f68817253fc37d4ca699daef /app/src/main/res/values-es-rES
parent576cc1a451a16f2d82ee1e41e83c420a85ded47e (diff)
parentda93672c2ed6b54e0e7119a6b55715185112df3e (diff)
downloadfrost-58f4f9298b09081b3c937227828824849057a835.tar.gz
frost-58f4f9298b09081b3c937227828824849057a835.tar.bz2
frost-58f4f9298b09081b3c937227828824849057a835.zip
Merge dev
Diffstat (limited to 'app/src/main/res/values-es-rES')
-rw-r--r--app/src/main/res/values-es-rES/strings.xml11
-rw-r--r--app/src/main/res/values-es-rES/strings_pref_behaviour.xml2
-rw-r--r--app/src/main/res/values-es-rES/strings_pref_feed.xml2
3 files changed, 15 insertions, 0 deletions
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 6b96de27..200b923b 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -17,6 +17,7 @@
<string name="birthdays">Cumpleaños</string>
<string name="chat">Chat</string>
<string name="photos">Fotos</string>
+ <string name="marketplace">Marketplace</string>
<string name="notes">Notas</string>
<string name="on_this_day">En este día</string>
<string name="loading_account">Preparando todo…</string>
@@ -45,4 +46,14 @@
<string name="options">Opciones</string>
<string name="tab_customizer_instructions">Mantén pulsado y arrastra para reorganizar los iconos superiores.</string>
<string name="no_new_notifications">No se han encontrado Notificaciones</string>
+ <string name="today">Hoy</string>
+ <string name="yesterday">Ayer</string>
+ <!--
+ Template used to display human readable string;
+ For instance:
+ Today at 1:23 PM
+ Mar 13 at 9:00 AM
+
+ The first element is the day, and the second element is the time
+ -->
</resources>
diff --git a/app/src/main/res/values-es-rES/strings_pref_behaviour.xml b/app/src/main/res/values-es-rES/strings_pref_behaviour.xml
index dd64c6d1..925f058c 100644
--- a/app/src/main/res/values-es-rES/strings_pref_behaviour.xml
+++ b/app/src/main/res/values-es-rES/strings_pref_behaviour.xml
@@ -17,6 +17,8 @@
<string name="force_message_bottom_desc">Al cargar un hilo de mensaje, activa un desplazamiento hacia la parte inferior de la página en lugar de cargar la página tal como es.</string>
<string name="enable_pip">Activar PIP</string>
<string name="enable_pip_desc">Activar función de video en miniatura</string>
+ <string name="autoplay_settings">Configuración de jugadas automáticas</string>
+ <string name="autoplay_settings_desc">Abra configuración de juego de auto de Facebook. Tenga en cuenta que debe estar desactivada para que PIP trabajar.</string>
<string name="exit_confirmation">Confirmar salida</string>
<string name="exit_confirmation_desc">Muestra un diálogo de confirmación antes de salir de la app</string>
<string name="analytics">Analytics</string>
diff --git a/app/src/main/res/values-es-rES/strings_pref_feed.xml b/app/src/main/res/values-es-rES/strings_pref_feed.xml
index b5b3451d..2ebbdf87 100644
--- a/app/src/main/res/values-es-rES/strings_pref_feed.xml
+++ b/app/src/main/res/values-es-rES/strings_pref_feed.xml
@@ -11,6 +11,8 @@
<string name="suggested_friends_desc">Mostrar \"Gente que quizá conozcas\" en el feed</string>
<string name="suggested_groups">Grupos sugeridos</string>
<string name="suggested_groups_desc">Mostrar \"grupos sugeridos\" en el feed</string>
+ <string name="show_stories">Historias destacadas</string>
+ <string name="show_stories_desc">Mostrar historias en el feed</string>
<string name="facebook_ads">Anuncios de Facebook</string>
<string name="facebook_ads_desc">Mostrar anuncios nativos de Facebook</string>
</resources>