diff --git a/src/Notes-master/.idea/misc.xml b/src/Notes-master/.idea/misc.xml index 639900d..6e86672 100644 --- a/src/Notes-master/.idea/misc.xml +++ b/src/Notes-master/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/src/Notes-master/.idea/sonarlint/issuestore/8/a/8aaddc41c246602ddc646cb7c12994ad82f7a4bc b/src/Notes-master/.idea/sonarlint/issuestore/8/a/8aaddc41c246602ddc646cb7c12994ad82f7a4bc new file mode 100644 index 0000000..24d7705 --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/8/a/8aaddc41c246602ddc646cb7c12994ad82f7a4bc @@ -0,0 +1,44 @@ + +p +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥 +Z +java:S6208"CMerge the previous cases into this one using comma-separated label.( +g +java:S1301"KReplace this "switch" statement by "if" statements to increase readability.(ד +7 +java:S1116`"Remove this empty statement.( +a +java:S1124"EReorder the modifiers to comply with the Java Language Specification.( +[ +java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ѿk +n +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.( +2 +java:S3626"Remove this redundant jump.(݅ +2 +java:S3626"Remove this redundant jump.(݅ +2 +java:S3626"Remove this redundant jump.(݅ +F +java:S2093"*Change this "try" to a try-with-resources.( +o +java:S1450"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.( +8 +java:S1116"Remove this empty statement.( +i +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.( +? java:S108")Either remove or fill this block of code.(ʥ +h +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(# +^ +java:S1126"BReplace this if-then-else statement by a single method invocation.(玒 +h +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b +G +java:S3398"0Move this method into "OnListItemClickListener".( +A +java:S3398"%Move this method into "ModeCallback".( +< +java:S3398"%Move this method into "ModeCallback".( +K +java:S3398"/Move this method into "BackgroundQueryHandler".( \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/issuestore/index.pb b/src/Notes-master/.idea/sonarlint/issuestore/index.pb new file mode 100644 index 0000000..d54c96a --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/issuestore/index.pb @@ -0,0 +1,3 @@ + +^ +.src/net/micode/notes/ui/NotesListActivity.java,8\a\8aaddc41c246602ddc646cb7c12994ad82f7a4bc \ No newline at end of file diff --git a/src/Notes-master/.idea/sonarlint/securityhotspotstore/8/a/8aaddc41c246602ddc646cb7c12994ad82f7a4bc b/src/Notes-master/.idea/sonarlint/securityhotspotstore/8/a/8aaddc41c246602ddc646cb7c12994ad82f7a4bc new file mode 100644 index 0000000..e69de29 diff --git a/src/Notes-master/.idea/sonarlint/securityhotspotstore/index.pb b/src/Notes-master/.idea/sonarlint/securityhotspotstore/index.pb new file mode 100644 index 0000000..d54c96a --- /dev/null +++ b/src/Notes-master/.idea/sonarlint/securityhotspotstore/index.pb @@ -0,0 +1,3 @@ + +^ +.src/net/micode/notes/ui/NotesListActivity.java,8\a\8aaddc41c246602ddc646cb7c12994ad82f7a4bc \ No newline at end of file diff --git a/src/Notes-master/.idea/vcs.xml b/src/Notes-master/.idea/vcs.xml new file mode 100644 index 0000000..c8ade07 --- /dev/null +++ b/src/Notes-master/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Notes-master/Notes-master.iml b/src/Notes-master/Notes-master.iml index c90834f..c9bcc5c 100644 --- a/src/Notes-master/Notes-master.iml +++ b/src/Notes-master/Notes-master.iml @@ -8,4 +8,7 @@ + + \ No newline at end of file diff --git a/src/Notes-master3/.gradle/8.0/executionHistory/executionHistory.bin b/src/Notes-master3/.gradle/8.0/executionHistory/executionHistory.bin index 9a4ddfe..7b5aa4f 100644 Binary files a/src/Notes-master3/.gradle/8.0/executionHistory/executionHistory.bin and b/src/Notes-master3/.gradle/8.0/executionHistory/executionHistory.bin differ diff --git a/src/Notes-master3/.gradle/8.0/executionHistory/executionHistory.lock b/src/Notes-master3/.gradle/8.0/executionHistory/executionHistory.lock index 2b9f615..1603136 100644 Binary files a/src/Notes-master3/.gradle/8.0/executionHistory/executionHistory.lock and b/src/Notes-master3/.gradle/8.0/executionHistory/executionHistory.lock differ diff --git a/src/Notes-master3/.gradle/8.0/fileHashes/fileHashes.bin b/src/Notes-master3/.gradle/8.0/fileHashes/fileHashes.bin index 2d3b3b8..b76cd22 100644 Binary files a/src/Notes-master3/.gradle/8.0/fileHashes/fileHashes.bin and b/src/Notes-master3/.gradle/8.0/fileHashes/fileHashes.bin differ diff --git a/src/Notes-master3/.gradle/8.0/fileHashes/fileHashes.lock b/src/Notes-master3/.gradle/8.0/fileHashes/fileHashes.lock index cf71774..cbfd202 100644 Binary files a/src/Notes-master3/.gradle/8.0/fileHashes/fileHashes.lock and b/src/Notes-master3/.gradle/8.0/fileHashes/fileHashes.lock differ diff --git a/src/Notes-master3/.gradle/8.0/fileHashes/resourceHashesCache.bin b/src/Notes-master3/.gradle/8.0/fileHashes/resourceHashesCache.bin index e55b985..a4c4293 100644 Binary files a/src/Notes-master3/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/src/Notes-master3/.gradle/8.0/fileHashes/resourceHashesCache.bin differ diff --git a/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 727cdb2..9e0ef5b 100644 Binary files a/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/src/Notes-master3/.gradle/file-system.probe b/src/Notes-master3/.gradle/file-system.probe index beaec80..a244f89 100644 Binary files a/src/Notes-master3/.gradle/file-system.probe and b/src/Notes-master3/.gradle/file-system.probe differ diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a b/src/Notes-master3/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a new file mode 100644 index 0000000..69f4968 --- /dev/null +++ b/src/Notes-master3/.idea/sonarlint/issuestore/2/8/283f16cc23da56ca65616082bc810304d3511d0a @@ -0,0 +1,39 @@ + +t +java:S22930"YReplace the type specification in this constructor call with the diamond operator ("<>").(ə +o +java:S2293]"YReplace the type specification in this constructor call with the diamond operator ("<>").( +o +java:S2293m"YReplace the type specification in this constructor call with the diamond operator ("<>").(Ȫ +J +java:S1066U"/Merge this if statement with the enclosing one.(ڧ + +java:S1319\"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( + +java:S1319l"mThe return type of this method should be an interface such as "Set" rather than the implementation "HashSet".( +j +java:S1104*"TMake widgetId a static final constant or non-public and provide accessors if needed.(ǎ +q +java:S1104+"VMake widgetType a static final constant or non-public and provide accessors if needed.(漬 +C +java:S5411_"(Use a primitive boolean expression here.(ɯ +C +java:S5411o"(Use a primitive boolean expression here.(ɯ +D +java:S5411"(Use a primitive boolean expression here.( +7 +java:S1116,"Remove this empty statement.( +D +java:S1874/".Remove this use of ""; it is deprecated.( +J +java:S2864^"4Iterate over the "entrySet" instead of the "keySet".(਷ +B +java:S1125_"'Remove the unnecessary boolean literal.(ɯ +J +java:S2864n"4Iterate over the "entrySet" instead of the "keySet".(਷ +B +java:S1125o"'Remove the unnecessary boolean literal.(ɯ +A +java:S1168|"+Return an empty collection instead of null.( +C +java:S1125"'Remove the unnecessary boolean literal.( \ No newline at end of file diff --git a/src/Notes-master3/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 b/src/Notes-master3/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 new file mode 100644 index 0000000..64188e9 --- /dev/null +++ b/src/Notes-master3/.idea/sonarlint/issuestore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 @@ -0,0 +1,87 @@ + +w +java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(艥8Э1 +E +java:S1604"(Make this anonymous inner class a lambda(̺V81 +F +java:S1604"(Make this anonymous inner class a lambda(ά81 +F +java:S1604"(Make this anonymous inner class a lambda(ܴ81 +K +java:S1604"(Make this anonymous inner class a lambda(8Э1 +F +java:S1604"(Make this anonymous inner class a lambda(8Э1 +F +java:S1604"(Make this anonymous inner class a lambda(۱8Э1 +F +java:S1604"(Make this anonymous inner class a lambda(ά8Э1 +> +java:S1116c"Remove this empty statement.(8ِ1 +h +java:S1124"EReorder the modifiers to comply with the Java Language Specification.(8ِ1 +b +java:S1124"EReorder the modifiers to comply with the Java Language Specification.(Ѿk8ڐ1 +u +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed.(8ې1 +9 +java:S3626"Remove this redundant jump.(݅8ې1 +9 +java:S3626"Remove this redundant jump.(݅8ې1 +9 +java:S3626"Remove this redundant jump.(݅8ې1 +W +java:S1874"9Remove this use of "PreferenceManager"; it is deprecated.(­8ې1 +a +java:S1874"CRemove this use of "getDefaultSharedPreferences"; it is deprecated.(­8ې1 +M +java:S2093"*Change this "try" to a try-with-resources.(8ݐ1 +v +java:S1450"XRemove the "mMoveMenu" field and declare it as a local variable in the relevant methods.(81 +u +java:S3252"RUse static access with "android.widget.AbsListView" for "MultiChoiceModeListener".(81 +\ +java:S1874"9Remove this use of "getDefaultDisplay"; it is deprecated.(ĸ8搩1 +T +java:S1874"1Remove this use of "getHeight"; it is deprecated.(8搩1 +? +java:S1116"Remove this empty statement.(8琩1 +p +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 20 to the 15 allowed.(8됩1 +J +java:S1874".Remove this use of ""; it is deprecated.(?8됩1 +Y java:S125""; it is deprecated.(Ч8Э1 +m +java:S1874"JDon't override a deprecated method or explicitly mark it as "@Deprecated".(ች8Э1 +R +java:S1874"/Remove this use of "execute"; it is deprecated.(嫏8Э1 +o +java:S3776"RRefactor this method to reduce its Cognitive Complexity from 18 to the 15 allowed.(b8Э1 +N +java:S3398"0Move this method into "OnListItemClickListener".(8ѭ1 +C +java:S3398"%Move this method into "ModeCallback".(81 +H +java:S3398"%Move this method into "ModeCallback".(8ѭ1 +R +java:S3398"/Move this method into "BackgroundQueryHandler".(81 +D +java:S1068S"(Remove this unused "mode" private field.(L81 \ No newline at end of file diff --git a/src/Notes-master3/.idea/sonarlint/securityhotspotstore/2/8/283f16cc23da56ca65616082bc810304d3511d0a b/src/Notes-master3/.idea/sonarlint/securityhotspotstore/2/8/283f16cc23da56ca65616082bc810304d3511d0a new file mode 100644 index 0000000..e69de29 diff --git a/src/Notes-master3/.idea/sonarlint/securityhotspotstore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 b/src/Notes-master3/.idea/sonarlint/securityhotspotstore/a/d/ad72331a1bed265bb9c0fe838faa74dbf69fce32 new file mode 100644 index 0000000..e69de29 diff --git a/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk b/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk index a99b18b..43c1983 100644 Binary files a/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk and b/src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk differ diff --git a/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar b/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar index b894c6e..eac920c 100644 Binary files a/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar and b/src/Notes-master3/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar differ diff --git a/src/Notes-master3/app/build/intermediates/compile_app_classes_jar/debug/classes.jar b/src/Notes-master3/app/build/intermediates/compile_app_classes_jar/debug/classes.jar index f29b9f7..47cd1cc 100644 Binary files a/src/Notes-master3/app/build/intermediates/compile_app_classes_jar/debug/classes.jar and b/src/Notes-master3/app/build/intermediates/compile_app_classes_jar/debug/classes.jar differ diff --git a/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex b/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex index 934bbb5..d9fc15c 100644 Binary files a/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex and b/src/Notes-master3/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex differ diff --git a/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out b/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out index bd4094b..7cbe9f9 100644 Binary files a/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out and b/src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out differ diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties index 8aef560..03d0083 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties +++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties @@ -1,4 +1,4 @@ -#Wed Jan 03 17:30:27 GMT+08:00 2024 +#Wed Jan 03 18:03:07 GMT+08:00 2024 net.micode.notes.app-main-6\:/color/primary_text_dark.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_primary_text_dark.xml.flat net.micode.notes.app-main-6\:/color/secondary_text_dark.xml=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\color_secondary_text_dark.xml.flat net.micode.notes.app-main-6\:/drawable-hdpi/bg_btn_set_color.png=E\:\\_Ufo\\0SE\\GitProject\\MicodeNotes\\src\\Notes-master3\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_bg_btn_set_color.png.flat 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 index 4b37728..e5601c7 100644 --- 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 @@ -53,6 +53,7 @@ 親フォルダに移動 リストモードを終了する リマインダーを削除する + 回收站 検索 すべて選択 選択項目がありません、操作は無効です 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..b99c241 --- /dev/null +++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rCN/values-zh-rCN.xml @@ -0,0 +1,109 @@ + + + + 短信 + 邮件 + + + %1$s 条符合“%2$s”的搜索结果 + + 确认删除文件夹及所包含的便签吗? + 确认要删除该条便签吗? + 确认要删除所选的 %d 条便签吗? + 删除 + 便签 + 便签2x2 + 便签4x4 + 删除 + 通话便签 + 取消 + 设置 + 成功删除提醒 + 不能为空便签设置闹钟提醒 + 不能将空便签发送到桌面 + 要查看的便签不存在 + 导出文本时发生错误,请检查SD卡 + SD卡被占用,不能操作 + 同步已取消 + 同步失败,发生内部错误 + 同步失败,请检查网络和帐号设置 + 导出失败 + 文件夹 %1$s 已存在,请重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已将文本文件(%1$s)输出至SD卡(%2$s)目录 + 已将所选 %1$d 条便签移到 %2$s 文件夹 + 请输入名称 + 已添加到桌面 + 提醒我 + 新建文件夹 + 删除 + 取消全选 + 导出文本 + 修改文件夹名称 + 刪除文件夹 + 查看文件夹 + + 正常 + 文字大小 + + 超大 + 进入清单模式 + 移动到文件夹 + 上一级文件夹 + 退出清单模式 + 删除提醒 + 回收站 + 搜索 + 全选 + 没有选中项,操作无效 + 选中了 %d 项 + 发送到桌面 + 设置 + 分享 + 同步 + 取消同步 + 选择文件夹 + 已过期 + 发送邮件 + 打开地图 + 呼叫电话 + 浏览网页 + 查看 + 知道了 + 新建便签 + ... + 与google task同步便签记录 + 同步账号 + 添加账号 + 新建便签背景颜色随机 + 取消同步 + 立即同步 + 当前帐号 %1$s + 如更换同步帐号,过去的帐号同步信息将被清空,再次切换的同时可能会造成数据重复 + 请选择google帐号,便签将与该帐号的google task内容同步。 + 同步便签 + 上次同步于 %1$s + 取消 + 更换账号 + 删除账号 + 设置 + 正在同步中,不能修改同步帐号 + 同步帐号已设置为%1$s + 便签 + 搜索便签 + 正在搜索便签 + 便签中的文字 + 创建提醒 + 导出成功 + 与%1$s同步成功 + 正在获取服务器便签列表... + 登录%1$s... + 正在同步本地便签... + 同步已取消 + 同步失败 + 同步成功 + 同步便签... + 没有关联内容,点击新建便签。 + 访客模式下,便签内容不可见 + \ 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..aed056e --- /dev/null +++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merged.dir/values-zh-rTW/values-zh-rTW.xml @@ -0,0 +1,109 @@ + + + + 短信 + 郵件 + + + %1$s 條符合”%2$s“的搜尋結果 + + 確認刪除檔夾及所包含的便簽嗎? + 确认要删除該條便籤嗎? + 确认要刪除所選的 %d 條便籤嗎? + 刪除 + 便簽 + 便簽2x2 + 便簽4x4 + 刪除 + 通話便籤 + 取消 + 設置 + 成功刪除提醒 + 不能爲空便籤設置鬧鐘提醒 + 不能將空便籤發送到桌面 + 要查看的便籤不存在 + 導出TXT時發生錯誤,請檢查SD卡 + SD卡被佔用,不能操作 + 同步已取消 + 同步失敗,發生內部錯誤 + 同步失敗,請檢查網絡和帳號設置 + 導出失敗 + 文件夾 %1$s 已存在,請重新命名 + yyyyMMdd + MM月dd日 kk:mm + 已將文本文件(%1$s)導出至SD(%2$s)目錄 + 已將所選 %1$d 便籤移到 %2$s 文件夾 + 請輸入名稱 + 已添加到桌面 + 提醒我 + 新建文件夾 + 刪除 + 取消全選 + 導出文本 + 修改文件夾名稱 + 刪除文件夾 + 查看文件夾 + + 正常 + 文字大小 + + 超大 + 進入清單模式 + 移動到文件夾 + 上一級文件夾 + 退出清單模式 + 刪除提醒 + 回收站 + 搜尋 + 全選 + 沒有選中項,操作無效 + 選中了 %d 項 + 發送到桌面 + 設置 + 分享 + 同步 + 取消同步 + 選擇文件夾 + 已過期 + 發送郵件 + 打開地圖 + 呼叫電話 + 浏覽網頁 + 查看 + 知道了 + 新建便簽 + ... + 与google task同步便簽記錄 + 同步賬號 + 添加賬號 + 新建便籤背景顏色隨機 + 取消同步 + 立即同步 + 當前帳號 %1$s + 如更換同步帳號,過去的帳號同步信息將被清空,再次切換的同時可能會造成數據重復 + 請選擇google帳號,便簽將與該帳號的google task內容同步。 + 同步便簽 + 上次同步于 %1$s + 取消 + 更換賬號 + 刪除賬號 + 設置 + 正在同步中,不能修改同步帳號 + 同步帳號已設置為%1$s + 便籤 + 搜索便籤 + 正在搜索便籤 + 便籤中的文字 + 創建提醒 + 導出成功 + 與%1$s同步成功 + 正在獲取服務器便籤列表... + 登陸%1$s... + 正在同步本地便籤... + 同步已取消 + 同步失敗 + 同步成功 + 同步便簽... + 沒有關聯內容,點擊新建便簽。 + 訪客模式下,便籤內容不可見 + \ No newline at end of file diff --git a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml index bfc71c1..2092cb8 100644 --- a/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml +++ b/src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml @@ -11,7 +11,7 @@ %1$s result for \"%2$s\" %1$s results for \"%2$s\" -