diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-ja/values-ja.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-ja/values-ja.xml
new file mode 100644
index 0000000..8099e9c
--- /dev/null
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-ja/values-ja.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>ショートメッセージ</item>
+        <item>メール</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 件の「<ns1:g id="SEARCH">%2$s</ns1:g>」に一致する検索結果</item>
+    </plurals>
+    <string name="alert_message_delete_folder">フォルダとその含まれているノートを削除してもよろしいですか？</string>
+    <string name="alert_message_delete_note">このノートを削除してもよろしいですか？</string>
+    <string name="alert_message_delete_notes">%d 個のノートを削除してもよろしいですか？</string>
+    <string name="alert_title_delete">削除</string>
+    <string name="app_name">メモ</string>
+    <string name="app_widget2x2">メモ 2x2</string>
+    <string name="app_widget4x4">メモ 4x4</string>
+    <string name="button_delete">削除</string>
+    <string name="call_record_folder_name">通話メモ</string>
+    <string name="datetime_dialog_cancel">キャンセル</string>
+    <string name="datetime_dialog_ok">設定</string>
+    <string name="delete_remind_time_message">リマインダーを削除しました</string>
+    <string name="error_note_empty_for_clock">空のノートにはアラームを設定できません</string>
+    <string name="error_note_empty_for_send_to_desktop">空のノートはデスクトップに送ることができません</string>
+    <string name="error_note_not_exist">表示しようとしているノートは存在しません</string>
+    <string name="error_sdcard_export">テキストをエクスポートする際にエラーが発生しました、SDカードを確認してください</string>
+    <string name="error_sdcard_unmounted">SDカードが使用中で、操作できません</string>
+    <string name="error_sync_cancelled">同期がキャンセルされました</string>
+    <string name="error_sync_internal">同期に失敗しました。内部エラーが発生しました</string>
+    <string name="error_sync_network">同期に失敗しました。ネットワークとアカウントの設定を確認してください</string>
+    <string name="failed_sdcard_export">エクスポート失敗</string>
+    <string name="folder_exist">フォルダ %1$s は既に存在します、違う名前を付けてください</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="format_exported_file_location">%1$s テキストファイルを SDカード(%2$s) ディレクトリに出力しました</string>
+    <string name="format_move_notes_to_folder">%1$d 個のノートを %2$s フォルダに移動しました</string>
+    <string name="hint_foler_name">名前を入力してください</string>
+    <string name="info_note_enter_desktop">デスクトップに追加されました</string>
+    <string name="menu_alert">アラート</string>
+    <string name="menu_beauty">美女背景</string>
+    <string name="menu_cat">橘猫背景</string>
+    <string name="menu_chimpanzee">猩猩背景</string>
+    <string name="menu_create_folder">フォルダを作成する</string>
+    <string name="menu_delete">削除</string>
+    <string name="menu_deselect_all">選択を解除</string>
+    <string name="menu_export_text">テキストをエクスポートする</string>
+    <string name="menu_folder_change_name">フォルダ名を変更する</string>
+    <string name="menu_folder_delete">フォルダを削除する</string>
+    <string name="menu_folder_view">フォルダを表示する</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_normal">通常</string>
+    <string name="menu_font_size">文字のサイズ</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_super">特大</string>
+    <string name="menu_gray">灰猫背景</string>
+    <string name="menu_list_mode">リストモードに入る</string>
+    <string name="menu_move">フォルダに移動する</string>
+    <string name="menu_move_parent_folder">親フォルダに移動</string>
+    <string name="menu_normal_mode">リストモードを終了する</string>
+    <string name="menu_recover">恢复便签</string>
+    <string name="menu_remove_remind">リマインダーを削除する</string>
+    <string name="menu_restore">回收站</string>
+    <string name="menu_search">検索</string>
+    <string name="menu_select_all">すべて選択</string>
+    <string name="menu_select_none">選択項目がありません、操作は無効です</string>
+    <string name="menu_select_title">%d 項目が選択されました</string>
+    <string name="menu_send_to_desktop">デスクトップに送る</string>
+    <string name="menu_setting">設定</string>
+    <string name="menu_share">共有</string>
+    <string name="menu_sync">同期する</string>
+    <string name="menu_sync_cancel">同期をキャンセルする</string>
+    <string name="menu_title_select_folder">フォルダを選択する</string>
+    <string name="note_alert_expired">期限切れ</string>
+    <string name="note_link_email">メールを送信する</string>
+    <string name="note_link_other">マップを開く</string>
+    <string name="note_link_tel">電話をかける</string>
+    <string name="note_link_web">ウェブページを閲覧する</string>
+    <string name="notealert_enter">表示する</string>
+    <string name="notealert_ok">了解しました</string>
+    <string name="notelist_menu_new">新しいメモ</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">Google タスクとのメモ同期</string>
+    <string name="preferences_account_title">同期アカウント</string>
+    <string name="preferences_add_account">アカウントを追加</string>
+    <string name="preferences_bg_random_appear_title">メモ作成時の背景色をランダムに選択する</string>
+    <string name="preferences_button_sync_cancel">同期をキャンセル</string>
+    <string name="preferences_button_sync_immediately">今すぐ同期</string>
+    <string name="preferences_dialog_change_account_title">現在のアカウント：%1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">同期アカウントを変更すると、過去のアカウントの同期情報が削除され、切り替え時に重複データが発生する可能性があります</string>
+    <string name="preferences_dialog_select_account_tips">Google アカウントを選択してください。メモはこのアカウントの Google タスク内容と同期されます。</string>
+    <string name="preferences_dialog_select_account_title">メモの同期</string>
+    <string name="preferences_last_sync_time">前回の同期：%1$s</string>
+    <string name="preferences_menu_cancel">キャンセル</string>
+    <string name="preferences_menu_change_account">アカウントを変更</string>
+    <string name="preferences_menu_remove_account">アカウントを削除</string>
+    <string name="preferences_title">設定</string>
+    <string name="preferences_toast_cannot_change_account">同期中のため、同期アカウントを変更できません</string>
+    <string name="preferences_toast_success_set_accout">同期アカウントが%1$sに設定されました</string>
+    <string name="recover_list_recover">恢复</string>
+    <string name="search">メモ</string>
+    <string name="search_hint">メモを検索</string>
+    <string name="search_label">メモを検索中</string>
+    <string name="search_setting_description">メモのテキスト</string>
+    <string name="set_remind_time_message">リマインダーを設定しました</string>
+    <string name="success_sdcard_export">エクスポート成功</string>
+    <string name="success_sync_account">%1$sとの同期が成功しました</string>
+    <string name="sync_progress_init_list">サーバーのメモリストを取得しています...</string>
+    <string name="sync_progress_login">%1$sにログイン中...</string>
+    <string name="sync_progress_syncing">ローカルメモを同期しています...</string>
+    <string name="ticker_cancel">同期がキャンセルされました</string>
+    <string name="ticker_fail">同期に失敗しました</string>
+    <string name="ticker_success">同期が成功しました</string>
+    <string name="ticker_syncing">メモを同期しています...</string>
+    <string name="widget_havenot_content">関連コンテンツがありません。新しいメモを作成してください。</string>
+    <string name="widget_under_visit_mode">訪問者モードでは、メモの内容は表示されません</string>
+</resources>
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-ko-rKR/values-ko-rKR.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-ko-rKR/values-ko-rKR.xml
new file mode 100644
index 0000000..22a9bd4
--- /dev/null
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-ko-rKR/values-ko-rKR.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>문자 메시지</item>
+        <item>이메일</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other">"<ns1:g id="SEARCH">%2$s</ns1:g>"와(과) 일치하는 결과 <ns1:g id="NUMBER">%1$s</ns1:g>개</item>
+    </plurals>
+    <string name="alert_message_delete_folder">폴더와 해당 메모를 삭제하시겠습니까?</string>
+    <string name="alert_message_delete_note">이 메모를 삭제하시겠습니까?</string>
+    <string name="alert_message_delete_notes">%d개의 메모를 삭제하시겠습니까?</string>
+    <string name="alert_title_delete">삭제</string>
+    <string name="app_name">메모</string>
+    <string name="app_widget2x2">메모 2x2</string>
+    <string name="app_widget4x4">메모 4x4</string>
+    <string name="button_delete">삭제</string>
+    <string name="call_record_folder_name">통화 메모</string>
+    <string name="datetime_dialog_cancel">취소</string>
+    <string name="datetime_dialog_ok">설정</string>
+    <string name="delete_remind_time_message">알림 삭제 성공</string>
+    <string name="error_note_empty_for_clock">시계 알림을 설정하려면 비어 있지 않은 메모여야 합니다.</string>
+    <string name="error_note_empty_for_send_to_desktop">빈 메모를 바탕화면으로 보낼 수 없습니다.</string>
+    <string name="error_note_not_exist">찾을 수 없는 메모입니다.</string>
+    <string name="error_sdcard_export">텍스트 내보내기 중 오류가 발생했습니다. SD 카드를 확인해주세요.</string>
+    <string name="error_sdcard_unmounted">SD 카드가 마운트되지 않았습니다. 조작할 수 없습니다.</string>
+    <string name="error_sync_cancelled">동기화가 이미 취소되었습니다</string>
+    <string name="error_sync_internal">내부 오류로 인해 동기화에 실패했습니다</string>
+    <string name="error_sync_network">네트워크 및 계정 설정을 확인해주세요. 동기화에 실패했습니다</string>
+    <string name="failed_sdcard_export">내보내기 실패</string>
+    <string name="file_path">1</string>
+    <string name="folder_exist">폴더 %1$s은(는) 이미 존재합니다. 다시 이름을 지어주세요.</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM월dd일 kk:mm</string>
+    <string name="format_exported_file_location">텍스트 파일(%1$s)을 SD 카드(%2$s) 디렉토리로 내보냈습니다</string>
+    <string name="format_move_notes_to_folder">%1$d개의 메모를 %2$s 폴더로 이동했습니다</string>
+    <string name="hint_foler_name">이름을 입력하세요.</string>
+    <string name="info_note_enter_desktop">바탕화면에 추가되었습니다</string>
+    <string name="menu_alert">알림 설정</string>
+    <string name="menu_beauty">미녀 배경</string>
+    <string name="menu_cat">귤색 고양이 배경</string>
+    <string name="menu_chimpanzee">침팬지 배경</string>
+    <string name="menu_create_folder">새 폴더 만들기</string>
+    <string name="menu_delete">삭제</string>
+    <string name="menu_deselect_all">모두 선택 해제</string>
+    <string name="menu_export_text">텍스트 내보내기</string>
+    <string name="menu_folder_change_name">폴더 이름 변경</string>
+    <string name="menu_folder_delete">폴더 삭제</string>
+    <string name="menu_folder_view">폴더 보기</string>
+    <string name="menu_font_large">크게</string>
+    <string name="menu_font_normal">보통</string>
+    <string name="menu_font_size">글꼴 크기</string>
+    <string name="menu_font_small">작게</string>
+    <string name="menu_font_super">매우 크게</string>
+    <string name="menu_gray">회색 고양이 배경</string>
+    <string name="menu_list_mode">목록 모드로 전환</string>
+    <string name="menu_move">폴더로 이동</string>
+    <string name="menu_move_parent_folder">상위 폴더로 이동</string>
+    <string name="menu_normal_mode">일반 모드로 전환</string>
+    <string name="menu_recover">메모 복구</string>
+    <string name="menu_remove_remind">알림 삭제</string>
+    <string name="menu_restore">휴지통</string>
+    <string name="menu_search">검색</string>
+    <string name="menu_select_all">모두 선택</string>
+    <string name="menu_select_none">선택된 항목이 없습니다. 작업할 수 없습니다.</string>
+    <string name="menu_select_title">%d 항목 선택됨</string>
+    <string name="menu_send_to_desktop">바탕화면으로 보내기</string>
+    <string name="menu_setting">설정</string>
+    <string name="menu_share">공유</string>
+    <string name="menu_sync">동기화</string>
+    <string name="menu_sync_cancel">동기화 취소</string>
+    <string name="menu_title_select_folder">폴더 선택</string>
+    <string name="note_alert_expired">만료됨</string>
+    <string name="note_link_email">이메일 보내기</string>
+    <string name="note_link_other">지도 열기</string>
+    <string name="note_link_tel">전화 걸기</string>
+    <string name="note_link_web">웹페이지 열기</string>
+    <string name="notealert_enter">보기</string>
+    <string name="notealert_ok">확인</string>
+    <string name="notelist_menu_new">새 메모</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">Google 작업과 메모 기록 동기화</string>
+    <string name="preferences_account_title">계정 동기화</string>
+    <string name="preferences_add_account">계정 추가</string>
+    <string name="preferences_bg_random_appear_title">메모 배경색 랜덤</string>
+    <string name="preferences_button_sync_cancel">동기화 취소</string>
+    <string name="preferences_button_sync_immediately">즉시 동기화</string>
+    <string name="preferences_dialog_change_account_title">현재 계정: %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">동기화 계정을 변경하면 이전 계정의 동기화 정보가 삭제되며, 동시에 변경할 경우 데이터 중복을 일으킬 수 있습니다.</string>
+    <string name="preferences_dialog_select_account_tips">Google 계정을 선택하세요. 메모는 해당 계정의 Google 작업 내용과 동기화됩니다.</string>
+    <string name="preferences_dialog_select_account_title">메모 동기화</string>
+    <string name="preferences_last_sync_time">최근 동기화: %1$s</string>
+    <string name="preferences_menu_cancel">취소</string>
+    <string name="preferences_menu_change_account">계정 변경</string>
+    <string name="preferences_menu_remove_account">계정 삭제</string>
+    <string name="preferences_title">설정</string>
+    <string name="preferences_toast_cannot_change_account">동기화 진행 중입니다. 동기화 계정을 변경할 수 없습니다.</string>
+    <string name="preferences_toast_success_set_accout">동기화 계정이 %1$s(으)로 설정되었습니다.</string>
+    <string name="search">메모</string>
+    <string name="search_hint">메모 검색</string>
+    <string name="search_label">메모 검색 중</string>
+    <string name="search_setting_description">메모 내 텍스트</string>
+    <string name="set_remind_time_message">알림 생성</string>
+    <string name="success_sdcard_export">내보내기 성공</string>
+    <string name="success_sync_account">%1$s와의 동기화에 성공했습니다</string>
+    <string name="sync_progress_init_list">서버 메모 목록 가져오는 중...</string>
+    <string name="sync_progress_login">%1$s 로그인 중...</string>
+    <string name="sync_progress_syncing">로컬 메모 동기화 중...</string>
+    <string name="ticker_cancel">동기화가 취소되었습니다</string>
+    <string name="ticker_fail">동기화 실패</string>
+    <string name="ticker_success">동기화 성공</string>
+    <string name="ticker_syncing">메모 동기화 중...</string>
+    <string name="widget_havenot_content">연관된 내용이 없습니다. 새 메모를 클릭하세요.</string>
+    <string name="widget_under_visit_mode">게스트 모드에서는 메모 내용이 표시되지 않습니다.</string>
+</resources>
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
new file mode 100644
index 0000000..d381da3
--- /dev/null
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>邮件</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
+    </plurals>
+    <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
+    <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
+    <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
+    <string name="alert_title_delete">删除</string>
+    <string name="app_name">便签</string>
+    <string name="app_widget2x2">便签2x2</string>
+    <string name="app_widget4x4">便签4x4</string>
+    <string name="button_delete">删除</string>
+    <string name="call_record_folder_name">通话便签</string>
+    <string name="datetime_dialog_cancel">取消</string>
+    <string name="datetime_dialog_ok">设置</string>
+    <string name="delete_remind_time_message">成功删除提醒</string>
+    <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
+    <string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
+    <string name="error_note_not_exist">要查看的便签不存在</string>
+    <string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
+    <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
+    <string name="error_sync_cancelled">同步已取消</string>
+    <string name="error_sync_internal">同步失败，发生内部错误</string>
+    <string name="error_sync_network">同步失败，请检查网络和帐号设置</string>
+    <string name="failed_sdcard_export">导出失败</string>
+    <string name="file_path">1</string>
+    <string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string>
+    <string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
+    <string name="hint_foler_name">请输入名称</string>
+    <string name="info_note_enter_desktop">已添加到桌面</string>
+    <string name="menu_alert">提醒我</string>
+    <string name="menu_beauty">美女背景</string>
+    <string name="menu_cat">橘猫背景</string>
+    <string name="menu_chimpanzee">猩猩背景</string>
+    <string name="menu_create_folder">新建文件夹</string>
+    <string name="menu_delete">删除</string>
+    <string name="menu_deselect_all">取消全选</string>
+    <string name="menu_export_text">导出文本</string>
+    <string name="menu_folder_change_name">修改文件夹名称</string>
+    <string name="menu_folder_delete">刪除文件夹</string>
+    <string name="menu_folder_view">查看文件夹</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_normal">正常</string>
+    <string name="menu_font_size">文字大小</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_super">超大</string>
+    <string name="menu_gray">灰猫背景</string>
+    <string name="menu_list_mode">进入清单模式</string>
+    <string name="menu_move">移动到文件夹</string>
+    <string name="menu_move_parent_folder">上一级文件夹</string>
+    <string name="menu_normal_mode">退出清单模式</string>
+    <string name="menu_recover">恢复便签</string>
+    <string name="menu_remove_remind">删除提醒</string>
+    <string name="menu_restore">回收站</string>
+    <string name="menu_search">搜索</string>
+    <string name="menu_select_all">全选</string>
+    <string name="menu_select_none">没有选中项，操作无效</string>
+    <string name="menu_select_title">选中了 %d 项</string>
+    <string name="menu_send_to_desktop">发送到桌面</string>
+    <string name="menu_setting">设置</string>
+    <string name="menu_share">分享</string>
+    <string name="menu_sync">同步</string>
+    <string name="menu_sync_cancel">取消同步</string>
+    <string name="menu_title_select_folder">选择文件夹</string>
+    <string name="note_alert_expired">已过期</string>
+    <string name="note_link_email">发送邮件</string>
+    <string name="note_link_other">打开地图</string>
+    <string name="note_link_tel">呼叫电话</string>
+    <string name="note_link_web">浏览网页</string>
+    <string name="notealert_enter">查看</string>
+    <string name="notealert_ok">知道了</string>
+    <string name="notelist_menu_new">新建便签</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">与google task同步便签记录</string>
+    <string name="preferences_account_title">同步账号</string>
+    <string name="preferences_add_account">添加账号</string>
+    <string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string>
+    <string name="preferences_button_sync_cancel">取消同步</string>
+    <string name="preferences_button_sync_immediately">立即同步</string>
+    <string name="preferences_dialog_change_account_title">当前帐号 %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string>
+    <string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string>
+    <string name="preferences_dialog_select_account_title">同步便签</string>
+    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
+    <string name="preferences_menu_cancel">取消</string>
+    <string name="preferences_menu_change_account">更换账号</string>
+    <string name="preferences_menu_remove_account">删除账号</string>
+    <string name="preferences_title">设置</string>
+    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string>
+    <string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string>
+    <string name="search">便签</string>
+    <string name="search_hint">搜索便签</string>
+    <string name="search_label">正在搜索便签</string>
+    <string name="search_setting_description">便签中的文字</string>
+    <string name="set_remind_time_message">创建提醒</string>
+    <string name="success_sdcard_export">导出成功</string>
+    <string name="success_sync_account">与%1$s同步成功</string>
+    <string name="sync_progress_init_list">正在获取服务器便签列表...</string>
+    <string name="sync_progress_login">登录%1$s...</string>
+    <string name="sync_progress_syncing">正在同步本地便签...</string>
+    <string name="ticker_cancel">同步已取消</string>
+    <string name="ticker_fail">同步失败</string>
+    <string name="ticker_success">同步成功</string>
+    <string name="ticker_syncing">同步便签...</string>
+    <string name="widget_havenot_content">没有关联内容，点击新建便签。</string>
+    <string name="widget_under_visit_mode">访客模式下，便签内容不可见</string>
+</resources>
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
new file mode 100644
index 0000000..d81d85e
--- /dev/null
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>郵件</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
+    </plurals>
+    <string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string>
+    <string name="alert_message_delete_note">确认要删除該條便籤嗎?</string>
+    <string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string>
+    <string name="alert_title_delete">刪除</string>
+    <string name="app_name">便簽</string>
+    <string name="app_widget2x2">便簽2x2</string>
+    <string name="app_widget4x4">便簽4x4</string>
+    <string name="button_delete">刪除</string>
+    <string name="call_record_folder_name">通話便籤</string>
+    <string name="datetime_dialog_cancel">取消</string>
+    <string name="datetime_dialog_ok">設置</string>
+    <string name="delete_remind_time_message">成功刪除提醒</string>
+    <string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string>
+    <string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string>
+    <string name="error_note_not_exist">要查看的便籤不存在</string>
+    <string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string>
+    <string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string>
+    <string name="error_sync_cancelled">同步已取消</string>
+    <string name="error_sync_internal">同步失敗，發生內部錯誤</string>
+    <string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string>
+    <string name="failed_sdcard_export">導出失敗</string>
+    <string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string>
+    <string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string>
+    <string name="hint_foler_name">請輸入名稱</string>
+    <string name="info_note_enter_desktop">已添加到桌面</string>
+    <string name="menu_alert">提醒我</string>
+    <string name="menu_beauty">美女背景</string>
+    <string name="menu_cat">橘猫背景</string>
+    <string name="menu_chimpanzee">猩猩背景</string>
+    <string name="menu_create_folder">新建文件夾</string>
+    <string name="menu_delete">刪除</string>
+    <string name="menu_deselect_all">取消全選</string>
+    <string name="menu_export_text">導出文本</string>
+    <string name="menu_folder_change_name">修改文件夾名稱</string>
+    <string name="menu_folder_delete">刪除文件夾</string>
+    <string name="menu_folder_view">查看文件夾</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_normal">正常</string>
+    <string name="menu_font_size">文字大小</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_super">超大</string>
+    <string name="menu_gray">灰猫背景</string>
+    <string name="menu_list_mode">進入清單模式</string>
+    <string name="menu_move">移動到文件夾</string>
+    <string name="menu_move_parent_folder">上一級文件夾</string>
+    <string name="menu_normal_mode">退出清單模式</string>
+    <string name="menu_recover">恢复便签</string>
+    <string name="menu_remove_remind">刪除提醒</string>
+    <string name="menu_restore">回收站</string>
+    <string name="menu_search">搜尋</string>
+    <string name="menu_select_all">全選</string>
+    <string name="menu_select_none">沒有選中項，操作無效</string>
+    <string name="menu_select_title">選中了 %d 項</string>
+    <string name="menu_send_to_desktop">發送到桌面</string>
+    <string name="menu_setting">設置</string>
+    <string name="menu_share">分享</string>
+    <string name="menu_sync">同步</string>
+    <string name="menu_sync_cancel">取消同步</string>
+    <string name="menu_title_select_folder">選擇文件夾</string>
+    <string name="note_alert_expired">已過期</string>
+    <string name="note_link_email">發送郵件</string>
+    <string name="note_link_other">打開地圖</string>
+    <string name="note_link_tel">呼叫電話</string>
+    <string name="note_link_web">浏覽網頁</string>
+    <string name="notealert_enter">查看</string>
+    <string name="notealert_ok">知道了</string>
+    <string name="notelist_menu_new">新建便簽</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">与google task同步便簽記錄</string>
+    <string name="preferences_account_title">同步賬號</string>
+    <string name="preferences_add_account">添加賬號</string>
+    <string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string>
+    <string name="preferences_button_sync_cancel">取消同步</string>
+    <string name="preferences_button_sync_immediately">立即同步</string>
+    <string name="preferences_dialog_change_account_title">當前帳號 %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string>
+    <string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string>
+    <string name="preferences_dialog_select_account_title">同步便簽</string>
+    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
+    <string name="preferences_menu_cancel">取消</string>
+    <string name="preferences_menu_change_account">更換賬號</string>
+    <string name="preferences_menu_remove_account">刪除賬號</string>
+    <string name="preferences_title">設置</string>
+    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string>
+    <string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string>
+    <string name="recover_list_recover">恢复</string>
+    <string name="search">便籤</string>
+    <string name="search_hint">搜索便籤</string>
+    <string name="search_label">正在搜索便籤</string>
+    <string name="search_setting_description">便籤中的文字</string>
+    <string name="set_remind_time_message">創建提醒</string>
+    <string name="success_sdcard_export">導出成功</string>
+    <string name="success_sync_account">與%1$s同步成功</string>
+    <string name="sync_progress_init_list">正在獲取服務器便籤列表...</string>
+    <string name="sync_progress_login">登陸%1$s...</string>
+    <string name="sync_progress_syncing">正在同步本地便籤...</string>
+    <string name="ticker_cancel">同步已取消</string>
+    <string name="ticker_fail">同步失敗</string>
+    <string name="ticker_success">同步成功</string>
+    <string name="ticker_syncing">同步便簽...</string>
+    <string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string>
+    <string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string>
+</resources>
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
new file mode 100644
index 0000000..9367dda
--- /dev/null
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values/values.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="format_for_exported_note">
+        <item>-%s</item>      
+        <item>--%s</item>     
+        <item>--%s</item>     
+        <item>--%s</item>     
+    </string-array>
+    <string-array name="menu_share_ways">
+        <item>Messaging</item>
+        <item>Email</item>
+    </string-array>
+    <color name="user_query_highlight">#335b5b5b</color>
+    <dimen name="text_font_size_large">26sp</dimen>
+    <dimen name="text_font_size_medium">20sp</dimen>
+    <dimen name="text_font_size_normal">17sp</dimen>
+    <dimen name="text_font_size_small">14sp</dimen>
+    <dimen name="text_font_size_super">33sp</dimen>
+    <plurals name="search_results_title">
+         <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
+        
+        <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
+    </plurals>
+    <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
+    <string name="alert_message_delete_note">Confirm to delete this note?</string>
+    <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
+    <string name="alert_title_delete">Delete selected notes</string>
+    <string name="app_name">Notes</string>
+    <string name="app_widget2x2">Notes 2x2</string>
+    <string name="app_widget4x4">Notes 4x4</string>
+    <string name="button_delete">Delete</string>
+    <string name="call_record_folder_name">Call notes</string>
+    <string name="datetime_dialog_cancel">cancel</string>
+    <string name="datetime_dialog_ok">set</string>
+    <string name="delete_remind_time_message">Delete reminder successfully</string>
+    <string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string>
+    <string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string>
+    <string name="error_note_not_exist">The note is not exist</string>
+    <string name="error_sdcard_export">Export failed, please check SD card</string>
+    <string name="error_sdcard_unmounted">SD card busy, not available now</string>
+    <string name="error_sync_cancelled">Sync is canceled</string>
+    <string name="error_sync_internal">Sync failed, internal error occurs</string>
+    <string name="error_sync_network">Sync failed, please check network and account settings</string>
+    <string name="failed_sdcard_export">Export fail</string>
+    <string name="file_name_txt_format">notes_%s.txt</string>
+    <string name="file_path">/MIUI/notes/</string>
+    <string name="folder_exist">The folder %1$s exist, please rename</string>
+    <string name="format_date_ymd" translatable="false">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MMMd kk:mm</string>
+    <string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string>
+    <string name="format_folder_files_count">(%d)</string>
+    <string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
+    <string name="hint_foler_name">Input name</string>
+    <string name="info_note_enter_desktop">Note added to home</string>
+    <string name="menu_alert">Remind me</string>
+    <string name="menu_beauty">background:beauty</string>
+    <string name="menu_cat">background:cat</string>
+    <string name="menu_chimpanzee">background:chimpanzee</string>
+    <string name="menu_create_folder">New Folder</string>
+    <string name="menu_delete">Delete</string>
+    <string name="menu_deselect_all">Deselect all</string>
+    <string name="menu_export_text">Export text</string>
+    <string name="menu_folder_change_name">Change folder name</string>
+    <string name="menu_folder_delete">Delete folder</string>
+    <string name="menu_folder_view">View folder</string>
+    <string name="menu_font_large">Large</string>
+    <string name="menu_font_normal">Medium</string>
+    <string name="menu_font_size">Font size</string>
+    <string name="menu_font_small">Small</string>
+    <string name="menu_font_super">Super</string>
+    <string name="menu_gray">background:gray</string>
+    <string name="menu_list_mode">Enter check list</string>
+    <string name="menu_move">Move to folder</string>
+    <string name="menu_move_parent_folder">Parent folder</string>
+    <string name="menu_normal_mode">Leave check list</string>
+    <string name="menu_recover">recover</string>
+    <string name="menu_remove_remind">Delete reminder</string>
+    <string name="menu_restore">trash</string>
+    <string name="menu_search">Search</string>
+    <string name="menu_select_all">Select all</string>
+    <string name="menu_select_none">Nothing selected, the operation is invalid</string>
+    <string name="menu_select_title">%d selected</string>
+    <string name="menu_send_to_desktop">Send to home</string>
+    <string name="menu_setting">Settings</string>
+    <string name="menu_share">Share</string>
+    <string name="menu_sync">Sync</string>
+    <string name="menu_sync_cancel">Cancel syncing</string>
+    <string name="menu_title_select_folder">Select folder</string>
+    <string name="note_alert_expired">Expired</string>
+    <string name="note_link_email">Send email</string>
+    <string name="note_link_other">Open map</string>
+    <string name="note_link_tel">Call</string>
+    <string name="note_link_web">Browse web</string>
+    <string name="notealert_enter">Take a look</string>
+    <string name="notealert_ok">Got it</string>
+    <string name="notelist_menu_new">Add note</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">Sync notes with google task</string>
+    <string name="preferences_account_title">Sync account</string>
+    <string name="preferences_add_account">Add account</string>
+    <string name="preferences_bg_random_appear_title">New note background color random</string>
+    <string name="preferences_button_sync_cancel">Cancel syncing</string>
+    <string name="preferences_button_sync_immediately">Sync immediately</string>
+    <string name="preferences_dialog_change_account_title">Current account %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string>
+    <string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string>
+    <string name="preferences_dialog_select_account_title">Sync notes</string>
+    <string name="preferences_last_sync_time">Last sync time %1$s</string>
+    <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
+    <string name="preferences_menu_cancel">Cancel</string>
+    <string name="preferences_menu_change_account">Change sync account</string>
+    <string name="preferences_menu_remove_account">Remove sync account</string>
+    <string name="preferences_title">Settings</string>
+    <string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string>
+    <string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string>
+    <string name="search">Notes</string>
+    <string name="search_hint">Search notes</string>
+    <string name="search_label">Searching Notes</string>
+    <string name="search_setting_description">Text in your notes</string>
+    <string name="set_remind_time_message">Set reminder</string>
+    <string name="success_sdcard_export">Export successful</string>
+    <string name="success_sync_account">Sync is successful with account %1$s</string>
+    <string name="sync_progress_init_list">Getting remote note list...</string>
+    <string name="sync_progress_login">Logging into %1$s...</string>
+    <string name="sync_progress_syncing">Synchronize local notes with Google Task...</string>
+    <string name="ticker_cancel">Sync is canceled</string>
+    <string name="ticker_fail">Sync is failed</string>
+    <string name="ticker_success">Sync is successful</string>
+    <string name="ticker_syncing">Syncing notes...</string>
+    <string name="widget_havenot_content">No associated note found, click to create associated note.</string>
+    <string name="widget_under_visit_mode">Privacy mode，can not see note content</string>
+    <style name="HighlightTextAppearancePrimary">
+    <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@color/primary_text_dark</item>
+    </style>
+    <style name="HighlightTextAppearanceSecondary">
+        <item name="android:textSize">@dimen/text_font_size_small</item>
+        <item name="android:textColor">@color/secondary_text_dark</item>
+    </style>
+    <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
+        <item name="android:displayOptions"/>
+        <item name="android:visibility">visible</item>
+    </style>
+    <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
+        <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
+    </style>
+    <style name="TextAppearanceLarge">
+        <item name="android:textSize">@dimen/text_font_size_large</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceMedium">
+        <item name="android:textSize">@dimen/text_font_size_medium</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceNormal">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearancePrimaryItem">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@color/primary_text_dark</item>
+    </style>
+    <style name="TextAppearanceSecondaryItem">
+        <item name="android:textSize">@dimen/text_font_size_small</item>
+        <item name="android:textColor">@color/secondary_text_dark</item>
+    </style>
+    <style name="TextAppearanceSuper">
+        <item name="android:textSize">@dimen/text_font_size_super</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceUnderMenuIcon">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+</resources>
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-ja/values-ja.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-ja/values-ja.xml
new file mode 100644
index 0000000..8099e9c
--- /dev/null
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-ja/values-ja.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>ショートメッセージ</item>
+        <item>メール</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 件の「<ns1:g id="SEARCH">%2$s</ns1:g>」に一致する検索結果</item>
+    </plurals>
+    <string name="alert_message_delete_folder">フォルダとその含まれているノートを削除してもよろしいですか？</string>
+    <string name="alert_message_delete_note">このノートを削除してもよろしいですか？</string>
+    <string name="alert_message_delete_notes">%d 個のノートを削除してもよろしいですか？</string>
+    <string name="alert_title_delete">削除</string>
+    <string name="app_name">メモ</string>
+    <string name="app_widget2x2">メモ 2x2</string>
+    <string name="app_widget4x4">メモ 4x4</string>
+    <string name="button_delete">削除</string>
+    <string name="call_record_folder_name">通話メモ</string>
+    <string name="datetime_dialog_cancel">キャンセル</string>
+    <string name="datetime_dialog_ok">設定</string>
+    <string name="delete_remind_time_message">リマインダーを削除しました</string>
+    <string name="error_note_empty_for_clock">空のノートにはアラームを設定できません</string>
+    <string name="error_note_empty_for_send_to_desktop">空のノートはデスクトップに送ることができません</string>
+    <string name="error_note_not_exist">表示しようとしているノートは存在しません</string>
+    <string name="error_sdcard_export">テキストをエクスポートする際にエラーが発生しました、SDカードを確認してください</string>
+    <string name="error_sdcard_unmounted">SDカードが使用中で、操作できません</string>
+    <string name="error_sync_cancelled">同期がキャンセルされました</string>
+    <string name="error_sync_internal">同期に失敗しました。内部エラーが発生しました</string>
+    <string name="error_sync_network">同期に失敗しました。ネットワークとアカウントの設定を確認してください</string>
+    <string name="failed_sdcard_export">エクスポート失敗</string>
+    <string name="folder_exist">フォルダ %1$s は既に存在します、違う名前を付けてください</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="format_exported_file_location">%1$s テキストファイルを SDカード(%2$s) ディレクトリに出力しました</string>
+    <string name="format_move_notes_to_folder">%1$d 個のノートを %2$s フォルダに移動しました</string>
+    <string name="hint_foler_name">名前を入力してください</string>
+    <string name="info_note_enter_desktop">デスクトップに追加されました</string>
+    <string name="menu_alert">アラート</string>
+    <string name="menu_beauty">美女背景</string>
+    <string name="menu_cat">橘猫背景</string>
+    <string name="menu_chimpanzee">猩猩背景</string>
+    <string name="menu_create_folder">フォルダを作成する</string>
+    <string name="menu_delete">削除</string>
+    <string name="menu_deselect_all">選択を解除</string>
+    <string name="menu_export_text">テキストをエクスポートする</string>
+    <string name="menu_folder_change_name">フォルダ名を変更する</string>
+    <string name="menu_folder_delete">フォルダを削除する</string>
+    <string name="menu_folder_view">フォルダを表示する</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_normal">通常</string>
+    <string name="menu_font_size">文字のサイズ</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_super">特大</string>
+    <string name="menu_gray">灰猫背景</string>
+    <string name="menu_list_mode">リストモードに入る</string>
+    <string name="menu_move">フォルダに移動する</string>
+    <string name="menu_move_parent_folder">親フォルダに移動</string>
+    <string name="menu_normal_mode">リストモードを終了する</string>
+    <string name="menu_recover">恢复便签</string>
+    <string name="menu_remove_remind">リマインダーを削除する</string>
+    <string name="menu_restore">回收站</string>
+    <string name="menu_search">検索</string>
+    <string name="menu_select_all">すべて選択</string>
+    <string name="menu_select_none">選択項目がありません、操作は無効です</string>
+    <string name="menu_select_title">%d 項目が選択されました</string>
+    <string name="menu_send_to_desktop">デスクトップに送る</string>
+    <string name="menu_setting">設定</string>
+    <string name="menu_share">共有</string>
+    <string name="menu_sync">同期する</string>
+    <string name="menu_sync_cancel">同期をキャンセルする</string>
+    <string name="menu_title_select_folder">フォルダを選択する</string>
+    <string name="note_alert_expired">期限切れ</string>
+    <string name="note_link_email">メールを送信する</string>
+    <string name="note_link_other">マップを開く</string>
+    <string name="note_link_tel">電話をかける</string>
+    <string name="note_link_web">ウェブページを閲覧する</string>
+    <string name="notealert_enter">表示する</string>
+    <string name="notealert_ok">了解しました</string>
+    <string name="notelist_menu_new">新しいメモ</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">Google タスクとのメモ同期</string>
+    <string name="preferences_account_title">同期アカウント</string>
+    <string name="preferences_add_account">アカウントを追加</string>
+    <string name="preferences_bg_random_appear_title">メモ作成時の背景色をランダムに選択する</string>
+    <string name="preferences_button_sync_cancel">同期をキャンセル</string>
+    <string name="preferences_button_sync_immediately">今すぐ同期</string>
+    <string name="preferences_dialog_change_account_title">現在のアカウント：%1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">同期アカウントを変更すると、過去のアカウントの同期情報が削除され、切り替え時に重複データが発生する可能性があります</string>
+    <string name="preferences_dialog_select_account_tips">Google アカウントを選択してください。メモはこのアカウントの Google タスク内容と同期されます。</string>
+    <string name="preferences_dialog_select_account_title">メモの同期</string>
+    <string name="preferences_last_sync_time">前回の同期：%1$s</string>
+    <string name="preferences_menu_cancel">キャンセル</string>
+    <string name="preferences_menu_change_account">アカウントを変更</string>
+    <string name="preferences_menu_remove_account">アカウントを削除</string>
+    <string name="preferences_title">設定</string>
+    <string name="preferences_toast_cannot_change_account">同期中のため、同期アカウントを変更できません</string>
+    <string name="preferences_toast_success_set_accout">同期アカウントが%1$sに設定されました</string>
+    <string name="recover_list_recover">恢复</string>
+    <string name="search">メモ</string>
+    <string name="search_hint">メモを検索</string>
+    <string name="search_label">メモを検索中</string>
+    <string name="search_setting_description">メモのテキスト</string>
+    <string name="set_remind_time_message">リマインダーを設定しました</string>
+    <string name="success_sdcard_export">エクスポート成功</string>
+    <string name="success_sync_account">%1$sとの同期が成功しました</string>
+    <string name="sync_progress_init_list">サーバーのメモリストを取得しています...</string>
+    <string name="sync_progress_login">%1$sにログイン中...</string>
+    <string name="sync_progress_syncing">ローカルメモを同期しています...</string>
+    <string name="ticker_cancel">同期がキャンセルされました</string>
+    <string name="ticker_fail">同期に失敗しました</string>
+    <string name="ticker_success">同期が成功しました</string>
+    <string name="ticker_syncing">メモを同期しています...</string>
+    <string name="widget_havenot_content">関連コンテンツがありません。新しいメモを作成してください。</string>
+    <string name="widget_under_visit_mode">訪問者モードでは、メモの内容は表示されません</string>
+</resources>
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-ko-rKR/values-ko-rKR.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-ko-rKR/values-ko-rKR.xml
new file mode 100644
index 0000000..22a9bd4
--- /dev/null
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-ko-rKR/values-ko-rKR.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>문자 메시지</item>
+        <item>이메일</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other">"<ns1:g id="SEARCH">%2$s</ns1:g>"와(과) 일치하는 결과 <ns1:g id="NUMBER">%1$s</ns1:g>개</item>
+    </plurals>
+    <string name="alert_message_delete_folder">폴더와 해당 메모를 삭제하시겠습니까?</string>
+    <string name="alert_message_delete_note">이 메모를 삭제하시겠습니까?</string>
+    <string name="alert_message_delete_notes">%d개의 메모를 삭제하시겠습니까?</string>
+    <string name="alert_title_delete">삭제</string>
+    <string name="app_name">메모</string>
+    <string name="app_widget2x2">메모 2x2</string>
+    <string name="app_widget4x4">메모 4x4</string>
+    <string name="button_delete">삭제</string>
+    <string name="call_record_folder_name">통화 메모</string>
+    <string name="datetime_dialog_cancel">취소</string>
+    <string name="datetime_dialog_ok">설정</string>
+    <string name="delete_remind_time_message">알림 삭제 성공</string>
+    <string name="error_note_empty_for_clock">시계 알림을 설정하려면 비어 있지 않은 메모여야 합니다.</string>
+    <string name="error_note_empty_for_send_to_desktop">빈 메모를 바탕화면으로 보낼 수 없습니다.</string>
+    <string name="error_note_not_exist">찾을 수 없는 메모입니다.</string>
+    <string name="error_sdcard_export">텍스트 내보내기 중 오류가 발생했습니다. SD 카드를 확인해주세요.</string>
+    <string name="error_sdcard_unmounted">SD 카드가 마운트되지 않았습니다. 조작할 수 없습니다.</string>
+    <string name="error_sync_cancelled">동기화가 이미 취소되었습니다</string>
+    <string name="error_sync_internal">내부 오류로 인해 동기화에 실패했습니다</string>
+    <string name="error_sync_network">네트워크 및 계정 설정을 확인해주세요. 동기화에 실패했습니다</string>
+    <string name="failed_sdcard_export">내보내기 실패</string>
+    <string name="file_path">1</string>
+    <string name="folder_exist">폴더 %1$s은(는) 이미 존재합니다. 다시 이름을 지어주세요.</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM월dd일 kk:mm</string>
+    <string name="format_exported_file_location">텍스트 파일(%1$s)을 SD 카드(%2$s) 디렉토리로 내보냈습니다</string>
+    <string name="format_move_notes_to_folder">%1$d개의 메모를 %2$s 폴더로 이동했습니다</string>
+    <string name="hint_foler_name">이름을 입력하세요.</string>
+    <string name="info_note_enter_desktop">바탕화면에 추가되었습니다</string>
+    <string name="menu_alert">알림 설정</string>
+    <string name="menu_beauty">미녀 배경</string>
+    <string name="menu_cat">귤색 고양이 배경</string>
+    <string name="menu_chimpanzee">침팬지 배경</string>
+    <string name="menu_create_folder">새 폴더 만들기</string>
+    <string name="menu_delete">삭제</string>
+    <string name="menu_deselect_all">모두 선택 해제</string>
+    <string name="menu_export_text">텍스트 내보내기</string>
+    <string name="menu_folder_change_name">폴더 이름 변경</string>
+    <string name="menu_folder_delete">폴더 삭제</string>
+    <string name="menu_folder_view">폴더 보기</string>
+    <string name="menu_font_large">크게</string>
+    <string name="menu_font_normal">보통</string>
+    <string name="menu_font_size">글꼴 크기</string>
+    <string name="menu_font_small">작게</string>
+    <string name="menu_font_super">매우 크게</string>
+    <string name="menu_gray">회색 고양이 배경</string>
+    <string name="menu_list_mode">목록 모드로 전환</string>
+    <string name="menu_move">폴더로 이동</string>
+    <string name="menu_move_parent_folder">상위 폴더로 이동</string>
+    <string name="menu_normal_mode">일반 모드로 전환</string>
+    <string name="menu_recover">메모 복구</string>
+    <string name="menu_remove_remind">알림 삭제</string>
+    <string name="menu_restore">휴지통</string>
+    <string name="menu_search">검색</string>
+    <string name="menu_select_all">모두 선택</string>
+    <string name="menu_select_none">선택된 항목이 없습니다. 작업할 수 없습니다.</string>
+    <string name="menu_select_title">%d 항목 선택됨</string>
+    <string name="menu_send_to_desktop">바탕화면으로 보내기</string>
+    <string name="menu_setting">설정</string>
+    <string name="menu_share">공유</string>
+    <string name="menu_sync">동기화</string>
+    <string name="menu_sync_cancel">동기화 취소</string>
+    <string name="menu_title_select_folder">폴더 선택</string>
+    <string name="note_alert_expired">만료됨</string>
+    <string name="note_link_email">이메일 보내기</string>
+    <string name="note_link_other">지도 열기</string>
+    <string name="note_link_tel">전화 걸기</string>
+    <string name="note_link_web">웹페이지 열기</string>
+    <string name="notealert_enter">보기</string>
+    <string name="notealert_ok">확인</string>
+    <string name="notelist_menu_new">새 메모</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">Google 작업과 메모 기록 동기화</string>
+    <string name="preferences_account_title">계정 동기화</string>
+    <string name="preferences_add_account">계정 추가</string>
+    <string name="preferences_bg_random_appear_title">메모 배경색 랜덤</string>
+    <string name="preferences_button_sync_cancel">동기화 취소</string>
+    <string name="preferences_button_sync_immediately">즉시 동기화</string>
+    <string name="preferences_dialog_change_account_title">현재 계정: %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">동기화 계정을 변경하면 이전 계정의 동기화 정보가 삭제되며, 동시에 변경할 경우 데이터 중복을 일으킬 수 있습니다.</string>
+    <string name="preferences_dialog_select_account_tips">Google 계정을 선택하세요. 메모는 해당 계정의 Google 작업 내용과 동기화됩니다.</string>
+    <string name="preferences_dialog_select_account_title">메모 동기화</string>
+    <string name="preferences_last_sync_time">최근 동기화: %1$s</string>
+    <string name="preferences_menu_cancel">취소</string>
+    <string name="preferences_menu_change_account">계정 변경</string>
+    <string name="preferences_menu_remove_account">계정 삭제</string>
+    <string name="preferences_title">설정</string>
+    <string name="preferences_toast_cannot_change_account">동기화 진행 중입니다. 동기화 계정을 변경할 수 없습니다.</string>
+    <string name="preferences_toast_success_set_accout">동기화 계정이 %1$s(으)로 설정되었습니다.</string>
+    <string name="search">메모</string>
+    <string name="search_hint">메모 검색</string>
+    <string name="search_label">메모 검색 중</string>
+    <string name="search_setting_description">메모 내 텍스트</string>
+    <string name="set_remind_time_message">알림 생성</string>
+    <string name="success_sdcard_export">내보내기 성공</string>
+    <string name="success_sync_account">%1$s와의 동기화에 성공했습니다</string>
+    <string name="sync_progress_init_list">서버 메모 목록 가져오는 중...</string>
+    <string name="sync_progress_login">%1$s 로그인 중...</string>
+    <string name="sync_progress_syncing">로컬 메모 동기화 중...</string>
+    <string name="ticker_cancel">동기화가 취소되었습니다</string>
+    <string name="ticker_fail">동기화 실패</string>
+    <string name="ticker_success">동기화 성공</string>
+    <string name="ticker_syncing">메모 동기화 중...</string>
+    <string name="widget_havenot_content">연관된 내용이 없습니다. 새 메모를 클릭하세요.</string>
+    <string name="widget_under_visit_mode">게스트 모드에서는 메모 내용이 표시되지 않습니다.</string>
+</resources>
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
new file mode 100644
index 0000000..d381da3
--- /dev/null
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>邮件</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 条符合“<ns1:g id="SEARCH">%2$s</ns1:g>”的搜索结果</item>
+    </plurals>
+    <string name="alert_message_delete_folder">确认删除文件夹及所包含的便签吗？</string>
+    <string name="alert_message_delete_note">确认要删除该条便签吗?</string>
+    <string name="alert_message_delete_notes">确认要删除所选的 %d 条便签吗?</string>
+    <string name="alert_title_delete">删除</string>
+    <string name="app_name">便签</string>
+    <string name="app_widget2x2">便签2x2</string>
+    <string name="app_widget4x4">便签4x4</string>
+    <string name="button_delete">删除</string>
+    <string name="call_record_folder_name">通话便签</string>
+    <string name="datetime_dialog_cancel">取消</string>
+    <string name="datetime_dialog_ok">设置</string>
+    <string name="delete_remind_time_message">成功删除提醒</string>
+    <string name="error_note_empty_for_clock">不能为空便签设置闹钟提醒</string>
+    <string name="error_note_empty_for_send_to_desktop">不能将空便签发送到桌面</string>
+    <string name="error_note_not_exist">要查看的便签不存在</string>
+    <string name="error_sdcard_export">导出文本时发生错误，请检查SD卡</string>
+    <string name="error_sdcard_unmounted">SD卡被占用，不能操作</string>
+    <string name="error_sync_cancelled">同步已取消</string>
+    <string name="error_sync_internal">同步失败，发生内部错误</string>
+    <string name="error_sync_network">同步失败，请检查网络和帐号设置</string>
+    <string name="failed_sdcard_export">导出失败</string>
+    <string name="file_path">1</string>
+    <string name="folder_exist">文件夹 %1$s 已存在，请重新命名</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="format_exported_file_location">已将文本文件(%1$s)输出至SD卡(%2$s)目录</string>
+    <string name="format_move_notes_to_folder">已将所选 %1$d 条便签移到 %2$s 文件夹</string>
+    <string name="hint_foler_name">请输入名称</string>
+    <string name="info_note_enter_desktop">已添加到桌面</string>
+    <string name="menu_alert">提醒我</string>
+    <string name="menu_beauty">美女背景</string>
+    <string name="menu_cat">橘猫背景</string>
+    <string name="menu_chimpanzee">猩猩背景</string>
+    <string name="menu_create_folder">新建文件夹</string>
+    <string name="menu_delete">删除</string>
+    <string name="menu_deselect_all">取消全选</string>
+    <string name="menu_export_text">导出文本</string>
+    <string name="menu_folder_change_name">修改文件夹名称</string>
+    <string name="menu_folder_delete">刪除文件夹</string>
+    <string name="menu_folder_view">查看文件夹</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_normal">正常</string>
+    <string name="menu_font_size">文字大小</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_super">超大</string>
+    <string name="menu_gray">灰猫背景</string>
+    <string name="menu_list_mode">进入清单模式</string>
+    <string name="menu_move">移动到文件夹</string>
+    <string name="menu_move_parent_folder">上一级文件夹</string>
+    <string name="menu_normal_mode">退出清单模式</string>
+    <string name="menu_recover">恢复便签</string>
+    <string name="menu_remove_remind">删除提醒</string>
+    <string name="menu_restore">回收站</string>
+    <string name="menu_search">搜索</string>
+    <string name="menu_select_all">全选</string>
+    <string name="menu_select_none">没有选中项，操作无效</string>
+    <string name="menu_select_title">选中了 %d 项</string>
+    <string name="menu_send_to_desktop">发送到桌面</string>
+    <string name="menu_setting">设置</string>
+    <string name="menu_share">分享</string>
+    <string name="menu_sync">同步</string>
+    <string name="menu_sync_cancel">取消同步</string>
+    <string name="menu_title_select_folder">选择文件夹</string>
+    <string name="note_alert_expired">已过期</string>
+    <string name="note_link_email">发送邮件</string>
+    <string name="note_link_other">打开地图</string>
+    <string name="note_link_tel">呼叫电话</string>
+    <string name="note_link_web">浏览网页</string>
+    <string name="notealert_enter">查看</string>
+    <string name="notealert_ok">知道了</string>
+    <string name="notelist_menu_new">新建便签</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">与google task同步便签记录</string>
+    <string name="preferences_account_title">同步账号</string>
+    <string name="preferences_add_account">添加账号</string>
+    <string name="preferences_bg_random_appear_title">新建便签背景颜色随机</string>
+    <string name="preferences_button_sync_cancel">取消同步</string>
+    <string name="preferences_button_sync_immediately">立即同步</string>
+    <string name="preferences_dialog_change_account_title">当前帐号 %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">如更换同步帐号，过去的帐号同步信息将被清空，再次切换的同时可能会造成数据重复</string>
+    <string name="preferences_dialog_select_account_tips">请选择google帐号，便签将与该帐号的google task内容同步。</string>
+    <string name="preferences_dialog_select_account_title">同步便签</string>
+    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
+    <string name="preferences_menu_cancel">取消</string>
+    <string name="preferences_menu_change_account">更换账号</string>
+    <string name="preferences_menu_remove_account">删除账号</string>
+    <string name="preferences_title">设置</string>
+    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帐号</string>
+    <string name="preferences_toast_success_set_accout">同步帐号已设置为%1$s</string>
+    <string name="search">便签</string>
+    <string name="search_hint">搜索便签</string>
+    <string name="search_label">正在搜索便签</string>
+    <string name="search_setting_description">便签中的文字</string>
+    <string name="set_remind_time_message">创建提醒</string>
+    <string name="success_sdcard_export">导出成功</string>
+    <string name="success_sync_account">与%1$s同步成功</string>
+    <string name="sync_progress_init_list">正在获取服务器便签列表...</string>
+    <string name="sync_progress_login">登录%1$s...</string>
+    <string name="sync_progress_syncing">正在同步本地便签...</string>
+    <string name="ticker_cancel">同步已取消</string>
+    <string name="ticker_fail">同步失败</string>
+    <string name="ticker_success">同步成功</string>
+    <string name="ticker_syncing">同步便签...</string>
+    <string name="widget_havenot_content">没有关联内容，点击新建便签。</string>
+    <string name="widget_under_visit_mode">访客模式下，便签内容不可见</string>
+</resources>
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
new file mode 100644
index 0000000..d81d85e
--- /dev/null
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="menu_share_ways">
+        <item>短信</item>
+        <item>郵件</item>
+    </string-array>
+    <plurals name="search_results_title">
+        <item quantity="other"><ns1:g id="NUMBER">%1$s</ns1:g> 條符合”<ns1:g id="SEARCH">%2$s</ns1:g>“的搜尋結果</item>
+    </plurals>
+    <string name="alert_message_delete_folder">確認刪除檔夾及所包含的便簽嗎？</string>
+    <string name="alert_message_delete_note">确认要删除該條便籤嗎?</string>
+    <string name="alert_message_delete_notes">确认要刪除所選的 %d 條便籤嗎?</string>
+    <string name="alert_title_delete">刪除</string>
+    <string name="app_name">便簽</string>
+    <string name="app_widget2x2">便簽2x2</string>
+    <string name="app_widget4x4">便簽4x4</string>
+    <string name="button_delete">刪除</string>
+    <string name="call_record_folder_name">通話便籤</string>
+    <string name="datetime_dialog_cancel">取消</string>
+    <string name="datetime_dialog_ok">設置</string>
+    <string name="delete_remind_time_message">成功刪除提醒</string>
+    <string name="error_note_empty_for_clock">不能爲空便籤設置鬧鐘提醒</string>
+    <string name="error_note_empty_for_send_to_desktop">不能將空便籤發送到桌面</string>
+    <string name="error_note_not_exist">要查看的便籤不存在</string>
+    <string name="error_sdcard_export">導出TXT時發生錯誤，請檢查SD卡</string>
+    <string name="error_sdcard_unmounted">SD卡被佔用，不能操作</string>
+    <string name="error_sync_cancelled">同步已取消</string>
+    <string name="error_sync_internal">同步失敗，發生內部錯誤</string>
+    <string name="error_sync_network">同步失敗，請檢查網絡和帳號設置</string>
+    <string name="failed_sdcard_export">導出失敗</string>
+    <string name="folder_exist">文件夾 %1$s 已存在，請重新命名</string>
+    <string name="format_date_ymd">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MM月dd日 kk:mm</string>
+    <string name="format_exported_file_location">已將文本文件(%1$s)導出至SD(%2$s)目錄</string>
+    <string name="format_move_notes_to_folder">已將所選 %1$d 便籤移到 %2$s 文件夾</string>
+    <string name="hint_foler_name">請輸入名稱</string>
+    <string name="info_note_enter_desktop">已添加到桌面</string>
+    <string name="menu_alert">提醒我</string>
+    <string name="menu_beauty">美女背景</string>
+    <string name="menu_cat">橘猫背景</string>
+    <string name="menu_chimpanzee">猩猩背景</string>
+    <string name="menu_create_folder">新建文件夾</string>
+    <string name="menu_delete">刪除</string>
+    <string name="menu_deselect_all">取消全選</string>
+    <string name="menu_export_text">導出文本</string>
+    <string name="menu_folder_change_name">修改文件夾名稱</string>
+    <string name="menu_folder_delete">刪除文件夾</string>
+    <string name="menu_folder_view">查看文件夾</string>
+    <string name="menu_font_large">大</string>
+    <string name="menu_font_normal">正常</string>
+    <string name="menu_font_size">文字大小</string>
+    <string name="menu_font_small">小</string>
+    <string name="menu_font_super">超大</string>
+    <string name="menu_gray">灰猫背景</string>
+    <string name="menu_list_mode">進入清單模式</string>
+    <string name="menu_move">移動到文件夾</string>
+    <string name="menu_move_parent_folder">上一級文件夾</string>
+    <string name="menu_normal_mode">退出清單模式</string>
+    <string name="menu_recover">恢复便签</string>
+    <string name="menu_remove_remind">刪除提醒</string>
+    <string name="menu_restore">回收站</string>
+    <string name="menu_search">搜尋</string>
+    <string name="menu_select_all">全選</string>
+    <string name="menu_select_none">沒有選中項，操作無效</string>
+    <string name="menu_select_title">選中了 %d 項</string>
+    <string name="menu_send_to_desktop">發送到桌面</string>
+    <string name="menu_setting">設置</string>
+    <string name="menu_share">分享</string>
+    <string name="menu_sync">同步</string>
+    <string name="menu_sync_cancel">取消同步</string>
+    <string name="menu_title_select_folder">選擇文件夾</string>
+    <string name="note_alert_expired">已過期</string>
+    <string name="note_link_email">發送郵件</string>
+    <string name="note_link_other">打開地圖</string>
+    <string name="note_link_tel">呼叫電話</string>
+    <string name="note_link_web">浏覽網頁</string>
+    <string name="notealert_enter">查看</string>
+    <string name="notealert_ok">知道了</string>
+    <string name="notelist_menu_new">新建便簽</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">与google task同步便簽記錄</string>
+    <string name="preferences_account_title">同步賬號</string>
+    <string name="preferences_add_account">添加賬號</string>
+    <string name="preferences_bg_random_appear_title">新建便籤背景顏色隨機</string>
+    <string name="preferences_button_sync_cancel">取消同步</string>
+    <string name="preferences_button_sync_immediately">立即同步</string>
+    <string name="preferences_dialog_change_account_title">當前帳號 %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">如更換同步帳號，過去的帳號同步信息將被清空，再次切換的同時可能會造成數據重復</string>
+    <string name="preferences_dialog_select_account_tips">請選擇google帳號，便簽將與該帳號的google task內容同步。</string>
+    <string name="preferences_dialog_select_account_title">同步便簽</string>
+    <string name="preferences_last_sync_time">上次同步于 %1$s</string>
+    <string name="preferences_menu_cancel">取消</string>
+    <string name="preferences_menu_change_account">更換賬號</string>
+    <string name="preferences_menu_remove_account">刪除賬號</string>
+    <string name="preferences_title">設置</string>
+    <string name="preferences_toast_cannot_change_account">正在同步中，不能修改同步帳號</string>
+    <string name="preferences_toast_success_set_accout">同步帳號已設置為%1$s</string>
+    <string name="recover_list_recover">恢复</string>
+    <string name="search">便籤</string>
+    <string name="search_hint">搜索便籤</string>
+    <string name="search_label">正在搜索便籤</string>
+    <string name="search_setting_description">便籤中的文字</string>
+    <string name="set_remind_time_message">創建提醒</string>
+    <string name="success_sdcard_export">導出成功</string>
+    <string name="success_sync_account">與%1$s同步成功</string>
+    <string name="sync_progress_init_list">正在獲取服務器便籤列表...</string>
+    <string name="sync_progress_login">登陸%1$s...</string>
+    <string name="sync_progress_syncing">正在同步本地便籤...</string>
+    <string name="ticker_cancel">同步已取消</string>
+    <string name="ticker_fail">同步失敗</string>
+    <string name="ticker_success">同步成功</string>
+    <string name="ticker_syncing">同步便簽...</string>
+    <string name="widget_havenot_content">沒有關聯內容，點擊新建便簽。</string>
+    <string name="widget_under_visit_mode">訪客模式下，便籤內容不可見</string>
+</resources>
\ No newline at end of file
diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
new file mode 100644
index 0000000..9367dda
--- /dev/null
+++ b/src/Notes-master3/app/build/intermediates/incremental/debug/packageDebugResources/merged.dir/values/values.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:ns1="urn:oasis:names:tc:xliff:document:1.2">
+    <string-array name="format_for_exported_note">
+        <item>-%s</item>      
+        <item>--%s</item>     
+        <item>--%s</item>     
+        <item>--%s</item>     
+    </string-array>
+    <string-array name="menu_share_ways">
+        <item>Messaging</item>
+        <item>Email</item>
+    </string-array>
+    <color name="user_query_highlight">#335b5b5b</color>
+    <dimen name="text_font_size_large">26sp</dimen>
+    <dimen name="text_font_size_medium">20sp</dimen>
+    <dimen name="text_font_size_normal">17sp</dimen>
+    <dimen name="text_font_size_small">14sp</dimen>
+    <dimen name="text_font_size_super">33sp</dimen>
+    <plurals name="search_results_title">
+         <item quantity="one"><ns1:g example="1" id="number">%1$s</ns1:g> result for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
+        
+        <item quantity="other"><ns1:g example="15" id="number">%1$s</ns1:g> results for \"<ns1:g example="???" id="search">%2$s</ns1:g>\"</item>
+    </plurals>
+    <string name="alert_message_delete_folder">Confirm to delete folder and its notes?</string>
+    <string name="alert_message_delete_note">Confirm to delete this note?</string>
+    <string name="alert_message_delete_notes">Confirm to delete the selected %d notes?</string>
+    <string name="alert_title_delete">Delete selected notes</string>
+    <string name="app_name">Notes</string>
+    <string name="app_widget2x2">Notes 2x2</string>
+    <string name="app_widget4x4">Notes 4x4</string>
+    <string name="button_delete">Delete</string>
+    <string name="call_record_folder_name">Call notes</string>
+    <string name="datetime_dialog_cancel">cancel</string>
+    <string name="datetime_dialog_ok">set</string>
+    <string name="delete_remind_time_message">Delete reminder successfully</string>
+    <string name="error_note_empty_for_clock">Sorry, can not set clock on empty note</string>
+    <string name="error_note_empty_for_send_to_desktop">Sorry, can not send and empty note to home</string>
+    <string name="error_note_not_exist">The note is not exist</string>
+    <string name="error_sdcard_export">Export failed, please check SD card</string>
+    <string name="error_sdcard_unmounted">SD card busy, not available now</string>
+    <string name="error_sync_cancelled">Sync is canceled</string>
+    <string name="error_sync_internal">Sync failed, internal error occurs</string>
+    <string name="error_sync_network">Sync failed, please check network and account settings</string>
+    <string name="failed_sdcard_export">Export fail</string>
+    <string name="file_name_txt_format">notes_%s.txt</string>
+    <string name="file_path">/MIUI/notes/</string>
+    <string name="folder_exist">The folder %1$s exist, please rename</string>
+    <string name="format_date_ymd" translatable="false">yyyyMMdd</string>
+    <string name="format_datetime_mdhm">MMMd kk:mm</string>
+    <string name="format_exported_file_location">Export text file (%1$s) to SD (%2$s) directory</string>
+    <string name="format_folder_files_count">(%d)</string>
+    <string name="format_move_notes_to_folder">Have moved selected %1$d notes to %2$s folder</string>
+    <string name="hint_foler_name">Input name</string>
+    <string name="info_note_enter_desktop">Note added to home</string>
+    <string name="menu_alert">Remind me</string>
+    <string name="menu_beauty">background:beauty</string>
+    <string name="menu_cat">background:cat</string>
+    <string name="menu_chimpanzee">background:chimpanzee</string>
+    <string name="menu_create_folder">New Folder</string>
+    <string name="menu_delete">Delete</string>
+    <string name="menu_deselect_all">Deselect all</string>
+    <string name="menu_export_text">Export text</string>
+    <string name="menu_folder_change_name">Change folder name</string>
+    <string name="menu_folder_delete">Delete folder</string>
+    <string name="menu_folder_view">View folder</string>
+    <string name="menu_font_large">Large</string>
+    <string name="menu_font_normal">Medium</string>
+    <string name="menu_font_size">Font size</string>
+    <string name="menu_font_small">Small</string>
+    <string name="menu_font_super">Super</string>
+    <string name="menu_gray">background:gray</string>
+    <string name="menu_list_mode">Enter check list</string>
+    <string name="menu_move">Move to folder</string>
+    <string name="menu_move_parent_folder">Parent folder</string>
+    <string name="menu_normal_mode">Leave check list</string>
+    <string name="menu_recover">recover</string>
+    <string name="menu_remove_remind">Delete reminder</string>
+    <string name="menu_restore">trash</string>
+    <string name="menu_search">Search</string>
+    <string name="menu_select_all">Select all</string>
+    <string name="menu_select_none">Nothing selected, the operation is invalid</string>
+    <string name="menu_select_title">%d selected</string>
+    <string name="menu_send_to_desktop">Send to home</string>
+    <string name="menu_setting">Settings</string>
+    <string name="menu_share">Share</string>
+    <string name="menu_sync">Sync</string>
+    <string name="menu_sync_cancel">Cancel syncing</string>
+    <string name="menu_title_select_folder">Select folder</string>
+    <string name="note_alert_expired">Expired</string>
+    <string name="note_link_email">Send email</string>
+    <string name="note_link_other">Open map</string>
+    <string name="note_link_tel">Call</string>
+    <string name="note_link_web">Browse web</string>
+    <string name="notealert_enter">Take a look</string>
+    <string name="notealert_ok">Got it</string>
+    <string name="notelist_menu_new">Add note</string>
+    <string name="notelist_string_info">...</string>
+    <string name="preferences_account_summary">Sync notes with google task</string>
+    <string name="preferences_account_title">Sync account</string>
+    <string name="preferences_add_account">Add account</string>
+    <string name="preferences_bg_random_appear_title">New note background color random</string>
+    <string name="preferences_button_sync_cancel">Cancel syncing</string>
+    <string name="preferences_button_sync_immediately">Sync immediately</string>
+    <string name="preferences_dialog_change_account_title">Current account %1$s</string>
+    <string name="preferences_dialog_change_account_warn_msg">All sync related information will be deleted, which may result in duplicated items sometime</string>
+    <string name="preferences_dialog_select_account_tips">Please select a google account. Local notes will be synced with google task.</string>
+    <string name="preferences_dialog_select_account_title">Sync notes</string>
+    <string name="preferences_last_sync_time">Last sync time %1$s</string>
+    <string name="preferences_last_sync_time_format">yyyy-MM-dd hh:mm:ss</string>
+    <string name="preferences_menu_cancel">Cancel</string>
+    <string name="preferences_menu_change_account">Change sync account</string>
+    <string name="preferences_menu_remove_account">Remove sync account</string>
+    <string name="preferences_title">Settings</string>
+    <string name="preferences_toast_cannot_change_account">Cannot change the account because sync is in progress</string>
+    <string name="preferences_toast_success_set_accout">%1$s has been set as the sync account</string>
+    <string name="search">Notes</string>
+    <string name="search_hint">Search notes</string>
+    <string name="search_label">Searching Notes</string>
+    <string name="search_setting_description">Text in your notes</string>
+    <string name="set_remind_time_message">Set reminder</string>
+    <string name="success_sdcard_export">Export successful</string>
+    <string name="success_sync_account">Sync is successful with account %1$s</string>
+    <string name="sync_progress_init_list">Getting remote note list...</string>
+    <string name="sync_progress_login">Logging into %1$s...</string>
+    <string name="sync_progress_syncing">Synchronize local notes with Google Task...</string>
+    <string name="ticker_cancel">Sync is canceled</string>
+    <string name="ticker_fail">Sync is failed</string>
+    <string name="ticker_success">Sync is successful</string>
+    <string name="ticker_syncing">Syncing notes...</string>
+    <string name="widget_havenot_content">No associated note found, click to create associated note.</string>
+    <string name="widget_under_visit_mode">Privacy mode，can not see note content</string>
+    <style name="HighlightTextAppearancePrimary">
+    <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@color/primary_text_dark</item>
+    </style>
+    <style name="HighlightTextAppearanceSecondary">
+        <item name="android:textSize">@dimen/text_font_size_small</item>
+        <item name="android:textColor">@color/secondary_text_dark</item>
+    </style>
+    <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
+        <item name="android:displayOptions"/>
+        <item name="android:visibility">visible</item>
+    </style>
+    <style name="NoteTheme" parent="@android:style/Theme.Holo.Light">
+        <item name="android:actionBarStyle">@style/NoteActionBarStyle</item>
+    </style>
+    <style name="TextAppearanceLarge">
+        <item name="android:textSize">@dimen/text_font_size_large</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceMedium">
+        <item name="android:textSize">@dimen/text_font_size_medium</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceNormal">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearancePrimaryItem">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@color/primary_text_dark</item>
+    </style>
+    <style name="TextAppearanceSecondaryItem">
+        <item name="android:textSize">@dimen/text_font_size_small</item>
+        <item name="android:textColor">@color/secondary_text_dark</item>
+    </style>
+    <style name="TextAppearanceSuper">
+        <item name="android:textSize">@dimen/text_font_size_super</item>
+        <item name="android:textColorLink">#0000ff</item>
+    </style>
+    <style name="TextAppearanceUnderMenuIcon">
+        <item name="android:textSize">@dimen/text_font_size_normal</item>
+        <item name="android:textColor">@android:color/black</item>
+    </style>
+</resources>
\ No newline at end of file