Fixing bugs

android/res/layout/article_button_element.xml

@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/medium_margin"
-        android:background="@color/bkg2"
+        android:background="@color/button_default"
         android:drawableLeft="@drawable/ic_action_web_site"
         android:text="@string/go_to_website"
         android:textSize="@dimen/xlarge_text_size" />

android/res/layout/article_phone_element.xml

@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/medium_margin"
-        android:background="@color/bkg2"
+        android:background="@color/button_default"
         android:drawableLeft="@drawable/ic_action_call"
         android:gravity="left|center_vertical"
         android:textSize="@dimen/xlarge_text_size" />

android/res/layout/article_photo_element.xml

@@ -7,14 +7,16 @@
     android:orientation="vertical"
     android:showDividers="middle" >
 
-    <fishrungames.bashgid.DynamicImageView
+    <ImageView
         android:id="@+id/imageView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:adjustViewBounds="true"
-                android:cropToPadding="false"
-                android:scaleType="centerCrop" />
+        android:cropToPadding="false"
+        android:minHeight="10dp"
+        android:minWidth="10dp"
+        android:scaleType="centerCrop" />
 
     <TextView
         android:id="@+id/dateTextView"

android/res/layout/fragment_grid_page.xml

@@ -11,15 +11,17 @@
         android:layout_gravity="center_horizontal"
         android:indeterminate="true" />
     
-    <GridView
+    <fishrungames.bashgid.StaticGridView
         android:id="@+id/gridView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="bottom"
         android:horizontalSpacing="@dimen/grid_view_horizontal_spacing"
         android:numColumns="@integer/grid_columns"
-        android:verticalSpacing="@dimen/grid_view_vertical_spacing" >
+        android:verticalSpacing="@dimen/grid_view_vertical_spacing"
+        android:isScrollContainer="false"
+        android:stretchMode="columnWidth" />
+
 
-    </GridView>
 
 </LinearLayout>

android/res/layout/fragment_journal_page.xml

@@ -7,7 +7,7 @@
     android:orientation="vertical"
     tools:context="fishrungames.bashgid.MainPageFragment" >
 
-    
+  
     <ListView
         android:id="@+id/listView"
         android:layout_width="match_parent"
@@ -20,4 +20,13 @@
 
     </ListView>
     
+      <ProgressBar
+        android:id="@+id/progressBar"
+        style="?android:attr/progressBarStyleLarge"
+        android:layout_width="@dimen/progress_bar_size"
+        android:layout_height="@dimen/progress_bar_size"
+        android:layout_gravity="center_horizontal"
+        android:indeterminate="true" />
+    
+    
 </LinearLayout>

android/res/layout/fragment_photo_album_page.xml

@@ -3,19 +3,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_margin="0dp"
-    android:background="@color/bkg1"
+    android:background="@color/black"
     android:orientation="vertical"
     tools:context="fishrungames.bashgid.MainPageFragment" >
 
-  
     <ListView
         android:id="@+id/listView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/large_margin"
+        android:layout_gravity="center_horizontal"
         android:layout_marginLeft="@dimen/large_margin"
         android:layout_marginRight="@dimen/large_margin"
-        android:divider="@color/bkg2"
+        android:divider="@color/black"
         android:dividerHeight="@dimen/small_divider_height" >
 
     </ListView>

android/res/layout/fragment_settings_page.xml

@@ -139,6 +139,7 @@
                 style="?android:attr/borderlessButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="@color/button_default"
                 android:text="@string/call_support"
                 android:textSize="@dimen/small_text_size"
                 android:layout_marginBottom="@dimen/medium_margin"
@@ -149,6 +150,7 @@
                 style="?android:attr/borderlessButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="@color/button_default"
                 android:text="@string/visit_kitap"
                 android:textSize="@dimen/small_text_size"
                 android:layout_marginBottom="@dimen/medium_margin" />
@@ -158,6 +160,7 @@
                 style="?android:attr/borderlessButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="@color/button_default"
                 android:text="@string/visit_developer"
                 android:textSize="@dimen/small_text_size"
                 android:layout_marginBottom="@dimen/medium_margin" />
@@ -167,6 +170,7 @@
                 style="?android:attr/borderlessButtonStyle"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:background="@color/button_default"
                 android:text="@string/visit_translator"
                 android:textSize="@dimen/small_text_size"
                 android:layout_marginBottom="@dimen/medium_margin" />

android/res/layout/fragment_video_record_page.xml

@@ -32,7 +32,9 @@
             <TextView
                 android:id="@+id/descriptionTextView"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/medium_margin" />
+
         </LinearLayout>
 
     </ScrollView>

android/res/layout/fragment_welcome.xml

@@ -36,7 +36,9 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:text="@string/lang_english"
-                android:textSize="@dimen/language_text_size" />
+                android:textColor="@color/text_white"
+                android:textSize="@dimen/language_text_size"
+                android:textStyle="bold" />
 
             <ImageButton
                 android:id="@+id/image_flag_usa"
@@ -65,7 +67,9 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:text="@string/lang_russian"
-                android:textSize="@dimen/language_text_size" />
+                android:textColor="@color/text_white"
+                android:textSize="@dimen/language_text_size"
+                android:textStyle="bold" />
 
             <ImageButton
                 android:id="@+id/image_flag_russia"
@@ -94,7 +98,9 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:text="@string/lang_chinese"
-                android:textSize="@dimen/language_text_size" />
+                android:textColor="@color/text_white"
+                android:textSize="@dimen/language_text_size"
+                android:textStyle="bold" />
 
             <ImageButton
                 android:id="@+id/image_flag_china"

android/res/layout/grid_page_list_element.xml

@@ -2,27 +2,27 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/LinearLayout1"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/video_page_height"
+    android:layout_height="wrap_content"
     android:layout_gravity="center_vertical"
     android:background="@color/bkg1"
     android:gravity="center_vertical"
     android:orientation="vertical"
     android:showDividers="middle" >
 
-    <fishrungames.bashgid.DynamicImageView
+    <fishrungames.bashgid.SquareImageView
         android:id="@+id/imageView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="bottom"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
         android:adjustViewBounds="true"
         android:cropToPadding="false"
         android:scaleType="centerCrop" />
 
     <TextView
         android:id="@+id/nameTextView"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
+        android:layout_gravity="clip_vertical"
         android:layout_margin="@dimen/medium_margin"
         android:text="dsdsd"
         android:textSize="@dimen/large_text_size"

android/res/layout/main_page_header.xml

@@ -13,6 +13,61 @@
         android:background="@color/bkg2" />
 
     <include layout="@layout/main_page_news"/>
+
+    <View
+        android:id="@+id/View01"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/large_divider_height"
+        android:background="@color/bkg2" />
+    
+    
+    
+    <LinearLayout
+           android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/bkg1"
+    android:orientation="vertical"
+    android:paddingLeft="20dp"
+    android:paddingRight="20dp" >
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|center_horizontal"
+            android:orientation="horizontal" >
+
+            <TextView
+                android:id="@+id/shortCatalogTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|center_horizontal"
+                android:layout_margin="@dimen/medium_margin"
+                android:text="@string/featured"
+                android:textSize="@dimen/large_text_size"
+                android:textStyle="bold" />
+
+            <ImageButton
+                android:id="@+id/refreshCatalogButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|center_horizontal"
+                android:background="@drawable/transparent"
+                android:src="@drawable/ic_action_refresh" />
+
+        </LinearLayout>
+
+    <ProgressBar
+        android:id="@+id/databaseDownloadProgressBar"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:indeterminate="false"
+        android:max="100"
+        android:progress="0" />
+
+    
+</LinearLayout>
+
     
 
 </LinearLayout>

android/res/layout/main_page_news.xml

@@ -6,23 +6,40 @@
     android:orientation="vertical"
     tools:context="fishrungames.bashgid.MainPageFragment" >
 
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical|center_horizontal"
+        android:orientation="horizontal" >
+    
     <TextView
         android:id="@+id/selectLanguageTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
+        android:layout_gravity="center_vertical|center_horizontal"
         android:layout_margin="@dimen/medium_margin"
         android:text="@string/news_header"
         android:textSize="@dimen/large_text_size"
         android:textStyle="bold" />
 
+    <ImageButton
+        android:id="@+id/refreshNewsButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical|center_horizontal"
+        android:background="@drawable/transparent"
+        android:src="@drawable/ic_action_refresh" />
+
+    </LinearLayout>
+
     <ProgressBar
-        android:id="@+id/progressBar"
-        style="?android:attr/progressBarStyleLarge"
-        android:layout_width="@dimen/progress_bar_size"
-        android:layout_height="@dimen/progress_bar_size"
-        android:layout_gravity="center_horizontal"
-        android:indeterminate="true" />
+        android:id="@+id/newsDownloadProgressBar"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:indeterminate="false"
+        android:max="100"
+        android:progress="0" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -36,6 +53,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="@dimen/medium_margin"
+            android:layout_marginRight="@dimen/medium_margin"
             android:background="@drawable/transparent_button"
             android:gravity="left|center_vertical"
             android:minHeight="0dp"
@@ -56,6 +74,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="@dimen/medium_margin"
+            android:layout_marginRight="@dimen/medium_margin"
             android:background="@drawable/transparent_button"
             android:gravity="left|center_vertical"
             android:minHeight="0dp"
@@ -76,6 +95,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="@dimen/medium_margin"
+            android:layout_marginRight="@dimen/medium_margin"
             android:background="@drawable/transparent_button"
             android:gravity="left|center_vertical"
             android:minHeight="0dp"
@@ -90,7 +110,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:background="@drawable/transparent"
+        android:layout_margin="@dimen/medium_margin"
+        android:background="@color/button_default"
+        android:padding="@dimen/medium_margin"
         android:text="@string/other_news" />
     
 </LinearLayout>

android/res/layout/main_page_search.xml

@@ -29,6 +29,8 @@
         android:id="@+id/searchEditText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:lines="1"
+    	android:maxLines="1"
         android:hint="@string/enter_search_query" >
 
         <requestFocus />
@@ -41,6 +43,9 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:drawableLeft="@drawable/ic_action_search"
+        android:layout_margin="@dimen/medium_margin"
+        android:background="@color/button_default"
+        android:padding="@dimen/medium_margin"
         android:text="@string/search_title"
         android:textSize="@dimen/large_text_size" />
     

android/res/layout/news_page_list_header.xml

@@ -8,22 +8,38 @@
     android:paddingRight="20dp"
     tools:context="fishrungames.bashgid.MainPageFragment" >
 
-    <TextView
-        android:id="@+id/dateTextView"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_margin="@dimen/medium_margin"
-        android:text="@string/news_header"
-        android:textSize="@dimen/large_text_size"
-        android:textStyle="bold" />
-    
+        android:layout_gravity="center_vertical|center_horizontal" >
+
+        <TextView
+            android:id="@+id/dateTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|center_horizontal"
+            android:layout_margin="@dimen/medium_margin"
+            android:text="@string/news_header"
+            android:textSize="@dimen/large_text_size"
+            android:textStyle="bold" />
+        
+        <ImageButton
+            android:id="@+id/refreshNewsButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|center_horizontal"
+            android:background="@drawable/transparent"
+            android:src="@drawable/ic_action_refresh" />
+
+    </LinearLayout>
+
     <ProgressBar
-        android:id="@+id/progressBar"
-        style="?android:attr/progressBarStyleLarge"
-        android:layout_width="@dimen/progress_bar_size"
-        android:layout_height="@dimen/progress_bar_size"
-        android:layout_gravity="center_horizontal"
-        android:indeterminate="true" />
+        android:id="@+id/newsDownloadProgressBar"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:indeterminate="false"
+        android:max="100"
+        android:progress="0" />
     
 </LinearLayout>

android/res/layout/photo_album_element.xml

@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/LinearLayout"
-    android:layout_width="match_parent"
+    android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="@color/light_grey_1"
-    android:orientation="horizontal"
+    android:layout_gravity="center_horizontal"
+    android:background="@color/black"
+    android:orientation="vertical"
     android:showDividers="middle" >
 
-    <fishrungames.bashgid.DynamicImageView
-                android:id="@+id/imageView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:adjustViewBounds="true"
-                android:cropToPadding="false"
-                android:scaleType="centerCrop" />
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:adjustViewBounds="true"
+        android:cropToPadding="false"
+        android:scaleType="centerCrop" />
 
 </LinearLayout>

android/res/layout/photo_album_list_element.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/LinearLayout1"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@color/light_grey_1"
-    android:orientation="vertical"
-    android:showDividers="middle" >
-
-    <ImageButton
-        android:id="@+id/imageButton"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:adjustViewBounds="true"
-        android:contentDescription="@string/related_image"
-        android:scaleType="fitCenter" />
-
-    <TextView
-        android:id="@+id/dateTextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="TextView" />
-
-</LinearLayout>

android/res/layout/photo_page_element.xml

@@ -3,6 +3,7 @@
     android:id="@+id/LinearLayout1"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/black"
     android:gravity="center_vertical"
     android:orientation="vertical" >
 
@@ -32,6 +33,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="@dimen/large_margin"
                 android:text="TextView"
+                android:textColor="@color/text_white"
                 android:textSize="@dimen/xlarge_text_size"
                 android:textStyle="bold" />
 
@@ -42,6 +44,7 @@
                 android:layout_marginLeft="@dimen/large_margin"
                 android:layout_marginRight="@dimen/large_margin"
                 android:text="TextView"
+                android:textColor="@color/text_white"
                 android:textSize="@dimen/medium_text_size" />
 
         </LinearLayout>

android/res/layout/search_page_list_header.xml

@@ -7,20 +7,30 @@
     tools:context="fishrungames.bashgid.SearchFragment" >
 
     <TextView
-        android:id="@+id/addressTextView"
+        android:id="@+id/titleTextView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:gravity="center_horizontal"
-        android:textSize="@dimen/medium_text_size"
+        android:textSize="@dimen/xlarge_text_size"
         android:textStyle="bold" />
 
+    <TextView
+        android:id="@+id/smallHintTextView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/search_small_hint"
+        android:textSize="@dimen/xsmall_text_size" />
+
     <EditText
         android:id="@+id/editText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="@string/enter_search_query"
-        android:inputType="text" >
+        android:inputType="text"
+        android:lines="1"
+        android:maxLines="1"
+        android:textSize="@dimen/medium_text_size" >
 
         <requestFocus />
     </EditText>
@@ -28,6 +38,7 @@
     <TextView
         android:id="@+id/hintTextView"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/xsmall_text_size" />
     
 </LinearLayout>

android/res/menu/global.xml

@@ -4,7 +4,7 @@
     <item android:id="@+id/action_search"
           android:title="@string/search_title"
           android:icon="@drawable/abc_ic_search_api_mtrl_alpha"
-          app:showAsAction="always|withText"
+          app:showAsAction="always"
           android:actionViewClass="android.widget.SearchView" />
 
 </menu>

android/res/values-ru/strings.xml

@@ -49,11 +49,6 @@
 
     <string name="go_to_website">Перейти на сайт</string>
     
-    <string name="buy">Купить...</string>
-    <string name="read">Читать</string>
-    <string name="price">Стоимость: </string>
-    <string name="rub">Руб.</string>
-    
     <string name="journal_open_map">Показать на карте</string>
     <string name="map_is_loading">Карта загружается...</string>
     <string name="map_is_loaded">Карта загружена</string>
@@ -74,7 +69,7 @@
 <string name="search_is_performing">Идет поиск, пожалуйста, подождите...</string>
 <string name="search_at_least_3_symbols">Чтобы начать поиск, введите как минимум 3 символа</string>
 
-<string name="credits">Башгид (c) 2015\n\nВсе права принадлежат ГУП «Китап»\nТелефон: +73472238838\nhttp://kitap-ufa.ru/\n\nРазработчик - Владислав Хорев\nТелефон: +79260492730\nEmail: mephi1984@gmail.com\n\nПеревод на китайский язык сделан Лилией Лисицей\nТелефон: +8615756011926\nEmail:lilialoo926@mail.ru</string>
+<string name="credits">Башгид (c) 2015\n\nВсе права принадлежат ГУП «Китап»\nТелефон: +73472238838\nhttp://kitap-ufa.ru/\n\nРазработчик - Владислав Хорев\nТелефон: +79260492730\nEmail: mephi1984@gmail.com\nhttp://fishrungames.ru/\n\nПеревод на китайский язык сделан Лилией Лисицей\nТелефон: +8615756011926\nEmail: littlefoxlilia@mail.ru\nhttp://littlefoxlilia.ru/</string>
 
 <string name="call_support">У вас возникли трудности при работе с приложением? Нажмите сюда, чтобы позвонить в техподдержку.</string>
 
@@ -90,6 +85,13 @@
     
 <string name="category_is_loaded">Категория загружена</string>
     
+    
+<string name="search_small_hint">Чтобы искать во всех категориях, нажмите кнопку Поиск справа вверху</string>
+    
+<string name="littlefoxlilia_link" formatted="false">http://littlefoxlilia.ru/ru/%D0%BE-%D1%81%D0%B5%D0%B1%D0%B5/</string>
+
+<string name="featured">Символы РБ</string>
+    
 
 	
 </resources>

android/res/values-zh-rCN/strings.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">俄罗斯联邦巴什基尔自治共和国指南</string>
+    
+    <string name="app_name">巴什科尔托斯坦指南</string>
     <string name="navigation_drawer_open">打开导航窗口</string>
     <string name="navigation_drawer_close">关闭导航窗口</string>
 	<string name="action_settings">设置</string>  
@@ -10,13 +11,13 @@
     
 	
     <string name="search_title">搜索标题</string>
-    <string name="enter_search_query">输入问题</string>
+    <string name="enter_search_query">输入关键词</string>
     
     
-    <string name="news_record_not_available">无法查看新闻记录</string>
-    <string name="other_news">其他新闻…</string>
+    <string name="news_record_not_available">无法查看记录</string>
+    <string name="other_news">其他…</string>
     
-    <string name="see_all">查看所有新闻</string>
+    <string name="see_all">更多</string>
     
     
     <string name="news_header">头条新闻</string>
@@ -29,10 +30,10 @@
     
     <string name="RB_Coat">标识</string>
     
-     <string name="drawer_header">俄罗斯联邦巴什基尔自治共和国指南</string>
+     <string name="drawer_header">巴什科尔托斯坦指南</string>
     <string name="drawer_guide">指南</string>
     <string name="drawer_news">新闻</string>
-    <string name="drawer_catalogue">目录</string>
+    <string name="drawer_catalogue">所有文章</string>
     <string name="drawer_map">地图</string>
     <string name="drawer_video">视频</string>
     <string name="drawer_photo_gallery">图片库</string>
@@ -40,12 +41,7 @@
     <string name="drawer_for_investor">投资者信息</string>
     <string name="drawer_settings">设置</string>
     
-    <string name="go_to_website">去现场</string>
-    
-    <string name="buy">Buy</string>
-    <string name="read">Read</string>
-    <string name="price">Price: </string>
-    <string name="rub">RUB</string>
+    <string name="go_to_website">跳转至详细信息页面</string>
     
     
     <string name="journal_open_map">在地图上显示</string>
@@ -57,7 +53,7 @@
     <string name="dialog_cancel">取消</string>
     
 <string name="search_everywhere">全面搜索</string>
-<string name="search_in">在%%搜索: </string>
+<string name="search_in">在%%搜索: %%</string>
     
 <string name="address_form">地址:</string>
 <string name="copied_text">复制文本</string>
@@ -65,23 +61,28 @@
 
 <string name="search_result_count">搜索结果: %% 文章被找到</string>
 <string name="search_is_performing">正在搜索，请稍等…</string>
-<string name="search_at_least_3_symbols">输入关键字符，开始搜索</string>
+<string name="search_at_least_3_symbols">请输入关键字并开始搜索</string>
 
-<string name="credits">Bashguide (c) 2015\n\nApplication owner: ГУП «Китап»\nPhone: +73472238838\nhttp://kitap-ufa.ru/\n\nApplication is made by Vladislav Khorev\nPhone: +79260492730\nEmail: mephi1984@gmail.com\n\nTranslation to Chinese made by Little Fox Lilia\nPhone: +8615756011926\nEmail:lilialoo926@mail.ru</string>
+<string name="credits">巴什科尔托斯坦指南 (c) 2015\n\n软件所有权：版权归俄罗斯国企“基塔普”公司所有 (ГУП «Китап»)\n电话: +73472238838\nhttp://kitap-ufa.ru/\n\n软件开发者：弗拉季斯拉夫·郝列夫\n电话: +79260492730\n邮箱: mephi1984@gmail.com\nhttp://fishrungames.ru/\n\n软件翻译：小狐狸莉莉娅\n电话: +8615756011926\n邮箱:littlefoxlilia@mail.ru\nhttp://littlefoxlilia.ru/</string>
 
-<string name="call_support">Having problems with application? Click here to call support.</string>
+<string name="call_support">程序出现问题？请点击这里寻求技术支持</string>
 
-<string name="visit_kitap">Visit ГУП «Китап» website</string>
+<string name="visit_kitap">查看“基塔普”公司网站</string>
 
-<string name="visit_developer">Visit developer\'s website</string>
+<string name="visit_developer">查看开发人员的个人网站</string>
 
-<string name="visit_translator">Visit translator\'s website</string>
+<string name="visit_translator">查看翻译人员的个人网站</string>
 
-<string name="hold_address">Tap and hold address to copy it to clipboard.</string>
+<string name="hold_address">请轻按地址直至复制到剪贴板</string>
 
 
-<string name="category_is_loading">Category is loading...</string>
-    
-<string name="category_is_loaded">Category is loaded</string>
+<string name="category_is_loading">正在加载目录...</string>
     
+<string name="category_is_loaded">目录加载完毕</string>
+<string name="search_small_hint">如果您想要搜索所有的目录，请点击右上角的搜索按钮</string>
+
+<string name="littlefoxlilia_link" formatted="false">http://littlefoxlilia.ru/zh/%E5%85%B3%E4%BA%8E%E6%88%91/</string>
+
+<string name="featured">巴什科尔托斯坦特色</string>
+
 </resources>

android/res/values/colors.xml

@@ -27,6 +27,7 @@
 
 <color name="bkg2">#d0d0d0</color>
 
+<color name="button_default">#e0e0e0</color>
 
 
 <color name="drawer_color">#202020</color>

android/res/values/strings.xml

@@ -49,12 +49,7 @@
     
     
     <string name="go_to_website">Go to website</string>
-    
-    <string name="buy">Buy</string>
-    <string name="read">Read</string>
-    <string name="price">Price: </string>
-    <string name="rub">RUB</string>
-    
+
     <string name="journal_open_map">Show on map</string>
     <string name="map_is_loading">Map is loading...</string>
     <string name="map_is_loaded">Map is loaded</string>
@@ -75,7 +70,7 @@
 <string name="search_is_performing">Search is performing, please wait...</string>
 <string name="search_at_least_3_symbols">To start search, enter at least 3 symbols</string>
 
-<string name="credits">Bashguide (c) 2015\n\nApplication owner: ГУП «Китап»\nPhone: +73472238838\nhttp://kitap-ufa.ru/\n\nApplication is made by Vladislav Khorev\nPhone: +79260492730\nEmail: mephi1984@gmail.com\n\nTranslation to Chinese made by Little Fox Lilia\nPhone: +8615756011926\nEmail:lilialoo926@mail.ru</string>
+<string name="credits">Bashguide (c) 2015\n\nApplication owner: ГУП «Китап»\nPhone: +73472238838\nhttp://kitap-ufa.ru/\n\nApplication is made by Vladislav Khorev\nPhone: +79260492730\nEmail: mephi1984@gmail.com\nhttp://fishrungames.ru/\n\nTranslation to Chinese made by Little Fox Lilia\nPhone: +8615756011926\nEmail: littlefoxlilia@mail.ru\nhttp://littlefoxlilia.ru/</string>
 
 <string name="call_support">Having problems with application? Click here to call support.</string>
 
@@ -91,6 +86,11 @@
 
 <string name="category_is_loaded">Category is loaded</string>
     
+<string name="search_small_hint">If you want to search in all categories, click search button at top right</string>
+    
+<string name="littlefoxlilia_link" formatted="false">http://littlefoxlilia.ru/en/about/</string>
+    
+<string name="featured">Featured RB</string>
 
     
 </resources>