Add conference screen changed: "X" up button, action menu, button removed.

app/src/main/res/layout/muc_editor.xml

@@ -101,22 +101,5 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             />
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:gravity="center_horizontal|bottom"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            >
-
-            <Button
-                android:text="@string/muc_save"
-                android:id="@+id/ok"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                />
-
-        </LinearLayout>
-
     </LinearLayout>
 </LinearLayout>

app/src/main/res/menu/add_conference.xml

+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/action_add_conference"
+        android:title="@string/muc_add"
+        app:showAsAction="always"
+        />
+</menu>
\ No newline at end of file

app/src/main/res/values-ru/muc_editor.xml

@@ -27,7 +27,7 @@
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor_error.png -->
     <string name="ALREADY_JOINED">Уже подключена</string>
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor.png -->
-    <string name="muc_add">Присоединиться к конференции</string>
+    <string name="muc_add">Добавить конференцию</string>
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_list_conference_context_menu.png -->
     <string name="muc_delete">Удалить конференцию</string>
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_list_conference_confirm.png -->

app/src/main/res/values/muc_editor.xml

@@ -27,7 +27,7 @@
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor_error.png -->
     <string name="ALREADY_JOINED">Already joined</string>
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/conference_editor.png -->
-    <string name="muc_add">Join conference</string>
+    <string name="muc_add">Add conference</string>
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_list_conference_context_menu.png -->
     <string name="muc_delete">Remove conference</string>
     <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/contact_list_conference_confirm.png -->