yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

字符串移至 string.xml

Browse Source
This commit is contained in:
seven332 committed 2014-06-13 22:47:24 +08:00
1 parent 148f03a175
commit bcba2f556b
6 files changed
+50 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

res/layout/dir_selection.xml
+1 -1
View File
@@ -36,6 +36,6 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textColor="@android:color/holo_red_dark"
android:text="当前路径不可写" />
android:text="@string/cur_dir_not_writable" />
</LinearLayout>
res/values-zh-rCN/strings.xml
+11 -1
View File
@@ -60,7 +60,7 @@
<string name="toast_tag_mode">切换至标签搜索模式</string>
<!-- Jump -->
<string name="jump_sum">共 %d 页</string>
<string name="jump_summary" formatted="false">第 %d 页，共 %d 页</string>
<string name="jump_to">跳至：</string>
<string name="toast_invalid_page">非法页面</string>
@@ -149,6 +149,14 @@
<!-- Favorite -->
<string name="local_favorite">本地收藏</string>
<string name="select_item">选择项目</string>
<string name="where_to_move">移动至何处？</string>
<string name="moving">正在移动…</string>
<string name="move_successfully">移动成功</string>
<string name="failed_to_move">移动失败</string>
<string name="dst_src_same">目标与源相同</string>
<string name="delete_successfully">删除成功</string>
<string name="failed_to_delete">删除失败</string>
<!-- Settings -->
<string name="display_settings_title">显示</string>
@@ -305,6 +313,7 @@
<string name="rating0">感觉快要窒息了</string>
<!-- Util -->
<string name="retry">重试</string>
<string name="local">本地</string>
<string name="tag">标签</string>
<string name="copyed">已复制</string>
@@ -368,4 +377,5 @@
<string name="advance_search_left">左划更多</string>
<string name="restart_to_take_effect">重启应用以便生效</string>
<string name="cur_dir_not_writable">当前文件夹不可写</string>
</resources>
res/values/strings.xml
+21 -12
View File
@@ -37,15 +37,14 @@
<!-- Login -->
<string name="check_login">Checking login status</string>
<string name="toast_login_succeeded">Login succeeded</string>
<string name="toast_login_failed">Login failed</string>
<string name="toast_login_succeeded">Login succeedfully</string>
<string name="toast_login_failed">Failed to login</string>
<string name="dialog_title_login_or_not">Login or not</string>
<string name="dialog_messgae_login_or_not">What are the benefits of login ?</string>
<string name="not_login">Do not login</string>
<string name="toast_logout_succeeded">Logout succeeded</string>
<string name="toast_logout_failed">Logout failed</string>
<string name="toast_logout_succeeded">Logout succeedfully</string>
<string name="toast_logout_failed">Failed to logout</string>
<!-- Search -->
<string name="hint_no_keyword">No keyword is OK</string>
@@ -64,7 +63,7 @@
<string name="toast_tag_mode">Switch To Tag Search Mode</string>
<!-- Jump -->
<string name="jump_sum">%d pages in total</string>
<string name="jump_summary" formatted="false">Page %d, %d pages in total</string>
<string name="jump_to">Jump to : </string>
<string name="toast_invalid_page">Invalid page</string>
@@ -151,6 +150,14 @@
<!-- Favorite -->
<string name="local_favorite">Local Favorite</string>
<string name="select_item">Select item</string>
<string name="where_to_move">Where to move ?</string>
<string name="moving">Moving…</string>
<string name="move_successfully">Move successfully</string>
<string name="failed_to_move">Failed to move</string>
<string name="dst_src_same">The same Source and Destination</string>
<string name="delete_successfully">Delete successfully</string>
<string name="failed_to_delete">Failed to delete</string>
<!-- Settings -->
<string name="display_settings_title">Display</string>
@@ -258,8 +265,8 @@
<string name="start_download_task">Start download task</string>
<string name="download_task_finished">Download task finished</string>
<string name="downloading">Downloading</string>
<string name="download_successfully">download successfully</string>
<string name="download_unsuccessfully">download unsuccessfully</string>
<string name="download_successfully">Download successfully</string>
<string name="download_unsuccessfully">Failed to download</string>
<string name="not_started">Not started</string>
<string name="waiting">Waiting</string>
<string name="wait_for_last">Please wait for the last operation</string>
@@ -275,13 +282,13 @@
<string name="select_mode_warning">Please login to avoid Sad Panda.</string>
<!-- Vote -->
<string name="vote_succeeded">Vote succeeded</string>
<string name="vote_failed">Vote failed</string>
<string name="vote_succeeded">Vote successfully</string>
<string name="vote_failed">Failed to vote</string>
<!-- Rate -->
<string name="invalid_rating">Invalid rating</string>
<string name="rate_succeeded">Rate succeeded</string>
<string name="rate_failed">Rate failed</string>
<string name="rate_succeeded">Rate successfully</string>
<string name="rate_failed">Failed to rate</string>
<string name="uploader_others">该用户上传的其他内容</string>
@@ -313,6 +320,7 @@
<string name="rating0">DISASTER</string>
<!-- Util -->
<string name="retry">Retry</string>
<string name="local">Local</string>
<string name="tag">Tag</string>
<string name="copyed">Copyed</string>
@@ -377,4 +385,5 @@
<string name="advance_search_left">Swipe left</string>
<string name="restart_to_take_effect">Restart the application to take effect</string>
<string name="cur_dir_not_writable">Current directory is not writable</string>
</resources>
src/com/hippo/ehviewer/ui/FavouriteActivity.java
+15 -10
View File
@@ -351,7 +351,7 @@ public class FavouriteActivity extends AbstractGalleryActivity
public boolean onCreateActionMode(ActionMode mode, Menu menu) {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.favorite_choice, menu);
mode.setTitle("Select Items"); // TODO
mode.setTitle(R.string.select_item);
return true;
}
@@ -370,7 +370,7 @@ public class FavouriteActivity extends AbstractGalleryActivity
private void startMoveFromLocal2Cloud() {
mPdb = new ProgressDialogBulider(FavouriteActivity.this);
mPdb.setCancelable(false).setTitle("正在移动...");
mPdb.setCancelable(false).setTitle(R.string.moving);
mPdb.setMax(mChoiceGiSetCopy.size()).setProgress(0);
mProgressDialog = mPdb.create();
mProgressDialog.show();
@@ -407,7 +407,8 @@ public class FavouriteActivity extends AbstractGalleryActivity
public void onActionClicked() {
startMoveFromLocal2Cloud();
}
}, 0, "移动失败", R.drawable.ic_warning, "重试", true);
}, 0, mResources.getString(R.string.failed_to_move),
R.drawable.ic_warning, mResources.getString(R.string.retry), true);
}
});
} else {
@@ -416,18 +417,19 @@ public class FavouriteActivity extends AbstractGalleryActivity
mPdb = null;
mProgressDialog.dismiss();
mProgressDialog = null;
new SuperToast(this, "移动成功").show(); // TODO
new SuperToast(this, R.string.move_successfully).show();
}
}
private AlertDialog createMoveDialog(final ActionMode mode) {
return new DialogBuilder(this).setTitle("移动至何处？") // TODO
return new DialogBuilder(this).setTitle(R.string.where_to_move)
.setItems(mMenuTitles, new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view,
int position, long id) {
if (mMenuIndex == position) {
new SuperToast(FavouriteActivity.this, "目标与源相同", SuperToast.WARNING).show();
new SuperToast(FavouriteActivity.this, R.string.dst_src_same,
SuperToast.WARNING).show();
return;
}
@@ -443,14 +445,16 @@ public class FavouriteActivity extends AbstractGalleryActivity
mMoveDialog = null;
mClient.modifyFavorite(getGids(mChoiceGiSetCopy), mTargetCat,
mMenuIndex -1, new Modify("移动成功", "移动失败", true));
mMenuIndex -1, new Modify(mResources.getString(R.string.move_successfully),
mResources.getString(R.string.failed_to_move), true));
mHlv.setRefreshing(true);
} else { // change cloud dir
mMoveDialog.dismiss();
mMoveDialog = null;
mClient.modifyFavorite(getGids(mChoiceGiSetCopy), mTargetCat,
mMenuIndex -1, new Modify("移动成功", "移动失败", false));
mMenuIndex -1, new Modify(mResources.getString(R.string.move_successfully),
mResources.getString(R.string.failed_to_move), false));
mHlv.setRefreshing(true);
}
}
@@ -475,7 +479,8 @@ public class FavouriteActivity extends AbstractGalleryActivity
} else {
mTargetCat = -1;
mClient.modifyFavorite(getGids(mChoiceGiSet), mTargetCat,
mMenuIndex -1, new Modify("删除成功", "删除失败", false));
mMenuIndex -1, new Modify(mResources.getString(R.string.delete_successfully),
mResources.getString(R.string.failed_to_delete), false));
mHlv.setRefreshing(true);
}
mode.finish();
@@ -536,7 +541,7 @@ public class FavouriteActivity extends AbstractGalleryActivity
public void onFailure(String eMsg) {
mHlv.setRefreshing(false);
showToastBar(new Remodify(mSuccStr, mFailStr, mToLocal), 0, mFailStr + ": " + eMsg,
R.drawable.ic_action_redo, "重试", true); // TODO
R.drawable.ic_action_redo, mResources.getString(R.string.retry), true);
}
}
src/com/hippo/ehviewer/ui/MangaListActivity.java
+1 -1
View File
@@ -534,7 +534,7 @@ public class MangaListActivity extends AbstractGalleryActivity
LayoutInflater inflater = this.getLayoutInflater();
View view = inflater.inflate(R.layout.jump, null);
TextView tv = (TextView)view.findViewById(R.id.list_jump_sum);
tv.setText(String.format(getString(R.string.jump_sum), getMaxPage())); // TODO
tv.setText(String.format(getString(R.string.jump_summary), getCurPage() + 1, getMaxPage()));
tv = (TextView)view.findViewById(R.id.list_jump_to);
tv.setText(R.string.jump_to);
final EditText et = (EditText)view.findViewById(R.id.list_jump_edit);
src/com/hippo/ehviewer/ui/SettingsActivity.java
+1 -1
View File
@@ -434,7 +434,7 @@ public class SettingsActivity extends AbstractPreferenceActivity {
public void onClick(View v) {
if (!fileExplorerView.canWrite())
new SuperToast(mActivity).setIcon(R.drawable.ic_warning)
.setMessage("当前路径不可写").show();
.setMessage(R.string.cur_dir_not_writable).show();
else {
String downloadPath = fileExplorerView.getCurPath();