Clean up

.gitignore

@@ -12,10 +12,6 @@
 bin/
 gen/
 out/
-<<<<<<< HEAD
-output.json
-=======
->>>>>>> d994e7295260ffaf87f1fe42c85c33124aec4ff2
 
 # Gradle files
 .gradle/
@@ -26,11 +22,6 @@ local.properties
 
 # Proguard folder generated by Eclipse
 proguard/
-<<<<<<< HEAD
-app/lint.xml
-app/proguard-project.txt
-=======
->>>>>>> d994e7295260ffaf87f1fe42c85c33124aec4ff2
 
 # Log Files
 *.log
@@ -43,25 +34,11 @@ captures/
 
 # IntelliJ
 *.iml
-<<<<<<< HEAD
 .idea/
 
-# Keystore files
-# Uncomment the following line if you do not want to check your keystore files in.
-*.jks
-=======
-.idea/workspace.xml
-.idea/tasks.xml
-.idea/gradle.xml
-.idea/assetWizardSettings.xml
-.idea/dictionaries
-.idea/libraries
-.idea/caches
-
 # Keystore files
 # Uncomment the following line if you do not want to check your keystore files in.
 #*.jks
->>>>>>> d994e7295260ffaf87f1fe42c85c33124aec4ff2
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
@@ -79,4 +56,4 @@ fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
-fastlane/readme.md
+fastlane/readme.md

app/release/output.json

@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":451,"versionName":"4.5.1","enabled":true,"outputFile":"EdXposedManager-org.meowcat.edxposed.manager-4.5.1-451-release.apk","fullName":"release","baseName":"release"},"path":"EdXposedManager-org.meowcat.edxposed.manager-4.5.1-451-release.apk","properties":{}}]

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

@@ -317,6 +317,7 @@
     <string name="meowcat">小喵工作室</string>
     <string name="white_list_mode_summary">白名单模式: 仅选中的应用加载 EdXposed 框架\n黑名单模式: 选中的应用不会加载 EdXposed 框架\n仅当启用应用名单模式时有效</string>
     <string name="settings_group_edxposed">Elder Driver Xposed 设置 (重启生效)</string>
+    <string name="settings_group_log">日志</string>
     <string name="pref_title_black_white_list">应用名单模式</string>
     <string name="pref_black_white_list_summary">注意：使用应用名单可能会导致某些系统全局模块不能正常工作.</string>
     <string name="ignore_chinese_summary">从模块列表中隐藏中文模块。模块仍然可以被搜索。启用此选项可能会降低性能.</string>
@@ -377,7 +378,7 @@
     <string name="custom_list">使用自定义模块列表</string>
     <string name="custom_list_summ">镜像化的模块列表可以帮助加速加载\n但是新提交的模块显示会有延迟（大约24小时）</string>
     <string name="stop_verbose_log">停止记录详细日志</string>
-    <string name="stop_verbose_log_summ">结束详细日志记录程序.\n在下次重新启动之前，将不会记录详细日志.</string>
+    <string name="stop_verbose_log_summary">结束详细日志记录程序.\n在下次重新启动之前，将不会记录详细日志.</string>
     <string name="stop_log">停止记录所有日志</string>
-    <string name="stop_log_summ">结束详细日志记录程序.\n在下次重新启动之前，将不会记录模块和详细日志.</string>
+    <string name="stop_log_summary">结束详细日志记录程序.\n在下次重新启动之前，将不会记录模块和详细日志.</string>
 </resources>

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

@@ -332,7 +332,7 @@
     <string name="title_white_list">White List</string>
     <string name="title_black_list">Black List</string>
     <string name="add_package_failed">Failed to edit, one or more settings prevent you from editing.</string>
-    <string name="menu_title_compile_reset">Deoptimize</string>
+    <string name="menu_title_compile_reset">De-optimize</string>
     <string name="menu_title_compile_speed">Optimize with Speed mode</string>
     <string name="menu_title_compile_dexopt">Optimize with Dexopt mode</string>
     <string name="compile_reset_msg">Resetting …</string>
@@ -341,6 +341,7 @@
     <string name="pref_dynamic_modules_summary">When turned on, load latest activated module list on each app process started</string>
     <string name="title_compat_list">Compat mode</string>
     <string name="settings_group_edxposed">Elder Driver Xposed Settings (Reboot needed)</string>
+    <string name="settings_group_log">Logs</string>
     <string name="pref_title_black_white_list">App List Mode</string>
     <string name="pref_black_white_list_summary">Note: using app list mode might break system-wide modules\' functions.</string>
     <string name="white_list_mode_summary">White List mode: Only selected app load EdXposed Framework.\nBlack List mode: Selected app NOT load EdXposed Framework.</string>
@@ -377,7 +378,7 @@
     <string name="elderdrivers_github" translatable="false">https://github.com/ElderDrivers/</string>
     <string name="elderdrivers_website" translatable="false">http://edxp.meowcat.org/</string>
     <string name="notinstalled">The EdXposed framework is not installed.</string>
-    <string name="pref_title_enable_boot_image_deopt">Deoptimize boot image</string>
+    <string name="pref_title_enable_boot_image_deopt">De-optimize boot image</string>
     <string name="pref_enable_boot_image_deopt_summary">Turn on to make all framework methods hookable, but the whole system will be slowed down.\nMainly used to check if one framework method is inlined when it can\'t be hooked into.</string>
 
     <string name="pref_title_disable_verbose_log">Disable verbose logs</string>
@@ -408,7 +409,7 @@
     <string name="hook_modules">Force hook modules</string>
     <string name="hook_modules_summary">Force add modules to white-list and remove modules from black-list.\nClosing this option does not remove modules from white-list.</string>
     <string name="stop_verbose_log">Stop verbose log catcher</string>
-    <string name="stop_verbose_log_summ">Stop the verbose log catcher.\nVerbose log will wont be record until the next reboot.</string>
+    <string name="stop_verbose_log_summary">Stop the verbose log catcher.\nVerbose log will wont be record until the next reboot.</string>
     <string name="stop_log">Stop all log catcher</string>
-    <string name="stop_log_summ">Stop all of the log catcher.\nModules and Verbose log will wont be record until the next reboot.</string>
+    <string name="stop_log_summary">Stop all of the log catcher.\nModules and Verbose log will wont be record until the next reboot.</string>
 </resources>