diff options
| -rw-r--r-- | res/values-zh-rCN/filtershow_strings.xml | 7 | ||||
| -rw-r--r-- | res/values/filtershow_strings.xml | 8 | ||||
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 7 |
3 files changed, 11 insertions, 11 deletions
diff --git a/res/values-zh-rCN/filtershow_strings.xml b/res/values-zh-rCN/filtershow_strings.xml index ccde8d3f8..c3e37e697 100644 --- a/res/values-zh-rCN/filtershow_strings.xml +++ b/res/values-zh-rCN/filtershow_strings.xml @@ -38,11 +38,12 @@ <string name="size" msgid="4639404642236356037">"大小"</string> <string name="x" msgid="6810256999024563662">"x"</string> <string name="menu_settings" msgid="6428291655769260831">"设置"</string> - <string name="unsaved" msgid="8704442449002374375">"此图片的更改尚未保存。"</string> - <string name="save_before_exit" msgid="2680660633675916712">"要在退出之前保存更改吗？"</string> + <string name="unsaved" msgid="8704442449002374375">"是否放弃当前图片的操作？"</string> + <string name="save_before_exit" msgid="2680660633675916712">"放弃更改？"</string> <string name="save_and_exit" msgid="3628425023766687419">"保存并退出"</string> + <string name="discard">"放弃"</string> <string name="save_and_processing" msgid="6371565035837463194">"正在处理完整分辨率图片…"</string> - <string name="exit" msgid="242642957038770113">"退出"</string> + <string name="exit" msgid="242642957038770113">"取消"</string> <string name="history" msgid="455767361472692409">"历史记录"</string> <string name="reset" msgid="9013181350779592937">"重置"</string> <!-- no translation found for history_original (150973253194312841) --> diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml index 01f667efa..53a5b5c23 100644 --- a/res/values/filtershow_strings.xml +++ b/res/values/filtershow_strings.xml @@ -73,15 +73,17 @@ <!-- Exit Dialog --> <!-- String displayed when exiting with unsaved changes [CHAR LIMIT=NONE] --> - <string name="unsaved">There are unsaved changes to this image.</string> + <string name="unsaved">Discrad the changes you\'ve made to this image?</string> <!-- String displayed when exiting with unsaved changes [CHAR LIMIT=NONE] --> - <string name="save_before_exit">Do you want to save before exiting?</string> + <string name="save_before_exit">Discard changes?</string> <!-- String displayed when saving and exiting editor [CHAR LIMIT=NONE] --> <string name="save_and_exit">Save and Exit</string> + <!-- String displayed when discard editor [CHAR LIMIT=NONE] --> + <string name="discard">Discard</string> <!-- String displayed when saving and exiting editor [CHAR LIMIT=NONE] --> <string name="save_and_processing">Processing full resolution image...</string> <!-- String displayed when exiting editor[CHAR LIMIT=NONE] --> - <string name="exit">Exit</string> + <string name="exit">Cancel</string> <!-- History Panel --> diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 46f3d1621..54b637e4e 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -380,7 +380,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL setContentView(R.layout.filtershow_activity); Resources r = getResources(); setActionBar(false); - mPopUpText = r.getString(R.string.save_and_exit).toUpperCase( + mPopUpText = r.getString(R.string.discard).toUpperCase( Locale.getDefault()); mExit = r.getString(R.string.exit).toUpperCase(Locale.getDefault()); int marginTop = r.getDimensionPixelSize(R.dimen.compare_margin_top); @@ -1756,10 +1756,7 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL @Override public void onClick(DialogInterface dialog, int id) { - // saveImage(); - HistoryManager adapter = mMasterImage - .getHistory(); - adapter.resetActiveFilter(); + done(); } }); builder.setNegativeButton(mExit, |