diff options
| author | Camil Staps | 2015-06-10 13:16:16 +0200 |
|---|---|---|
| committer | Camil Staps | 2015-06-10 13:16:16 +0200 |
| commit | dd9c36491ab017795a71bdc4624281b65dcabd11 (patch) | |
| tree | a99376c8d15be4f1bb6b66aa80600c5011c74a18 /app/src/main/res/values | |
| parent | IT WORKS (diff) | |
| parent | Aligned (EDIT) to the right (diff) | |
Merge branch 'master' of github:camilstaps/RSSin
Conflicts:
app/src/main/java/org/rssin/android/FeedSorterTrainer.java
app/src/main/java/org/rssin/neurons/FeedSorter.java
app/src/main/java/org/rssin/neurons/MultiNeuralNetwork.java
app/src/main/java/org/rssin/neurons/NeuralNetwork.java
app/src/main/java/org/rssin/rssin/SortedFeedItemContainer.java
Diffstat (limited to 'app/src/main/res/values')
| -rwxr-xr-x | app/src/main/res/values/strings.xml | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1a279c7..4696d0f 100755 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -65,4 +65,15 @@ <string name="article_author_unknown">Unknown author</string> <string name="article_published_on">Published on:</string> <string name="article_published_on_unknown"/> + <string name="navigation_drawer_all_feeds">All feeds</string> + <string name="navigation_drawer_start">START</string> + <string name="navigation_drawer_edit_filters">FILTERS</string> + <string name="navigation_drawer_edit_feeds">FEEDS</string> + <string name="article_feedback_saved">Feedback saved.</string> + <string name="feeds_activity_add_feed">Add feed</string> + <string name="feeds_activity_url">URL:</string> + <string name="filter_settings_title">Title</string> + <string name="filter_settings_new_title">New title:</string> + <string name="menu_article_share">Share</string> + <string name="navigation_drawer_edit_text">(EDIT)</string> </resources> |