From a8b07ffc679a9662f9b6a94a097f8b491ff232e8 Mon Sep 17 00:00:00 2001
From: dupengyue <dupengyue@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期二, 07 三月 2017 11:33:25 +0800
Subject: [PATCH] 框架搭建完成，工作交接
---
VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es-rUS/values-es-rUS.xml | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es-rUS/values-es-rUS.xml b/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es-rUS/values-es-rUS.xml
index 6ee60b6..843ce16 100644
--- a/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es-rUS/values-es-rUS.xml
+++ b/VisitFace/DemoForBsk/app/build/intermediates/incremental/mergeDebugResources/merged.dir/values-es-rUS/values-es-rUS.xml
@@ -8,8 +8,8 @@
<string msgid="4076576682505996667" name="abc_action_mode_done">"Listo"</string>
<string msgid="7468859129482906941" name="abc_activity_chooser_view_see_all">"Ver todo"</string>
<string msgid="2031811694353399454" name="abc_activitychooserview_choose_application">"Elige una aplicaci贸n."</string>
- <string msgid="121134116657445385" name="abc_capital_off">"DESACTIVADO"</string>
- <string msgid="3405795526292276155" name="abc_capital_on">"ACTIVADO"</string>
+ <string msgid="121134116657445385" name="abc_capital_off">"DESACTIVAR"</string>
+ <string msgid="3405795526292276155" name="abc_capital_on">"ACTIVAR"</string>
<string msgid="7723749260725869598" name="abc_search_hint">"Buscar鈥�"</string>
<string msgid="3691816814315814921" name="abc_searchview_description_clear">"Eliminar la consulta"</string>
<string msgid="2550479030709304392" name="abc_searchview_description_query">"Consulta de b煤squeda"</string>
@@ -19,6 +19,5 @@
<string msgid="3421042268587513524" name="abc_shareactionprovider_share_with">"Compartir con"</string>
<string msgid="7165123711973476752" name="abc_shareactionprovider_share_with_application">"Compartir con %s"</string>
<string msgid="1603543279005712093" name="abc_toolbar_collapse_description">"Contraer"</string>
- <string msgid="146198913615257606" name="search_menu_title">"Buscar"</string>
<string msgid="2869576371154716097" name="status_bar_notification_info_overflow">"999+"</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0