Merge branch 'develop' into 'master'

修改大小写

See merge request SilverBlog/SilverBlog_Android!65

Author: qwe7002

app/src/main/res/layout/content_activity_main.xml

@@ -58,20 +58,20 @@
     <Button
         android:id="@+id/save_button"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@+id/password_group"
-        android:text="@string/save_button"
+        android:layout_height="58dp"
         android:layout_alignParentEnd="true"
-        android:layout_toEndOf="@+id/eton_placeholder" />
+        android:layout_below="@+id/password_group"
+        android:layout_toEndOf="@+id/eton_placeholder"
+        android:text="@string/save_button" />
 
     <Button
         android:id="@+id/use_old"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="58dp"
         android:layout_alignParentStart="true"
         android:layout_below="@+id/password_group"
-        android:text="@string/use_old"
-        android:layout_toStartOf="@+id/save_button" />
+        android:layout_toStartOf="@+id/save_button"
+        android:text="@string/use_old" />
 
 
 </RelativeLayout>

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

@@ -8,19 +8,19 @@
 
     <string name="https_myblog_com">Blog address (example: https://demo.silverblog.org)</string>
 
-    <string name="admin_password">admin password</string>
+    <string name="admin_password">Password</string>
 
     <string name="save_button">Save</string>
 
-    <string name="scanner_notify">Please execute [./manage.py qrcode] and scan the QRcode</string>
+    <string name="scanner_notify">Please execute [./manage.py qrcode] and scan the Qrcode</string>
 
-    <string name="document">article</string>
+    <string name="document">Article</string>
 
-    <string name="menu">menu</string>
+    <string name="menu">Menu</string>
 
-    <string name="document_title">article title</string>
+    <string name="document_title">Article title</string>
 
-    <string name="document_url">article URL (leave blank for Pinyin)</string>
+    <string name="document_url">Article URL (leave blank for Pinyin)</string>
 
     <string name="document_content">Article Content</string>
 
@@ -32,34 +32,34 @@
 
     <string name="visit_document">Visit new blog</string>
 
-    <string name="cancel">cancel</string>
+    <string name="cancel">Cancel</string>
 
-    <string name="loading">connecting to server...</string>
+    <string name="loading">connecting to server…</string>
 
-    <string name="loading_message">submitting data, please wait...</string>
+    <string name="loading_message">submitting data, please wait…</string>
 
     <string name="list_is_none">The current article list is empty</string>
 
     <string name="network_error">Failed to get article list, please check network status!</string>
 
-    <string name="git_push_error">operation failed! Please check the API server output!</string>
+    <string name="git_push_error">Operation failed! Please check the API server output!</string>
 
     <string name="delete_notify">Delete this article? (Warning! This operation is irreversible, please exercise caution!)</string>
 
-    <string name="modify">modify</string>
+    <string name="modify">Modify</string>
 
-    <string name="delete">delete</string>
+    <string name="delete">Delete</string>
 
     <string name="scan_button">Scan QR code</string>
 
-    <string name="share_menu_button">share</string>
+    <string name="share_menu_button">Share</string>
 
     <string name="edit_title">Edit article</string>
 
     <string name="content_not_none">title and content can not be empty!</string>
 
-    <string name="post_title">Post article</string>
-        <string name="check_input">Please configure server information</string>first
+    <string name="post_title">New article</string>
+    <string name="check_input">Please configure server information first!</string>
 
     <string name="config_save">Configuration Saved</string>
 
@@ -69,22 +69,21 @@
 
     <string name="check_config">Please check your System.json configuration file.</string>
 
-        
     <string name="navigation_drawer_open" translatable="false">Open navigation drawer</string>
 
     <string name="navigation_drawer_close" translatable="false">Close navigation drawer</string>
 
-    <string name="logout">logout</string>
+    <string name="logout">Logout</string>
 
-    <string name="notice">notice</string>
+    <string name="notice">Notice</string>
 
     <string name="save_notice">The article has not been saved, do you really want to leave the edit page?</string>
 
     <string name="share_recive">To receive the share data, select the action</string>
 
-    <string name="use_old">use the previous configuration</string>
+    <string name="use_old">use the previous config</string>
 
     <string name="select_config">Please select the configuration file</string>
     <string name="api_too_low">The current server API version is too low. Please try again after upgrading.</string>
-    <string name="select">Select</string>
+    <string name="select">Please select operation</string>
 </resources>