提交类型 编写翻译部分

WeiChat/src/main/res/values-en/strings.xml

@@ -46,7 +46,7 @@
 
     <!-- start行政办公OA界面-->
     <string name = "oamain_title"> OA </string>
-         <string name = "oasign_title"> Sign in </string>
+         <string name = "oasign_title"> check in </string>
          <string name = "oaoutplan_title">Outwork </string>
          <string name = "oaworkdaily_title"> Daily </string>
          <string name = "oapackup_title"> Retract </string>
@@ -585,8 +585,8 @@
         <string name = "me"> Me </string>
 
         <string name = "msg_title"> message </string>
-        <string name = "msg_approval"> Approval Workflow </string>
-        <string name = "msg_work"> Backlog </string>
+        <string name = "msg_approval"> my reviews </string>
+        <string name = "msg_work"> undone work </string>
         <string name = "msg_subscribe"> Subscription </string>
         <string name = "friendly_time_just_now"> just </string>
         <string name = "mark_readed"> marked as unread </string>
@@ -1425,4 +1425,30 @@
 
     <string name="sales_statistics">销售看板</string>
 
+
+    //商旅服务
+    <string name="business_services">business services</string>
+
+    <!--一元捐项目新-->
+    <string name="charitable">Love donation</string>
+    <string name="charitable_user_agreement"><u>《UU User protocol》</u></string>
+    <string name="new_select_pay">select</string>
+    <string name="input_two_double">Less than two double</string>
+    <string name="not_more_pay">Amount Less than 99999</string>
+    <string name="not_pay_num_can">pay Amount Non conformity</string>
+    <string name="find_num_project">find<b>%1$d</b>project</string>
+    <string name="regx_operator">\\%1$s</string>
+
+    //设备管理项目
+    <string name="title_device_manage">Device management</string>
+    <string name="text_scan_device">scan</string>
+    <string name="text_device_query">device inquiry</string>
+    <string name="text_application_use">using application</string>
+    <string name="text_scrap_application">Scrap application</string>
+    <string name="text_maintenance">Maintenance</string>
+    <string name="text_fault_inspection">Fault submission</string>
+    <string name="text_cycle_count">Cycle inventory</string>
+    <string name="text_cycle_count_add">add Cycle</string>
+    <string name="more_info"><u>more info</u></string>
+    <string name="cycle">Cycle</string>
 </resources>

WeiChat/src/main/res/values/strings.xml

@@ -1870,4 +1870,32 @@
     <string name="input_name">请输入姓名</string>
 
     <string name="sales_statistics">销售看板</string>
+
+
+    <!--一元捐项目新-->
+    <string name="charitable">一元捐</string>
+    <string name="charitable_user_agreement"><u>《优软一元捐用户协议》</u></string>
+    <string name="new_select_pay">当前选择</string>
+    <string name="input_two_double">只能键入两位小数</string>
+    <string name="not_more_pay">金额不能大于99999</string>
+    <string name="not_pay_num_can">支付金额不符合标准</string>
+    <string name="find_num_project">查到<b>%1$d</b>个相关项目</string>
+    <string name="regx_operator">\\%1$s</string>
+
+
+    //商旅服务
+    <string name="business_services">商旅服务</string>
+
+    //设备管理项目
+    <string name="title_device_manage">设备管理</string>
+    <string name="text_scan_device">扫一扫</string>
+    <string name="text_device_query">设备查询</string>
+    <string name="text_application_use">使用申请</string>
+    <string name="text_scrap_application">报废申请</string>
+    <string name="text_maintenance">养护管理</string>
+    <string name="text_fault_inspection">故障送检</string>
+    <string name="text_cycle_count">周期盘点</string>
+    <string name="text_cycle_count_add">添加盘点</string>
+    <string name="more_info"><u>详细信息</u></string>
+    <string name="cycle">盘点</string>
 </resources>

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Mon Feb 05 16:32:11 CST 2018
-debugName=208
+#Tue Feb 06 09:36:00 CST 2018
+debugName=210
 versionName=616
-debugCode=208
+debugCode=210
 versionCode=155

app_core/common/src/main/res/values/strings.xml

@@ -1927,6 +1927,8 @@
     <string name="str_work_b2b_commerce">B2B商务</string>
     <string name="str_work_usoft_mall">优软商城</string>
     <string name="str_work_charitable_donations">一元捐</string>
+    //商旅服务
+    <string name="business_services">商旅服务</string>
     <!--工作台菜单-->
 
     <string name="str_search_history">搜索历史</string>

app_modular/appmessages/src/main/res/values-en/strings.xml

@@ -1,5 +1,6 @@
 <resources>
     <string name="app_name">AppMessages</string>
+    <string name="uu_helper">UU assistant</string>
     <string name="real_time_form">实时看板</string>
     <string name="industry_access_failure">所属行业获取失败</string>
     <string name="company_business_targets">商家营业指标</string>

app_modular/appworks/src/main/AndroidManifest.xml

@@ -357,7 +357,8 @@
             android:name=".CRM.erp.activity.DeviceCycleCountAddActivity"
             android:label="@string/text_cycle_count_add"
             />
-        <activity android:name=".OA.platform.activity.BusinessTravelActivity">
+        <activity android:name=".OA.platform.activity.BusinessTravelActivity"
+            android:label="@string/business_services">
             <intent-filter>
                 <action android:name="com.modular.work.BusinessTravelActivity" />