mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-02 05:33:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'FreshRSS/dev' into dev

Browse Source
This commit is contained in:
Alexandre Alapetite
2015-05-17 22:07:20 +02:00
parent 83ab561242 cad42ea55f
commit 0ee60dd065
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/i18n/en/admin.php
View File

@@ -12,7 +12,7 @@ return array(
'title' => 'Authentication',
'title_reset' => 'Authentication reset',
'token' => 'Authentication token',
'token_help' => 'Allows to access RSS output of the default user without authentication:',
'token_help' => 'Allows access to RSS output of the default user without authentication:',
'type' => 'Authentication method',
'unsafe_autologin' => 'Allow unsafe automatic login using the format: ',
),

6
app/i18n/en/feedback.php
View File

@@ -2,7 +2,7 @@
return array(
'admin' => array(
'optimization_complete' => 'Optimization complete',
'optimization_complete' => 'Optimisation complete',
),
'access' => array(
'denied' => 'You don’t have permission to access this page',
@@ -52,7 +52,7 @@ return array(
'zip_error' => 'An error occured during Zip import.',
),
'sub' => array(
'actualize' => 'Actualize',
'actualize' => 'Actualise',
'category' => array(
'created' => 'Category %s has been created.',
'deleted' => 'Category has been deleted.',
@@ -86,7 +86,7 @@ return array(
'purge_completed' => 'Purge completed (%d articles deleted)',
),
'update' => array(
'can_apply' => 'FreshRSS will be now updated to the <strong>version %s</strong>.',
'can_apply' => 'FreshRSS will now be updated to the <strong>version %s</strong>.',
'error' => 'The update process has encountered an error: %s',
'file_is_nok' => 'Check permissions on <em>%s</em> directory. HTTP server must have rights to write into',
'finished' => 'Update completed!',

6
app/i18n/en/install.php
View File

@@ -3,11 +3,11 @@
return array(
'action' => array(
'finish' => 'Complete installation',
'fix_errors_before' => 'Fix errors before skip to the next step.',
'fix_errors_before' => 'Please fix errors before skipping to the next step.',
'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>',
'email_persona' => 'Login email 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)',
@@ -91,7 +91,7 @@ return array(
'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.',
'fix_errors_before' => 'Please fix errors before skipping to the next step.',
'javascript_is_better' => 'FreshRSS is more pleasant with JavaScript enabled',
'language' => array(
'_' => 'Language',