Skip to content
This repository was archived by the owner on Jun 9, 2022. It is now read-only.

#1610 and #1687 #95

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

#1610 and #1687 #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ad6203c
add sync single record for unverified account
May 16, 2013
c7b1444
add chinese translations
cendy172 May 17, 2013
0cc4f13
update the chinese translations
cendy172 May 17, 2013
7ed33d6
finished #1672 and translate the message to chinese
cendy172 May 17, 2013
9121e84
refactor the test code
cendy172 May 17, 2013
83d50f6
update the text of UI
cendy172 May 17, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RapidFTR-Android/res/layout/signup.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

<EditText android:background="@drawable/textbox"
android:id="@+id/password"
android:hint="@string/password"
android:hint="@string/password_length"
android:inputType="textPassword"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
Expand Down
5 changes: 2 additions & 3 deletions RapidFTR-Android/res/menu/child_menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>

<menu xmlns:android="http://schemas.android.com/apk/res/android">

<item android:id="@+id/synchronize_child"
android:title="@string/synchronize_child" />
android:title="@string/synchronize_child"/>
<item android:id="@+id/logout"
android:title="@string/log_out" />
android:title="@string/log_out"/>
<item android:id="@+id/synchronize_log"
android:title="@string/synchronize_log"
android:visible="false"/>
Expand Down
2 changes: 2 additions & 0 deletions RapidFTR-Android/res/values-ar/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@

<string name="username_required">إسم المستخدم ضروري</string>
<string name="password_required">كلمة السر ضرورية</string>
<string name="password_length">Use at least 6 characters or more for your password</string>
<string name="password_length_error">Password should be 6 characters or more</string>
<string name="organisation_required">المنظمة ضرورية</string>
<string name="confirm_password_required">أعد إدخال كلمة السر</string>
<string name="url_required">رابط المخدم ضروري</string>
Expand Down
2 changes: 2 additions & 0 deletions RapidFTR-Android/res/values-es/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

<string name="username">Username</string>
<string name="password">Password</string>
<string name="password_length">Use at least 6 characters or more for your password</string>
<string name="password_length_error">Password should be 6 characters or more</string>
<string name="url">URL</string>

<string name="rapidftr_url">https://test.rapidftr.com</string>
Expand Down
2 changes: 2 additions & 0 deletions RapidFTR-Android/res/values-fr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

<string name="username">Username</string>
<string name="password">Password</string>
<string name="password_length">Use at least 6 characters or more for your password</string>
<string name="password_length_error">Password should be 6 characters or more</string>
<string name="url">URL</string>
<string name="full_name_required">Full name required</string>
<string name="full_name">Full Name</string>
Expand Down
2 changes: 2 additions & 0 deletions RapidFTR-Android/res/values-ru/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

<string name="username">Username</string>
<string name="password">Password</string>
<string name="password_length">Use at least 6 characters or more for your password</string>
<string name="password_length_error">Password should be 6 characters or more</string>
<string name="url">URL</string>

<string name="rapidftr_url">https://test.rapidftr.com</string>
Expand Down
197 changes: 115 additions & 82 deletions RapidFTR-Android/res/values-zh/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,90 +3,123 @@
<string name="app_name">RapidFTR</string>

<string name="log_in">登录</string>
<string name="log_out">Log Out</string>
<string name="confirm_logout_message">Records are still being sychronised. Logging out now will cancel this process, are you sure you want to log out?</string>
<string name="logout_successful">You have been logged out successfully.</string>
<string name="change_url">Change URL</string>
<string name="register_child">Register Child</string>
<string name="view_all_children">View All Children</string>
<string name="search_for_a_child">Search for a Child</string>
<string name="synchronize">Synchronize</string>
<string name="new_user">New to RapidFTR? </string>
<string name="full_name_required">Full name required</string>
<string name="full_name">Full Name</string>

<string name="username">Username</string>
<string name="password">Password</string>
<string name="url">URL</string>

<string name="rapidftr_url">https://test.rapidftr.com</string>
<string name="rapidftr_username">rapidftr</string>

<string name="username_required">Username is required</string>
<string name="password_required">Password is required</string>
<string name="organisation_required">Organisation is required</string>
<string name="confirm_password_required">Re-type password</string>
<string name="url_required">Server URL is required</string>
<string name="password_mismatch">Password mismatch</string>

<string name="loading_message">Loading&#8230;</string>
<string name="unauthorized">Incorrect username or password</string>
<string name="login_successful">Login Successful</string>
<string name="invalid_url">Please enter a valid url</string>
<string name="server_not_reachable">Unable to connect to the server, please contact your system administrator</string>
<string name="log_out">退出</string>
<string name="confirm_logout_message">正在同步，退出将终止同步，确实要退出？</string>
<string name="session_timeout">会话失效，请退出重新登录</string>

<string name="logout_successful">退出成功</string>
<string name="change_url">更改网址</string>
<string name="register_child">注册孩子</string>
<string name="view_all_children">查看所有孩子</string>
<string name="search_for_a_child">搜索孩子</string>
<string name="synchronize">同步</string>
<string name="new_user">RapidFTR新用户? </string>
<string name="full_name_required">全称是必需的</string>
<string name="username_taken">用户名已使用，请重新选择</string>
<string name="full_name">全称</string>

<string name="username">用户名</string>
<string name="password">密码</string>
<string name="url">网址</string>

<string name="rapidftr_url"></string>
<string name="rapidftr_username"></string>

<string name="username_required">用户名是必需的</string>
<string name="password_required">密码是必需的</string>
<string name="password_length">密码长度应至少6位</string>
<string name="password_length_error">密码长度必须不小于6个字符</string>
<string name="organisation_required">组织是必需的</string>
<string name="confirm_password_required">重新填写网址</string>
<string name="url_required">服务器网址是必需的</string>
<string name="password_mismatch">密码不匹配</string>

<string name="loading_message">加载&#8230;</string>
<string name="unauthorized">用户名或密码不正确</string>
<string name="login_successful">登录成功</string>
<string name="invalid_url">请输入一个合法的网址</string>
<string name="server_not_reachable">无法连接到服务器，请联系系统管理员</string>
<string name="RapidFTRLogo">RapidFTR</string>

<string name="new_registration">New Registration</string>
<string name="save_child_progress">Saving record</string>
<string name="save_child_invalid">Please fill up at least one field</string>
<string name="save_child_success">Saved record successfully</string>
<string name="save_child_failure">Failed to save record!</string>

<string name="photo_capture">Capture Photo</string>
<string name="photo_capture_error">An error occurred while capturing the photo</string>
<string name="photo_view">View Photo</string>
<string name="photo_view_error">An error occurred while loading the photo</string>
<string name="photo_not_captured">No photo captured for the record</string>
<string name="photo_gallery_delete_error">Unable to delete photo from Gallery. Please go to Gallery and delete it manually</string>
<string name="set_as_primary">Set as primary photo</string>

<string name="synchronize_all">Synchronize All</string>
<string name="cancel_synchronize_all">Cancel Synchronize All</string>
<string name="synchronize_child">Synchronize This Record</string>
<string name="sync_progress">Sync in progress&#8230;</string>
<string name="sync_success">Sync successful</string>
<string name="sync_failure">Sync failed</string>
<string name="network_not_available">Network connection is not available, Please try again later</string>

<string name="internal_error">An error occurred while performing this operation</string>
<string name="fetch_child_error">An error occurred while fetching record(s), please try again</string>
<string name="submit">Submit</string>
<string name="edit">Edit</string>
<string name="save">Save</string>
<string name="choose_action">Choose an action</string>
<string name="discard">Discard</string>
<string name="cancel">Cancel</string>
<string name="clear">Clear</string>

<string name="register_tab_name">Register</string>
<string name="view_all_tab_name">View All</string>
<string name="search_tab_name">Search</string>
<string name="synchronize_log">Sync error</string>
<string name="synchronize_step_1">Step 1 of 3 - Syncing Form Sections&#8230;</string>
<string name="synchronize_step_2">Step 2 of 3 - Sending records to server&#8230;</string>
<string name="synchronize_step_3">Step 3 of 3 - Getting records from server&#8230;</string>
<string name="signup">Sign Up!</string>
<string name="confirm">Confirm Password</string>
<string name="organisation">Organisation</string>
<string name="optional_url">URL(Optional)</string>

<string name="sync_complete">Sync complete.</string>
<string name="sync_error">Error in syncing. Try again after some time.</string>
<string name="search_child">Search record by name/id</string>
<string name="go">Go</string>
<string name="child_not_found">No Record Found</string>

<string name="this_is_audio_upload_box">This is an audio upload box</string>
<string name="new_registration">新注册</string>
<string name="save_child_progress">保存记录</string>
<string name="save_child_invalid">请至少填写一个表单</string>
<string name="save_child_success">保存记录成功</string>
<string name="save_child_failure">保存记录失败！</string>

<string name="photo_capture">拍照</string>
<string name="photo_capture_error">拍照失败</string>
<string name="photo_view">预览</string>
<string name="photo_view_error">加载照片出错</string>
<string name="photo_not_captured">该记录无照片</string>
<string name="photo_gallery_delete_error">无法删除照片，请去相册删除</string>
<string name="set_as_primary">设为主要照片</string>


<string name="synchronize_all">同步所有</string>
<string name="cancel_synchronize_all">取消同步所有</string>
<string name="synchronize_child">同步此条记录</string>
<string name="sync_progress">正在同步&#8230;</string>
<string name="sync_success">同步成功</string>
<string name="sync_failure">同步失败</string>
<string name="network_not_available">网络连接失败，请稍后重试</string>

<string name="internal_error">操作出错</string>
<string name="fetch_child_error">获取记录出错，请重试</string>
<string name="fetch_form_sections_error">获取会话出错</string>
<string name="submit">提交</string>
<string name="edit">编辑</string>
<string name="save">保存</string>
<string name="choose_action">选择一个动作</string>
<string name="discard">丢弃</string>
<string name="cancel">取消</string>
<string name="clear">清除</string>

<string name="register_tab_name">注册</string>
<string name="view_all_tab_name">查看所有</string>
<string name="search_tab_name">搜索</string>
<string name="synchronize_log">同步出错</string>
<string name="synchronize_step_1">步骤1-同步表单&#8230;</string>
<string name="synchronize_step_2">步骤2-上传记录&#8230;</string>
<string name="synchronize_step_3">步骤3-下载记录&#8230;</string>
<string name="signup">注册！</string>
<string name="confirm">确认密码</string>
<string name="organisation">组织</string>
<string name="optional_url">网址</string>

<string name="sync_complete">同步完成</string>
<string name="sync_error">同步出错，请稍后再试！</string>
<string name="search_child">通过名字或编号搜索</string>
<string name="go">搜索</string>
<string name="child_not_found">无此记录</string>

<string name="this_is_audio_upload_box">这是一个语音上传框</string>
<string name="info">关于</string>

<string name="info_text">RapidFTR支持如下语言：</string>
<string name="full_name_label">全名：</string>
<string name="username_label">用户名：</string>
<string name="password_label">密码：</string>
<string name="confirm_label">确认密码：</string>
<string name="organisation_label">组织：</string>
<string name="mandatory">所有表单必填</string>
<string name="registered">你已注册，请登录使用 </string>

<string name="yes">确定</string>
<string name="start_record">开始</string>
<string name="stop_record">停止</string>
<string name="play_record">播放</string>
<string name="forgot_password">请重设密码</string>

<string name="network_down">无法连接到服务器，同步取消</string>
<string name="no_connection">无法连接到服务器，请稍后重试</string>
<string name="connection_off">无网络，请打开wifi或数据重试</string>
<string name="temp_sync_error">同步数据出错，请稍后重试</string>
<string name="current_password_label">当前密码</string>
<string name="new_password">新密码</string>
<string name="change_password">更改密码</string>
<string name="password_change_success">密码更改成功</string>
<string name="password_change_failed">无法更改密码，请重试</string>
<string name="confirm_change_password_text">正在同步，更改密码将终止同步，是否继续？</string>
</resources>

2 changes: 2 additions & 0 deletions RapidFTR-Android/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@

<string name="username_required">Username is required</string>
<string name="password_required">Password is required</string>
<string name="password_length">Use at least 6 characters or more for your password</string>
<string name="password_length_error">Password should be 6 characters or more</string>
<string name="organisation_required">Organisation is required</string>
<string name="confirm_password_required">Re-type password</string>
<string name="url_required">Server URL is required</string>
Expand Down
Loading