Merge branch 'master' into fileChooserRefactor

* master:
  French localization: Menu (JabRef#1657)
  Fixed one more NPE which should have been fixed in JabRef#1631 (JabRef#1649)

src/main/java/net/sf/jabref/gui/journals/ManageJournalsPanel.java

@@ -425,7 +425,8 @@ public void actionPerformed(ActionEvent e) {
             }
             File toFile;
             try {
-                String toName = FileDialogs.getNewFile(frame, new File(System.getProperty("user.home")), null,
+                String toName = FileDialogs.getNewFile(frame, new File(System.getProperty("user.home")),
+                        Collections.emptyList(),
                         JFileChooser.SAVE_DIALOG, false);
                 if (toName == null) {
                     return;

src/main/resources/l10n/Menu_fr.properties

@@ -1,8 +1,8 @@
 #!
 #! created/edited by Popeye version 0.54 (popeye.sourceforge.net)
 #! encoding:ISO-8859-1
-Abbreviate_journal_names_(ISO)=Abr\u00e9ger_les_noms_de_journAUX_(IS&O)
-Abbreviate_journal_names_(MEDLINE)=Abr\u00e9ger_les_noms_de_journAUX_(MEDLI&NE)
+Abbreviate_journal_names_(ISO)=Abr\u00e9ger_les_noms_de_journaux_(IS&O)
+Abbreviate_journal_names_(MEDLINE)=Abr\u00e9ger_les_noms_de_journaux_(MEDLI&NE)
 About_JabRef=A_&propos_de_JabRef
 Append_database=&Joindre_\u00e0_la_base
 Autogenerate_BibTeX_keys=Cr\u00e9ation_&automatique_des_cl\u00e9s_BibTeX
@@ -29,7 +29,7 @@ Online_help=Aide_en_ligne
 Manage_content_selectors=&G\u00e9rer_les_s\u00e9lecteurs_de_contenu
 Manage_custom_exports=&G\u00e9rer_les_exportations_personnalis\u00e9es
 Manage_custom_imports=G\u00e9rer_les_&importations_personnalis\u00e9es
-Manage_journal_abbreviations=G\u00e9rer_les_abr\u00e9viations_de_&journAUX
+Manage_journal_abbreviations=G\u00e9rer_les_abr\u00e9viations_de_&journaux
 Mark_entries=Etiqueter_des_&entr\u00e9es
 New_entry=N&ouvelle_entr\u00e9e
 New_entry_by_type...=&Nouvelle_entr\u00e9e...
@@ -52,14 +52,14 @@ Save_database_as...=Enregistrer_la_base_sous_...
 Save_selected_as...=Enregistrer_la_s\u00e9&lection_sous_...
 Search=&Recherche
 Select_all=&Tout_s\u00e9lectionner
-Set_up_general_fields=Configurer_les_champs_&g\u00e9n\u00e9rAUX
+Set_up_general_fields=Configurer_les_champs_&g\u00e9n\u00e9raux
 Show_error_console=Afficher_la_console_d'erreur
 Sort_tabs=Trier_les_onglets
 Switch_preview_layout=Aper\u00e7u_1/Aper\u00e7u_2
 Toggle_entry_preview=&Afficher/masquer_l'aper\u00e7u
 Toggle_groups_interface=Afficher/masquer_l'interface_des_&groupes
 Tools=&Outils
-Unabbreviate_journal_names=D\u00e9&velopper_les_noms_de_journAUX
+Unabbreviate_journal_names=D\u00e9&velopper_les_noms_de_journaux
 Undo=&Annuler
 Unmark_all=To&ut_d\u00e9s\u00e9tiqueter
 Unmark_entries=&D\u00e9s\u00e9tiqueter_des_entr\u00e9es
@@ -123,4 +123,4 @@ New_%0_database=Nouvelle_base_%0
 
 Disable_highlight_groups_matching_entries=Désactiver_le_surlignement_des_groupes_correspondant_à_des_entrées
 
-Online_help_forum=
+Online_help_forum=Forum_d'aide_en_ligne