aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexis Degrugillier <aledeg@users.noreply.github.com> 2021-01-02 11:14:23 -0500
committerGravatar GitHub <noreply@github.com> 2021-01-02 17:14:23 +0100
commit08d76967b0664ee668d9b508993b52c44c3bfa78 (patch)
tree835aa85ded33b3d428a58c2bb93c07ca9d65f24e
parentce9eb7b14c378526d9488f0eb20e663580e9f429 (diff)
Add temp folder check during install (#3312)
Before, the temp path was not check during install. With some configuration, FRSS was not working because of a non-writable temp directory. It happened with XAMPP on MacOS X but it might be the case for other platforms. Now, the temp path is checked during install to make sure it is writable. See #3310
-rw-r--r--app/i18n/cz/install.php12
-rw-r--r--app/i18n/de/install.php20
-rw-r--r--app/i18n/en-us/conf.php2
-rw-r--r--app/i18n/en-us/feedback.php6
-rw-r--r--app/i18n/en-us/gen.php4
-rw-r--r--app/i18n/en-us/install.php12
-rw-r--r--app/i18n/en-us/sub.php14
-rw-r--r--app/i18n/en/install.php12
-rwxr-xr-xapp/i18n/es/install.php12
-rw-r--r--app/i18n/fr/install.php12
-rw-r--r--app/i18n/he/install.php12
-rw-r--r--app/i18n/it/install.php12
-rw-r--r--app/i18n/kr/install.php12
-rw-r--r--app/i18n/nl/install.php12
-rw-r--r--app/i18n/oc/install.php12
-rw-r--r--app/i18n/pl/install.php12
-rw-r--r--app/i18n/pt-br/install.php12
-rw-r--r--app/i18n/ru/install.php12
-rw-r--r--app/i18n/sk/install.php12
-rw-r--r--app/i18n/tr/install.php12
-rw-r--r--app/i18n/zh-cn/install.php12
-rw-r--r--app/install.php14
-rw-r--r--cli/i18n/ignore/en-us.php15
-rw-r--r--lib/lib_install.php4
24 files changed, 181 insertions, 90 deletions
diff --git a/app/i18n/cz/install.php b/app/i18n/cz/install.php
index cc582d781..36b1e9f11 100644
--- a/app/i18n/cz/install.php
+++ b/app/i18n/cz/install.php
@@ -33,7 +33,7 @@ return array(
'_' => 'Kontrola',
'already_installed' => 'Zjistili jsme, že FreshRSS je již nainstalován!',
'cache' => array(
- 'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/cache</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
+ 'nok' => 'Zkontrolujte oprávnění adresáře <em>%s</em>. HTTP server musí mít do tohoto adresáře práva zápisu.',
'ok' => 'Oprávnění adresáře cache jsou v pořádku.',
),
'ctype' => array(
@@ -45,7 +45,7 @@ return array(
'ok' => 'Máte rozšíření cURL.',
),
'data' => array(
- 'nok' => 'Zkontrolujte oprávnění adresáře <em>./data</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
+ 'nok' => 'Zkontrolujte oprávnění adresáře <em>%s</em>. HTTP server musí mít do tohoto adresáře práva zápisu.',
'ok' => 'Oprávnění adresáře data jsou v pořádku.',
),
'dom' => array(
@@ -53,7 +53,7 @@ return array(
'ok' => 'Máte požadovanou knihovnu pro procházení DOM.',
),
'favicons' => array(
- 'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/favicons</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
+ 'nok' => 'Zkontrolujte oprávnění adresáře <em>%s</em>. HTTP server musí mít do tohoto adresáře práva zápisu.',
'ok' => 'Oprávnění adresáře favicons jsou v pořádku.',
),
'fileinfo' => array(
@@ -88,8 +88,12 @@ return array(
'nok' => 'Vaše verze PHP je %s, ale FreshRSS vyžaduje alespoň verzi %s.',
'ok' => 'Vaše verze PHP je %s a je kompatibilní s FreshRSS.',
),
+ 'tmp' => array(
+ 'nok' => 'Zkontrolujte oprávnění adresáře <em>%s</em>. HTTP server musí mít do tohoto adresáře práva zápisu.',
+ 'ok' => 'Permissions on the temp directory are good.', // TODO - Translation
+ ),
'users' => array(
- 'nok' => 'Zkontrolujte oprávnění adresáře <em>./data/users</em>. HTTP server musí mít do tohoto adresáře práva zápisu',
+ 'nok' => 'Zkontrolujte oprávnění adresáře <em>%s</em>. HTTP server musí mít do tohoto adresáře práva zápisu.',
'ok' => 'Oprávnění adresáře users jsou v pořádku.',
),
'xml' => array(
diff --git a/app/i18n/de/install.php b/app/i18n/de/install.php
index 3bb79532a..db1f71984 100644
--- a/app/i18n/de/install.php
+++ b/app/i18n/de/install.php
@@ -33,8 +33,8 @@ return array(
'_' => 'Überprüfungen',
'already_installed' => 'Wir haben festgestellt, dass FreshRSS bereits installiert wurde!',
'cache' => array(
- 'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/cache</em>. Der HTTP-Server muss Schreibrechte besitzen.',
- 'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data/cache</em> sind in Ordnung.',
+ 'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>%s</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+ 'ok' => 'Die Berechtigungen des Verzeichnisses <em>%s</em> sind in Ordnung.',
),
'ctype' => array(
'nok' => 'Ihnen fehlt eine benötigte Bibliothek für die Überprüfung von Zeichentypen (php-ctype).',
@@ -45,16 +45,16 @@ return array(
'ok' => 'Sie haben die cURL-Erweiterung.',
),
'data' => array(
- 'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data</em>. Der HTTP-Server muss Schreibrechte besitzen.',
- 'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data</em> sind in Ordnung.',
+ 'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>%s</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+ 'ok' => 'Die Berechtigungen des Verzeichnisses <em>%s</em> sind in Ordnung.',
),
'dom' => array(
'nok' => 'Ihnen fehlt eine benötigte Bibliothek um DOM zu durchstöbern.',
'ok' => 'Sie haben die benötigte Bibliothek um DOM zu durchstöbern.',
),
'favicons' => array(
- 'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/favicons</em>. Der HTTP-Server muss Schreibrechte besitzen.',
- 'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data/favicons</em> sind in Ordnung.',
+ 'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>%s</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+ 'ok' => 'Die Berechtigungen des Verzeichnisses <em>%s</em> sind in Ordnung.',
),
'fileinfo' => array(
'nok' => 'Ihnen fehlt PHP fileinfo (Paket fileinfo).',
@@ -88,9 +88,13 @@ return array(
'nok' => 'Ihre PHP-Version ist %s aber FreshRSS benötigt mindestens Version %s.',
'ok' => 'Ihre PHP-Version ist %s, welche kompatibel mit FreshRSS ist.',
),
+ 'tmp' => array(
+ 'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>%s</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+ 'ok' => 'Permissions on the temp directory are good.', // TODO - Translation
+ ),
'users' => array(
- 'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>./data/users</em>. Der HTTP-Server muss Schreibrechte besitzen.',
- 'ok' => 'Die Berechtigungen des Verzeichnisses <em>./data/users</em> sind in Ordnung.',
+ 'nok' => 'Überprüfen Sie die Berechtigungen des Verzeichnisses <em>%s</em>. Der HTTP-Server muss Schreibrechte besitzen.',
+ 'ok' => 'Die Berechtigungen des Verzeichnisses <em>%s</em> sind in Ordnung.',
),
'xml' => array(
'nok' => 'Ihnen fehlt die benötigte Bibliothek um XML zu parsen.',
diff --git a/app/i18n/en-us/conf.php b/app/i18n/en-us/conf.php
index 11c1a8781..b1d8a1146 100644
--- a/app/i18n/en-us/conf.php
+++ b/app/i18n/en-us/conf.php
@@ -70,7 +70,7 @@ return array(
'get_category' => 'Display "%s" category',
'get_favorite' => 'Display favorite articles',
'get_feed' => 'Display "%s" feed',
- 'get_tag' => 'Display "%s" label', // TODO - Translation
+ 'get_tag' => 'Display "%s" label',
'no_filter' => 'No filter',
'none' => 'You haven’t created any user queries yet.',
'number' => 'Query n°%d',
diff --git a/app/i18n/en-us/feedback.php b/app/i18n/en-us/feedback.php
index 20017e6ed..bfe8cd350 100644
--- a/app/i18n/en-us/feedback.php
+++ b/app/i18n/en-us/feedback.php
@@ -110,9 +110,9 @@ return array(
'purge_completed' => 'Purge completed (%d articles deleted)',
),
'tag' => array(
- 'created' => 'Tag "%s" has been created.', // TODO - Translation
- 'name_exists' => 'Tag name already exists.', // TODO - Translation
- 'renamed' => 'Tag "%s" has been renamed to "%s".', // TODO - Translation
+ 'created' => 'Tag "%s" has been created.',
+ 'name_exists' => 'Tag name already exists.',
+ 'renamed' => 'Tag "%s" has been renamed to "%s".',
),
'update' => array(
'can_apply' => 'FreshRSS will now be updated to the <strong>version %s</strong>.',
diff --git a/app/i18n/en-us/gen.php b/app/i18n/en-us/gen.php
index 3f3bcfbdd..738fd8d22 100644
--- a/app/i18n/en-us/gen.php
+++ b/app/i18n/en-us/gen.php
@@ -15,14 +15,14 @@ return array(
'export' => 'Export',
'filter' => 'Filter',
'import' => 'Import',
- 'load_default_shortcuts' => 'Load default shortcuts', // TODO - Translation
+ 'load_default_shortcuts' => 'Load default shortcuts',
'manage' => 'Manage',
'mark_favorite' => 'Mark as favorite',
'mark_read' => 'Mark as read',
'promote' => 'Promote',
'purge' => 'Purge',
'remove' => 'Remove',
- 'rename' => 'Rename', // TODO - Translation
+ 'rename' => 'Rename',
'see_website' => 'See website',
'submit' => 'Submit',
'truncate' => 'Delete all articles',
diff --git a/app/i18n/en-us/install.php b/app/i18n/en-us/install.php
index 048774a1e..3c28b0c37 100644
--- a/app/i18n/en-us/install.php
+++ b/app/i18n/en-us/install.php
@@ -33,7 +33,7 @@ return array(
'_' => 'Checks',
'already_installed' => 'We have detected that FreshRSS is already installed!',
'cache' => array(
- 'nok' => 'Check permissions on the <em>./data/cache</em> directory. The HTTP server must have write permission.',
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permission.',
'ok' => 'Permissions on the cache directory are good.',
),
'ctype' => array(
@@ -45,7 +45,7 @@ return array(
'ok' => 'You have the cURL library.',
),
'data' => array(
- 'nok' => 'Check permissions on the <em>./data</em> directory. The HTTP server must have write permission.',
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permission.',
'ok' => 'Permissions on the data directory are good.',
),
'dom' => array(
@@ -53,7 +53,7 @@ return array(
'ok' => 'You have the required library to browse the DOM.',
),
'favicons' => array(
- 'nok' => 'Check permissions on the <em>./data/favicons</em> directory. The HTTP server must have write permission.',
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permission.',
'ok' => 'Permissions on the favicons directory are good.',
),
'fileinfo' => array(
@@ -88,8 +88,12 @@ return array(
'nok' => 'Your PHP version is %s, but FreshRSS requires at least version %s.',
'ok' => 'Your PHP version, %s, is compatible with FreshRSS.',
),
+ 'tmp' => array(
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permissions.',
+ 'ok' => 'Permissions on the temp directory are good.',
+ ),
'users' => array(
- 'nok' => 'Check permissions on the <em>./data/users</em> directory. The HTTP server must have write permissions',
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permissions.',
'ok' => 'Permissions on the users directory are good.',
),
'xml' => array(
diff --git a/app/i18n/en-us/sub.php b/app/i18n/en-us/sub.php
index 3567a5eb8..0ce87b43f 100644
--- a/app/i18n/en-us/sub.php
+++ b/app/i18n/en-us/sub.php
@@ -108,22 +108,22 @@ return array(
'import_export' => 'Import / export',
'subscription_management' => 'Subscription management',
'subscription_tools' => 'Subscription tools',
- 'tag_management' => 'Tag management', // TODO - Translation
+ 'tag_management' => 'Tag management',
),
'tag' => array(
- 'name' => 'Name', // TODO - Translation
- 'new_name' => 'New name', // TODO - Translation
- 'old_name' => 'Old name', // TODO - Translation
+ 'name' => 'Name',
+ 'new_name' => 'New name',
+ 'old_name' => 'Old name',
),
'title' => array(
'_' => 'Subscription management',
'add' => 'Add a feed or category',
'add_category' => 'Add a category',
'add_feed' => 'Add a feed',
- 'add_tag' => 'Add a tag', // TODO - Translation
- 'delete_tag' => 'Delete a tag', // TODO - Translation
+ 'add_tag' => 'Add a tag',
+ 'delete_tag' => 'Delete a tag',
'feed_management' => 'RSS feeds management',
- 'rename_tag' => 'Rename a tag', // TODO - Translation
+ 'rename_tag' => 'Rename a tag',
'subscription_tools' => 'Subscription tools',
),
);
diff --git a/app/i18n/en/install.php b/app/i18n/en/install.php
index 048774a1e..3c28b0c37 100644
--- a/app/i18n/en/install.php
+++ b/app/i18n/en/install.php
@@ -33,7 +33,7 @@ return array(
'_' => 'Checks',
'already_installed' => 'We have detected that FreshRSS is already installed!',
'cache' => array(
- 'nok' => 'Check permissions on the <em>./data/cache</em> directory. The HTTP server must have write permission.',
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permission.',
'ok' => 'Permissions on the cache directory are good.',
),
'ctype' => array(
@@ -45,7 +45,7 @@ return array(
'ok' => 'You have the cURL library.',
),
'data' => array(
- 'nok' => 'Check permissions on the <em>./data</em> directory. The HTTP server must have write permission.',
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permission.',
'ok' => 'Permissions on the data directory are good.',
),
'dom' => array(
@@ -53,7 +53,7 @@ return array(
'ok' => 'You have the required library to browse the DOM.',
),
'favicons' => array(
- 'nok' => 'Check permissions on the <em>./data/favicons</em> directory. The HTTP server must have write permission.',
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permission.',
'ok' => 'Permissions on the favicons directory are good.',
),
'fileinfo' => array(
@@ -88,8 +88,12 @@ return array(
'nok' => 'Your PHP version is %s, but FreshRSS requires at least version %s.',
'ok' => 'Your PHP version, %s, is compatible with FreshRSS.',
),
+ 'tmp' => array(
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permissions.',
+ 'ok' => 'Permissions on the temp directory are good.',
+ ),
'users' => array(
- 'nok' => 'Check permissions on the <em>./data/users</em> directory. The HTTP server must have write permissions',
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permissions.',
'ok' => 'Permissions on the users directory are good.',
),
'xml' => array(
diff --git a/app/i18n/es/install.php b/app/i18n/es/install.php
index 2a747d0d4..ef7e1e70b 100755
--- a/app/i18n/es/install.php
+++ b/app/i18n/es/install.php
@@ -33,7 +33,7 @@ return array(
'_' => 'Verificaciones',
'already_installed' => '¡FreshRSS ya está instalado!',
'cache' => array(
- 'nok' => 'Comprueba los permisos en el directorio <em>./data/cache</em>. El servidor HTTP debe contar con permisos de escritura.',
+ 'nok' => 'Comprueba los permisos en el directorio <em>%s</em>. El servidor HTTP debe contar con permisos de escritura.',
'ok' => 'Los permisos del directorio cache son correctos.',
),
'ctype' => array(
@@ -45,7 +45,7 @@ return array(
'ok' => 'Dispones de la librería cURL.',
),
'data' => array(
- 'nok' => 'Comprueba los permisos del directorio <em>./data</em>. El servidor HTTP debe contar con permisos de escritura.',
+ 'nok' => 'Comprueba los permisos del directorio <em>%s</em>. El servidor HTTP debe contar con permisos de escritura.',
'ok' => 'Los permisos del directorio data son correctos.',
),
'dom' => array(
@@ -53,7 +53,7 @@ return array(
'ok' => 'Dispones de la librería necesaria para explorar la DOM.',
),
'favicons' => array(
- 'nok' => 'Verifica los permisos en el directorio <em>./data/favicons</em>. El servidor HTTP debe contar con permisos de escritura.',
+ 'nok' => 'Verifica los permisos en el directorio <em>%s</em>. El servidor HTTP debe contar con permisos de escritura.',
'ok' => 'Los permisos del directorio favicons son correctos.',
),
'fileinfo' => array(
@@ -88,8 +88,12 @@ return array(
'nok' => 'Dispones de la versión PHP %s, pero FreshRSS necesita de, al menos, la versión %s.',
'ok' => 'Dispones de la versión PHP %s, que es compatible con FreshRSS.',
),
+ 'tmp' => array(
+ 'nok' => 'Revisa los permisos en el directorio <em>%s</em>. El servidor HTTP debe contar con permisos de escritura.',
+ 'ok' => 'Permissions on the temp directory are good.', // TODO - Translation
+ ),
'users' => array(
- 'nok' => 'Revisa los permisos en el directorio <em>./data/users</em>. El servidor HTTP debe contar con permisos de escritura.',
+ 'nok' => 'Revisa los permisos en el directorio <em>%s</em>. El servidor HTTP debe contar con permisos de escritura.',
'ok' => 'Los permisos en el directorio users son correctos.',
),
'xml' => array(
diff --git a/app/i18n/fr/install.php b/app/i18n/fr/install.php
index ddd840908..3ee38d04d 100644
--- a/app/i18n/fr/install.php
+++ b/app/i18n/fr/install.php
@@ -33,7 +33,7 @@ return array(
'_' => 'Vérifications',
'already_installed' => 'FreshRSS semble avoir déjà été installé !',
'cache' => array(
- 'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/cache</em>. Le serveur HTTP doit être capable d’écrire dedans',
+ 'nok' => 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans.',
'ok' => 'Les droits sur le répertoire de cache sont bons.',
),
'ctype' => array(
@@ -45,7 +45,7 @@ return array(
'ok' => 'Vous disposez de cURL.',
),
'data' => array(
- 'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data</em>. Le serveur HTTP doit être capable d’écrire dedans',
+ 'nok' => 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans.',
'ok' => 'Les droits sur le répertoire de data sont bons.',
),
'dom' => array(
@@ -53,7 +53,7 @@ return array(
'ok' => 'Vous disposez de la librairie pour parcourir le DOM.',
),
'favicons' => array(
- 'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/favicons</em>. Le serveur HTTP doit être capable d’écrire dedans',
+ 'nok' => 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans.',
'ok' => 'Les droits sur le répertoire des favicons sont bons.',
),
'fileinfo' => array(
@@ -88,8 +88,12 @@ return array(
'nok' => 'Votre version de PHP est la %s mais FreshRSS requiert au moins la version %s.',
'ok' => 'Votre version de PHP est la %s, qui est compatible avec FreshRSS.',
),
+ 'tmp' => array(
+ 'nok' => 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans.',
+ 'ok' => 'Les droits sur le répertoire temporaire sont bons.',
+ ),
'users' => array(
- 'nok' => 'Veuillez vérifier les droits sur le répertoire <em>./data/users</em>. Le serveur HTTP doit être capable d’écrire dedans',
+ 'nok' => 'Veuillez vérifier les droits sur le répertoire <em>%s</em>. Le serveur HTTP doit être capable d’écrire dedans.',
'ok' => 'Les droits sur le répertoire des utilisateurs sont bons.',
),
'xml' => array(
diff --git a/app/i18n/he/install.php b/app/i18n/he/install.php
index f8de459f2..1b83c8a4e 100644
--- a/app/i18n/he/install.php
+++ b/app/i18n/he/install.php
@@ -33,7 +33,7 @@ return array(
'_' => 'בדיקות',
'already_installed' => 'We have detected that FreshRSS is already installed!', // TODO - Translation
'cache' => array(
- 'nok' => 'Check permissions on the <em>./data/cache</em> directory. The HTTP server must have write permission.', // TODO - Translation
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permission.', // TODO - Translation
'ok' => 'ההרשאות בתיקיית המטמון תקינות',
),
'ctype' => array(
@@ -45,7 +45,7 @@ return array(
'ok' => 'יש לכם את גירסת %s של cURL',
),
'data' => array(
- 'nok' => 'Check permissions on the <em>./data</em> directory. The HTTP server must have write permission.', // TODO - Translation
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permission.', // TODO - Translation
'ok' => 'ההרשאות בתיקיית הדאטא תקינות',
),
'dom' => array(
@@ -53,7 +53,7 @@ return array(
'ok' => 'הספרייה הנדרשת לסיור ב DOM מותקנת',
),
'favicons' => array(
- 'nok' => 'Check permissions on the <em>./data/favicons</em> directory. The HTTP server must have write permission.', // TODO - Translation
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permission.', // TODO - Translation
'ok' => 'ההרשאות בתיקיית הfavicons תקינות',
),
'fileinfo' => array(
@@ -88,8 +88,12 @@ return array(
'nok' => 'גירסת PHP שלכם היא %s אך FreshRSS דורש לפחות את גירסה %s',
'ok' => 'גירסת PHP שלכם היא %s, שתואמת ל FreshRSS',
),
+ 'tmp' => array(
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permissions.', // TODO - Translation
+ 'ok' => 'Permissions on the temp directory are good.', // TODO - Translation
+ ),
'users' => array(
- 'nok' => 'Check permissions on the <em>./data/users</em> directory. The HTTP server must have write permissions', // TODO - Translation
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permissions.', // TODO - Translation
'ok' => 'Permissions on the users directory are good.', // TODO - Translation
),
'xml' => array(
diff --git a/app/i18n/it/install.php b/app/i18n/it/install.php
index bc55c623a..a19db50bb 100644
--- a/app/i18n/it/install.php
+++ b/app/i18n/it/install.php
@@ -33,7 +33,7 @@ return array(
'_' => 'Controlli',
'already_installed' => 'FreshRSS risulta già installato!',
'cache' => array(
- 'nok' => 'Verifica i permessi sulla cartella <em>./data/cache</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+ 'nok' => 'Verifica i permessi sulla cartella <em>%s</em>. Il server HTTP deve avere i permessi per scriverci dentro.',
'ok' => 'I permessi sulla cartella della cache sono corretti.',
),
'ctype' => array(
@@ -45,7 +45,7 @@ return array(
'ok' => 'Estensione cURL presente.',
),
'data' => array(
- 'nok' => 'Verifica i permessi sulla cartella <em>./data</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+ 'nok' => 'Verifica i permessi sulla cartella <em>%s</em>. Il server HTTP deve avere i permessi per scriverci dentro.',
'ok' => 'I permessi sulla cartella data sono corretti.',
),
'dom' => array(
@@ -53,7 +53,7 @@ return array(
'ok' => 'Libreria richiesta per leggere DOM presente.',
),
'favicons' => array(
- 'nok' => 'Verifica i permessi sulla cartella <em>./data/favicons</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+ 'nok' => 'Verifica i permessi sulla cartella <em>%s</em>. Il server HTTP deve avere i permessi per scriverci dentro.',
'ok' => 'I permessi sulla cartella favicons sono corretti.',
),
'fileinfo' => array(
@@ -88,8 +88,12 @@ return array(
'nok' => 'Versione di PHP %s FreshRSS richiede almeno la versione %s.',
'ok' => 'Versione di PHP %s, compatibile con FreshRSS.',
),
+ 'tmp' => array(
+ 'nok' => 'Verifica i permessi sulla cartella <em>%s</em>. Il server HTTP deve avere i permessi per scriverci dentro.',
+ 'ok' => 'Permissions on the temp directory are good.', // TODO - Translation
+ ),
'users' => array(
- 'nok' => 'Verifica i permessi sulla cartella <em>./data/users</em>. Il server HTTP deve avere i permessi per scriverci dentro',
+ 'nok' => 'Verifica i permessi sulla cartella <em>%s</em>. Il server HTTP deve avere i permessi per scriverci dentro.',
'ok' => 'I permessi sulla cartella users sono corretti.',
),
'xml' => array(
diff --git a/app/i18n/kr/install.php b/app/i18n/kr/install.php
index 0880baf5f..64d76000d 100644
--- a/app/i18n/kr/install.php
+++ b/app/i18n/kr/install.php
@@ -33,7 +33,7 @@ return array(
'_' => '설치 요구사항 확인',
'already_installed' => 'FreshRSS가 이미 설치되어 있는 것을 감지했습니다!',
'cache' => array(
- 'nok' => '<em>./data/cache</em> 디렉토리의 권한을 확인하세요. HTTP 서버가 쓰기 권한을 가지고 있어야 합니다',
+ 'nok' => '<em>%s</em> 디렉토리의 권한을 확인하세요. HTTP 서버가 쓰기 권한을 가지고 있어야 합니다',
'ok' => 'cache 디렉토리의 권한이 올바르게 설정되었습니다.',
),
'ctype' => array(
@@ -45,7 +45,7 @@ return array(
'ok' => 'cURL 라이브러리가 설치되어 있습니다.',
),
'data' => array(
- 'nok' => '<em>./data</em> 디렉토리의 권한을 확인하세요. HTTP 서버가 쓰기 권한을 가지고 있어야 합니다',
+ 'nok' => '<em>%s</em> 디렉토리의 권한을 확인하세요. HTTP 서버가 쓰기 권한을 가지고 있어야 합니다',
'ok' => 'data 디렉토리의 권한이 올바르게 설정되었습니다.',
),
'dom' => array(
@@ -53,7 +53,7 @@ return array(
'ok' => 'DOM을 다룰 수 있는 라이브러리가 설치되어 있습니다.',
),
'favicons' => array(
- 'nok' => '<em>./data/favicons</em> 디렉토리의 권한을 확인하세요. HTTP 서버가 쓰기 권한을 가지고 있어야 합니다',
+ 'nok' => '<em>%s</em> 디렉토리의 권한을 확인하세요. HTTP 서버가 쓰기 권한을 가지고 있어야 합니다',
'ok' => 'favicons 디렉토리의 권한이 올바르게 설정되어 있습니다.',
),
'fileinfo' => array(
@@ -88,8 +88,12 @@ return array(
'nok' => 'PHP 버전은 %s 이지만, FreshRSS에는 최소 %s의 버전이 필요합니다.',
'ok' => 'PHP 버전은 %s 이고, FreshRSS와 호환가능 합니다.',
),
+ 'tmp' => array(
+ 'nok' => '<em>%s</em> 디렉토리의 권한을 확인하세요. HTTP 서버가 쓰기 권한을 가지고 있어야 합니다.',
+ 'ok' => 'Permissions on the temp directory are good.', // TODO - Translation
+ ),
'users' => array(
- 'nok' => '<em>./data/users</em> 디렉토리의 권한을 확인하세요. HTTP 서버가 쓰기 권한을 가지고 있어야 합니다',
+ 'nok' => '<em>%s</em> 디렉토리의 권한을 확인하세요. HTTP 서버가 쓰기 권한을 가지고 있어야 합니다.',
'ok' => 'users 디렉토리의 권한이 올바르게 설정되어 있습니다.',
),
'xml' => array(
diff --git a/app/i18n/nl/install.php b/app/i18n/nl/install.php
index ee2ed73b1..1b7a3e839 100644
--- a/app/i18n/nl/install.php
+++ b/app/i18n/nl/install.php
@@ -33,7 +33,7 @@ return array(
'_' => 'Controles',
'already_installed' => 'We hebben geconstateerd dat FreshRSS al is geïnstallerd!',
'cache' => array(
- 'nok' => 'Controleer permissies van de <em>./data/cache</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven',
+ 'nok' => 'Controleer permissies van de <em>%s</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven.',
'ok' => 'Permissies van de cache map zijn goed.',
),
'ctype' => array(
@@ -45,7 +45,7 @@ return array(
'ok' => 'U hebt de cURL uitbreiding.',
),
'data' => array(
- 'nok' => 'Controleer permissies van de <em>./data</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven',
+ 'nok' => 'Controleer permissies van de <em>%s</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven.',
'ok' => 'Permissies van de data map zijn goed.',
),
'dom' => array(
@@ -53,7 +53,7 @@ return array(
'ok' => 'U hebt de benodigde bibliotheek om te bladeren in de DOM.',
),
'favicons' => array(
- 'nok' => 'Controleer permissies van de <em>./data/favicons</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven',
+ 'nok' => 'Controleer permissies van de <em>%s</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven.',
'ok' => 'Permissies van de favicons map zijn goed.',
),
'fileinfo' => array(
@@ -88,8 +88,12 @@ return array(
'nok' => 'Uw PHP versie is %s maar FreshRSS benodigd tenminste versie %s.',
'ok' => 'Uw PHP versie is %s, welke compatibel is met FreshRSS.',
),
+ 'tmp' => array(
+ 'nok' => 'Controleer permissies van de <em>%s</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven.',
+ 'ok' => 'Permissions on the temp directory are good.', // TODO - Translation
+ ),
'users' => array(
- 'nok' => 'Controleer permissies van de <em>./data/users</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven',
+ 'nok' => 'Controleer permissies van de <em>%s</em> map. HTTP server moet rechten hebben om er in te kunnen schrijven.',
'ok' => 'Permissies van de users map zijn goed.',
),
'xml' => array(
diff --git a/app/i18n/oc/install.php b/app/i18n/oc/install.php
index a366bd8ee..6c2bb3b28 100644
--- a/app/i18n/oc/install.php
+++ b/app/i18n/oc/install.php
@@ -33,7 +33,7 @@ return array(
'_' => 'Verificacions',
'already_installed' => 'Sembla que FreshRSS es ja installat !',
'cache' => array(
- 'nok' => 'Volgatz verificar los dreches sul repertòri <em>./data/cache</em>. Lo servidor HTTP deu poder escriure dedins',
+ 'nok' => 'Volgatz verificar los dreches sul repertòri <em>%s</em>. Lo servidor HTTP deu poder escriure dedins.',
'ok' => 'Los dreches sul cache son bons.',
),
'ctype' => array(
@@ -45,7 +45,7 @@ return array(
'ok' => 'Avètz la bibliotèca cURL.',
),
'data' => array(
- 'nok' => 'Volgatz verificar los dreches sul repertòri <em>./data</em>. Lo servidor HTTP deu poder escriure dedins',
+ 'nok' => 'Volgatz verificar los dreches sul repertòri <em>%s</em>. Lo servidor HTTP deu poder escriure dedins.',
'ok' => 'Los dreches sul repertòri data son bons.',
),
'dom' => array(
@@ -53,7 +53,7 @@ return array(
'ok' => 'Avètz la bibliotèca per percórrer lo DOM.',
),
'favicons' => array(
- 'nok' => 'Volgatz verificar los dreches sul repertòri <em>./data/favicons</em>. Lo servidor HTTP deu poder escriure dedins',
+ 'nok' => 'Volgatz verificar los dreches sul repertòri <em>%s</em>. Lo servidor HTTP deu poder escriure dedins.',
'ok' => 'Los dreches sul repertòri dels favicons son bons.',
),
'fileinfo' => array(
@@ -88,8 +88,12 @@ return array(
'nok' => 'Vòstra version PHP es la %s mas FreshRSS demanda almens la version %s.',
'ok' => 'Vòstra version PHP es %s, qu’es compatibla amb FreshRSS.',
),
+ 'tmp' => array(
+ 'nok' => 'Volgatz verificar los dreches sul repertòri <em>%s</em>. Lo servidor HTTP deu poder escriure dedins.',
+ 'ok' => 'Permissions on the temp directory are good.', // TODO - Translation
+ ),
'users' => array(
- 'nok' => 'Volgatz verificar los dreches sul repertòri <em>./data/users</em>. Lo servidor HTTP deu poder escriure dedins',
+ 'nok' => 'Volgatz verificar los dreches sul repertòri <em>%s</em>. Lo servidor HTTP deu poder escriure dedins.',
'ok' => 'Los dreches sul repertòri dels utilizaires son bons.',
),
'xml' => array(
diff --git a/app/i18n/pl/install.php b/app/i18n/pl/install.php
index a9d02efdb..34e7e12df 100644
--- a/app/i18n/pl/install.php
+++ b/app/i18n/pl/install.php
@@ -33,7 +33,7 @@ return array(
'_' => 'Checks', // TODO - Translation
'already_installed' => 'We have detected that FreshRSS is already installed!', // TODO - Translation
'cache' => array(
- 'nok' => 'Check permissions on the <em>./data/cache</em> directory. The HTTP server must have write permission.', // TODO - Translation
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permission.', // TODO - Translation
'ok' => 'Permissions on the cache directory are good.', // TODO - Translation
),
'ctype' => array(
@@ -45,7 +45,7 @@ return array(
'ok' => 'You have the cURL library.', // TODO - Translation
),
'data' => array(
- 'nok' => 'Check permissions on the <em>./data</em> directory. The HTTP server must have write permission.', // TODO - Translation
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permission.', // TODO - Translation
'ok' => 'Permissions on the data directory are good.', // TODO - Translation
),
'dom' => array(
@@ -53,7 +53,7 @@ return array(
'ok' => 'You have the required library to browse the DOM.', // TODO - Translation
),
'favicons' => array(
- 'nok' => 'Check permissions on the <em>./data/favicons</em> directory. The HTTP server must have write permission.', // TODO - Translation
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permission.', // TODO - Translation
'ok' => 'Permissions on the favicons directory are good.', // TODO - Translation
),
'fileinfo' => array(
@@ -88,8 +88,12 @@ return array(
'nok' => 'Your PHP version is %s, but FreshRSS requires at least version %s.', // TODO - Translation
'ok' => 'Your PHP version, %s, is compatible with FreshRSS.', // TODO - Translation
),
+ 'tmp' => array(
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permissions.', // TODO - Translation
+ 'ok' => 'Permissions on the temp directory are good.', // TODO - Translation
+ ),
'users' => array(
- 'nok' => 'Check permissions on the <em>./data/users</em> directory. The HTTP server must have write permissions', // TODO - Translation
+ 'nok' => 'Check permissions on the <em>%s</em> directory. The HTTP server must have write permissions.', // TODO - Translation
'ok' => 'Permissions on the users directory are good.', // TODO - Translation
),
'xml' => array(
diff --git a/app/i18n/pt-br/install.php b/app/i18n/pt-br/install.php
index da490ee5d..ae56cf770 100644
--- a/app/i18n/pt-br/install.php
+++ b/app/i18n/pt-br/install.php
@@ -33,7 +33,7 @@ return array(
'_' => 'Verificações',
'already_installed' => 'Verificamos que o FreshRSS já está instalado!',
'cache' => array(
- 'nok' => 'Verifique as permissões no diretório <em>./data/cache</em>. O servidor HTTP deve ter direitos para escrever dentro desta pasta.',
+ 'nok' => 'Verifique as permissões no diretório <em>%s</em>. O servidor HTTP deve ter direitos para escrever dentro desta pasta.',
'ok' => 'Permissões no diretório cache estão corretos.',
),
'ctype' => array(
@@ -45,7 +45,7 @@ return array(
'ok' => 'Você tem a biblioteca cURL.',
),
'data' => array(
- 'nok' => 'Verifique as permissões no diretório <em>./data</em>. O servidor HTTP deve ter direitos para escrever dentro desta pasta.',
+ 'nok' => 'Verifique as permissões no diretório <em>%s</em>. O servidor HTTP deve ter direitos para escrever dentro desta pasta.',
'ok' => 'Permissões no diretório data estão corretos.',
),
'dom' => array(
@@ -53,7 +53,7 @@ return array(
'ok' => 'Você tem a biblioteca necessária para navegar pelo DOM.',
),
'favicons' => array(
- 'nok' => 'Verifique as permissões no diretório <em>./data/favicons</em>. O servidor HTTP deve ter direitos para escrever dentro desta pasta.',
+ 'nok' => 'Verifique as permissões no diretório <em>%s</em>. O servidor HTTP deve ter direitos para escrever dentro desta pasta.',
'ok' => 'Permissões no diretório favicons estão corretos.',
),
'fileinfo' => array(
@@ -88,8 +88,12 @@ return array(
'nok' => 'Sua versão do PHP é %s mas FreshRSS requer ao menos a versão %s.',
'ok' => 'Sua versão do PHP é %s, que é compatível com o FreshRSS.',
),
+ 'tmp' => array(
+ 'nok' => 'Verifiquei as permissões no diretório <em>%s</em>. O servidor HTTP deve ter direitos para escrever dentro desta pasta.',
+ 'ok' => 'Permissions on the temp directory are good.', // TODO - Translation
+ ),
'users' => array(
- 'nok' => 'Verifiquei as permissões no diretório <em>./data/users</em>. O servidor HTTP deve ter direitos para escrever dentro desta pasta.',
+ 'nok' => 'Verifiquei as permissões no diretório <em>%s</em>. O servidor HTTP deve ter direitos para escrever dentro desta pasta.',
'ok' => 'Permissões no diretório users estão corretos.',
),
'xml' => array(
diff --git a/app/i18n/ru/install.php b/app/i18n/ru/install.php
index b7530f7d4..797d708b7 100644
--- a/app/i18n/ru/install.php
+++ b/app/i18n/ru/install.php
@@ -33,7 +33,7 @@ return array(
'_' => 'Проверки',
'already_installed' => 'Обнаружена предыдущая установка FreshRSS!',
'cache' => array(
- 'nok' => 'Проверьте права доступа к папке <em>./data/cache</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+ 'nok' => 'Проверьте права доступа к папке <em>%s</em> . Сервер HTTP должен иметь права на запись в эту папку.',
'ok' => 'Права на папку кэша в порядке.',
),
'ctype' => array(
@@ -45,7 +45,7 @@ return array(
'ok' => 'У вас установлено расширение cURL.',
),
'data' => array(
- 'nok' => 'Проверьте права доступа к папке <em>./data</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+ 'nok' => 'Проверьте права доступа к папке <em>%s</em> . Сервер HTTP должен иметь права на запись в эту папку.',
'ok' => 'Права на <em>./data/</em> в порядке.',
),
'dom' => array(
@@ -53,7 +53,7 @@ return array(
'ok' => 'У вас установлена необходимая библиотека для просмотра DOM.',
),
'favicons' => array(
- 'nok' => 'Проверьте права доступа к папке <em>./data/favicons</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+ 'nok' => 'Проверьте права доступа к папке <em>%s</em> . Сервер HTTP должен иметь права на запись в эту папку.',
'ok' => 'Права на папку значков в порядке.',
),
'fileinfo' => array(
@@ -88,8 +88,12 @@ return array(
'nok' => 'У вас установлен PHP версии %s, но FreshRSS необходима версия не ниже %s.',
'ok' => 'У вас установлен PHP версии %s, который совместим с FreshRSS.',
),
+ 'tmp' => array(
+ 'nok' => 'Проверьте права доступа к папке <em>%s</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+ 'ok' => 'Permissions on the temp directory are good.', // TODO - Translation
+ ),
'users' => array(
- 'nok' => 'Проверьте права доступа к папке <em>./data/users</em> . Сервер HTTP должен иметь права на запись в эту папку.',
+ 'nok' => 'Проверьте права доступа к папке <em>%s</em> . Сервер HTTP должен иметь права на запись в эту папку.',
'ok' => 'Права на папку users в порядке.',
),
'xml' => array(
diff --git a/app/i18n/sk/install.php b/app/i18n/sk/install.php
index 03a4dbfcd..17dc475f3 100644
--- a/app/i18n/sk/install.php
+++ b/app/i18n/sk/install.php
@@ -33,7 +33,7 @@ return array(
'_' => 'Kontrola',
'already_installed' => 'Zistilo sa, že FreshRSS je už nainštalovaný!',
'cache' => array(
- 'nok' => 'Skontrolujte oprávnenia prístupu do priečinku <em>./data/cache</em>. HTTP server musí mať právo doň zapisovať.',
+ 'nok' => 'Skontrolujte oprávnenia prístupu do priečinku <em>%s</em>. HTTP server musí mať právo doň zapisovať.',
'ok' => 'Oprávnenia prístupu do priečinku vyrovnávacej pamäte sú OK.',
),
'ctype' => array(
@@ -45,7 +45,7 @@ return array(
'ok' => 'Našla sa knižnica cURL.',
),
'data' => array(
- 'nok' => 'Skontrolujte oprávnenia prístupu do priečinku <em>./data</em>. HTTP server musí mať právo doň zapisovať.',
+ 'nok' => 'Skontrolujte oprávnenia prístupu do priečinku <em>%s</em>. HTTP server musí mať právo doň zapisovať.',
'ok' => 'Oprávnenia prístupu do priečinku údajov sú OK.',
),
'dom' => array(
@@ -53,7 +53,7 @@ return array(
'ok' => 'Našla sa požadovaná knižnica na prehliadanie DOM.',
),
'favicons' => array(
- 'nok' => 'Skontrolujte oprávnenia prístupu do priečinku <em>./data/favicons</em>. HTTP server musí mať právo doň zapisovať.',
+ 'nok' => 'Skontrolujte oprávnenia prístupu do priečinku <em>%s</em>. HTTP server musí mať právo doň zapisovať.',
'ok' => 'Oprávnenia prístupu do priečinku ikôn obľúbených sú OK.',
),
'fileinfo' => array(
@@ -88,8 +88,12 @@ return array(
'nok' => 'Vaša verzia PHP je %s, ale FreshRSS vyžaduje minimálne verziu %s.',
'ok' => 'Vaša verzia PHP %s je kompatibilná s FreshRSS.',
),
+ 'tmp' => array(
+ 'nok' => 'Skontrolujte oprávnenia prístupu do priečinku <em>%s</em>. HTTP server musí mať právo doň zapisovať.',
+ 'ok' => 'Permissions on the temp directory are good.', // TODO - Translation
+ ),
'users' => array(
- 'nok' => 'Skontrolujte oprávnenia prístupu do priečinku <em>./data/users</em>. HTTP server musí mať právo doň zapisovať.',
+ 'nok' => 'Skontrolujte oprávnenia prístupu do priečinku <em>%s</em>. HTTP server musí mať právo doň zapisovať.',
'ok' => 'Oprávnenia prístupu do priečinku používateľov sú OK.',
),
'xml' => array(
diff --git a/app/i18n/tr/install.php b/app/i18n/tr/install.php
index 0837ecf91..11d21cf1a 100644
--- a/app/i18n/tr/install.php
+++ b/app/i18n/tr/install.php
@@ -33,7 +33,7 @@ return array(
'_' => 'Kontroller',
'already_installed' => 'FreshRSS zaten yüklü!',
'cache' => array(
- 'nok' => '<em>./data/cache</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+ 'nok' => '<em>%s/em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı.',
'ok' => 'Önbellek klasörü yetkileri sorunsuz.',
),
'ctype' => array(
@@ -45,7 +45,7 @@ return array(
'ok' => 'cURL eklentisi sorunsuz.',
),
'data' => array(
- 'nok' => '<em>./data</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+ 'nok' => '<em>%s</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı.',
'ok' => 'Veri klasörü yetkileri sorunsuz.',
),
'dom' => array(
@@ -53,7 +53,7 @@ return array(
'ok' => 'DOM kütüphanesi sorunsuz.',
),
'favicons' => array(
- 'nok' => '<em>./data/favicons</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+ 'nok' => '<em>%s</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı.',
'ok' => 'Site ikonu klasörü yetkileri sorunsuz.',
),
'fileinfo' => array(
@@ -88,8 +88,12 @@ return array(
'nok' => 'PHP versiyonunuz %s fakat FreshRSS için gerekli olan en düşük sürüm %s.',
'ok' => 'PHP versiyonunuz %s, FreshRSS ile tam uyumlu.',
),
+ 'tmp' => array(
+ 'nok' => '<em>%s</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı.',
+ 'ok' => 'Permissions on the temp directory are good.', // TODO - Translation
+ ),
'users' => array(
- 'nok' => '<em>./data/users</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı',
+ 'nok' => '<em>%s</em> klasör yetkisini kontrol edin. HTTP yazma yetkisi olmalı.',
'ok' => 'Kullanıcılar klasörü yetkileri sorunsuz.',
),
'xml' => array(
diff --git a/app/i18n/zh-cn/install.php b/app/i18n/zh-cn/install.php
index 7e2794498..dad23ac17 100644
--- a/app/i18n/zh-cn/install.php
+++ b/app/i18n/zh-cn/install.php
@@ -33,7 +33,7 @@ return array(
'_' => '检查',
'already_installed' => '我们检测到 FreshRSS 已经安装!',
'cache' => array(
- 'nok' => '请检查 <em>./data/cache</em> 目录权限。HTTP 服务器必须有其写入权限。',
+ 'nok' => '请检查 <em>%s</em> 目录权限。HTTP 服务器必须有其写入权限。',
'ok' => 'cache 目录权限正常',
),
'ctype' => array(
@@ -45,7 +45,7 @@ return array(
'ok' => '已找到 cURL 库',
),
'data' => array(
- 'nok' => '请检查 <em>./data</em> 目录权限。HTTP 服务器必须有其写入权限。',
+ 'nok' => '请检查 <em>%s</em> 目录权限。HTTP 服务器必须有其写入权限。',
'ok' => 'data 目录权限正常',
),
'dom' => array(
@@ -53,7 +53,7 @@ return array(
'ok' => '已找到用于浏览 DOM 的库',
),
'favicons' => array(
- 'nok' => '请检查 <em>./data/favicons</em> 目录权限。HTTP 服务器必须有其写入权限。',
+ 'nok' => '请检查 <em>%s</em> 目录权限。HTTP 服务器必须有其写入权限。',
'ok' => 'favicons 目录权限正常',
),
'fileinfo' => array(
@@ -88,8 +88,12 @@ return array(
'nok' => '你的 PHP 版本为 %s,但 FreshRSS 最低需要 %s',
'ok' => '你的 PHP 版本为 %s,与 FreshRSS 兼容',
),
+ 'tmp' => array(
+ 'nok' => '请检查 <em>%s</em> 目录权限。HTTP 服务器必须有其写入权限。',
+ 'ok' => 'Permissions on the temp directory are good.', // TODO - Translation
+ ),
'users' => array(
- 'nok' => '请检查 <em>./data/users</em> 目录权限。HTTP 服务器必须有其写入权限。',
+ 'nok' => '请检查 <em>%s</em> 目录权限。HTTP 服务器必须有其写入权限。',
'ok' => 'users 目录权限正常',
),
'xml' => array(
diff --git a/app/install.php b/app/install.php
index fc296b405..418c72eba 100644
--- a/app/install.php
+++ b/app/install.php
@@ -440,25 +440,31 @@ function printStep1() {
<?php } ?>
<?php if ($res['data'] == 'ok') { ?>
- <p class="alert alert-success"><span class="alert-head"><?= _t('gen.short.ok') ?></span> <?= _t('install.check.data.ok') ?></p>
+ <p class="alert alert-success"><span class="alert-head"><?= _t('gen.short.ok') ?></span> <?= _t('install.check.data.ok', DATA_PATH) ?></p>
<?php } else { ?>
<p class="alert alert-error"><span class="alert-head"><?= _t('gen.short.damn') ?></span> <?= _t('install.check.data.nok', DATA_PATH) ?></p>
<?php } ?>
<?php if ($res['cache'] == 'ok') { ?>
- <p class="alert alert-success"><span class="alert-head"><?= _t('gen.short.ok') ?></span> <?= _t('install.check.cache.ok') ?></p>
+ <p class="alert alert-success"><span class="alert-head"><?= _t('gen.short.ok') ?></span> <?= _t('install.check.cache.ok', CACHE_PATH) ?></p>
<?php } else { ?>
<p class="alert alert-error"><span class="alert-head"><?= _t('gen.short.damn') ?></span> <?= _t('install.check.cache.nok', CACHE_PATH) ?></p>
<?php } ?>
+ <?php if ($res['tmp'] == 'ok') { ?>
+ <p class="alert alert-success"><span class="alert-head"><?= _t('gen.short.ok') ?></span> <?= _t('install.check.tmp.ok', TMP_PATH) ?></p>
+ <?php } else { ?>
+ <p class="alert alert-error"><span class="alert-head"><?= _t('gen.short.damn') ?></span> <?= _t('install.check.tmp.nok', TMP_PATH) ?></p>
+ <?php } ?>
+
<?php if ($res['users'] == 'ok') { ?>
- <p class="alert alert-success"><span class="alert-head"><?= _t('gen.short.ok') ?></span> <?= _t('install.check.users.ok') ?></p>
+ <p class="alert alert-success"><span class="alert-head"><?= _t('gen.short.ok') ?></span> <?= _t('install.check.users.ok', USERS_PATH) ?></p>
<?php } else { ?>
<p class="alert alert-error"><span class="alert-head"><?= _t('gen.short.damn') ?></span> <?= _t('install.check.users.nok', USERS_PATH) ?></p>
<?php } ?>
<?php if ($res['favicons'] == 'ok') { ?>
- <p class="alert alert-success"><span class="alert-head"><?= _t('gen.short.ok') ?></span> <?= _t('install.check.favicons.ok') ?></p>
+ <p class="alert alert-success"><span class="alert-head"><?= _t('gen.short.ok') ?></span> <?= _t('install.check.favicons.ok', DATA_PATH . '/favicons') ?></p>
<?php } else { ?>
<p class="alert alert-error"><span class="alert-head"><?= _t('gen.short.damn') ?></span> <?= _t('install.check.favicons.nok', DATA_PATH . '/favicons') ?></p>
<?php } ?>
diff --git a/cli/i18n/ignore/en-us.php b/cli/i18n/ignore/en-us.php
index 066fe79ce..518ca705b 100644
--- a/cli/i18n/ignore/en-us.php
+++ b/cli/i18n/ignore/en-us.php
@@ -194,6 +194,7 @@ return array(
'conf.query.get_all',
'conf.query.get_category',
'conf.query.get_feed',
+ 'conf.query.get_tag',
'conf.query.no_filter',
'conf.query.none',
'conf.query.number',
@@ -368,6 +369,9 @@ return array(
'feedback.sub.feed.selector_preview.selector_empty',
'feedback.sub.feed.updated',
'feedback.sub.purge_completed',
+ 'feedback.tag.created',
+ 'feedback.tag.name_exists',
+ 'feedback.tag.renamed',
'feedback.update.can_apply',
'feedback.update.error',
'feedback.update.file_is_nok',
@@ -393,11 +397,13 @@ return array(
'gen.action.export',
'gen.action.filter',
'gen.action.import',
+ 'gen.action.load_default_shortcuts',
'gen.action.manage',
'gen.action.mark_read',
'gen.action.promote',
'gen.action.purge',
'gen.action.remove',
+ 'gen.action.rename',
'gen.action.see_website',
'gen.action.submit',
'gen.action.truncate',
@@ -655,6 +661,8 @@ return array(
'install.check.pdo.ok',
'install.check.php.nok',
'install.check.php.ok',
+ 'install.check.tmp.nok',
+ 'install.check.tmp.ok',
'install.check.users.nok',
'install.check.users.ok',
'install.check.xml.nok',
@@ -753,11 +761,18 @@ return array(
'sub.menu.import_export',
'sub.menu.subscription_management',
'sub.menu.subscription_tools',
+ 'sub.menu.tag_management',
+ 'sub.tag.name',
+ 'sub.tag.new_name',
+ 'sub.tag.old_name',
'sub.title._',
'sub.title.add',
'sub.title.add_category',
'sub.title.add_feed',
+ 'sub.title.add_tag',
+ 'sub.title.delete_tag',
'sub.title.feed_management',
+ 'sub.title.rename_tag',
'sub.title.subscription_tools',
'user.email.feedback.invalid',
'user.email.feedback.required',
diff --git a/lib/lib_install.php b/lib/lib_install.php
index 14a614c2e..e67b3611c 100644
--- a/lib/lib_install.php
+++ b/lib/lib_install.php
@@ -43,6 +43,7 @@ function checkRequirements($dbType = '') {
$mbstring = extension_loaded('mbstring');
$data = DATA_PATH && is_writable(DATA_PATH);
$cache = CACHE_PATH && is_writable(CACHE_PATH);
+ $tmp = TMP_PATH && is_writable(TMP_PATH);
$users = USERS_PATH && is_writable(USERS_PATH);
$favicons = is_writable(join_path(DATA_PATH, 'favicons'));
$http_referer = is_referer_from_same_domain();
@@ -63,12 +64,13 @@ function checkRequirements($dbType = '') {
'mbstring' => $mbstring ? 'ok' : 'ko',
'data' => $data ? 'ok' : 'ko',
'cache' => $cache ? 'ok' : 'ko',
+ 'tmp' => $tmp ? 'ok' : 'ko',
'users' => $users ? 'ok' : 'ko',
'favicons' => $favicons ? 'ok' : 'ko',
'http_referer' => $http_referer ? 'ok' : 'ko',
'message' => $message ?: 'ok',
'all' => $php && $curl && $pdo && $pcre && $ctype && $dom && $xml &&
- $data && $cache && $users && $favicons && $http_referer && $message == '' ? 'ok' : 'ko'
+ $data && $cache && $tmp && $users && $favicons && $http_referer && $message == '' ? 'ok' : 'ko'
);
}