From 372d902847a36f40a248b9143b8c0f98d9e6309c Mon Sep 17 00:00:00 2001
From: Federico Iosue <federico.iosue@gmail.com>
Date: Sat, 29 Aug 2020 22:54:25 +0200
Subject: [PATCH] Updated Indonesian and Chinese Simplified tranlations

---
 .../omninotes/helpers/LanguageHelperTest.java |   5 +-
 .../src/main/res/values-in-rID/arrays.xml     |   1 -
 .../src/main/res/values-in-rID/strings.xml    |  18 +-
 .../src/main/res/values-zh-rCN/arrays.xml     |  18 +-
 .../src/main/res/values-zh-rCN/strings.xml    | 154 +++++++++---------
 5 files changed, 106 insertions(+), 90 deletions(-)

diff --git a/omniNotes/src/androidTest/java/it/feio/android/omninotes/helpers/LanguageHelperTest.java b/omniNotes/src/androidTest/java/it/feio/android/omninotes/helpers/LanguageHelperTest.java
index d3919fd4a0..14bad5cada 100644
--- a/omniNotes/src/androidTest/java/it/feio/android/omninotes/helpers/LanguageHelperTest.java
+++ b/omniNotes/src/androidTest/java/it/feio/android/omninotes/helpers/LanguageHelperTest.java
@@ -67,7 +67,7 @@ public void sameStaticStringToEnsureTranslationsAreCorrect () {
     assertTranslationMatches("ar_SA", R.string.add_note, "إضافة نقطة");
     assertTranslationMatches("es_XA", R.string.add_note, "Amestar Nota");
     assertTranslationMatches("ca_ES", R.string.add_note, "Afegeix una nota");
-    assertTranslationMatches("zh_CN", R.string.add_note, "添加记事");
+    assertTranslationMatches("zh_CN", R.string.add_note, "新建笔记");
     assertTranslationMatches("zh_TW", R.string.add_note, "新增筆記");
     assertTranslationMatches("hr_HR", R.string.add_note, "Dodaj Bilješku");
     assertTranslationMatches("cs_CZ", R.string.add_note, "Přidat poznámku");
@@ -125,6 +125,7 @@ private void assertTranslationMatches (String locale, int resourceId) {
   }
 
   private void assertTranslationMatches (String locale, int resourceId, String string) {
-    assertEquals(LanguageHelper.getLocalizedString(testContext, locale, resourceId), string);
+    assertEquals(string, LanguageHelper.getLocalizedString(testContext, locale, resourceId));
   }
+  
 }
diff --git a/omniNotes/src/main/res/values-in-rID/arrays.xml b/omniNotes/src/main/res/values-in-rID/arrays.xml
index 9297041b24..3cfb16cb39 100644
--- a/omniNotes/src/main/res/values-in-rID/arrays.xml
+++ b/omniNotes/src/main/res/values-in-rID/arrays.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2013-2019 Federico Iosue (federico@iosue.it)
   ~
diff --git a/omniNotes/src/main/res/values-in-rID/strings.xml b/omniNotes/src/main/res/values-in-rID/strings.xml
index 78dc35a0cc..689e806019 100644
--- a/omniNotes/src/main/res/values-in-rID/strings.xml
+++ b/omniNotes/src/main/res/values-in-rID/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
 <!--
   ~ Copyright (C) 2013-2019 Federico Iosue (federico@iosue.it)
   ~
@@ -44,6 +43,7 @@
     <string name="confirm">Konfirmasi</string>
     <string name="ok">Ok</string>
     <string name="no">Tidak</string>
+    <string name="failed">galat</string>
     <string name="cancel">Batal</string>
     <string name="note_updated">Catatan telah diperbaharui</string>
     <string name="empty_note_not_saved">Tidak dapat menyimpan catatan kosong</string>
@@ -66,6 +66,7 @@
     <string name="delete_all_attachments">Menghapus semua penambahan?</string>
     <string name="gallery">Galeri</string>
     <string name="location">Lokasi</string>
+    <string name="timestamp">Timestamp</string>
     <string name="pushbullet">Pushbullet</string>
     <string name="remove_location">Hapus lokasi?</string>
     <string name="remove_reminder">Hapus pengingat?</string>
@@ -83,6 +84,7 @@
     <string name="data_import_message">Klik -&gt; kembalikan\nKlik-lama -&gt; hapus</string>
     <string name="data_import_message_warning">PERINGATAN: Ini akan menggantikan semua data yang sudah ada!</string>
     <string name="data_export_completed">Mencadangkan data telah selesai</string>
+    <string name="data_export_failed">Gagal mencadangkan data: periksa logcat untuk rincian</string>
     <string name="data_import_completed">Pemulihan data telah selesai</string>
     <string name="click_to_refresh_application">Klik untuk menyegarkan aplikasi</string>
     <string name="backup_existing">Cadangan sudah ada. Hal itu akan ditimpa</string>
@@ -204,6 +206,7 @@
     <string name="uncompleted_checklists">Daftar cek tidak lengkap</string>
     <string name="info">Info</string>
     <string name="completed">Selesai</string>
+    <string name="undo_changes_note_confirmation">Konfirmasi perurungan perubahan?</string>
     <!-- Settings -->
     <string name="dashclock_description">Tampilkan beberapa statistik dan mengakhiri pengingat dari Omni Notes</string>
     <string name="settings">Setelan</string>
@@ -216,6 +219,8 @@
     <string name="settings_export">Cadangan</string>
     <string name="settings_sync_import_export">Sinkron dan cadangan</string>
     <string name="settings_import">Memulihkan atau menghapus cadangan</string>
+    <string name="settings_import_legacy">Pulihkan cadangan lawas</string>
+    <string name="settings_import_legacy_summary">Izinkan untuk memulihkan cadangan lawas yang dibuat dengan versi Omni Notes sebelumnya ke versi 6</string>
     <string name="settings_import_from_springpad">Impor catatan dari Springpad</string>
     <string name="settings_import_from_springpad_summary">Pilih arsip Springpad anda yang sudah diekspor dan pastikan untuk terhubung ke internet</string>
     <string name="settings_sync_drive">Sinkron dengan Google Drive</string>
@@ -242,6 +247,9 @@
     <string name="settings_max_video_size">Lampiran video</string>
     <string name="settings_screen_data">Data</string>
     <string name="settings_backup">Cadangan</string>
+    <string name="settings_enable_automatic_backup">Aktifkan cadangan otomatis</string>
+    <string name="settings_enable_automatic_backup_summary">Catatan akan disimpan ke folder cadangan \"_autobackup\"</string>
+    <string name="settings_enable_automatic_backup_dialog">Dengan mengaktifkan fitur ini, pencadangan data secara penuh akan dilakukan</string>
     <string name="settings_password">Kata sandi</string>
     <string name="settings_password_access">Permintaan kata sandi sedang diproses</string>
     <string name="settings_password_instructions">Sandi memsatikan bahwa catatan tidak dapat dilihat atau diubah oleh orang lain.\n\nSaat melakukan perubahan sandi baru, sandi sebelumnya akan diminta.</string>
@@ -268,6 +276,7 @@
     <string name="settings_category_preferences">Pengaturan</string>
     <string name="settings_category_beta">Beta</string>
     <string name="settings_category_about">Tentang</string>
+    <string name="settings_beta">Opsional</string>
     <string name="settings_beta_summary">Berlangganan ke program beta agar tetap update dengan fitur-fitur terbaru</string>
     <string name="donate">Donasi</string>
     <string name="donate_summary">Dukung pengembangan aplikasi ini dengan donasi non-profit</string>
@@ -330,6 +339,8 @@
     <string name="settings_error_reporting_summary_off">Tidak ada laporan kerusakan akan dikirim. Jangan mengeluh jika terjadi sesuatu kesalahan!</string>
     <string name="settings_send_analytics">Kirim data anonim</string>
     <string name="settings_send_analytics_summary">Bantu pengembang dengan mengirimkan data yang tidak sensitif seperti model perangkat, bahasa, fitur aplikasi yang sering digunakan. Data ini hanya digunakan untuk memperbaiki aplikasi open-source.</string>
+    <string name="settings_enable_file_logging">Simpan file log</string>
+    <string name="settings_enable_file_logging_summary">Log dari aplikasi akan disimpan ke file yang mana dapat anda bagikan dengan pengembang untuk meneliti kemungkinan masalah (memuat ulang dibutuhkan)</string>
     <string name="settings_statistics">Statistik</string>
     <!-- Stats -->
     <string name="stats_total_notes">Total nota</string>
@@ -370,6 +381,7 @@
     <string name="tour_detailactivity_action_title">Lakukan lebih banyak</string>
     <string name="tour_detailactivity_action_detail">Berbagi, tag, arsip, keamanan, dan banyak lagi&#8230;</string>
     <string name="tour_detailactivity_reminder_title">Hanya klik</string>
+    <string name="tour_detailactivity_reminder_detail">Menekan lama memiliki efek yang berbeda pada objek (lampiran, lokasi, pengingat) dibanding dengan menekan singkat!</string>
     <string name="tour_detailactivity_links_title">Tautan</string>
     <string name="tour_detailactivity_links_detail">Mengenali URL, alamat e-mail dan nomor telepon</string>
     <string name="tour_detailactivity_swipe_title">Geser</string>
@@ -378,6 +390,7 @@
     <string name="tour_detailactivity_save_detail">Untuk kembali, tekan ikon navigasi \"up\", atau tombol kembali di perangkat Anda</string>
     <string name="tour_listactivity_final_title">Enjoy</string>
     <string name="tour_listactivity_final_detail">Terima kasih telah menggunakan Omni Notes \nAplikasi catatan alternatif bersumber terbuka yang cocok untuk kerja maupun rekreasi!</string>
+    <string name="tour_community">Berlangganan ke komunitas untuk berpartisipasi!</string>
     <!-- Accessibility -->
     <string name="drawer_open">drawer terbuka</string>
     <string name="drawer_close">drawer tertutup</string>
@@ -388,5 +401,8 @@
     <string name="navigation_drawer_open">Buka drawer navigasi</string>
     <string name="navigation_drawer_close">Tutup drawer navigasi</string>
     <!-- Various -->
+    <string name="channel_backups_name">Cadangan</string>
+    <string name="channel_backups_description">Pemberitahuan untuk status dan hasil pencadangan</string>
     <string name="channel_reminders_name">Pengingat</string>
+    <string name="channel_reminders_description">Pemberitahuna untuk catatan pengingat</string>
 </resources>
diff --git a/omniNotes/src/main/res/values-zh-rCN/arrays.xml b/omniNotes/src/main/res/values-zh-rCN/arrays.xml
index 22ccd87c5d..516bde64ee 100644
--- a/omniNotes/src/main/res/values-zh-rCN/arrays.xml
+++ b/omniNotes/src/main/res/values-zh-rCN/arrays.xml
@@ -17,7 +17,7 @@
   -->
 <resources>
     <string-array name="navigation_list">
-        <item>记事</item>
+        <item>笔记</item>
         <item>归档</item>
         <item>提醒</item>
         <item>回收站</item>
@@ -31,24 +31,24 @@
     </string-array>
     <string-array name="checked_items_behavior">
         <item>保持原位</item>
-        <item>移动至所有事项末尾</item>
-        <item>取消勾选后移动至未勾选事项顶端</item>
+        <item>移至所有事项末尾</item>
+        <item>移至未勾选事项末尾</item>
     </string-array>
     <string-array name="colors_app">
         <item>禁用</item>
-        <item>仅条状颜色标识</item>
-        <item>仅记事列表全彩</item>
+        <item>仅条状标识</item>
+        <item>仅笔记列表</item>
         <item>全彩</item>
     </string-array>
     <string-array name="colors_widget">
         <item>禁用</item>
-        <item>仅条状颜色标识</item>
-        <item>记事列表全彩</item>
+        <item>仅条状标识</item>
+        <item>仅笔记列表</item>
     </string-array>
     <string-array name="attachments_actions">
-        <item>共享</item>
+        <item>分享</item>
         <item>删除</item>
-        <item>全部刪除</item>
+        <item>全部删除</item>
         <item>编辑</item>
     </string-array>
 </resources>
diff --git a/omniNotes/src/main/res/values-zh-rCN/strings.xml b/omniNotes/src/main/res/values-zh-rCN/strings.xml
index 3399375d1a..4758faeffc 100644
--- a/omniNotes/src/main/res/values-zh-rCN/strings.xml
+++ b/omniNotes/src/main/res/values-zh-rCN/strings.xml
@@ -17,12 +17,12 @@
   -->
 <resources>
     <!-- Activities -->
-    <string name="title_item_list">记事</string>
-    <string name="add_note">添加记事</string>
+    <string name="title_item_list">笔记</string>
+    <string name="add_note">新建笔记</string>
     <string name="title">标题</string>
     <string name="title_activity_list">Omni Notes</string>
     <string name="search">搜索</string>
-    <string name="search_hint">在记事中搜索</string>
+    <string name="search_hint">在笔记中搜索</string>
     <string name="content">内容</string>
     <string name="save">保存</string>
     <string name="share">共享</string>
@@ -30,27 +30,27 @@
     <string name="trash">删除记事</string>
     <string name="trash_action">删除记事</string>
     <string name="trashed">已回收</string>
-    <string name="note_trashed">记事已移入回收站</string>
-    <string name="note_untrashed">记事已从回收站恢复</string>
+    <string name="note_trashed">已将笔记移入回收站</string>
+    <string name="note_untrashed">已将笔记从回收站还原</string>
     <string name="untrash">从回收站恢复</string>
     <string name="delete">删除</string>
-    <string name="note_deleted">记事已永久删除</string>
+    <string name="note_deleted">已将笔记永久删除</string>
     <string name="archive">归档</string>
     <string name="unarchive">从归档中恢复</string>
     <string name="creation">创建于:</string>
     <string name="last_update">更新于</string>
-    <string name="delete_note_confirmation">确认删除记事？</string>
-    <string name="confirm">确认</string>
+    <string name="delete_note_confirmation">确定要删除此笔记吗？</string>
+    <string name="confirm">确定</string>
     <string name="ok">确定</string>
     <string name="no">否</string>
     <string name="failed">失败</string>
     <string name="cancel">取消</string>
-    <string name="note_updated">记事已更新</string>
-    <string name="empty_note_not_saved">未保存空白记事</string>
-    <string name="empty_note_not_shared">无法共享空白记事</string>
-    <string name="note_archived">记事已归档</string>
-    <string name="note_unarchived">已从归档中还原记事</string>
-    <string name="note">记事</string>
+    <string name="note_updated">已更新此笔记</string>
+    <string name="empty_note_not_saved">无法保存空白笔记</string>
+    <string name="empty_note_not_shared">无法分享空白笔记</string>
+    <string name="note_archived">笔记已归档</string>
+    <string name="note_unarchived">笔记已从归档中还原</string>
+    <string name="note">笔记</string>
     <string name="share_message_chooser">共享</string>
     <string name="shared_content_sign">\n【来自 Omni Notes】</string>
     <string name="sort">排序</string>
@@ -78,13 +78,13 @@
     <string name="storage_not_available">存储不可用</string>
     <string name="video">视频</string>
     <string name="feature_not_available_on_this_device">功能在此设备上不可用</string>
-    <string name="error_occurred_deleting_note">删除记事时发生错误</string>
+    <string name="error_occurred_deleting_note">删除笔记时发生错误</string>
     <string name="no_backups_available">无可用备份</string>
     <string name="data_export_message">输入备份名称</string>
     <string name="data_import_message">点击 -&gt; 还原\n长按 -&gt; 删除</string>
     <string name="data_import_message_warning">警告：此操作将覆盖所有当前数据！</string>
     <string name="data_export_completed">数据备份完成</string>
-    <string name="data_export_failed">数据备份失败：检查日志的详细信息</string>
+    <string name="data_export_failed">数据备份失败：检查 logcat 以获取详细信息</string>
     <string name="data_import_completed">数据导入完成</string>
     <string name="click_to_refresh_application">点击刷新应用</string>
     <string name="backup_existing">备份已存在，该备份将被覆盖</string>
@@ -93,25 +93,25 @@
     <string name="add_tag">添加标签</string>
     <string name="select_tags">选择标签</string>
     <string name="categories">类别</string>
-    <string name="edit_tag">编辑类别</string>
-    <string name="add_category">添加类别</string>
+    <string name="edit_tag">编辑分类</string>
+    <string name="add_category">新增分类</string>
     <string name="category_title">标题</string>
     <string name="category_description">描述</string>
     <string name="category_color">颜色</string>
-    <string name="category_saved">类别已保存</string>
-    <string name="category_deleted">类别已删除</string>
+    <string name="category_saved">分类已保存</string>
+    <string name="category_deleted">分类已删除</string>
     <string name="category_missing_title">缺少类别标题</string>
     <string name="delete_this_category">删除此类别</string>
-    <string name="category">类别</string>
+    <string name="category">分类</string>
     <string name="categorize_as">分类为</string>
-    <string name="title_activity_category">编辑类别</string>
-    <string name="delete_unused_category_confirmation">确认删除类别？</string>
+    <string name="title_activity_category">编辑分类</string>
+    <string name="delete_unused_category_confirmation">确定要删除此分类吗？</string>
     <string name="delete_category_confirmation">该分类已被用于某些笔记。\n确定要将这些笔记从该分类中移除，并删除该分类？</string>
     <string name="discard">取消</string>
     <string name="remove_category">移除类别</string>
-    <string name="no_tags_created">没有可用的标签，\n请先在你的笔记中添加一些标签。</string>
+    <string name="no_tags_created">没有可用的标签\n请先为您的笔记添加一些标签。</string>
     <string name="no_categories_created">尚未创建类别</string>
-    <string name="notes_category_removed">类别已从记事中移除</string>
+    <string name="notes_category_removed">已为笔记移除分类</string>
     <string name="notes_categorized_as">记事已分类为</string>
     <string name="insert_security_password">输入安全密码</string>
     <string name="lock">锁定</string>
@@ -156,7 +156,7 @@
     <string name="shortcut_note_deleted">快捷方式指向的记事已删除</string>
     <string name="widget_simple_description">带按钮的简单小部件</string>
     <string name="widget_list_description">带按钮的可滚动列表小部件</string>
-    <string name="notes">记事</string>
+    <string name="notes">笔记</string>
     <string name="show_thumbnails">显示附件缩略图</string>
     <string name="show_timestamps">显示时间戳</string>
     <string name="choose_action">选择要执行的操作</string>
@@ -178,7 +178,7 @@
     <string name="delete_merged">在合并笔记后删除原有笔记</string>
     <string name="not_set">未设置</string>
     <string name="empty_trash">清空回收站</string>
-    <string name="empty_trash_confirmation">确认删除回收站中所有记事？</string>
+    <string name="empty_trash_confirmation">确定要删除回收站中的所有笔记吗？</string>
     <string name="help">帮助</string>
     <string name="online_manual">在线用户手册</string>
     <string name="tags_added">标签已添加</string>
@@ -193,12 +193,12 @@
     <string name="remove_filter">移除过滤器</string>
     <string name="filter_old_reminders">隐藏旧提醒事项</string>
     <string name="remove_filter_old_reminders">显示旧提醒事项</string>
-    <string name="filter_archived">隐藏已归档记事</string>
-    <string name="remove_filter_archived">显示已归档记事</string>
+    <string name="filter_archived">隐藏已归档笔记</string>
+    <string name="remove_filter_archived">显示已归档笔记</string>
     <string name="permission_external_storage">外部储存权限用于在公共文件夹进行备份</string>
     <string name="permission_external_storage_detail_attachment">需要获取读取外部存储权限，以便为笔记添加附件</string>
-    <string name="permission_audio_recording">麦克风权限用于录制音频记事</string>
-    <string name="permission_coarse_location">位置权限用于在您的记事中加入位置信息</string>
+    <string name="permission_audio_recording">麦克风权限用于录制音频笔记</string>
+    <string name="permission_coarse_location">位置权限用于为您的笔记添加位置信息</string>
     <string name="permission_not_granted">权限未被授予</string>
     <string name="checklist">待办事项列表</string>
     <string name="text_note">文本注释</string>
@@ -206,14 +206,14 @@
     <string name="uncompleted_checklists">未完成的待办事项列表</string>
     <string name="info">信息</string>
     <string name="completed">已完成</string>
-    <string name="undo_changes_note_confirmation">确认撤销更改？</string>
+    <string name="undo_changes_note_confirmation">确定要撤销更改吗？</string>
     <!-- Settings -->
     <string name="dashclock_description">显示Omni Notes统计数据及最近提醒</string>
     <string name="settings">设置</string>
     <string name="settings_about">信息</string>
     <string name="settings_category_other">其他</string>
-    <string name="settings_reset_all_data">删除所有数据</string>
-    <string name="reset_all_data_confirmation">确认删除所有应用程序的数据（备份将被保留）？</string>
+    <string name="settings_reset_all_data">清空所有数据</string>
+    <string name="reset_all_data_confirmation">确定要清空本应用程序中的所有数据吗（备份将会被保留）？</string>
     <string name="action_settings">设置</string>
     <string name="settings_screen_sync_import_export">同步和备份</string>
     <string name="settings_export">备份</string>
@@ -221,19 +221,19 @@
     <string name="settings_import">还原或删除备份</string>
     <string name="settings_import_legacy">恢复旧版备份</string>
     <string name="settings_import_legacy_summary">允许恢复 Omni Note 6 之前的旧版备份</string>
-    <string name="settings_import_from_springpad">从Sringpad导入记事</string>
-    <string name="settings_import_from_springpad_summary">选择您的Springpad导出存档并确保已连接至网络</string>
-    <string name="settings_sync_drive">与Google Drive同步</string>
-    <string name="settings_sync_drive_summary">注册本应用以将数据同步至Google Drive储存服务</string>
+    <string name="settings_import_from_springpad">从 Springpad 中导入笔记</string>
+    <string name="settings_import_from_springpad_summary">选择您的 Springpad 导出存档并确保已连接至网络</string>
+    <string name="settings_sync_drive">与 Google Drive 同步</string>
+    <string name="settings_sync_drive_summary">注册本应用，以将数据同步至 Google Drive 存储服务</string>
     <string name="export_success">文件成功导出到文件夹</string>
     <string name="export_fail">文件导出失败</string>
     <string name="import_success">文件成功导入</string>
     <string name="import_fail">文件导入失败</string>
     <string name="file_not_exists">要导入的文件不存在</string>
-    <string name="import_warning">导入数据可能会覆盖当前的记事。是否继续？</string>
-    <string name="export_warning">导出的文件将覆盖前一个。要继续吗？</string>
+    <string name="import_warning">导入数据可能会覆盖现有笔记。是否继续？</string>
+    <string name="export_warning">导出文件将会覆盖现有文件。是否继续？</string>
     <string name="settings_category_gestures">手势</string>
-    <string name="settings_enable_swype">启用滑动手势</string>
+    <string name="settings_enable_swype">启用滑动手势（swype）</string>
     <string name="settings_screen_interface">界面</string>
     <string name="settings_enable_animations">动画</string>
     <string name="settings_screen_backup">备份</string>
@@ -248,11 +248,11 @@
     <string name="settings_screen_data">数据</string>
     <string name="settings_backup">备份</string>
     <string name="settings_enable_automatic_backup">启用自动备份</string>
-    <string name="settings_enable_automatic_backup_summary">笔记将存储到“_autobackup”备份文件夹</string>
+    <string name="settings_enable_automatic_backup_summary">笔记将会被存储至“_autobackup”备份文件夹</string>
     <string name="settings_enable_automatic_backup_dialog">激活此功能将执行完整的数据备份</string>
     <string name="settings_password">密码</string>
     <string name="settings_password_access">访问时需输入密码</string>
-    <string name="settings_password_instructions">密码确保您的记事不会被他人查看或修改.\n\n在设置新密码时您将被要求提供现有密码</string>
+    <string name="settings_password_instructions">密码确保您的笔记无法被他人查看或修改。\n\n设置新密码时，必须输入现有密码。</string>
     <string name="settings_password_not_matching">密码缺失或不匹配</string>
     <string name="insert_new_password">输入新密码</string>
     <string name="confirm_new_password">确认新密码</string>
@@ -260,16 +260,16 @@
     <string name="password_successfully_removed">密码已移除：已解锁所有笔记</string>
     <string name="wrong_password">密码错误</string>
     <string name="empty_password">密码为空</string>
-    <string name="agree_unlocking_all_notes">移除密码\n并解锁所有已锁定的记事?</string>
-    <string name="settings_enable_tag_marker">类别标记</string>
-    <string name="settings_backup_summary">导入或导出应用程序数据</string>
-    <string name="settings_max_video_size_summary">文件大小上限(MB)</string>
+    <string name="agree_unlocking_all_notes">是否移除密码并解锁所有已锁定的笔记？</string>
+    <string name="settings_enable_tag_marker">分类标记</string>
+    <string name="settings_backup_summary">导入或导出应用数据</string>
+    <string name="settings_max_video_size_summary">文件大小上限（MB）</string>
     <string name="settings_password_summary">编辑应用程序的安全密码</string>
-    <string name="settings_enable_animations_summary">启用或禁用记事列表动画</string>
+    <string name="settings_enable_animations_summary">启用或禁用笔记列表动画</string>
     <string name="settings_enable_tag_marker_summary">显示/隐藏类别的颜色标记</string>
-    <string name="settings_enable_editor_links_summary">在编辑器中启用或禁用链接与邮件地址自动高亮显示</string>
-    <string name="confirm_removing_backup">确认删除备份</string>
-    <string name="confirm_restoring_backup">确认还原备份</string>
+    <string name="settings_enable_editor_links_summary">将输入的链接与邮件地址自动转换为可点击的链接</string>
+    <string name="confirm_removing_backup">真的要删除备份吗？</string>
+    <string name="confirm_restoring_backup">真的要还原备份吗？</string>
     <string name="data_deletion_completed">数据删除完成</string>
     <string name="settings_checked_items_behavior">待办事项列表</string>
     <string name="settings_checked_items_behavior_summary">选中一条事项时进行何种操作？</string>
@@ -282,17 +282,17 @@
     <string name="donate_summary">请考虑为我们提供非盈利性捐赠以支持本应用后续开发</string>
     <string name="settings_choose_language">选择语言</string>
     <string name="settings_notification_ringtone">铃声</string>
-    <string name="settings_enable_tag_marker_full">全彩</string>
-    <string name="settings_enable_tag_marker_full_summary">记事列表与记事内容均以全彩显示</string>
+    <string name="settings_enable_tag_marker_full">全彩卡片与笔记背景</string>
+    <string name="settings_enable_tag_marker_full_summary">在列表视图中显示全彩卡片，在笔记视图中使用全彩背景</string>
     <string name="settings_enable_tag_marker_full_list_only">仅列表</string>
-    <string name="settings_enable_tag_marker_full_list_only_summary">仅以全彩显示记事列表，显示记事内容时仅使用彩色小标记</string>
+    <string name="settings_enable_tag_marker_full_list_only_summary">在列表视图中显示全彩卡片，在笔记视图中使用彩色标签</string>
     <string name="settings_notification_snooze_delay">响铃延迟</string>
     <string name="minutes">分钟</string>
     <string name="settings_simple_calendar">简洁日历与时间</string>
-    <string name="settings_simple_calendar_summary">使用与Google软件相比更加简洁的安卓日历与时间选择器</string>
+    <string name="settings_simple_calendar_summary">使用（简单一些的）Android 默认日期/时间选择器，而非 Google 默认</string>
     <string name="settings_first_day_of_week">星期起始日</string>
-    <string name="settings_tour_show_again">用户引导</string>
-    <string name="settings_tour_show_again_summary">再次显示用户引导</string>
+    <string name="settings_tour_show_again">应用导览</string>
+    <string name="settings_tour_show_again_summary">再次显示应用导览</string>
     <string name="backup_include_settings">包括设置 （带密码）</string>
     <string name="settings_included">设置已包括</string>
     <string name="settings_password_question_instructions">输入安全问题和对应答案用于在遗忘密码时进行重置</string>
@@ -311,34 +311,34 @@
     <string name="settings_navdrawer_on_exit_summary">在记事列表视图下点击后退键打开导航菜单而非退出应用</string>
     <string name="settings_text_size">字体大小</string>
     <string name="settings_screen_behaviors">行为</string>
-    <string name="settings_enable_swipe">滑动记事</string>
-    <string name="settings_enable_swipe_summary">在记事上滑动以执行操作</string>
+    <string name="settings_enable_swipe">滑动笔记</string>
+    <string name="settings_enable_swipe_summary">在笔记上滑动以执行操作</string>
     <string name="settings_swipe_to_trash">滑动删除</string>
     <string name="settings_swipe_to_trash_summary_1">滑动以将记事归档</string>
     <string name="settings_swipe_to_trash_summary_2">滑动以删除记事</string>
     <string name="settings_show_uncategorized">未分类组</string>
     <string name="settings_show_uncategorized_summary">在导航菜单中添加未分类记事项</string>
-    <string name="settings_show_category_count">记事数量</string>
+    <string name="settings_show_category_count">笔记数量</string>
     <string name="settings_show_category_count_summary">在类别名称旁显示关联的记事数量</string>
     <string name="settings_auto_location">自动定位</string>
     <string name="settings_auto_location_summary">自动将位置信息添加至新记事</string>
     <string name="settings_dynamic_menu">动态菜单</string>
-    <string name="settings_dynamic_menu_summary">自动隐藏未使用的菜单选项</string>
+    <string name="settings_dynamic_menu_summary">自动隐藏未使用的菜单项</string>
     <string name="settings_fab_expansion_behavior">悬浮按钮</string>
     <string name="settings_fab_expansion_behavior_summary_on">短按操作</string>
     <string name="settings_fab_expansion_behavior_summary_off">短按开关选项</string>
-    <string name="settings_attachments_on_bottom">底部显示附件</string>
+    <string name="settings_attachments_on_bottom">将附件移至底部</string>
     <string name="settings_attachments_on_bottom_summary_on">在内容下方显示附件</string>
     <string name="settings_attachments_on_bottom_summary_off">在内容上方显示附件</string>
     <string name="settings_prettified_dates">美化日期格式</string>
-    <string name="settings_prettified_dates_summary_on">简洁格式显示日期</string>
-    <string name="settings_prettified_dates_summary_off">详细格式显示日期</string>
+    <string name="settings_prettified_dates_summary_on">使用更简洁的格式显示日期</string>
+    <string name="settings_prettified_dates_summary_off">使用更详细的格式显示日期</string>
     <string name="settings_screen_privacy">隐私</string>
     <string name="settings_error_reporting">错误报告</string>
-    <string name="settings_error_reporting_summary_on">当程序崩溃时,将通知开发人员来帮助你</string>
-    <string name="settings_error_reporting_summary_off">错误报告将不会被发送,问题可能不会被解决!</string>
+    <string name="settings_error_reporting_summary_on">当应用崩溃时，将告知开发者以便解决问题</string>
+    <string name="settings_error_reporting_summary_off">不会发送崩溃报告。如果发生错误，请主动反馈！</string>
     <string name="settings_send_analytics">共享匿名数据</string>
-    <string name="settings_send_analytics_summary">向开发者发送设备型号, 语言设置, 常用软件功能等非敏感信息. 这些数据仅用于开源软件的改进和开发.</string>
+    <string name="settings_send_analytics_summary">向开发者发送设备型号、语言设置、常用功能等非敏感信息。这些数据仅用于改进此开源应用。</string>
     <string name="settings_enable_file_logging">保存日志到文件</string>
     <string name="settings_enable_file_logging_summary">应用程序的日志将被保存到您可以与开发者共享以调查可能出现的问题的文件(需要重启)</string>
     <string name="settings_statistics">统计</string>
@@ -348,7 +348,7 @@
     <string name="stats_archived_notes">已归档笔记</string>
     <string name="stats_trashed_notes">已删除笔记</string>
     <string name="stats_reminders">提醒</string>
-    <string name="stats_future_reminders">待提醒</string>
+    <string name="stats_future_reminders">未来提醒</string>
     <string name="stats_checklists">待办事项列表</string>
     <string name="stats_locked_notes">已锁定笔记</string>
     <string name="stats_categories">类别</string>
@@ -363,25 +363,25 @@
     <string name="stats_words">字数</string>
     <string name="stats_max_words">最多字数</string>
     <string name="stats_avg_words">平均字数</string>
-    <string name="stats_characters">字符</string>
+    <string name="stats_characters">字符数</string>
     <string name="stats_max_characters">最多字符数</string>
     <string name="stats_avg_characters">平均字符数</string>
     <!-- Instructions -->
-    <string name="tour_request_start">这是您第一次使用Omni Note，您是否希望观看用户引导？</string>
-    <string name="tour_listactivity_intro_title">欢迎使用 Omni Notes ！</string>
-    <string name="tour_listactivity_intro_detail">点击\"继续\"观看引导</string>
+    <string name="tour_request_start">这是您第一次打开 Omni Notes，您想看看应用导览吗？</string>
+    <string name="tour_listactivity_intro_title">欢迎使用 Omni Notes！</string>
+    <string name="tour_listactivity_intro_detail">点击\"继续\"以开始导览</string>
     <string name="tour_listactivity_actions_title">操作</string>
-    <string name="tour_listactivity_actions_detail">创建新记事并排序，访问首选项</string>
+    <string name="tour_listactivity_actions_detail">创建新笔记，排序笔记，访问首选项</string>
     <string name="tour_listactivity_home_title">导航</string>
     <string name="tour_listactivity_home_detail">使用导航菜单筛选并分类查看笔记</string>
     <string name="tour_listactivity_tag_title">标签</string>
-    <string name="tour_listactivity_tag_detail">添加不同颜色的标签以便更加高效地管理您的笔记。</string>
+    <string name="tour_listactivity_tag_detail">添加多彩分类，更加直观地管理您的笔记</string>
     <string name="tour_detailactivity_attachment_title">改进</string>
     <string name="tour_detailactivity_attachment_detail">为您的记事添加不同类型的附件！</string>
     <string name="tour_detailactivity_action_title">更多功能</string>
-    <string name="tour_detailactivity_action_detail">共享，标记，存档，保护，并......</string>
+    <string name="tour_detailactivity_action_detail">分享、标签、归档、保护，以及更多&#8230;</string>
     <string name="tour_detailactivity_reminder_title">只需点击</string>
-    <string name="tour_detailactivity_reminder_detail">长按对对象（附件、位置、提醒）有不同于短按键的效果！</string>
+    <string name="tour_detailactivity_reminder_detail">长按对象（附件、位置、提醒）即可访问更多功能！</string>
     <string name="tour_detailactivity_links_title">链接</string>
     <string name="tour_detailactivity_links_detail">支持识别 URL、邮箱地址和电话号码</string>
     <string name="tour_detailactivity_swipe_title">滑动手势</string>
@@ -390,7 +390,7 @@
     <string name="tour_detailactivity_save_detail">点击“向上”导航图标或您设备的后退键即可保存</string>
     <string name="tour_listactivity_final_title">祝您使用愉快</string>
     <string name="tour_listactivity_final_detail">感谢您使用 Omni Notes\n\n一款帮助您提高工作效率\n记录生活中精彩时刻的\n开源笔记应用！</string>
-    <string name="tour_community">订阅社区参与！</string>
+    <string name="tour_community">订阅社区，参与进来！</string>
     <!-- Accessibility -->
     <string name="drawer_open">抽屉打开</string>
     <string name="drawer_close">抽屉关闭</string>