Merge remote-tracking branch 'origin/master'

app/src/main/res/values-en-rUS/strings.xml

@@ -189,10 +189,10 @@
     <string name="visitor_show_time">time:%1s</string>
     <string name="visitor_show_notes">notes:%1s</string>
     <string name="visitor_show_admin">admin:%1s</string>
-    <string name="visitor_show">traffic permit</string>
+    <string name="visitor_show">Electronic Pass</string>
     <string name="visitor_is_people">is out people</string>
     <string name="visitor_check_fail">check fail</string>
-    <string name="visitor_traffic_permit">traffic permit</string>
+    <string name="visitor_traffic_permit">Electronic Pass</string>
     <string name="prompt_registration_deadline">please input registration deadline</string>
     <string name="invalid_active_date_before">deadline must be before start date</string>
     <string name="forum_show_active_score">active_score:%1d</string>

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

@@ -190,10 +190,10 @@
     <string name="visitor_show_time">time:%1s</string>
     <string name="visitor_show_notes">notes:%1s</string>
     <string name="visitor_show_admin">admin:%1s</string>
-    <string name="visitor_show">traffic permit</string>
+    <string name="visitor_show">Electronic Pass</string>
     <string name="visitor_is_people">is out people</string>
     <string name="visitor_check_fail">check fail</string>
-    <string name="visitor_traffic_permit">traffic permit</string>
+    <string name="visitor_traffic_permit">Electronic Pass</string>
     <string name="prompt_registration_deadline">please input registration deadline</string>
     <string name="invalid_active_date_before">deadline must be before start date</string>
     <string name="forum_show_active_score">active_score:%1d</string>