From 9dac732efec06ed1f08f7a39793101dd31b55e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= <soutade@gmail.com>
Date: Sat, 20 Jun 2015 18:22:51 +0200
Subject: [PATCH] Rename ressources into resources

---
 Makefile                                      |  12 +-
 install.sh                                    |   4 +-
 {ressources => resources}/icons/France.png    | Bin
 {ressources => resources}/icons/SOURCE        |   0
 .../icons/United Kingdom.png                  | Bin
 {ressources => resources}/icons/about.png     | Bin
 {ressources => resources}/icons/about_low.png | Bin
 {ressources => resources}/icons/charts.png    | Bin
 .../icons/charts_low.png                      | Bin
 {ressources => resources}/icons/check.png     | Bin
 {ressources => resources}/icons/delete.png    | Bin
 {ressources => resources}/icons/exit.png      | Bin
 {ressources => resources}/icons/exit_low.png  | Bin
 {ressources => resources}/icons/export.png    | Bin
 .../icons/export_low.png                      | Bin
 {ressources => resources}/icons/import.png    | Bin
 .../icons/import_low.png                      | Bin
 .../icons/preferences.png                     | Bin
 .../icons/preferences_low.png                 | Bin
 {ressources => resources}/icons/search.png    | Bin
 .../icons/search_low.png                      | Bin
 .../icons/switch_user.png                     | Bin
 .../icons/switch_user_low.png                 | Bin
 {ressources => resources}/icons/user.png      | Bin
 {ressources => resources}/icons/user_low.png  | Bin
 {ressources => resources}/init.sql            |   0
 {ressources => resources}/po/french.po        | 416 ++++++++++--------
 resources/po/french.qm                        | Bin 0 -> 16934 bytes
 {ressources => resources}/po/kisscount.pot    | 412 +++++++++--------
 ressources/po/french.qm                       | Bin 15948 -> 0 bytes
 src/model/Database.hpp                        |   2 +-
 src/view/SupportedLanguages.hpp               |   2 +-
 src/view/view.hpp                             |  42 +-
 src/view/wxUI.cpp                             |   6 +-
 tools/generate_locales.sh                     |   4 +-
 tools/package.sh                              |  12 +-
 36 files changed, 518 insertions(+), 394 deletions(-)
 rename {ressources => resources}/icons/France.png (100%)
 rename {ressources => resources}/icons/SOURCE (100%)
 rename {ressources => resources}/icons/United Kingdom.png (100%)
 rename {ressources => resources}/icons/about.png (100%)
 rename {ressources => resources}/icons/about_low.png (100%)
 rename {ressources => resources}/icons/charts.png (100%)
 rename {ressources => resources}/icons/charts_low.png (100%)
 rename {ressources => resources}/icons/check.png (100%)
 rename {ressources => resources}/icons/delete.png (100%)
 rename {ressources => resources}/icons/exit.png (100%)
 rename {ressources => resources}/icons/exit_low.png (100%)
 rename {ressources => resources}/icons/export.png (100%)
 rename {ressources => resources}/icons/export_low.png (100%)
 rename {ressources => resources}/icons/import.png (100%)
 rename {ressources => resources}/icons/import_low.png (100%)
 rename {ressources => resources}/icons/preferences.png (100%)
 rename {ressources => resources}/icons/preferences_low.png (100%)
 rename {ressources => resources}/icons/search.png (100%)
 rename {ressources => resources}/icons/search_low.png (100%)
 rename {ressources => resources}/icons/switch_user.png (100%)
 rename {ressources => resources}/icons/switch_user_low.png (100%)
 rename {ressources => resources}/icons/user.png (100%)
 rename {ressources => resources}/icons/user_low.png (100%)
 rename {ressources => resources}/init.sql (100%)
 rename {ressources => resources}/po/french.po (61%)
 create mode 100644 resources/po/french.qm
 rename {ressources => resources}/po/kisscount.pot (53%)
 delete mode 100644 ressources/po/french.qm

diff --git a/Makefile b/Makefile
index 5a4e9cc..2a5ea41 100644
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,11 @@ QT_PACKAGES="QtCore QtGui QtSql QtXml"
 CXXFLAGS+=`pkg-config --cflags $(QT_PACKAGES)`
 CXXFLAGS+=-Wall -Isrc -Isrc/win32
 ifdef WIN32
-CXXFLAGS+=-DRESSOURCES_ROOT="\"./ressources/\""
+CXXFLAGS+=-DRESOURCES_ROOT="\"./resources/\"" -static
 else
-CXXFLAGS+=-DRESSOURCES_ROOT="\"$(SHARE_DIR)\""  -ggdb -fPIC
+CXXFLAGS+=-DRESOURCES_ROOT="\"$(SHARE_DIR)\""  -ggdb -fPIC
 # For developpers
-#CXXFLAGS+=-DRESSOURCES_ROOT="\"./ressources/\""
+#CXXFLAGS+=-DRESOURCES_ROOT="\"./resources/\""
 endif
 
 SOURCES=$(shell find src -name '*.cpp' -type f | tr '\n' ' ')
@@ -38,7 +38,7 @@ ifndef WIN32
 LDFLAGS+=`pkg-config --libs $(QT_PACKAGES)`
 LDFLAGS+=-lofx
 else
-LDFLAGS+=lib/QtCore4.dll lib/QtGui4.dll lib/QtSql4.dll lib/QtXml4.dll
+LDFLAGS+=lib_mingw_32/QtCore4.dll lib_mingw_32/QtGui4.dll lib_mingw_32/QtSql4.dll lib_mingw_32/QtXml4.dll
 endif
 
 all: mojito lib/libkdchart.a $(KISSCOUNT)
@@ -96,9 +96,9 @@ endif
 install:
 	mkdir -p $(BIN_DIR) $(SHARE_DIR) $(DOC_DIR)
 	cp $(KISSCOUNT) $(BIN_DIR)
-	cp -rf ressources/* $(SHARE_DIR)
+	cp -rf resources/* $(SHARE_DIR)
 	rm -rf $(SHARE_DIR)/po/* # Only copy qm files
-	cp -rf ressources/po/*.qm $(SHARE_DIR)/po/
+	cp -rf resources/po/*.qm $(SHARE_DIR)/po/
 	cp -rf README* ChangeLog AUTHORS COPYING TODO $(DOC_DIR)
 
 remove:
diff --git a/install.sh b/install.sh
index e9b536c..e13ec8e 100755
--- a/install.sh
+++ b/install.sh
@@ -35,7 +35,7 @@ case "$1" in
 	sudo mkdir -p $SHARE_DIR
 	sudo mkdir -p $LIB_DIR
 	sudo mkdir -p ~/.local/share/kisscount
-	sudo cp -r ressources/* $SHARE_DIR
+	sudo cp -r resources/* $SHARE_DIR
 	sudo cp kc $BIN_DIR
 	sudo cp -r lib/* $LIB_DIR
 	
@@ -69,4 +69,4 @@ case "$1" in
 
 	exit 1
 	;;
-esac
\ No newline at end of file
+esac
diff --git a/ressources/icons/France.png b/resources/icons/France.png
similarity index 100%
rename from ressources/icons/France.png
rename to resources/icons/France.png
diff --git a/ressources/icons/SOURCE b/resources/icons/SOURCE
similarity index 100%
rename from ressources/icons/SOURCE
rename to resources/icons/SOURCE
diff --git a/ressources/icons/United Kingdom.png b/resources/icons/United Kingdom.png
similarity index 100%
rename from ressources/icons/United Kingdom.png
rename to resources/icons/United Kingdom.png
diff --git a/ressources/icons/about.png b/resources/icons/about.png
similarity index 100%
rename from ressources/icons/about.png
rename to resources/icons/about.png
diff --git a/ressources/icons/about_low.png b/resources/icons/about_low.png
similarity index 100%
rename from ressources/icons/about_low.png
rename to resources/icons/about_low.png
diff --git a/ressources/icons/charts.png b/resources/icons/charts.png
similarity index 100%
rename from ressources/icons/charts.png
rename to resources/icons/charts.png
diff --git a/ressources/icons/charts_low.png b/resources/icons/charts_low.png
similarity index 100%
rename from ressources/icons/charts_low.png
rename to resources/icons/charts_low.png
diff --git a/ressources/icons/check.png b/resources/icons/check.png
similarity index 100%
rename from ressources/icons/check.png
rename to resources/icons/check.png
diff --git a/ressources/icons/delete.png b/resources/icons/delete.png
similarity index 100%
rename from ressources/icons/delete.png
rename to resources/icons/delete.png
diff --git a/ressources/icons/exit.png b/resources/icons/exit.png
similarity index 100%
rename from ressources/icons/exit.png
rename to resources/icons/exit.png
diff --git a/ressources/icons/exit_low.png b/resources/icons/exit_low.png
similarity index 100%
rename from ressources/icons/exit_low.png
rename to resources/icons/exit_low.png
diff --git a/ressources/icons/export.png b/resources/icons/export.png
similarity index 100%
rename from ressources/icons/export.png
rename to resources/icons/export.png
diff --git a/ressources/icons/export_low.png b/resources/icons/export_low.png
similarity index 100%
rename from ressources/icons/export_low.png
rename to resources/icons/export_low.png
diff --git a/ressources/icons/import.png b/resources/icons/import.png
similarity index 100%
rename from ressources/icons/import.png
rename to resources/icons/import.png
diff --git a/ressources/icons/import_low.png b/resources/icons/import_low.png
similarity index 100%
rename from ressources/icons/import_low.png
rename to resources/icons/import_low.png
diff --git a/ressources/icons/preferences.png b/resources/icons/preferences.png
similarity index 100%
rename from ressources/icons/preferences.png
rename to resources/icons/preferences.png
diff --git a/ressources/icons/preferences_low.png b/resources/icons/preferences_low.png
similarity index 100%
rename from ressources/icons/preferences_low.png
rename to resources/icons/preferences_low.png
diff --git a/ressources/icons/search.png b/resources/icons/search.png
similarity index 100%
rename from ressources/icons/search.png
rename to resources/icons/search.png
diff --git a/ressources/icons/search_low.png b/resources/icons/search_low.png
similarity index 100%
rename from ressources/icons/search_low.png
rename to resources/icons/search_low.png
diff --git a/ressources/icons/switch_user.png b/resources/icons/switch_user.png
similarity index 100%
rename from ressources/icons/switch_user.png
rename to resources/icons/switch_user.png
diff --git a/ressources/icons/switch_user_low.png b/resources/icons/switch_user_low.png
similarity index 100%
rename from ressources/icons/switch_user_low.png
rename to resources/icons/switch_user_low.png
diff --git a/ressources/icons/user.png b/resources/icons/user.png
similarity index 100%
rename from ressources/icons/user.png
rename to resources/icons/user.png
diff --git a/ressources/icons/user_low.png b/resources/icons/user_low.png
similarity index 100%
rename from ressources/icons/user_low.png
rename to resources/icons/user_low.png
diff --git a/ressources/init.sql b/resources/init.sql
similarity index 100%
rename from ressources/init.sql
rename to resources/init.sql
diff --git a/ressources/po/french.po b/resources/po/french.po
similarity index 61%
rename from ressources/po/french.po
rename to resources/po/french.po
index 5954071..072171e 100644
--- a/ressources/po/french.po
+++ b/resources/po/french.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-08 15:12+0100\n"
+"POT-Creation-Date: 2015-06-20 17:21+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Soutadé <soutade@gmail.com>\n"
 "Language-Team: \n"
@@ -11,29 +11,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.7.6\n"
 
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: src/view/StatsPanel.cpp:315
+#: src/view/StatsPanel.cpp:316
 msgid " - "
 msgstr " - "
 
-#: src/view/PreferencesPanel.cpp:1155
+#: src/view/PreferencesPanel.cpp:1371
 msgid " ?"
 msgstr " ?"
 
-#: src/view/PreferencesPanel.cpp:859 src/view/PreferencesPanel.cpp:869
-#: src/view/PreferencesPanel.cpp:892 src/view/PreferencesPanel.cpp:1034
-#: src/view/PreferencesPanel.cpp:1056 src/view/PreferencesPanel.cpp:1099
+#: src/view/PreferencesPanel.cpp:993 src/view/PreferencesPanel.cpp:1003
+#: src/view/PreferencesPanel.cpp:1026 src/view/PreferencesPanel.cpp:1168
+#: src/view/PreferencesPanel.cpp:1190 src/view/PreferencesPanel.cpp:1255
+#: src/view/PreferencesPanel.cpp:1277 src/view/PreferencesPanel.cpp:1315
 #: src/view/UsersDialog.cpp:123
 msgid " already exists"
 msgstr " existe déjà"
 
-#: src/view/ImportPanel.cpp:274
+#: src/view/ImportPanel.cpp:335
 msgid " and "
 msgstr " et "
 
@@ -41,11 +42,12 @@ msgstr " et "
 msgid " does not exist"
 msgstr " n'existe pas"
 
-#: src/view/ExportPanel.cpp:90 src/view/SearchPanel.cpp:146
+#: src/view/ExportPanel.cpp:90 src/view/SearchPanel.cpp:149
 msgid " entries found"
 msgstr " entrées trouvées"
 
-#: src/view/ImportPanel.cpp:296 src/view/ImportPanel.cpp:320
+#: src/view/ImportPanel.cpp:360 src/view/ImportPanel.cpp:384
+#: src/view/ImportPanel.cpp:407
 msgid " must have a name"
 msgstr " doit avoir un nom"
 
@@ -53,7 +55,7 @@ msgstr " doit avoir un nom"
 msgid " not found, aborting"
 msgstr " non trouvé, arrêt"
 
-#: src/view/AccountPanel.cpp:839
+#: src/view/AccountPanel.cpp:855
 msgid " operations ?"
 msgstr " opérations ?"
 
@@ -65,25 +67,30 @@ msgstr " crée"
 msgid " successfully removed"
 msgstr " supprimé"
 
-#: src/view/ImportPanel.cpp:280
+#: src/view/ImportPanel.cpp:344
 msgid " will be created, is it ok ?"
 msgstr " vont être créés, êtes vous d'accord ?"
 
-#: src/view/ImportPanel.cpp:273
+#: src/view/ImportPanel.cpp:334
 #, c-format
 msgid "%d accounts"
 msgstr "%d comptes"
 
-#: src/view/ImportPanel.cpp:278
+#: src/view/ImportPanel.cpp:339
 #, c-format
 msgid "%d categories"
 msgstr "%d catégories"
 
-#: src/view/StatsPanel.cpp:288
+#: src/view/ImportPanel.cpp:342
+#, c-format
+msgid "%d tags"
+msgstr "%d étiquettes"
+
+#: src/view/StatsPanel.cpp:289
 msgid "0 line"
 msgstr "Limite 0"
 
-#: src/view/ExportPanel.cpp:92 src/view/SearchPanel.cpp:148
+#: src/view/ExportPanel.cpp:92 src/view/SearchPanel.cpp:151
 msgid "1 entry found"
 msgstr "1 entrée trouvée"
 
@@ -91,56 +98,56 @@ msgstr "1 entrée trouvée"
 msgid "A new database will be created, continue ?"
 msgstr "Une nouvelle base de données va être crée, continuer ?"
 
-#: src/view/SearchBanner.cpp:103 src/view/grid/GridAccount.cpp:73
+#: src/view/SearchBanner.cpp:115 src/view/grid/GridAccount.cpp:74
 msgid "Account"
 msgstr "Compte"
 
-#: src/view/PreferencesPanel.cpp:869 src/view/PreferencesPanel.cpp:892
-#: src/view/ImportPanel.cpp:296
+#: src/view/PreferencesPanel.cpp:1003 src/view/PreferencesPanel.cpp:1026
+#: src/view/ImportPanel.cpp:360
 msgid "Account "
 msgstr "Le compte "
 
-#: src/controller/KissCount.cpp:353
+#: src/controller/KissCount.cpp:380
 msgid "Account 1"
 msgstr "Compte 1"
 
-#: src/view/PreferencesPanel.cpp:859
+#: src/view/PreferencesPanel.cpp:993
 msgid "Account must have a name"
 msgstr "Le compte doit avoir un nom"
 
-#: src/view/ImportPanel.cpp:68 src/view/AccountPanel.cpp:432
+#: src/view/ImportPanel.cpp:69 src/view/AccountPanel.cpp:448
 msgid "Account name"
 msgstr "Nom du compte"
 
-#: src/view/AccountPanel.cpp:431
+#: src/view/AccountPanel.cpp:447
 msgid "Account number"
 msgstr "Numéro de compte"
 
-#: src/view/StatsPanel.cpp:287 src/view/PreferencesPanel.cpp:50
+#: src/view/StatsPanel.cpp:288 src/view/PreferencesPanel.cpp:52
 msgid "Accounts"
 msgstr "Comptes"
 
-#: src/view/AccountPanel.cpp:1024
+#: src/view/AccountPanel.cpp:1040
 msgid "Accounts updated until "
 msgstr "Comptes mis à jours jusqu'à "
 
-#: src/view/StatsPanel.cpp:265
+#: src/view/StatsPanel.cpp:266
 msgid "Amount"
 msgstr "Montant"
 
-#: src/view/SearchBanner.cpp:99
+#: src/view/SearchBanner.cpp:110
 msgid "Amount from"
 msgstr "Montant min"
 
-#: src/view/SearchBanner.cpp:100
+#: src/view/SearchBanner.cpp:111
 msgid "Amount to"
 msgstr "Montant max"
 
-#: src/view/AccountPanel.cpp:1029
+#: src/view/AccountPanel.cpp:1045
 msgid "Any account updated !"
 msgstr "Aucun compte mis à jour"
 
-#: src/view/ExportPanel.cpp:130 src/view/ImportPanel.cpp:162
+#: src/view/ExportPanel.cpp:130 src/view/ImportPanel.cpp:180
 msgid "Any engine can process this file !"
 msgstr "Format de fichier non reconnu"
 
@@ -148,23 +155,23 @@ msgstr "Format de fichier non reconnu"
 msgid "Are you sure want to come back to "
 msgstr "êtes vous sûr de vouloir revenir à "
 
-#: src/view/SnapshotsDialog.cpp:137 src/view/AccountPanel.cpp:834
+#: src/view/SnapshotsDialog.cpp:137 src/view/AccountPanel.cpp:850
 msgid "Are you sure want to delete "
 msgstr "Etes vous sûr de vouloir supprimer "
 
-#: src/view/grid/GridAccount.cpp:839
+#: src/view/grid/GridAccount.cpp:865
 msgid "Are you sure want to delete : \n"
 msgstr "Etes vous sûr de vouloir supprimer : \n"
 
-#: src/view/PreferencesPanel.cpp:1155
+#: src/view/PreferencesPanel.cpp:1371
 msgid "Are you sure want to delete profil of "
 msgstr "Etes vous sûr de vouloir supprimer le profil de "
 
-#: src/view/ImportPanel.cpp:368
+#: src/view/ImportPanel.cpp:455
 msgid "Are you sure want to integrate these operations ?"
 msgstr "Etes vous sûr de vouloir intégreer ces opérations"
 
-#: src/view/PreferencesPanel.cpp:467
+#: src/view/PreferencesPanel.cpp:554
 msgid "Ascending"
 msgstr "Croissant"
 
@@ -172,15 +179,15 @@ msgstr "Croissant"
 msgid "Back to this snapshot"
 msgstr "Revenir à cette sauvegarde"
 
-#: src/view/PreferencesPanel.cpp:345
+#: src/view/PreferencesPanel.cpp:363
 msgid "Background color"
 msgstr "Couleur d'arrière plan"
 
-#: src/view/AccountPanel.cpp:225
+#: src/view/AccountPanel.cpp:241
 msgid "Balance"
 msgstr "Solde"
 
-#: src/view/PreferencesPanel.cpp:212
+#: src/view/PreferencesPanel.cpp:230
 msgid "Blocked"
 msgstr "Bloqué"
 
@@ -193,11 +200,11 @@ msgstr "Fichiers CSV (*.csv)"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/view/grid/GridAccount.cpp:1189 src/view/grid/GridAccount.cpp:1202
+#: src/view/grid/GridAccount.cpp:1263 src/view/grid/GridAccount.cpp:1276
 msgid "Cannot group these operations"
 msgstr "Impossible de grouper ces opérations"
 
-#: src/view/grid/GridAccount.cpp:1355 src/view/grid/GridAccount.cpp:1361
+#: src/view/grid/GridAccount.cpp:1430 src/view/grid/GridAccount.cpp:1436
 msgid "Cannot ungroup these operations"
 msgstr "Impossible de dégrouper ces opérations"
 
@@ -209,36 +216,36 @@ msgstr ""
 "Impossible de migrer d'une base de données en version 2 à une base de "
 "données en version 3 car certaines colones ont été supprimées"
 
-#: src/controller/KissCount.cpp:344
+#: src/controller/KissCount.cpp:371
 msgid "Car"
 msgstr "Voiture"
 
-#: src/view/PreferencesPanel.cpp:51
+#: src/view/PreferencesPanel.cpp:53
 msgid "Categories"
 msgstr "Catégories"
 
-#: src/view/SearchBanner.cpp:101 src/view/grid/GridAccount.cpp:73
+#: src/view/SearchBanner.cpp:112 src/view/grid/GridAccount.cpp:74
 msgid "Category"
 msgstr "Catégorie"
 
-#: src/view/PreferencesPanel.cpp:1034 src/view/PreferencesPanel.cpp:1056
-#: src/view/ImportPanel.cpp:320
+#: src/view/PreferencesPanel.cpp:1168 src/view/PreferencesPanel.cpp:1190
+#: src/view/ImportPanel.cpp:384
 msgid "Category "
 msgstr "La catégorie "
 
-#: src/view/PreferencesPanel.cpp:1024
+#: src/view/PreferencesPanel.cpp:1158
 msgid "Category must have a name"
 msgstr "La catégorie doit avoir un nom"
 
-#: src/view/ImportPanel.cpp:75
+#: src/view/ImportPanel.cpp:76
 msgid "Category name"
 msgstr "Catégorie"
 
-#: src/view/PreferencesPanel.cpp:68
+#: src/view/PreferencesPanel.cpp:71
 msgid "Change Name"
 msgstr "Changer de nom"
 
-#: src/view/PreferencesPanel.cpp:69
+#: src/view/PreferencesPanel.cpp:72
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
@@ -254,26 +261,34 @@ msgstr "Changer la catégorie"
 msgid "Change password"
 msgstr "Changer le mot de passe"
 
-#: src/view/AccountPanel.cpp:119
+#: src/view/SearchPanel.cpp:55
+msgid "Change tag"
+msgstr "Changer d'étiquette"
+
+#: src/view/AccountPanel.cpp:131
 msgid "Check"
 msgstr "Rapprochement"
 
-#: src/view/SearchBanner.cpp:82
+#: src/view/SearchBanner.cpp:93
 msgid "Checked"
 msgstr "Rapprochée"
 
-#: src/view/ImportPanel.cpp:125
+#: src/view/ImportPanel.cpp:140
 msgid "Choose a database to open"
 msgstr "Choisissez une base de données à ouvrir"
 
-#: src/view/SearchPanel.cpp:195
+#: src/view/SearchPanel.cpp:198
 msgid "Choose a new account"
 msgstr "Nouveau compte"
 
-#: src/view/SearchPanel.cpp:237
+#: src/view/SearchPanel.cpp:240
 msgid "Choose a new category"
 msgstr "Nouvelle catégorie"
 
+#: src/view/SearchPanel.cpp:287
+msgid "Choose a new tag"
+msgstr "Nouvelle étiquette"
+
 #: src/view/PasswordDialog.cpp:41
 msgid "Confirm password"
 msgstr "Confirmer le mot de passe"
@@ -286,58 +301,60 @@ msgstr "Répartition des coûts"
 msgid "Create a snapshot"
 msgstr "Faire une sauvegarde"
 
-#: src/view/ImportPanel.cpp:173 src/view/ImportPanel.cpp:203
-#: src/view/ImportPanel.cpp:247 src/view/ImportPanel.cpp:258
-#: src/view/ImportPanel.cpp:287 src/view/ImportPanel.cpp:310
+#: src/view/ImportPanel.cpp:191 src/view/ImportPanel.cpp:221
+#: src/view/ImportPanel.cpp:251 src/view/ImportPanel.cpp:297
+#: src/view/ImportPanel.cpp:308 src/view/ImportPanel.cpp:319
+#: src/view/ImportPanel.cpp:351 src/view/ImportPanel.cpp:374
+#: src/view/ImportPanel.cpp:397
 msgid "Create one"
 msgstr "En créer un"
 
-#: src/view/grid/GridAccount.cpp:73
+#: src/view/grid/GridAccount.cpp:74
 msgid "Credit"
 msgstr "Crédit"
 
-#: src/view/AccountPanel.cpp:221
+#: src/view/AccountPanel.cpp:237
 msgid "Cur Credit"
 msgstr "Cur Crédit"
 
-#: src/view/AccountPanel.cpp:222
+#: src/view/AccountPanel.cpp:238
 msgid "Cur Debit"
 msgstr "Cur Débit"
 
-#: src/view/AccountPanel.cpp:434
+#: src/view/AccountPanel.cpp:450
 msgid "Current value"
 msgstr "Valeur courante"
 
-#: src/view/grid/GridAccount.cpp:73
+#: src/view/grid/GridAccount.cpp:74
 msgid "Date"
 msgstr "Date"
 
-#: src/view/SearchBanner.cpp:30
+#: src/view/SearchBanner.cpp:31
 msgid "Date from"
 msgstr "Date min"
 
-#: src/view/SearchBanner.cpp:31
+#: src/view/SearchBanner.cpp:32
 msgid "Date to"
 msgstr "Date max"
 
-#: src/view/StatsPanel.cpp:279
+#: src/view/StatsPanel.cpp:280
 msgid "Days"
 msgstr "Jours"
 
-#: src/view/grid/GridAccount.cpp:73
+#: src/view/grid/GridAccount.cpp:74
 msgid "Debit"
 msgstr "Débit"
 
-#: src/view/PreferencesPanel.cpp:210
+#: src/view/PreferencesPanel.cpp:228
 msgid "Default"
 msgstr "Défaut"
 
-#: src/view/PreferencesPanel.cpp:665
+#: src/view/PreferencesPanel.cpp:752
 msgid "Default account cannot be hidden"
 msgstr "Impossible de cacher le compte par défaut"
 
-#: src/view/PreferencesPanel.cpp:213 src/view/PreferencesPanel.cpp:348
-#: src/view/AccountPanel.cpp:692
+#: src/view/PreferencesPanel.cpp:231 src/view/PreferencesPanel.cpp:366
+#: src/view/PreferencesPanel.cpp:471 src/view/AccountPanel.cpp:708
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -345,44 +362,46 @@ msgstr "Supprimer"
 msgid "Delete a snapshot"
 msgstr "Supprimer la sauvegarde"
 
-#: src/view/PreferencesPanel.cpp:468
+#: src/view/PreferencesPanel.cpp:555
 msgid "Descending"
 msgstr "Décroissant"
 
-#: src/view/SearchBanner.cpp:98 src/view/grid/GridAccount.cpp:73
+#: src/view/SearchBanner.cpp:109 src/view/grid/GridAccount.cpp:74
 msgid "Description"
 msgstr "Description"
 
-#: src/view/SearchPanel.cpp:276
+#: src/view/SearchPanel.cpp:324
 msgid "Enter a new description"
 msgstr "Nouvelle description"
 
-#: src/view/StatsPanel.cpp:330 src/view/PreferencesPanel.cpp:592
-#: src/view/PreferencesPanel.cpp:665 src/view/PreferencesPanel.cpp:859
-#: src/view/PreferencesPanel.cpp:869 src/view/PreferencesPanel.cpp:892
-#: src/view/PreferencesPanel.cpp:1024 src/view/PreferencesPanel.cpp:1034
-#: src/view/PreferencesPanel.cpp:1056 src/view/PreferencesPanel.cpp:1093
-#: src/view/PreferencesPanel.cpp:1099 src/view/PreferencesPanel.cpp:1141
-#: src/view/ExportPanel.cpp:117 src/view/ExportPanel.cpp:130
-#: src/view/ExportPanel.cpp:137 src/view/PasswordDialog.cpp:64
-#: src/view/PasswordDialog.cpp:70 src/view/SearchBanner.cpp:171
-#: src/view/SearchBanner.cpp:181 src/view/SearchBanner.cpp:194
-#: src/view/SearchBanner.cpp:203 src/view/SnapshotsDialog.cpp:117
-#: src/view/SnapshotsDialog.cpp:133 src/view/SnapshotsDialog.cpp:142
-#: src/view/SnapshotsDialog.cpp:167 src/view/SnapshotsDialog.cpp:176
-#: src/view/grid/GridAccount.cpp:1189 src/view/grid/GridAccount.cpp:1202
-#: src/view/grid/GridAccount.cpp:1355 src/view/grid/GridAccount.cpp:1361
-#: src/view/grid/FormulaDelegate.cpp:59 src/view/ImportPanel.cpp:162
-#: src/view/ImportPanel.cpp:296 src/view/ImportPanel.cpp:320
-#: src/view/AccountPanel.cpp:830 src/view/UsersDialog.cpp:93
+#: src/view/StatsPanel.cpp:331 src/view/PreferencesPanel.cpp:679
+#: src/view/PreferencesPanel.cpp:752 src/view/PreferencesPanel.cpp:993
+#: src/view/PreferencesPanel.cpp:1003 src/view/PreferencesPanel.cpp:1026
+#: src/view/PreferencesPanel.cpp:1158 src/view/PreferencesPanel.cpp:1168
+#: src/view/PreferencesPanel.cpp:1190 src/view/PreferencesPanel.cpp:1245
+#: src/view/PreferencesPanel.cpp:1255 src/view/PreferencesPanel.cpp:1277
+#: src/view/PreferencesPanel.cpp:1309 src/view/PreferencesPanel.cpp:1315
+#: src/view/PreferencesPanel.cpp:1357 src/view/ExportPanel.cpp:117
+#: src/view/ExportPanel.cpp:130 src/view/ExportPanel.cpp:137
+#: src/view/PasswordDialog.cpp:64 src/view/PasswordDialog.cpp:70
+#: src/view/SearchBanner.cpp:185 src/view/SearchBanner.cpp:195
+#: src/view/SearchBanner.cpp:208 src/view/SearchBanner.cpp:217
+#: src/view/SnapshotsDialog.cpp:117 src/view/SnapshotsDialog.cpp:133
+#: src/view/SnapshotsDialog.cpp:142 src/view/SnapshotsDialog.cpp:167
+#: src/view/SnapshotsDialog.cpp:176 src/view/grid/GridAccount.cpp:1263
+#: src/view/grid/GridAccount.cpp:1276 src/view/grid/GridAccount.cpp:1430
+#: src/view/grid/GridAccount.cpp:1436 src/view/grid/FormulaDelegate.cpp:59
+#: src/view/ImportPanel.cpp:180 src/view/ImportPanel.cpp:360
+#: src/view/ImportPanel.cpp:384 src/view/ImportPanel.cpp:407
+#: src/view/AccountPanel.cpp:846 src/view/UsersDialog.cpp:93
 #: src/view/UsersDialog.cpp:123 src/model/Database.cpp:47
 #: src/model/Database.cpp:55 src/model/Database.cpp:74
 #: src/model/Database.cpp:99 src/model/Database.cpp:105
 #: src/model/Database.cpp:111 src/model/Database.cpp:121
-#: src/model/Database.cpp:140 src/model/Database.cpp:583
-#: src/model/Database.cpp:759 src/model/Database.cpp:901
-#: src/model/Database.cpp:1721 src/model/DatabaseUpdate.cpp:31
-#: src/model/DatabaseUpdate.cpp:164
+#: src/model/Database.cpp:140 src/model/Database.cpp:604
+#: src/model/Database.cpp:780 src/model/Database.cpp:922
+#: src/model/Database.cpp:1038 src/model/Database.cpp:1881
+#: src/model/DatabaseUpdate.cpp:31 src/model/DatabaseUpdate.cpp:183
 msgid "Error"
 msgstr "Erreur"
 
@@ -398,28 +417,32 @@ msgstr "Export"
 msgid "Failed to save operations"
 msgstr "Erreur lors de la sauvegarde des opérations"
 
-#: src/view/ImportPanel.cpp:68
+#: src/view/ImportPanel.cpp:69
 msgid "File account"
 msgstr "Compte du fichier"
 
-#: src/view/ImportPanel.cpp:75
+#: src/view/ImportPanel.cpp:76
 msgid "File category"
 msgstr "Catégorie du fichier"
 
-#: src/view/AccountPanel.cpp:435
+#: src/view/ImportPanel.cpp:83
+msgid "File tag"
+msgstr "Étiquette dans le fichier"
+
+#: src/view/AccountPanel.cpp:451
 msgid "Final value"
 msgstr "Valeur finale"
 
-#: src/controller/KissCount.cpp:344 src/view/SearchBanner.cpp:78
-#: src/view/grid/GridAccount.cpp:360
+#: src/controller/KissCount.cpp:371 src/view/SearchBanner.cpp:89
+#: src/view/grid/GridAccount.cpp:378
 msgid "Fix"
 msgstr "Fixe"
 
-#: src/view/PreferencesPanel.cpp:347
+#: src/view/PreferencesPanel.cpp:365
 msgid "Font"
 msgstr "Police"
 
-#: src/view/PreferencesPanel.cpp:346
+#: src/view/PreferencesPanel.cpp:364
 msgid "Foreground color"
 msgstr "Couleur d'avant plan"
 
@@ -431,63 +454,67 @@ msgstr "De"
 msgid "From "
 msgstr "A partir de "
 
-#: src/view/GenerateDialog.cpp:34 src/view/AccountPanel.cpp:689
+#: src/view/GenerateDialog.cpp:34 src/view/AccountPanel.cpp:705
 msgid "Generate month"
 msgstr "Générer mois"
 
-#: src/model/import/GrisbiImportEngine.cpp:166
+#: src/model/import/GrisbiImportEngine.cpp:167
 msgid "Grisbi files (*.gsb)"
 msgstr "Fichiers Grisbi (*.gsb)"
 
-#: src/controller/KissCount.cpp:344
+#: src/controller/KissCount.cpp:371
 msgid "Groceries"
 msgstr "Courses"
 
-#: src/view/AccountPanel.cpp:143
+#: src/view/AccountPanel.cpp:155
 msgid "Group"
 msgstr "Grouper"
 
-#: src/view/PreferencesPanel.cpp:214
+#: src/view/PreferencesPanel.cpp:232
 msgid "Hidden"
 msgstr "Caché"
 
-#: src/controller/KissCount.cpp:344
+#: src/controller/KissCount.cpp:371
 msgid "Hobbies"
 msgstr "Loisirs"
 
-#: src/view/ImportPanel.cpp:113
+#: src/view/ImportPanel.cpp:128
 msgid "Import"
 msgstr "Import"
 
-#: src/view/AccountPanel.cpp:433
+#: src/view/AccountPanel.cpp:449
 msgid "Initial value"
 msgstr "Valeur initiale"
 
-#: src/view/ImportPanel.cpp:51
+#: src/view/ImportPanel.cpp:52
 msgid "Integrate operations"
 msgstr "Intégrer les opérations"
 
-#: src/view/ImportPanel.cpp:68
+#: src/view/ImportPanel.cpp:69
 msgid "Internal account"
 msgstr "Compte interne"
 
-#: src/view/ImportPanel.cpp:75
+#: src/view/ImportPanel.cpp:76
 msgid "Internal category"
 msgstr "Catégorie interne"
 
-#: src/view/SearchBanner.cpp:181
+#: src/view/ImportPanel.cpp:83
+msgid "Internal tag"
+msgstr "Étiquette interne"
+
+#: src/view/SearchBanner.cpp:195
 msgid "Invalid amount from"
 msgstr "Montant min invalide"
 
-#: src/view/SearchBanner.cpp:203
+#: src/view/SearchBanner.cpp:217
 msgid "Invalid amount range"
 msgstr "Intervalle des montants invalide"
 
-#: src/view/SearchBanner.cpp:194
+#: src/view/SearchBanner.cpp:208
 msgid "Invalid amount to"
 msgstr "Montant max invalide"
 
-#: src/view/SearchBanner.cpp:171
+#: src/view/SearchBanner.cpp:185
 msgid "Invalid date range"
 msgstr "Intervalle de temps invalide"
 
@@ -495,7 +522,7 @@ msgstr "Intervalle de temps invalide"
 msgid "Invalid formula !"
 msgstr "Formule invalide !"
 
-#: src/view/PreferencesPanel.cpp:1093
+#: src/view/PreferencesPanel.cpp:1309
 msgid "Invalid name !"
 msgstr "Nom invalide !"
 
@@ -507,26 +534,26 @@ msgstr "Ancien mot de passe invalide"
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: src/view/StatsPanel.cpp:330
+#: src/view/StatsPanel.cpp:331
 msgid "Invalide date range"
 msgstr "Intervalle de temps invalide"
 
-#: src/view/PreferencesPanel.cpp:592
+#: src/view/PreferencesPanel.cpp:679
 msgid "It must be at least one account !"
 msgstr "Il doit y avoir au moins un compte !"
 
-#: src/view/AccountPanel.cpp:830
+#: src/view/AccountPanel.cpp:846
 msgid "It must be at least one month !"
 msgstr "Il doit rester au moins un mois"
 
-#: src/view/PreferencesPanel.cpp:70
+#: src/view/PreferencesPanel.cpp:73
 msgid "Kill me"
 msgstr "Kill me"
 
 #: src/view/ExportPanel.cpp:90 src/view/ExportPanel.cpp:92
 #: src/view/ExportPanel.cpp:95 src/view/ExportPanel.cpp:135
-#: src/view/SearchPanel.cpp:146 src/view/SearchPanel.cpp:148
-#: src/view/SearchPanel.cpp:151
+#: src/view/SearchPanel.cpp:149 src/view/SearchPanel.cpp:151
+#: src/view/SearchPanel.cpp:154
 msgid "KissCount"
 msgstr "KissCount"
 
@@ -534,7 +561,7 @@ msgstr "KissCount"
 msgid "KissCount - Export"
 msgstr "KissCount - Export"
 
-#: src/view/ImportPanel.cpp:118
+#: src/view/ImportPanel.cpp:133
 msgid "KissCount - Import"
 msgstr "KissCount - Import"
 
@@ -546,41 +573,41 @@ msgstr "Fichiers KissCount xml (*.xml)"
 msgid "KissCount xml files (*.xml)"
 msgstr "Fichiers KissCount xml (*.xml)"
 
-#: src/view/PreferencesPanel.cpp:52
+#: src/view/PreferencesPanel.cpp:55
 msgid "Language"
 msgstr "Langue"
 
-#: src/view/PreferencesPanel.cpp:1141
+#: src/view/PreferencesPanel.cpp:1357
 msgid "Language not changed"
 msgstr "Langue non changée"
 
-#: src/view/PreferencesPanel.cpp:1138
+#: src/view/PreferencesPanel.cpp:1354
 msgid "Language successfully changed, please go to another panel"
 msgstr ""
 "Langue changée, allez sur un autre panneau pour rendre le changement effectif"
 
-#: src/view/wxUI.cpp:317
+#: src/view/wxUI.cpp:319
 msgid "Licenced under GNU GPL v3"
 msgstr "Licence GNU GPL v3"
 
-#: src/view/ImportPanel.cpp:47
+#: src/view/ImportPanel.cpp:48
 msgid "Load operations"
 msgstr "Charger les opérations"
 
-#: src/view/AccountPanel.cpp:115
+#: src/view/AccountPanel.cpp:127
 msgid "Mode"
 msgstr "Mode"
 
-#: src/view/StatsPanel.cpp:276
+#: src/view/StatsPanel.cpp:277
 msgid "Months"
 msgstr "Mois"
 
-#: src/view/PreferencesPanel.cpp:62 src/view/PreferencesPanel.cpp:208
-#: src/view/PreferencesPanel.cpp:344
+#: src/view/PreferencesPanel.cpp:65 src/view/PreferencesPanel.cpp:226
+#: src/view/PreferencesPanel.cpp:362 src/view/PreferencesPanel.cpp:470
 msgid "Name"
 msgstr "Nom"
 
-#: src/view/PreferencesPanel.cpp:1105
+#: src/view/PreferencesPanel.cpp:1321
 msgid "Name changed"
 msgstr "Nom changé"
 
@@ -592,11 +619,15 @@ msgstr "Nouvel utilisateur"
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: src/view/ExportPanel.cpp:95 src/view/SearchPanel.cpp:151
+#: src/view/grid/GridAccount.cpp:124
+msgid "No Tag"
+msgstr "Pas de tag"
+
+#: src/view/ExportPanel.cpp:95 src/view/SearchPanel.cpp:154
 msgid "No entry found"
 msgstr "Pas d'entrée trouvée"
 
-#: src/view/ImportPanel.cpp:352
+#: src/view/ImportPanel.cpp:439
 msgid "No operation found into this file"
 msgstr "Aucun opération trouvée dans ce fichier"
 
@@ -604,24 +635,25 @@ msgstr "Aucun opération trouvée dans ce fichier"
 msgid "No operation to save"
 msgstr "Aucun opération à sauvegarder"
 
-#: src/view/SearchBanner.cpp:80 src/view/CostRepartitionBanner.cpp:106
+#: src/view/SearchBanner.cpp:91 src/view/CostRepartitionBanner.cpp:106
 msgid "Non fix"
 msgstr "Courantes"
 
-#: src/view/PreferencesPanel.cpp:608 src/view/PreferencesPanel.cpp:700
-#: src/view/SearchPanel.cpp:191 src/view/SearchPanel.cpp:233
+#: src/view/PreferencesPanel.cpp:695 src/view/PreferencesPanel.cpp:787
+#: src/view/PreferencesPanel.cpp:834 src/view/SearchPanel.cpp:194
+#: src/view/SearchPanel.cpp:236 src/view/SearchPanel.cpp:283
 msgid "None"
 msgstr "Aucun"
 
-#: src/view/SearchBanner.cpp:84
+#: src/view/SearchBanner.cpp:95
 msgid "Not checked"
 msgstr "Non rapprochée"
 
-#: src/view/PreferencesPanel.cpp:209
+#: src/view/PreferencesPanel.cpp:227
 msgid "Number"
 msgstr "Numéro de compte"
 
-#: src/model/import/OFXImportEngine.cpp:144
+#: src/model/import/OFXImportEngine.cpp:145
 msgid "OFX files (*.ofx)"
 msgstr "Fichiers OFX (*.ofx)"
 
@@ -634,15 +666,15 @@ msgstr "OK"
 msgid "Old password"
 msgstr "Ancien mot de passe"
 
-#: src/view/PreferencesPanel.cpp:53
+#: src/view/PreferencesPanel.cpp:56
 msgid "Operation order"
 msgstr "Ordre des opérations"
 
-#: src/view/SearchBanner.cpp:102 src/view/AccountPanel.cpp:198
+#: src/view/SearchBanner.cpp:114 src/view/AccountPanel.cpp:214
 msgid "Operations"
 msgstr "Opérations"
 
-#: src/view/ImportPanel.cpp:425
+#: src/view/ImportPanel.cpp:512
 msgid "Operations successfully imported"
 msgstr "les opérations ont été importées avec succès"
 
@@ -650,7 +682,7 @@ msgstr "les opérations ont été importées avec succès"
 msgid "Operations successfuly saved"
 msgstr "Opérations sauvegardées avec succès"
 
-#: src/controller/KissCount.cpp:345
+#: src/controller/KissCount.cpp:372
 msgid "Other"
 msgstr "Autres"
 
@@ -662,7 +694,7 @@ msgstr "Mot de passe "
 msgid "Password changed"
 msgstr "Mot de passe changé"
 
-#: src/view/wxUI.cpp:317
+#: src/view/wxUI.cpp:319
 msgid "Personal accounting software"
 msgstr "Logiciel de comptabilité personnelle"
 
@@ -670,19 +702,19 @@ msgstr "Logiciel de comptabilité personnelle"
 msgid "Please retype new password"
 msgstr "Re entrez le mot de passe"
 
-#: src/view/PreferencesPanel.cpp:194 src/view/PreferencesPanel.cpp:1146
+#: src/view/PreferencesPanel.cpp:212 src/view/PreferencesPanel.cpp:1362
 msgid "Preferences"
 msgstr "Préférences"
 
-#: src/view/wxUI.cpp:322
+#: src/view/wxUI.cpp:324
 msgid "Quit KissCount ?"
 msgstr "Quitter KissCount ?"
 
-#: src/view/AccountPanel.cpp:118
+#: src/view/AccountPanel.cpp:130
 msgid "Real"
 msgstr "Réel"
 
-#: src/view/SearchPanel.cpp:55
+#: src/view/SearchPanel.cpp:56
 msgid "Rename"
 msgstr "Renommer"
 
@@ -690,20 +722,20 @@ msgstr "Renommer"
 msgid "Save as"
 msgstr "Sauvegarder sous"
 
-#: src/view/ImportPanel.cpp:55
+#: src/view/ImportPanel.cpp:56
 msgid "Save import patterns"
 msgstr "Sauvegarder les motifs d'import"
 
 #: src/view/ExportPanel.cpp:38 src/view/SearchPanel.cpp:40
-#: src/view/SearchPanel.cpp:95 src/view/SearchPanel.cpp:288
+#: src/view/SearchPanel.cpp:98 src/view/SearchPanel.cpp:336
 msgid "Search"
 msgstr "Chercher"
 
-#: src/view/PreferencesPanel.cpp:54
+#: src/view/PreferencesPanel.cpp:57
 msgid "Shared with"
 msgstr "Partagé avec"
 
-#: src/view/SnapshotsDialog.cpp:32 src/view/AccountPanel.cpp:146
+#: src/view/SnapshotsDialog.cpp:32 src/view/AccountPanel.cpp:158
 msgid "Snapshots"
 msgstr "Sauvegardes"
 
@@ -711,23 +743,44 @@ msgstr "Sauvegardes"
 msgid "Some operations date has been updated"
 msgstr "Mise à jour de la date de certaines opérations"
 
-#: src/view/StatsPanel.cpp:143 src/view/StatsPanel.cpp:315
+#: src/view/StatsPanel.cpp:143 src/view/StatsPanel.cpp:316
 msgid "Statistics"
 msgstr "Statistiques"
 
+#: src/view/SearchBanner.cpp:113 src/view/grid/GridAccount.cpp:74
+msgid "Tag"
+msgstr "Étiquette"
+
+#: src/view/PreferencesPanel.cpp:1255 src/view/PreferencesPanel.cpp:1277
+#: src/view/ImportPanel.cpp:407
+msgid "Tag "
+msgstr "Étiquette "
+
+#: src/view/PreferencesPanel.cpp:1245
+msgid "Tag must have a name"
+msgstr "L'étiquette doit être définie"
+
+#: src/view/ImportPanel.cpp:83
+msgid "Tag name"
+msgstr "Étiquette"
+
+#: src/view/PreferencesPanel.cpp:54
+msgid "Tags"
+msgstr "Étiquettes"
+
 #: src/view/StatsPanel.cpp:78
 msgid "To"
 msgstr "A"
 
-#: src/view/AccountPanel.cpp:216 src/view/AccountPanel.cpp:223
+#: src/view/AccountPanel.cpp:232 src/view/AccountPanel.cpp:239
 msgid "Total Credit"
 msgstr "Total Crédit"
 
-#: src/view/AccountPanel.cpp:217 src/view/AccountPanel.cpp:224
+#: src/view/AccountPanel.cpp:233 src/view/AccountPanel.cpp:240
 msgid "Total Debit"
 msgstr "Total Débit"
 
-#: src/view/AccountPanel.cpp:144
+#: src/view/AccountPanel.cpp:156
 msgid "UnGroup"
 msgstr "Dégrouper"
 
@@ -744,7 +797,7 @@ msgid "Unable to open Database"
 msgstr "Impossible d'ouvrir la base de données"
 
 #: src/model/Database.cpp:47 src/model/Database.cpp:55
-#: src/model/Database.cpp:74 src/model/Database.cpp:1721
+#: src/model/Database.cpp:74 src/model/Database.cpp:1881
 msgid "Unable to open database"
 msgstr "Impossible d'ouvrir la base de données"
 
@@ -752,17 +805,18 @@ msgstr "Impossible d'ouvrir la base de données"
 msgid "Unable to remove "
 msgstr "Impossible de supprimer "
 
-#: src/model/DatabaseUpdate.cpp:164
+#: src/model/DatabaseUpdate.cpp:183
 msgid "Unable to upgrade Database"
 msgstr "Impossible de mettre à jour la base de données"
 
-#: src/controller/KissCount.cpp:345
+#: src/controller/KissCount.cpp:372
 msgid "Unexpected"
 msgstr "Exceptionnel"
 
-#: src/view/SearchBanner.cpp:68 src/view/SearchBanner.cpp:89
-#: src/view/AccountPanel.cpp:583 src/model/User.cpp:72 src/model/User.cpp:90
-#: src/model/User.cpp:168
+#: src/view/SearchBanner.cpp:69 src/view/SearchBanner.cpp:79
+#: src/view/SearchBanner.cpp:100 src/view/AccountPanel.cpp:599
+#: src/model/User.cpp:72 src/model/User.cpp:90 src/model/User.cpp:178
+#: src/model/User.cpp:238
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -774,20 +828,24 @@ msgstr "Comptes non résolus"
 msgid "Unresolved categories"
 msgstr "Catégories non résolues"
 
-#: src/model/Database.cpp:583 src/model/Database.cpp:759
-#: src/model/Database.cpp:901
+#: src/view/ImportPanel.cpp:35
+msgid "Unresolved tags"
+msgstr "Étiquette non résolue"
+
+#: src/model/Database.cpp:604 src/model/Database.cpp:780
+#: src/model/Database.cpp:922 src/model/Database.cpp:1038
 msgid "Update failed !\n"
 msgstr "La mise à jour à échouée !\n"
 
-#: src/view/AccountPanel.cpp:145
+#: src/view/AccountPanel.cpp:157
 msgid "Update next months"
 msgstr "Mettre à jour mois suivants"
 
-#: src/view/PreferencesPanel.cpp:49
+#: src/view/PreferencesPanel.cpp:51
 msgid "User"
 msgstr "Utilisateur"
 
-#: src/view/PreferencesPanel.cpp:1099 src/view/UsersDialog.cpp:40
+#: src/view/PreferencesPanel.cpp:1315 src/view/UsersDialog.cpp:40
 #: src/view/UsersDialog.cpp:123
 msgid "User "
 msgstr "Utilisateur "
@@ -796,11 +854,11 @@ msgstr "Utilisateur "
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: src/view/PreferencesPanel.cpp:211 src/view/AccountPanel.cpp:117
+#: src/view/PreferencesPanel.cpp:229 src/view/AccountPanel.cpp:129
 msgid "Virtual"
 msgstr "Virtuel"
 
-#: src/view/GenerateDialog.cpp:215 src/view/grid/GridAccount.cpp:1076
+#: src/view/GenerateDialog.cpp:215 src/view/grid/GridAccount.cpp:1127
 msgid "Warning"
 msgstr "Attention"
 
@@ -808,15 +866,19 @@ msgstr "Attention"
 msgid "Welcome back to "
 msgstr "Bienvenue sur "
 
-#: src/view/PreferencesPanel.cpp:613
+#: src/view/PreferencesPanel.cpp:700
 msgid "Wich account will replace this one ?"
 msgstr "Quel compte va remplacer celui-ci ?"
 
-#: src/view/PreferencesPanel.cpp:706
+#: src/view/PreferencesPanel.cpp:793
 msgid "Wich category will replace this one ?"
-msgstr "Quelle catégorie va remplacer celle-ci"
+msgstr "Quelle catégorie va remplacer celle-ci ?"
 
-#: src/view/grid/GridAccount.cpp:1076
+#: src/view/PreferencesPanel.cpp:840
+msgid "Wich tag will replace this one ?"
+msgstr "Quelle étiquette va remplacer celle-ci ?"
+
+#: src/view/grid/GridAccount.cpp:1127
 msgid "You made a debit on a blocked account"
 msgstr "Vous avez effectué une opération de débit sur un compte bloqué"
 
diff --git a/resources/po/french.qm b/resources/po/french.qm
new file mode 100644
index 0000000000000000000000000000000000000000..20550ae1f2df6eab4f2f004e33861e61ac1323d9
GIT binary patch
literal 16934
zcmcgz33wdEl`cy&np300vMr1;ZR0~W#`wS-4grj88G|g}#;_1*&9tO3Gu@LpWQnj@
z!j%Btkc5yBj)eONBw>@?jS2S+`Cz$o>@G*Rj28&ugM8uG&F=rIrmL!_dt?*%7Cx)z
zsCw_!yWgufhwsRA{`%c3E_q_wlzUFS`mPs_W~}Kd#u|=fj7?=M`~}A5T!ZJ&7+dfG
zW7GeH&+*@?vlvVLoUzqW#wO!=;x@((e37xz`HU@ngoSRpp0NoP7P`3+&p)xyZ#H7x
zGc5G`lNsB4ISa4A_p@Rwe9RI&SF`Zu6^wQLiiIycgRuiHWZ@gX1$<FFU&Zqg7Jlr0
z#txprB2x|n{FCv-`laWvS?8PzVk&I*S8oLTIqZucPhhO&KiQE_-2*sBu~lzf&RE;S
z?AY5wj7=QRdVkQ*Sm!LZ`VyRDZ<F<X?_S2HtYe#h3i$hfot<>WQNXhS&x`Rqmklg^
z2=Iz*Xym^cJM6ox^o>h__j-2bH(qCK++=p<gEJU2u3_iy*oDs*vmGs1-`UIVoz%@(
zV~V};5k7BymF@fx_}dO-J3q#=wU>P~6a0;R%>Me(E8y*2<EBo1jj@Hz<ECDBHe)jf
z#~H8u8K0juZgl!gJog><mEY`yI9kU2Z0ENbo3?J;ou@y>*glUmH0-n>lVuGjo;S$Y
z_`@0=UIP5{7Bq&hE#o||H_l$L0(6|&c<kzf7~AWL#uNAXd%#)Wc*=q=G1fk}F;jp{
z=bqj8k016jHsc=}FTZ#^W666PZ+-y#+4mcNvZKV<lBtcKeET`Z4t+7S-`_cm?VAW4
z`~HKFYdCaHZX@*NqR_YYSq45dgf3lmC-(0Xy6Fy_v*VV~t&^7H`Aq26dDnygZ-kzB
z8uWI}2|YRdUGV9>(6g`o1$_Bh=-nUR4LOX4L-hHSN5k`fbS2>K2=^Qhez3#BJtw{o
zJ((L`M|w7U|M2?l2KaYM_@qN2w>f)-Pt9)u-0k5D3hNk)oF3jzdUe39;qSZ-c=K)!
zU;4$xIL9O5%SnFoPY+*l-v;2B8NT8B*MV<mg>SxX75MW~_?9iu<u9~{|GDRN@adZH
z{hj~I*db3gO_=j6V+V~iP2CB;C!TCNdd^=NoAgZ6dD9`^IUAcUd>e2M+tIY$`2*zh
zWYa?jz6<*Q*!1|3-+^Ad-t@u`W`MtoA{`GwpXZN{Y`kbZ<ac1i{KbQi-y4yw{CRog
z+^5b0`~{KkcV7a%zcg}Lu7k1ArIA~gHGr<eBlj-E`uH=Er_P347c7a6TlgB}drNfH
z?Ag%AOtkOk(3=^t=m}d=j5Qw>9ew<L;Cmr@);Z4u?$@H{Kl*F%As4+Miq8*vIC{}_
z7eoGQqgS1ACiL$^Jg>s@$I)wF1e}iH=q<0rp#O>3)Z4Fv-u^JQ<mwLq=f>EfJAs!y
zA6q?0e7GXEefU}M`?s-gUIhNMzZJXTzE;qEFP;y84=i?1<T=Rah1k8J-(vk>?7=tj
zj9(Lb;#GX#@b9s=2yWZQ@o@*A1Noj9pLraf`?tmyw133dehcH-O%KAqw8e96R|D>Q
z@!^YKfc||ie)`gl;NNNS3$}sZ6CRA;d>Q=4;)CNqJ>q5T|4IDL?PciQA@RG71vtmj
zM6B(*;QM)rmhgUncVps+W4gef>k~)q`W^hi#fdL1nTqwNBu@PZe25Mu25$s?jmIXo
zF9QDd8xlXb`vk}{nz-VKe#rYj5_fcd8TvLo@ysHk^UB04lhW{uzf1hF{XW>qj>Mlc
zc%SS^vRiN-V_9<k_dwsmGm`5!e-r%gOJ4Fg<UQ-^<ZY)vhi5MNuPv~X2}_c{Jn1#a
z^PS`i_cwyC@#IU_LeKX8x8xh6OBh>pck+#|(6cA`*8=v>4K>H^m<NCL%jUMn4DfsZ
z=DlZZ0{#=4kGQP@xwSU0x1R_8_nOcBpKIVJ|I&Q^+DTadhvti3Z-HH((0tvMKLWmg
zYJT)S;GJ_<^Be2%ob^icCr{r7{clONJqtcA>`Bdg`x4mAyQzg=e+Y0!QYRgC6wd!v
z>b#rQfKTtFuKLvnkmt129s4bZ{&c18$b}&9@u^2vfsWbNr{38g_SA54%a)7I2Am(Z
z*f!uEG^ypX3*zASOD(_Xv>?CjE&s9=^c=Fb<^E?D!!A2p-hS$<u+!hSyz}$}@Q=4=
zVGKEN2C8MS1DJszM6W@Daext_H{<Br5WYQ9e%D|eslMvOR~8##Syp0YyfRpZ?P6Qm
z%W`>(VdjdKnHe>#k!-14QhTF(Z&^bdHcUICA)bsCHk)08p}<U5(%@$tt7O<tSs+mG
zr*rr==qiFH3ltjswSz!6EIyG?Qif%hi&+2~a4L320hxhK8Rp=CAQXs)`RgKHS3nw(
z=dip4(`Mu=rLr+(4qJw4*k<1HLZa2Qi%4?Gn8)E3@yUO&vV_#ZPsE9tXPEs?v7EIB
z6)@tA!wNV>5k!?i9s#BkDnT_HPQfag<*Z|ubeYAmDlK>-(M>Q)m2}!Fl?E!g+^CU;
z#LAY&hIZ^J;m8I2Uj(*1+f{FG(aJl+`rcmbCAN_y3_2trkfsP4b^$K2fIb&8qO}!%
zmJDQXVqF@a6d?xvbW@CN*<8-(w_IZ98QGGNEgQ~h`e8fROumso<Uu?~B1uoo%ot`m
z4Uy}LIa%%@*6w119DSC^lRKNSGYuXMI;1taU<AHh*qLQt#z8E+@?wo(Z`mBwcD1rz
z&Q#JeVhvI@{7079w7|$^ZB2~~wh#*}&P}1$UUjnM*5-v=sYh#7I>$C)H=!YQBwMgp
z4*%09{bXDGRi^rv<Yr6z8OHa18CqO|#A1?h7Jup3WF$%(=PomBYnzcV%Vxh>vi#CZ
zJ2rH@V(HRLvTh|ed9cVbAu`4F4)9N?l#;UYX3^?;&9k)XfI;U%2|VU5UZ}ty90dMT
zxP?v^W_|B4nf39LlDDaVAWdH-X-OB1*RdGbS|N)B#~o}Hk_!Tmk^n0CeygYsnDVeg
zX}QZeO;r!|E(N|kBu<{^W&GO;3M!z3-fzXL5;uX_^qoA$q$(99qf&r6SQ!K6m(6L?
zNwL*{L%L+rU%9hsS)NQ)(LK?-uu6<AHzdRcW1#5d$KGYK5xFZ?-Botfp80GUj+4ee
z^4}VBt2k>IAYn~dW{<iqMxJ+?g1eOU;HX6~k$jCSyaBK@&4%z-n2{Sd$Z-;GGRca>
zF`aN&_8|NOe3ESxiVnGQqdWwUIFQX*hK8^w(9@RKC){3z?g$T@1EMVdl+cowu&eKN
zX-;2Ow2V=wf&hXS+f2J`lpQ1O<SnD$OrJ(?)M<Oz3hv>ETguIkjoce{I6vgcrvxI;
zSUIa~X=r;tAGB;K$c{_o`;LWtsS#JlKJ|0LFMKpbV26>4<XnZ3G|d`|Cg=sU!EgpN
z*7W}kq>+Ocagh{5XlNQwl4?LwB8giVNL<!N6h)e1L0>HdhTx>79d3t?O|GU?;}&Ae
zN@>f^coL+8*m_V@qqMLcHyTqqW5Swg#UNf$dZ9w+grlpf%T1_cn}yPlqxqeA+zD2A
z&?I+9c1x)WWpP>dCjL@1D&TuKFnRt~f;w2F1QQ05b2JAWXB%+1oQH_W(PqxH(^~9L
zvZJxa;XYO6Uy-A8PWm)G<LZJ_(H#g0rW+VG<JraLviV>{2}hqJNo(ugu$jAxlF>DH
ze!4U~M`>>gu8%t$e%zwm)6`AW<<!Ds*eaf5Ib23rBojhmg;N;>S133Xz#HP&o@mTI
zKtY*3F|FX!4~4mROw3f0{4Ln`tzxg(yTL!MX-xbSAPK)XH)#q*kv&Pb$mNo!q@5)|
zA<u8HMfgX-_On4*3<znivqBa{9&X9Dg(Xv*A!T#li-2r^mt_0Ca)5S8)i~be91rj+
z=^M6+C6pt^A_@!co5e`t(`E&xU!tf1%c$g0vDlWCK@4*!#TOnuGhazO1!Wdh8QGt*
z+{SKGGpi1$ef=Ch-W`y@lcTBGB99fVZWvW`Oh#%*DKT-<TPvu9C+2R`{O;lP_rVG5
zX}!6Zgj_$f9P2>Ma=$mFoB}2c;Y2p{*40|lSIR?FwVUW3GVMXj==0RM^L=}T7sz9;
z%5ZoQ51m$$YpFt8YnDpeoT65IPWM3^BgL&kF>6bNE*}tb&H;jx(sl_-3oX%v{#lP$
z@EviMk2-P_z9Lf67Ox%?Wu&f)>v1GeqC3#YA;>O|e|icX?jEwzr>Q+1h?CwuXq8Ab
z5x!avEq$C&5r;)Aw%F-l<DU8=@>`<lq)4fP$zI(<jsq89DrW)HM=oG1TBq<DNyKc5
z-6T9&?@5|FBqXXgeR?oM1L9V_KI4_ZCU}7PH6aLEeW|s2pm}7s2z(_EOKBZd1H$U|
z%yL@09eW^K%o~2anhWvnf=W<oLY2AODH4SS<pspTPw=^N-T;RlR?#Y$XgX2%NJ)Sa
z3zJhw-oTalSeaB?H*Y0DuKp})B63erO^HSZWd(pKnIEt2b@cuRwFGE+hE5}wHeqQd
zt7T~9`9)?Hv^?HjDH^p~$We+d%K^XN13yL^mRtQgim3=eCQot1F5)D;;x(&gM9tV+
zM0?Q~Hggp%n~SpLSc`^_JVj_ZT#e#(tGfVvp&UYSCPoWus#@=Ay`GKm)p|7>XUA5F
zRbmJ7QLWC819>eM!ZjR7@-+iEMMaZEWVtn9R&ts!){mJUk@X2@MG7EPUNdZbCiItd
zb{7o9iw#oY*j!7e3YbzxWDP^vOh)$~?MQ+37A9;=vc73KFB%o|=ld6P>L_N6sqg|&
z9fc>JQr|PUkclt1{FTf^Fqtwk+Li??swONcPtc}fwoq%S)KBs@_b6)Chcjsf3b7)!
zt*K2H1TzVHr3%L)HJA9qD~d(Elqu+|z%1%#xkf?a6+xFwn3UhmX+=aA-|nsnNja);
zW!(HEB?hNN^n+0h8feX;Ct~JgNKw+Iql|!=)Oyjp$cm8yI_+xN=9;rmJ}jDBI=unv
zz|Sr6=&>r|y?RWvXV49Hj1t`$sM=T2K-rIsa#emBJWj|Ck>o(Khq^t!m`AyfFFoag
zsRyW;1M<haMeH#yG`+D+A|{_l(L`9Ur+p=fi*lHrs5iOBh0;bFzyL;WOZ0FV`kW_~
zxFg!S#-8km;#!ie1=n&|gE~{f3iY7LtQHYp$ViB4;lo84PhD<maRij`Jx&qbil7oc
zM0ToS^0XW~QA4|ajFg@{9akZ_A>4xvT7l5XR>DN6^X?Xolt3fpk~>l>Et~FlEF+Io
z4XI<z4=Ddv0u1GA6xQ4(z#xCGngAUui`i0tR`me}OZ}ccfZ!GxfL`pyR#LywdkvBT
z^;)?vX%1s;rJzWSbIl}0R{e~oV`}_%3bm4(aRRvn7CFZ0@AurkBxRuSnDwf>*Q{$J
zcRh#Fyvjxb1P4;1eDi@uZ-KdSi!5L)bMIIsdtE`6PF0s~=|mRY2Nm&Dn$=1`isaUO
zc22IsZ|A{a+9Vjil}`_}@?bbg3CCmEUBR7sFo?jAfst*(1f(>_ud>1BEH31DlfNdr
z!3>h*hS)7!4H*%!os5IHB@CB7sfPzb@Zc#@4XZRVh;SrRV*msvJplDY>(DXCrh7Xo
z&<gwj^~h~^q0?1~QA6wud3zw7nD5jedz$31By_+j<|{c<zZMX+Ro;J04}_FU47CgN
z?T7LnVH!*qEvq`kz8}0KPKw3JWdaMC)sS#N|6mM|uoNK}e_iz1<>IO<no|LSp;oBq
z&XeOJvPbbxA0H3}tnld~c2YUzDQWRe32)k}vKTHvVr!O-oMoa&LuKT80bLqL_^?w9
z5fd8ZtLotv)F=nLZ#|qm;OH1r>^Pj0>S;1XWz>=5=#pL^gJ|a~sfjP535-_iK<v0|
zsnqSg;+x@L4;&a)3C!TyB?L^c)Mj(_LAiZvJ!*JB)kcuR141luz;iCpI09}EPej*U
zyi);pZ$<5v)x9e2j^uM%-2L2f0en4NN#2&EwjXZrrCg%D@R1c$cat;pg*c#lLrI~W
zeDEL=7X_fh1;D3T(!6b`HTW*80p<b1XA3A?ki(}|6I}?B77Kgf)ga!B3l~C74Qrv{
zl;4ZB^u3L6Bi4z~p|Hp{8K7E7tq1To4Xe$v0m*~I<Pp4+GU6=ri~?DtWehr$%$uk{
zhfquvOk2MoA*S(!6tvLwhk-1q57QX*T#N6h)xTI`+^aW>YppcDAI|{T%Dzp;%C)`5
z@M0CM=pu?3UX+bmI@|8@kd|J@%mfx2Q69GSupC<LWVG-o7U*ec(`w2-wa!5k@35&h
zamd>r?hs$&uu1?b`AgDb!>1wMJ{!rNq(dnL6<-ubA!o_CXdg=0O(lK8p-XG~Dfbr;
zPb82e0r5wU4oHe-WUBc)aGPvUZffdtjE#Cvwo6-1gKU(eh;CQCv7Hn^&@h^BZl}*P
zg5b|HYXEWz$sUMSp>4r+*)$-O>8KbMGO{+bSk4b9eOtO)8mPe=R1hoaba?PpOJ9Y8
z+Hjsmnx66Z;qqueuk+%HASr|pR%t3LQX7h`)P~U8<GPDV^r2~#rslZb?lzz{dp29s
z)K@c86Lbl?24Q0h2od3cF7Ze7OV~9%Ta;sV21c|X5MpcCaq@%>YmQS4o3&@Tm)x9O
z6PRIj0R!EF3m56;)qXWo=|RgHcfJs<7I-K{QU_r9h7%<Lak)?P8e6!3uj9GEvfArM
znnA4gZz$AoEvNj7JhzAuG&lIBraXp1>z#JY^72p@druJk94z?`eP&?KP)`X&J<6Lt
zS{zJrWft?1ip}9Q6iXCyCvzVi;JUOKtJvD=6_eIcz|S@6rqDsIxK+aNx#MFHtQ>?K
z3T9cbT%@`b(9-x^%vqYe*FY{>+!u>`{}LA@g=ikorA|y)i>qNrt7@r%S8@i*+svY7
z%ZvC}hnjyB8G(rBl)VOUMWUFzR)pxHRUR!^yv^x%?-Sv#$v+QN8!sYID`6zo7Oepb
z?R-pFDUr-#>!25OQc<rPfk~?xhHPC|!KA9n{<MkeD8I1*dnDbV^_HnkS+sH%P`;JN
z|DGQ9dW-5ZMV5gccCErvJAv$jT&y})WCI^r){b;U-MwyxA^43PiQ67^&NQ2p)OT>m
z!o(0x%hbEj(9j?z-BT8!Is7R%Hf^xXVp?l!b@EV3_gILy5Ra&*VDEBEV#5%$C4<>g
zy&X0&@FeQ&u?^Mv9*wM%U@MeckV;cTbLSe}s4p7T)b}KTyPr~&74%UxzxzCF<^~#g
za9l515~bvjS;FmwWxL~oN}ioK37wvDAFAfu0b_NR_=YkDzDwn7T02a;znvpl*67Jr
zI{Yg&rxL<i&7UlV69~AY=G<_rUN!A4?rw-La2OJO2Z0=GcEQ(fmRqB=)vND8<SX6~
z`5IRm*fI&LVWT$c*~vC?PeL^Z%}x1l8<QKIvYGQ;AWrmb^k1JP#I~ACw03@p=9y2D
zbVWAVH4W1)l=dR<QK?xwV?}pF6p>)!5=Pr5+w8}!01~b0eX3HZ&jc+kZgv&4`cqi5
zxw{z#U84292lqUZ{z-~{Sc+}nGLuh`|9|5}o2Lfvf-z+=*4(Nl6Y+Bi&8$uu6DoOp
ziZUWg^SY)_!_~=(tCa%AFEdsEV>@||g}j=)cI19d#isZs+ZriYY0r;EQaAy{O-kAH
zIb~?`X|}UXn<t>L7dKxJ?$YfekRDTz%6Y=n_)T`vDmgj)zQpZ&X%<amIkoL?N+^S1
z0-MyZ2^!RDGu(5lFgM6621AuFTQrzukKdsm6VM%~7@PM87?LSn5)W~kA!|k(P#ZgL
z-6V$U2E^6jG;PlKU_`C@>QU|P0UW7jmN((4994{HuY!h5(QK?K>nEa7F;>wX@)q2k
z!OJzr6s8TD;@8`u=;J#yfzuEmIg~Qaqi0N!&DmnPq9;x5$gD+jMknT%&Qes7<ISS&
z86KX3Ia^9=>7s)E5_G{e-LbYFZ{_OFxl=wU@?w<{6A-$)ph8qM{>frR(jZE7()KKx
zo0L`SKc1O!d^SDgYP|UA4CZrkW}1ekG2~BuU@eDS%hS<niVZ+CVNo-jxLZOf%kvX5
zlM~|J7=3z5c5&`|Z;yA!l3+><P6<qF_e7k*XGO(N%0!7sZA87%SK;ZTJI~~=dEEq$
zk{CW1g#F$&q*ux``CL1uJ@W+oNFq;;*2H)PCW#<5yzCdl+pcg`REtAsB4R3c8#W8Y
ztX2y|v4)RtNo8&_D}(q6q5{*3lAhcNDO^7(o?IHuSZS;FcR*D42&~8=)Y1W~zgRJg
z+6-h0IWcvYhPkDvrID?s?O#c1EjqZW+aKCm$!P$i{0Bow5G7VD(EB)1oPau=nm@>U
zD}*M#A}awj=1mPjD|gvs(LPSt_{Cx^CuoAQ4DNcF7ID&L$Mf5%c4&eKkbc0il2s^c
GkpB-CpMAyv

literal 0
HcmV?d00001

diff --git a/ressources/po/kisscount.pot b/resources/po/kisscount.pot
similarity index 53%
rename from ressources/po/kisscount.pot
rename to resources/po/kisscount.pot
index 4adce5d..2eae29f 100644
--- a/ressources/po/kisscount.pot
+++ b/resources/po/kisscount.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-02-08 15:12+0100\n"
+"POT-Creation-Date: 2015-06-20 17:48+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,22 +17,23 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/view/StatsPanel.cpp:315
+#: src/view/StatsPanel.cpp:316
 msgid " - "
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:1155
+#: src/view/PreferencesPanel.cpp:1371
 msgid " ?"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:859 src/view/PreferencesPanel.cpp:869
-#: src/view/PreferencesPanel.cpp:892 src/view/PreferencesPanel.cpp:1034
-#: src/view/PreferencesPanel.cpp:1056 src/view/PreferencesPanel.cpp:1099
+#: src/view/PreferencesPanel.cpp:993 src/view/PreferencesPanel.cpp:1003
+#: src/view/PreferencesPanel.cpp:1026 src/view/PreferencesPanel.cpp:1168
+#: src/view/PreferencesPanel.cpp:1190 src/view/PreferencesPanel.cpp:1255
+#: src/view/PreferencesPanel.cpp:1277 src/view/PreferencesPanel.cpp:1315
 #: src/view/UsersDialog.cpp:123
 msgid " already exists"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:274
+#: src/view/ImportPanel.cpp:335
 msgid " and "
 msgstr ""
 
@@ -40,11 +41,12 @@ msgstr ""
 msgid " does not exist"
 msgstr ""
 
-#: src/view/ExportPanel.cpp:90 src/view/SearchPanel.cpp:146
+#: src/view/ExportPanel.cpp:90 src/view/SearchPanel.cpp:149
 msgid " entries found"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:296 src/view/ImportPanel.cpp:320
+#: src/view/ImportPanel.cpp:360 src/view/ImportPanel.cpp:384
+#: src/view/ImportPanel.cpp:407
 msgid " must have a name"
 msgstr ""
 
@@ -52,7 +54,7 @@ msgstr ""
 msgid " not found, aborting"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:839
+#: src/view/AccountPanel.cpp:855
 msgid " operations ?"
 msgstr ""
 
@@ -64,25 +66,30 @@ msgstr ""
 msgid " successfully removed"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:280
+#: src/view/ImportPanel.cpp:344
 msgid " will be created, is it ok ?"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:273
+#: src/view/ImportPanel.cpp:334
 #, c-format
 msgid "%d accounts"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:278
+#: src/view/ImportPanel.cpp:339
 #, c-format
 msgid "%d categories"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:288
+#: src/view/ImportPanel.cpp:342
+#, c-format
+msgid "%d tags"
+msgstr ""
+
+#: src/view/StatsPanel.cpp:289
 msgid "0 line"
 msgstr ""
 
-#: src/view/ExportPanel.cpp:92 src/view/SearchPanel.cpp:148
+#: src/view/ExportPanel.cpp:92 src/view/SearchPanel.cpp:151
 msgid "1 entry found"
 msgstr ""
 
@@ -90,56 +97,56 @@ msgstr ""
 msgid "A new database will be created, continue ?"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:103 src/view/grid/GridAccount.cpp:73
+#: src/view/SearchBanner.cpp:115 src/view/grid/GridAccount.cpp:74
 msgid "Account"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:869 src/view/PreferencesPanel.cpp:892
-#: src/view/ImportPanel.cpp:296
+#: src/view/PreferencesPanel.cpp:1003 src/view/PreferencesPanel.cpp:1026
+#: src/view/ImportPanel.cpp:360
 msgid "Account "
 msgstr ""
 
-#: src/controller/KissCount.cpp:353
+#: src/controller/KissCount.cpp:380
 msgid "Account 1"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:859
+#: src/view/PreferencesPanel.cpp:993
 msgid "Account must have a name"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:68 src/view/AccountPanel.cpp:432
+#: src/view/ImportPanel.cpp:69 src/view/AccountPanel.cpp:448
 msgid "Account name"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:431
+#: src/view/AccountPanel.cpp:447
 msgid "Account number"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:287 src/view/PreferencesPanel.cpp:50
+#: src/view/StatsPanel.cpp:288 src/view/PreferencesPanel.cpp:52
 msgid "Accounts"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:1024
+#: src/view/AccountPanel.cpp:1040
 msgid "Accounts updated until "
 msgstr ""
 
-#: src/view/StatsPanel.cpp:265
+#: src/view/StatsPanel.cpp:266
 msgid "Amount"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:99
+#: src/view/SearchBanner.cpp:110
 msgid "Amount from"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:100
+#: src/view/SearchBanner.cpp:111
 msgid "Amount to"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:1029
+#: src/view/AccountPanel.cpp:1045
 msgid "Any account updated !"
 msgstr ""
 
-#: src/view/ExportPanel.cpp:130 src/view/ImportPanel.cpp:162
+#: src/view/ExportPanel.cpp:130 src/view/ImportPanel.cpp:180
 msgid "Any engine can process this file !"
 msgstr ""
 
@@ -147,23 +154,23 @@ msgstr ""
 msgid "Are you sure want to come back to "
 msgstr ""
 
-#: src/view/SnapshotsDialog.cpp:137 src/view/AccountPanel.cpp:834
+#: src/view/SnapshotsDialog.cpp:137 src/view/AccountPanel.cpp:850
 msgid "Are you sure want to delete "
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:839
+#: src/view/grid/GridAccount.cpp:865
 msgid "Are you sure want to delete : \n"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:1155
+#: src/view/PreferencesPanel.cpp:1371
 msgid "Are you sure want to delete profil of "
 msgstr ""
 
-#: src/view/ImportPanel.cpp:368
+#: src/view/ImportPanel.cpp:455
 msgid "Are you sure want to integrate these operations ?"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:467
+#: src/view/PreferencesPanel.cpp:554
 msgid "Ascending"
 msgstr ""
 
@@ -171,15 +178,15 @@ msgstr ""
 msgid "Back to this snapshot"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:345
+#: src/view/PreferencesPanel.cpp:363
 msgid "Background color"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:225
+#: src/view/AccountPanel.cpp:241
 msgid "Balance"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:212
+#: src/view/PreferencesPanel.cpp:230
 msgid "Blocked"
 msgstr ""
 
@@ -192,11 +199,11 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:1189 src/view/grid/GridAccount.cpp:1202
+#: src/view/grid/GridAccount.cpp:1263 src/view/grid/GridAccount.cpp:1276
 msgid "Cannot group these operations"
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:1355 src/view/grid/GridAccount.cpp:1361
+#: src/view/grid/GridAccount.cpp:1430 src/view/grid/GridAccount.cpp:1436
 msgid "Cannot ungroup these operations"
 msgstr ""
 
@@ -206,36 +213,36 @@ msgid ""
 "be deleted."
 msgstr ""
 
-#: src/controller/KissCount.cpp:344
+#: src/controller/KissCount.cpp:371
 msgid "Car"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:51
+#: src/view/PreferencesPanel.cpp:53
 msgid "Categories"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:101 src/view/grid/GridAccount.cpp:73
+#: src/view/SearchBanner.cpp:112 src/view/grid/GridAccount.cpp:74
 msgid "Category"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:1034 src/view/PreferencesPanel.cpp:1056
-#: src/view/ImportPanel.cpp:320
+#: src/view/PreferencesPanel.cpp:1168 src/view/PreferencesPanel.cpp:1190
+#: src/view/ImportPanel.cpp:384
 msgid "Category "
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:1024
+#: src/view/PreferencesPanel.cpp:1158
 msgid "Category must have a name"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:75
+#: src/view/ImportPanel.cpp:76
 msgid "Category name"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:68
+#: src/view/PreferencesPanel.cpp:71
 msgid "Change Name"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:69
+#: src/view/PreferencesPanel.cpp:72
 msgid "Change Password"
 msgstr ""
 
@@ -251,26 +258,34 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:119
+#: src/view/SearchPanel.cpp:55
+msgid "Change tag"
+msgstr ""
+
+#: src/view/AccountPanel.cpp:131
 msgid "Check"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:82
+#: src/view/SearchBanner.cpp:93
 msgid "Checked"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:125
+#: src/view/ImportPanel.cpp:140
 msgid "Choose a database to open"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:195
+#: src/view/SearchPanel.cpp:198
 msgid "Choose a new account"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:237
+#: src/view/SearchPanel.cpp:240
 msgid "Choose a new category"
 msgstr ""
 
+#: src/view/SearchPanel.cpp:287
+msgid "Choose a new tag"
+msgstr ""
+
 #: src/view/PasswordDialog.cpp:41
 msgid "Confirm password"
 msgstr ""
@@ -283,58 +298,60 @@ msgstr ""
 msgid "Create a snapshot"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:173 src/view/ImportPanel.cpp:203
-#: src/view/ImportPanel.cpp:247 src/view/ImportPanel.cpp:258
-#: src/view/ImportPanel.cpp:287 src/view/ImportPanel.cpp:310
+#: src/view/ImportPanel.cpp:191 src/view/ImportPanel.cpp:221
+#: src/view/ImportPanel.cpp:251 src/view/ImportPanel.cpp:297
+#: src/view/ImportPanel.cpp:308 src/view/ImportPanel.cpp:319
+#: src/view/ImportPanel.cpp:351 src/view/ImportPanel.cpp:374
+#: src/view/ImportPanel.cpp:397
 msgid "Create one"
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:73
+#: src/view/grid/GridAccount.cpp:74
 msgid "Credit"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:221
+#: src/view/AccountPanel.cpp:237
 msgid "Cur Credit"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:222
+#: src/view/AccountPanel.cpp:238
 msgid "Cur Debit"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:434
+#: src/view/AccountPanel.cpp:450
 msgid "Current value"
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:73
+#: src/view/grid/GridAccount.cpp:74
 msgid "Date"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:30
+#: src/view/SearchBanner.cpp:31
 msgid "Date from"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:31
+#: src/view/SearchBanner.cpp:32
 msgid "Date to"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:279
+#: src/view/StatsPanel.cpp:280
 msgid "Days"
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:73
+#: src/view/grid/GridAccount.cpp:74
 msgid "Debit"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:210
+#: src/view/PreferencesPanel.cpp:228
 msgid "Default"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:665
+#: src/view/PreferencesPanel.cpp:752
 msgid "Default account cannot be hidden"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:213 src/view/PreferencesPanel.cpp:348
-#: src/view/AccountPanel.cpp:692
+#: src/view/PreferencesPanel.cpp:231 src/view/PreferencesPanel.cpp:366
+#: src/view/PreferencesPanel.cpp:471 src/view/AccountPanel.cpp:708
 msgid "Delete"
 msgstr ""
 
@@ -342,44 +359,46 @@ msgstr ""
 msgid "Delete a snapshot"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:468
+#: src/view/PreferencesPanel.cpp:555
 msgid "Descending"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:98 src/view/grid/GridAccount.cpp:73
+#: src/view/SearchBanner.cpp:109 src/view/grid/GridAccount.cpp:74
 msgid "Description"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:276
+#: src/view/SearchPanel.cpp:324
 msgid "Enter a new description"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:330 src/view/PreferencesPanel.cpp:592
-#: src/view/PreferencesPanel.cpp:665 src/view/PreferencesPanel.cpp:859
-#: src/view/PreferencesPanel.cpp:869 src/view/PreferencesPanel.cpp:892
-#: src/view/PreferencesPanel.cpp:1024 src/view/PreferencesPanel.cpp:1034
-#: src/view/PreferencesPanel.cpp:1056 src/view/PreferencesPanel.cpp:1093
-#: src/view/PreferencesPanel.cpp:1099 src/view/PreferencesPanel.cpp:1141
-#: src/view/ExportPanel.cpp:117 src/view/ExportPanel.cpp:130
-#: src/view/ExportPanel.cpp:137 src/view/PasswordDialog.cpp:64
-#: src/view/PasswordDialog.cpp:70 src/view/SearchBanner.cpp:171
-#: src/view/SearchBanner.cpp:181 src/view/SearchBanner.cpp:194
-#: src/view/SearchBanner.cpp:203 src/view/SnapshotsDialog.cpp:117
-#: src/view/SnapshotsDialog.cpp:133 src/view/SnapshotsDialog.cpp:142
-#: src/view/SnapshotsDialog.cpp:167 src/view/SnapshotsDialog.cpp:176
-#: src/view/grid/GridAccount.cpp:1189 src/view/grid/GridAccount.cpp:1202
-#: src/view/grid/GridAccount.cpp:1355 src/view/grid/GridAccount.cpp:1361
-#: src/view/grid/FormulaDelegate.cpp:59 src/view/ImportPanel.cpp:162
-#: src/view/ImportPanel.cpp:296 src/view/ImportPanel.cpp:320
-#: src/view/AccountPanel.cpp:830 src/view/UsersDialog.cpp:93
+#: src/view/StatsPanel.cpp:331 src/view/PreferencesPanel.cpp:679
+#: src/view/PreferencesPanel.cpp:752 src/view/PreferencesPanel.cpp:993
+#: src/view/PreferencesPanel.cpp:1003 src/view/PreferencesPanel.cpp:1026
+#: src/view/PreferencesPanel.cpp:1158 src/view/PreferencesPanel.cpp:1168
+#: src/view/PreferencesPanel.cpp:1190 src/view/PreferencesPanel.cpp:1245
+#: src/view/PreferencesPanel.cpp:1255 src/view/PreferencesPanel.cpp:1277
+#: src/view/PreferencesPanel.cpp:1309 src/view/PreferencesPanel.cpp:1315
+#: src/view/PreferencesPanel.cpp:1357 src/view/ExportPanel.cpp:117
+#: src/view/ExportPanel.cpp:130 src/view/ExportPanel.cpp:137
+#: src/view/PasswordDialog.cpp:64 src/view/PasswordDialog.cpp:70
+#: src/view/SearchBanner.cpp:185 src/view/SearchBanner.cpp:195
+#: src/view/SearchBanner.cpp:208 src/view/SearchBanner.cpp:217
+#: src/view/SnapshotsDialog.cpp:117 src/view/SnapshotsDialog.cpp:133
+#: src/view/SnapshotsDialog.cpp:142 src/view/SnapshotsDialog.cpp:167
+#: src/view/SnapshotsDialog.cpp:176 src/view/grid/GridAccount.cpp:1263
+#: src/view/grid/GridAccount.cpp:1276 src/view/grid/GridAccount.cpp:1430
+#: src/view/grid/GridAccount.cpp:1436 src/view/grid/FormulaDelegate.cpp:59
+#: src/view/ImportPanel.cpp:180 src/view/ImportPanel.cpp:360
+#: src/view/ImportPanel.cpp:384 src/view/ImportPanel.cpp:407
+#: src/view/AccountPanel.cpp:846 src/view/UsersDialog.cpp:93
 #: src/view/UsersDialog.cpp:123 src/model/Database.cpp:47
 #: src/model/Database.cpp:55 src/model/Database.cpp:74
 #: src/model/Database.cpp:99 src/model/Database.cpp:105
 #: src/model/Database.cpp:111 src/model/Database.cpp:121
-#: src/model/Database.cpp:140 src/model/Database.cpp:583
-#: src/model/Database.cpp:759 src/model/Database.cpp:901
-#: src/model/Database.cpp:1721 src/model/DatabaseUpdate.cpp:31
-#: src/model/DatabaseUpdate.cpp:164
+#: src/model/Database.cpp:140 src/model/Database.cpp:604
+#: src/model/Database.cpp:780 src/model/Database.cpp:922
+#: src/model/Database.cpp:1038 src/model/Database.cpp:1881
+#: src/model/DatabaseUpdate.cpp:31 src/model/DatabaseUpdate.cpp:183
 msgid "Error"
 msgstr ""
 
@@ -395,28 +414,32 @@ msgstr ""
 msgid "Failed to save operations"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:68
+#: src/view/ImportPanel.cpp:69
 msgid "File account"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:75
+#: src/view/ImportPanel.cpp:76
 msgid "File category"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:435
+#: src/view/ImportPanel.cpp:83
+msgid "File tag"
+msgstr ""
+
+#: src/view/AccountPanel.cpp:451
 msgid "Final value"
 msgstr ""
 
-#: src/controller/KissCount.cpp:344 src/view/SearchBanner.cpp:78
-#: src/view/grid/GridAccount.cpp:360
+#: src/controller/KissCount.cpp:371 src/view/SearchBanner.cpp:89
+#: src/view/grid/GridAccount.cpp:378
 msgid "Fix"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:347
+#: src/view/PreferencesPanel.cpp:365
 msgid "Font"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:346
+#: src/view/PreferencesPanel.cpp:364
 msgid "Foreground color"
 msgstr ""
 
@@ -428,63 +451,67 @@ msgstr ""
 msgid "From "
 msgstr ""
 
-#: src/view/GenerateDialog.cpp:34 src/view/AccountPanel.cpp:689
+#: src/view/GenerateDialog.cpp:34 src/view/AccountPanel.cpp:705
 msgid "Generate month"
 msgstr ""
 
-#: src/model/import/GrisbiImportEngine.cpp:166
+#: src/model/import/GrisbiImportEngine.cpp:167
 msgid "Grisbi files (*.gsb)"
 msgstr ""
 
-#: src/controller/KissCount.cpp:344
+#: src/controller/KissCount.cpp:371
 msgid "Groceries"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:143
+#: src/view/AccountPanel.cpp:155
 msgid "Group"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:214
+#: src/view/PreferencesPanel.cpp:232
 msgid "Hidden"
 msgstr ""
 
-#: src/controller/KissCount.cpp:344
+#: src/controller/KissCount.cpp:371
 msgid "Hobbies"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:113
+#: src/view/ImportPanel.cpp:128
 msgid "Import"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:433
+#: src/view/AccountPanel.cpp:449
 msgid "Initial value"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:51
+#: src/view/ImportPanel.cpp:52
 msgid "Integrate operations"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:68
+#: src/view/ImportPanel.cpp:69
 msgid "Internal account"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:75
+#: src/view/ImportPanel.cpp:76
 msgid "Internal category"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:181
+#: src/view/ImportPanel.cpp:83
+msgid "Internal tag"
+msgstr ""
+
+#: src/view/SearchBanner.cpp:195
 msgid "Invalid amount from"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:203
+#: src/view/SearchBanner.cpp:217
 msgid "Invalid amount range"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:194
+#: src/view/SearchBanner.cpp:208
 msgid "Invalid amount to"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:171
+#: src/view/SearchBanner.cpp:185
 msgid "Invalid date range"
 msgstr ""
 
@@ -492,7 +519,7 @@ msgstr ""
 msgid "Invalid formula !"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:1093
+#: src/view/PreferencesPanel.cpp:1309
 msgid "Invalid name !"
 msgstr ""
 
@@ -504,26 +531,26 @@ msgstr ""
 msgid "Invalid password"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:330
+#: src/view/StatsPanel.cpp:331
 msgid "Invalide date range"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:592
+#: src/view/PreferencesPanel.cpp:679
 msgid "It must be at least one account !"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:830
+#: src/view/AccountPanel.cpp:846
 msgid "It must be at least one month !"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:70
+#: src/view/PreferencesPanel.cpp:73
 msgid "Kill me"
 msgstr ""
 
 #: src/view/ExportPanel.cpp:90 src/view/ExportPanel.cpp:92
 #: src/view/ExportPanel.cpp:95 src/view/ExportPanel.cpp:135
-#: src/view/SearchPanel.cpp:146 src/view/SearchPanel.cpp:148
-#: src/view/SearchPanel.cpp:151
+#: src/view/SearchPanel.cpp:149 src/view/SearchPanel.cpp:151
+#: src/view/SearchPanel.cpp:154
 msgid "KissCount"
 msgstr ""
 
@@ -531,7 +558,7 @@ msgstr ""
 msgid "KissCount - Export"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:118
+#: src/view/ImportPanel.cpp:133
 msgid "KissCount - Import"
 msgstr ""
 
@@ -543,40 +570,40 @@ msgstr ""
 msgid "KissCount xml files (*.xml)"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:52
+#: src/view/PreferencesPanel.cpp:55
 msgid "Language"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:1141
+#: src/view/PreferencesPanel.cpp:1357
 msgid "Language not changed"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:1138
+#: src/view/PreferencesPanel.cpp:1354
 msgid "Language successfully changed, please go to another panel"
 msgstr ""
 
-#: src/view/wxUI.cpp:317
+#: src/view/wxUI.cpp:319
 msgid "Licenced under GNU GPL v3"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:47
+#: src/view/ImportPanel.cpp:48
 msgid "Load operations"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:115
+#: src/view/AccountPanel.cpp:127
 msgid "Mode"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:276
+#: src/view/StatsPanel.cpp:277
 msgid "Months"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:62 src/view/PreferencesPanel.cpp:208
-#: src/view/PreferencesPanel.cpp:344
+#: src/view/PreferencesPanel.cpp:65 src/view/PreferencesPanel.cpp:226
+#: src/view/PreferencesPanel.cpp:362 src/view/PreferencesPanel.cpp:470
 msgid "Name"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:1105
+#: src/view/PreferencesPanel.cpp:1321
 msgid "Name changed"
 msgstr ""
 
@@ -588,11 +615,15 @@ msgstr ""
 msgid "New password"
 msgstr ""
 
-#: src/view/ExportPanel.cpp:95 src/view/SearchPanel.cpp:151
+#: src/view/grid/GridAccount.cpp:124
+msgid "No Tag"
+msgstr ""
+
+#: src/view/ExportPanel.cpp:95 src/view/SearchPanel.cpp:154
 msgid "No entry found"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:352
+#: src/view/ImportPanel.cpp:439
 msgid "No operation found into this file"
 msgstr ""
 
@@ -600,24 +631,25 @@ msgstr ""
 msgid "No operation to save"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:80 src/view/CostRepartitionBanner.cpp:106
+#: src/view/SearchBanner.cpp:91 src/view/CostRepartitionBanner.cpp:106
 msgid "Non fix"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:608 src/view/PreferencesPanel.cpp:700
-#: src/view/SearchPanel.cpp:191 src/view/SearchPanel.cpp:233
+#: src/view/PreferencesPanel.cpp:695 src/view/PreferencesPanel.cpp:787
+#: src/view/PreferencesPanel.cpp:834 src/view/SearchPanel.cpp:194
+#: src/view/SearchPanel.cpp:236 src/view/SearchPanel.cpp:283
 msgid "None"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:84
+#: src/view/SearchBanner.cpp:95
 msgid "Not checked"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:209
+#: src/view/PreferencesPanel.cpp:227
 msgid "Number"
 msgstr ""
 
-#: src/model/import/OFXImportEngine.cpp:144
+#: src/model/import/OFXImportEngine.cpp:145
 msgid "OFX files (*.ofx)"
 msgstr ""
 
@@ -630,15 +662,15 @@ msgstr ""
 msgid "Old password"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:53
+#: src/view/PreferencesPanel.cpp:56
 msgid "Operation order"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:102 src/view/AccountPanel.cpp:198
+#: src/view/SearchBanner.cpp:114 src/view/AccountPanel.cpp:214
 msgid "Operations"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:425
+#: src/view/ImportPanel.cpp:512
 msgid "Operations successfully imported"
 msgstr ""
 
@@ -646,7 +678,7 @@ msgstr ""
 msgid "Operations successfuly saved"
 msgstr ""
 
-#: src/controller/KissCount.cpp:345
+#: src/controller/KissCount.cpp:372
 msgid "Other"
 msgstr ""
 
@@ -658,7 +690,7 @@ msgstr ""
 msgid "Password changed"
 msgstr ""
 
-#: src/view/wxUI.cpp:317
+#: src/view/wxUI.cpp:319
 msgid "Personal accounting software"
 msgstr ""
 
@@ -666,19 +698,19 @@ msgstr ""
 msgid "Please retype new password"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:194 src/view/PreferencesPanel.cpp:1146
+#: src/view/PreferencesPanel.cpp:212 src/view/PreferencesPanel.cpp:1362
 msgid "Preferences"
 msgstr ""
 
-#: src/view/wxUI.cpp:322
+#: src/view/wxUI.cpp:324
 msgid "Quit KissCount ?"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:118
+#: src/view/AccountPanel.cpp:130
 msgid "Real"
 msgstr ""
 
-#: src/view/SearchPanel.cpp:55
+#: src/view/SearchPanel.cpp:56
 msgid "Rename"
 msgstr ""
 
@@ -686,20 +718,20 @@ msgstr ""
 msgid "Save as"
 msgstr ""
 
-#: src/view/ImportPanel.cpp:55
+#: src/view/ImportPanel.cpp:56
 msgid "Save import patterns"
 msgstr ""
 
 #: src/view/ExportPanel.cpp:38 src/view/SearchPanel.cpp:40
-#: src/view/SearchPanel.cpp:95 src/view/SearchPanel.cpp:288
+#: src/view/SearchPanel.cpp:98 src/view/SearchPanel.cpp:336
 msgid "Search"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:54
+#: src/view/PreferencesPanel.cpp:57
 msgid "Shared with"
 msgstr ""
 
-#: src/view/SnapshotsDialog.cpp:32 src/view/AccountPanel.cpp:146
+#: src/view/SnapshotsDialog.cpp:32 src/view/AccountPanel.cpp:158
 msgid "Snapshots"
 msgstr ""
 
@@ -707,23 +739,44 @@ msgstr ""
 msgid "Some operations date has been updated"
 msgstr ""
 
-#: src/view/StatsPanel.cpp:143 src/view/StatsPanel.cpp:315
+#: src/view/StatsPanel.cpp:143 src/view/StatsPanel.cpp:316
 msgid "Statistics"
 msgstr ""
 
+#: src/view/SearchBanner.cpp:113 src/view/grid/GridAccount.cpp:74
+msgid "Tag"
+msgstr ""
+
+#: src/view/PreferencesPanel.cpp:1255 src/view/PreferencesPanel.cpp:1277
+#: src/view/ImportPanel.cpp:407
+msgid "Tag "
+msgstr ""
+
+#: src/view/PreferencesPanel.cpp:1245
+msgid "Tag must have a name"
+msgstr ""
+
+#: src/view/ImportPanel.cpp:83
+msgid "Tag name"
+msgstr ""
+
+#: src/view/PreferencesPanel.cpp:54
+msgid "Tags"
+msgstr ""
+
 #: src/view/StatsPanel.cpp:78
 msgid "To"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:216 src/view/AccountPanel.cpp:223
+#: src/view/AccountPanel.cpp:232 src/view/AccountPanel.cpp:239
 msgid "Total Credit"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:217 src/view/AccountPanel.cpp:224
+#: src/view/AccountPanel.cpp:233 src/view/AccountPanel.cpp:240
 msgid "Total Debit"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:144
+#: src/view/AccountPanel.cpp:156
 msgid "UnGroup"
 msgstr ""
 
@@ -740,7 +793,7 @@ msgid "Unable to open Database"
 msgstr ""
 
 #: src/model/Database.cpp:47 src/model/Database.cpp:55
-#: src/model/Database.cpp:74 src/model/Database.cpp:1721
+#: src/model/Database.cpp:74 src/model/Database.cpp:1881
 msgid "Unable to open database"
 msgstr ""
 
@@ -748,17 +801,18 @@ msgstr ""
 msgid "Unable to remove "
 msgstr ""
 
-#: src/model/DatabaseUpdate.cpp:164
+#: src/model/DatabaseUpdate.cpp:183
 msgid "Unable to upgrade Database"
 msgstr ""
 
-#: src/controller/KissCount.cpp:345
+#: src/controller/KissCount.cpp:372
 msgid "Unexpected"
 msgstr ""
 
-#: src/view/SearchBanner.cpp:68 src/view/SearchBanner.cpp:89
-#: src/view/AccountPanel.cpp:583 src/model/User.cpp:72 src/model/User.cpp:90
-#: src/model/User.cpp:168
+#: src/view/SearchBanner.cpp:69 src/view/SearchBanner.cpp:79
+#: src/view/SearchBanner.cpp:100 src/view/AccountPanel.cpp:599
+#: src/model/User.cpp:72 src/model/User.cpp:90 src/model/User.cpp:178
+#: src/model/User.cpp:238
 msgid "Unknown"
 msgstr ""
 
@@ -770,20 +824,24 @@ msgstr ""
 msgid "Unresolved categories"
 msgstr ""
 
-#: src/model/Database.cpp:583 src/model/Database.cpp:759
-#: src/model/Database.cpp:901
+#: src/view/ImportPanel.cpp:35
+msgid "Unresolved tags"
+msgstr ""
+
+#: src/model/Database.cpp:604 src/model/Database.cpp:780
+#: src/model/Database.cpp:922 src/model/Database.cpp:1038
 msgid "Update failed !\n"
 msgstr ""
 
-#: src/view/AccountPanel.cpp:145
+#: src/view/AccountPanel.cpp:157
 msgid "Update next months"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:49
+#: src/view/PreferencesPanel.cpp:51
 msgid "User"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:1099 src/view/UsersDialog.cpp:40
+#: src/view/PreferencesPanel.cpp:1315 src/view/UsersDialog.cpp:40
 #: src/view/UsersDialog.cpp:123
 msgid "User "
 msgstr ""
@@ -792,11 +850,11 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:211 src/view/AccountPanel.cpp:117
+#: src/view/PreferencesPanel.cpp:229 src/view/AccountPanel.cpp:129
 msgid "Virtual"
 msgstr ""
 
-#: src/view/GenerateDialog.cpp:215 src/view/grid/GridAccount.cpp:1076
+#: src/view/GenerateDialog.cpp:215 src/view/grid/GridAccount.cpp:1127
 msgid "Warning"
 msgstr ""
 
@@ -804,15 +862,19 @@ msgstr ""
 msgid "Welcome back to "
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:613
+#: src/view/PreferencesPanel.cpp:700
 msgid "Wich account will replace this one ?"
 msgstr ""
 
-#: src/view/PreferencesPanel.cpp:706
+#: src/view/PreferencesPanel.cpp:793
 msgid "Wich category will replace this one ?"
 msgstr ""
 
-#: src/view/grid/GridAccount.cpp:1076
+#: src/view/PreferencesPanel.cpp:840
+msgid "Wich tag will replace this one ?"
+msgstr ""
+
+#: src/view/grid/GridAccount.cpp:1127
 msgid "You made a debit on a blocked account"
 msgstr ""
 
diff --git a/ressources/po/french.qm b/ressources/po/french.qm
deleted file mode 100644
index ca42ce68c85a6e85a7b579a799208832f4003585..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15948
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
RmLM}pHQ-3W$rTOA{||YJ#_#|D

diff --git a/src/model/Database.hpp b/src/model/Database.hpp
index f382619..817e78d 100644
--- a/src/model/Database.hpp
+++ b/src/model/Database.hpp
@@ -36,7 +36,7 @@
 #endif
 #define BDD_FILE     "kc.bdd"
 
-#define INIT_SCRIPT  RESSOURCES_ROOT "init.sql"
+#define INIT_SCRIPT  RESOURCES_ROOT "init.sql"
 
 
 // if (!_db.CheckSyntax(req))			
diff --git a/src/view/SupportedLanguages.hpp b/src/view/SupportedLanguages.hpp
index f4a97c0..9ee4c86 100644
--- a/src/view/SupportedLanguages.hpp
+++ b/src/view/SupportedLanguages.hpp
@@ -21,7 +21,7 @@
 #define SUPPORTEDLANGUAGES_H
 
 namespace SupportedLanguages {
-#define ICONS_PATH RESSOURCES_ROOT "icons/"
+#define ICONS_PATH RESOURCES_ROOT "icons/"
 
     enum Language {English, French, NB_SUPPORTED_LANGUAGES} ;
 
diff --git a/src/view/view.hpp b/src/view/view.hpp
index b59dd70..b7767c5 100644
--- a/src/view/view.hpp
+++ b/src/view/view.hpp
@@ -32,29 +32,29 @@ namespace view {
 #define DEFAULT_FONT(font_name)  QFont font_name;
 };
 
-#define DELETE_ICON RESSOURCES_ROOT "icons/delete.png"
-#define CHECKED_ICON  RESSOURCES_ROOT "icons/check.png"
+#define DELETE_ICON RESOURCES_ROOT "icons/delete.png"
+#define CHECKED_ICON  RESOURCES_ROOT "icons/check.png"
 
-#define USER_ICON RESSOURCES_ROOT "icons/user.png"
-#define STATS_ICON   RESSOURCES_ROOT "icons/charts.png"
-#define SEARCH_ICON  RESSOURCES_ROOT "icons/search.png"
-#define PREFS_ICON   RESSOURCES_ROOT "icons/preferences.png"
-#define IMPORT_ICON   RESSOURCES_ROOT "icons/import.png"
-#define EXPORT_ICON   RESSOURCES_ROOT "icons/export.png"
-#define CHANGE_USER_ICON RESSOURCES_ROOT "icons/switch_user.png"
-#define ABOUT_ICON  RESSOURCES_ROOT "icons/about.png"
-#define QUIT_ICON   RESSOURCES_ROOT "icons/exit.png"
+#define USER_ICON RESOURCES_ROOT "icons/user.png"
+#define STATS_ICON   RESOURCES_ROOT "icons/charts.png"
+#define SEARCH_ICON  RESOURCES_ROOT "icons/search.png"
+#define PREFS_ICON   RESOURCES_ROOT "icons/preferences.png"
+#define IMPORT_ICON   RESOURCES_ROOT "icons/import.png"
+#define EXPORT_ICON   RESOURCES_ROOT "icons/export.png"
+#define CHANGE_USER_ICON RESOURCES_ROOT "icons/switch_user.png"
+#define ABOUT_ICON  RESOURCES_ROOT "icons/about.png"
+#define QUIT_ICON   RESOURCES_ROOT "icons/exit.png"
 
-#define USER_LOW_ICON RESSOURCES_ROOT "icons/user_low.png"
-#define STATS_LOW_ICON   RESSOURCES_ROOT "icons/charts_low.png"
-#define SEARCH_LOW_ICON  RESSOURCES_ROOT "icons/search_low.png"
-#define PREFS_LOW_ICON   RESSOURCES_ROOT "icons/preferences_low.png"
-#define IMPORT_LOW_ICON   RESSOURCES_ROOT "icons/import_low.png"
-#define EXPORT_LOW_ICON   RESSOURCES_ROOT "icons/export_low.png"
-#define CHANGE_USER_LOW_ICON RESSOURCES_ROOT "icons/switch_user_low.png"
-#define ABOUT_LOW_ICON  RESSOURCES_ROOT "icons/about_low.png"
-#define QUIT_LOW_ICON   RESSOURCES_ROOT "icons/exit_low.png"
+#define USER_LOW_ICON RESOURCES_ROOT "icons/user_low.png"
+#define STATS_LOW_ICON   RESOURCES_ROOT "icons/charts_low.png"
+#define SEARCH_LOW_ICON  RESOURCES_ROOT "icons/search_low.png"
+#define PREFS_LOW_ICON   RESOURCES_ROOT "icons/preferences_low.png"
+#define IMPORT_LOW_ICON   RESOURCES_ROOT "icons/import_low.png"
+#define EXPORT_LOW_ICON   RESOURCES_ROOT "icons/export_low.png"
+#define CHANGE_USER_LOW_ICON RESOURCES_ROOT "icons/switch_user_low.png"
+#define ABOUT_LOW_ICON  RESOURCES_ROOT "icons/about_low.png"
+#define QUIT_LOW_ICON   RESOURCES_ROOT "icons/exit_low.png"
 
-#define LANG_ROOT RESSOURCES_ROOT "po/"
+#define LANG_ROOT RESOURCES_ROOT "po/"
 
 #endif
diff --git a/src/view/wxUI.cpp b/src/view/wxUI.cpp
index 508b247..c31dd6d 100644
--- a/src/view/wxUI.cpp
+++ b/src/view/wxUI.cpp
@@ -144,10 +144,10 @@ bool wxUI::SetLanguage(QString language)
     
     if (i != SupportedLanguages::English)
     {
-	if (!_translator.load(SupportedLanguages::languages[i].filename, RESSOURCES_ROOT "po"))
+	if (!_translator.load(SupportedLanguages::languages[i].filename, RESOURCES_ROOT "po"))
 	{
 	    i = SupportedLanguages::English;
-	    _translator.load(SupportedLanguages::languages[i].filename, RESSOURCES_ROOT "po");
+	    _translator.load(SupportedLanguages::languages[i].filename, RESOURCES_ROOT "po");
 	    _language = SupportedLanguages::languages[i].name;
 	    res = false;
 	}
@@ -316,7 +316,7 @@ void wxUI::ChangeUser()
 
 void wxUI::OnButtonAbout()
 {
-    QMessageBox::information(0, "KissCount " APP_VERSION, _("Personal accounting software") + "\n\nhttp://indefero.soutade.fr/p/kisscount/\n\n" + _("Licenced under GNU GPL v3") + "\n\nCopyright (C) 2010-2014 Grégory Soutadé");
+    QMessageBox::information(0, "KissCount " APP_VERSION, _("Personal accounting software") + "\n\nhttp://indefero.soutade.fr/p/kisscount/\n\n" + _("Licenced under GNU GPL v3") + "\n\nCopyright (C) 2010-2015 Grégory Soutadé");
 }
 
 void wxUI::OnButtonQuit()
diff --git a/tools/generate_locales.sh b/tools/generate_locales.sh
index 2a393b8..dbef00a 100755
--- a/tools/generate_locales.sh
+++ b/tools/generate_locales.sh
@@ -14,8 +14,8 @@ for p in find xgettext poeditor lconvert lrelease ; do
 done
 
 CPP_FILE_LIST=`find src -name '*.cpp' -print`
-xgettext --from-code utf-8 -d kisscount -s --keyword=_ -p ./ressources/po -o kisscount.pot $CPP_FILE_LIST
-for po in ./ressources/po/*.po ; do
+xgettext --from-code utf-8 -d kisscount -s --keyword=_ -p ./resources/po -o kisscount.pot $CPP_FILE_LIST
+for po in ./resources/po/*.po ; do
     ts=`echo $po | sed s/po$/ts/`
     poeditor $po
     echo lconvert -locations relative $po -o $ts
diff --git a/tools/package.sh b/tools/package.sh
index b8fdc6d..f4ac842 100755
--- a/tools/package.sh
+++ b/tools/package.sh
@@ -20,9 +20,9 @@ if [ "$1" == "clean" ] ; then
 make clean
 fi
 make || (echo "Compilation failed" ; exit 1)
-cp -r kc ressources AUTHORS COPYING README* www install.sh "$DIR"
-rm -rf "$DIR"/ressources/po/*
-cp -r ressources/po/*.qm "$DIR/ressources/po/" # Copy only QM files
+cp -r kc resources AUTHORS COPYING README* www install.sh "$DIR"
+rm -rf "$DIR"/resources/po/*
+cp -r resources/po/*.qm "$DIR/resources/po/" # Copy only QM files
 find "$DIR" -type f -executable -exec ${HOST}strip \{\} \;
 tar -jcf "$FILE" "$DIR"
 rm -rf "$DIR"
@@ -32,9 +32,9 @@ if [ -d "debian" ] ; then
 DEB_FILE="kisscount_${VERSION}-1_${ARCH}.deb"
 rm -rf "$DEB_DIR" "$DEB_FILE"
 mkdir "$DEB_DIR"
-cp -r kc.1 kc debian README* ChangeLog AUTHORS COPYING TODO ressources "$DEB_DIR"
-rm -rf "$DEB_DIR/ressources/po/*"
-cp -r ressources/po/*.qm "$DEB_DIR"/ressources/po/ # Copy only QM files
+cp -r kc.1 kc debian README* ChangeLog AUTHORS COPYING TODO resources "$DEB_DIR"
+rm -rf "$DEB_DIR/resources/po/*"
+cp -r resources/po/*.qm "$DEB_DIR"/resources/po/ # Copy only QM files
 cd "$DEB_DIR"
 ${HOST}strip kc
 mv debian/Makefile .