From: Andrew Dolgov <noreply@fakecake.org>
Date: Mon, 17 Aug 2015 04:55:44 +0000 (+0300)
Subject: Merge branch 'master' of git.fakecake.org:tt-rss
X-Git-Tag: 16.3~129
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=961cae85a4ed14647c3b4a616c3c63873c7bc5e0;hp=d5eaaa050821a7b07baf932d6ce705f3c67ef334;p=tt-rss.git

Merge branch 'master' of git.fakecake.org:tt-rss
---

diff --git a/include/functions2.php b/include/functions2.php
index 6a83a44f..dd9d1ad6 100644
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -1890,6 +1890,7 @@
 				$rv = $retval;
 			}
 		}
+		unset($retval); // Unset to prevent breaking render if there are no HOOK_RENDER_ENCLOSURE hooks below.
 
 		if ($rv === '' && !empty($result)) {
 			$entries_html = array();
diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index a922516c..7ea0bf0c 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -1248,6 +1248,8 @@
 					if ($file_content && strlen($file_content) > _MIN_CACHE_IMAGE_SIZE) {
 						file_put_contents($local_filename, $file_content);
 					}
+				} else {
+					touch($local_filename);
 				}
 			}
 		}
diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index a8732e4a..19f00a4e 100644
Binary files a/locale/fr_FR/LC_MESSAGES/messages.mo and b/locale/fr_FR/LC_MESSAGES/messages.mo differ
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 882f7631..60c334a4 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-08-12 12:23+0300\n"
-"PO-Revision-Date: 2015-07-16 07:30+0200\n"
+"PO-Revision-Date: 2015-08-15 18:36+0200\n"
 "Last-Translator: Raphael Rochet <raphael@rri.fr>\n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.8.2\n"
+"X-Generator: Poedit 1.8.4\n"
 
 #: backend.php:73
 msgid "Use default"
@@ -55,49 +55,39 @@ msgstr "Au bout de 3 mois"
 msgid "Default interval"
 msgstr "Fréquence de mise à jour par défaut"
 
-#: backend.php:83
-#: backend.php:93
+#: backend.php:83 backend.php:93
 msgid "Disable updates"
 msgstr "Désactiver les mises à jour"
 
-#: backend.php:84
-#: backend.php:94
+#: backend.php:84 backend.php:94
 msgid "15 minutes"
 msgstr "15 minutes"
 
-#: backend.php:85
-#: backend.php:95
+#: backend.php:85 backend.php:95
 msgid "30 minutes"
 msgstr "30 minutes"
 
-#: backend.php:86
-#: backend.php:96
+#: backend.php:86 backend.php:96
 msgid "Hourly"
 msgstr "Toutes les heures"
 
-#: backend.php:87
-#: backend.php:97
+#: backend.php:87 backend.php:97
 msgid "4 hours"
 msgstr "4 heures"
 
-#: backend.php:88
-#: backend.php:98
+#: backend.php:88 backend.php:98
 msgid "12 hours"
 msgstr "12 heures"
 
-#: backend.php:89
-#: backend.php:99
+#: backend.php:89 backend.php:99
 msgid "Daily"
 msgstr "Une fois par jour"
 
-#: backend.php:90
-#: backend.php:100
+#: backend.php:90 backend.php:100
 msgid "Weekly"
 msgstr "Une fois par semaine"
 
-#: backend.php:103
-#: classes/pref/system.php:51
-#: classes/pref/users.php:119
+#: backend.php:103 classes/pref/system.php:51 classes/pref/users.php:119
 msgid "User"
 msgstr "Utilisateur"
 
@@ -165,39 +155,16 @@ msgstr "Méthode non trouvée"
 msgid "Plugin not found"
 msgstr "Plugin non trouvé"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
-#: classes/backend.php:5
-#: classes/pref/feeds.php:1411
-#: classes/pref/filters.php:766
-#: classes/pref/labels.php:296
-#: js/feedlist.js:133
-#: js/functions.js:1229
-#: js/functions.js:1363
-#: js/functions.js:1675
-#: js/prefs.js:653
-#: js/prefs.js:854
-#: js/prefs.js:1760
-#: js/prefs.js:1776
-#: js/prefs.js:1794
-#: js/tt-rss.js:55
-#: js/tt-rss.js:525
-#: js/viewfeed.js:1296
-#: plugins/import_export/import_export.js:17
-#: plugins/af_sort_bayes/init.js:9
-#: js/feedlist.js:457
-#: js/functions.js:449
-#: js/functions.js:793
-#: js/prefs.js:1441
-#: js/prefs.js:1494
-#: js/prefs.js:1534
-#: js/prefs.js:1551
-#: js/prefs.js:1567
-#: js/prefs.js:1587
-#: js/tt-rss.js:542
-#: js/viewfeed.js:839
+#: index.php:133 index.php:149 index.php:267 prefs.php:102
+#: classes/backend.php:5 classes/pref/feeds.php:1411
+#: classes/pref/filters.php:766 classes/pref/labels.php:296 js/feedlist.js:133
+#: js/functions.js:1229 js/functions.js:1363 js/functions.js:1675
+#: js/prefs.js:653 js/prefs.js:854 js/prefs.js:1760 js/prefs.js:1776
+#: js/prefs.js:1794 js/tt-rss.js:55 js/tt-rss.js:525 js/viewfeed.js:1296
+#: plugins/import_export/import_export.js:17 plugins/af_sort_bayes/init.js:9
+#: js/feedlist.js:457 js/functions.js:449 js/functions.js:793 js/prefs.js:1441
+#: js/prefs.js:1494 js/prefs.js:1534 js/prefs.js:1551 js/prefs.js:1567
+#: js/prefs.js:1587 js/tt-rss.js:542 js/viewfeed.js:839
 msgid "Loading, please wait..."
 msgstr "Chargement en cours, veuillez patienter..."
 
@@ -217,21 +184,15 @@ msgstr "Adaptatif"
 msgid "All Articles"
 msgstr "Tous les articles"
 
-#: index.php:175
-#: include/functions2.php:102
-#: classes/feeds.php:104
+#: index.php:175 include/functions2.php:102 classes/feeds.php:104
 msgid "Starred"
 msgstr "Remarquables"
 
-#: index.php:176
-#: include/functions2.php:103
-#: classes/feeds.php:105
+#: index.php:176 include/functions2.php:103 classes/feeds.php:105
 msgid "Published"
 msgstr "Publiés"
 
-#: index.php:177
-#: classes/feeds.php:91
-#: classes/feeds.php:103
+#: index.php:177 classes/feeds.php:91 classes/feeds.php:103
 msgid "Unread"
 msgstr "Non lus"
 
@@ -263,12 +224,8 @@ msgstr "Les plus anciens en premier"
 msgid "Title"
 msgstr "Titre"
 
-#: index.php:192
-#: index.php:233
-#: include/functions2.php:92
-#: classes/feeds.php:109
-#: js/FeedTree.js:132
-#: js/FeedTree.js:160
+#: index.php:192 index.php:233 include/functions2.php:92 classes/feeds.php:109
+#: js/FeedTree.js:132 js/FeedTree.js:160
 msgid "Mark as read"
 msgstr "Marquer comme lu"
 
@@ -304,8 +261,7 @@ msgstr "Rechercher..."
 msgid "Feed actions:"
 msgstr "Actions sur ce flux :"
 
-#: index.php:228
-#: classes/handler/public.php:660
+#: index.php:228 classes/handler/public.php:660
 msgid "Subscribe to feed..."
 msgstr "S'abonner au flux..."
 
@@ -317,9 +273,7 @@ msgstr "Modifier ce flux..."
 msgid "Rescore feed"
 msgstr "Recalculer le score du flux"
 
-#: index.php:231
-#: classes/pref/feeds.php:771
-#: classes/pref/feeds.php:1366
+#: index.php:231 classes/pref/feeds.php:771 classes/pref/feeds.php:1366
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Se désabonner"
@@ -336,8 +290,7 @@ msgstr "Masquer/afficher les flux lus"
 msgid "Other actions:"
 msgstr "Autres actions :"
 
-#: index.php:236
-#: include/functions2.php:78
+#: index.php:236 include/functions2.php:78
 msgid "Toggle widescreen mode"
 msgstr "Basculer le mode écran large"
 
@@ -361,9 +314,7 @@ msgstr "Déconnexion"
 msgid "Updates are available from Git."
 msgstr "Des mises à jour sont disponible via Git"
 
-#: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:105
+#: prefs.php:33 prefs.php:120 include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Configuration"
@@ -376,21 +327,16 @@ msgstr "Raccourcis clavier"
 msgid "Exit preferences"
 msgstr "Quitter la configuration"
 
-#: prefs.php:123
-#: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1287
+#: prefs.php:123 classes/pref/feeds.php:112 classes/pref/feeds.php:1287
 #: classes/pref/feeds.php:1355
 msgid "Feeds"
 msgstr "Flux"
 
-#: prefs.php:126
-#: classes/pref/filters.php:235
+#: prefs.php:126 classes/pref/filters.php:235
 msgid "Filters"
 msgstr "Filtres"
 
-#: prefs.php:129
-#: include/functions.php:1252
-#: include/functions.php:1904
+#: prefs.php:129 include/functions.php:1252 include/functions.php:1904
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etiquettes"
@@ -403,8 +349,7 @@ msgstr "Utilisateurs"
 msgid "System"
 msgstr "Système"
 
-#: register.php:187
-#: include/login_form.php:245
+#: register.php:187 include/login_form.php:245
 msgid "Create new account"
 msgstr "Créer un nouveau compte"
 
@@ -412,20 +357,11 @@ msgstr "Créer un nouveau compte"
 msgid "New user registrations are administratively disabled."
 msgstr "L'inscription de nouveaux utilisateurs est désactivée par l'administrateur."
 
-#: register.php:197
-#: register.php:242
-#: register.php:255
-#: register.php:270
-#: register.php:289
-#: register.php:337
-#: register.php:347
-#: register.php:359
-#: classes/handler/public.php:730
-#: classes/handler/public.php:801
-#: classes/handler/public.php:899
-#: classes/handler/public.php:978
-#: classes/handler/public.php:992
-#: classes/handler/public.php:999
+#: register.php:197 register.php:242 register.php:255 register.php:270
+#: register.php:289 register.php:337 register.php:347 register.php:359
+#: classes/handler/public.php:730 classes/handler/public.php:801
+#: classes/handler/public.php:899 classes/handler/public.php:978
+#: classes/handler/public.php:992 classes/handler/public.php:999
 #: classes/handler/public.php:1024
 msgid "Return to Tiny Tiny RSS"
 msgstr "Revenir à Tiny Tiny RSS"
@@ -442,13 +378,11 @@ msgstr "Identifiant souhaité :"
 msgid "Check availability"
 msgstr "Vérifier la disponibilité"
 
-#: register.php:229
-#: classes/handler/public.php:817
+#: register.php:229 classes/handler/public.php:817
 msgid "Email:"
 msgstr "Adresse mail :"
 
-#: register.php:232
-#: classes/handler/public.php:822
+#: register.php:232 classes/handler/public.php:822
 msgid "How much is two plus two:"
 msgstr "Combien font 2 plus 2 :"
 
@@ -480,13 +414,9 @@ msgstr "L'inscription de nouveaux utilisateurs est actuellement fermée."
 msgid "Tiny Tiny RSS data update script."
 msgstr "Script de mise à jour des données de Tiny Tiny RSS."
 
-#: include/digest.php:109
-#: include/functions.php:1261
-#: include/functions.php:1805
-#: include/functions.php:1890
-#: include/functions.php:1912
-#: classes/opml.php:421
-#: classes/pref/feeds.php:228
+#: include/digest.php:109 include/functions.php:1261
+#: include/functions.php:1805 include/functions.php:1890
+#: include/functions.php:1912 classes/opml.php:421 classes/pref/feeds.php:228
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
@@ -545,18 +475,15 @@ msgstr "Afficher la fenêtre de recherche"
 msgid "Article"
 msgstr "Article"
 
-#: include/functions2.php:63
-#: js/viewfeed.js:1989
+#: include/functions2.php:63 js/viewfeed.js:1989
 msgid "Toggle starred"
 msgstr "Marquer comme (non) remarquable"
 
-#: include/functions2.php:64
-#: js/viewfeed.js:2000
+#: include/functions2.php:64 js/viewfeed.js:2000
 msgid "Toggle published"
 msgstr "Marquer comme (non) publié"
 
-#: include/functions2.php:65
-#: js/viewfeed.js:1978
+#: include/functions2.php:65 js/viewfeed.js:1978
 msgid "Toggle unread"
 msgstr "Marquer comme (non) lu"
 
@@ -576,13 +503,11 @@ msgstr "Écarter les articles lus"
 msgid "Open in new window"
 msgstr "Ouvrir dans une nouvelle fenêtre"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:2019
+#: include/functions2.php:70 js/viewfeed.js:2019
 msgid "Mark below as read"
 msgstr "Marquer les articles en-dessous comme lus"
 
-#: include/functions2.php:71
-#: js/viewfeed.js:2013
+#: include/functions2.php:71 js/viewfeed.js:2013
 msgid "Mark above as read"
 msgstr "Marquer les articles au-dessus comme lus"
 
@@ -610,8 +535,7 @@ msgstr "Contracter l'article"
 msgid "Toggle article expansion (combined mode)"
 msgstr "Basculer le développement (mode combiné)"
 
-#: include/functions2.php:79
-#: plugins/embed_original/init.php:31
+#: include/functions2.php:79 plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Basculer l'intégration de l'article original"
 
@@ -643,8 +567,7 @@ msgstr "Inverser la sélection"
 msgid "Deselect everything"
 msgstr "Tout désélectionner"
 
-#: include/functions2.php:87
-#: classes/pref/feeds.php:552
+#: include/functions2.php:87 classes/pref/feeds.php:552
 #: classes/pref/feeds.php:808
 msgid "Feed"
 msgstr "Flux"
@@ -657,14 +580,11 @@ msgstr "Actualiser le flux actif"
 msgid "Un/hide read feeds"
 msgstr "Masquer/afficher les flux lus"
 
-#: include/functions2.php:90
-#: classes/pref/feeds.php:1358
+#: include/functions2.php:90 classes/pref/feeds.php:1358
 msgid "Subscribe to feed"
 msgstr "S'abonner au flux"
 
-#: include/functions2.php:91
-#: js/FeedTree.js:139
-#: js/PrefFeedTree.js:68
+#: include/functions2.php:91 js/FeedTree.js:139 js/PrefFeedTree.js:68
 msgid "Edit feed"
 msgstr "Modifier le flux"
 
@@ -676,8 +596,7 @@ msgstr "Inverser l'ordre des en-têtes"
 msgid "Debug feed update"
 msgstr "Déboguer les mises à jour"
 
-#: include/functions2.php:95
-#: js/FeedTree.js:182
+#: include/functions2.php:95 js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Marquer tous les flux comme lus"
 
@@ -697,8 +616,7 @@ msgstr "Basculer le développement automatique en mode combiné"
 msgid "Go to"
 msgstr "Aller à"
 
-#: include/functions2.php:100
-#: include/functions.php:1963
+#: include/functions2.php:100 include/functions.php:1963
 msgid "All articles"
 msgstr "Tous les articles"
 
@@ -706,9 +624,7 @@ msgstr "Tous les articles"
 msgid "Fresh"
 msgstr "Nouveaux"
 
-#: include/functions2.php:104
-#: js/tt-rss.js:469
-#: js/tt-rss.js:653
+#: include/functions2.php:104 js/tt-rss.js:469 js/tt-rss.js:653
 msgid "Tag cloud"
 msgstr "Nuage de tags"
 
@@ -716,13 +632,11 @@ msgstr "Nuage de tags"
 msgid "Other"
 msgstr "Autre"
 
-#: include/functions2.php:107
-#: classes/pref/labels.php:281
+#: include/functions2.php:107 classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Créer une étiquette"
 
-#: include/functions2.php:108
-#: classes/pref/filters.php:740
+#: include/functions2.php:108 classes/pref/filters.php:740
 msgid "Create filter"
 msgstr "Créer un filtre"
 
@@ -739,15 +653,13 @@ msgstr "Afficher la fenêtre d'aide"
 msgid "Search results: %s"
 msgstr "Résultats de recherche : %s"
 
-#: include/functions2.php:1299
-#: classes/feeds.php:737
+#: include/functions2.php:1299 classes/feeds.php:737
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "Commentaire"
 msgstr[1] "Commentaires"
 
-#: include/functions2.php:1303
-#: classes/feeds.php:741
+#: include/functions2.php:1303 classes/feeds.php:741
 msgid "comments"
 msgstr "Commentaires"
 
@@ -755,46 +667,32 @@ msgstr "Commentaires"
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1362
-#: include/functions2.php:1613
+#: include/functions2.php:1362 include/functions2.php:1613
 #: classes/article.php:292
 msgid "no tags"
 msgstr "aucun tag"
 
-#: include/functions2.php:1372
-#: classes/feeds.php:723
+#: include/functions2.php:1372 classes/feeds.php:723
 msgid "Edit tags for this article"
 msgstr "Modifier les tags pour cet article"
 
-#: include/functions2.php:1404
-#: classes/feeds.php:670
+#: include/functions2.php:1404 classes/feeds.php:670
 msgid "Originally from:"
 msgstr "Origine :"
 
-#: include/functions2.php:1417
-#: classes/feeds.php:683
+#: include/functions2.php:1417 classes/feeds.php:683
 #: classes/pref/feeds.php:571
 msgid "Feed URL"
 msgstr "URL du flux"
 
-#: include/functions2.php:1454
-#: classes/backend.php:105
-#: classes/pref/users.php:95
-#: classes/pref/feeds.php:1655
-#: classes/pref/feeds.php:1721
-#: classes/pref/filters.php:192
-#: classes/pref/prefs.php:1101
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/googlereaderimport/init.php:194
-#: plugins/import_export/init.php:411
-#: plugins/import_export/init.php:456
-#: plugins/af_sort_bayes/init.php:402
-#: plugins/share/init.php:123
+#: include/functions2.php:1454 classes/backend.php:105
+#: classes/pref/users.php:95 classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1721 classes/pref/filters.php:192
+#: classes/pref/prefs.php:1101 classes/dlg.php:37 classes/dlg.php:60
+#: classes/dlg.php:93 classes/dlg.php:159 classes/dlg.php:186
+#: plugins/af_psql_trgm/init.php:102 plugins/googlereaderimport/init.php:194
+#: plugins/import_export/init.php:411 plugins/import_export/init.php:456
+#: plugins/af_sort_bayes/init.php:402 plugins/share/init.php:123
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
@@ -815,13 +713,11 @@ msgstr "Fichier attaché"
 msgid "%d min"
 msgstr "%d min"
 
-#: include/functions.php:1250
-#: include/functions.php:1902
+#: include/functions.php:1250 include/functions.php:1902
 msgid "Special"
 msgstr "Spécial"
 
-#: include/functions.php:1753
-#: classes/pref/filters.php:216
+#: include/functions.php:1753 classes/pref/filters.php:216
 #: classes/pref/filters.php:494
 msgid "All feeds"
 msgstr "Tous les flux"
@@ -846,14 +742,12 @@ msgstr "Articles archivés"
 msgid "Recently read"
 msgstr "Lus récemment"
 
-#: include/login_form.php:190
-#: classes/handler/public.php:557
+#: include/login_form.php:190 classes/handler/public.php:557
 #: classes/handler/public.php:812
 msgid "Login:"
 msgstr "Identifiant :"
 
-#: include/login_form.php:200
-#: classes/handler/public.php:560
+#: include/login_form.php:200 classes/handler/public.php:560
 msgid "Password:"
 msgstr "Mot de passe :"
 
@@ -865,10 +759,8 @@ msgstr "J'ai oublié mon mot de passe"
 msgid "Profile:"
 msgstr "Profil :"
 
-#: include/login_form.php:216
-#: classes/handler/public.php:299
-#: classes/rpc.php:63
-#: classes/pref/prefs.php:1039
+#: include/login_form.php:216 classes/handler/public.php:299
+#: classes/rpc.php:63 classes/pref/prefs.php:1039
 msgid "Default profile"
 msgstr "Profil par défaut"
 
@@ -884,8 +776,7 @@ msgstr "N'affiche pas les images dans les articles, allège les actualisations a
 msgid "Remember me"
 msgstr "Se souvenir de moi"
 
-#: include/login_form.php:242
-#: classes/handler/public.php:565
+#: include/login_form.php:242 classes/handler/public.php:565
 msgid "Log in"
 msgstr "Se connecter"
 
@@ -925,8 +816,7 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 msgstr "Sujet non trouvé dans l'aide."
 
-#: classes/handler/public.php:498
-#: plugins/bookmarklets/init.php:40
+#: classes/handler/public.php:498 plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Partager avec Tiny Tiny RSS"
 
@@ -934,10 +824,8 @@ msgstr "Partager avec Tiny Tiny RSS"
 msgid "Title:"
 msgstr "Titre :"
 
-#: classes/handler/public.php:508
-#: classes/pref/feeds.php:569
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
+#: classes/handler/public.php:508 classes/pref/feeds.php:569
+#: plugins/instances/init.php:212 plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL :"
 
@@ -957,25 +845,15 @@ msgstr "Les articles partagés apparaîtront dans le flux Publiés."
 msgid "Share"
 msgstr "Partager"
 
-#: classes/handler/public.php:534
-#: classes/handler/public.php:568
-#: classes/feeds.php:1084
-#: classes/feeds.php:1134
-#: classes/feeds.php:1171
-#: classes/article.php:205
-#: classes/pref/users.php:170
-#: classes/pref/feeds.php:788
-#: classes/pref/feeds.php:929
-#: classes/pref/feeds.php:1861
-#: classes/pref/filters.php:475
-#: classes/pref/filters.php:889
-#: classes/pref/filters.php:970
-#: classes/pref/filters.php:1063
-#: classes/pref/labels.php:81
-#: classes/pref/prefs.php:987
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:172
-#: plugins/instances/init.php:248
+#: classes/handler/public.php:534 classes/handler/public.php:568
+#: classes/feeds.php:1084 classes/feeds.php:1134 classes/feeds.php:1171
+#: classes/article.php:205 classes/pref/users.php:170
+#: classes/pref/feeds.php:788 classes/pref/feeds.php:929
+#: classes/pref/feeds.php:1861 classes/pref/filters.php:475
+#: classes/pref/filters.php:889 classes/pref/filters.php:970
+#: classes/pref/filters.php:1063 classes/pref/labels.php:81
+#: classes/pref/prefs.php:987 plugins/note/init.php:53
+#: plugins/mail/init.php:172 plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 msgid "Cancel"
 msgstr "Annuler"
@@ -1033,8 +911,7 @@ msgstr "Récupération de mot de passe"
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "Vous devrez fournir un nom et une adresse email valides. Un lien pour réinitialiser votre mot de passe sera envoyé à votre adresse email."
 
-#: classes/handler/public.php:827
-#: classes/pref/users.php:352
+#: classes/handler/public.php:827 classes/pref/users.php:352
 msgid "Reset password"
 msgstr "Réinitialiser le mot de passe"
 
@@ -1042,8 +919,7 @@ msgstr "Réinitialiser le mot de passe"
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Des paramètres du formulaire manquent ou sont invalides."
 
-#: classes/handler/public.php:841
-#: classes/handler/public.php:907
+#: classes/handler/public.php:841 classes/handler/public.php:907
 msgid "Go back"
 msgstr "Revenir"
 
@@ -1071,9 +947,7 @@ msgstr "Exécuter les mises à jour"
 msgid "View as RSS feed"
 msgstr "Voir comme flux RSS"
 
-#: classes/feeds.php:54
-#: classes/feeds.php:134
-#: classes/pref/feeds.php:1517
+#: classes/feeds.php:54 classes/feeds.php:134 classes/pref/feeds.php:1517
 msgid "View as RSS"
 msgstr "Voir comme RSS"
 
@@ -1082,19 +956,12 @@ msgstr "Voir comme RSS"
 msgid "Last updated: %s"
 msgstr "Dernière mise à jour : %s"
 
-#: classes/feeds.php:90
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1349
-#: classes/pref/feeds.php:1606
-#: classes/pref/feeds.php:1670
-#: classes/pref/filters.php:349
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:734
-#: classes/pref/filters.php:822
-#: classes/pref/filters.php:849
-#: classes/pref/labels.php:275
-#: classes/pref/prefs.php:999
-#: plugins/instances/init.php:287
+#: classes/feeds.php:90 classes/pref/users.php:337 classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1606 classes/pref/feeds.php:1670
+#: classes/pref/filters.php:349 classes/pref/filters.php:397
+#: classes/pref/filters.php:734 classes/pref/filters.php:822
+#: classes/pref/filters.php:849 classes/pref/labels.php:275
+#: classes/pref/prefs.php:999 plugins/instances/init.php:287
 msgid "All"
 msgstr "Tout"
 
@@ -1102,19 +969,12 @@ msgstr "Tout"
 msgid "Invert"
 msgstr "Inverse"
 
-#: classes/feeds.php:93
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1351
-#: classes/pref/feeds.php:1608
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:351
-#: classes/pref/filters.php:399
-#: classes/pref/filters.php:736
-#: classes/pref/filters.php:824
-#: classes/pref/filters.php:851
-#: classes/pref/labels.php:277
-#: classes/pref/prefs.php:1001
-#: plugins/instances/init.php:289
+#: classes/feeds.php:93 classes/pref/users.php:339 classes/pref/feeds.php:1351
+#: classes/pref/feeds.php:1608 classes/pref/feeds.php:1672
+#: classes/pref/filters.php:351 classes/pref/filters.php:399
+#: classes/pref/filters.php:736 classes/pref/filters.php:824
+#: classes/pref/filters.php:851 classes/pref/labels.php:277
+#: classes/pref/prefs.php:1001 plugins/instances/init.php:289
 msgid "None"
 msgstr "Aucun"
 
@@ -1142,17 +1002,13 @@ msgstr "Archive"
 msgid "Move back"
 msgstr "Revenir"
 
-#: classes/feeds.php:116
-#: classes/pref/filters.php:358
-#: classes/pref/filters.php:406
-#: classes/pref/filters.php:831
+#: classes/feeds.php:116 classes/pref/filters.php:358
+#: classes/pref/filters.php:406 classes/pref/filters.php:831
 #: classes/pref/filters.php:858
 msgid "Delete"
 msgstr "Supprimer"
 
-#: classes/feeds.php:121
-#: classes/feeds.php:126
-#: plugins/mailto/init.php:25
+#: classes/feeds.php:121 classes/feeds.php:126 plugins/mailto/init.php:25
 #: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Transférer par email"
@@ -1161,8 +1017,7 @@ msgstr "Transférer par email"
 msgid "Feed:"
 msgstr "Flux :"
 
-#: classes/feeds.php:200
-#: classes/feeds.php:877
+#: classes/feeds.php:200 classes/feeds.php:877
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
@@ -1175,8 +1030,7 @@ msgstr "Jamais"
 msgid "Imported at %s"
 msgstr "Importé à %s"
 
-#: classes/feeds.php:454
-#: classes/feeds.php:551
+#: classes/feeds.php:454 classes/feeds.php:551
 msgid "mark feed as read"
 msgstr "Marquer le flux comme lu"
 
@@ -1204,14 +1058,12 @@ msgstr "Aucun article à afficher. Vous pouvez assigner des étiquettes aux arti
 msgid "No articles found to display."
 msgstr "Aucun article à afficher."
 
-#: classes/feeds.php:803
-#: classes/feeds.php:975
+#: classes/feeds.php:803 classes/feeds.php:975
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Flux mis à jour à %s"
 
-#: classes/feeds.php:813
-#: classes/feeds.php:985
+#: classes/feeds.php:813 classes/feeds.php:985
 msgid "Some feeds have update errors (click for details)"
 msgstr "Des erreurs sont survenues pendant la mise à jour de certains flux (cliquer ici pour les détails)"
 
@@ -1219,15 +1071,12 @@ msgstr "Des erreurs sont survenues pendant la mise à jour de certains flux (cli
 msgid "No feed selected."
 msgstr "Aucun flux sélectionné."
 
-#: classes/feeds.php:1022
-#: classes/feeds.php:1030
+#: classes/feeds.php:1022 classes/feeds.php:1030
 msgid "Feed or site URL"
 msgstr "URL du flux"
 
-#: classes/feeds.php:1036
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:815
-#: classes/pref/feeds.php:1825
+#: classes/feeds.php:1036 classes/pref/feeds.php:592
+#: classes/pref/feeds.php:815 classes/pref/feeds.php:1825
 msgid "Place in category:"
 msgstr "Placer dans la catégorie :"
 
@@ -1235,25 +1084,19 @@ msgstr "Placer dans la catégorie :"
 msgid "Available feeds"
 msgstr "Flux disponibles"
 
-#: classes/feeds.php:1056
-#: classes/pref/users.php:133
-#: classes/pref/feeds.php:634
-#: classes/pref/feeds.php:863
+#: classes/feeds.php:1056 classes/pref/users.php:133
+#: classes/pref/feeds.php:634 classes/pref/feeds.php:863
 msgid "Authentication"
 msgstr "Identification"
 
-#: classes/feeds.php:1060
-#: classes/pref/users.php:397
-#: classes/pref/feeds.php:640
-#: classes/pref/feeds.php:867
+#: classes/feeds.php:1060 classes/pref/users.php:397
+#: classes/pref/feeds.php:640 classes/pref/feeds.php:867
 #: classes/pref/feeds.php:1839
 msgid "Login"
 msgstr "Se connecter"
 
-#: classes/feeds.php:1063
-#: classes/pref/feeds.php:653
-#: classes/pref/feeds.php:873
-#: classes/pref/feeds.php:1842
+#: classes/feeds.php:1063 classes/pref/feeds.php:653
+#: classes/pref/feeds.php:873 classes/pref/feeds.php:1842
 #: classes/pref/prefs.php:245
 msgid "Password"
 msgstr "Mot de passe"
@@ -1262,9 +1105,7 @@ msgstr "Mot de passe"
 msgid "This feed requires authentication."
 msgstr "Ce flux nécessite une identification."
 
-#: classes/feeds.php:1078
-#: classes/feeds.php:1132
-#: classes/pref/feeds.php:1860
+#: classes/feeds.php:1078 classes/feeds.php:1132 classes/pref/feeds.php:1860
 msgid "Subscribe"
 msgstr "S'abonner"
 
@@ -1272,12 +1113,8 @@ msgstr "S'abonner"
 msgid "More feeds"
 msgstr "D'autres flux"
 
-#: classes/feeds.php:1104
-#: classes/feeds.php:1170
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1342
-#: classes/pref/filters.php:727
-#: js/tt-rss.js:174
+#: classes/feeds.php:1104 classes/feeds.php:1170 classes/pref/users.php:324
+#: classes/pref/feeds.php:1342 classes/pref/filters.php:727 js/tt-rss.js:174
 msgid "Search"
 msgstr "Rechercher"
 
@@ -1293,12 +1130,9 @@ msgstr "Archive du flux"
 msgid "limit:"
 msgstr "limite :"
 
-#: classes/feeds.php:1133
-#: classes/pref/users.php:350
-#: classes/pref/feeds.php:758
-#: classes/pref/filters.php:465
-#: classes/pref/filters.php:753
-#: classes/pref/labels.php:284
+#: classes/feeds.php:1133 classes/pref/users.php:350
+#: classes/pref/feeds.php:758 classes/pref/filters.php:465
+#: classes/pref/filters.php:753 classes/pref/labels.php:284
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Supprimer"
@@ -1314,7 +1148,7 @@ msgstr "dans %s"
 
 #: classes/feeds.php:1157
 msgid "Used for word stemming"
-msgstr ""
+msgstr "Utilisé pour la racinisation des mots"
 
 #: classes/feeds.php:1166
 msgid "Search syntax"
@@ -1328,24 +1162,16 @@ msgstr "Article non trouvé."
 msgid "Tags for this article (separated by commas):"
 msgstr "Tags pour cet article (séparés par des virgules) :"
 
-#: classes/article.php:203
-#: classes/pref/users.php:168
-#: classes/pref/feeds.php:787
-#: classes/pref/feeds.php:926
-#: classes/pref/filters.php:472
-#: classes/pref/labels.php:79
-#: classes/pref/prefs.php:985
-#: plugins/af_psql_trgm/init.php:184
-#: plugins/note/init.php:51
-#: plugins/nsfw/init.php:85
-#: plugins/mail/init.php:64
-#: plugins/instances/init.php:245
-#: plugins/af_redditimgur/init.php:57
+#: classes/article.php:203 classes/pref/users.php:168
+#: classes/pref/feeds.php:787 classes/pref/feeds.php:926
+#: classes/pref/filters.php:472 classes/pref/labels.php:79
+#: classes/pref/prefs.php:985 plugins/af_psql_trgm/init.php:184
+#: plugins/note/init.php:51 plugins/nsfw/init.php:85 plugins/mail/init.php:64
+#: plugins/instances/init.php:245 plugins/af_redditimgur/init.php:57
 msgid "Save"
 msgstr "Enregistrer"
 
-#: classes/opml.php:28
-#: classes/opml.php:33
+#: classes/opml.php:28 classes/opml.php:33
 msgid "OPML Utility"
 msgstr "Outil OPML"
 
@@ -1391,21 +1217,18 @@ msgstr "Créer un filtre..."
 msgid "Processing category: %s"
 msgstr "Placer dans la catégorie : %s"
 
-#: classes/opml.php:470
-#: plugins/googlereaderimport/init.php:66
+#: classes/opml.php:470 plugins/googlereaderimport/init.php:66
 #: plugins/import_export/init.php:424
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "Échec de l'envoi, code d'erreur %d"
 
-#: classes/opml.php:484
-#: plugins/googlereaderimport/init.php:80
+#: classes/opml.php:484 plugins/googlereaderimport/init.php:80
 #: plugins/import_export/init.php:438
 msgid "Unable to move uploaded file."
 msgstr "Impossible de déplacer le fichier envoyé."
 
-#: classes/opml.php:488
-#: plugins/googlereaderimport/init.php:84
+#: classes/opml.php:488 plugins/googlereaderimport/init.php:84
 #: plugins/import_export/init.php:442
 msgid "Error: please upload OPML file."
 msgstr "Erreur : veuillez envoyer un document OPML."
@@ -1414,13 +1237,11 @@ msgstr "Erreur : veuillez envoyer un document OPML."
 msgid "Error: unable to find moved OPML file."
 msgstr "Erreur : impossible de trouver le fichier OPML déplacé."
 
-#: classes/opml.php:506
-#: plugins/googlereaderimport/init.php:187
+#: classes/opml.php:506 plugins/googlereaderimport/init.php:187
 msgid "Error while parsing document."
 msgstr "Erreur lors de l'analyse du document."
 
-#: classes/pref/system.php:8
-#: classes/pref/users.php:6
+#: classes/pref/system.php:8 classes/pref/users.php:6
 #: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Vous n'avez pas les permissions nécessaires pour ouvrir cet onglet."
@@ -1429,8 +1250,7 @@ msgstr "Vous n'avez pas les permissions nécessaires pour ouvrir cet onglet."
 msgid "Error Log"
 msgstr "Journal des erreurs"
 
-#: classes/pref/system.php:40
-#: plugins/af_sort_bayes/init.php:250
+#: classes/pref/system.php:40 plugins/af_sort_bayes/init.php:250
 msgid "Refresh"
 msgstr "Actualiser"
 
@@ -1458,8 +1278,7 @@ msgstr "Date"
 msgid "User not found"
 msgstr "Utilisateur non trouvé"
 
-#: classes/pref/users.php:53
-#: classes/pref/users.php:399
+#: classes/pref/users.php:53 classes/pref/users.php:399
 msgid "Registered"
 msgstr "Inscrit"
 
@@ -1479,8 +1298,7 @@ msgstr "Flux abonnés"
 msgid "Access level: "
 msgstr "Permissions : "
 
-#: classes/pref/users.php:154
-#: classes/pref/feeds.php:661
+#: classes/pref/users.php:154 classes/pref/feeds.php:661
 #: classes/pref/feeds.php:879
 msgid "Options"
 msgstr "Options"
@@ -1514,18 +1332,12 @@ msgstr "Envoi du mot de passe de <b>%s</b> à <b>%s</b>"
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notification de changement de mot de passe"
 
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1346
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:346
-#: classes/pref/filters.php:394
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:819
-#: classes/pref/filters.php:846
-#: classes/pref/labels.php:272
-#: classes/pref/prefs.php:996
-#: plugins/instances/init.php:284
+#: classes/pref/users.php:334 classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1603 classes/pref/feeds.php:1667
+#: classes/pref/filters.php:346 classes/pref/filters.php:394
+#: classes/pref/filters.php:731 classes/pref/filters.php:819
+#: classes/pref/filters.php:846 classes/pref/labels.php:272
+#: classes/pref/prefs.php:996 plugins/instances/init.php:284
 msgid "Select"
 msgstr "Sélectionner"
 
@@ -1537,8 +1349,7 @@ msgstr "Créer l'utilisateur"
 msgid "Details"
 msgstr "Détails"
 
-#: classes/pref/users.php:348
-#: classes/pref/filters.php:746
+#: classes/pref/users.php:348 classes/pref/filters.php:746
 #: plugins/instances/init.php:293
 msgid "Edit"
 msgstr "Modifier"
@@ -1551,8 +1362,7 @@ msgstr "Permissions"
 msgid "Last login"
 msgstr "Dernière connexion"
 
-#: classes/pref/users.php:419
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419 plugins/instances/init.php:334
 msgid "Click to edit"
 msgstr "Cliquer pour modifier"
 
@@ -1568,10 +1378,8 @@ msgstr "Aucun utilisateur correspondant trouvé."
 msgid "Check to enable field"
 msgstr "Cocher pour activer le champ"
 
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:65 classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258 classes/pref/feeds.php:264
 #: classes/pref/feeds.php:290
 #, php-format
 msgid "(%d feed)"
@@ -1583,19 +1391,15 @@ msgstr[1] "(%d flux)"
 msgid "Feed Title"
 msgstr "Titre du flux"
 
-#: classes/pref/feeds.php:605
-#: classes/pref/feeds.php:829
-#, fuzzy
+#: classes/pref/feeds.php:605 classes/pref/feeds.php:829
 msgid "Language:"
-msgstr "Langue"
+msgstr "Langue:"
 
-#: classes/pref/feeds.php:612
-#: classes/pref/feeds.php:838
+#: classes/pref/feeds.php:612 classes/pref/feeds.php:838
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: classes/pref/feeds.php:627
-#: classes/pref/feeds.php:854
+#: classes/pref/feeds.php:627 classes/pref/feeds.php:854
 msgid "Article purging:"
 msgstr "Purge des articles :"
 
@@ -1603,33 +1407,27 @@ msgstr "Purge des articles :"
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Astuce :</b> vous devez renseigner vos informations d'identification si le flux nécessite une authentification, sauf pour les flux Twitter."
 
-#: classes/pref/feeds.php:673
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:673 classes/pref/feeds.php:883
 msgid "Hide from Popular feeds"
 msgstr "Masquer dans la liste des flux populaires"
 
-#: classes/pref/feeds.php:685
-#: classes/pref/feeds.php:889
+#: classes/pref/feeds.php:685 classes/pref/feeds.php:889
 msgid "Include in e-mail digest"
 msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
 
-#: classes/pref/feeds.php:698
-#: classes/pref/feeds.php:895
+#: classes/pref/feeds.php:698 classes/pref/feeds.php:895
 msgid "Always display image attachments"
 msgstr "Toujours afficher les images jointes"
 
-#: classes/pref/feeds.php:711
-#: classes/pref/feeds.php:903
+#: classes/pref/feeds.php:711 classes/pref/feeds.php:903
 msgid "Do not embed images"
 msgstr "Ne pas intégrer les images"
 
-#: classes/pref/feeds.php:724
-#: classes/pref/feeds.php:911
+#: classes/pref/feeds.php:724 classes/pref/feeds.php:911
 msgid "Cache images locally"
 msgstr "Enregistrer localement les images"
 
-#: classes/pref/feeds.php:736
-#: classes/pref/feeds.php:917
+#: classes/pref/feeds.php:736 classes/pref/feeds.php:917
 msgid "Mark updated articles as unread"
 msgstr "Marquer les article mis à jour comme non lus"
 
@@ -1649,8 +1447,7 @@ msgstr "Réinscription aux mises à jour en push"
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Réinitialiser l'état de l'inscription PubSubHubbub pour les flux en mise à jour push."
 
-#: classes/pref/feeds.php:1190
-#: classes/pref/feeds.php:1243
+#: classes/pref/feeds.php:1190 classes/pref/feeds.php:1243
 msgid "All done."
 msgstr "Tout est terminé."
 
@@ -1666,14 +1463,12 @@ msgstr "Flux inactifs"
 msgid "Edit selected feeds"
 msgstr "Modifier les flux sélectionnés"
 
-#: classes/pref/feeds.php:1362
-#: classes/pref/feeds.php:1376
+#: classes/pref/feeds.php:1362 classes/pref/feeds.php:1376
 #: classes/pref/filters.php:749
 msgid "Reset sort order"
 msgstr "Réinitialiser le critère de tri"
 
-#: classes/pref/feeds.php:1364
-#: js/prefs.js:1732
+#: classes/pref/feeds.php:1364 js/prefs.js:1732
 msgid "Batch subscribe"
 msgstr "Abonnement par lots"
 
@@ -1701,8 +1496,7 @@ msgstr "Purger manuellement"
 msgid "Clear feed data"
 msgstr "Purger les données de flux"
 
-#: classes/pref/feeds.php:1398
-#: classes/pref/filters.php:757
+#: classes/pref/feeds.php:1398 classes/pref/filters.php:757
 msgid "Rescore articles"
 msgstr "Recalculer le score des articles"
 
@@ -1782,13 +1576,11 @@ msgstr "Supprimer toutes les URL générées"
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Les flux suivants n'ont pas été mis à jour depuis 3 mois (par âge décroissant) :"
 
-#: classes/pref/feeds.php:1633
-#: classes/pref/feeds.php:1697
+#: classes/pref/feeds.php:1633 classes/pref/feeds.php:1697
 msgid "Click to edit feed"
 msgstr "Cliquez pour modifier le flux"
 
-#: classes/pref/feeds.php:1651
-#: classes/pref/feeds.php:1717
+#: classes/pref/feeds.php:1651 classes/pref/feeds.php:1717
 msgid "Unsubscribe from selected feeds"
 msgstr "Se désabonner des flux sélectionnés"
 
@@ -1812,58 +1604,47 @@ msgstr "Articles correspondant à ce filtre :"
 msgid "No recent articles matching this filter have been found."
 msgstr "Aucun article récent correspondant à ce filtre."
 
-#: classes/pref/filters.php:226
-#: classes/pref/filters.php:505
+#: classes/pref/filters.php:226 classes/pref/filters.php:505
 msgid "(inverse)"
 msgstr "(inversé)"
 
-#: classes/pref/filters.php:222
-#: classes/pref/filters.php:504
+#: classes/pref/filters.php:222 classes/pref/filters.php:504
 #, php-format
 msgid "%s on %s in %s %s"
 msgstr "%s sur %s dans %s %s"
 
-#: classes/pref/filters.php:335
-#: classes/pref/filters.php:810
+#: classes/pref/filters.php:335 classes/pref/filters.php:810
 #: classes/pref/labels.php:22
 msgid "Caption"
 msgstr "Légende"
 
-#: classes/pref/filters.php:341
-#: classes/pref/filters.php:814
+#: classes/pref/filters.php:341 classes/pref/filters.php:814
 #: classes/pref/filters.php:929
 msgid "Match"
 msgstr "Correspondance"
 
-#: classes/pref/filters.php:355
-#: classes/pref/filters.php:403
-#: classes/pref/filters.php:828
-#: classes/pref/filters.php:855
+#: classes/pref/filters.php:355 classes/pref/filters.php:403
+#: classes/pref/filters.php:828 classes/pref/filters.php:855
 msgid "Add"
 msgstr "Ajouter"
 
-#: classes/pref/filters.php:389
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:389 classes/pref/filters.php:841
 msgid "Apply actions"
 msgstr "Actions effectuées"
 
-#: classes/pref/filters.php:439
-#: classes/pref/filters.php:870
+#: classes/pref/filters.php:439 classes/pref/filters.php:870
 msgid "Enabled"
 msgstr "Activé"
 
-#: classes/pref/filters.php:448
-#: classes/pref/filters.php:873
+#: classes/pref/filters.php:448 classes/pref/filters.php:873
 msgid "Match any rule"
 msgstr "Au moins une correspondance"
 
-#: classes/pref/filters.php:457
-#: classes/pref/filters.php:876
+#: classes/pref/filters.php:457 classes/pref/filters.php:876
 msgid "Inverse matching"
 msgstr "Correspondance inverse"
 
-#: classes/pref/filters.php:469
-#: classes/pref/filters.php:883
+#: classes/pref/filters.php:469 classes/pref/filters.php:883
 msgid "Test"
 msgstr "Test"
 
@@ -1883,8 +1664,7 @@ msgstr "Inverser le résultat de l'expression rationnelle"
 msgid "on field"
 msgstr "sur le champ"
 
-#: classes/pref/filters.php:949
-#: js/PrefFilterTree.js:61
+#: classes/pref/filters.php:949 js/PrefFilterTree.js:61
 msgid "in"
 msgstr "dans"
 
@@ -1896,8 +1676,7 @@ msgstr "Filtres Wiki:"
 msgid "Save rule"
 msgstr "Enregistrer"
 
-#: classes/pref/filters.php:967
-#: js/functions.js:1033
+#: classes/pref/filters.php:967 js/functions.js:1033
 msgid "Add rule"
 msgstr "Ajouter une règle"
 
@@ -1906,16 +1685,14 @@ msgid "Perform Action"
 msgstr "Exécuter l'action"
 
 #: classes/pref/filters.php:1041
-#, fuzzy
 msgid "No actions available"
-msgstr "Une nouvelle version est disponible !"
+msgstr "Aucune action disponible"
 
 #: classes/pref/filters.php:1060
 msgid "Save action"
 msgstr "Enregistrer"
 
-#: classes/pref/filters.php:1060
-#: js/functions.js:1059
+#: classes/pref/filters.php:1060 js/functions.js:1059
 msgid "Add action"
 msgstr "Ajouter une action"
 
@@ -2134,8 +1911,7 @@ msgstr "Éliminer les tags non sûrs des articles"
 msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Élimine toutes les balises HTML sauf les plus courantes lors de la lecture des articles."
 
-#: classes/pref/prefs.php:53
-#: js/prefs.js:1687
+#: classes/pref/prefs.php:53 js/prefs.js:1687
 msgid "Customize stylesheet"
 msgstr "Personnaliser la feuille de style"
 
@@ -2235,8 +2011,7 @@ msgstr "Mots de passe à usage unique / Identificateur"
 msgid "One time passwords are currently enabled. Enter your current password below to disable."
 msgstr "Les mots de passe à usage unique sont actuellement activés. Entrez votre mot de passe actuel ci-dessous pour les désactiver."
 
-#: classes/pref/prefs.php:347
-#: classes/pref/prefs.php:398
+#: classes/pref/prefs.php:347 classes/pref/prefs.php:398
 msgid "Enter your password"
 msgstr "Entrez votre mot de passe"
 
@@ -2317,33 +2092,27 @@ msgstr "Téléchargez plus de plugins sur <a class=\"visibleLink\" target=\"_bla
 msgid "System plugins"
 msgstr "Plugins systèmes"
 
-#: classes/pref/prefs.php:740
-#: classes/pref/prefs.php:796
+#: classes/pref/prefs.php:740 classes/pref/prefs.php:796
 msgid "Plugin"
 msgstr "Plugin"
 
-#: classes/pref/prefs.php:741
-#: classes/pref/prefs.php:797
+#: classes/pref/prefs.php:741 classes/pref/prefs.php:797
 msgid "Description"
 msgstr "Description"
 
-#: classes/pref/prefs.php:742
-#: classes/pref/prefs.php:798
+#: classes/pref/prefs.php:742 classes/pref/prefs.php:798
 msgid "Version"
 msgstr "Version"
 
-#: classes/pref/prefs.php:743
-#: classes/pref/prefs.php:799
+#: classes/pref/prefs.php:743 classes/pref/prefs.php:799
 msgid "Author"
 msgstr "Auteur"
 
-#: classes/pref/prefs.php:774
-#: classes/pref/prefs.php:833
+#: classes/pref/prefs.php:774 classes/pref/prefs.php:833
 msgid "more info"
 msgstr "plus d'info"
 
-#: classes/pref/prefs.php:783
-#: classes/pref/prefs.php:842
+#: classes/pref/prefs.php:783 classes/pref/prefs.php:842
 msgid "Clear data"
 msgstr "Purger les données"
 
@@ -2359,8 +2128,7 @@ msgstr "Activer les plugins sélectionnés"
 msgid "Incorrect one time password"
 msgstr "Mot de passe à usage unique incorrect"
 
-#: classes/pref/prefs.php:928
-#: classes/pref/prefs.php:945
+#: classes/pref/prefs.php:928 classes/pref/prefs.php:945
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
 
@@ -2373,8 +2141,7 @@ msgstr "Vous pouvez redéfinir les couleurs, les polices et la mise en page du t
 msgid "Create profile"
 msgstr "Création d'un profil"
 
-#: classes/pref/prefs.php:1033
-#: classes/pref/prefs.php:1061
+#: classes/pref/prefs.php:1033 classes/pref/prefs.php:1061
 msgid "(active)"
 msgstr "(actif)"
 
@@ -2394,9 +2161,7 @@ msgstr "Si vous avez importé des étiquettes et/ou des filtres, vous devrez peu
 msgid "Your Public OPML URL is:"
 msgstr "Votre URL OPML publique est :"
 
-#: classes/dlg.php:57
-#: classes/dlg.php:183
-#: plugins/share/init.php:120
+#: classes/dlg.php:57 classes/dlg.php:183 plugins/share/init.php:120
 msgid "Generate new URL"
 msgstr "Générer une nouvelle URL"
 
@@ -2404,8 +2169,7 @@ msgstr "Générer une nouvelle URL"
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr "Le démon de mise à jour est activé dans la configuration mais le processus n'est pas lancé et les flux ne sont donc pas mis à jour. Veuillez le démarrer ou contacter l'administrateur."
 
-#: classes/dlg.php:75
-#: classes/dlg.php:84
+#: classes/dlg.php:75 classes/dlg.php:84
 msgid "Last update:"
 msgstr "Dernière mise à jour :"
 
@@ -2426,13 +2190,11 @@ msgstr "Donnée enregistrée (%s, %d)"
 msgid "Show related articles"
 msgstr "Voir les articles liés"
 
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:223
+#: plugins/af_psql_trgm/init.php:118 plugins/af_psql_trgm/init.php:223
 msgid "Mark similar articles as read"
 msgstr "Marquer les articles similaires comme lus"
 
-#: plugins/af_psql_trgm/init.php:162
-#: plugins/af_redditimgur/init.php:46
+#: plugins/af_psql_trgm/init.php:162 plugins/af_redditimgur/init.php:46
 msgid "Global settings"
 msgstr "Paramètres généraux"
 
@@ -2448,8 +2210,7 @@ msgstr "Longueur minimale du titre:"
 msgid "Enable for all feeds:"
 msgstr "Activer pour tous les flux:"
 
-#: plugins/af_psql_trgm/init.php:195
-#: plugins/af_readability/init.php:42
+#: plugins/af_psql_trgm/init.php:195 plugins/af_readability/init.php:42
 msgid "Currently enabled for (click to edit):"
 msgstr "Actuellement activé pour (cliquer pour modifier):"
 
@@ -2465,13 +2226,11 @@ msgstr "Flux supportés par af_comics"
 msgid "The following comics are currently supported:"
 msgstr "Les comics suivants sont actuellement supportés :"
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
+#: plugins/note/init.php:26 plugins/note/note.js:11
 msgid "Edit article note"
 msgstr "Modifier l'annotation de l'article"
 
-#: plugins/googlereaderimport/init.php:92
-#: plugins/import_export/init.php:450
+#: plugins/googlereaderimport/init.php:92 plugins/import_export/init.php:450
 msgid "No file uploaded."
 msgstr "Aucun fichier envoyé."
 
@@ -2496,15 +2255,12 @@ msgstr "Collez votre fichier starred.json ou shared.json dans le formulaire ci-d
 msgid "Import my Starred items"
 msgstr "Importer mes éléments partagés"
 
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
-#: plugins/mail/init.php:112
-#: plugins/mail/init.php:118
+#: plugins/mailto/init.php:49 plugins/mailto/init.php:55
+#: plugins/mail/init.php:112 plugins/mail/init.php:118
 msgid "[Forwarded]"
 msgstr "[Transféré]"
 
-#: plugins/mailto/init.php:49
-#: plugins/mail/init.php:112
+#: plugins/mailto/init.php:49 plugins/mail/init.php:112
 msgid "Multiple articles"
 msgstr "Articles multiples"
 
@@ -2581,8 +2337,7 @@ msgstr "Impossible de charger le document XML."
 msgid "Prepare data"
 msgstr "Préparer les données"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
+#: plugins/nsfw/init.php:30 plugins/nsfw/init.php:42
 msgid "Not work safe (click to toggle)"
 msgstr "Non convenable au travail (cliquer pour basculer)"
 
@@ -2642,35 +2397,29 @@ msgstr "Envoyer le mail"
 msgid "Linked"
 msgstr "Instances liées"
 
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
+#: plugins/instances/init.php:204 plugins/instances/init.php:395
 msgid "Instance"
 msgstr "Instance"
 
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
+#: plugins/instances/init.php:215 plugins/instances/init.php:312
 #: plugins/instances/init.php:404
 msgid "Instance URL"
 msgstr "URL de l'instance"
 
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
+#: plugins/instances/init.php:226 plugins/instances/init.php:414
 msgid "Access key:"
 msgstr "Clef d'accès :"
 
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
+#: plugins/instances/init.php:229 plugins/instances/init.php:313
 #: plugins/instances/init.php:417
 msgid "Access key"
 msgstr "Clef d'accès"
 
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
+#: plugins/instances/init.php:233 plugins/instances/init.php:421
 msgid "Use one access key for both linked instances."
 msgstr "Utilisez une clef d'accès pour les deux instances liées."
 
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
+#: plugins/instances/init.php:241 plugins/instances/init.php:429
 msgid "Generate new key"
 msgstr "Générer une nouvelle clef"
 
@@ -2711,9 +2460,8 @@ msgid "Configuration saved"
 msgstr "La configuration a été enregistrée"
 
 #: plugins/af_readability/init.php:25
-#, fuzzy
 msgid "Inline content"
-msgstr "Simplifier le contenu de l'article"
+msgstr "Contenu intégré"
 
 #: plugins/af_readability/init.php:31
 msgid "af_readability settings"
@@ -2727,8 +2475,7 @@ msgstr "Readability"
 msgid "Inline article content"
 msgstr "Simplifier le contenu de l'article"
 
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
+#: plugins/vf_shared/init.php:16 plugins/vf_shared/init.php:69
 msgid "Shared articles"
 msgstr "Articles partagés"
 
@@ -2851,8 +2598,7 @@ msgstr "Réinitialiser l'inscription ? Tiny Tiny RSS essayera de se réinscrire
 msgid "Subscription reset."
 msgstr "Abonnement réinitialisé."
 
-#: js/functions.js:1247
-#: js/tt-rss.js:685
+#: js/functions.js:1247 js/tt-rss.js:685
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Se désabonner de %s ?"
@@ -2869,19 +2615,12 @@ msgstr "Veuillez saisir un titre pour cette catégorie :"
 msgid "Generate new syndication address for this feed?"
 msgstr "Générer une nouvelle adresse d'abonnement pour ce flux ?"
 
-#: js/functions.js:1392
-#: js/prefs.js:1218
+#: js/functions.js:1392 js/prefs.js:1218
 msgid "Trying to change address..."
 msgstr "Changement de l'adresse..."
 
-#: js/functions.js:1693
-#: js/functions.js:1803
-#: js/prefs.js:414
-#: js/prefs.js:444
-#: js/prefs.js:476
-#: js/prefs.js:629
-#: js/prefs.js:649
-#: js/prefs.js:1194
+#: js/functions.js:1693 js/functions.js:1803 js/prefs.js:414 js/prefs.js:444
+#: js/prefs.js:476 js/prefs.js:629 js/prefs.js:649 js/prefs.js:1194
 #: js/prefs.js:1339
 msgid "No feeds are selected."
 msgstr "Aucun flux sélectionné."
@@ -2894,13 +2633,11 @@ msgstr "Supprimer les flux sélectionnés de l'archive ? Les flux contenant des
 msgid "Feeds with update errors"
 msgstr "Flux avec des erreurs de mise à jour"
 
-#: js/functions.js:1785
-#: js/prefs.js:1176
+#: js/functions.js:1785 js/prefs.js:1176
 msgid "Remove selected feeds?"
 msgstr "Supprimer les flux sélectionnés ?"
 
-#: js/functions.js:1788
-#: js/prefs.js:1179
+#: js/functions.js:1788 js/prefs.js:1179
 msgid "Removing selected feeds..."
 msgstr "Suppression des flux sélectionnés..."
 
@@ -2932,11 +2669,8 @@ msgstr "Ajout de l'utilisateur..."
 msgid "User Editor"
 msgstr "Éditeur d'utilisateur"
 
-#: js/prefs.js:99
-#: js/prefs.js:211
-#: js/prefs.js:736
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
+#: js/prefs.js:99 js/prefs.js:211 js/prefs.js:736
+#: plugins/instances/instances.js:26 plugins/instances/instances.js:89
 #: js/functions.js:1600
 msgid "Saving data..."
 msgstr "Enregistrement des données..."
@@ -2961,8 +2695,7 @@ msgstr "Supprimer les étiquettes sélectionnées ?"
 msgid "Removing selected labels..."
 msgstr "Suppression des étiquettes sélectionnées..."
 
-#: js/prefs.js:312
-#: js/prefs.js:1380
+#: js/prefs.js:312 js/prefs.js:1380
 msgid "No labels are selected."
 msgstr "Aucune étiquette sélectionnée."
 
@@ -2974,10 +2707,7 @@ msgstr "Supprimer les utilisateurs sélectionnés ? L'administrateur par défaut
 msgid "Removing selected users..."
 msgstr "Suppression des utilisateurs sélectionnés..."
 
-#: js/prefs.js:343
-#: js/prefs.js:487
-#: js/prefs.js:508
-#: js/prefs.js:547
+#: js/prefs.js:343 js/prefs.js:487 js/prefs.js:508 js/prefs.js:547
 msgid "No users are selected."
 msgstr "Aucun utilisateur sélectionné."
 
@@ -2989,9 +2719,7 @@ msgstr "Supprimer les filtres sélectionnés ?"
 msgid "Removing selected filters..."
 msgstr "Suppression des filtres sélectionnés..."
 
-#: js/prefs.js:376
-#: js/prefs.js:584
-#: js/prefs.js:603
+#: js/prefs.js:376 js/prefs.js:584 js/prefs.js:603
 msgid "No filters are selected."
 msgstr "Aucun filtre sélectionné."
 
@@ -3023,9 +2751,7 @@ msgstr "Combien de jours faut-il conserver les articles (0 pour utiliser la vale
 msgid "Purging selected feed..."
 msgstr "Purge du flux sélectionné..."
 
-#: js/prefs.js:492
-#: js/prefs.js:513
-#: js/prefs.js:552
+#: js/prefs.js:492 js/prefs.js:513 js/prefs.js:552
 msgid "Please select only one user."
 msgstr "Veuillez sélectionner un seul utilisateur."
 
@@ -3069,8 +2795,7 @@ msgstr "Import OPML"
 msgid "Please choose an OPML file first."
 msgstr "Veuillez d'abord sélectionner un fichier OPML."
 
-#: js/prefs.js:802
-#: plugins/googlereaderimport/init.js:45
+#: js/prefs.js:802 plugins/googlereaderimport/init.js:45
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Import en cours, veuillez patienter..."
@@ -3103,9 +2828,7 @@ msgstr "Marquage de tous les flux comme lus..."
 msgid "Please enable mail plugin first."
 msgstr "Veuillez d'abord activer le plugin mail."
 
-#: js/tt-rss.js:434
-#: js/functions.js:1579
-#: js/tt-rss.js:666
+#: js/tt-rss.js:434 js/functions.js:1579 js/tt-rss.js:666
 msgid "You can't edit this kind of feed."
 msgstr "Vous ne pouvez pas modifier ce type de flux."
 
@@ -3113,8 +2836,7 @@ msgstr "Vous ne pouvez pas modifier ce type de flux."
 msgid "Please enable embed_original plugin first."
 msgstr "Veuillez d'abord activer le plugin embed_original."
 
-#: js/tt-rss.js:518
-#: js/tt-rss.js:716
+#: js/tt-rss.js:518 js/tt-rss.js:716
 msgid "Widescreen is not available in combined mode."
 msgstr "L'écran large n'est pas disponible en mode combiné."
 
@@ -3122,8 +2844,7 @@ msgstr "L'écran large n'est pas disponible en mode combiné."
 msgid "You can't rescore this kind of feed."
 msgstr "Vous ne pouvez pas recalculer le score de ce type de flux."
 
-#: js/tt-rss.js:835
-#: js/tt-rss.js:679
+#: js/tt-rss.js:835 js/tt-rss.js:679
 msgid "Please select some feed first."
 msgstr "Veuillez d'abord sélectionner un flux."
 
@@ -3136,16 +2857,9 @@ msgstr "Recalculer le score des articles de %s ?"
 msgid "Rescoring articles..."
 msgstr "Recalcul des scores des articles..."
 
-#: js/viewfeed.js:1018
-#: js/viewfeed.js:1061
-#: js/viewfeed.js:1114
-#: js/viewfeed.js:2269
-#: plugins/mailto/init.js:7
-#: plugins/mail/mail.js:7
-#: js/viewfeed.js:742
-#: js/viewfeed.js:770
-#: js/viewfeed.js:797
-#: js/viewfeed.js:862
+#: js/viewfeed.js:1018 js/viewfeed.js:1061 js/viewfeed.js:1114
+#: js/viewfeed.js:2269 plugins/mailto/init.js:7 plugins/mail/mail.js:7
+#: js/viewfeed.js:742 js/viewfeed.js:770 js/viewfeed.js:797 js/viewfeed.js:862
 #: js/viewfeed.js:896
 msgid "No articles are selected."
 msgstr "Aucun article sélectionné."
@@ -3253,8 +2967,7 @@ msgstr "Import Google Reader"
 msgid "Please choose a file first."
 msgstr "Veuillez d'abord choisir le fichier."
 
-#: plugins/mailto/init.js:21
-#: plugins/mail/mail.js:21
+#: plugins/mailto/init.js:21 plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Transférer l'article par email"
 
@@ -3305,8 +3018,7 @@ msgstr "Supprimer les instances sélectionnées ?"
 msgid "Removing selected instances..."
 msgstr "Suppression des instances sélectionnées..."
 
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
+#: plugins/instances/instances.js:139 plugins/instances/instances.js:151
 msgid "No instances are selected."
 msgstr "Aucune instance sélectionnée."
 
@@ -3346,8 +3058,7 @@ msgstr "Tentative d'annulation de partage ..."
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Ceci va invalider tous les articles partagés par URL. Souhaitez-vous continuer ?"
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1518
+#: plugins/share/share_prefs.js:6 js/prefs.js:1518
 msgid "Clearing URLs..."
 msgstr "Nettoyage des URL..."
 
@@ -3355,8 +3066,7 @@ msgstr "Nettoyage des URL..."
 msgid "Shared URLs cleared."
 msgstr "URL partagées supprimées."
 
-#: js/feedlist.js:413
-#: js/feedlist.js:441
+#: js/feedlist.js:413 js/feedlist.js:441
 msgid "Mark all articles in %s as read?"
 msgstr "Marquer tous les articles de %s comme lus ?"
 
@@ -3540,13 +3250,11 @@ msgstr "Suppression des profils sélectionnés..."
 msgid "No profiles are selected."
 msgstr "Aucun profil sélectionné."
 
-#: js/prefs.js:1438
-#: js/prefs.js:1491
+#: js/prefs.js:1438 js/prefs.js:1491
 msgid "Activate selected profile?"
 msgstr "Activer le profil sélectionné ?"
 
-#: js/prefs.js:1454
-#: js/prefs.js:1507
+#: js/prefs.js:1454 js/prefs.js:1507
 msgid "Please choose a profile to activate."
 msgstr "Veuillez sélectionner un profil à activer."
 
@@ -3570,9 +3278,7 @@ msgstr "Éditeur d'étiquette"
 msgid "You can't unsubscribe from the category."
 msgstr "Vous ne pouvez pas vous désabonner de la catégorie."
 
-#: js/viewfeed.js:111
-#: js/viewfeed.js:162
-#: js/viewfeed.js:179
+#: js/viewfeed.js:111 js/viewfeed.js:162 js/viewfeed.js:179
 msgid "Click to open next unread feed."
 msgstr "Cliquez pour aller au prochain flux non lu"
 
diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 9d913ace..861016bc 100644
Binary files a/locale/it_IT/LC_MESSAGES/messages.mo and b/locale/it_IT/LC_MESSAGES/messages.mo differ
diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po
index 10824e96..21da3b0d 100644
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-08-12 12:23+0300\n"
-"PO-Revision-Date: 2015-07-26 14:55+0100\n"
+"PO-Revision-Date: 2015-08-15 19:16+0100\n"
 "Last-Translator: dedioste <dedioste@gmail.com>\n"
 "Language-Team: \n"
 "Language: it\n"
@@ -52,49 +52,39 @@ msgstr "Vecchi di 3 mesi"
 msgid "Default interval"
 msgstr "Intervallo predefinito"
 
-#: backend.php:83
-#: backend.php:93
+#: backend.php:83 backend.php:93
 msgid "Disable updates"
 msgstr "Disattiva aggiornamenti"
 
-#: backend.php:84
-#: backend.php:94
+#: backend.php:84 backend.php:94
 msgid "15 minutes"
 msgstr "15 minuti"
 
-#: backend.php:85
-#: backend.php:95
+#: backend.php:85 backend.php:95
 msgid "30 minutes"
 msgstr "30 minuti"
 
-#: backend.php:86
-#: backend.php:96
+#: backend.php:86 backend.php:96
 msgid "Hourly"
 msgstr "Ogni ora"
 
-#: backend.php:87
-#: backend.php:97
+#: backend.php:87 backend.php:97
 msgid "4 hours"
 msgstr "4 ore"
 
-#: backend.php:88
-#: backend.php:98
+#: backend.php:88 backend.php:98
 msgid "12 hours"
 msgstr "12 ore"
 
-#: backend.php:89
-#: backend.php:99
+#: backend.php:89 backend.php:99
 msgid "Daily"
 msgstr "Ogni giorno"
 
-#: backend.php:90
-#: backend.php:100
+#: backend.php:90 backend.php:100
 msgid "Weekly"
 msgstr "Ogni settimana"
 
-#: backend.php:103
-#: classes/pref/system.php:51
-#: classes/pref/users.php:119
+#: backend.php:103 classes/pref/system.php:51 classes/pref/users.php:119
 msgid "User"
 msgstr "Utente"
 
@@ -162,39 +152,16 @@ msgstr "Metodo non trovato"
 msgid "Plugin not found"
 msgstr "Plugin non trovato"
 
-#: index.php:133
-#: index.php:149
-#: index.php:267
-#: prefs.php:102
-#: classes/backend.php:5
-#: classes/pref/feeds.php:1411
-#: classes/pref/filters.php:766
-#: classes/pref/labels.php:296
-#: js/feedlist.js:133
-#: js/functions.js:1229
-#: js/functions.js:1363
-#: js/functions.js:1675
-#: js/prefs.js:653
-#: js/prefs.js:854
-#: js/prefs.js:1760
-#: js/prefs.js:1776
-#: js/prefs.js:1794
-#: js/tt-rss.js:55
-#: js/tt-rss.js:525
-#: js/viewfeed.js:1296
-#: plugins/import_export/import_export.js:17
-#: plugins/af_sort_bayes/init.js:9
-#: js/feedlist.js:457
-#: js/functions.js:449
-#: js/functions.js:793
-#: js/prefs.js:1441
-#: js/prefs.js:1494
-#: js/prefs.js:1534
-#: js/prefs.js:1551
-#: js/prefs.js:1567
-#: js/prefs.js:1587
-#: js/tt-rss.js:542
-#: js/viewfeed.js:839
+#: index.php:133 index.php:149 index.php:267 prefs.php:102
+#: classes/backend.php:5 classes/pref/feeds.php:1411
+#: classes/pref/filters.php:766 classes/pref/labels.php:296 js/feedlist.js:133
+#: js/functions.js:1229 js/functions.js:1363 js/functions.js:1675
+#: js/prefs.js:653 js/prefs.js:854 js/prefs.js:1760 js/prefs.js:1776
+#: js/prefs.js:1794 js/tt-rss.js:55 js/tt-rss.js:525 js/viewfeed.js:1296
+#: plugins/import_export/import_export.js:17 plugins/af_sort_bayes/init.js:9
+#: js/feedlist.js:457 js/functions.js:449 js/functions.js:793 js/prefs.js:1441
+#: js/prefs.js:1494 js/prefs.js:1534 js/prefs.js:1551 js/prefs.js:1567
+#: js/prefs.js:1587 js/tt-rss.js:542 js/viewfeed.js:839
 msgid "Loading, please wait..."
 msgstr "Caricamento, attendere prego..."
 
@@ -214,21 +181,15 @@ msgstr "Adattivo"
 msgid "All Articles"
 msgstr "Tutti gli articoli"
 
-#: index.php:175
-#: include/functions2.php:102
-#: classes/feeds.php:104
+#: index.php:175 include/functions2.php:102 classes/feeds.php:104
 msgid "Starred"
 msgstr "Con stella"
 
-#: index.php:176
-#: include/functions2.php:103
-#: classes/feeds.php:105
+#: index.php:176 include/functions2.php:103 classes/feeds.php:105
 msgid "Published"
 msgstr "Pubblicati"
 
-#: index.php:177
-#: classes/feeds.php:91
-#: classes/feeds.php:103
+#: index.php:177 classes/feeds.php:91 classes/feeds.php:103
 msgid "Unread"
 msgstr "Non letti"
 
@@ -260,12 +221,8 @@ msgstr "Prima i più vecchi"
 msgid "Title"
 msgstr "Titolo"
 
-#: index.php:192
-#: index.php:233
-#: include/functions2.php:92
-#: classes/feeds.php:109
-#: js/FeedTree.js:132
-#: js/FeedTree.js:160
+#: index.php:192 index.php:233 include/functions2.php:92 classes/feeds.php:109
+#: js/FeedTree.js:132 js/FeedTree.js:160
 msgid "Mark as read"
 msgstr "Segna come letto"
 
@@ -301,8 +258,7 @@ msgstr "Cerca..."
 msgid "Feed actions:"
 msgstr "Azioni sul notiziario:"
 
-#: index.php:228
-#: classes/handler/public.php:660
+#: index.php:228 classes/handler/public.php:660
 msgid "Subscribe to feed..."
 msgstr "Sottoscrivi il notiziario..."
 
@@ -314,9 +270,7 @@ msgstr "Modifica questo notiziario..."
 msgid "Rescore feed"
 msgstr "Cambia punteggio notiziario"
 
-#: index.php:231
-#: classes/pref/feeds.php:771
-#: classes/pref/feeds.php:1366
+#: index.php:231 classes/pref/feeds.php:771 classes/pref/feeds.php:1366
 #: js/PrefFeedTree.js:74
 msgid "Unsubscribe"
 msgstr "Annulla sottoscrizione"
@@ -333,8 +287,7 @@ msgstr "Visualizza/Nascondi notiziari letti"
 msgid "Other actions:"
 msgstr "Altre azioni:"
 
-#: index.php:236
-#: include/functions2.php:78
+#: index.php:236 include/functions2.php:78
 msgid "Toggle widescreen mode"
 msgstr "Modalità widescreen"
 
@@ -358,9 +311,7 @@ msgstr "Esci"
 msgid "Updates are available from Git."
 msgstr "Gli aggiornamenti sono disponibili via Git."
 
-#: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:105
+#: prefs.php:33 prefs.php:120 include/functions2.php:105
 #: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "Preferenze"
@@ -373,21 +324,16 @@ msgstr "Scorciatoie da tastiera"
 msgid "Exit preferences"
 msgstr "Esci dalle preferenze"
 
-#: prefs.php:123
-#: classes/pref/feeds.php:112
-#: classes/pref/feeds.php:1287
+#: prefs.php:123 classes/pref/feeds.php:112 classes/pref/feeds.php:1287
 #: classes/pref/feeds.php:1355
 msgid "Feeds"
 msgstr "Notiziari"
 
-#: prefs.php:126
-#: classes/pref/filters.php:235
+#: prefs.php:126 classes/pref/filters.php:235
 msgid "Filters"
 msgstr "Filtri"
 
-#: prefs.php:129
-#: include/functions.php:1252
-#: include/functions.php:1904
+#: prefs.php:129 include/functions.php:1252 include/functions.php:1904
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "Etichette"
@@ -400,8 +346,7 @@ msgstr "Utenti"
 msgid "System"
 msgstr "Sistema"
 
-#: register.php:187
-#: include/login_form.php:245
+#: register.php:187 include/login_form.php:245
 msgid "Create new account"
 msgstr "Crea un nuovo account"
 
@@ -409,20 +354,11 @@ msgstr "Crea un nuovo account"
 msgid "New user registrations are administratively disabled."
 msgstr "La registrazione di nuovi utenti è disattivata dall'amministratore."
 
-#: register.php:197
-#: register.php:242
-#: register.php:255
-#: register.php:270
-#: register.php:289
-#: register.php:337
-#: register.php:347
-#: register.php:359
-#: classes/handler/public.php:730
-#: classes/handler/public.php:801
-#: classes/handler/public.php:899
-#: classes/handler/public.php:978
-#: classes/handler/public.php:992
-#: classes/handler/public.php:999
+#: register.php:197 register.php:242 register.php:255 register.php:270
+#: register.php:289 register.php:337 register.php:347 register.php:359
+#: classes/handler/public.php:730 classes/handler/public.php:801
+#: classes/handler/public.php:899 classes/handler/public.php:978
+#: classes/handler/public.php:992 classes/handler/public.php:999
 #: classes/handler/public.php:1024
 msgid "Return to Tiny Tiny RSS"
 msgstr "Ritorna a Tiny Tiny RSS"
@@ -439,13 +375,11 @@ msgstr "Nome utente desiderato:"
 msgid "Check availability"
 msgstr "Controlla disponibilità"
 
-#: register.php:229
-#: classes/handler/public.php:817
+#: register.php:229 classes/handler/public.php:817
 msgid "Email:"
 msgstr "Email:"
 
-#: register.php:232
-#: classes/handler/public.php:822
+#: register.php:232 classes/handler/public.php:822
 msgid "How much is two plus two:"
 msgstr "Quanto fa due più due:"
 
@@ -477,13 +411,9 @@ msgstr "La registrazione di nuovi utenti è attualmente chiusa."
 msgid "Tiny Tiny RSS data update script."
 msgstr "Script di aggiornamento dei dati di Tiny Tiny RSS."
 
-#: include/digest.php:109
-#: include/functions.php:1261
-#: include/functions.php:1805
-#: include/functions.php:1890
-#: include/functions.php:1912
-#: classes/opml.php:421
-#: classes/pref/feeds.php:228
+#: include/digest.php:109 include/functions.php:1261
+#: include/functions.php:1805 include/functions.php:1890
+#: include/functions.php:1912 classes/opml.php:421 classes/pref/feeds.php:228
 msgid "Uncategorized"
 msgstr "Senza categoria"
 
@@ -542,18 +472,15 @@ msgstr "Mostra il campo di ricerca"
 msgid "Article"
 msgstr "Articolo"
 
-#: include/functions2.php:63
-#: js/viewfeed.js:1989
+#: include/functions2.php:63 js/viewfeed.js:1989
 msgid "Toggle starred"
 msgstr "Inverti articoli con stella"
 
-#: include/functions2.php:64
-#: js/viewfeed.js:2000
+#: include/functions2.php:64 js/viewfeed.js:2000
 msgid "Toggle published"
 msgstr "Inverti articoli pubblicati"
 
-#: include/functions2.php:65
-#: js/viewfeed.js:1978
+#: include/functions2.php:65 js/viewfeed.js:1978
 msgid "Toggle unread"
 msgstr "Inverti articoli non letti"
 
@@ -573,13 +500,11 @@ msgstr "Rimuovi articoli letti"
 msgid "Open in new window"
 msgstr "Apri in una nuova finestra"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:2019
+#: include/functions2.php:70 js/viewfeed.js:2019
 msgid "Mark below as read"
 msgstr "Segna gli articoli sotto come letti"
 
-#: include/functions2.php:71
-#: js/viewfeed.js:2013
+#: include/functions2.php:71 js/viewfeed.js:2013
 msgid "Mark above as read"
 msgstr "Segna gli articoli sopra come letti"
 
@@ -607,8 +532,7 @@ msgstr "Chiudi / collassa articolo"
 msgid "Toggle article expansion (combined mode)"
 msgstr "Inverti l'espansione degli articoli (modalità combinata)"
 
-#: include/functions2.php:79
-#: plugins/embed_original/init.php:31
+#: include/functions2.php:79 plugins/embed_original/init.php:31
 msgid "Toggle embed original"
 msgstr "Inserire gli originali"
 
@@ -640,8 +564,7 @@ msgstr "Inverti la selezione"
 msgid "Deselect everything"
 msgstr "Deseleziona tutto"
 
-#: include/functions2.php:87
-#: classes/pref/feeds.php:552
+#: include/functions2.php:87 classes/pref/feeds.php:552
 #: classes/pref/feeds.php:808
 msgid "Feed"
 msgstr "Notiziario"
@@ -654,14 +577,11 @@ msgstr "Aggiorna notiziario attivo"
 msgid "Un/hide read feeds"
 msgstr "Visualizza/Nascondi notiziari letti"
 
-#: include/functions2.php:90
-#: classes/pref/feeds.php:1358
+#: include/functions2.php:90 classes/pref/feeds.php:1358
 msgid "Subscribe to feed"
 msgstr "Sottoscrivi il notiziario"
 
-#: include/functions2.php:91
-#: js/FeedTree.js:139
-#: js/PrefFeedTree.js:68
+#: include/functions2.php:91 js/FeedTree.js:139 js/PrefFeedTree.js:68
 msgid "Edit feed"
 msgstr "Modifica notiziario"
 
@@ -673,8 +593,7 @@ msgstr "Invertire l'ordine dei sommari"
 msgid "Debug feed update"
 msgstr "Debug aggiornamenti dei feed"
 
-#: include/functions2.php:95
-#: js/FeedTree.js:182
+#: include/functions2.php:95 js/FeedTree.js:182
 msgid "Mark all feeds as read"
 msgstr "Segna tutti i notiziari come letti"
 
@@ -694,8 +613,7 @@ msgstr "Attiva espansione automatica in modalità combinata"
 msgid "Go to"
 msgstr "Vai a"
 
-#: include/functions2.php:100
-#: include/functions.php:1963
+#: include/functions2.php:100 include/functions.php:1963
 msgid "All articles"
 msgstr "Tutti gli articoli"
 
@@ -703,9 +621,7 @@ msgstr "Tutti gli articoli"
 msgid "Fresh"
 msgstr "Recenti"
 
-#: include/functions2.php:104
-#: js/tt-rss.js:469
-#: js/tt-rss.js:653
+#: include/functions2.php:104 js/tt-rss.js:469 js/tt-rss.js:653
 msgid "Tag cloud"
 msgstr "Nuvola etichette"
 
@@ -713,13 +629,11 @@ msgstr "Nuvola etichette"
 msgid "Other"
 msgstr "Altri"
 
-#: include/functions2.php:107
-#: classes/pref/labels.php:281
+#: include/functions2.php:107 classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Crea etichetta"
 
-#: include/functions2.php:108
-#: classes/pref/filters.php:740
+#: include/functions2.php:108 classes/pref/filters.php:740
 msgid "Create filter"
 msgstr "Crea filtro"
 
@@ -736,15 +650,13 @@ msgstr "Mostra la sezione di aiuto"
 msgid "Search results: %s"
 msgstr "Risultati di ricerca: %s"
 
-#: include/functions2.php:1299
-#: classes/feeds.php:737
+#: include/functions2.php:1299 classes/feeds.php:737
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "Commento"
 msgstr[1] "Commenti"
 
-#: include/functions2.php:1303
-#: classes/feeds.php:741
+#: include/functions2.php:1303 classes/feeds.php:741
 msgid "comments"
 msgstr "Commenti"
 
@@ -752,46 +664,32 @@ msgstr "Commenti"
 msgid " - "
 msgstr " - "
 
-#: include/functions2.php:1362
-#: include/functions2.php:1613
+#: include/functions2.php:1362 include/functions2.php:1613
 #: classes/article.php:292
 msgid "no tags"
 msgstr "nessuna etichetta"
 
-#: include/functions2.php:1372
-#: classes/feeds.php:723
+#: include/functions2.php:1372 classes/feeds.php:723
 msgid "Edit tags for this article"
 msgstr "Modifica le etichette per questo articolo"
 
-#: include/functions2.php:1404
-#: classes/feeds.php:670
+#: include/functions2.php:1404 classes/feeds.php:670
 msgid "Originally from:"
 msgstr "Originariamente da:"
 
-#: include/functions2.php:1417
-#: classes/feeds.php:683
+#: include/functions2.php:1417 classes/feeds.php:683
 #: classes/pref/feeds.php:571
 msgid "Feed URL"
 msgstr "URL del notiziario"
 
-#: include/functions2.php:1454
-#: classes/backend.php:105
-#: classes/pref/users.php:95
-#: classes/pref/feeds.php:1655
-#: classes/pref/feeds.php:1721
-#: classes/pref/filters.php:192
-#: classes/pref/prefs.php:1101
-#: classes/dlg.php:37
-#: classes/dlg.php:60
-#: classes/dlg.php:93
-#: classes/dlg.php:159
-#: classes/dlg.php:186
-#: plugins/af_psql_trgm/init.php:102
-#: plugins/googlereaderimport/init.php:194
-#: plugins/import_export/init.php:411
-#: plugins/import_export/init.php:456
-#: plugins/af_sort_bayes/init.php:402
-#: plugins/share/init.php:123
+#: include/functions2.php:1454 classes/backend.php:105
+#: classes/pref/users.php:95 classes/pref/feeds.php:1655
+#: classes/pref/feeds.php:1721 classes/pref/filters.php:192
+#: classes/pref/prefs.php:1101 classes/dlg.php:37 classes/dlg.php:60
+#: classes/dlg.php:93 classes/dlg.php:159 classes/dlg.php:186
+#: plugins/af_psql_trgm/init.php:102 plugins/googlereaderimport/init.php:194
+#: plugins/import_export/init.php:411 plugins/import_export/init.php:456
+#: plugins/af_sort_bayes/init.php:402 plugins/share/init.php:123
 msgid "Close this window"
 msgstr "Chiudi questa finestra"
 
@@ -812,13 +710,11 @@ msgstr "Allegati"
 msgid "%d min"
 msgstr "%d minimo"
 
-#: include/functions.php:1250
-#: include/functions.php:1902
+#: include/functions.php:1250 include/functions.php:1902
 msgid "Special"
 msgstr "Speciale"
 
-#: include/functions.php:1753
-#: classes/pref/filters.php:216
+#: include/functions.php:1753 classes/pref/filters.php:216
 #: classes/pref/filters.php:494
 msgid "All feeds"
 msgstr "Tutti i notiziari"
@@ -843,14 +739,12 @@ msgstr "Articoli archiviati"
 msgid "Recently read"
 msgstr "Letti di recente"
 
-#: include/login_form.php:190
-#: classes/handler/public.php:557
+#: include/login_form.php:190 classes/handler/public.php:557
 #: classes/handler/public.php:812
 msgid "Login:"
 msgstr "Nome utente:"
 
-#: include/login_form.php:200
-#: classes/handler/public.php:560
+#: include/login_form.php:200 classes/handler/public.php:560
 msgid "Password:"
 msgstr "Password:"
 
@@ -862,10 +756,8 @@ msgstr "Ho dimenticato la mia password"
 msgid "Profile:"
 msgstr "Profilo:"
 
-#: include/login_form.php:216
-#: classes/handler/public.php:299
-#: classes/rpc.php:63
-#: classes/pref/prefs.php:1039
+#: include/login_form.php:216 classes/handler/public.php:299
+#: classes/rpc.php:63 classes/pref/prefs.php:1039
 msgid "Default profile"
 msgstr "Profilo predefinito"
 
@@ -881,8 +773,7 @@ msgstr "Non mostra le immagini negli articoli, riduce i refresh automatici."
 msgid "Remember me"
 msgstr "Ricordami"
 
-#: include/login_form.php:242
-#: classes/handler/public.php:565
+#: include/login_form.php:242 classes/handler/public.php:565
 msgid "Log in"
 msgstr "Accedi"
 
@@ -922,8 +813,7 @@ msgstr "Ctrl"
 msgid "Help topic not found."
 msgstr "Argomento dell'aiuto non trovato."
 
-#: classes/handler/public.php:498
-#: plugins/bookmarklets/init.php:40
+#: classes/handler/public.php:498 plugins/bookmarklets/init.php:40
 msgid "Share with Tiny Tiny RSS"
 msgstr "Condividi con Tiny Tiny RSS"
 
@@ -931,10 +821,8 @@ msgstr "Condividi con Tiny Tiny RSS"
 msgid "Title:"
 msgstr "Titolo:"
 
-#: classes/handler/public.php:508
-#: classes/pref/feeds.php:569
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
+#: classes/handler/public.php:508 classes/pref/feeds.php:569
+#: plugins/instances/init.php:212 plugins/instances/init.php:401
 msgid "URL:"
 msgstr "URL:"
 
@@ -954,25 +842,15 @@ msgstr "Gli articoli condivisi appariranno nel notiziario Pubblicati."
 msgid "Share"
 msgstr "Condividi"
 
-#: classes/handler/public.php:534
-#: classes/handler/public.php:568
-#: classes/feeds.php:1084
-#: classes/feeds.php:1134
-#: classes/feeds.php:1171
-#: classes/article.php:205
-#: classes/pref/users.php:170
-#: classes/pref/feeds.php:788
-#: classes/pref/feeds.php:929
-#: classes/pref/feeds.php:1861
-#: classes/pref/filters.php:475
-#: classes/pref/filters.php:889
-#: classes/pref/filters.php:970
-#: classes/pref/filters.php:1063
-#: classes/pref/labels.php:81
-#: classes/pref/prefs.php:987
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:172
-#: plugins/instances/init.php:248
+#: classes/handler/public.php:534 classes/handler/public.php:568
+#: classes/feeds.php:1084 classes/feeds.php:1134 classes/feeds.php:1171
+#: classes/article.php:205 classes/pref/users.php:170
+#: classes/pref/feeds.php:788 classes/pref/feeds.php:929
+#: classes/pref/feeds.php:1861 classes/pref/filters.php:475
+#: classes/pref/filters.php:889 classes/pref/filters.php:970
+#: classes/pref/filters.php:1063 classes/pref/labels.php:81
+#: classes/pref/prefs.php:987 plugins/note/init.php:53
+#: plugins/mail/init.php:172 plugins/instances/init.php:248
 #: plugins/instances/init.php:436
 msgid "Cancel"
 msgstr "Annulla"
@@ -1030,8 +908,7 @@ msgstr "Recupera password"
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "Dovrai fornire un nome utente e una email collegata validi. Verrà spedito un link per resettare la password."
 
-#: classes/handler/public.php:827
-#: classes/pref/users.php:352
+#: classes/handler/public.php:827 classes/pref/users.php:352
 msgid "Reset password"
 msgstr "Reimposta password"
 
@@ -1039,8 +916,7 @@ msgstr "Reimposta password"
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "Alcuni dei parametri richiesti sono mancanti o scorretti."
 
-#: classes/handler/public.php:841
-#: classes/handler/public.php:907
+#: classes/handler/public.php:841 classes/handler/public.php:907
 msgid "Go back"
 msgstr "Torna indietro"
 
@@ -1068,9 +944,7 @@ msgstr "Effettua gli aggiornamenti"
 msgid "View as RSS feed"
 msgstr "Visualizza come notiziario RSS"
 
-#: classes/feeds.php:54
-#: classes/feeds.php:134
-#: classes/pref/feeds.php:1517
+#: classes/feeds.php:54 classes/feeds.php:134 classes/pref/feeds.php:1517
 msgid "View as RSS"
 msgstr "Visualizza come RSS"
 
@@ -1079,19 +953,12 @@ msgstr "Visualizza come RSS"
 msgid "Last updated: %s"
 msgstr "Ultimo aggiornamento: %s"
 
-#: classes/feeds.php:90
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1349
-#: classes/pref/feeds.php:1606
-#: classes/pref/feeds.php:1670
-#: classes/pref/filters.php:349
-#: classes/pref/filters.php:397
-#: classes/pref/filters.php:734
-#: classes/pref/filters.php:822
-#: classes/pref/filters.php:849
-#: classes/pref/labels.php:275
-#: classes/pref/prefs.php:999
-#: plugins/instances/init.php:287
+#: classes/feeds.php:90 classes/pref/users.php:337 classes/pref/feeds.php:1349
+#: classes/pref/feeds.php:1606 classes/pref/feeds.php:1670
+#: classes/pref/filters.php:349 classes/pref/filters.php:397
+#: classes/pref/filters.php:734 classes/pref/filters.php:822
+#: classes/pref/filters.php:849 classes/pref/labels.php:275
+#: classes/pref/prefs.php:999 plugins/instances/init.php:287
 msgid "All"
 msgstr "Tutti"
 
@@ -1099,19 +966,12 @@ msgstr "Tutti"
 msgid "Invert"
 msgstr "Inverti"
 
-#: classes/feeds.php:93
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1351
-#: classes/pref/feeds.php:1608
-#: classes/pref/feeds.php:1672
-#: classes/pref/filters.php:351
-#: classes/pref/filters.php:399
-#: classes/pref/filters.php:736
-#: classes/pref/filters.php:824
-#: classes/pref/filters.php:851
-#: classes/pref/labels.php:277
-#: classes/pref/prefs.php:1001
-#: plugins/instances/init.php:289
+#: classes/feeds.php:93 classes/pref/users.php:339 classes/pref/feeds.php:1351
+#: classes/pref/feeds.php:1608 classes/pref/feeds.php:1672
+#: classes/pref/filters.php:351 classes/pref/filters.php:399
+#: classes/pref/filters.php:736 classes/pref/filters.php:824
+#: classes/pref/filters.php:851 classes/pref/labels.php:277
+#: classes/pref/prefs.php:1001 plugins/instances/init.php:289
 msgid "None"
 msgstr "Nessuno"
 
@@ -1139,17 +999,13 @@ msgstr "Archivio"
 msgid "Move back"
 msgstr "Sposta indietro"
 
-#: classes/feeds.php:116
-#: classes/pref/filters.php:358
-#: classes/pref/filters.php:406
-#: classes/pref/filters.php:831
+#: classes/feeds.php:116 classes/pref/filters.php:358
+#: classes/pref/filters.php:406 classes/pref/filters.php:831
 #: classes/pref/filters.php:858
 msgid "Delete"
 msgstr "Elimina"
 
-#: classes/feeds.php:121
-#: classes/feeds.php:126
-#: plugins/mailto/init.php:25
+#: classes/feeds.php:121 classes/feeds.php:126 plugins/mailto/init.php:25
 #: plugins/mail/init.php:75
 msgid "Forward by email"
 msgstr "Inoltra per email"
@@ -1158,8 +1014,7 @@ msgstr "Inoltra per email"
 msgid "Feed:"
 msgstr "Notiziario:"
 
-#: classes/feeds.php:200
-#: classes/feeds.php:877
+#: classes/feeds.php:200 classes/feeds.php:877
 msgid "Feed not found."
 msgstr "Notiziario non trovato."
 
@@ -1172,8 +1027,7 @@ msgstr "Mai"
 msgid "Imported at %s"
 msgstr "Importato alle %s"
 
-#: classes/feeds.php:454
-#: classes/feeds.php:551
+#: classes/feeds.php:454 classes/feeds.php:551
 msgid "mark feed as read"
 msgstr "Segna notiziario come letto"
 
@@ -1201,14 +1055,12 @@ msgstr "Nessun articolo trovato da visualizzare. Si possono assegnare manualment
 msgid "No articles found to display."
 msgstr "Nessun articolo trovato da visualizzare."
 
-#: classes/feeds.php:803
-#: classes/feeds.php:975
+#: classes/feeds.php:803 classes/feeds.php:975
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "Ultimo aggiornamento notiziari alle %s"
 
-#: classes/feeds.php:813
-#: classes/feeds.php:985
+#: classes/feeds.php:813 classes/feeds.php:985
 msgid "Some feeds have update errors (click for details)"
 msgstr "Qualche notiziario ha degli errori di aggiornamento (fare clic per dettagli)"
 
@@ -1216,15 +1068,12 @@ msgstr "Qualche notiziario ha degli errori di aggiornamento (fare clic per detta
 msgid "No feed selected."
 msgstr "Nessun notiziario selezionato."
 
-#: classes/feeds.php:1022
-#: classes/feeds.php:1030
+#: classes/feeds.php:1022 classes/feeds.php:1030
 msgid "Feed or site URL"
 msgstr "URL del sito o del notiziario"
 
-#: classes/feeds.php:1036
-#: classes/pref/feeds.php:592
-#: classes/pref/feeds.php:815
-#: classes/pref/feeds.php:1825
+#: classes/feeds.php:1036 classes/pref/feeds.php:592
+#: classes/pref/feeds.php:815 classes/pref/feeds.php:1825
 msgid "Place in category:"
 msgstr "Mettere nella categoria:"
 
@@ -1232,25 +1081,19 @@ msgstr "Mettere nella categoria:"
 msgid "Available feeds"
 msgstr "Notiziari disponibili"
 
-#: classes/feeds.php:1056
-#: classes/pref/users.php:133
-#: classes/pref/feeds.php:634
-#: classes/pref/feeds.php:863
+#: classes/feeds.php:1056 classes/pref/users.php:133
+#: classes/pref/feeds.php:634 classes/pref/feeds.php:863
 msgid "Authentication"
 msgstr "Autenticazione"
 
-#: classes/feeds.php:1060
-#: classes/pref/users.php:397
-#: classes/pref/feeds.php:640
-#: classes/pref/feeds.php:867
+#: classes/feeds.php:1060 classes/pref/users.php:397
+#: classes/pref/feeds.php:640 classes/pref/feeds.php:867
 #: classes/pref/feeds.php:1839
 msgid "Login"
 msgstr "Nome utente"
 
-#: classes/feeds.php:1063
-#: classes/pref/feeds.php:653
-#: classes/pref/feeds.php:873
-#: classes/pref/feeds.php:1842
+#: classes/feeds.php:1063 classes/pref/feeds.php:653
+#: classes/pref/feeds.php:873 classes/pref/feeds.php:1842
 #: classes/pref/prefs.php:245
 msgid "Password"
 msgstr "Password"
@@ -1259,9 +1102,7 @@ msgstr "Password"
 msgid "This feed requires authentication."
 msgstr "Questo notiziario richiede l'autenticazione."
 
-#: classes/feeds.php:1078
-#: classes/feeds.php:1132
-#: classes/pref/feeds.php:1860
+#: classes/feeds.php:1078 classes/feeds.php:1132 classes/pref/feeds.php:1860
 msgid "Subscribe"
 msgstr "Sottoscrivi"
 
@@ -1269,12 +1110,8 @@ msgstr "Sottoscrivi"
 msgid "More feeds"
 msgstr "Altri notiziari"
 
-#: classes/feeds.php:1104
-#: classes/feeds.php:1170
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1342
-#: classes/pref/filters.php:727
-#: js/tt-rss.js:174
+#: classes/feeds.php:1104 classes/feeds.php:1170 classes/pref/users.php:324
+#: classes/pref/feeds.php:1342 classes/pref/filters.php:727 js/tt-rss.js:174
 msgid "Search"
 msgstr "Cerca"
 
@@ -1290,12 +1127,9 @@ msgstr "Archivio notiziari"
 msgid "limit:"
 msgstr "Limite:"
 
-#: classes/feeds.php:1133
-#: classes/pref/users.php:350
-#: classes/pref/feeds.php:758
-#: classes/pref/filters.php:465
-#: classes/pref/filters.php:753
-#: classes/pref/labels.php:284
+#: classes/feeds.php:1133 classes/pref/users.php:350
+#: classes/pref/feeds.php:758 classes/pref/filters.php:465
+#: classes/pref/filters.php:753 classes/pref/labels.php:284
 #: plugins/instances/init.php:294
 msgid "Remove"
 msgstr "Rimuovi"
@@ -1311,7 +1145,7 @@ msgstr "in %s"
 
 #: classes/feeds.php:1157
 msgid "Used for word stemming"
-msgstr ""
+msgstr "Usato per determinare la radice delle parole"
 
 #: classes/feeds.php:1166
 msgid "Search syntax"
@@ -1325,24 +1159,16 @@ msgstr "Articolo non trovato."
 msgid "Tags for this article (separated by commas):"
 msgstr "Etichette per questo articolo (separate da virgole):"
 
-#: classes/article.php:203
-#: classes/pref/users.php:168
-#: classes/pref/feeds.php:787
-#: classes/pref/feeds.php:926
-#: classes/pref/filters.php:472
-#: classes/pref/labels.php:79
-#: classes/pref/prefs.php:985
-#: plugins/af_psql_trgm/init.php:184
-#: plugins/note/init.php:51
-#: plugins/nsfw/init.php:85
-#: plugins/mail/init.php:64
-#: plugins/instances/init.php:245
-#: plugins/af_redditimgur/init.php:57
+#: classes/article.php:203 classes/pref/users.php:168
+#: classes/pref/feeds.php:787 classes/pref/feeds.php:926
+#: classes/pref/filters.php:472 classes/pref/labels.php:79
+#: classes/pref/prefs.php:985 plugins/af_psql_trgm/init.php:184
+#: plugins/note/init.php:51 plugins/nsfw/init.php:85 plugins/mail/init.php:64
+#: plugins/instances/init.php:245 plugins/af_redditimgur/init.php:57
 msgid "Save"
 msgstr "Salva"
 
-#: classes/opml.php:28
-#: classes/opml.php:33
+#: classes/opml.php:28 classes/opml.php:33
 msgid "OPML Utility"
 msgstr "Utility OPML"
 
@@ -1388,21 +1214,18 @@ msgstr "Aggiungendo filtro..."
 msgid "Processing category: %s"
 msgstr "Elaborando categoria: %s"
 
-#: classes/opml.php:470
-#: plugins/googlereaderimport/init.php:66
+#: classes/opml.php:470 plugins/googlereaderimport/init.php:66
 #: plugins/import_export/init.php:424
 #, php-format
 msgid "Upload failed with error code %d"
 msgstr "Caricamento fallito con codice errore %d"
 
-#: classes/opml.php:484
-#: plugins/googlereaderimport/init.php:80
+#: classes/opml.php:484 plugins/googlereaderimport/init.php:80
 #: plugins/import_export/init.php:438
 msgid "Unable to move uploaded file."
 msgstr "Non è possibile spostare il file caricato."
 
-#: classes/opml.php:488
-#: plugins/googlereaderimport/init.php:84
+#: classes/opml.php:488 plugins/googlereaderimport/init.php:84
 #: plugins/import_export/init.php:442
 msgid "Error: please upload OPML file."
 msgstr "Errore: caricare il file OPML."
@@ -1411,13 +1234,11 @@ msgstr "Errore: caricare il file OPML."
 msgid "Error: unable to find moved OPML file."
 msgstr "Errore: non trovato il file OPML spostato."
 
-#: classes/opml.php:506
-#: plugins/googlereaderimport/init.php:187
+#: classes/opml.php:506 plugins/googlereaderimport/init.php:187
 msgid "Error while parsing document."
 msgstr "Errore durante l'analisi del documento."
 
-#: classes/pref/system.php:8
-#: classes/pref/users.php:6
+#: classes/pref/system.php:8 classes/pref/users.php:6
 #: plugins/instances/init.php:154
 msgid "Your access level is insufficient to open this tab."
 msgstr "Il livello di accesso non è sufficiente per aprire questa scheda."
@@ -1426,8 +1247,7 @@ msgstr "Il livello di accesso non è sufficiente per aprire questa scheda."
 msgid "Error Log"
 msgstr "Log degli errori"
 
-#: classes/pref/system.php:40
-#: plugins/af_sort_bayes/init.php:250
+#: classes/pref/system.php:40 plugins/af_sort_bayes/init.php:250
 msgid "Refresh"
 msgstr "Aggiorna"
 
@@ -1455,8 +1275,7 @@ msgstr "Data"
 msgid "User not found"
 msgstr "Utente non trovato"
 
-#: classes/pref/users.php:53
-#: classes/pref/users.php:399
+#: classes/pref/users.php:53 classes/pref/users.php:399
 msgid "Registered"
 msgstr "Registrato"
 
@@ -1476,8 +1295,7 @@ msgstr "Notiziari sottoscritti"
 msgid "Access level: "
 msgstr "Livello di accesso: "
 
-#: classes/pref/users.php:154
-#: classes/pref/feeds.php:661
+#: classes/pref/users.php:154 classes/pref/feeds.php:661
 #: classes/pref/feeds.php:879
 msgid "Options"
 msgstr "Opzioni"
@@ -1511,18 +1329,12 @@ msgstr "Inviata nuova password dell'utente <b>%s</b> a <b>%s</b> "
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] Notifica di cambio password"
 
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1346
-#: classes/pref/feeds.php:1603
-#: classes/pref/feeds.php:1667
-#: classes/pref/filters.php:346
-#: classes/pref/filters.php:394
-#: classes/pref/filters.php:731
-#: classes/pref/filters.php:819
-#: classes/pref/filters.php:846
-#: classes/pref/labels.php:272
-#: classes/pref/prefs.php:996
-#: plugins/instances/init.php:284
+#: classes/pref/users.php:334 classes/pref/feeds.php:1346
+#: classes/pref/feeds.php:1603 classes/pref/feeds.php:1667
+#: classes/pref/filters.php:346 classes/pref/filters.php:394
+#: classes/pref/filters.php:731 classes/pref/filters.php:819
+#: classes/pref/filters.php:846 classes/pref/labels.php:272
+#: classes/pref/prefs.php:996 plugins/instances/init.php:284
 msgid "Select"
 msgstr "Seleziona"
 
@@ -1534,8 +1346,7 @@ msgstr "Crea utente"
 msgid "Details"
 msgstr "Dettagli"
 
-#: classes/pref/users.php:348
-#: classes/pref/filters.php:746
+#: classes/pref/users.php:348 classes/pref/filters.php:746
 #: plugins/instances/init.php:293
 msgid "Edit"
 msgstr "Modifica"
@@ -1548,8 +1359,7 @@ msgstr "Livello di accesso"
 msgid "Last login"
 msgstr "Ultimo accesso"
 
-#: classes/pref/users.php:419
-#: plugins/instances/init.php:334
+#: classes/pref/users.php:419 plugins/instances/init.php:334
 msgid "Click to edit"
 msgstr "Fai clic per modificare"
 
@@ -1565,10 +1375,8 @@ msgstr "Nessun utente corrispondente trovato."
 msgid "Check to enable field"
 msgstr "Spuntare per attivare il campo"
 
-#: classes/pref/feeds.php:65
-#: classes/pref/feeds.php:214
-#: classes/pref/feeds.php:258
-#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:65 classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258 classes/pref/feeds.php:264
 #: classes/pref/feeds.php:290
 #, php-format
 msgid "(%d feed)"
@@ -1580,19 +1388,15 @@ msgstr[1] "(%d notiziari)"
 msgid "Feed Title"
 msgstr "Titolo del notiziario"
 
-#: classes/pref/feeds.php:605
-#: classes/pref/feeds.php:829
-#, fuzzy
+#: classes/pref/feeds.php:605 classes/pref/feeds.php:829
 msgid "Language:"
-msgstr "Lingua"
+msgstr "Lingua:"
 
-#: classes/pref/feeds.php:612
-#: classes/pref/feeds.php:838
+#: classes/pref/feeds.php:612 classes/pref/feeds.php:838
 msgid "Update"
 msgstr "Aggiorna"
 
-#: classes/pref/feeds.php:627
-#: classes/pref/feeds.php:854
+#: classes/pref/feeds.php:627 classes/pref/feeds.php:854
 msgid "Article purging:"
 msgstr "Eliminazione articoli:"
 
@@ -1600,33 +1404,27 @@ msgstr "Eliminazione articoli:"
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>Suggerimento:</b> occorre fornire le credenziali di accesso se il proprio notiziario richiede l'autenticazione, eccetto che per i notiziari di Twitter."
 
-#: classes/pref/feeds.php:673
-#: classes/pref/feeds.php:883
+#: classes/pref/feeds.php:673 classes/pref/feeds.php:883
 msgid "Hide from Popular feeds"
 msgstr "Nascondere dai notiziari popolari"
 
-#: classes/pref/feeds.php:685
-#: classes/pref/feeds.php:889
+#: classes/pref/feeds.php:685 classes/pref/feeds.php:889
 msgid "Include in e-mail digest"
 msgstr "Includere nell'email riassunto"
 
-#: classes/pref/feeds.php:698
-#: classes/pref/feeds.php:895
+#: classes/pref/feeds.php:698 classes/pref/feeds.php:895
 msgid "Always display image attachments"
 msgstr "Mostrare sempre le immagini allegate"
 
-#: classes/pref/feeds.php:711
-#: classes/pref/feeds.php:903
+#: classes/pref/feeds.php:711 classes/pref/feeds.php:903
 msgid "Do not embed images"
 msgstr "Non includere le immagini"
 
-#: classes/pref/feeds.php:724
-#: classes/pref/feeds.php:911
+#: classes/pref/feeds.php:724 classes/pref/feeds.php:911
 msgid "Cache images locally"
 msgstr "Memorizzare le immagini localmente"
 
-#: classes/pref/feeds.php:736
-#: classes/pref/feeds.php:917
+#: classes/pref/feeds.php:736 classes/pref/feeds.php:917
 msgid "Mark updated articles as unread"
 msgstr "Segnare gli articoli aggiornati come non letti"
 
@@ -1646,8 +1444,7 @@ msgstr "Sottoscrivi di nuovo per inviare aggiornamenti"
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "Reimposta lo stato di sottoscrizione a PubSubHubbub per i notiziari attivati all'invio."
 
-#: classes/pref/feeds.php:1190
-#: classes/pref/feeds.php:1243
+#: classes/pref/feeds.php:1190 classes/pref/feeds.php:1243
 msgid "All done."
 msgstr "Tutto fatto."
 
@@ -1663,14 +1460,12 @@ msgstr "Notiziari non attivi"
 msgid "Edit selected feeds"
 msgstr "Modifica i notiziari selezionati"
 
-#: classes/pref/feeds.php:1362
-#: classes/pref/feeds.php:1376
+#: classes/pref/feeds.php:1362 classes/pref/feeds.php:1376
 #: classes/pref/filters.php:749
 msgid "Reset sort order"
 msgstr "Reimposta ordinamento"
 
-#: classes/pref/feeds.php:1364
-#: js/prefs.js:1732
+#: classes/pref/feeds.php:1364 js/prefs.js:1732
 msgid "Batch subscribe"
 msgstr "Sottoscrivi in gruppo"
 
@@ -1698,8 +1493,7 @@ msgstr "Eliminazione manuale"
 msgid "Clear feed data"
 msgstr "Cancella i dati del notiziario"
 
-#: classes/pref/feeds.php:1398
-#: classes/pref/filters.php:757
+#: classes/pref/feeds.php:1398 classes/pref/filters.php:757
 msgid "Rescore articles"
 msgstr "Cambia punteggio degli articoli"
 
@@ -1779,13 +1573,11 @@ msgstr "Cancella tutti gli URL generati"
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "Questi notiziari non sono stati aggiornati con nuovi contenuti da 3 mesi (prima i più vecchi):"
 
-#: classes/pref/feeds.php:1633
-#: classes/pref/feeds.php:1697
+#: classes/pref/feeds.php:1633 classes/pref/feeds.php:1697
 msgid "Click to edit feed"
 msgstr "Fare clic per modificare il notiziario"
 
-#: classes/pref/feeds.php:1651
-#: classes/pref/feeds.php:1717
+#: classes/pref/feeds.php:1651 classes/pref/feeds.php:1717
 msgid "Unsubscribe from selected feeds"
 msgstr "Annulla la sottoscrizione ai notiziari selezionati"
 
@@ -1809,58 +1601,47 @@ msgstr "Articoli che corrispondono a questo filtro:"
 msgid "No recent articles matching this filter have been found."
 msgstr "Nessun articolo recente trovato che corrisponde a questo filtro."
 
-#: classes/pref/filters.php:226
-#: classes/pref/filters.php:505
+#: classes/pref/filters.php:226 classes/pref/filters.php:505
 msgid "(inverse)"
 msgstr "(inverso)"
 
-#: classes/pref/filters.php:222
-#: classes/pref/filters.php:504
+#: classes/pref/filters.php:222 classes/pref/filters.php:504
 #, php-format
 msgid "%s on %s in %s %s"
 msgstr "%s su %s in %s %s"
 
-#: classes/pref/filters.php:335
-#: classes/pref/filters.php:810
+#: classes/pref/filters.php:335 classes/pref/filters.php:810
 #: classes/pref/labels.php:22
 msgid "Caption"
 msgstr "Etichetta"
 
-#: classes/pref/filters.php:341
-#: classes/pref/filters.php:814
+#: classes/pref/filters.php:341 classes/pref/filters.php:814
 #: classes/pref/filters.php:929
 msgid "Match"
 msgstr "Corrisponde"
 
-#: classes/pref/filters.php:355
-#: classes/pref/filters.php:403
-#: classes/pref/filters.php:828
-#: classes/pref/filters.php:855
+#: classes/pref/filters.php:355 classes/pref/filters.php:403
+#: classes/pref/filters.php:828 classes/pref/filters.php:855
 msgid "Add"
 msgstr "Aggiungi"
 
-#: classes/pref/filters.php:389
-#: classes/pref/filters.php:841
+#: classes/pref/filters.php:389 classes/pref/filters.php:841
 msgid "Apply actions"
 msgstr "Applica azioni"
 
-#: classes/pref/filters.php:439
-#: classes/pref/filters.php:870
+#: classes/pref/filters.php:439 classes/pref/filters.php:870
 msgid "Enabled"
 msgstr "Attivato"
 
-#: classes/pref/filters.php:448
-#: classes/pref/filters.php:873
+#: classes/pref/filters.php:448 classes/pref/filters.php:873
 msgid "Match any rule"
 msgstr "Corrispondenza a ogni regola"
 
-#: classes/pref/filters.php:457
-#: classes/pref/filters.php:876
+#: classes/pref/filters.php:457 classes/pref/filters.php:876
 msgid "Inverse matching"
 msgstr "Corrispondenza inversa"
 
-#: classes/pref/filters.php:469
-#: classes/pref/filters.php:883
+#: classes/pref/filters.php:469 classes/pref/filters.php:883
 msgid "Test"
 msgstr "Prova"
 
@@ -1880,8 +1661,7 @@ msgstr "Corrispondenza inversa delle espressioni regolari"
 msgid "on field"
 msgstr "al campo"
 
-#: classes/pref/filters.php:949
-#: js/PrefFilterTree.js:61
+#: classes/pref/filters.php:949 js/PrefFilterTree.js:61
 msgid "in"
 msgstr "in"
 
@@ -1893,8 +1673,7 @@ msgstr "Wiki: Filtri"
 msgid "Save rule"
 msgstr "Salva regola"
 
-#: classes/pref/filters.php:967
-#: js/functions.js:1033
+#: classes/pref/filters.php:967 js/functions.js:1033
 msgid "Add rule"
 msgstr "Aggiungi regola"
 
@@ -1903,16 +1682,14 @@ msgid "Perform Action"
 msgstr "Esegui azione"
 
 #: classes/pref/filters.php:1041
-#, fuzzy
 msgid "No actions available"
-msgstr "Nuova versione disponibile."
+msgstr "Nessuna azione disponibile"
 
 #: classes/pref/filters.php:1060
 msgid "Save action"
 msgstr "Salva azione"
 
-#: classes/pref/filters.php:1060
-#: js/functions.js:1059
+#: classes/pref/filters.php:1060 js/functions.js:1059
 msgid "Add action"
 msgstr "Aggiungi azione"
 
@@ -2131,8 +1908,7 @@ msgstr "Togliere le etichette non sicure dagli articoli"
 msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Toglie le tag HTML meno comuni durante la lettura degli articoli."
 
-#: classes/pref/prefs.php:53
-#: js/prefs.js:1687
+#: classes/pref/prefs.php:53 js/prefs.js:1687
 msgid "Customize stylesheet"
 msgstr "Personalizza il foglio di stile"
 
@@ -2232,8 +2008,7 @@ msgstr "Password usa e getta(OTP) / Autenticatore"
 msgid "One time passwords are currently enabled. Enter your current password below to disable."
 msgstr "Le password usa e getta (OTP) sono attualmente attive. Inserisci la password attuale per disattivarle."
 
-#: classes/pref/prefs.php:347
-#: classes/pref/prefs.php:398
+#: classes/pref/prefs.php:347 classes/pref/prefs.php:398
 msgid "Enter your password"
 msgstr "Inserire la password"
 
@@ -2314,33 +2089,27 @@ msgstr "Scarica altri plugin dai <a class=\"visibleLink\" target=\"_blank\" href
 msgid "System plugins"
 msgstr "Plugin di sistema"
 
-#: classes/pref/prefs.php:740
-#: classes/pref/prefs.php:796
+#: classes/pref/prefs.php:740 classes/pref/prefs.php:796
 msgid "Plugin"
 msgstr "Plugin"
 
-#: classes/pref/prefs.php:741
-#: classes/pref/prefs.php:797
+#: classes/pref/prefs.php:741 classes/pref/prefs.php:797
 msgid "Description"
 msgstr "Descrizione"
 
-#: classes/pref/prefs.php:742
-#: classes/pref/prefs.php:798
+#: classes/pref/prefs.php:742 classes/pref/prefs.php:798
 msgid "Version"
 msgstr "Versione"
 
-#: classes/pref/prefs.php:743
-#: classes/pref/prefs.php:799
+#: classes/pref/prefs.php:743 classes/pref/prefs.php:799
 msgid "Author"
 msgstr "Autore"
 
-#: classes/pref/prefs.php:774
-#: classes/pref/prefs.php:833
+#: classes/pref/prefs.php:774 classes/pref/prefs.php:833
 msgid "more info"
 msgstr "Ulteriori informazioni"
 
-#: classes/pref/prefs.php:783
-#: classes/pref/prefs.php:842
+#: classes/pref/prefs.php:783 classes/pref/prefs.php:842
 msgid "Clear data"
 msgstr "Cancella i dati"
 
@@ -2356,8 +2125,7 @@ msgstr "Attiva i plugin selezionati"
 msgid "Incorrect one time password"
 msgstr "Password usa e getta sbagliata"
 
-#: classes/pref/prefs.php:928
-#: classes/pref/prefs.php:945
+#: classes/pref/prefs.php:928 classes/pref/prefs.php:945
 msgid "Incorrect password"
 msgstr "Password sbagliata"
 
@@ -2370,8 +2138,7 @@ msgstr "Si possono cambiare i colori, i caratteri e la disposizione del tema cor
 msgid "Create profile"
 msgstr "Crea profilo"
 
-#: classes/pref/prefs.php:1033
-#: classes/pref/prefs.php:1061
+#: classes/pref/prefs.php:1033 classes/pref/prefs.php:1061
 msgid "(active)"
 msgstr "(attivo)"
 
@@ -2391,9 +2158,7 @@ msgstr "Se sono stati importati etichette e/o filtri, ricaricare le preferenze p
 msgid "Your Public OPML URL is:"
 msgstr "L'URL OPML pubblico è:"
 
-#: classes/dlg.php:57
-#: classes/dlg.php:183
-#: plugins/share/init.php:120
+#: classes/dlg.php:57 classes/dlg.php:183 plugins/share/init.php:120
 msgid "Generate new URL"
 msgstr "Genera nuovo URL"
 
@@ -2401,8 +2166,7 @@ msgstr "Genera nuovo URL"
 msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
 msgstr "Il demone per l'aggiornamento è attivato nella configurazione, ma il processo del demone non è in esecuzione; questo impedisce l'aggiornameto di tutti i notiziari. Avviare il processo del demone o contattare il proprietario dell'istanza."
 
-#: classes/dlg.php:75
-#: classes/dlg.php:84
+#: classes/dlg.php:75 classes/dlg.php:84
 msgid "Last update:"
 msgstr "Ultimo aggiornamento:"
 
@@ -2423,13 +2187,11 @@ msgstr "Data salvata (%s, %d)"
 msgid "Show related articles"
 msgstr "Mostra articoli collegati"
 
-#: plugins/af_psql_trgm/init.php:118
-#: plugins/af_psql_trgm/init.php:223
+#: plugins/af_psql_trgm/init.php:118 plugins/af_psql_trgm/init.php:223
 msgid "Mark similar articles as read"
 msgstr "Segnare tutti gli articoli simili come letti"
 
-#: plugins/af_psql_trgm/init.php:162
-#: plugins/af_redditimgur/init.php:46
+#: plugins/af_psql_trgm/init.php:162 plugins/af_redditimgur/init.php:46
 msgid "Global settings"
 msgstr "Impostazioni globali"
 
@@ -2445,8 +2207,7 @@ msgstr "Lunghezza del titolo minima:"
 msgid "Enable for all feeds:"
 msgstr "Attiva per tutti i notiziari:"
 
-#: plugins/af_psql_trgm/init.php:195
-#: plugins/af_readability/init.php:42
+#: plugins/af_psql_trgm/init.php:195 plugins/af_readability/init.php:42
 msgid "Currently enabled for (click to edit):"
 msgstr "Attualmente attivo per (clicca per modificare):"
 
@@ -2462,13 +2223,11 @@ msgstr "Notiziari supportati da af_comics"
 msgid "The following comics are currently supported:"
 msgstr "I seguenti fumetti sono attualmente supportati:"
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
+#: plugins/note/init.php:26 plugins/note/note.js:11
 msgid "Edit article note"
 msgstr "Modifica note articolo"
 
-#: plugins/googlereaderimport/init.php:92
-#: plugins/import_export/init.php:450
+#: plugins/googlereaderimport/init.php:92 plugins/import_export/init.php:450
 msgid "No file uploaded."
 msgstr "Nessun file caricato."
 
@@ -2493,15 +2252,12 @@ msgstr "Incolla il tuo starred.json o shared.json nel box sotto."
 msgid "Import my Starred items"
 msgstr "Importa i miei articoli preferiti"
 
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
-#: plugins/mail/init.php:112
-#: plugins/mail/init.php:118
+#: plugins/mailto/init.php:49 plugins/mailto/init.php:55
+#: plugins/mail/init.php:112 plugins/mail/init.php:118
 msgid "[Forwarded]"
 msgstr "[Inoltrato]"
 
-#: plugins/mailto/init.php:49
-#: plugins/mail/init.php:112
+#: plugins/mailto/init.php:49 plugins/mail/init.php:112
 msgid "Multiple articles"
 msgstr "Articoli multipli"
 
@@ -2578,8 +2334,7 @@ msgstr "Documento XML non caricato."
 msgid "Prepare data"
 msgstr "Prepara dati"
 
-#: plugins/nsfw/init.php:30
-#: plugins/nsfw/init.php:42
+#: plugins/nsfw/init.php:30 plugins/nsfw/init.php:42
 msgid "Not work safe (click to toggle)"
 msgstr "Non sicuro per luoghi di lavoro (clicca per attivare)"
 
@@ -2639,35 +2394,29 @@ msgstr "Invia email"
 msgid "Linked"
 msgstr "Collegato"
 
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
+#: plugins/instances/init.php:204 plugins/instances/init.php:395
 msgid "Instance"
 msgstr "Istanza"
 
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
+#: plugins/instances/init.php:215 plugins/instances/init.php:312
 #: plugins/instances/init.php:404
 msgid "Instance URL"
 msgstr "URL dell'istanza"
 
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
+#: plugins/instances/init.php:226 plugins/instances/init.php:414
 msgid "Access key:"
 msgstr "Chiave di accesso:"
 
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
+#: plugins/instances/init.php:229 plugins/instances/init.php:313
 #: plugins/instances/init.php:417
 msgid "Access key"
 msgstr "Chiave di accesso"
 
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
+#: plugins/instances/init.php:233 plugins/instances/init.php:421
 msgid "Use one access key for both linked instances."
 msgstr "Usare una sola chiave di accesso per entrambe le istanze collegate."
 
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
+#: plugins/instances/init.php:241 plugins/instances/init.php:429
 msgid "Generate new key"
 msgstr "Genera nuova chiave"
 
@@ -2708,9 +2457,8 @@ msgid "Configuration saved"
 msgstr "La configurazione è stata salvata"
 
 #: plugins/af_readability/init.php:25
-#, fuzzy
 msgid "Inline content"
-msgstr "Contenuto completo dell'articolo."
+msgstr "Contenuto completo dell'articolo"
 
 #: plugins/af_readability/init.php:31
 msgid "af_readability settings"
@@ -2724,8 +2472,7 @@ msgstr "Readability"
 msgid "Inline article content"
 msgstr "Contenuto completo dell'articolo."
 
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:69
+#: plugins/vf_shared/init.php:16 plugins/vf_shared/init.php:69
 msgid "Shared articles"
 msgstr "Articoli condivisi"
 
@@ -2850,8 +2597,7 @@ msgstr "Reimpostare la sottoscrizione? Tiny Tiny RSS proverà ancora al prossimo
 msgid "Subscription reset."
 msgstr "Sottoscrizione reimpostata."
 
-#: js/functions.js:1247
-#: js/tt-rss.js:685
+#: js/functions.js:1247 js/tt-rss.js:685
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "Annullare la sottoscrizione a %s?"
@@ -2868,19 +2614,12 @@ msgstr "Inserire il titolo della categoria:"
 msgid "Generate new syndication address for this feed?"
 msgstr "Generare un nuovo indirizzo per questo notiziario?"
 
-#: js/functions.js:1392
-#: js/prefs.js:1218
+#: js/functions.js:1392 js/prefs.js:1218
 msgid "Trying to change address..."
 msgstr "Provo a cambiare indirizzo..."
 
-#: js/functions.js:1693
-#: js/functions.js:1803
-#: js/prefs.js:414
-#: js/prefs.js:444
-#: js/prefs.js:476
-#: js/prefs.js:629
-#: js/prefs.js:649
-#: js/prefs.js:1194
+#: js/functions.js:1693 js/functions.js:1803 js/prefs.js:414 js/prefs.js:444
+#: js/prefs.js:476 js/prefs.js:629 js/prefs.js:649 js/prefs.js:1194
 #: js/prefs.js:1339
 msgid "No feeds are selected."
 msgstr "Nessun notiziario selezionato."
@@ -2893,13 +2632,11 @@ msgstr "Rimuovere i notiziari selezionati dall'archivio? I notiziari con articol
 msgid "Feeds with update errors"
 msgstr "Notiziari con errori di aggiornamento"
 
-#: js/functions.js:1785
-#: js/prefs.js:1176
+#: js/functions.js:1785 js/prefs.js:1176
 msgid "Remove selected feeds?"
 msgstr "Rimuovere i notiziari selezionati?"
 
-#: js/functions.js:1788
-#: js/prefs.js:1179
+#: js/functions.js:1788 js/prefs.js:1179
 msgid "Removing selected feeds..."
 msgstr "Rimuovendo i notiziari selezionati..."
 
@@ -2931,11 +2668,8 @@ msgstr "Creando utente..."
 msgid "User Editor"
 msgstr "Editor utente"
 
-#: js/prefs.js:99
-#: js/prefs.js:211
-#: js/prefs.js:736
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
+#: js/prefs.js:99 js/prefs.js:211 js/prefs.js:736
+#: plugins/instances/instances.js:26 plugins/instances/instances.js:89
 #: js/functions.js:1600
 msgid "Saving data..."
 msgstr "Salvando dati..."
@@ -2960,8 +2694,7 @@ msgstr "Rimuovere le etichette selezionate?"
 msgid "Removing selected labels..."
 msgstr "Rimuovendo le etichette selezionate..."
 
-#: js/prefs.js:312
-#: js/prefs.js:1380
+#: js/prefs.js:312 js/prefs.js:1380
 msgid "No labels are selected."
 msgstr "Nessuna etichetta selezionata."
 
@@ -2973,10 +2706,7 @@ msgstr "Rimuovere gli utenti selezionati? Non saranno rimossi l'amministratore p
 msgid "Removing selected users..."
 msgstr "Rimuovendo gli utenti selezionati..."
 
-#: js/prefs.js:343
-#: js/prefs.js:487
-#: js/prefs.js:508
-#: js/prefs.js:547
+#: js/prefs.js:343 js/prefs.js:487 js/prefs.js:508 js/prefs.js:547
 msgid "No users are selected."
 msgstr "Nessun utente selezionato."
 
@@ -2988,9 +2718,7 @@ msgstr "Rimuovere i filtri selezionati?"
 msgid "Removing selected filters..."
 msgstr "Rimuovendo i filtri selezionati..."
 
-#: js/prefs.js:376
-#: js/prefs.js:584
-#: js/prefs.js:603
+#: js/prefs.js:376 js/prefs.js:584 js/prefs.js:603
 msgid "No filters are selected."
 msgstr "Nessun filtro selezionato."
 
@@ -3022,9 +2750,7 @@ msgstr "Per quanti giorni vuoi conservare gli articoli? (0 - usa il valore prede
 msgid "Purging selected feed..."
 msgstr "Pulendo i notiziari selezionati..."
 
-#: js/prefs.js:492
-#: js/prefs.js:513
-#: js/prefs.js:552
+#: js/prefs.js:492 js/prefs.js:513 js/prefs.js:552
 msgid "Please select only one user."
 msgstr "Selezionare un solo utente."
 
@@ -3068,8 +2794,7 @@ msgstr "Importazione OPML"
 msgid "Please choose an OPML file first."
 msgstr "Scegliere prima un file OPML."
 
-#: js/prefs.js:802
-#: plugins/googlereaderimport/init.js:45
+#: js/prefs.js:802 plugins/googlereaderimport/init.js:45
 #: plugins/import_export/import_export.js:115
 msgid "Importing, please wait..."
 msgstr "Importando, attendere prego..."
@@ -3102,9 +2827,7 @@ msgstr "Segnando tutti i notiziari come letti..."
 msgid "Please enable mail plugin first."
 msgstr "Per favore, prima attiva il plugin email."
 
-#: js/tt-rss.js:434
-#: js/functions.js:1579
-#: js/tt-rss.js:666
+#: js/tt-rss.js:434 js/functions.js:1579 js/tt-rss.js:666
 msgid "You can't edit this kind of feed."
 msgstr "Impossibile modificare questo tipo di notiziario."
 
@@ -3112,8 +2835,7 @@ msgstr "Impossibile modificare questo tipo di notiziario."
 msgid "Please enable embed_original plugin first."
 msgstr "Per favore, prima attiva il plugin embed_original."
 
-#: js/tt-rss.js:518
-#: js/tt-rss.js:716
+#: js/tt-rss.js:518 js/tt-rss.js:716
 msgid "Widescreen is not available in combined mode."
 msgstr "Widescreen non disponibile nella modalità combinata."
 
@@ -3121,8 +2843,7 @@ msgstr "Widescreen non disponibile nella modalità combinata."
 msgid "You can't rescore this kind of feed."
 msgstr "Impossibile cambiare il punteggio a questo tipo di notiziari."
 
-#: js/tt-rss.js:835
-#: js/tt-rss.js:679
+#: js/tt-rss.js:835 js/tt-rss.js:679
 msgid "Please select some feed first."
 msgstr "Selezionare prima qualche notiziario."
 
@@ -3135,16 +2856,9 @@ msgstr "Cambiare il punteggio degli articoli in %s ?"
 msgid "Rescoring articles..."
 msgstr "Cambiando punteggio degli articoli..."
 
-#: js/viewfeed.js:1018
-#: js/viewfeed.js:1061
-#: js/viewfeed.js:1114
-#: js/viewfeed.js:2269
-#: plugins/mailto/init.js:7
-#: plugins/mail/mail.js:7
-#: js/viewfeed.js:742
-#: js/viewfeed.js:770
-#: js/viewfeed.js:797
-#: js/viewfeed.js:862
+#: js/viewfeed.js:1018 js/viewfeed.js:1061 js/viewfeed.js:1114
+#: js/viewfeed.js:2269 plugins/mailto/init.js:7 plugins/mail/mail.js:7
+#: js/viewfeed.js:742 js/viewfeed.js:770 js/viewfeed.js:797 js/viewfeed.js:862
 #: js/viewfeed.js:896
 msgid "No articles are selected."
 msgstr "Nessun articolo selezionato."
@@ -3252,8 +2966,7 @@ msgstr "Importa da Google Reader"
 msgid "Please choose a file first."
 msgstr "Scegliere prima un file."
 
-#: plugins/mailto/init.js:21
-#: plugins/mail/mail.js:21
+#: plugins/mailto/init.js:21 plugins/mail/mail.js:21
 msgid "Forward article by email"
 msgstr "Inoltra l'articolo per email"
 
@@ -3304,8 +3017,7 @@ msgstr "Rimuovere le istanze selezionate?"
 msgid "Removing selected instances..."
 msgstr "Rimuovendo le istanze selezionate..."
 
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
+#: plugins/instances/instances.js:139 plugins/instances/instances.js:151
 msgid "No instances are selected."
 msgstr "Nessuna istanza selezionata."
 
@@ -3345,8 +3057,7 @@ msgstr "Provando a togliere la condivisione..."
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "Questo renderà non più accessibili tutti gli URL degli articoli precedentemente condivisi. Procedere?"
 
-#: plugins/share/share_prefs.js:6
-#: js/prefs.js:1518
+#: plugins/share/share_prefs.js:6 js/prefs.js:1518
 msgid "Clearing URLs..."
 msgstr "Cancellando gli URL..."
 
@@ -3354,8 +3065,7 @@ msgstr "Cancellando gli URL..."
 msgid "Shared URLs cleared."
 msgstr "ULR condivisi cancellati."
 
-#: js/feedlist.js:413
-#: js/feedlist.js:441
+#: js/feedlist.js:413 js/feedlist.js:441
 msgid "Mark all articles in %s as read?"
 msgstr "Segnare tutti gli articoli in %s come letti?"
 
@@ -3539,13 +3249,11 @@ msgstr "Rimuovendo i profili selezionati..."
 msgid "No profiles are selected."
 msgstr "Nessun profilo selezionato."
 
-#: js/prefs.js:1438
-#: js/prefs.js:1491
+#: js/prefs.js:1438 js/prefs.js:1491
 msgid "Activate selected profile?"
 msgstr "Attivare il profilo selezionato?"
 
-#: js/prefs.js:1454
-#: js/prefs.js:1507
+#: js/prefs.js:1454 js/prefs.js:1507
 msgid "Please choose a profile to activate."
 msgstr "Scegliere un profilo da attivare."
 
@@ -3569,9 +3277,7 @@ msgstr "Editor etichette"
 msgid "You can't unsubscribe from the category."
 msgstr "Impossibile annullare la sottoscrizione alla categoria."
 
-#: js/viewfeed.js:111
-#: js/viewfeed.js:162
-#: js/viewfeed.js:179
+#: js/viewfeed.js:111 js/viewfeed.js:162 js/viewfeed.js:179
 msgid "Click to open next unread feed."
 msgstr "Clicca per passare al prossimo notiziario da leggere."