chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 5 Activity

resolves merge conflict

Browse source
This commit is contained in:
Vavassor 2017-05-07 20:20:59 -04:00
commit daf0ec8e49
7 changed files with 180 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/res/values/strings.xml
View file

@ -166,6 +166,13 @@
<string name="notification_title_summary">%d new interactions</string>
<string name="description_account_locked">Locked Account</string>
<string name="about_title_activity">About</string>
<string name="about_application_version">App version: </string>
<string name="about_project_site">Project website: \n https://tusky.keylesspalace.com</string>
<string name="about_bug_feature_request_site">Bug reports &amp; feature requests: \n https://github.com/Vavassor/Tusky/issues</string>
<string name="about_tusky_account">Tusky\'s Profile</string>
<string name="status_share_content">Share content of toot</string>
<string name="status_share_link">Share link to toot</string>