Resolving Conflicts

vending-app/src/main/res/values-zh-rCN/strings.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="download_notification_cancel">取消</string>
+    <string name="download_notification_attachment_file">%s的附件文件</string>
+    <string name="download_notification_tips">文件下载中</string>
+
     <string name="toast_installed">microG Companion 不可单独使用。已转而打开 microG 服务设置。</string>
     <string name="toast_not_installed">microG Companion 不可单独使用。请安装 microG 服务以使用 microG。</string>
     <string name="pay_disabled">支付功能不可用</string>
@@ -19,9 +23,4 @@
     <string name="license_notification_sign_in">登录</string>
     <string name="license_notification_ignore">忽略</string>
     <string name="app_name">microG Companion</string>
-
-    <string name="download_notification_cancel">取消</string>
-    <string name="download_notification_attachment_file">%s的附件文件</string>
-    <string name="download_notification_tips">文件下载中</string>
-
 </resources>