1
0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-25 00:58:50 -05:00

Merge branch 'master' into build-update

This commit is contained in:
ashley willis 2012-06-07 22:12:02 -05:00
commit d070be56de

View File

@ -93,7 +93,7 @@
<string name="folder_progress">\u0020<xliff:g id="completed">%s</xliff:g>/<xliff:g id="total">%s</xliff:g></string>
<string name="status_next_poll">\u0020下次接收时间<xliff:g id="nexttime">%s</xliff:g></string>
<!-- NEW: <string name="status_syncing_off">\u0020(Syncing disabled)</string>-->
<string name="status_syncing_off">同步关闭</string>
<!-- Actions will be used as buttons and in menu items -->
<string name="next_action">下一步</string> <!-- Used as part of a multi-step process -->