diff options
Diffstat (limited to 'app')
31 files changed, 55 insertions, 56 deletions
diff --git a/app/Controllers/authController.php b/app/Controllers/authController.php index c4258b8df..27a7b4ac8 100644 --- a/app/Controllers/authController.php +++ b/app/Controllers/authController.php @@ -221,7 +221,7 @@ class FreshRSS_auth_Controller extends FreshRSS_ActionController { /** * This action gives possibility to a user to create an account. * - * The user is redirected to the home if he's connected. + * The user is redirected to the home when logged in. * * A 403 is sent if max number of registrations is reached. */ diff --git a/app/Controllers/feedController.php b/app/Controllers/feedController.php index de243501b..faca9416b 100755 --- a/app/Controllers/feedController.php +++ b/app/Controllers/feedController.php @@ -96,7 +96,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { $id = $feedDAO->addFeed($values); if (!$id) { - // There was an error in database... we cannot say what here. + // There was an error in database… we cannot say what here. throw new FreshRSS_FeedNotAdded_Exception($url); } $feed->_id($id); @@ -196,7 +196,7 @@ class FreshRSS_feed_Controller extends FreshRSS_ActionController { Minz_Log::warning($e->getMessage()); return Minz_Request::bad(_t('feedback.sub.feed.internal_problem', _url('index', 'logs')), $url_redirect); } catch (Minz_FileNotExistException $e) { - // Cache directory doesn't exist! + // Cache directory doesn’t exist! Minz_Log::error($e->getMessage()); return Minz_Request::bad(_t('feedback.sub.feed.internal_problem', _url('index', 'logs')), $url_redirect); } catch (FreshRSS_AlreadySubscribed_Exception $e) { diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index d384afddb..dfe6f97cb 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -185,8 +185,8 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { /** * This method tries to guess the file type based on its name. * - * Itis a *very* basic guess file type function. Only based on filename. - * That's could be improved but should be enough for what we have to do. + * It is a *very* basic guess file type function. Only based on filename. + * That could be improved but should be enough for what we have to do. */ private static function guessFileType($filename) { if (substr_compare($filename, '.zip', -4) === 0) { @@ -594,7 +594,7 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { foreach ($export_feeds as $feed_id) { $result = $export_service->generateFeedEntries($feed_id, $max_number_entries); if (!$result) { - // It means the actual feed_id doesn't correspond to any existing feed + // It means the actual feed_id doesn’t correspond to any existing feed continue; } @@ -604,7 +604,7 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { $nb_files = count($exported_files); if ($nb_files <= 0) { - // There's nothing to do, there're no files to export + // There’s nothing to do, there’re no files to export return Minz_Request::forward( array('c' => 'importExport', 'a' => 'index'), true @@ -616,7 +616,7 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { $filename = key($exported_files); $content = $exported_files[$filename]; } else { - // More files? Let's compress them in a Zip archive + // More files? Let’s compress them in a Zip archive if (!extension_loaded('zip')) { // Oops, there is no ZIP extension! return Minz_Request::bad( diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php index 0f67fe64c..a4a7fd086 100644 --- a/app/Controllers/updateController.php +++ b/app/Controllers/updateController.php @@ -137,7 +137,7 @@ class FreshRSS_update_Controller extends FreshRSS_ActionController { $this->view->_path('update/index.phtml'); if (file_exists(UPDATE_FILENAME)) { - // There is already an update file to apply: we don't need to check + // There is already an update file to apply: we don’t need to check // the webserver! // Or if already check during the last hour, do nothing. Minz_Request::forward(array('c' => 'update'), true); diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php index c5e1b30ab..f5db8b93b 100644 --- a/app/Controllers/userController.php +++ b/app/Controllers/userController.php @@ -351,8 +351,8 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController { $_POST['new_user_passwordPlain'] = ''; invalidateHttpCache(); - // If the user has admin access, it means he's already logged in - // and we don't want to login with the new account. Otherwise, the + // If the user has admin access, it means he’s already logged in + // and we don’t want to login with the new account. Otherwise, the // user just created its account himself so he probably wants to // get started immediately. if ($ok && !FreshRSS_Auth::hasAccess('admin')) { @@ -407,12 +407,12 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController { * * This route works with GET requests since the URL is provided by email. * The security risks (e.g. forged URL by an attacker) are not very high so - * it's ok. + * it’s ok. * * It returns 404 error if `force_email_validation` is disabled or if the - * user doesn't exist. + * user doesn’t exist. * - * It returns 403 if user isn't logged in and `username` param isn't passed. + * It returns 403 if user isn’t logged in and `username` param isn’t passed. */ public function validateEmailAction() { if (!FreshRSS_Context::$system_conf->force_email_validation) { @@ -470,7 +470,7 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController { /** * This action resends a validation email to the current user. * - * It only acts on POST requests but doesn't require any param (except the + * It only acts on POST requests but doesn’t require any param (except the * CSRF token). * * It returns 403 error if the user is not logged in or 404 if request is @@ -537,7 +537,7 @@ class FreshRSS_user_Controller extends FreshRSS_ActionController { if (Minz_Request::isPost()) { $ok = true; if ($self_deletion) { - // We check the password if it's a self-destruction + // We check the password if it’s a self-destruction $nonce = Minz_Session::param('nonce'); $challenge = Minz_Request::param('challenge', ''); diff --git a/app/FreshRSS.php b/app/FreshRSS.php index 64b8d13ae..dc5ed0999 100644 --- a/app/FreshRSS.php +++ b/app/FreshRSS.php @@ -4,8 +4,7 @@ class FreshRSS extends Minz_FrontController { /** * Initialize the different FreshRSS / Minz components. * - * PLEASE DON'T CHANGE THE ORDER OF INITIALIZATIONS UNLESS YOU KNOW WHAT - * YOU DO!! + * PLEASE DON’T CHANGE THE ORDER OF INITIALIZATIONS UNLESS YOU KNOW WHAT YOU DO!! * * Here is the list of components: * - Create a configuration setter and register it to system conf @@ -37,7 +36,7 @@ class FreshRSS extends Minz_FrontController { Minz_ExtensionManager::init(); // Auth has to be initialized before using currentUser session parameter - // because it's this part which create this parameter. + // because it’s this part which create this parameter. self::initAuth(); if (FreshRSS_Context::$user_conf == null) { FreshRSS_Context::initUser(); diff --git a/app/Models/Auth.php b/app/Models/Auth.php index 7259025b3..90fb128d4 100644 --- a/app/Models/Auth.php +++ b/app/Models/Auth.php @@ -190,7 +190,7 @@ class FreshRSS_Auth { break; case 'http_auth': case 'none': - // Nothing to do... + // Nothing to do… break; default: // TODO: extensions diff --git a/app/Models/Entry.php b/app/Models/Entry.php index cc1f4d9bc..c4f69211b 100644 --- a/app/Models/Entry.php +++ b/app/Models/Entry.php @@ -490,18 +490,18 @@ class FreshRSS_Entry extends Minz_Model { public function loadCompleteContent($force = false) { // Gestion du contenu - // On cherche à récupérer les articles en entier... même si le flux ne le propose pas + // Trying to fetch full article content even when feeds do not propose it $feed = $this->feed(true); if ($feed != null && trim($feed->pathEntries()) != '') { $entryDAO = FreshRSS_Factory::createEntryDao(); $entry = $force ? null : $entryDAO->searchByGuid($this->feedId, $this->guid); if ($entry) { - // l'article existe déjà en BDD, en se contente de recharger ce contenu + // l’article existe déjà en BDD, en se contente de recharger ce contenu $this->content = $entry->content(); } else { try { - // l'article n'est pas en BDD, on va le chercher sur le site + // l’article n’est pas en BDD, on va le chercher sur le site $fullContent = self::getContentByParsing( htmlspecialchars_decode($this->link(), ENT_QUOTES), $feed->pathEntries(), @@ -526,7 +526,7 @@ class FreshRSS_Entry extends Minz_Model { return true; } } catch (Exception $e) { - // rien à faire, on garde l'ancien contenu(requête a échoué) + // rien à faire, on garde l’ancien contenu(requête a échoué) Minz_Log::warning($e->getMessage()); } } diff --git a/app/Models/Feed.php b/app/Models/Feed.php index 781553ca7..595c59f4f 100644 --- a/app/Models/Feed.php +++ b/app/Models/Feed.php @@ -300,7 +300,7 @@ class FreshRSS_Feed extends Minz_Model { $this->hubUrl = isset($links[0]) ? $links[0] : null; if ($loadDetails) { - // si on a utilisé l'auto-discover, notre url va avoir changé + // si on a utilisé l’auto-discover, notre url va avoir changé $subscribe_url = $simplePie->subscribe_url(false); //HTML to HTML-PRE //ENT_COMPAT except '&' diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php index b47f06b42..90a60de4f 100644 --- a/app/Models/FeedDAO.php +++ b/app/Models/FeedDAO.php @@ -88,7 +88,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable { // TODO: not sure if we should write this method in DAO since DAO // should not be aware about feed class - // Add feed only if we don't find it in DB + // Add feed only if we don’t find it in DB $feed_search = $this->searchByUrl($feed->url()); if (!$feed_search) { $values = array( diff --git a/app/Models/Share.php b/app/Models/Share.php index 0a341fa55..36e17c201 100644 --- a/app/Models/Share.php +++ b/app/Models/Share.php @@ -157,7 +157,7 @@ class FreshRSS_Share { } /** - * Return the current field of the share option. It's null for shares + * Return the current field of the share option. It’s null for shares * using the GET method. */ public function field() { diff --git a/app/Models/TagDAO.php b/app/Models/TagDAO.php index 2b24921a2..0bfb89082 100644 --- a/app/Models/TagDAO.php +++ b/app/Models/TagDAO.php @@ -15,11 +15,11 @@ class FreshRSS_TagDAO extends Minz_ModelPdo implements FreshRSS_Searchable { try { require(APP_PATH . '/SQL/install.sql.' . $this->pdo->dbType() . '.php'); - Minz_Log::warning('SQL ALTER GUID case sensitivity...'); + Minz_Log::warning('SQL ALTER GUID case sensitivity…'); $databaseDAO = FreshRSS_Factory::createDatabaseDAO(); $databaseDAO->ensureCaseInsensitiveGuids(); - Minz_Log::warning('SQL CREATE TABLE tag...'); + Minz_Log::warning('SQL CREATE TABLE tag…'); $ok = $this->pdo->exec($GLOBALS['SQL_CREATE_TABLE_TAGS']) !== false; } catch (Exception $e) { Minz_Log::error('FreshRSS_EntryDAO::createTagTable error: ' . $e->getMessage()); diff --git a/app/Services/ExportService.php b/app/Services/ExportService.php index d8db4df71..7069ccec1 100644 --- a/app/Services/ExportService.php +++ b/app/Services/ExportService.php @@ -61,7 +61,7 @@ class FreshRSS_Export_Service { /** * Generate the starred and labelled entries file content. * - * Both starred and labelled entries are put into a "starred" file, that's + * Both starred and labelled entries are put into a "starred" file, that’s * why there is only one method for both. * * @param string $type must be one of: @@ -100,7 +100,7 @@ class FreshRSS_Export_Service { * @param integer $max_number_entries * * @return array|null First item is the filename, second item is the content. - * It also can return null if the feed doesn't exist. + * It also can return null if the feed doesn’t exist. */ public function generateFeedEntries($feed_id, $max_number_entries) { $feed = $this->feed_dao->searchById($feed_id); diff --git a/app/actualize_script.php b/app/actualize_script.php index e3ee5a5e5..08f897a6c 100755 --- a/app/actualize_script.php +++ b/app/actualize_script.php @@ -78,7 +78,7 @@ foreach ($users as $user) { Minz_ExtensionManager::callHook('freshrss_user_maintenance'); $app->init(); - notice('FreshRSS actualize ' . $user . '...'); + notice('FreshRSS actualize ' . $user . '…'); echo $user, ' '; //Buffered $app->run(); diff --git a/app/i18n/cz/feedback.php b/app/i18n/cz/feedback.php index dd71cac49..72905696a 100644 --- a/app/i18n/cz/feedback.php +++ b/app/i18n/cz/feedback.php @@ -107,7 +107,7 @@ return array( 'http_error' => 'Failed to load website content.', // TODO 'no_entries' => 'There are no articles in this feed. You need at least one article to create a preview.', // TODO 'no_feed' => 'Internal error (feed cannot be found).', // TODO - 'no_result' => 'The selector didn\'t match anything. As a fallback the original feed text will be displayed instead.', // TODO + 'no_result' => 'The selector didn’t match anything. As a fallback the original feed text will be displayed instead.', // TODO 'selector_empty' => 'The selector is empty. You need to define one to create a preview.', // TODO ), 'updated' => 'Kanál byl aktualizován', diff --git a/app/i18n/en-us/admin.php b/app/i18n/en-us/admin.php index 41d8e197c..481e5a714 100644 --- a/app/i18n/en-us/admin.php +++ b/app/i18n/en-us/admin.php @@ -12,7 +12,7 @@ return array( 'auth' => array( - 'allow_anonymous' => 'Allow anonymous reading of the default user\'s articles (%s)', // IGNORE + 'allow_anonymous' => 'Allow anonymous reading of the default user’s articles (%s)', // IGNORE 'allow_anonymous_refresh' => 'Allow anonymous refresh of the articles', // IGNORE 'api_enabled' => 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>', // IGNORE 'form' => 'Web form (traditional, requires JavaScript)', // IGNORE diff --git a/app/i18n/en-us/conf.php b/app/i18n/en-us/conf.php index 09f9ba1e5..ddd9ed278 100644 --- a/app/i18n/en-us/conf.php +++ b/app/i18n/en-us/conf.php @@ -14,7 +14,7 @@ return array( 'archiving' => array( '_' => 'Archiving', // IGNORE 'exception' => 'Purge exception', // IGNORE - 'help' => 'More options are available in the individual feed\'s settings', // IGNORE + 'help' => 'More options are available in the individual feed’s settings', // IGNORE 'keep_favourites' => 'Never delete favorites', 'keep_labels' => 'Never delete labels', // IGNORE 'keep_max' => 'Maximum number of articles to keep', // IGNORE diff --git a/app/i18n/en-us/feedback.php b/app/i18n/en-us/feedback.php index 25aa87caa..92aed9b16 100644 --- a/app/i18n/en-us/feedback.php +++ b/app/i18n/en-us/feedback.php @@ -107,7 +107,7 @@ return array( 'http_error' => 'Failed to load website content.', // IGNORE 'no_entries' => 'There are no articles in this feed. You need at least one article to create a preview.', // IGNORE 'no_feed' => 'Internal error (feed cannot be found).', // IGNORE - 'no_result' => 'The selector didn\'t match anything. As a fallback the original feed text will be displayed instead.', // IGNORE + 'no_result' => 'The selector didn’t match anything. As a fallback the original feed text will be displayed instead.', // IGNORE 'selector_empty' => 'The selector is empty. You need to define one to create a preview.', // IGNORE ), 'updated' => 'Feed has been updated', // IGNORE diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php index 44041dc12..3541b434a 100644 --- a/app/i18n/en/admin.php +++ b/app/i18n/en/admin.php @@ -12,7 +12,7 @@ return array( 'auth' => array( - 'allow_anonymous' => 'Allow anonymous reading of the default user\'s articles (%s)', + 'allow_anonymous' => 'Allow anonymous reading of the default user’s articles (%s)', 'allow_anonymous_refresh' => 'Allow anonymous refresh of the articles', 'api_enabled' => 'Allow <abbr>API</abbr> access <small>(required for mobile apps)</small>', 'form' => 'Web form (traditional, requires JavaScript)', diff --git a/app/i18n/en/conf.php b/app/i18n/en/conf.php index 91d5d5995..9dfba080e 100644 --- a/app/i18n/en/conf.php +++ b/app/i18n/en/conf.php @@ -14,7 +14,7 @@ return array( 'archiving' => array( '_' => 'Archiving', 'exception' => 'Purge exception', - 'help' => 'More options are available in the individual feed\'s settings', + 'help' => 'More options are available in the individual feed’s settings', 'keep_favourites' => 'Never delete favourites', 'keep_labels' => 'Never delete labels', 'keep_max' => 'Maximum number of articles to keep', diff --git a/app/i18n/en/feedback.php b/app/i18n/en/feedback.php index 9cecd92a3..23bc80250 100644 --- a/app/i18n/en/feedback.php +++ b/app/i18n/en/feedback.php @@ -107,7 +107,7 @@ return array( 'http_error' => 'Failed to load website content.', 'no_entries' => 'There are no articles in this feed. You need at least one article to create a preview.', 'no_feed' => 'Internal error (feed cannot be found).', - 'no_result' => 'The selector didn\'t match anything. As a fallback the original feed text will be displayed instead.', + 'no_result' => 'The selector didn’t match anything. As a fallback the original feed text will be displayed instead.', 'selector_empty' => 'The selector is empty. You need to define one to create a preview.', ), 'updated' => 'Feed has been updated', diff --git a/app/i18n/es/gen.php b/app/i18n/es/gen.php index 409f57e2e..7d2df254a 100755 --- a/app/i18n/es/gen.php +++ b/app/i18n/es/gen.php @@ -123,7 +123,7 @@ return array( ), 'js' => array( 'category_empty' => 'Vaciar categoría', - 'confirm_action' => '¿Seguyro que quieres hacerlo? No hay marcha atrás...', + 'confirm_action' => '¿Seguyro que quieres hacerlo? No hay marcha atrás…', 'confirm_action_feed_cat' => '¿Seguro que quieres hacerlo? Perderás todos los favoritos relacionados y las peticiones de usuario. ¡Y no hay marcha atrás!', 'feedback' => array( 'body_new_articles' => 'Hay %%d nuevos artículos para leer en FreshRSS.', diff --git a/app/i18n/fr/feedback.php b/app/i18n/fr/feedback.php index e48c806fd..e7f4dfaa4 100644 --- a/app/i18n/fr/feedback.php +++ b/app/i18n/fr/feedback.php @@ -100,14 +100,14 @@ return array( 'n_entries_deleted' => '%d articles ont été supprimés.', 'no_refresh' => 'Il n’y a aucun flux à actualiser…', 'not_added' => '<em>%s</em> n’a pas pu être ajouté.', - 'not_found' => 'Le flux n\'a pas pu être trouvé.', + 'not_found' => 'Le flux n’a pas pu être trouvé.', 'over_max' => 'Vous avez atteint votre limite de flux (%d)', 'reloaded' => '<em>%s</em> a été rechargé.', 'selector_preview' => array( 'http_error' => 'Échec lors du chargement du contenu du site web.', - 'no_entries' => 'Il n\'y a pas d\'articles dans ce flux. Vous devez avoir au moins un article pour générer une prévisualisation.', - 'no_feed' => 'Erreur interne (le flux n\'a pas pu être trouvé).', - 'no_result' => 'Le sélecteur n\'a produit aucune concordance. Dans ces circonstances, le texte original du flux sera affiché.', + 'no_entries' => 'Il n’y a pas d’articles dans ce flux. Vous devez avoir au moins un article pour générer une prévisualisation.', + 'no_feed' => 'Erreur interne (le flux n’a pas pu être trouvé).', + 'no_result' => 'Le sélecteur n’a produit aucune concordance. Dans ces circonstances, le texte original du flux sera affiché.', 'selector_empty' => 'Le sélecteur est vide. Vous devez en définir un pour générer une prévisualisation.', ), 'updated' => 'Le flux a été mis à jour', diff --git a/app/i18n/he/feedback.php b/app/i18n/he/feedback.php index 2c6a2270b..a93ee5fb7 100644 --- a/app/i18n/he/feedback.php +++ b/app/i18n/he/feedback.php @@ -107,7 +107,7 @@ return array( 'http_error' => 'Failed to load website content.', // TODO 'no_entries' => 'There are no articles in this feed. You need at least one article to create a preview.', // TODO 'no_feed' => 'Internal error (feed cannot be found).', // TODO - 'no_result' => 'The selector didn\'t match anything. As a fallback the original feed text will be displayed instead.', // TODO + 'no_result' => 'The selector didn’t match anything. As a fallback the original feed text will be displayed instead.', // TODO 'selector_empty' => 'The selector is empty. You need to define one to create a preview.', // TODO ), 'updated' => 'ההזנה התעדכנה', diff --git a/app/i18n/it/feedback.php b/app/i18n/it/feedback.php index ff09fbe5a..1192e14b7 100644 --- a/app/i18n/it/feedback.php +++ b/app/i18n/it/feedback.php @@ -107,7 +107,7 @@ return array( 'http_error' => 'Failed to load website content.', // TODO 'no_entries' => 'There are no articles in this feed. You need at least one article to create a preview.', // TODO 'no_feed' => 'Internal error (feed cannot be found).', // TODO - 'no_result' => 'The selector didn\'t match anything. As a fallback the original feed text will be displayed instead.', // TODO + 'no_result' => 'The selector didn’t match anything. As a fallback the original feed text will be displayed instead.', // TODO 'selector_empty' => 'The selector is empty. You need to define one to create a preview.', // TODO ), 'updated' => 'Feed aggiornato', diff --git a/app/i18n/nl/conf.php b/app/i18n/nl/conf.php index 4785347d5..14f23c701 100644 --- a/app/i18n/nl/conf.php +++ b/app/i18n/nl/conf.php @@ -80,7 +80,7 @@ return array( 'title' => 'Profiel', ), 'query' => array( - '_' => 'Gebruikersquery\'s (informatie aanvragen)', + '_' => 'Gebruikersquery’s (informatie aanvragen)', 'deprecated' => 'Deze query (informatie aanvraag) is niet langer geldig. De bedoelde categorie of feed is al verwijderd.', 'filter' => array( '_' => 'Filter toegepast:', @@ -118,7 +118,7 @@ return array( 'state_13' => 'Toon gelezen artikelen', 'state_14' => 'Toon ongelezen artikelen', 'state_15' => 'Toon alle artikelen', - 'title' => 'Gebruikersquery\'s', + 'title' => 'Gebruikersquery’s', ), 'reading' => array( '_' => 'Lezen', diff --git a/app/i18n/oc/feedback.php b/app/i18n/oc/feedback.php index f31b5b289..4b752cfce 100644 --- a/app/i18n/oc/feedback.php +++ b/app/i18n/oc/feedback.php @@ -56,11 +56,11 @@ return array( 'removed' => '%s suprimida', ), '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.', + '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', 'file_cannot_be_uploaded' => 'Telecargament del fichièr impossible', - 'no_zip_extension' => 'L\'extension es pas presenta sul servidor.', + 'no_zip_extension' => 'L’extension es pas presenta sul servidor.', 'zip_error' => 'Una error s’es producha pendent l’importacion del fichièr ZIP.', ), 'profile' => array( @@ -95,7 +95,7 @@ return array( 'deleted' => 'Lo flux es suprimit', 'error' => 'Error en actualizar', 'internal_problem' => 'Lo flux pòt pas èsser ajustat. <a href="%s">Consultatz los jornals d’audit de FreshRSS</a> per ne saber mai. Podètz forçar l’apondon en ajustant <code>#force_feed</code> a l’URL.', - 'invalid_url' => 'L\'URL <em>%s</em> es invalida', + 'invalid_url' => 'L’URL <em>%s</em> es invalida', 'n_actualized' => '%s fluxes son estats actualizats', 'n_entries_deleted' => '%d articles son estats suprimits', 'no_refresh' => 'I a pas cap de flux d’actualizar…', diff --git a/app/i18n/pl/index.php b/app/i18n/pl/index.php index d11d187ed..c1a1961c0 100644 --- a/app/i18n/pl/index.php +++ b/app/i18n/pl/index.php @@ -16,7 +16,7 @@ return array( 'agpl3' => '<a href="https://www.gnu.org/licenses/agpl-3.0.html">AGPL 3</a>', // IGNORE 'bugs_reports' => 'Zgłaszanie problemów', 'credits' => 'Uznanie autorstwa', - 'credits_content' => 'Niektóre elementy designu pochodzą z <a href="http://twitter.github.io/bootstrap/">Bootstrapa</a>, przy czym FreshRSS nie używa tego frameworku. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Ikony</a> zostały pierwotnie stworzone dla <a href="https://www.gnome.org/">projektu GNOME</a>. Font <em>Open Sans</em> jest autorstwa <a href="https://fonts.google.com/specimen/Open+Sans">Steve\'a Mattesona</a>. FreshRSS opiera się na <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, frameworku PHP.', + 'credits_content' => 'Niektóre elementy designu pochodzą z <a href="http://twitter.github.io/bootstrap/">Bootstrapa</a>, przy czym FreshRSS nie używa tego frameworku. <a href="https://git.gnome.org/browse/gnome-icon-theme-symbolic">Ikony</a> zostały pierwotnie stworzone dla <a href="https://www.gnome.org/">projektu GNOME</a>. Font <em>Open Sans</em> jest autorstwa <a href="https://fonts.google.com/specimen/Open+Sans">Steve’a Mattesona</a>. FreshRSS opiera się na <a href="https://github.com/marienfressinaud/MINZ">Minz</a>, frameworku PHP.', 'freshrss_description' => 'FreshRSS jest agregatorem kanałów RSS przeznaczonym do zainstalowania na własnym serwerze, podobnie jak <a href="http://tontof.net/kriss/feed/">Kriss Feed</a>, bądź <a href="https://github.com/LeedRSS/Leed">Leed</a>. Jest lekki i łatwy do schowania w kieszeni, pozostając przy tym potężnym i konfigurowalnym narzędziem.', 'github' => '<a href="https://github.com/FreshRSS/FreshRSS/issues">na Githubie</a>', 'license' => 'Licencja', diff --git a/app/i18n/tr/sub.php b/app/i18n/tr/sub.php index f21255c05..4704b401c 100644 --- a/app/i18n/tr/sub.php +++ b/app/i18n/tr/sub.php @@ -12,7 +12,7 @@ return array( 'api' => array( - 'documentation' => 'URL\'yi harici bir araçla kullanmak için kopyala.', + 'documentation' => 'URL’yi harici bir araçla kullanmak için kopyala.', 'title' => 'API', // IGNORE ), 'bookmarklet' => array( diff --git a/app/install.php b/app/install.php index c9faffd4c..9186404c1 100644 --- a/app/install.php +++ b/app/install.php @@ -284,7 +284,7 @@ function freshrss_already_installed() { return false; } - // ok, the global conf exists... but what about default user conf? + // ok, the global conf exists… but what about default user conf? $current_user = $system_conf->default_user; try { Minz_Configuration::register('user', join_path(USERS_PATH, $current_user, 'config.php')); diff --git a/app/shares.php b/app/shares.php index 474fecc25..330f52bb7 100644 --- a/app/shares.php +++ b/app/shares.php @@ -1,7 +1,7 @@ <?php /* - * This is a configuration file. You shouldn't modify it unless you know what + * This is a configuration file. You shouldn’t modify it unless you know what * you are doing. If you want to add a share type, this is where you need to do * it. * @@ -16,7 +16,7 @@ * for internal use) * - transform is an array of transformation to apply on links and titles * - help is a URL to a help page (mandatory for form = 'advanced') - * - form is the type of form to display during configuration. It's either + * - form is the type of form to display during configuration. It’s either * 'simple' or 'advanced'. 'simple' is used when only the name is configurable, * 'advanced' is used when the name and the location are configurable. * - method is the HTTP method (POST or GET) used to share a link. |