Fixed

kdevlab · Sep 19, 2013 · 9bda747 · 9bda747
1 parent 8705e7a
commit 9bda747
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/layout-ru-xhdpi/conversation_list_item.xml b/layout-ru-xhdpi/conversation_list_item.xml
@@ -12,7 +12,8 @@
             <RelativeLayout android:id="@id/middle_area" android:paddingRight="10.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_toLeftOf="@id/conversation_checkbox" android:layout_toRightOf="@id/avatar" android:layout_alignTop="@id/avatar">
                 <TextView android:textSize="12.669983dip" android:textColor="@drawable/color_e_pressed_a" android:id="@id/date" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:layout_alignParentTop="true" android:layout_alignParentRight="true" />
                 <TextView android:textSize="12.669983dip" android:textColor="@drawable/color_e_pressed_a" android:gravity="center" android:id="@id/deliver_status" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:layout_alignParentTop="true" android:layout_alignParentRight="true" />
-                <LinearLayout android:gravity="left" android:orientation="horizontal" android:id="@id/from_area" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_toLeftOf="@id/date" android:layout_alignParentLeft="true" android:layout_alignParentTop="true">
+                <ImageView android:id="@id/conv_unsend_iv" android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:layout_marginRight="5.0dip" android:src="@drawable/icon_talk_failure" android:layout_toLeftOf="@id/date" />
+                <LinearLayout android:gravity="left" android:orientation="horizontal" android:id="@id/from_area" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_toLeftOf="@id/conv_unsend_iv" android:layout_alignParentLeft="true" android:layout_alignParentTop="true">
                     <TextView android:textSize="17.5dip" android:textColor="@drawable/color_b_pressed_a" android:ellipsize="middle" android:id="@id/from" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxEms="8" android:singleLine="true" android:includeFontPadding="false" />
                     <ImageView android:id="@id/buddy_verified" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="2.0dip" android:layout_marginTop="2.0dip" android:src="@drawable/v_icon_001" android:contentDescription="@string/foobar" />
                 </LinearLayout>
@@ -25,4 +26,4 @@
             <ImageView android:id="@id/conv_set_top_iv" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/all_list_top_images" android:layout_alignParentTop="true" android:layout_alignParentRight="true" />
         </RelativeLayout>
     </LinearLayout>
-</merge>
+</merge>
diff --git a/layout-ru/conversation_list_item.xml b/layout-ru/conversation_list_item.xml
@@ -12,7 +12,8 @@
             <RelativeLayout android:id="@id/middle_area" android:paddingRight="10.0dip" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_toLeftOf="@id/conversation_checkbox" android:layout_toRightOf="@id/avatar" android:layout_alignTop="@id/avatar">
                 <TextView android:textSize="12.669983dip" android:textColor="@drawable/color_e_pressed_a" android:id="@id/date" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:layout_alignParentTop="true" android:layout_alignParentRight="true" />
                 <TextView android:textSize="12.669983dip" android:textColor="@drawable/color_e_pressed_a" android:gravity="center" android:id="@id/deliver_status" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:singleLine="true" android:layout_alignParentTop="true" android:layout_alignParentRight="true" />
-                <LinearLayout android:gravity="left" android:orientation="horizontal" android:id="@id/from_area" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_toLeftOf="@id/date" android:layout_alignParentLeft="true" android:layout_alignParentTop="true">
+                <ImageView android:id="@id/conv_unsend_iv" android:visibility="invisible" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="2.0dip" android:layout_marginRight="5.0dip" android:src="@drawable/icon_talk_failure" android:layout_toLeftOf="@id/date" />
+                <LinearLayout android:gravity="left" android:orientation="horizontal" android:id="@id/from_area" android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_toLeftOf="@id/conv_unsend_iv" android:layout_alignParentLeft="true" android:layout_alignParentTop="true">
                     <TextView android:textSize="17.5dip" android:textColor="@drawable/color_b_pressed_a" android:ellipsize="middle" android:id="@id/from" android:layout_width="wrap_content" android:layout_height="wrap_content" android:maxEms="8" android:singleLine="true" android:includeFontPadding="false" />
                     <ImageView android:id="@id/buddy_verified" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="2.0dip" android:layout_marginTop="2.0dip" android:src="@drawable/v_icon_001" android:contentDescription="@string/foobar" />
                 </LinearLayout>
@@ -25,4 +26,4 @@
             <ImageView android:id="@id/conv_set_top_iv" android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/all_list_top_images" android:layout_alignParentTop="true" android:layout_alignParentRight="true" />
         </RelativeLayout>
     </LinearLayout>
-</merge>
+</merge>
diff --git a/values-ru/strings.xml b/values-ru/strings.xml
@@ -110,12 +110,8 @@ Please remember that you can only log in and restore password AFTER you confirm
      <string name="address_with_distance">%1$dm %2$s</string>
      <string name="age">" лет"</string>
      <string name="agree_contact_licence">Совпадение с контактами телефонной книги</string>
-     <!-- The count of MNPS does not match! Now: 2 must: 0
-	%s: 1 must: 0
-	%d: 1 must: 0 -->
-     <!-- Original string: 已阅读并同意<a href="http://www.miliao.com/yinsi.php">使用条款及隐私协议</a> -->
-     <string name="agree_private_licence">""Я прочитал и соглашаюсь 
-     <string name="address_with_distance">%1$dм %2$s"</string>
+     <string name="agree_private_licence">"Я прочитал и соглашаюсь 
+"</string>
      <string name="all_marked_readed">Пометить все как прочитанные</string>
      <string name="all_people_visible">Показать всем</string>
      <string name="alread_friend">Друзья MiTalk</string>