aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Roland Arendes <roland@arendes.de> 2018-09-25 23:05:51 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2018-09-25 23:05:51 +0200
commitde0e9351052b484e054899b9528387d1bde0a1c5 (patch)
tree5b90e76bcccf31b311e8eae30ebc6f8e755a0392
parent21e2409b9fb22351f320a658c7874dd41d0f824a (diff)
Small docs update (see #1999) and i18n fix (see #1309) (#2026)
* Update conf.php Small i18n fix for german translation * Update README.md Added Reeder-3 as an supported client via Fever API * Update README.md Adding Reeder-3/iOS as an supported client * Update README.fr.md Adding Reeder-3/iOS as an supported client * Update 06_Fever_API.md Adding Reeder-3/iOS as an supported client * Update 06_Fever_API.md Adding Reeder-3/iOS as an supported client * Adding myself As requested, adding myself to the list of contributors
-rw-r--r--CREDITS.md1
-rw-r--r--README.fr.md1
-rw-r--r--README.md1
-rw-r--r--app/i18n/de/conf.php2
-rw-r--r--docs/en/users/06_Fever_API.md1
-rw-r--r--docs/fr/users/06_Fever_API.md1
6 files changed, 6 insertions, 1 deletions
diff --git a/CREDITS.md b/CREDITS.md
index 4b6fdab23..a02b9477d 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -13,6 +13,7 @@ People are sorted by name so please keep this order.
* [Amaury Carrade](https://github.com/AmauryCarrade): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=AmauryCarrade), [Web](https://amaury.carrade.eu/)
* [Anton Smirnov](https://github.com/sandfoxme): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:sandfoxme), [Web](http://sandfox.me/)
* [ASMfreaK](https://github.com/ASMfreaK): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=ASMfreaK)
+* [chemical1979](https://github.com/chemical1979): [contributions](https://github.com/FreshRSS/FreshRSS/commits?author=chemical1979)
* [Craig Andrews](https://github.com/candrews): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:candrews), [Web](http://candrews.integralblue.com/)
* [Crupuk](https://github.com/Crupuk): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Crupuk)
* [Damstre](https://github.com/Damstre): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:Damstre)
diff --git a/README.fr.md b/README.fr.md
index ef1092e4a..e638568b7 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -187,6 +187,7 @@ Tout client supportant une API de type Fever ; Sélection :
* iOS
* [Fiery Feeds](https://itunes.apple.com/app/fiery-feeds-rss-reader/id1158763303) (Propriétaire)
* [Unread](https://itunes.apple.com/app/unread-rss-reader/id1252376153) (Propriétaire)
+ * [Reeder-3](https://itunes.apple.com/app/reeder-3/id697846300) (Propriétaire)
* MacOS
* [Readkit](https://itunes.apple.com/app/readkit/id588726889) (Propriétaire)
diff --git a/README.md b/README.md
index 0111d6882..0e0a4ba3a 100644
--- a/README.md
+++ b/README.md
@@ -187,6 +187,7 @@ Supported clients are:
* iOS
* [Fiery Feeds](https://itunes.apple.com/app/fiery-feeds-rss-reader/id1158763303) (Closed source)
* [Unread](https://itunes.apple.com/app/unread-rss-reader/id1252376153) (Closed source)
+ * [Reeder-3](https://itunes.apple.com/app/reeder-3/id697846300) (Closed source)
* MacOS
* [Readkit](https://itunes.apple.com/app/readkit/id588726889) (Closed source)
diff --git a/app/i18n/de/conf.php b/app/i18n/de/conf.php
index 78f3b4510..3a0c98c27 100644
--- a/app/i18n/de/conf.php
+++ b/app/i18n/de/conf.php
@@ -102,7 +102,7 @@ return array(
'read' => array(
'article_open_on_website' => 'wenn der Artikel auf der Original-Webseite geöffnet wird',
'article_viewed' => 'wenn der Artikel angesehen wird',
- 'scroll' => 'beim Blättern',
+ 'scroll' => 'beim Scrollen bzw. Überspringen',
'upon_reception' => 'beim Empfang des Artikels',
'when' => 'Artikel als gelesen markieren…',
),
diff --git a/docs/en/users/06_Fever_API.md b/docs/en/users/06_Fever_API.md
index 7d2af8b02..971cf957d 100644
--- a/docs/en/users/06_Fever_API.md
+++ b/docs/en/users/06_Fever_API.md
@@ -23,6 +23,7 @@ Tested with:
- iOS
- [Fiery Feeds](https://itunes.apple.com/app/fiery-feeds-rss-reader/id1158763303)
- [Unread](https://itunes.apple.com/app/unread-rss-reader/id1252376153)
+ - [Reeder-3](https://itunes.apple.com/app/reeder-3/id697846300)
- MacOS
- [Readkit](https://itunes.apple.com/app/readkit/id588726889)
diff --git a/docs/fr/users/06_Fever_API.md b/docs/fr/users/06_Fever_API.md
index 6ad817041..50650ebcd 100644
--- a/docs/fr/users/06_Fever_API.md
+++ b/docs/fr/users/06_Fever_API.md
@@ -10,6 +10,7 @@ Testé avec:
- iOS
- [Fiery Feeds](https://itunes.apple.com/app/fiery-feeds-rss-reader/id1158763303)
- [Unread](https://itunes.apple.com/app/unread-rss-reader/id1252376153)
+ - [Reeder-3](https://itunes.apple.com/app/reeder-3/id697846300)
- MacOS
- [Readkit](https://itunes.apple.com/app/readkit/id588726889)