summaryrefslogtreecommitdiff
path: root/app/i18n
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-04-27 21:08:29 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-04-27 21:08:29 +0200
commit0e95494e29353a9ae31fb1196c6c9aaf556ae981 (patch)
treeda499463fda30157c172d92a1e02e972a6c6d6e5 /app/i18n
parent2a52d315bed725d5997a42547673bccfe2409b5d (diff)
Fix issue #26 : possibilité de s'abonner à des flux derrière authentification HTTP + correction quelques traductions
Diffstat (limited to 'app/i18n')
-rw-r--r--app/i18n/en.php7
-rw-r--r--app/i18n/fr.php3
2 files changed, 6 insertions, 4 deletions
diff --git a/app/i18n/en.php b/app/i18n/en.php
index 921f86ddc..1bb7c2213 100644
--- a/app/i18n/en.php
+++ b/app/i18n/en.php
@@ -9,7 +9,7 @@ return array (
'configuration' => 'Configuration',
'general_and_reading' => 'General and reading',
'categories' => 'Categories',
- 'category' => 'Catégory',
+ 'category' => 'Category',
'shortcuts' => 'Shortcuts',
'about' => 'About',
@@ -88,7 +88,7 @@ return array (
'cancel' => 'Cancel',
'back_to_rss_feeds' => '← Go back to your RSS feeds',
- 'feeds_moved_category_deleted' => 'When you delete a category, their feeds are automatically classified under <em>%s</ em>.',
+ 'feeds_moved_category_deleted' => 'When you delete a category, their feeds are automatically classified under <em>%s</em>.',
'category_number' => 'Category n°%d',
'ask_empty' => 'Clear ?',
'number_feeds' => '%d feeds',
@@ -123,6 +123,7 @@ return array (
'no' => 'No',
'css_path_on_website' => 'Articles CSS path on original website',
'retrieve_truncated_feeds' => 'Retrieves truncated RSS feeds (attention, requires more time!)',
+ 'http_authentication' => 'HTTP Authentication',
'http_username' => 'HTTP username',
'http_password' => 'HTTP password',
'blank_to_disable' => 'Leave blank to disable',
@@ -198,7 +199,7 @@ return array (
'september' => 'september',
'october' => 'october',
'november' => 'november',
- 'december' => 'décember',
+ 'december' => 'december',
// special format for date() function
'Jan' => '\J\a\n\u\a\r\y',
'Feb' => '\F\e\b\r\u\a\r\y',
diff --git a/app/i18n/fr.php b/app/i18n/fr.php
index 3178f3687..c5bba9d07 100644
--- a/app/i18n/fr.php
+++ b/app/i18n/fr.php
@@ -123,7 +123,8 @@ return array (
'no' => 'Non',
'css_path_on_website' => 'Chemin CSS des articles sur le site d\'origine',
'retrieve_truncated_feeds' => 'Permet de récupérer les flux tronqués (attention, demande plus de temps !)',
- 'http_username' => 'Username HTTP',
+ 'http_authentication' => 'Authentification HTTP',
+ 'http_username' => 'Identifiant HTTP',
'http_password' => 'Mot de passe HTTP',
'blank_to_disable' => 'Laissez vide pour désactiver',
'not_yet_implemented' => 'Pas encore implémenté',