Merge branch 'development' of https://github.com/siacs/Conversations into development

2 files changed, 27 insertions, 15 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 80bd2052..ebfaaa17 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -21,6 +21,7 @@
     <string name="title_activity_contact_details">Contact Details</string>
     <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="just_now">just now</string>
     <string name="minute_ago">1 min ago</string>
     <string name="minutes_ago">%d mins ago</string>
@@ -200,10 +201,10 @@
     <string name="mgmt_account_account_offline">Account is offline</string>
     <string name="attach_record_voice">Record voice</string>
     <string name="account_settings">Account Settings</string>
-    <string name="account_settings_jabber_id">Jabber ID:</string>
-    <string name="account_settings_password">Password:</string>
+    <string name="account_settings_jabber_id">Jabber ID</string>
+    <string name="account_settings_password">Password</string>
     <string name="account_settings_example_jabber_id">username@example.com</string>
-    <string name="account_settings_confirm_password">Confirm password:</string>
+    <string name="account_settings_confirm_password">Confirm password</string>
     <string name="password">Password</string>
     <string name="confirm_password">Confirm password</string>
     <string name="passwords_do_not_match">Passwords do not match</string>
@@ -254,4 +255,12 @@
     <string name="otr_fingerprint">OTR fingerprint</string>
     <string name="verify">Verify</string>
     <string name="decrypt">Decrypt</string>
+    <string name="conferences">Conferences</string>
+    <string name="search">Search</string>
+    <string name="create_contact">Create Contact</string>
+    <string name="create_conference">Create Conference</string>
+    <string name="delete_contact">Delete Contact</string>
+    <string name="view_contact_details">View contact details</string>
+    <string name="create">Create</string>
+    <string name="contact_already_exists">The contact already exists</string>
 </resources>
\ No newline at end of file
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 0191d302..0c4ddc39 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -1,23 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="ConversationsTheme"
-           parent="@android:style/Theme.Holo.Light.DarkActionBar">
+
+    <style name="ConversationsTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar">
         <item name="android:actionBarStyle">@style/ConversationsActionBar</item>
         <item name="android:actionBarWidgetTheme">@style/ConversationsActionBarWidget</item>
+        <item name="android:actionBarTabStyle">@style/ConversationsActionBarTabs</item>
     </style>
 
-    <style name="ConversationsActionBar"
-           parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
+    <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:displayOptions">showHome|homeAsUp|showTitle</item>
-	<item name="android:icon">@android:color/transparent</item>
+        <item name="android:icon">@android:color/transparent</item>
+    </style>
+
+    <style name="ConversationsActionBarWidget" parent="android:Theme.Holo.Light">
+        <item name="android:popupMenuStyle">@android:style/Widget.Holo.Light.PopupMenu</item>
+        <item name="android:dropDownListViewStyle">@android:style/Widget.Holo.Light.ListView.DropDown</item>
     </style>
     
-    
-    <style name="ConversationsActionBarWidget"
-    parent="android:Theme.Holo.Light">
-    <item name="android:popupMenuStyle">@android:style/Widget.Holo.Light.PopupMenu</item>
-    <item name="android:dropDownListViewStyle">@android:style/Widget.Holo.Light.ListView.DropDown</item>
-</style>
-</resources>
+    <style name="ConversationsActionBarTabs" parent="@android:style/Widget.Holo.ActionBar.TabView">
+       <item name="android:background">@drawable/actionbar_tab_indicator</item>
+    </style>
 
+</resources>
\ No newline at end of file