diff options
| author | 2023-10-22 19:03:51 +0200 | |
|---|---|---|
| committer | 2023-10-22 19:03:51 +0200 | |
| commit | 83cf7301f46c9609da493a412eaad8d10b09bdda (patch) | |
| tree | 98fd8d51727a90ef895b6d4831ac37139ffc92df /app | |
| parent | 430d467b5a98c6691ed87180f0f15ddb111c213b (diff) | |
Do not update feeds after import (#5629)
* Add checkbox to not update feeds after import to avoid duplicate feeds when importing multiple files.
* Import without updating feeds, but now unconditionally
* Added hint to click "Update feeds" to all translations
* Update app/i18n/fr/feedback.php
* Fix i18n
---------
Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Diffstat (limited to 'app')
| -rw-r--r-- | app/Controllers/importExportController.php | 1 | ||||
| -rw-r--r-- | app/i18n/cz/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/de/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/el/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/en-us/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/en/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/es/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/fa/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/fr/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/he/feedback.php | 4 | ||||
| -rwxr-xr-x | app/i18n/hu/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/id/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/it/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/ja/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/ko/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/lv/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/nl/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/oc/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/pl/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/pt-br/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/ru/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/sk/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/tr/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/zh-cn/feedback.php | 4 | ||||
| -rw-r--r-- | app/i18n/zh-tw/feedback.php | 4 |
25 files changed, 48 insertions, 49 deletions
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index d4a03c939..dc11a2a46 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -203,7 +203,6 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { } // And finally, we get import status and redirect to the home page - Minz_Session::_param('actualize_feeds', true); $content_notif = $error === true ? _t('feedback.import_export.feeds_imported_with_errors') : _t('feedback.import_export.feeds_imported'); Minz_Request::good($content_notif); } diff --git a/app/i18n/cz/feedback.php b/app/i18n/cz/feedback.php index a627d5fa9..c0cb91c2b 100644 --- a/app/i18n/cz/feedback.php +++ b/app/i18n/cz/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'Na serveru není přítomno rozšíření ZIP. Zkuste exportovat soubory jeden po druhém.', - 'feeds_imported' => 'Vaše kanály byly naimportovány a budou nyní aktualizovány', - 'feeds_imported_with_errors' => 'Vaše kanály byly naimportovány, došlo ale k nějakým chybám', + 'feeds_imported' => 'Vaše kanály byly naimportovány a budou nyní aktualizovány / Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY + 'feeds_imported_with_errors' => 'Vaše kanály byly naimportovány, došlo ale k nějakým chybám / Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY 'file_cannot_be_uploaded' => 'Soubor nelze nahrát!', 'no_zip_extension' => 'Na serveru není přítomno rozšíření ZIP.', 'zip_error' => 'Během importu ZIP došlo k chybě.', // DIRTY diff --git a/app/i18n/de/feedback.php b/app/i18n/de/feedback.php index 994543801..05be44cce 100644 --- a/app/i18n/de/feedback.php +++ b/app/i18n/de/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'Die ZIP-Erweiterung fehlt auf Ihrem Server. Bitte versuchen Sie die Dateien eine nach der anderen zu exportieren.', - 'feeds_imported' => 'Ihre Feeds sind importiert worden und werden jetzt aktualisiert', - 'feeds_imported_with_errors' => 'Ihre Feeds sind importiert worden, aber es traten einige Fehler auf', + 'feeds_imported' => 'Ihre Feeds sind importiert worden. Wenn Sie alle Dateien importiert haben, können Sie <i>Feeds aktualisieren</i> klicken.', + 'feeds_imported_with_errors' => 'Ihre Feeds sind importiert worden, aber es traten einige Fehler auf. Wenn Sie alle Dateien importiert haben, können Sie <i>Feeds aktualisieren</i> klicken.', 'file_cannot_be_uploaded' => 'Die Datei kann nicht hochgeladen werden!', 'no_zip_extension' => 'Die ZIP-Erweiterung ist auf Ihrem Server nicht vorhanden.', 'zip_error' => 'Ein Fehler trat während des ZIP-Imports auf.', // DIRTY diff --git a/app/i18n/el/feedback.php b/app/i18n/el/feedback.php index 1555d0e66..72d522d67 100644 --- a/app/i18n/el/feedback.php +++ b/app/i18n/el/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'The ZIP extension is not present on your server. Please try to export files one by one.', // TODO - 'feeds_imported' => 'Your feeds have been imported and will now be updated', // TODO - 'feeds_imported_with_errors' => 'Your feeds have been imported, but some errors occurred', // TODO + 'feeds_imported' => 'Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // TODO + 'feeds_imported_with_errors' => 'Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // TODO 'file_cannot_be_uploaded' => 'File cannot be uploaded!', // TODO 'no_zip_extension' => 'The ZIP extension is not present on your server.', // TODO 'zip_error' => 'An error occurred during ZIP processing.', // TODO diff --git a/app/i18n/en-us/feedback.php b/app/i18n/en-us/feedback.php index 3ec0ae6f8..8d4027984 100644 --- a/app/i18n/en-us/feedback.php +++ b/app/i18n/en-us/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'The ZIP extension is not present on your server. Please try to export files one by one.', // IGNORE - 'feeds_imported' => 'Your feeds have been imported and will now be updated', // IGNORE - 'feeds_imported_with_errors' => 'Your feeds have been imported, but some errors occurred', // IGNORE + 'feeds_imported' => 'Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // IGNORE + 'feeds_imported_with_errors' => 'Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // IGNORE 'file_cannot_be_uploaded' => 'File cannot be uploaded!', // IGNORE 'no_zip_extension' => 'The ZIP extension is not present on your server.', // IGNORE 'zip_error' => 'An error occurred during ZIP processing.', // IGNORE diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php index 1e69f8287..c81438e4f 100644 --- a/app/i18n/en/feedback.php +++ b/app/i18n/en/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'The ZIP extension is not present on your server. Please try to export files one by one.', - 'feeds_imported' => 'Your feeds have been imported and will now be updated', - 'feeds_imported_with_errors' => 'Your feeds have been imported, but some errors occurred', + 'feeds_imported' => 'Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', + 'feeds_imported_with_errors' => 'Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', 'file_cannot_be_uploaded' => 'File cannot be uploaded!', 'no_zip_extension' => 'The ZIP extension is not present on your server.', 'zip_error' => 'An error occurred during ZIP processing.', diff --git a/app/i18n/es/feedback.php b/app/i18n/es/feedback.php index 75da7dcde..0af6cfffb 100644 --- a/app/i18n/es/feedback.php +++ b/app/i18n/es/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'La extensión ZIP no está disponible en tu servidor. Por favor, exporta estos archivos uno a uno.', - 'feeds_imported' => 'Se han importado tus fuentes y quedarán actualizadas', - 'feeds_imported_with_errors' => 'Se importaron tus fuentes; pero hubo algunos errores', + 'feeds_imported' => 'Se han importado tus fuentes y quedarán actualizadas / Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY + 'feeds_imported_with_errors' => 'Se importaron tus fuentes; pero hubo algunos errores / Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY 'file_cannot_be_uploaded' => 'No es posible enviar el archivo', 'no_zip_extension' => 'La extensión ZIP no está disponible en tu servidor.', 'zip_error' => 'Hubo un error durante la importación ZIP.', // DIRTY diff --git a/app/i18n/fa/feedback.php b/app/i18n/fa/feedback.php index 68424df36..ffba04507 100644 --- a/app/i18n/fa/feedback.php +++ b/app/i18n/fa/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => ' پسوند ZIP در سرور شما وجود ندارد. لطفا سعی کنید فایل ها را یکی یکی صادر کنید.', - 'feeds_imported' => ' فیدهای شما وارد شده اند و اکنون به روز خواهند شد', - 'feeds_imported_with_errors' => ' فیدهای شما وارد شده است', + 'feeds_imported' => ' فیدهای شما وارد شده اند و اکنون به روز خواهند شد / Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY + 'feeds_imported_with_errors' => ' فیدهای شما وارد شده است / Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY 'file_cannot_be_uploaded' => ' فایل قابل آپلود نیست!', 'no_zip_extension' => ' پسوند ZIP در سرور شما وجود ندارد.', 'zip_error' => ' در حین پردازش ZIP خطایی روی داد.', diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php index 660ad837d..de80ec367 100644 --- a/app/i18n/fr/feedback.php +++ b/app/i18n/fr/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'L’extension ZIP n’est pas présente sur votre serveur. Veuillez essayer d’exporter les fichiers un par un.', - 'feeds_imported' => 'Vos flux ont été importés et vont maintenant être actualisés.', - 'feeds_imported_with_errors' => 'Vos flux ont été importés mais des erreurs sont survenues.', + 'feeds_imported' => 'Vos flux ont été importés. Si vous avez fini vos importations, vous pouvez cliquer le bouton <i>Actualiser flux</i>.', + 'feeds_imported_with_errors' => 'Vos flux ont été importés mais des erreurs sont survenues. Si vous avez fini vos importations, vous pouvez cliquer le bouton <i>Actualiser flux</i>.', 'file_cannot_be_uploaded' => 'Le fichier ne peut pas être téléchargé !', 'no_zip_extension' => 'L’extension ZIP n’est pas présente sur votre serveur.', 'zip_error' => 'Une erreur est survenue durant le traintement du fichier ZIP.', diff --git a/app/i18n/he/feedback.php b/app/i18n/he/feedback.php index cbcf35ad9..2628748ee 100644 --- a/app/i18n/he/feedback.php +++ b/app/i18n/he/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'הרחבת ZIP אינה מותקנת על השרת.', - 'feeds_imported' => 'ההזנות שלך יובאו וכעת יעודכנו', - 'feeds_imported_with_errors' => 'ההזנות שלך יובאו אך אירעו מספר שגיאות', + 'feeds_imported' => 'ההזנות שלך יובאו וכעת יעודכנו / Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY + 'feeds_imported_with_errors' => 'ההזנות שלך יובאו אך אירעו מספר שגיאות / Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY 'file_cannot_be_uploaded' => 'אין אפשרות להעלות את הקובץ!', 'no_zip_extension' => 'הרחבת ZIP אינה מותקנת על השרת.', 'zip_error' => 'אירעה שגיאה במהלך ייבוא קובץ הZIP.', // DIRTY diff --git a/app/i18n/hu/feedback.php b/app/i18n/hu/feedback.php index bc7dec6c5..7775828ee 100755 --- a/app/i18n/hu/feedback.php +++ b/app/i18n/hu/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'A ZIP kiterjesztés nem létezik a szerveren. Exportáld a fájlokat egyesével.', - 'feeds_imported' => 'A hírlisták importálása megtörtént és most frissítésre kerülnek', - 'feeds_imported_with_errors' => 'A hírlisták importálása megtörtént, de néhány hiba történt', + 'feeds_imported' => 'A hírlisták importálása megtörtént és most frissítésre kerülnek / Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY + 'feeds_imported_with_errors' => 'A hírlisták importálása megtörtént, de néhány hiba történt / Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY 'file_cannot_be_uploaded' => 'Fájl nem feltölthető!', 'no_zip_extension' => 'A ZIP kiterjesztés nem létezik a szerveren.', 'zip_error' => 'Hiba történt a ZIP feldolgozása közben.', diff --git a/app/i18n/id/feedback.php b/app/i18n/id/feedback.php index 5f0a1050d..16dc5d30c 100644 --- a/app/i18n/id/feedback.php +++ b/app/i18n/id/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'The ZIP extension is not present on your server. Please try to export files one by one.', // TODO - 'feeds_imported' => 'Your feeds have been imported and will now be updated', // TODO - 'feeds_imported_with_errors' => 'Your feeds have been imported, but some errors occurred', // TODO + 'feeds_imported' => 'Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // TODO + 'feeds_imported_with_errors' => 'Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // TODO 'file_cannot_be_uploaded' => 'File cannot be uploaded!', // TODO 'no_zip_extension' => 'The ZIP extension is not present on your server.', // TODO 'zip_error' => 'An error occurred during ZIP processing.', // TODO diff --git a/app/i18n/it/feedback.php b/app/i18n/it/feedback.php index b2ef56cf7..fbcb1c56c 100644 --- a/app/i18n/it/feedback.php +++ b/app/i18n/it/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'Estensione ZIP non presente sul server. Per favore esporta i files singolarmente.', - 'feeds_imported' => 'I tuoi feed sono stati importati e saranno aggiornati', - 'feeds_imported_with_errors' => 'I tuoi feeds sono stati importati ma si sono verificati alcuni errori', + 'feeds_imported' => 'I tuoi feed sono stati importati e saranno aggiornati / Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY + 'feeds_imported_with_errors' => 'I tuoi feeds sono stati importati ma si sono verificati alcuni errori / Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY 'file_cannot_be_uploaded' => 'Il file non può essere caricato!', 'no_zip_extension' => 'Estensione ZIP non presente sul server.', 'zip_error' => 'Si è verificato un errore importando il file ZIP', // DIRTY diff --git a/app/i18n/ja/feedback.php b/app/i18n/ja/feedback.php index f5273e3e7..92cb052ed 100644 --- a/app/i18n/ja/feedback.php +++ b/app/i18n/ja/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'ZIP 拡張は現在あなたのサーバーに存在しません。一つずつファイルをエクスポートしてみてください。', - 'feeds_imported' => 'あなたのフィードはインポートされ、更新されます。', - 'feeds_imported_with_errors' => 'あなたのフィードはインポートされましたが、エラーが起きました。', + 'feeds_imported' => 'あなたのフィードはインポートされ、更新されます。 / Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY + 'feeds_imported_with_errors' => 'あなたのフィードはインポートされましたが、エラーが起きました。 / Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY 'file_cannot_be_uploaded' => 'ファイルをアップロードすることはできません!', 'no_zip_extension' => 'ZIP拡張は現在あなたのサーバーに存在しません。', 'zip_error' => 'ZIPをインポートするときエラーが発生しました。', // DIRTY diff --git a/app/i18n/ko/feedback.php b/app/i18n/ko/feedback.php index 909c75519..6ecd62d83 100644 --- a/app/i18n/ko/feedback.php +++ b/app/i18n/ko/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'ZIP 확장 기능을 서버에서 찾을 수 없습니다. 파일을 하나씩 내보내세요.', - 'feeds_imported' => '피드를 성공적으로 불러왔습니다', - 'feeds_imported_with_errors' => '피드를 불러왔지만, 문제가 발생했습니다', + 'feeds_imported' => '피드를 성공적으로 불러왔습니다 / Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY + 'feeds_imported_with_errors' => '피드를 불러왔지만, 문제가 발생했습니다 / Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY 'file_cannot_be_uploaded' => '파일을 업로드할 수 없습니다!', 'no_zip_extension' => 'ZIP 확장 기능을 서버에서 찾을 수 없습니다.', 'zip_error' => 'ZIP 파일을 불러오는 동안 문제가 발생했습니다.', // DIRTY diff --git a/app/i18n/lv/feedback.php b/app/i18n/lv/feedback.php index 31f3ce6e0..e6aa39077 100644 --- a/app/i18n/lv/feedback.php +++ b/app/i18n/lv/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'Jūsu serverī nav ZIP paplašinājuma. Lūdzu, mēģiniet eksportēt failus pa vienam.', - 'feeds_imported' => 'Jūsu barotnes tika importētas un tagad tiks atjauninātas.', - 'feeds_imported_with_errors' => 'Jūsu barotnes tika importētas, bet ir radušās dažas kļūdas', + 'feeds_imported' => 'Jūsu barotnes tika importētas un tagad tiks atjauninātas. / Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY + 'feeds_imported_with_errors' => 'Jūsu barotnes tika importētas, bet ir radušās dažas kļūdas / Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY 'file_cannot_be_uploaded' => 'Failu nevar augšupielādēt!', 'no_zip_extension' => 'Jūsu serverī nav ZIP paplašinājuma.', 'zip_error' => 'ZIP importa laikā notika kļūda.', // DIRTY diff --git a/app/i18n/nl/feedback.php b/app/i18n/nl/feedback.php index 6a9ff77ab..39f26f596 100644 --- a/app/i18n/nl/feedback.php +++ b/app/i18n/nl/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'ZIP uitbreiding is niet aanwezig op uw server. Exporteer a.u.b. uw bestanden één voor één.', - 'feeds_imported' => 'Uw feeds zijn geimporteerd en worden nu vernieuwd', - 'feeds_imported_with_errors' => 'Uw feeds zijn geimporteerd maar er zijn enige fouten opgetreden', + 'feeds_imported' => 'Uw feeds zijn geimporteerd en worden nu vernieuwd / Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY + 'feeds_imported_with_errors' => 'Uw feeds zijn geimporteerd maar er zijn enige fouten opgetreden / Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY 'file_cannot_be_uploaded' => 'Bestand kan niet worden verzonden!', 'no_zip_extension' => 'ZIP uitbreiding is niet aanwezig op uw server.', 'zip_error' => 'Er is een fout opgetreden tijdens het imporeren van het ZIP bestand.', // DIRTY diff --git a/app/i18n/oc/feedback.php b/app/i18n/oc/feedback.php index 9ab3b5bf3..a4db046e3 100644 --- a/app/i18n/oc/feedback.php +++ b/app/i18n/oc/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'L’extension ZIP es pas presenta sul servidor. Volgatz ensajar d’exportar los fichièrs un per un.', - 'feeds_imported' => 'Vòstres fluxes son estats importats seràn actualizats en seguida', - 'feeds_imported_with_errors' => 'Vòstres fluxes son estats importats mas i a agut d’errors', + 'feeds_imported' => 'Vòstres fluxes son estats importats seràn actualizats en seguida / Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY + 'feeds_imported_with_errors' => 'Vòstres fluxes son estats importats mas i a agut d’errors / Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY 'file_cannot_be_uploaded' => 'Telecargament del fichièr impossible', 'no_zip_extension' => 'L’extension es pas presenta sul servidor.', 'zip_error' => 'Una error s’es producha pendent l’importacion del fichièr ZIP.', // DIRTY diff --git a/app/i18n/pl/feedback.php b/app/i18n/pl/feedback.php index 44ad493f5..a61a03509 100644 --- a/app/i18n/pl/feedback.php +++ b/app/i18n/pl/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'Rozszerzenie ZIP nie jest dostępne na serwerze. Spróbuj eksportować pliki pojedynczo.', - 'feeds_imported' => 'Kanały zostały zaimportowane i zostaną teraz zaktualizowane', - 'feeds_imported_with_errors' => 'Kanały zostały zaimportowane, jednakże wystąpiło kilka błędów', + 'feeds_imported' => 'Kanały zostały zaimportowane i zostaną teraz zaktualizowane / Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY + 'feeds_imported_with_errors' => 'Kanały zostały zaimportowane, jednakże wystąpiło kilka błędów / Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY 'file_cannot_be_uploaded' => 'Plik nie może zostać wgrany!', 'no_zip_extension' => 'Rozszerzenie ZIP nie jest dostępne na serwerze.', 'zip_error' => 'Wystąpił błąd podczas importu pliku ZIP.', // DIRTY diff --git a/app/i18n/pt-br/feedback.php b/app/i18n/pt-br/feedback.php index 348fbf321..85995da31 100644 --- a/app/i18n/pt-br/feedback.php +++ b/app/i18n/pt-br/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'extensão ZIP não está presente em seu servidor. Por favor tente exportar os arquivos um por vez.', - 'feeds_imported' => 'Seus feeds foram importados e serão atualizados agora', - 'feeds_imported_with_errors' => 'Seus feeds foram importados, mas alguns erros ocorreram', + 'feeds_imported' => 'Seus feeds foram importados e serão atualizados agora / Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY + 'feeds_imported_with_errors' => 'Seus feeds foram importados, mas alguns erros ocorreram / Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY 'file_cannot_be_uploaded' => 'Arquivo não pôde ser enviado', 'no_zip_extension' => 'extensão ZIP não está presente em seu servidor.', 'zip_error' => 'Um erro ocorreu durante a importação do arquivo ZIP.', // DIRTY diff --git a/app/i18n/ru/feedback.php b/app/i18n/ru/feedback.php index 828f663fc..297898006 100644 --- a/app/i18n/ru/feedback.php +++ b/app/i18n/ru/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'На вашем сервере нет расширения ZIP. Пожалуйста, попробуйте экспортировать файлы один за другим.', - 'feeds_imported' => 'Ваши ленты импортированы и теперь будут обновлены', - 'feeds_imported_with_errors' => 'Ваши ленты импортированы, но возникли ошибки', + 'feeds_imported' => 'Ваши ленты импортированы и теперь будут обновлены / Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY + 'feeds_imported_with_errors' => 'Ваши ленты импортированы, но возникли ошибки / Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY 'file_cannot_be_uploaded' => 'Файл не может быть загружен!', 'no_zip_extension' => 'На вашем сервере нет расширения ZIP.', 'zip_error' => 'Ошибка возникла при импорте ZIP.', // DIRTY diff --git a/app/i18n/sk/feedback.php b/app/i18n/sk/feedback.php index e51670c27..4ec28a6d8 100644 --- a/app/i18n/sk/feedback.php +++ b/app/i18n/sk/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'ZIP rozšírenie sa na vašom serveri nenachádza. Prosím, skúste exportovať súbory pojednom.', - 'feeds_imported' => 'Váš kanál bol importovaný a bude aktualizovaný', - 'feeds_imported_with_errors' => 'Vaše kanály boli importované, ale vyskytli sa chyby', + 'feeds_imported' => 'Váš kanál bol importovaný a bude aktualizovaný / Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY + 'feeds_imported_with_errors' => 'Vaše kanály boli importované, ale vyskytli sa chyby / Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY 'file_cannot_be_uploaded' => 'Súbor sa nepodarilo nahrať!', 'no_zip_extension' => 'ZIP rozšírenie sa na vašom serveri nenachádza.', 'zip_error' => 'Počas importovania ZIP sa vyskytla chyba.', // DIRTY diff --git a/app/i18n/tr/feedback.php b/app/i18n/tr/feedback.php index e63fe8b11..891ce70ff 100644 --- a/app/i18n/tr/feedback.php +++ b/app/i18n/tr/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => 'ZIP eklentisi mevcut sunucunuzda yer almıyor. Lütfen başka dosya formatında dışarı aktarmayı deneyin.', - 'feeds_imported' => 'Akışlarınız içe aktarıldı ve şimdi güncellenecek', - 'feeds_imported_with_errors' => 'Akışlarınız içeri aktarıldı ama bazı hatalar meydana geldi', + 'feeds_imported' => 'Akışlarınız içe aktarıldı ve şimdi güncellenecek / Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY + 'feeds_imported_with_errors' => 'Akışlarınız içeri aktarıldı ama bazı hatalar meydana geldi / Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY 'file_cannot_be_uploaded' => 'Dosya yüklenemedi!', 'no_zip_extension' => 'ZIP eklentisi mevcut sunucunuzda yer almıyor.', 'zip_error' => 'ZIP içe aktarımı sırasında hata meydana geldi.', // DIRTY diff --git a/app/i18n/zh-cn/feedback.php b/app/i18n/zh-cn/feedback.php index 7019815ec..8c6be16d5 100644 --- a/app/i18n/zh-cn/feedback.php +++ b/app/i18n/zh-cn/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => '服务器未启用 ZIP 扩展,请尝试逐个导出文件。', - 'feeds_imported' => '你的订阅源已导入,即将刷新', - 'feeds_imported_with_errors' => '你的订阅源已导入,但发生错误', + 'feeds_imported' => '你的订阅源已导入,即将刷新 / Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY + 'feeds_imported_with_errors' => '你的订阅源已导入,但发生错误 / Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', // DIRTY 'file_cannot_be_uploaded' => '文件未能上传!', 'no_zip_extension' => '服务器未启用 ZIP 扩展。', 'zip_error' => '导入 ZIP 文件时出错', // DIRTY diff --git a/app/i18n/zh-tw/feedback.php b/app/i18n/zh-tw/feedback.php index 59a22ca1f..cc95f3849 100644 --- a/app/i18n/zh-tw/feedback.php +++ b/app/i18n/zh-tw/feedback.php @@ -57,8 +57,8 @@ return array( ), 'import_export' => array( 'export_no_zip_extension' => '伺服器未啟用 ZIP 擴展。請嘗試逐個導出文件。', - 'feeds_imported' => '你的訂閱已導入,即將刷新', - 'feeds_imported_with_errors' => '你的訂閱源已導入,但發生錯誤', + 'feeds_imported' => '你的訂閱已導入,即將刷新 / Your feeds have been imported. If you are done importing, you can now click the <i>Update feeds</i> button.', + 'feeds_imported_with_errors' => '你的訂閱源已導入,但發生錯誤 / Your feeds have been imported, but some errors occurred. If you are done importing, you can now click the <i>Update feeds</i> button.', 'file_cannot_be_uploaded' => '文件未能上傳!', 'no_zip_extension' => '伺服器未啟用 ZIP 擴展。', 'zip_error' => '導入 ZIP 文件時出錯', // DIRTY |
