Merge branch 'develop' of https://github.com/stom79/mastalab into develop

This commit is contained in:
stom79 2018-01-25 13:50:30 +01:00
commit 0d9238b8a3
1 changed files with 5 additions and 5 deletions

View File

@ -212,8 +212,8 @@
<item quantity="other">և %d այլ ծանուցումներ</item>
</plurals>
<plurals name="other_notif_hometimeline">
<item quantity="one">and another toot to discover</item>
<item quantity="other">and %d other toots to discover</item>
<item quantity="one">և մեկ այլ թութ</item>
<item quantity="other">և %d այլ թութ</item>
</plurals>
<string name="delete_notification_ask">Ջնջե՞լ ծանուցումը</string>
<string name="delete_notification_ask_all">Ջնջե՞լ բոլոր ծանուցումները</string>
@ -271,9 +271,9 @@
<string name="set_display_local">Display local timeline</string>
<string name="set_display_global">Display federated timeline</string>
<string name="set_disable_gif">Disable GIF avatars</string>
<string name="set_folder_title">Path: </string>
<string name="set_auto_store_toot">Save drafts automatically</string>
<string name="set_bubble_counter">Display counters</string>
<string name="set_folder_title">Հետագիծ․ </string>
<string name="set_auto_store_toot">Ինքնաշխատ պահել սևագրերը</string>
<string name="set_bubble_counter">Ցուցադրել հաշվիչները</string>
<string name="set_auto_add_media_url">Add URL of media in toots</string>
<string name="settings_title_notifications">Manage notifications</string>
<string name="set_notif_follow">Notify when someone follows you</string>