wbrawner/news-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'cc41daa4c8a2c28e6d4e215a735782dd1868fb8d'

Browse source 
# Conflicts:
#	News-Android-App/src/main/res/values-el/strings.xml
#	News-Android-App/src/main/res/values/strings.xml
This commit is contained in:
David Luhmer 2018-03-02 14:46:20 -04:00
commit 5076e0895f
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
News-Android-App/src/main/res/values/strings.xml
View file

@ -6,9 +6,9 @@
<string name="title_activity_sync_interval_selector">Sync Interval Selector</string>
<string name="title_activity_news_detail">NewsDetailActivity</string>
<string name="empty_view_content">No items here</string>
<string name="toast_GettingMoreItems">Started downloading more items… Please wait.</string>
<string name="toast_GettingMoreItems">Download of more items started… Please wait.</string>
<string name="no_wifi_available">No WiFi connected</string>
<string name="do_you_want_to_download_without_wifi">Do you want to download the images without a WiFi connection</string>
<string name="do_you_want_to_download_without_wifi">Do you want to download the images without a Wi-Fi connection</string>
<string name="current_version">You\'re using Version %s</string>
<string name="widget_header">Nextcloud News</string>
<plurals name="message_bar_new_articles_available">
@ -31,7 +31,7 @@
<string name="action_starred">Starred</string>
<string name="action_read">Read</string>
<string name="action_playPodacst">Play Podcast</string>
<string name="action_openInBrowser">Open in Browser</string>
<string name="action_openInBrowser">Open in Web browser</string>
<string name="action_Share">Share</string>
<string name="action_login">Server Settings</string>
<string name="action_save">Save</string>
@ -85,8 +85,9 @@
<string name="action_sign_in_short">Sign in</string>
<string name="login_progress_signing_in">Signing in…</string>
<!-- <string name="error_incorrect_password">Incorrect password</string> -->
<string name="error_field_required">This field is required</string>
<string name="error_invalid_url">This url is incorrect</string>
<string name="error_invalid_url">Incorrect URL</string>
<!-- Import Accounts -->
@ -137,7 +138,7 @@
<string name="pref_title_DisableHostnameVerification">Disable Hostname Verification</string>
<string name="pref_title_NavigateWithVolumeButtons">Navigate with volume buttons</string>
<string name="pref_title_MarkAsReadWhileScrolling">Mark as read while scrolling</string>
<string name="pref_title_OpenInBrowserDirectly">Use external browser to view articles</string>
<string name="pref_title_OpenInBrowserDirectly">Skip detailed view and open article in the browser</string>
<string name="dialog_feature_not_available">This feature is not available in this (open-source) version of this app. If you want to use this feature please download the app from the GitHub Repository or download the App from the Google PlayStore.</string>
@ -156,7 +157,7 @@
<!-- Settings for Display -->
<string name="pref_header_display">Display</string>
<string name="pref_title_app_theme">App theme</string>
<string name="pref_title_app_theme">App theme (start the program again to apply)</string>
<string name="pref_title_feed_list_layout">Feed list layout</string>
<string name="pref_display_title_lines_count">Line Count for title</string>
<string name="pref_display_browser">Browser</string>
@ -164,7 +165,6 @@
<string name="pref_display_news_detail_actionbar_icons_title">Action icons (Detail View)</string>
<string-array name="pref_display_news_detail_actionbar_icons" translatable="false">
@ -294,9 +294,9 @@
<string name="login_dialog_title_error">Error</string>
<string name="login_dialog_text_something_went_wrong">Something went wrong :(</string>
<string name="login_dialog_text_zero_version_code">The Web News App returned Version "0". Please take a look at the following bug report: https://github.com/nextcloud/news/issues/5#issuecomment-242883795</string>
<string name="login_dialog_text_not_compatible">This App version is not compatible with your Nextcloud News App. Please update the news app and the appframework.</string>
<string name="login_dialog_text_not_compatible">This App version is not compatible with your Nextcloud News App. Please upgrade the news app and the appframework.</string>
<string name="login_dialog_title_security_warning">Security Warning</string>
<string name="login_dialog_text_security_warning">You\'re not using https. An attacker could intercept your traffic and gain access to some sensitive data (e.g. your password). So it\'s strongly recommend to use https!</string>
<string name="login_dialog_text_security_warning">You\'re not using HTTPS, which is strongly encouraged. An attacker could intercept your traffic and gain access to some sensitive data (e.g. your password).</string>
<!-- Data & Sync -->