vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-09-09 18:29:47 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into rework_settings

Browse source
This commit is contained in:
vanitasvitae 2016-06-24 12:40:56 +02:00
commit becef9ca71
9 changed files with 310 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,6 @@
<resources>
//Application
<!-- Application -->
<string name="navigation_drawer_open" translatable="false">Open navigation drawer</string>
<string name="navigation_drawer_close" translatable="false">Close navigation drawer</string>
@ -11,16 +11,16 @@
<string name="permissions_screenshot">You must grant \"Access Storage Permission\" to save screenshots. After that you should
completely close the app or restart the phone. If you don\'t permit the storage access but want to use the
screenshot function at a later time, you can grant the permission later. Please open then: systemsettings - apps -
weather. In the permissions section you can grant the \"write storage permission\".</string>
Diaspora. In the permissions section you can grant the \"write storage permission\".</string>
<string name="permissions_image">You must grant \"Access Storage Permission\" to save images. After that you should
completely close the app or restart the phone. If you don\'t permit the storage access but want to save images
at a later time, you can grant the permission later. Please open then: systemsettings - apps -
weather. In the permissions section you can grant the \"write storage permission\".</string>
Diaspora. In the permissions section you can grant the \"write storage permission\".</string>
<string name="permission_denied">Permission denied.</string>
<string name="permission_granted_try_again">Permission granted. Please try again.</string>
//Titles
<!-- Titles -->
<string name="title_notifications">D* Notifications</string>
<string name="title_conversations">D* Conversations</string>
@ -34,7 +34,7 @@
<string name="title_public">D* Public</string>
//Pod Activity
<!-- Pod Activity -->
<string name="title_activity_pods">Select Pod</string>
<string name="filter_hint">Enter pod domain</string>
@ -52,7 +52,7 @@
<string name="notifications">Notifications</string>
<string name="messages">Conversations</string>
// Drawer and App
<!-- Drawer and App -->
<string name="app_copyright" translatable="false">The community-run distributed social network</string>
<string name="jb_menu_1">Settings</string>
@ -83,7 +83,7 @@
<string name="toast_screenshot">Saving screenshot as:</string>
// Floating Action Buttons - Titles
<!-- Floating Action Buttons - Titles -->
<string name="go_to_top">Go to top</string>
<string name="search_by_tags_or_persons">Search by tags or persons</string>
@ -95,7 +95,7 @@
<string name="search_alert_people">by people</string>
<string name="search_alert_bypeople_validate_needsomedata">Please add a name</string>
//Dialog //License
<!-- Dialog License -->
<string name="markdown_text">&lt;i>"On diaspora* it's possible to format your text in status messages, comments
and conversations using a simplified mark-up system called Markdown. This page gives an introduction to the