Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Language rework #174

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+33 −33
Open

Language rework #174

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d9017d
Language rework
comradekingu Dec 19, 2017
819bc76
reverting to "greater"
comradekingu Jan 30, 2018
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
66 changes: 33 additions & 33 deletions src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,22 +166,22 @@
<string name="setting_minimum_sync_chars" translatable="false">minimum_sync_chars</string>

<string name="pref_push_on_receive">Push SMS on reception</string>
<string name="pref_sync_wifi">Synchronize in Wi-Fi</string>
<string name="pref_sync_4g">Synchronize in 4G</string>
<string name="pref_sync_3g">Synchronize in 3G</string>
<string name="pref_sync_gprs">Synchronize in 2.5G (GPRS)</string>
<string name="pref_sync_2g">Synchronize in 2G</string>
<string name="pref_sync_wifi">Synchronize on Wi-Fi</string>
<string name="pref_sync_4g">Synchronize on 4G</string>
<string name="pref_sync_3g">Synchronize on 3G</string>
<string name="pref_sync_gprs">Synchronize on 2.5G (GPRS)</string>
<string name="pref_sync_2g">Synchronize on 2G</string>
<string name="pref_sync_others">Synchronize in other modes</string>
<string name="title_activity_login">Sign in</string>

<!-- Login -->
<string name="prompt_login">Login</string>
<string name="prompt_login">Log in</string>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry but i'm not in favor of this space

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Login" is not a verb, whereas "Log in" is.

<string name="prompt_password">Password </string>
<string name="action_sign_in">Sign in or register</string>
<string name="action_sign_in_short">Sign in</string>
<string name="error_invalid_login">Login or password incorrect</string>
<string name="error_invalid_login">Incorrect username or password</string>
<string name="error_invalid_password">This password is too short</string>
<string name="error_field_required">This field is required</string>
<string name="error_field_required">Required field</string>
<string name="prompt_serverURI">Server address</string>
<string name="error_invalid_server_address">Invalid server address</string>
<string name="error_connection_failed">Connection failed, ensure this is the right server</string>
Expand All @@ -193,10 +193,10 @@
</string-array>

<!-- Main activity -->
<string name="ma_title_rate_us">Rate us!</string>
<string name="ma_title_rate_us">Rate the app.</string>
<string name="ma_title_add_account">Add an account</string>
<string name="ma_title_welcome">Welcome</string>
<string name="ma_content_welcome">Welcome to Nextcloud SMS application. This application let you synchronize your SMS to your Nextcloud instance using SMS app.</string>
<string name="ma_content_welcome">Welcome to the Nextcloud SMS app, it lets you synchronize your SMSes to your Nextcloud instance using a SMS app.</string>
<string name="ma_title_remote_account">Remote account</string>
<string name="choose_account">Choose account</string>

Expand All @@ -207,30 +207,30 @@

<!-- Notifications -->
<string name="sync_title">Sync process</string>
<string name="sync_inprogress">Sync in progress...</string>
<string name="fatal_error">Fatal error ! </string>
<string name="sync_inprogress">Sync in progress …</string>
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

those ... are not supported on android if i remember

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ellipses are UTF-8. Works just fine.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, while Android lint warns you to use the character code … instead :)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh no, … is wrong?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wouldn't say wrong, just not how Android wants it to be expressed. See e.g. http://www.mysamplecode.com/2012/05/android-replace-with-ellipsis-character.html?m=1

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, that isn't in other Nextcloud Android resources, and it is very prone to errors in translation.

<string name="fatal_error">Fatal error! </string>

<!-- Errors -->
<string name="err_sync_get_smslist">Error #1: Invalid data received from server when getting previous messages</string>
<string name="err_sync_craft_http_request">Error #2: Error while crafting HTTP request</string>
<string name="err_sync_push_request">Error #3: Push request failed</string>
<string name="err_sync_push_request_resp">Error #4: Invalid data received from server when pushing data</string>
<string name="err_sync_create_json_null_smslist">Error #5: NULL SMS List</string>
<string name="err_sync_create_json_put_smslist">Error #6: Error while crafting push request</string>
<string name="err_sync_create_json_put_smslist">Error #6: Error crafting push request</string>
<string name="err_sync_create_json_request_encoding">Error #7: Unsupported encoding when generating request</string>
<string name="err_sync_auth_failed">Error #8: Authentication failed</string>
<string name="err_sync_http_request_returncode_unhandled">Error #9: Server set unhandled HTTP return code</string>
<string name="err_sync_http_request_connect">Error #11: Unable to perform a connection to Nextcloud instance</string>
<string name="err_sync_http_request_httpexception">Error #12: Unable to perform a connection to Nextcloud instance</string>
<string name="err_sync_http_request_ioexception">Error #13: Unable to perform a connection to Nextcloud instance</string>
<string name="err_sync_http_request_resp">Error #14: Unable to parse server response</string>
<string name="err_sync_http_request_parse_resp">Error #15: Unable to parse server response</string>
<string name="err_sync_http_request_connect">Error #11: Could not connect to Nextcloud</string>
<string name="err_sync_http_request_httpexception">Error #12: Could not connect to Nextcloud</string>
<string name="err_sync_http_request_ioexception">Error #13: Could not connect to Nextcloud</string>
<string name="err_sync_http_request_resp">Error #14: Could not parse server response</string>
<string name="err_sync_http_request_parse_resp">Error #15: Could not parse server response</string>
<string name="err_sync_no_connection_available">Error #16: No data connection available</string>
<string name="err_sync_account_unparsable">Error #17: malformed account. Please reconfigure it</string>
<string name="err_sync_ocsms_not_installed_or_oc_upgrade_required">Error #18: Nextcloud SMS app is not installed or Nextcloud awaiting for an upgrade</string>
<string name="err_sync_account_unparsable">Error #17: Malformed account. Please reconfigure it</string>
<string name="err_sync_ocsms_not_installed_or_oc_upgrade_required">Error #18: Nextcloud SMS app not installed or Nextcloud awaiting an upgrade</string>
<string name="err_fetch_phonelist">Invalid phonelist received from server.</string>
<string name="err_proto_v2">Server doesn\'t support this feature. Ensure server version is at least 1.6.</string>
<string name="contactinfos_title">Contact informations</string>
<string name="err_proto_v2">This feature is only supported on servers version 1.6 or higher.</string>
<string name="contactinfos_title">Contact information</string>
<string name="subtitle_contact_phones">- Contact phones</string>
<string name="pref_title_bulk_messages">Max messages to send per sync</string>
<string name="contactinfos_list">Contact list</string>
Expand All @@ -243,31 +243,31 @@
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
<string name="ma_title_my_accounts">My accounts</string>
<string name="ma_content_swipeaction">Swipe from left to right to access to action menu.</string>
<string name="ma_content_swipeaction">Swipe rightwards to access the action menu.</string>
<string name="cancel">Cancel</string>
<string name="understood">Understood</string>
<string name="notif_permission_required">Permissions required</string>
<string name="notif_permission_required_content">Some permissions are missing to perform the sync process. Please fix it in app settings</string>
<string name="notif_permission_required_content">Grant permissions in \"Settings\" to sync.</string>
<string name="please_fix_it">Please fix it.</string>
<string name="err_cannot_read_contacts">We cannot read your contacts.</string>
<string name="err_cannot_read_sms">We cannot read your SMS.</string>
<string name="err_cannot_read_contacts">Could not read your contacts.</string>
<string name="err_cannot_read_sms">Could not read your SMSes.</string>
<string name="action_appinfo_perms">App info and permissions</string>
<string name="restore_all_messages">Restore all messages</string>
<string name="account_actions">Account actions</string>
<string name="error_connection_failed_not_found">Connection failed, the server returns 404 NOT FOUND. Ensure you set the correct path for your Nextcloud instance.</string>
<string name="error_connection_failed_not_found">Connection failed, the server returns \"404 NOT FOUND\". Ensure you set the correct path for your Nextcloud instance.</string>
<string name="nothing_to_sync">There is nothing to sync.</string>
<string name="feature_not_already_implemented">This feature is not already implemented and will be available soon.</string>
<string name="pref_title_minimum_sync_chars">Minimum phonenumber length</string>
<string name="err_didnt_find_account_restore">We didn\'t find your account to restore your message, this is a very strange situation.</string>
<string name="launch_restore">Restore my SMS</string>
<string name="error_make_default_sms_app">Please make this application default SMS application to permit restore your messages. This limitation has been introduced by Android 4.4.</string>
<string name="err_didnt_find_account_restore">Could not find your account to restore your message.</string>
<string name="launch_restore">Restore my SMSes</string>
<string name="error_make_default_sms_app">On Android 4.4 onwards, please make this the default SMS app to permit restoring your messages.</string>
<string name="fix_permissions">Fix permissions</string>
<string name="err_kitkat_required">Android 4.4 or greater is required to use this feature.</string>
<string name="restore_finished">SMS restoration is now finished.</string>
<string name="restore_finished">SMS restoration finished.</string>
<string name="x_messages_restored">messages restored&#8230;</string>
<string name="err_no_connection">No connection available, please ensure you have a valid data connection.</string>
<string name="err_no_connection">No connection available, please ensure you have a working data connection.</string>
<string name="reinit_sync_cursor">Reinit synchronisation cursor</string>
<string name="reinit_sync_cursor_confirm">Are you sure you want to reinitialize the synchronization cursor ? This can slowdown the next synchronisation if we found many old messages not synced with server.</string>
<string name="reinit_sync_cursor_confirm">Are you sure you want to reinitialize the synchronization cursor? This can slow down the next sync if too many old messages have not yet been synced with server.</string>
<string name="yes_confirm">Yes</string>
<string name="no_confirm">No</string>
<string name="pref_show_sync_notifications">Show sync notifications</string>
Expand Down