diff --git a/pamac/main.py b/pamac/main.py
index 1762bf9..cedb322 100644
--- a/pamac/main.py
+++ b/pamac/main.py
@@ -70,11 +70,10 @@ def get_groups():
 	groups_list_clearing = True
 	groups_list.clear()
 	groups_list_clearing = False
-	tmp_list = []
+	tmp_list = set()
 	for repo in transaction.handle.get_syncdbs():
 		for name, pkgs in repo.grpcache:
-			if not name in tmp_list:
-				tmp_list.append(name)
+			tmp_list.add(name)
 	tmp_list = sorted(tmp_list)
 	for name in tmp_list:
 		groups_list.append([name])
@@ -117,8 +116,7 @@ def set_list_dict_group(group):
 			name, pkg_list = grp
 			for pkg in pkg_list:
 				pkg_name_list.add(pkg.name)
-	db = transaction.handle.get_localdb()
-	grp = db.read_grp(group)
+	grp = transaction.handle.get_localdb().read_grp(group)
 	if grp is not None:
 		name, pkg_list = grp
 		for pkg in pkg_list:
@@ -800,7 +798,7 @@ def check_conflicts():
 										transaction.to_remove.add(pkg.name)
 										if warning:
 											warning += '\n'
-										warning += _('{pkgname1} conflicts with {pkgname2}').format(pkgname1= found_conflict.name, pkgname2 = pkg.name)
+										warning += _('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = found_conflict.name, pkgname2 = pkg.name)
 										print(_('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = found_conflict.name, pkgname2 = pkg.name))
 						else:
 							#~ # check if the conflict can be safely removed
@@ -821,7 +819,7 @@ def check_conflicts():
 								transaction.to_remove.add(pkg.name)
 								if warning:
 									warning += '\n'
-								warning += _('{pkgname1} conflicts with {pkgname2}').format(pkgname1= found_conflict.name, pkgname2 = pkg.name)
+								warning += _('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = found_conflict.name, pkgname2 = pkg.name)
 								print(_('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = found_conflict.name, pkgname2 = pkg.name))
 
 	# remove in to_remove the packages which are needed by the names in to_add to avoid conflicts:
@@ -829,6 +827,7 @@ def check_conflicts():
 	for pkg_list in depends:
 		for pkg in pkg_list:
 			wont_be_removed.add(pkg.name)
+	transaction.to_remove -= wont_be_removed
 
 	if mode:
 		Window.get_window().set_cursor(None)
@@ -856,7 +855,7 @@ def choose_provides(name):
 			choose_label.set_markup(_('<b>{pkgname} is provided by {number} packages.\nPlease choose the one(s) you want to install:</b>').format(pkgname = name, number = str(len(provides.keys()))))
 			choose_list.clear()
 			for name in provides.keys():
-				if transaction.handle.get_localdb().get_pkg(name):
+				if name in transaction.localpkgs.keys():
 					choose_list.append([True, name])
 				else:
 					choose_list.append([False, name])
diff --git a/po/fr.po b/po/fr.po
index fbc4c9e..0417bb0 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
 # Translation of Pamac.
 # Copyright (C) 2007-2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the Pamac package.
-#
+# 
 # Translators:
 # guinux <guillaume@manjaro.org>, 2013
 msgid ""
@@ -9,21 +9,20 @@ msgstr ""
 "Project-Id-Version: manjaro-pamac\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-03-30 15:09+0100\n"
-"PO-Revision-Date: 2013-05-02 09:14+0000\n"
+"PO-Revision-Date: 2013-06-02 13:24+0000\n"
 "Last-Translator: guinux <guillaume@manjaro.org>\n"
-"Language-Team: French (France) (http://www.transifex.com/projects/p/manjaro-"
-"pamac/language/fr_FR/)\n"
-"Language: fr_FR\n"
+"Language-Team: French (http://www.transifex.com/projects/p/manjaro-pamac/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: data/polkit/org.manjaro.pamac.policy.in:10
+#: data/polkit/org.manjaro.pamac.policy:10
 msgid "Authentication is required"
 msgstr "Authentification nécessaire"
 
-#: pamac-daemon.py:29 pamac/main.py:527
+#: pamac-daemon.py:29 pamac/main.py:505
 msgid "Preparing"
 msgstr "Préparation"
 
@@ -31,71 +30,71 @@ msgstr "Préparation"
 msgid "Checking dependencies"
 msgstr "Vérification des dépendances"
 
-#: pamac-daemon.py:71
+#: pamac-daemon.py:75
 msgid "Checking file conflicts"
 msgstr "Analyse des conflits entre fichiers"
 
-#: pamac-daemon.py:74
+#: pamac-daemon.py:78
 msgid "Resolving dependencies"
 msgstr "Résolution des dépendances"
 
-#: pamac-daemon.py:77
+#: pamac-daemon.py:85
 msgid "Checking inter conflicts"
 msgstr "Recherche des conflits entre paquets"
 
-#: pamac-daemon.py:80 pamac/main.py:88
+#: pamac-daemon.py:88 pamac/main.py:51
 msgid "Installing"
 msgstr "Installation"
 
-#: pamac-daemon.py:87 pamac/main.py:88
+#: pamac-daemon.py:95 pamac/main.py:51
 msgid "Removing"
 msgstr "Désinstallation"
 
-#: pamac-daemon.py:94 pamac/main.py:88
+#: pamac-daemon.py:102 pamac/main.py:51
 msgid "Upgrading"
 msgstr "Mise à jour"
 
-#: pamac-daemon.py:101 pamac/main.py:88
+#: pamac-daemon.py:109 pamac/main.py:51
 msgid "Downgrading"
 msgstr "Retour à une version antérieure"
 
-#: pamac-daemon.py:109 pamac/main.py:88
+#: pamac-daemon.py:117 pamac/main.py:51
 msgid "Reinstalling"
 msgstr "Réinstallation"
 
-#: pamac-daemon.py:117
+#: pamac-daemon.py:125
 msgid "Checking integrity"
 msgstr "Vérification de l'intégrité des paquets"
 
-#: pamac-daemon.py:121
+#: pamac-daemon.py:129
 msgid "Loading packages files"
 msgstr "Chargement des fichiers des paquets"
 
-#: pamac-daemon.py:125 pamac/main.py:88
+#: pamac-daemon.py:133 pamac/main.py:51
 msgid "Configuring"
 msgstr "Configuration"
 
-#: pamac-daemon.py:132
+#: pamac-daemon.py:140
 msgid "Checking keys in keyring"
 msgstr "Vérification des clés dans le trousseau"
 
-#: pamac-daemon.py:191
+#: pamac-daemon.py:198
 msgid "Downloading {size}"
 msgstr "Téléchargement de {size}"
 
-#: pamac-daemon.py:196 pamac/main.py:458 pamac/main.py:1064
+#: pamac-daemon.py:203 pamac/main.py:439 pamac/main.py:1099
 msgid "Refreshing"
 msgstr "Actualisation"
 
-#: pamac-daemon.py:364 pamac-install.py:45 pamac/main.py:554
+#: pamac-daemon.py:371 pamac-install.py:44 pamac/main.py:533
 msgid "{pkgname} is not a valid path or package name"
 msgstr "{pkgname} n'est pas un fichier ou un nom de paquet valide"
 
-#: pamac-daemon.py:430
+#: pamac-daemon.py:438
 msgid "Transaction successfully finished"
 msgstr "Transaction terminée avec succès"
 
-#: pamac-daemon.py:434 pamac-daemon.py:442
+#: pamac-daemon.py:442 pamac-daemon.py:450
 msgid "Authentication failed"
 msgstr "L'authentification a échoué"
 
@@ -123,11 +122,11 @@ msgstr "Exécuter pamac-manager"
 msgid "Quit"
 msgstr "Quitter"
 
-#: pamac-install.py:74 pamac-install.py:80 pamac/main.py:917
+#: pamac-install.py:73 pamac-install.py:79 pamac/main.py:897
 msgid "Nothing to do"
 msgstr "Rien à faire"
 
-#: pamac-install.py:87 pamac/main.py:1115
+#: pamac-install.py:87 pamac/main.py:1150
 msgid "Pamac is already running"
 msgstr "Pamac est déjà en cours d'exécution"
 
@@ -135,187 +134,209 @@ msgstr "Pamac est déjà en cours d'exécution"
 msgid ""
 "Some updates are available.\n"
 "Please update your system first"
-msgstr ""
-"Des mises à jour sont disponibles.\n"
-"Mettez d'abord votre système à jour"
+msgstr "Des mises à jour sont disponibles.\nMettez d'abord votre système à jour"
 
-#: pamac/main.py:81 pamac/main.py:1005
-msgid "Installed"
-msgstr "Installé"
-
-#: pamac/main.py:81 pamac/main.py:1007
-msgid "Uninstalled"
-msgstr "Non installé"
-
-#: pamac/main.py:81 pamac/main.py:1009
-msgid "Orphans"
-msgstr "Orphelins"
-
-#: pamac/main.py:81 pamac/main.py:353 pamac/main.py:1011
-msgid "To install"
-msgstr "À installer"
-
-#: pamac/main.py:81 pamac/main.py:371 pamac/main.py:1013
-msgid "To remove"
-msgstr "À désinstaller"
-
-#: pamac/main.py:120 pamac/main.py:1021
+#: pamac/main.py:89 pamac/main.py:1052
 msgid "local"
 msgstr "locaux"
 
-#: pamac/main.py:211 pamac/main.py:974
+#: pamac/main.py:180 pamac/main.py:954 pamac/main.py:1003
 msgid "No package found"
 msgstr "Aucun paquet trouvé"
 
-#: pamac/main.py:262
+#: pamac/main.py:231
 msgid "Licenses"
 msgstr "Licences"
 
-#: pamac/main.py:267
+#: pamac/main.py:236
 msgid "Depends On"
 msgstr "Dépend de"
 
-#: pamac/main.py:269
+#: pamac/main.py:241 pamac/main.py:1035 pamac/main.py:1224
+msgid "Installed"
+msgstr "Installé"
+
+#: pamac/main.py:244
 msgid "Optional Deps"
 msgstr "Dépendances opt."
 
-#: pamac/main.py:272
+#: pamac/main.py:247
 msgid "Required By"
 msgstr "Requis par"
 
-#: pamac/main.py:274
+#: pamac/main.py:249
 msgid "Provides"
 msgstr "Fournit"
 
-#: pamac/main.py:276
+#: pamac/main.py:251
 msgid "Replaces"
 msgstr "Remplace"
 
-#: pamac/main.py:278
+#: pamac/main.py:253
 msgid "Conflicts With"
 msgstr "Est en conflit avec"
 
-#: pamac/main.py:283
+#: pamac/main.py:258
 msgid "Repository"
 msgstr "Dépôt"
 
-#: pamac/main.py:285 gui/manager.glade:538
+#: pamac/main.py:260 gui/manager.glade:538
 msgid "Groups"
 msgstr "Groupes"
 
-#: pamac/main.py:287
+#: pamac/main.py:262
 msgid "Compressed Size"
 msgstr "Taille compressée"
 
-#: pamac/main.py:288
+#: pamac/main.py:263
 msgid "Download Size"
 msgstr "Taille du téléchargement"
 
-#: pamac/main.py:290
+#: pamac/main.py:265
 msgid "Installed Size"
 msgstr "Taille après installation"
 
-#: pamac/main.py:291
+#: pamac/main.py:266
 msgid "Packager"
 msgstr "Paqueteur"
 
-#: pamac/main.py:292
+#: pamac/main.py:267
 msgid "Architecture"
 msgstr "Architecture"
 
-#: pamac/main.py:295
+#: pamac/main.py:270
 msgid "Install Date"
 msgstr "Installé le"
 
-#: pamac/main.py:297
+#: pamac/main.py:272
 msgid "Explicitly installed"
 msgstr "Explicitement installé"
 
-#: pamac/main.py:299
+#: pamac/main.py:274
 msgid "Installed as a dependency for another package"
 msgstr "Installé comme dépendance d'un autre paquet"
 
-#: pamac/main.py:301
+#: pamac/main.py:276
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: pamac/main.py:302
+#: pamac/main.py:277
 msgid "Install Reason"
 msgstr "Motif d'installation"
 
-#: pamac/main.py:307
+#: pamac/main.py:282
 msgid "Signatures"
 msgstr "Signatures"
 
-#: pamac/main.py:311
+#: pamac/main.py:286
 msgid "Backup files"
 msgstr "Fichiers sauvegardés"
 
-#: pamac/main.py:351
+#: pamac/main.py:326
 msgid "<big><b>Transaction Summary</b></big>"
 msgstr "<big><b>Résumé de la transaction</b></big>"
 
-#: pamac/main.py:359
+#: pamac/main.py:328 pamac/main.py:1041 pamac/main.py:1224
+msgid "To install"
+msgstr "À installer"
+
+#: pamac/main.py:334
 msgid "To reinstall"
 msgstr "A réinstaller"
 
-#: pamac/main.py:365
+#: pamac/main.py:340
 msgid "To downgrade"
 msgstr "Retour à une version antérieure"
 
-#: pamac/main.py:378
+#: pamac/main.py:346 pamac/main.py:1043 pamac/main.py:1224
+msgid "To remove"
+msgstr "À désinstaller"
+
+#: pamac/main.py:353
 msgid "To update"
 msgstr "À mettre à jour"
 
-#: pamac/main.py:389 pamac/main.py:482
+#: pamac/main.py:364 pamac/main.py:461
 msgid "<b>Total download size: </b>"
 msgstr "<b>Taille totale du téléchargement: </b>"
 
-#: pamac/main.py:474 pamac/main.py:1131
+#: pamac/main.py:454 pamac/main.py:1236
 msgid "<big><b>Your system is up-to-date</b></big>"
 msgstr "<big><b>Votre système est à jour</b></big>"
 
-#: pamac/main.py:484
+#: pamac/main.py:463
 msgid "<big><b>1 available update</b></big>"
 msgstr "<big><b>1 mise à jour disponible</b></big>"
 
-#: pamac/main.py:486
+#: pamac/main.py:465
 msgid "<big><b>{number} available updates</b></big>"
 msgstr "<big><b>{number} mises à jour disponibles</b></big>"
 
-#: pamac/main.py:572 pamac/main.py:573
+#: pamac/main.py:551 pamac/main.py:552
 msgid ""
 "The transaction cannot be performed because it needs to remove {pkgname1} "
 "which is a locked package"
-msgstr ""
-"La transaction ne peut pas être réalisée car elle nécessite de désinstaller "
-"{pkgname1} qui est un paquet bloqué"
+msgstr "La transaction ne peut pas être réalisée car elle nécessite de désinstaller {pkgname1} qui est un paquet bloqué"
 
-#: pamac/main.py:604 pamac/main.py:605 pamac/main.py:707 pamac/main.py:708
+#: pamac/main.py:583 pamac/main.py:584 pamac/main.py:686 pamac/main.py:687
 msgid "{pkgname1} will be replaced by {pkgname2}"
 msgstr "{pkgname1} sera remplacé par {pkgname2}"
 
-#: pamac/main.py:722 pamac/main.py:723 pamac/main.py:747 pamac/main.py:748
-#: pamac/main.py:768 pamac/main.py:769 pamac/main.py:799 pamac/main.py:800
-#: pamac/main.py:824 pamac/main.py:825 pamac/main.py:845 pamac/main.py:846
+#: pamac/main.py:701 pamac/main.py:702 pamac/main.py:726 pamac/main.py:727
+#: pamac/main.py:747 pamac/main.py:748 pamac/main.py:778 pamac/main.py:779
+#: pamac/main.py:803 pamac/main.py:804 pamac/main.py:824 pamac/main.py:825
 msgid "{pkgname1} conflicts with {pkgname2}"
 msgstr "{pkgname1} est en conflit avec {pkgname2}"
 
-#: pamac/main.py:780 pamac/main.py:781
+#: pamac/main.py:759 pamac/main.py:760
 msgid ""
 "{pkgname1} conflicts with {pkgname2}\n"
 "None of them will be installed"
-msgstr ""
-"{pkgname1} est en conflit avec {pkgname2}\n"
-"Aucun d'entre eux ne sera installé"
+msgstr "{pkgname1} est en conflit avec {pkgname2}\nAucun d'entre eux ne sera installé"
 
-#: pamac/main.py:876
+#: pamac/main.py:856
 msgid ""
 "<b>{pkgname} is provided by {number} packages.\n"
 "Please choose the one(s) you want to install:</b>"
-msgstr ""
-"<b>{pkgname} est fourni par {number} paquets.\n"
-"Veuillez choisir celui ou ceux que vous voulez installer:</b>"
+msgstr "<b>{pkgname} est fourni par {number} paquets.\nVeuillez choisir celui ou ceux que vous voulez installer:</b>"
+
+#: pamac/main.py:939
+msgid ""
+"<b>{pkgname} has {number} uninstalled optional deps.\n"
+"Please choose the one(s) you want to install:</b>"
+msgstr "<b>{pkgname} a {number} dépendances optionelles non installées.⏎\nVeuillez choisir celui ou ceux que vous voulez installer:</b>"
+
+#: pamac/main.py:957
+msgid "Unselect"
+msgstr "Déselectionner"
+
+#: pamac/main.py:961
+msgid "Remove"
+msgstr "Désintaller"
+
+#: pamac/main.py:964
+msgid "Reinstall"
+msgstr "Réinstaller"
+
+#: pamac/main.py:975
+msgid "Install optional deps"
+msgstr "Installer les dépendances optionnelles"
+
+#: pamac/main.py:979
+msgid "Install"
+msgstr "Installer"
+
+#: pamac/main.py:990
+msgid "Install with optional deps"
+msgstr "Installer avec les dépendances optionnelles"
+
+#: pamac/main.py:1037 pamac/main.py:1224
+msgid "Uninstalled"
+msgstr "Non installé"
+
+#: pamac/main.py:1039 pamac/main.py:1224
+msgid "Orphans"
+msgstr "Orphelins"
 
 #: pamac/common.py:13
 #, python-format
@@ -347,7 +368,7 @@ msgstr "Gestionnaire de paquets"
 msgid "Search"
 msgstr "Rechercher"
 
-#: gui/manager.glade:585 gui/manager.glade:679
+#: gui/manager.glade:585 gui/manager.glade:680
 msgid "State"
 msgstr "État"
 
@@ -355,31 +376,31 @@ msgstr "État"
 msgid "Repos"
 msgstr "Dépôts"
 
-#: gui/manager.glade:710
+#: gui/manager.glade:711
 msgid "Name"
 msgstr "Nom"
 
-#: gui/manager.glade:729
+#: gui/manager.glade:730
 msgid "Version"
 msgstr "Version"
 
-#: gui/manager.glade:746
+#: gui/manager.glade:747
 msgid "Size"
 msgstr "Taille"
 
-#: gui/manager.glade:847
+#: gui/manager.glade:848
 msgid "Infos"
 msgstr "Infos"
 
-#: gui/manager.glade:907
+#: gui/manager.glade:908
 msgid "Deps"
 msgstr "Dépendances"
 
-#: gui/manager.glade:972
+#: gui/manager.glade:973
 msgid "Details"
 msgstr "Détails"
 
-#: gui/manager.glade:1020
+#: gui/manager.glade:1021
 msgid "Files"
 msgstr "Fichiers"