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é \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 , 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 0000000..20550ae Binary files /dev/null and b/resources/po/french.qm differ 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 \n" "Language-Team: LANGUAGE \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 ca42ce6..0000000 Binary files a/ressources/po/french.qm and /dev/null differ 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 .