aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/i18n/en/admin.php13
-rw-r--r--app/i18n/en/feedback.php1
-rw-r--r--app/i18n/en/gen.php93
-rw-r--r--app/i18n/en/index.php5
-rw-r--r--app/i18n/en/install.php102
-rw-r--r--app/i18n/en/sub.php2
-rw-r--r--app/i18n/fr/gen.php4
-rw-r--r--app/i18n/fr/install.php4
8 files changed, 127 insertions, 97 deletions
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index b79b17bc4..d93e52f04 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -135,10 +135,21 @@ return array(
'top_feed' => 'Top ten feeds',
),
'update' => array(
+ '_' => 'Update system',
+ 'apply' => 'Apply',
+ 'check' => 'Check for new updates',
+ 'last' => 'Last verification: %s',
'title' => 'Update system',
),
- 'users' => array(
+ 'user' => array(
'articles_and_size' => '%s articles (%s)',
+ 'create' => 'Create new user',
+ 'email_persona' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+ 'language' => 'Language',
+ 'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
'title' => 'Manage users',
+ 'user_list' => 'List of users',
+ 'username' => 'Username',
+ 'users' => 'Users',
),
);
diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php
index 192a33fcf..8df83ac0a 100644
--- a/app/i18n/en/feedback.php
+++ b/app/i18n/en/feedback.php
@@ -38,6 +38,7 @@ return array(
'zip_error' => 'An error occured during Zip import.',
),
'sub' => array(
+ 'actualize' => 'Actualize',
'category' => array(
'created' => 'Category %s has been created.',
'deleted' => 'Category has been deleted.',
diff --git a/app/i18n/en/gen.php b/app/i18n/en/gen.php
index a460910bd..5459b83e1 100644
--- a/app/i18n/en/gen.php
+++ b/app/i18n/en/gen.php
@@ -5,6 +5,7 @@ return array(
'actualize' => 'Actualize',
'back_to_rss_feeds' => '← Go back to your RSS feeds',
'cancel' => 'Cancel',
+ 'create' => 'Create',
'disable' => 'Disable',
'empty' => 'Empty',
'enable' => 'Enable',
@@ -13,6 +14,7 @@ return array(
'import' => 'Import',
'manage' => 'Manage',
'mark_read' => 'Mark as read',
+ 'mark_favorite' => 'Mark as favourite',
'remove' => 'Remove',
'see_website' => 'See website',
'submit' => 'Submit',
@@ -70,6 +72,7 @@ return array(
'march' => 'Mar',
'may' => 'May',
'mon' => 'Mon',
+ 'month' => 'months',
'nov' => 'nov',
'november' => 'Nov',
'oct' => 'oct',
@@ -128,137 +131,66 @@ return array(
'short' => array(
'attention' => 'Attention!',
'blank_to_disable' => 'Leave blank to disable',
+ 'by_author' => 'By <em>%s</em>',
'by_default' => 'By default',
'damn' => 'Damn!',
+ 'default_category' => 'Uncategorized',
'no' => 'No',
'ok' => 'Ok!',
- 'oops' => 'Oops!',
'or' => 'or',
'yes' => 'Yes',
),
- 'activate_sharing' => 'Activate sharing',
'after_onread' => 'After “mark all as read”,',
'archiving_configuration_help' => 'More options are available in the individual stream settings',
- 'article' => 'Article',
'article_icons' => 'Article icons',
'article_open_on_website' => 'when article is opened on its original website',
'article_published_on' => 'This article originally appeared on <a href="%s">%s</a>',
'article_published_on_author' => 'This article originally appeared on <a href="%s">%s</a> by %s',
'article_viewed' => 'when article is viewed',
- 'articles' => 'articles',
'articles_per_page' => 'Number of articles per page',
'articles_to_display' => 'Articles to display',
- 'author' => 'Author',
'auto_load_more' => 'Load next articles at the page bottom',
'auto_read_when' => 'Mark article as read…',
'auto_remove_article' => 'Hide articles after reading',
'auto_share' => 'Share',
'auto_share_help' => 'If there is only one sharing mode, it is used. Else modes are accessible by their number.',
- 'bad_opml_file' => 'Your OPML file is invalid',
- 'base_url' => 'Base URL',
- 'bdd' => 'Database',
- 'bdd_conf_is_ko' => 'Verify your database information.',
- 'bdd_conf_is_ok' => 'Database configuration has been saved.',
- 'bdd_configuration' => 'Database configuration',
- 'bdd_type' => 'Type of database',
'bottom_line' => 'Bottom line',
- 'by' => 'by',
- 'by_email' => 'By email',
- 'by_feed' => 'by feed',
- 'cache_is_ok' => 'Permissions on cache directory are good',
- 'can_not_be_deleted' => 'Cannot be deleted',
'categories' => 'Categories',
'categories_management' => 'Categories management',
'categories_updated' => 'Categories have been updated',
- 'categorize' => 'Store in a category',
- 'category_number' => 'Category n°%d',
- 'change_value' => 'You should change this value by any other',
- 'checks' => 'Checks',
- 'choose_language' => 'Choose a language for FreshRSS',
'collapse_article' => 'Collapse',
- 'congratulations' => 'Congratulations!',
'content_width' => 'Content width',
- 'create' => 'Create',
- 'create_user' => 'Create new user',
- 'ctype_is_nok' => 'You lack a required library for character type checking (php-ctype)',
- 'ctype_is_ok' => 'You have the required library for character type checking (ctype)',
- 'curl_is_nok' => 'You lack cURL (php5-curl package)',
- 'curl_is_ok' => 'You have version %s of cURL',
'current_user' => 'Current user',
- 'data_is_ok' => 'Permissions on data directory are good',
- 'default_category' => 'Uncategorized',
- 'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
'default_view' => 'Default view',
'delete_articles_every' => 'Remove articles after',
'display_articles_unfolded' => 'Show articles unfolded by default',
'display_categories_unfolded' => 'Show categories folded by default',
'display_configuration' => 'Display',
'do_not_change_if_doubt' => 'Don’t change if you doubt about it',
- 'dom_is_nok' => 'You lack a required library to browse the DOM (php-xml package)',
- 'dom_is_ok' => 'You have the required library to browse the DOM',
- 'favicons_is_ok' => 'Permissions on favicons directory are good',
- 'feed' => 'Feed',
- 'feeds' => 'Feeds',
- 'finish_installation' => 'Complete installation',
'first_article' => 'Skip to the first article',
- 'fix_errors_before' => 'Fix errors before skip to the next step.',
'focus_search' => 'Access search box',
- 'freshrss_installation' => 'Installation · FreshRSS',
- 'general_conf_is_ok' => 'General configuration has been saved.',
- 'general_configuration' => 'General configuration',
'help' => 'Display documentation',
'hide_read_feeds' => 'Hide categories & feeds with no unread article (does not work with “Show all articles” configuration)',
- 'host' => 'Host',
'html5_notif_timeout' => 'HTML5 notification timeout',
- 'http_referer_is_nok' => 'Please check that you are not altering your HTTP REFERER.',
- 'http_referer_is_ok' => 'Your HTTP REFERER is known and corresponds to your server.',
'img_with_lazyload' => 'Use "lazy load" mode to load pictures',
- 'install_not_deleted' => 'Something went wrong; you must delete the file <em>%s</em> manually.',
- 'installation_is_ok' => 'The installation process was successful.<br />The final step will now attempt to delete any file and database backup created during the update process.<br />You may choose to skip this step by deleting <kbd>./data/do-install.txt</kbd> manually.',
- 'installation_step' => 'Installation — step %d · FreshRSS',
'is_admin' => 'is administrator',
'javascript_for_shortcuts' => 'JavaScript must be enabled in order to use shortcuts',
- 'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
'jump_next' => 'jump to next unread sibling (feed or category)',
- 'language' => 'Language',
- 'language_defined' => 'Language has been defined.',
'last_article' => 'Skip to the last article',
- 'log_is_ok' => 'Permissions on logs directory are good',
'login_required' => 'Login required:',
- 'mark_cat_read' => 'Mark category as read',
- 'mark_favorite' => 'Mark as favourite',
- 'mark_feed_read' => 'Mark feed as read',
- 'minz_is_nok' => 'You lack the Minz framework. You should execute <em>build.sh</em> script or <a href="https://github.com/marienfressinaud/MINZ">download it on Github</a> and install in <em>%s</em> directory the content of its <em>/lib</em> directory.',
- 'minz_is_ok' => 'You have the Minz framework',
- 'month' => 'months',
'more_information' => 'More information',
'next_article' => 'Skip to the next article',
- 'next_page' => 'Skip to the next page',
- 'next_step' => 'Go to the next step',
'no_feed_actualized' => 'No RSS feed has been updated',
'no_query' => 'You haven’t created any user query yet.',
'no_query_filter' => 'No filter',
'no_rss_feed' => 'No RSS feed',
- 'no_selected_feed' => 'No feed selected.',
- 'not_read' => '%d unread',
- 'not_reads' => '%d unread',
'not_yet_implemented' => 'Not yet implemented',
'number_divided_when_reader' => 'Divided by 2 in the reading view.',
'number_feeds' => '%d feeds',
'optimize_bdd' => 'Optimize database',
'optimize_todo_sometimes' => 'To do occasionally to reduce the size of the database',
'password_api' => 'Password API<br /><small>(e.g., for mobile apps)</small>',
- 'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
- 'pcre_is_nok' => 'You lack a required library for regular expressions (php-pcre)',
- 'pcre_is_ok' => 'You have the required library for regular expressions (PCRE)',
- 'pdo_is_nok' => 'You lack PDO or one of the supported drivers (pdo_mysql, pdo_sqlite)',
- 'pdo_is_ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite)',
- 'persona_connection_email' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
- 'persona_is_ok' => 'Permissions on Mozilla Persona directory are good',
- 'php_is_nok' => 'Your PHP version is %s but FreshRSS requires at least version %s',
- 'php_is_ok' => 'Your PHP version is %s, which is compatible with FreshRSS',
- 'prefix' => 'Table prefix',
'previous_article' => 'Skip to the previous article',
'previous_page' => 'Skip to the previous page',
'public' => 'Public',
@@ -305,29 +237,14 @@ return array(
'show_adaptive' => 'Adjust showing',
'show_all_articles' => 'Show all articles',
'sort_order' => 'Sort order',
- 'steps' => 'Steps',
'sticky_post' => 'Stick the article to the top when opened',
'theme' => 'Theme',
- 'this_is_the_end' => 'This is the end',
'top_line' => 'Top line',
- 'update_apply' => 'Apply',
- 'update_check' => 'Check for new updates',
- 'update_end' => 'Update process is completed, now you can go to the final step.',
- 'update_last' => 'Last verification: %s',
- 'update_long' => 'This can take a long time, depending on the size of your database. You may have to wait for this page to time out (~5 minutes) and then refresh this page.',
- 'update_start' => 'Start update process',
- 'updated' => 'Modifications have been updated',
'upon_reception' => 'upon reception of the article',
'user_filter' => 'Access user filters',
'user_filter_help' => 'If there is only one user filter, it is used. Else filters are accessible by their number.',
- 'users' => 'Users',
- 'users_list' => 'List of users',
- 'version_update' => 'Update',
'width_large' => 'Large',
'width_medium' => 'Medium',
'width_no_limit' => 'No limit',
'width_thin' => 'Thin',
- 'your_diaspora_pod' => 'Your Diaspora* pod',
- 'your_shaarli' => 'Your Shaarli',
- 'your_wallabag' => 'Your wallabag',
);
diff --git a/app/i18n/en/index.php b/app/i18n/en/index.php
index b4d48ca73..941388b68 100644
--- a/app/i18n/en/index.php
+++ b/app/i18n/en/index.php
@@ -16,9 +16,6 @@ return array(
'version' => 'Version',
'website' => 'Website',
),
- 'entry' => array(
- 'by_author' => 'By <em>%s</em>',
- ),
'feed' => array(
'add' => 'You may add some feeds.',
'empty' => 'There is no article to show.',
@@ -42,6 +39,8 @@ return array(
'global_view' => 'Global view',
'main_stream' => 'Main stream',
'mark_all_read' => 'Mark all as read',
+ 'mark_cat_read' => 'Mark category as read',
+ 'mark_feed_read' => 'Mark feed as read',
'newer_first' => 'Newer first',
'non-starred' => 'Show all but favorites',
'normal_view' => 'Normal view',
diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index afca37ed3..ed3210190 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -1,5 +1,105 @@
<?php
return array(
-
+ 'action' => array(
+ 'finish' => 'Complete installation',
+ 'next_step' => 'Go to the next step',
+ ),
+ 'auth' => array(
+ 'email_persona' => 'Login mail address<br /><small>(for <a href="https://persona.org/" rel="external">Mozilla Persona</a>)</small>',
+ 'form' => 'Web form (traditional, requires JavaScript)',
+ 'http' => 'HTTP (for advanced users with HTTPS)',
+ 'none' => 'None (dangerous)',
+ 'password_form' => 'Password<br /><small>(for the Web-form login method)</small>',
+ 'persona' => 'Mozilla Persona (modern, requires JavaScript)',
+ 'type' => 'Authentication method',
+ ),
+ 'bdd' => array(
+ '_' => 'Database',
+ 'conf' => array(
+ '_' => 'Database configuration',
+ 'ko' => 'Verify your database information.',
+ 'ok' => 'Database configuration has been saved.',
+ ),
+ 'host' => 'Host',
+ 'prefix' => 'Table prefix',
+ 'password' => 'HTTP password',
+ 'type' => 'Type of database',
+ 'username' => 'HTTP username',
+ ),
+ 'check' => array(
+ '_' => 'Checks',
+ 'cache' => array(
+ 'nok' => 'Check permissions on <em>./data/cache</em> directory. HTTP server must have rights to write into',
+ 'ok' => 'Permissions on cache directory are good.',
+ ),
+ 'ctype' => array(
+ 'nok' => 'You lack a required library for character type checking (php-ctype).',
+ 'ok' => 'You have the required library for character type checking (ctype).',
+ ),
+ 'curl' => array(
+ 'nok' => 'You lack cURL (php5-curl package).',
+ 'ok' => 'You have cURL extension.',
+ ),
+ 'data' => array(
+ 'nok' => 'Check permissions on <em>./data</em> directory. HTTP server must have rights to write into',
+ 'ok' => 'Permissions on data directory are good.',
+ ),
+ 'dom' => array(
+ 'nok' => 'You lack a required library to browse the DOM (php-xml package).',
+ 'ok' => 'You have the required library to browse the DOM.',
+ ),
+ 'favicons' => array(
+ 'nok' => 'Check permissions on <em>./data/favicons</em> directory. HTTP server must have rights to write into',
+ 'ok' => 'Permissions on favicons directory are good.',
+ ),
+ 'http_referer' => array(
+ 'nok' => 'Please check that you are not altering your HTTP REFERER.',
+ 'ok' => 'Your HTTP REFERER is known and corresponds to your server.',
+ ),
+ 'logs' => array(
+ 'nok' => 'Check permissions on <em>./data/logs</em> directory. HTTP server must have rights to write into',
+ 'ok' => 'Permissions on logs directory are good.',
+ ),
+ 'minz' => array(
+ 'nok' => 'You lack the Minz framework.',
+ 'ok' => 'You have the Minz framework.',
+ ),
+ 'pcre' => array(
+ 'nok' => 'You lack a required library for regular expressions (php-pcre).',
+ 'ok' => 'You have the required library for regular expressions (PCRE).',
+ ),
+ 'pdo' => array(
+ 'nok' => 'You lack PDO or one of the supported drivers (pdo_mysql, pdo_sqlite).',
+ 'ok' => 'You have PDO and at least one of the supported drivers (pdo_mysql, pdo_sqlite).',
+ ),
+ 'persona' => array(
+ 'nok' => 'Check permissions on <em>./data/persona</em> directory. HTTP server must have rights to write into',
+ 'ok' => 'Permissions on Mozilla Persona directory are good.',
+ ),
+ 'php' => array(
+ 'nok' => 'Your PHP version is %s but FreshRSS requires at least version %s.',
+ 'ok' => 'Your PHP version is %s, which is compatible with FreshRSS.',
+ ),
+ ),
+ 'conf' => array(
+ '_' => 'General configuration',
+ 'ok' => 'General configuration has been saved.',
+ ),
+ 'congratulations' => 'Congratulations!',
+ 'default_user' => 'Username of the default user <small>(maximum 16 alphanumeric characters)</small>',
+ 'delete_articles_after' => 'Remove articles after',
+ 'fix_errors_before' => 'Fix errors before skip to the next step.',
+ 'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
+ 'language' => array(
+ '_' => 'Language',
+ 'choose' => 'Choose a language for FreshRSS',
+ 'defined' => 'Language has been defined.',
+ ),
+ 'not_deleted' => 'Something went wrong; you must delete the file <em>%s</em> manually.',
+ 'ok' => 'The installation process was successful.',
+ 'step' => 'step %d',
+ 'steps' => 'Steps',
+ 'title' => 'Installation · FreshRSS',
+ 'this_is_the_end' => 'This is the end',
);
diff --git a/app/i18n/en/sub.php b/app/i18n/en/sub.php
index 27559bbc4..2b62e4775 100644
--- a/app/i18n/en/sub.php
+++ b/app/i18n/en/sub.php
@@ -27,8 +27,10 @@ return array(
'informations' => 'Information',
'keep_history' => 'Minimum number of articles to keep',
'moved_category_deleted' => 'When you delete a category, their feeds are automatically classified under <em>%s</em>.',
+ 'no_selected' => 'No feed selected.',
'number_entries' => '%d articles',
'stats' => 'Statistics',
+ 'think_to_add' => 'You may add some feeds.',
'title' => 'Title',
'title_add' => 'Add a RSS feed',
'ttl' => 'Do not automatically refresh more often than',
diff --git a/app/i18n/fr/gen.php b/app/i18n/fr/gen.php
index b2cdd3504..bb4478360 100644
--- a/app/i18n/fr/gen.php
+++ b/app/i18n/fr/gen.php
@@ -54,6 +54,8 @@ return array(
'december' => 'décembre',
'feb' => 'fév.',
'february' => 'février',
+ 'format_date' => 'j %s Y',
+ 'format_date_hour' => 'j %s Y \\à H\\:i',
'fri' => 'ven.',
'jan' => 'jan.',
'january' => 'janvier',
@@ -61,8 +63,6 @@ return array(
'july' => 'juillet',
'jun' => 'juin',
'june' => 'juin',
- 'format_date' => 'j %s Y',
- 'format_date_hour' => 'j %s Y \\à H\\:i',
'last_3_month' => 'Depuis les trois derniers mois',
'last_6_month' => 'Depuis les six derniers mois',
'last_month' => 'Depuis le mois dernier',
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
index 738b1c084..f1ef2ea3f 100644
--- a/app/i18n/fr/install.php
+++ b/app/i18n/fr/install.php
@@ -17,7 +17,7 @@ return array(
'bdd' => array(
'_' => 'Base de données',
'conf' => array(
- '_' => 'Base de données',
+ '_' => 'Configuration de la base de données',
'ko' => 'Vérifiez les informations d’accès à la base de données.',
'ok' => 'La configuration de la base de données a été enregistrée.',
),
@@ -96,8 +96,8 @@ return array(
'choose' => 'Choisissez la langue pour FreshRSS',
'defined' => 'La langue a bien été définie.',
),
- 'ok' => 'L’installation s’est bien passée.',
'not_deleted' => 'Quelque chose s’est mal passé, vous devez supprimer le fichier <em>%s</em> à la main.',
+ 'ok' => 'L’installation s’est bien passée.',
'step' => 'étape %d',
'steps' => 'Étapes',
'title' => 'Installation · FreshRSS',
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-10 13:51:09 +0000