Commit 3b63e0d1 authored by Lucio Maciel's avatar Lucio Maciel

Merge branch 'develop' into feature/db-spotlight

parents c319c1a9 4c5a07f7
...@@ -6,5 +6,5 @@ ...@@ -6,5 +6,5 @@
android:id="@+id/action_save_image" android:id="@+id/action_save_image"
android:icon="@drawable/ic_file_download_white_24dp" android:icon="@drawable/ic_file_download_white_24dp"
android:title="@string/action_save_to_gallery" android:title="@string/action_save_to_gallery"
android:showAsAction="always" /> app:showAsAction="always" />
</menu> </menu>
\ No newline at end of file
...@@ -169,9 +169,8 @@ ...@@ -169,9 +169,8 @@
<string name="permission_starring_not_allowed">Отмечивание запрещено</string> <string name="permission_starring_not_allowed">Отмечивание запрещено</string>
<!-- Favorite/Unfavorite chat room --> <!-- Favorite/Unfavorite chat room -->
<!-- TODO Add proper translation--> <string name="title_favorite_chat">Добавить чат в избранное</string>
<string name="title_favorite_chat">Favorite chat</string> <string name="title_unfavorite_chat">Удалить чат из избранного</string>
<string name="title_unfavorite_chat">Unfavorite chat</string>
<!-- Members List --> <!-- Members List -->
<string name="title_members_list">Пользователи</string> <string name="title_members_list">Пользователи</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment