rebase translations

2 files changed, 275 insertions, 255 deletions

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 4d50abe90..14c3cda92 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.mo
+++ b/locale/fr_FR/LC_MESSAGES/messages.mo
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 1854e6c8a..0027800cf 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-09 22:28+0400\n"
+"POT-Creation-Date: 2013-04-11 22:01+0400\n"
 "PO-Revision-Date: 2013-04-03 08:43+0100\n"
 "Last-Translator: Raphael Rochet <[email protected]>\n"
 "Language-Team: French\n"
@@ -22,88 +22,88 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: backend.php:69
+#: backend.php:74
 msgid "Use default"
 msgstr "Utiliser la valeur par défaut"
 
-#: backend.php:70
+#: backend.php:75
 msgid "Never purge"
 msgstr "Ne jamais purger"
 
-#: backend.php:71
+#: backend.php:76
 msgid "1 week old"
 msgstr "Au bout d'une semaine"
 
-#: backend.php:72
+#: backend.php:77
 msgid "2 weeks old"
 msgstr "Au bout de 2 semaines"
 
-#: backend.php:73
+#: backend.php:78
 msgid "1 month old"
 msgstr "Au bout d'un mois"
 
-#: backend.php:74
+#: backend.php:79
 msgid "2 months old"
 msgstr "Au bout de 2 mois"
 
-#: backend.php:75
+#: backend.php:80
 msgid "3 months old"
 msgstr "Au bout de 3 mois"
 
-#: backend.php:78
+#: backend.php:83
 msgid "Default interval"
 msgstr "Fréquence de mise à jour par défaut"
 
-#: backend.php:79
-#: backend.php:89
+#: backend.php:84
+#: backend.php:94
 msgid "Disable updates"
 msgstr "Désactiver les mises à jour"
 
-#: backend.php:80
-#: backend.php:90
+#: backend.php:85
+#: backend.php:95
 msgid "Each 15 minutes"
 msgstr "Toutes les 15 minutes"
 
-#: backend.php:81
-#: backend.php:91
+#: backend.php:86
+#: backend.php:96
 msgid "Each 30 minutes"
 msgstr "Toutes les 30 minutes"
 
-#: backend.php:82
-#: backend.php:92
+#: backend.php:87
+#: backend.php:97
 msgid "Hourly"
 msgstr "Toutes les heures"
 
-#: backend.php:83
-#: backend.php:93
+#: backend.php:88
+#: backend.php:98
 msgid "Each 4 hours"
 msgstr "Toutes les 4 heures"
 
-#: backend.php:84
-#: backend.php:94
+#: backend.php:89
+#: backend.php:99
 msgid "Each 12 hours"
 msgstr "Toutes les 12 heures"
 
-#: backend.php:85
-#: backend.php:95
+#: backend.php:90
+#: backend.php:100
 msgid "Daily"
 msgstr "Une fois par jour"
 
-#: backend.php:86
-#: backend.php:96
+#: backend.php:91
+#: backend.php:101
 msgid "Weekly"
 msgstr "Une fois par semaine"
 
-#: backend.php:99
+#: backend.php:104
 #: classes/pref/users.php:123
 msgid "User"
 msgstr "Utilisateur"
 
-#: backend.php:100
+#: backend.php:105
 msgid "Power User"
 msgstr "Utilisateur avancé"
 
-#: backend.php:101
+#: backend.php:106
 msgid "Administrator"
 msgstr "Administrateur"
 
@@ -162,7 +162,7 @@ msgstr "Le test d'échappement SQL a échoué, veuillez vérifier votre configur
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:680
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1348
 #: plugins/digest/digest_body.php:63
 #: js/feedlist.js:128
 #: js/feedlist.js:438
@@ -210,13 +210,13 @@ msgid "All Articles"
 msgstr "Tous les articles"
 
 #: index.php:174
-#: include/functions.php:1961
+#: include/functions.php:1972
 #: classes/feeds.php:106
 msgid "Starred"
 msgstr "Remarquables"
 
 #: index.php:175
-#: include/functions.php:1962
+#: include/functions.php:1973
 #: classes/feeds.php:107
 msgid "Published"
 msgstr "Publiés"
@@ -261,7 +261,7 @@ msgstr "Titre"
 
 #: index.php:192
 #: index.php:241
-#: include/functions.php:1951
+#: include/functions.php:1962
 #: classes/feeds.php:111
 #: classes/feeds.php:440
 #: js/FeedTree.js:128
@@ -320,8 +320,8 @@ msgid "Rescore feed"
 msgstr "Recalculer le score du flux"
 
 #: index.php:239
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:1283
+#: classes/pref/feeds.php:734
+#: classes/pref/feeds.php:1300
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "Se désabonner"
@@ -347,7 +347,7 @@ msgid "Show tag cloud..."
 msgstr "Afficher le nuage de tags..."
 
 #: index.php:248
-#: include/functions.php:1937
+#: include/functions.php:1948
 msgid "Toggle widescreen mode"
 msgstr "Basculer le mode écran large"
 
@@ -376,7 +376,7 @@ msgstr "Déconnexion"
 
 #: prefs.php:36
 #: prefs.php:121
-#: include/functions.php:1964
+#: include/functions.php:1975
 #: classes/pref/prefs.php:446
 msgid "Preferences"
 msgstr "Configuration"
@@ -391,8 +391,8 @@ msgstr "Quitter la configuration"
 
 #: prefs.php:124
 #: classes/pref/feeds.php:107
-#: classes/pref/feeds.php:1209
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1226
+#: classes/pref/feeds.php:1289
 msgid "Feeds"
 msgstr "Flux"
 
@@ -402,8 +402,8 @@ msgid "Filters"
 msgstr "Filtres"
 
 #: prefs.php:130
-#: include/functions.php:1150
-#: include/functions.php:1787
+#: include/functions.php:1161
+#: include/functions.php:1798
 #: classes/pref/labels.php:90
 #: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
@@ -491,10 +491,10 @@ 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:1159
-#: include/functions.php:1688
-#: include/functions.php:1773
-#: include/functions.php:1795
+#: include/functions.php:1170
+#: include/functions.php:1699
+#: include/functions.php:1784
+#: include/functions.php:1806
 #: classes/opml.php:416
 #: classes/pref/feeds.php:222
 msgid "Uncategorized"
@@ -511,315 +511,315 @@ msgstr[1] "%d articles archivés"
 msgid "No feeds found."
 msgstr "Aucun flux trouvé."
 
-#: include/functions.php:1148
-#: include/functions.php:1785
+#: include/functions.php:1159
+#: include/functions.php:1796
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr "Spécial"
 
-#: include/functions.php:1637
+#: include/functions.php:1648
 #: classes/feeds.php:1110
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: include/functions.php:1838
+#: include/functions.php:1849
 msgid "Starred articles"
 msgstr "Articles remarquables"
 
-#: include/functions.php:1840
+#: include/functions.php:1851
 msgid "Published articles"
 msgstr "Articles publiés"
 
-#: include/functions.php:1842
+#: include/functions.php:1853
 msgid "Fresh articles"
 msgstr "Nouveaux articles"
 
-#: include/functions.php:1844
-#: include/functions.php:1959
+#: include/functions.php:1855
+#: include/functions.php:1970
 msgid "All articles"
 msgstr "Tous les articles"
 
-#: include/functions.php:1846
+#: include/functions.php:1857
 msgid "Archived articles"
 msgstr "Articles archivés"
 
-#: include/functions.php:1848
+#: include/functions.php:1859
 msgid "Recently read"
 msgstr "Lus récemment"
 
-#: include/functions.php:1911
+#: include/functions.php:1922
 msgid "Navigation"
 msgstr "Navigation"
 
-#: include/functions.php:1912
+#: include/functions.php:1923
 msgid "Open next feed"
 msgstr "Ouvrir le flux suivant"
 
-#: include/functions.php:1913
+#: include/functions.php:1924
 msgid "Open previous feed"
 msgstr "Ouvrir le flux précédent"
 
-#: include/functions.php:1914
+#: include/functions.php:1925
 msgid "Open next article"
 msgstr "Ouvrir l'article suivant"
 
-#: include/functions.php:1915
+#: include/functions.php:1926
 msgid "Open previous article"
 msgstr "Ouvrir l'article précédent"
 
-#: include/functions.php:1916
+#: include/functions.php:1927
 msgid "Open next article (don't scroll long articles)"
 msgstr "Ouvrir l'article suivant (ne pas faire défiler les articles longs)"
 
-#: include/functions.php:1917
+#: include/functions.php:1928
 msgid "Open previous article (don't scroll long articles)"
 msgstr "Ouvrir l'article précédent (ne pas faire défiler les articles longs)"
 
-#: include/functions.php:1918
+#: include/functions.php:1929
 #, fuzzy
 msgid "Move to next article (don't expand or mark read)"
 msgstr "Ouvrir l'article suivant (ne pas faire défiler les articles longs)"
 
-#: include/functions.php:1919
+#: include/functions.php:1930
 #, fuzzy
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "Ouvrir l'article précédent (ne pas faire défiler les articles longs)"
 
-#: include/functions.php:1920
+#: include/functions.php:1931
 msgid "Show search dialog"
 msgstr "Afficher la fenêtre de recherche"
 
-#: include/functions.php:1921
+#: include/functions.php:1932
 msgid "Article"
 msgstr "Article"
 
-#: include/functions.php:1922
+#: include/functions.php:1933
 msgid "Toggle starred"
 msgstr "Marquer comme (non) remarquable"
 
-#: include/functions.php:1923
+#: include/functions.php:1934
 #: js/viewfeed.js:1918
 msgid "Toggle published"
 msgstr "Marquer comme (non) publié"
 
-#: include/functions.php:1924
+#: include/functions.php:1935
 #: js/viewfeed.js:1896
 msgid "Toggle unread"
 msgstr "Marquer comme (non) lu"
 
-#: include/functions.php:1925
+#: include/functions.php:1936
 msgid "Edit tags"
 msgstr "Modifier les tags"
 
-#: include/functions.php:1926
+#: include/functions.php:1937
 msgid "Dismiss selected"
 msgstr "Ecarter la sélection"
 
-#: include/functions.php:1927
+#: include/functions.php:1938
 msgid "Dismiss read"
 msgstr "Ecarter les articles lus"
 
-#: include/functions.php:1928
+#: include/functions.php:1939
 msgid "Open in new window"
 msgstr "Ouvrir dans une nouvelle fenêtre"
 
-#: include/functions.php:1929
+#: include/functions.php:1940
 #: js/viewfeed.js:1937
 msgid "Mark below as read"
 msgstr "Marquer les articles en-dessous comme lus"
 
-#: include/functions.php:1930
+#: include/functions.php:1941
 #: js/viewfeed.js:1931
 msgid "Mark above as read"
 msgstr "Marquer les articles au-dessus comme lus"
 
-#: include/functions.php:1931
+#: include/functions.php:1942
 msgid "Scroll down"
 msgstr "Défiler vers le bas"
 
-#: include/functions.php:1932
+#: include/functions.php:1943
 msgid "Scroll up"
 msgstr "Défiler vers le haut"
 
-#: include/functions.php:1933
+#: include/functions.php:1944
 msgid "Select article under cursor"
 msgstr "Sélectionner l'article sous le curseur"
 
-#: include/functions.php:1934
+#: include/functions.php:1945
 msgid "Email article"
 msgstr "Envoyer l'article par mail"
 
-#: include/functions.php:1935
+#: include/functions.php:1946
 msgid "Close/collapse article"
 msgstr "Contracter l'article"
 
-#: include/functions.php:1936
+#: include/functions.php:1947
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "Basculer le développement automatique en mode combiné"
 
-#: include/functions.php:1938
+#: include/functions.php:1949
 #: plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr "Basculer l'intégration de l'article original"
 
-#: include/functions.php:1939
+#: include/functions.php:1950
 msgid "Article selection"
 msgstr "Sélection d'article"
 
-#: include/functions.php:1940
+#: include/functions.php:1951
 msgid "Select all articles"
 msgstr "Sélectionner tous les articles"
 
-#: include/functions.php:1941
+#: include/functions.php:1952
 msgid "Select unread"
 msgstr "Sélectionner les articles non-lus"
 
-#: include/functions.php:1942
+#: include/functions.php:1953
 msgid "Select starred"
 msgstr "Sélectionner les articles remarquables"
 
-#: include/functions.php:1943
+#: include/functions.php:1954
 msgid "Select published"
 msgstr "Sélectionner les articles publiés"
 
-#: include/functions.php:1944
+#: include/functions.php:1955
 msgid "Invert selection"
 msgstr "Inverser la sélection"
 
-#: include/functions.php:1945
+#: include/functions.php:1956
 msgid "Deselect everything"
 msgstr "Tout désélectionner"
 
-#: include/functions.php:1946
-#: classes/pref/feeds.php:521
-#: classes/pref/feeds.php:754
+#: include/functions.php:1957
+#: classes/pref/feeds.php:538
+#: classes/pref/feeds.php:771
 msgid "Feed"
 msgstr "Flux"
 
-#: include/functions.php:1947
+#: include/functions.php:1958
 msgid "Refresh current feed"
 msgstr "Actualiser le flux actif"
 
-#: include/functions.php:1948
+#: include/functions.php:1959
 msgid "Un/hide read feeds"
 msgstr "Masquer/afficher les flux lus"
 
-#: include/functions.php:1949
-#: classes/pref/feeds.php:1275
+#: include/functions.php:1960
+#: classes/pref/feeds.php:1292
 msgid "Subscribe to feed"
 msgstr "S'abonner au flux"
 
-#: include/functions.php:1950
+#: include/functions.php:1961
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "Modifier le flux"
 
-#: include/functions.php:1952
+#: include/functions.php:1963
 msgid "Reverse headlines"
 msgstr "Inverser l'ordre des en-têtes"
 
-#: include/functions.php:1953
+#: include/functions.php:1964
 msgid "Debug feed update"
 msgstr "Déboguer les mises à jour"
 
-#: include/functions.php:1954
+#: include/functions.php:1965
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "Marquer tous les flux comme lus"
 
-#: include/functions.php:1955
+#: include/functions.php:1966
 msgid "Un/collapse current category"
 msgstr "Étendre/contracter la catégorie"
 
-#: include/functions.php:1956
+#: include/functions.php:1967
 msgid "Toggle combined mode"
 msgstr "Basculer le mode combiné"
 
-#: include/functions.php:1957
+#: include/functions.php:1968
 msgid "Toggle auto expand in combined mode"
 msgstr "Basculer le développement automatique en mode combiné"
 
-#: include/functions.php:1958
+#: include/functions.php:1969
 msgid "Go to"
 msgstr "Aller à"
 
-#: include/functions.php:1960
+#: include/functions.php:1971
 msgid "Fresh"
 msgstr "Nouveaux"
 
-#: include/functions.php:1963
+#: include/functions.php:1974
 #: js/tt-rss.js:447
 #: js/tt-rss.js:606
 msgid "Tag cloud"
 msgstr "Nuage de tags"
 
-#: include/functions.php:1965
+#: include/functions.php:1976
 msgid "Other"
 msgstr "Autre"
 
-#: include/functions.php:1966
+#: include/functions.php:1977
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "Créer une étiquette"
 
-#: include/functions.php:1967
+#: include/functions.php:1978
 #: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr "Créer un filtre"
 
-#: include/functions.php:1968
+#: include/functions.php:1979
 msgid "Un/collapse sidebar"
 msgstr "Ouvrir/fermer la barre latérale"
 
-#: include/functions.php:1969
+#: include/functions.php:1980
 msgid "Show help dialog"
 msgstr "Afficher la fenêtre d'aide"
 
-#: include/functions.php:2492
+#: include/functions.php:2503
 #, php-format
 msgid "Search results: %s"
 msgstr "Résultats de recherche: %s"
 
-#: include/functions.php:2985
+#: include/functions.php:2996
 #: js/viewfeed.js:2024
 msgid "Click to play"
 msgstr "Cliquez pour lancer la lecture"
 
-#: include/functions.php:2986
+#: include/functions.php:2997
 #: js/viewfeed.js:2023
 msgid "Play"
 msgstr "Lecture"
 
-#: include/functions.php:3104
+#: include/functions.php:3115
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3126
-#: include/functions.php:3426
+#: include/functions.php:3137
+#: include/functions.php:3437
 #: classes/article.php:281
 msgid "no tags"
 msgstr "aucun tag"
 
-#: include/functions.php:3136
+#: include/functions.php:3147
 #: classes/feeds.php:689
 msgid "Edit tags for this article"
 msgstr "Modifier les tags pour cet article"
 
-#: include/functions.php:3170
+#: include/functions.php:3181
 #: classes/feeds.php:641
 msgid "Originally from:"
 msgstr "Origine :"
 
-#: include/functions.php:3183
+#: include/functions.php:3194
 #: classes/feeds.php:654
-#: classes/pref/feeds.php:540
+#: classes/pref/feeds.php:557
 msgid "Feed URL"
 msgstr "URL du flux"
 
-#: include/functions.php:3215
+#: include/functions.php:3226
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
@@ -832,25 +832,25 @@ msgstr "URL du flux"
 #: classes/pref/users.php:99
 #: classes/pref/filters.php:147
 #: classes/pref/prefs.php:1107
-#: classes/pref/feeds.php:1588
-#: classes/pref/feeds.php:1660
-#: plugins/import_export/init.php:406
-#: plugins/import_export/init.php:429
-#: plugins/googlereaderimport/init.php:173
+#: classes/pref/feeds.php:1605
+#: classes/pref/feeds.php:1677
+#: plugins/import_export/init.php:408
+#: plugins/import_export/init.php:453
+#: plugins/googlereaderimport/init.php:197
 #: plugins/share/init.php:67
 #: plugins/updater/init.php:370
 msgid "Close this window"
 msgstr "Fermer cette fenêtre"
 
-#: include/functions.php:3451
+#: include/functions.php:3462
 msgid "(edit note)"
 msgstr "(modifier l'annotation)"
 
-#: include/functions.php:3686
+#: include/functions.php:3697
 msgid "unknown type"
 msgstr "type inconnu"
 
-#: include/functions.php:3742
+#: include/functions.php:3753
 msgid "Attachments"
 msgstr "Fichier attaché"
 
@@ -919,8 +919,8 @@ msgstr "Tags pour cet article (séparés par des virgules) :"
 #: classes/pref/labels.php:79
 #: classes/pref/filters.php:405
 #: classes/pref/prefs.php:989
-#: classes/pref/feeds.php:733
-#: classes/pref/feeds.php:881
+#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:898
 #: plugins/nsfw/init.php:86
 #: plugins/note/init.php:53
 #: plugins/instances/init.php:248
@@ -940,9 +940,9 @@ msgstr "Enregistrer"
 #: classes/pref/filters.php:880
 #: classes/pref/filters.php:947
 #: classes/pref/prefs.php:991
-#: classes/pref/feeds.php:734
-#: classes/pref/feeds.php:884
-#: classes/pref/feeds.php:1800
+#: classes/pref/feeds.php:751
+#: classes/pref/feeds.php:901
+#: classes/pref/feeds.php:1817
 #: plugins/mail/init.php:126
 #: plugins/note/init.php:55
 #: plugins/instances/init.php:251
@@ -960,8 +960,8 @@ msgid "Title:"
 msgstr "Titre :"
 
 #: classes/handler/public.php:434
-#: classes/pref/feeds.php:538
-#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:555
+#: classes/pref/feeds.php:786
 #: plugins/instances/init.php:215
 #: plugins/instances/init.php:405
 msgid "URL:"
@@ -1158,7 +1158,7 @@ msgstr "Voir comme flux RSS"
 
 #: classes/feeds.php:84
 #: classes/feeds.php:138
-#: classes/pref/feeds.php:1440
+#: classes/pref/feeds.php:1457
 msgid "View as RSS"
 msgstr "Voir comme RSS"
 
@@ -1175,9 +1175,9 @@ msgstr "Sélectionner :"
 #: classes/pref/filters.php:737
 #: classes/pref/filters.php:764
 #: classes/pref/prefs.php:1003
-#: classes/pref/feeds.php:1266
-#: classes/pref/feeds.php:1536
-#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1283
+#: classes/pref/feeds.php:1553
+#: classes/pref/feeds.php:1623
 #: plugins/instances/init.php:290
 msgid "All"
 msgstr "Tout"
@@ -1195,9 +1195,9 @@ msgstr "Inverse"
 #: classes/pref/filters.php:739
 #: classes/pref/filters.php:766
 #: classes/pref/prefs.php:1005
-#: classes/pref/feeds.php:1268
-#: classes/pref/feeds.php:1538
-#: classes/pref/feeds.php:1608
+#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1555
+#: classes/pref/feeds.php:1625
 #: plugins/instances/init.php:292
 msgid "None"
 msgstr "Aucun"
@@ -1304,9 +1304,9 @@ msgid "Feed or site URL"
 msgstr "URL du flux"
 
 #: classes/feeds.php:989
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:782
-#: classes/pref/feeds.php:1764
+#: classes/pref/feeds.php:577
+#: classes/pref/feeds.php:799
+#: classes/pref/feeds.php:1781
 msgid "Place in category:"
 msgstr "Placer dans la catégorie :"
 
@@ -1316,24 +1316,24 @@ msgstr "Flux disponibles"
 
 #: classes/feeds.php:1009
 #: classes/pref/users.php:139
-#: classes/pref/feeds.php:590
-#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:607
+#: classes/pref/feeds.php:835
 msgid "Authentication"
 msgstr "Identification"
 
 #: classes/feeds.php:1013
 #: classes/pref/users.php:402
-#: classes/pref/feeds.php:596
-#: classes/pref/feeds.php:822
-#: classes/pref/feeds.php:1778
+#: classes/pref/feeds.php:613
+#: classes/pref/feeds.php:839
+#: classes/pref/feeds.php:1795
 msgid "Login"
 msgstr "Se connecter"
 
 #: classes/feeds.php:1016
 #: classes/pref/prefs.php:271
-#: classes/pref/feeds.php:602
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1781
+#: classes/pref/feeds.php:619
+#: classes/pref/feeds.php:845
+#: classes/pref/feeds.php:1798
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -1343,7 +1343,7 @@ msgstr "Ce flux nécessite une identification."
 
 #: classes/feeds.php:1031
 #: classes/feeds.php:1087
-#: classes/pref/feeds.php:1799
+#: classes/pref/feeds.php:1816
 msgid "Subscribe"
 msgstr "S'abonner"
 
@@ -1355,7 +1355,7 @@ msgstr "D'autres flux"
 #: classes/feeds.php:1148
 #: classes/pref/users.php:332
 #: classes/pref/filters.php:641
-#: classes/pref/feeds.php:1259
+#: classes/pref/feeds.php:1276
 #: js/tt-rss.js:170
 msgid "Search"
 msgstr "Rechercher"
@@ -1377,7 +1377,7 @@ msgstr "limite :"
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:398
 #: classes/pref/filters.php:667
-#: classes/pref/feeds.php:707
+#: classes/pref/feeds.php:724
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr "Supprimer"
@@ -1461,12 +1461,33 @@ msgstr "Créer un filtre..."
 msgid "Processing category: %s"
 msgstr "Placer dans la catégorie : %s"
 
-#: classes/opml.php:468
+#: classes/opml.php:465
+#: plugins/import_export/init.php:421
+#: plugins/googlereaderimport/init.php:70
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr ""
+
+#: classes/opml.php:479
+#: plugins/import_export/init.php:435
+#: plugins/googlereaderimport/init.php:84
+#, fuzzy
+msgid "Unable to move uploaded file."
+msgstr "Erreur : impossible de charger l'article."
+
+#: classes/opml.php:483
+#: plugins/import_export/init.php:439
+#: plugins/googlereaderimport/init.php:88
 msgid "Error: please upload OPML file."
 msgstr "Erreur : veuillez envoyer un document OPML."
 
-#: classes/opml.php:475
-#: plugins/googlereaderimport/init.php:166
+#: classes/opml.php:492
+#, fuzzy
+msgid "Error: unable to find moved OPML file."
+msgstr "Erreur : impossible de charger l'article."
+
+#: classes/opml.php:499
+#: plugins/googlereaderimport/init.php:190
 msgid "Error while parsing document."
 msgstr "Erreur lors de l'analyse du document."
 
@@ -1505,8 +1526,8 @@ msgid "Change password to"
 msgstr "Nouveau mot de passe"
 
 #: classes/pref/users.php:161
-#: classes/pref/feeds.php:610
-#: classes/pref/feeds.php:834
+#: classes/pref/feeds.php:627
+#: classes/pref/feeds.php:851
 msgid "Options"
 msgstr "Options"
 
@@ -1551,9 +1572,9 @@ msgstr "[tt-rss] Notification de changement de mot passe"
 #: classes/pref/filters.php:734
 #: classes/pref/filters.php:761
 #: classes/pref/prefs.php:1000
-#: classes/pref/feeds.php:1263
-#: classes/pref/feeds.php:1533
-#: classes/pref/feeds.php:1603
+#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1550
+#: classes/pref/feeds.php:1620
 #: plugins/instances/init.php:287
 msgid "Select"
 msgstr "Sélectionner"
@@ -1684,13 +1705,13 @@ msgid "Combine"
 msgstr "Combiner"
 
 #: classes/pref/filters.php:663
-#: classes/pref/feeds.php:1279
-#: classes/pref/feeds.php:1293
+#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1310
 msgid "Reset sort order"
 msgstr "Réinitialiser le critère de tri"
 
 #: classes/pref/filters.php:671
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1335
 msgid "Rescore articles"
 msgstr "Recalculer le score des articles"
 
@@ -2188,235 +2209,235 @@ msgstr "Activer le profil"
 msgid "Check to enable field"
 msgstr "Cocher pour activer le champ"
 
-#: classes/pref/feeds.php:527
+#: classes/pref/feeds.php:544
 msgid "Feed Title"
 msgstr "Titre du flux"
 
-#: classes/pref/feeds.php:568
-#: classes/pref/feeds.php:793
+#: classes/pref/feeds.php:585
+#: classes/pref/feeds.php:810
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: classes/pref/feeds.php:583
-#: classes/pref/feeds.php:809
+#: classes/pref/feeds.php:600
+#: classes/pref/feeds.php:826
 msgid "Article purging:"
 msgstr "Purge des articles :"
 
-#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:623
 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:622
-#: classes/pref/feeds.php:838
+#: classes/pref/feeds.php:639
+#: classes/pref/feeds.php:855
 msgid "Hide from Popular feeds"
 msgstr "Masquer dans la liste des flux populaires"
 
-#: classes/pref/feeds.php:634
-#: classes/pref/feeds.php:844
+#: classes/pref/feeds.php:651
+#: classes/pref/feeds.php:861
 msgid "Include in e-mail digest"
 msgstr "Inclure dans la synthèse quotidienne par courrier électronique"
 
-#: classes/pref/feeds.php:647
-#: classes/pref/feeds.php:850
+#: classes/pref/feeds.php:664
+#: classes/pref/feeds.php:867
 msgid "Always display image attachments"
 msgstr "Toujours afficher les images jointes"
 
-#: classes/pref/feeds.php:660
-#: classes/pref/feeds.php:858
+#: classes/pref/feeds.php:677
+#: classes/pref/feeds.php:875
 msgid "Do not embed images"
 msgstr "Ne pas intégrer les images"
 
-#: classes/pref/feeds.php:673
-#: classes/pref/feeds.php:866
+#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:883
 msgid "Cache images locally"
 msgstr "Enregistrer localement les images"
 
-#: classes/pref/feeds.php:685
-#: classes/pref/feeds.php:872
+#: classes/pref/feeds.php:702
+#: classes/pref/feeds.php:889
 msgid "Mark updated articles as unread"
 msgstr "Marquer les article mis à jour comme non lus"
 
-#: classes/pref/feeds.php:691
+#: classes/pref/feeds.php:708
 msgid "Icon"
 msgstr "Icône"
 
-#: classes/pref/feeds.php:705
+#: classes/pref/feeds.php:722
 msgid "Replace"
 msgstr "Remplacer"
 
-#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:741
 msgid "Resubscribe to push updates"
 msgstr "Réinscription aux mises à jour en push"
 
-#: classes/pref/feeds.php:731
+#: classes/pref/feeds.php:748
 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:1112
-#: classes/pref/feeds.php:1165
+#: classes/pref/feeds.php:1129
+#: classes/pref/feeds.php:1182
 msgid "All done."
 msgstr "Tout est terminé."
 
-#: classes/pref/feeds.php:1220
+#: classes/pref/feeds.php:1237
 msgid "Feeds with errors"
 msgstr "Flux avec des erreurs"
 
-#: classes/pref/feeds.php:1240
+#: classes/pref/feeds.php:1257
 msgid "Inactive feeds"
 msgstr "Flux inactifs"
 
-#: classes/pref/feeds.php:1277
+#: classes/pref/feeds.php:1294
 msgid "Edit selected feeds"
 msgstr "Modifier les flux sélectionnés"
 
-#: classes/pref/feeds.php:1281
+#: classes/pref/feeds.php:1298
 #: js/prefs.js:1765
 msgid "Batch subscribe"
 msgstr "Abonnement par lots"
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1305
 msgid "Categories"
 msgstr "Catégories"
 
-#: classes/pref/feeds.php:1291
+#: classes/pref/feeds.php:1308
 msgid "Add category"
 msgstr "Ajouter une catégorie"
 
-#: classes/pref/feeds.php:1295
+#: classes/pref/feeds.php:1312
 msgid "Remove selected"
 msgstr "Supprimer les flux sélectionnés"
 
-#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1321
 msgid "(Un)hide empty categories"
 msgstr "Masquer/afficher les catégories vides"
 
-#: classes/pref/feeds.php:1309
+#: classes/pref/feeds.php:1326
 msgid "More actions..."
 msgstr "Autres actions..."
 
-#: classes/pref/feeds.php:1313
+#: classes/pref/feeds.php:1330
 msgid "Manual purge"
 msgstr "Purger manuellement"
 
-#: classes/pref/feeds.php:1317
+#: classes/pref/feeds.php:1334
 msgid "Clear feed data"
 msgstr "Purger les données de flux"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1385
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1387
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "Avec OPML, vous pouvez exporter et importer vos flux, filtrer, étiquettes et réglages de Tiny Tiny RSS."
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1389
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "Seul le profil de réglages principal peut être migré en utilisant OPML."
 
-#: classes/pref/feeds.php:1385
+#: classes/pref/feeds.php:1402
 msgid "Import my OPML"
 msgstr "Importer mon OPML"
 
-#: classes/pref/feeds.php:1389
+#: classes/pref/feeds.php:1406
 msgid "Filename:"
 msgstr "Nom du fichier :"
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1408
 msgid "Include settings"
 msgstr "Inclure les paramètres"
 
-#: classes/pref/feeds.php:1395
+#: classes/pref/feeds.php:1412
 msgid "Export OPML"
 msgstr "Exporter en OPML"
 
-#: classes/pref/feeds.php:1399
+#: classes/pref/feeds.php:1416
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "Votre fichier OPML peut être publié et toute personne qui connaît l'adresse indiquée ci-dessous peut s'y abonner."
 
-#: classes/pref/feeds.php:1401
+#: classes/pref/feeds.php:1418
 msgid "Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds."
 msgstr "Les OPML publiés n'incluent pas vos réglages de Tiny Tiny RSS, les flux qui nécessitent une authentification, ou les flux cachés des Flux Populaires."
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1420
 msgid "Public OPML URL"
 msgstr "URL OPML publique"
 
-#: classes/pref/feeds.php:1404
+#: classes/pref/feeds.php:1421
 msgid "Display published OPML URL"
 msgstr "Afficher l'URL de l'OPML public"
 
-#: classes/pref/feeds.php:1414
+#: classes/pref/feeds.php:1431
 msgid "Firefox integration"
 msgstr "Intégration à Firefox"
 
-#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1433
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "Ce site Tiny Tiny RSS peut être utilisé comme lecteur de flux dans Firefox en cliquant sur le lien ci-dessous."
 
-#: classes/pref/feeds.php:1423
+#: classes/pref/feeds.php:1440
 msgid "Click here to register this site as a feed reader."
 msgstr "Cliquer ici pour enregistrer ce site comme lecteur de flux."
 
-#: classes/pref/feeds.php:1431
+#: classes/pref/feeds.php:1448
 msgid "Published & shared articles / Generated feeds"
 msgstr "Articles publiés et partagés / Flux générés"
 
-#: classes/pref/feeds.php:1433
+#: classes/pref/feeds.php:1450
 msgid "Published articles and generated feeds"
 msgstr "Articles publiés et flux générés"
 
-#: classes/pref/feeds.php:1435
+#: classes/pref/feeds.php:1452
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "Les articles publiés sont exportés comme un flux RSS public et toute personne qui connaît l'adresse indiquée ci-dessous peut s'y abonner."
 
-#: classes/pref/feeds.php:1441
+#: classes/pref/feeds.php:1458
 msgid "Display URL"
 msgstr "Afficher l'URL"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1461
 msgid "Clear all generated URLs"
 msgstr "Supprimer toutes les URL générées"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1463
 msgid "Articles shared by URL"
 msgstr "Articles publiés par URL"
 
-#: classes/pref/feeds.php:1448
+#: classes/pref/feeds.php:1465
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "Vous pouvez désactiver tous les articles partagés par URL unique ici."
 
-#: classes/pref/feeds.php:1451
+#: classes/pref/feeds.php:1468
 msgid "Unshare all articles"
 msgstr "Désactiver le partage pour tous les articles"
 
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1546
 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:1566
-#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1583
+#: classes/pref/feeds.php:1653
 msgid "Click to edit feed"
 msgstr "Cliquez pour modifier le flux"
 
-#: classes/pref/feeds.php:1584
-#: classes/pref/feeds.php:1656
+#: classes/pref/feeds.php:1601
+#: classes/pref/feeds.php:1673
 msgid "Unsubscribe from selected feeds"
 msgstr "Se désabonner des flux sélectionnés"
 
-#: classes/pref/feeds.php:1595
+#: classes/pref/feeds.php:1612
 msgid "These feeds have not been updated because of errors:"
 msgstr "Ces flux n'ont pas été mis à jour à cause d'erreurs :"
 
-#: classes/pref/feeds.php:1761
+#: classes/pref/feeds.php:1778
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "Ajoutez un flux RSS valide par ligne (aucune détection de flux n'est réalisée)"
 
-#: classes/pref/feeds.php:1770
+#: classes/pref/feeds.php:1787
 msgid "Feeds to subscribe, One per line"
 msgstr "Flux auxquels s'abonner, un par ligne"
 
-#: classes/pref/feeds.php:1792
+#: classes/pref/feeds.php:1809
 msgid "Feeds require authentication."
 msgstr "Les flux requièrent une identification."
 
@@ -2590,51 +2611,51 @@ msgstr "Exporter mes données"
 msgid "Import"
 msgstr "Importer"
 
-#: plugins/import_export/init.php:218
+#: plugins/import_export/init.php:220
 msgid "Could not import: incorrect schema version."
 msgstr "Import impossible : version du schéma incorrecte."
 
-#: plugins/import_export/init.php:223
+#: plugins/import_export/init.php:225
 msgid "Could not import: unrecognized document format."
 msgstr "Import impossible : format de document non reconnu."
 
-#: plugins/import_export/init.php:382
+#: plugins/import_export/init.php:384
 msgid "Finished: "
 msgstr "Fini : "
 
-#: plugins/import_export/init.php:383
+#: plugins/import_export/init.php:385
 #, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "%d article traité, "
 msgstr[1] "%d articles traités, "
 
-#: plugins/import_export/init.php:384
+#: plugins/import_export/init.php:386
 #, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "%d importé, "
 msgstr[1] "%d importés, "
 
-#: plugins/import_export/init.php:385
+#: plugins/import_export/init.php:387
 #, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "%d flux créé."
 msgstr[1] "%d flux créés."
 
-#: plugins/import_export/init.php:390
+#: plugins/import_export/init.php:392
 msgid "Could not load XML document."
 msgstr "Impossible de charger le document XML."
 
-#: plugins/import_export/init.php:402
+#: plugins/import_export/init.php:404
 msgid "Prepare data"
 msgstr "Préparer les données"
 
-#: plugins/import_export/init.php:423
-#, php-format
-msgid "Could not upload file. You might need to adjust upload_max_filesize in PHP.ini (current value = %s)"
-msgstr "Envoi du fichier impossible. Vous devriez peut-être modifier la valeur de upload_max_filesize dans PHP.ini (valeur courante : %s)"
+#: plugins/import_export/init.php:447
+#: plugins/googlereaderimport/init.php:96
+msgid "No file uploaded."
+msgstr "Aucun fichier envoyé."
 
 #: plugins/mail/init.php:87
 msgid "From:"
@@ -2669,28 +2690,24 @@ msgstr "Valeur d'exemple"
 msgid "Set value"
 msgstr "Appliquer la valeur"
 
-#: plugins/googlereaderimport/init.php:72
-msgid "No file uploaded."
-msgstr "Aucun fichier envoyé."
-
-#: plugins/googlereaderimport/init.php:158
+#: plugins/googlereaderimport/init.php:182
 #, php-format
 msgid "All done. %d out of %d articles imported."
 msgstr "Terminé. %d articles sur %d importés."
 
-#: plugins/googlereaderimport/init.php:162
+#: plugins/googlereaderimport/init.php:186
 msgid "The document has incorrect format."
 msgstr "Le format du document n'est pas correct."
 
-#: plugins/googlereaderimport/init.php:333
+#: plugins/googlereaderimport/init.php:357
 msgid "Import starred or shared items from Google Reader"
 msgstr "Importer les articles marqués ou partagés de Google Reader"
 
-#: plugins/googlereaderimport/init.php:337
+#: plugins/googlereaderimport/init.php:361
 msgid "Paste your starred.json or shared.json into the form below."
 msgstr "Collez votre fichier starred.json ou shared.json dans le formulaire ci-dessous."
 
-#: plugins/googlereaderimport/init.php:351
+#: plugins/googlereaderimport/init.php:375
 msgid "Import my Starred items"
 msgstr "Importer mes éléments partagés"
 
@@ -3565,6 +3582,9 @@ msgstr "Partager l'article par URL"
 msgid "Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr "La mise à jour en direct est expérimentale. Veuillez sauvegarder votre dossier tt-rss avant de continuer. Tapez « yes » pour continuer."
 
+#~ msgid "Could not upload file. You might need to adjust upload_max_filesize in PHP.ini (current value = %s)"
+#~ msgstr "Envoi du fichier impossible. Vous devriez peut-être modifier la valeur de upload_max_filesize dans PHP.ini (valeur courante : %s)"
+
 #~ msgid "Default interval between feed updates"
 #~ msgstr "Intervalle par défaut entre les mises à jour de flux"