Solve conflicts

This commit is contained in:
neslihanturan 2018-03-25 20:24:46 +03:00
commit e5c8591fa7
12 changed files with 220 additions and 112 deletions

View file

@ -253,9 +253,11 @@
<string name="about_rate_us"><u>Rate Us</u></string>
<string name="about_faq">Frequently Asked Questions</string>
<string name="welcome_skip_button">Skip Tutorial</string>
<string name="no_internet">Internet unavailable</string>
<string name="internet_established">Internet available</string>
<string name="error_notifications">Error fetching notifications</string>
<string name="no_notifications">No notifications found</string>
<string name="about_translate"><u>Translate</u></string>
<string name="about_translate_title">Languages</string>