diff options
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/colors.xml | 2 | ||||
| -rw-r--r-- | res/values/strings.xml | 27 | ||||
| -rw-r--r-- | res/values/styles.xml | 4 | ||||
| -rw-r--r-- | res/values/themes.xml | 4 |
4 files changed, 19 insertions, 18 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index 4ede1c10..b6477939 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> + <color name="primary" type="color">#ff259b24</color> + <color name="primarydark" type="color">#ff0a7e07</color> <color name="primarytext" type="color">#de000000</color> <color name="secondarytext" type="color">#8a000000</color> <color name="ondarktext" type="color">#fffafafa</color> diff --git a/res/values/strings.xml b/res/values/strings.xml index 10a3f0e2..c636be79 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -22,6 +22,7 @@ <string name="title_activity_conversations">Conversations</string> <string name="title_activity_sharewith">Share with Conversation</string> <string name="title_activity_start_conversation">Start Conversation</string> + <string name="title_activity_choose_contact">Choose contact</string> <string name="just_now">just now</string> <string name="minute_ago">1 min ago</string> <string name="minutes_ago">%d mins ago</string> @@ -37,19 +38,17 @@ <string name="participant">Participant</string> <string name="visitor">Visitor</string> <string name="enter_new_name">Enter a new name:</string> - <string name="remove_contact_text">Do you want to delete %s from your roster? The conversation associated with this account will not be removed.</string> + <string name="remove_contact_text">Would you like to remove %s from your roster? The conversation associated with this contact will not be removed.</string> + <string name="remove_bookmark_text">Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed.</string> <string name="untrusted_cert_hint">The server %s presented you with an untrusted, possible self signed, certificate.</string> <string name="account_info">Server Info</string> <string name="register_account">Register new account on server</string> <string name="share_with">Share with</string> <string name="ask_again"><u>Click to ask again</u></string> <string name="show_otr_key">OTR fingerprint</string> - <string name="no_otr_fingerprint">No OTR Fingerprint generated. Just go ahead an start an encrypted conversation</string> + <string name="no_otr_fingerprint">No OTR Fingerprint generated. Just go ahead and start an encrypted conversation</string> <string name="start_conversation">Start Conversation</string> - <string name="invite_contacts">Invite Contacts</string> - <string name="invite_contacts_to_existing">Invite to existing conference</string> - <string name="new_conference">Create new conference</string> - <string name="new_contact">Create new contact</string> + <string name="invite_contact">Invite Contact</string> <string name="contacts">Contacts</string> <string name="search_jabber_id">Search or enter Jabber ID</string> <string name="choose_account">Choose account</string> @@ -65,9 +64,6 @@ <string name="ok">OK</string> <string name="done">Done</string> <string name="hide">Hide</string> - <string name="create_invite">Create \u0026 Invite</string> - <string name="new_conference_explained">Do you want to create a new conference with a randomly generated address and invite the selected contacts to it?</string> - <string name="no_open_mucs">No existing conferences</string> <string name="invitation_sent">Invitation sent</string> <string name="account_offline">Account offline</string> <string name="cant_invite_while_offline">You have to be online to invite people to conferences</string> @@ -149,7 +145,7 @@ <string name="pref_confirm_messages_summary">Let your contact know when you have received and read a message</string> <string name="pref_show_last_seen">Display last seen</string> <string name="pref_show_last_seen_summary">Display the latest time a contact has been seen online</string> - <string name="openpgp_error">OpenKeychain reporeted an error</string> + <string name="openpgp_error">OpenKeychain reported an error</string> <string name="error_decrypting_file">I/O Error decrypting file</string> <string name="error_copying_image_file">Error copying image file.</string> <string name="accept">Accept</string> @@ -157,7 +153,6 @@ <string name="pref_grant_presence_updates">Grant presence updates</string> <string name="pref_grant_presence_updates_summary">Preemptively grant and ask for presence subscription for contacts you created</string> <string name="subscriptions">Subscriptions</string> - <string name="subscription_updated">Subscription updated</string> <string name="your_account">Your account</string> <string name="keys">Keys</string> <string name="send_presence_updates">Send presence updates</string> @@ -182,13 +177,10 @@ <string name="account_status_not_found">Server not found</string> <string name="account_status_no_internet">No connectivity</string> <string name="account_status_requires_tls">Server requires TLS</string> - <string name="account_status_error">Untrusted cerficate</string> <string name="account_status_regis_fail">Registration failed</string> <string name="account_status_regis_conflict">Username already in use</string> <string name="account_status_regis_success">Registration completed</string> <string name="account_status_regis_not_sup">Server does not support registration</string> - <string name="certif_no_trust">Don\'t connect</string> - <string name="certif_trust">Trust certificate</string> <string name="encryption_choice_none">Plain text</string> <string name="encryption_choice_otr">OTR</string> <string name="encryption_choice_pgp">OpenPGP</string> @@ -269,4 +261,11 @@ <string name="save_as_bookmark">Save as bookmark</string> <string name="delete_bookmark">Delete bookmark</string> <string name="bookmark_already_exists">This bookmark already exists</string> + <string name="you">You</string> + <string name="action_edit_subject">Edit conference subject</string> + <string name="conference_not_found">Conference not found</string> + <string name="leave">Leave</string> + <string name="contact_added_you">Contact added you to contact list</string> + <string name="add_back">Add back</string> + <string name="contact_has_read_up_to_this_point">%s has read up to this point</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 1468283e..a827fe36 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -6,14 +6,14 @@ <item name="android:layout_marginTop">8dp</item> <item name="android:textSize">14sp</item> <item name="android:textAllCaps">true</item> - <item name="android:textColor">#5b5b5b</item> + <item name="android:textColor">@color/primarytext</item> <item name="android:textStyle">bold</item> </style> <style name="Divider"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">1.5dp</item> - <item name="android:background">#b7b7b7</item> + <item name="android:background">@color/divider</item> </style> </resources>
\ No newline at end of file diff --git a/res/values/themes.xml b/res/values/themes.xml index 0c4ddc39..97f1db8f 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -8,8 +8,8 @@ </style> <style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse"> - <item name="android:background">#259b24</item> - <item name="android:backgroundStacked">#0a7e07</item> + <item name="android:background">@color/primary</item> + <item name="android:backgroundStacked">@color/primarydark</item> <item name="android:displayOptions">showHome|homeAsUp|showTitle</item> <item name="android:icon">@android:color/transparent</item> </style> |