diff options
| author | Allan Wang <me@allanwang.ca> | 2019-04-25 15:26:09 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2019-04-25 15:26:09 -0700 |
| commit | 0b262754ad8489bda1ad21494b847652eb125aec (patch) | |
| tree | 008b3dfd3ed44d1a6d3518a33d4a00ed65732bba /app/src/main/res/values | |
| parent | ae6fdc31eb3c6d71391e825f7d3575b3565b8aea (diff) | |
| parent | 00f25fee8c1b1f002a92d6c9b16088b1b8b33ba4 (diff) | |
| download | frost-0b262754ad8489bda1ad21494b847652eb125aec.tar.gz frost-0b262754ad8489bda1ad21494b847652eb125aec.tar.bz2 frost-0b262754ad8489bda1ad21494b847652eb125aec.zip | |
Merge dev
Diffstat (limited to 'app/src/main/res/values')
| -rw-r--r-- | app/src/main/res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 12 | ||||
| -rw-r--r-- | app/src/main/res/values/strings_no_translate.xml | 1 | ||||
| -rw-r--r-- | app/src/main/res/values/strings_pref_behaviour.xml | 2 |
4 files changed, 17 insertions, 0 deletions
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 713bd1b4..847e74cb 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -9,4 +9,6 @@ <dimen name="tab_bar_height">50dp</dimen> <dimen name="intro_bar_height">64dp</dimen> <dimen name="badge_icon_size">20dp</dimen> + + <dimen name="toolbar_icon_size">24dp</dimen> </resources> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5fd35613..0c2e625c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -62,4 +62,16 @@ <string name="no_new_notifications">No new notifications found</string> + <string name="today">Today</string> + <string name="yesterday">Today</string> + <!-- + Template used to display human readable string; + For instance: + Today at 1:23 PM + Mar 13 at 9:00 AM + + The first element is the day, and the second element is the time + --> + <string name="time_template">%1s at %2s</string> + </resources> diff --git a/app/src/main/res/values/strings_no_translate.xml b/app/src/main/res/values/strings_no_translate.xml index 9eb85dc2..d9aa6cee 100644 --- a/app/src/main/res/values/strings_no_translate.xml +++ b/app/src/main/res/values/strings_no_translate.xml @@ -6,6 +6,7 @@ <string name="translation_url" translatable="false">https://crwd.in/frost-for-facebook</string> <string name="github_url" translatable="false">https://github.com/AllanWang/Frost-for-Facebook</string> <string name="github_downloads_url" translatable="false">https://github.com/AllanWang/Frost-for-Facebook/releases</string> + <string name="fdroid_url" translatable="false">https://f-droid.org/en/packages/com.pitchedapps.frost</string> <string name="reddit_url" translatable="false">https://www.reddit.com/r/FrostForFacebook</string> <string name="slack_url" translatable="false">https://frost-slack.allanwang.ca</string> <string name="xda_url" translatable="false">https://forum.xda-developers.com/android/apps-games/app-frost-facebook-t3685896</string> diff --git a/app/src/main/res/values/strings_pref_behaviour.xml b/app/src/main/res/values/strings_pref_behaviour.xml index 62e94112..77c35c1c 100644 --- a/app/src/main/res/values/strings_pref_behaviour.xml +++ b/app/src/main/res/values/strings_pref_behaviour.xml @@ -17,6 +17,8 @@ <string name="force_message_bottom_desc">When loading a message thread, trigger a scroll to the bottom of the page rather than loading the page as is.</string> <string name="enable_pip">Enable PIP</string> <string name="enable_pip_desc">Enable picture in picture videos</string> + <string name="autoplay_settings">Autoplay Settings</string> + <string name="autoplay_settings_desc">Open Facebook\'s auto play settings. Note that it must be disabled for PIP to work.</string> <string name="exit_confirmation">Exit Confirmation</string> <string name="exit_confirmation_desc">Show confirmation dialog before exiting the app</string> <string name="analytics">Analytics</string> |