From 2cea83f22b536b337a6a0a40e537d1380489b76e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Sat, 8 Feb 2014 15:14:04 +0100 Subject: [PATCH] Warn user when some operation dates are modified due to month restriction --- ChangeLog | 5 +- ressources/po/french.po | 383 +++++++++++++------------------- ressources/po/french.qm | Bin 15704 -> 15948 bytes ressources/po/kisscount.pot | 409 ++++++++++++++++++----------------- src/controller/KissCount.cpp | 6 +- src/controller/KissCount.hpp | 2 +- src/view/GenerateDialog.cpp | 5 +- 7 files changed, 378 insertions(+), 432 deletions(-) diff --git a/ChangeLog b/ChangeLog index 462957c..5d39328 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -v0.5 (03/06/2013) +v0.5 (08/02/2014) + +** Bugs ** + Bug in generate month : if the next month has less days than the first, but there are operations on non existings days, use last day of new month. v0.4 (26/02/2013) ** User ** diff --git a/ressources/po/french.po b/ressources/po/french.po index 5659885..5954071 100644 --- a/ressources/po/french.po +++ b/ressources/po/french.po @@ -2,24 +2,23 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-03 20:57+0200\n" +"POT-Creation-Date: 2014-02-08 15:12+0100\n" "PO-Revision-Date: \n" "Last-Translator: Soutadé \n" "Language-Team: \n" -"Language: \n" +"Language: fr_FR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Poedit-Language: French\n" -"X-Poedit-Country: FRANCE\n" "X-Poedit-SourceCharset: utf-8\n" +"X-Generator: Poedit 1.5.4\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:408 +#: src/view/StatsPanel.cpp:315 msgid " - " msgstr " - " @@ -27,13 +26,10 @@ msgstr " - " 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/UsersDialog.cpp:123 -#: 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 msgid " already exists" msgstr " existe déjà" @@ -41,18 +37,15 @@ msgstr " existe déjà" msgid " and " msgstr " et " -#: src/view/SnapshotsDialog.cpp:133 -#: src/view/SnapshotsDialog.cpp:167 +#: src/view/SnapshotsDialog.cpp:133 src/view/SnapshotsDialog.cpp:167 msgid " does not exist" msgstr " n'existe pas" -#: src/view/SearchPanel.cpp:96 -#: src/view/ExportPanel.cpp:90 +#: src/view/ExportPanel.cpp:90 src/view/SearchPanel.cpp:146 msgid " entries found" msgstr " entrées trouvées" -#: src/view/ImportPanel.cpp:296 -#: src/view/ImportPanel.cpp:320 +#: src/view/ImportPanel.cpp:296 src/view/ImportPanel.cpp:320 msgid " must have a name" msgstr " doit avoir un nom" @@ -60,7 +53,7 @@ msgstr " doit avoir un nom" msgid " not found, aborting" msgstr " non trouvé, arrêt" -#: src/view/AccountPanel.cpp:933 +#: src/view/AccountPanel.cpp:839 msgid " operations ?" msgstr " opérations ?" @@ -86,12 +79,11 @@ msgstr "%d comptes" msgid "%d categories" msgstr "%d catégories" -#: src/view/StatsPanel.cpp:352 +#: src/view/StatsPanel.cpp:288 msgid "0 line" msgstr "Limite 0" -#: src/view/SearchPanel.cpp:98 -#: src/view/ExportPanel.cpp:92 +#: src/view/ExportPanel.cpp:92 src/view/SearchPanel.cpp:148 msgid "1 entry found" msgstr "1 entrée trouvée" @@ -99,18 +91,16 @@ 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:98 -#: src/view/grid/GridAccount.cpp:73 +#: src/view/SearchBanner.cpp:103 src/view/grid/GridAccount.cpp:73 msgid "Account" msgstr "Compte" +#: src/view/PreferencesPanel.cpp:869 src/view/PreferencesPanel.cpp:892 #: src/view/ImportPanel.cpp:296 -#: src/view/PreferencesPanel.cpp:869 -#: src/view/PreferencesPanel.cpp:892 msgid "Account " msgstr "Le compte " -#: src/controller/KissCount.cpp:341 +#: src/controller/KissCount.cpp:353 msgid "Account 1" msgstr "Compte 1" @@ -118,42 +108,39 @@ msgstr "Compte 1" msgid "Account must have a name" msgstr "Le compte doit avoir un nom" -#: src/view/ImportPanel.cpp:68 -#: src/view/AccountPanel.cpp:499 +#: src/view/ImportPanel.cpp:68 src/view/AccountPanel.cpp:432 msgid "Account name" msgstr "Nom du compte" -#: src/view/AccountPanel.cpp:498 +#: src/view/AccountPanel.cpp:431 msgid "Account number" msgstr "Numéro de compte" -#: src/view/StatsPanel.cpp:351 -#: src/view/PreferencesPanel.cpp:50 +#: src/view/StatsPanel.cpp:287 src/view/PreferencesPanel.cpp:50 msgid "Accounts" msgstr "Comptes" -#: src/view/AccountPanel.cpp:1165 +#: src/view/AccountPanel.cpp:1024 msgid "Accounts updated until " msgstr "Comptes mis à jours jusqu'à " -#: src/view/StatsPanel.cpp:329 +#: src/view/StatsPanel.cpp:265 msgid "Amount" msgstr "Montant" -#: src/view/SearchBanner.cpp:94 +#: src/view/SearchBanner.cpp:99 msgid "Amount from" msgstr "Montant min" -#: src/view/SearchBanner.cpp:95 +#: src/view/SearchBanner.cpp:100 msgid "Amount to" msgstr "Montant max" -#: src/view/AccountPanel.cpp:1170 +#: src/view/AccountPanel.cpp:1029 msgid "Any account updated !" msgstr "Aucun compte mis à jour" -#: src/view/ImportPanel.cpp:162 -#: src/view/ExportPanel.cpp:130 +#: src/view/ExportPanel.cpp:130 src/view/ImportPanel.cpp:162 msgid "Any engine can process this file !" msgstr "Format de fichier non reconnu" @@ -161,12 +148,11 @@ 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:928 +#: src/view/SnapshotsDialog.cpp:137 src/view/AccountPanel.cpp:834 msgid "Are you sure want to delete " msgstr "Etes vous sûr de vouloir supprimer " -#: src/view/grid/GridAccount.cpp:793 +#: src/view/grid/GridAccount.cpp:839 msgid "Are you sure want to delete : \n" msgstr "Etes vous sûr de vouloir supprimer : \n" @@ -190,7 +176,7 @@ msgstr "Revenir à cette sauvegarde" msgid "Background color" msgstr "Couleur d'arrière plan" -#: src/view/AccountPanel.cpp:291 +#: src/view/AccountPanel.cpp:225 msgid "Balance" msgstr "Solde" @@ -198,27 +184,32 @@ msgstr "Solde" msgid "Blocked" msgstr "Bloqué" +#: src/model/export/CSVExportEngine.cpp:34 +msgid "CSV files (*.csv)" +msgstr "Fichiers CSV (*.csv)" + +#: src/view/PasswordDialog.cpp:50 src/view/GenerateDialog.cpp:50 #: src/view/UsersDialog.cpp:50 -#: src/view/GenerateDialog.cpp:49 -#: src/view/PasswordDialog.cpp:50 msgid "Cancel" msgstr "Annuler" -#: src/view/grid/GridAccount.cpp:1305 -#: src/view/grid/GridAccount.cpp:1318 +#: src/view/grid/GridAccount.cpp:1189 src/view/grid/GridAccount.cpp:1202 msgid "Cannot group these operations" msgstr "Impossible de grouper ces opérations" -#: src/view/grid/GridAccount.cpp:1449 -#: src/view/grid/GridAccount.cpp:1455 +#: src/view/grid/GridAccount.cpp:1355 src/view/grid/GridAccount.cpp:1361 msgid "Cannot ungroup these operations" msgstr "Impossible de dégrouper ces opérations" #: src/model/DatabaseUpdate.cpp:94 -msgid "Cannot update database version 2 to version 3 because some columns needs to be deleted." -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" +msgid "" +"Cannot update database version 2 to version 3 because some columns needs to " +"be deleted." +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:332 +#: src/controller/KissCount.cpp:344 msgid "Car" msgstr "Voiture" @@ -226,14 +217,12 @@ msgstr "Voiture" msgid "Categories" msgstr "Catégories" -#: src/view/SearchBanner.cpp:96 -#: src/view/grid/GridAccount.cpp:73 +#: src/view/SearchBanner.cpp:101 src/view/grid/GridAccount.cpp:73 msgid "Category" msgstr "Catégorie" +#: src/view/PreferencesPanel.cpp:1034 src/view/PreferencesPanel.cpp:1056 #: src/view/ImportPanel.cpp:320 -#: src/view/PreferencesPanel.cpp:1034 -#: src/view/PreferencesPanel.cpp:1056 msgid "Category " msgstr "La catégorie " @@ -253,11 +242,11 @@ msgstr "Changer de nom" msgid "Change Password" msgstr "Changer le mot de passe" -#: src/view/SearchPanel.cpp:51 +#: src/view/SearchPanel.cpp:53 msgid "Change account" msgstr "Changer de compte" -#: src/view/SearchPanel.cpp:52 +#: src/view/SearchPanel.cpp:54 msgid "Change category" msgstr "Changer la catégorie" @@ -265,11 +254,11 @@ msgstr "Changer la catégorie" msgid "Change password" msgstr "Changer le mot de passe" -#: src/view/AccountPanel.cpp:164 +#: src/view/AccountPanel.cpp:119 msgid "Check" msgstr "Rapprochement" -#: src/view/SearchBanner.cpp:77 +#: src/view/SearchBanner.cpp:82 msgid "Checked" msgstr "Rapprochée" @@ -277,11 +266,11 @@ msgstr "Rapprochée" msgid "Choose a database to open" msgstr "Choisissez une base de données à ouvrir" -#: src/view/SearchPanel.cpp:143 +#: src/view/SearchPanel.cpp:195 msgid "Choose a new account" msgstr "Nouveau compte" -#: src/view/SearchPanel.cpp:183 +#: src/view/SearchPanel.cpp:237 msgid "Choose a new category" msgstr "Nouvelle catégorie" @@ -289,8 +278,7 @@ msgstr "Nouvelle catégorie" msgid "Confirm password" msgstr "Confirmer le mot de passe" -#: src/view/StatsPanel.cpp:162 -#: src/view/AccountPanel.cpp:113 +#: src/view/CostRepartitionBanner.cpp:46 msgid "Cost repartition" msgstr "Répartition des coûts" @@ -298,12 +286,9 @@ 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: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 msgid "Create one" msgstr "En créer un" @@ -311,15 +296,15 @@ msgstr "En créer un" msgid "Credit" msgstr "Crédit" -#: src/view/AccountPanel.cpp:287 +#: src/view/AccountPanel.cpp:221 msgid "Cur Credit" msgstr "Cur Crédit" -#: src/view/AccountPanel.cpp:288 +#: src/view/AccountPanel.cpp:222 msgid "Cur Debit" msgstr "Cur Débit" -#: src/view/AccountPanel.cpp:501 +#: src/view/AccountPanel.cpp:434 msgid "Current value" msgstr "Valeur courante" @@ -335,7 +320,7 @@ msgstr "Date min" msgid "Date to" msgstr "Date max" -#: src/view/StatsPanel.cpp:343 +#: src/view/StatsPanel.cpp:279 msgid "Days" msgstr "Jours" @@ -351,9 +336,8 @@ msgstr "Défaut" 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:786 +#: src/view/PreferencesPanel.cpp:213 src/view/PreferencesPanel.cpp:348 +#: src/view/AccountPanel.cpp:692 msgid "Delete" msgstr "Supprimer" @@ -365,65 +349,39 @@ msgstr "Supprimer la sauvegarde" msgid "Descending" msgstr "Décroissant" -#: src/view/SearchBanner.cpp:93 -#: src/view/grid/GridAccount.cpp:73 +#: src/view/SearchBanner.cpp:98 src/view/grid/GridAccount.cpp:73 msgid "Description" msgstr "Description" -#: src/view/SearchPanel.cpp:220 +#: src/view/SearchPanel.cpp:276 msgid "Enter a new description" msgstr "Nouvelle description" -#: src/view/StatsPanel.cpp:423 -#: src/view/UsersDialog.cpp:93 -#: src/view/UsersDialog.cpp:123 -#: src/view/SearchBanner.cpp:156 -#: src/view/SearchBanner.cpp:166 -#: src/view/SearchBanner.cpp:179 -#: src/view/SearchBanner.cpp:188 -#: 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/ImportPanel.cpp:162 -#: src/view/ImportPanel.cpp:296 -#: src/view/ImportPanel.cpp:320 -#: src/view/ExportPanel.cpp:117 -#: src/view/ExportPanel.cpp:130 -#: src/view/ExportPanel.cpp:137 -#: 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/PasswordDialog.cpp:64 -#: src/view/PasswordDialog.cpp:70 -#: src/view/AccountPanel.cpp:924 -#: src/view/grid/GridAccount.cpp:1305 -#: src/view/grid/GridAccount.cpp:1318 -#: src/view/grid/GridAccount.cpp:1449 -#: src/view/grid/GridAccount.cpp:1455 -#: src/view/grid/FormulaDelegate.cpp:59 -#: 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:582 -#: src/model/Database.cpp:758 -#: src/model/Database.cpp:900 -#: src/model/Database.cpp:1720 -#: src/model/DatabaseUpdate.cpp:31 +#: 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/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 msgid "Error" msgstr "Erreur" @@ -432,8 +390,7 @@ msgstr "Erreur" msgid "Error creating original database" msgstr "Erreur durant la création de la base de données initiale" -#: src/view/ExportPanel.cpp:51 -#: src/view/ExportPanel.cpp:73 +#: src/view/ExportPanel.cpp:51 src/view/ExportPanel.cpp:73 msgid "Export" msgstr "Export" @@ -449,13 +406,12 @@ msgstr "Compte du fichier" msgid "File category" msgstr "Catégorie du fichier" -#: src/view/AccountPanel.cpp:502 +#: src/view/AccountPanel.cpp:435 msgid "Final value" msgstr "Valeur finale" -#: src/view/SearchBanner.cpp:73 +#: src/controller/KissCount.cpp:344 src/view/SearchBanner.cpp:78 #: src/view/grid/GridAccount.cpp:360 -#: src/controller/KissCount.cpp:332 msgid "Fix" msgstr "Fixe" @@ -467,16 +423,15 @@ msgstr "Police" msgid "Foreground color" msgstr "Couleur d'avant plan" -#: src/view/StatsPanel.cpp:75 +#: src/view/StatsPanel.cpp:73 msgid "From" msgstr "De" -#: src/view/GenerateDialog.cpp:36 +#: src/view/GenerateDialog.cpp:37 msgid "From " msgstr "A partir de " -#: src/view/GenerateDialog.cpp:33 -#: src/view/AccountPanel.cpp:783 +#: src/view/GenerateDialog.cpp:34 src/view/AccountPanel.cpp:689 msgid "Generate month" msgstr "Générer mois" @@ -484,11 +439,11 @@ msgstr "Générer mois" msgid "Grisbi files (*.gsb)" msgstr "Fichiers Grisbi (*.gsb)" -#: src/controller/KissCount.cpp:332 +#: src/controller/KissCount.cpp:344 msgid "Groceries" msgstr "Courses" -#: src/view/AccountPanel.cpp:188 +#: src/view/AccountPanel.cpp:143 msgid "Group" msgstr "Grouper" @@ -496,7 +451,7 @@ msgstr "Grouper" msgid "Hidden" msgstr "Caché" -#: src/controller/KissCount.cpp:332 +#: src/controller/KissCount.cpp:344 msgid "Hobbies" msgstr "Loisirs" @@ -504,7 +459,7 @@ msgstr "Loisirs" msgid "Import" msgstr "Import" -#: src/view/AccountPanel.cpp:500 +#: src/view/AccountPanel.cpp:433 msgid "Initial value" msgstr "Valeur initiale" @@ -520,19 +475,19 @@ msgstr "Compte interne" msgid "Internal category" msgstr "Catégorie interne" -#: src/view/SearchBanner.cpp:166 +#: src/view/SearchBanner.cpp:181 msgid "Invalid amount from" msgstr "Montant min invalide" -#: src/view/SearchBanner.cpp:188 +#: src/view/SearchBanner.cpp:203 msgid "Invalid amount range" msgstr "Intervalle des montants invalide" -#: src/view/SearchBanner.cpp:179 +#: src/view/SearchBanner.cpp:194 msgid "Invalid amount to" msgstr "Montant max invalide" -#: src/view/SearchBanner.cpp:156 +#: src/view/SearchBanner.cpp:171 msgid "Invalid date range" msgstr "Intervalle de temps invalide" @@ -552,7 +507,7 @@ msgstr "Ancien mot de passe invalide" msgid "Invalid password" msgstr "Mot de passe invalide" -#: src/view/StatsPanel.cpp:423 +#: src/view/StatsPanel.cpp:330 msgid "Invalide date range" msgstr "Intervalle de temps invalide" @@ -560,7 +515,7 @@ msgstr "Intervalle de temps invalide" msgid "It must be at least one account !" msgstr "Il doit y avoir au moins un compte !" -#: src/view/AccountPanel.cpp:924 +#: src/view/AccountPanel.cpp:830 msgid "It must be at least one month !" msgstr "Il doit rester au moins un mois" @@ -568,13 +523,10 @@ msgstr "Il doit rester au moins un mois" msgid "Kill me" msgstr "Kill me" -#: src/view/SearchPanel.cpp:96 -#: src/view/SearchPanel.cpp:98 -#: src/view/SearchPanel.cpp:101 -#: src/view/ExportPanel.cpp:90 -#: src/view/ExportPanel.cpp:92 -#: src/view/ExportPanel.cpp:95 -#: src/view/ExportPanel.cpp:135 +#: 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 msgid "KissCount" msgstr "KissCount" @@ -604,9 +556,10 @@ msgstr "Langue non changée" #: src/view/PreferencesPanel.cpp:1138 msgid "Language successfully changed, please go to another panel" -msgstr "Langue changée, allez sur un autre panneau pour rendre le changement effectif" +msgstr "" +"Langue changée, allez sur un autre panneau pour rendre le changement effectif" -#: src/view/wxUI.cpp:309 +#: src/view/wxUI.cpp:317 msgid "Licenced under GNU GPL v3" msgstr "Licence GNU GPL v3" @@ -614,16 +567,15 @@ msgstr "Licence GNU GPL v3" msgid "Load operations" msgstr "Charger les opérations" -#: src/view/AccountPanel.cpp:160 +#: src/view/AccountPanel.cpp:115 msgid "Mode" msgstr "Mode" -#: src/view/StatsPanel.cpp:340 +#: src/view/StatsPanel.cpp:276 msgid "Months" msgstr "Mois" -#: src/view/PreferencesPanel.cpp:62 -#: src/view/PreferencesPanel.cpp:208 +#: src/view/PreferencesPanel.cpp:62 src/view/PreferencesPanel.cpp:208 #: src/view/PreferencesPanel.cpp:344 msgid "Name" msgstr "Nom" @@ -632,8 +584,7 @@ msgstr "Nom" msgid "Name changed" msgstr "Nom changé" -#: src/view/UsersDialog.cpp:51 -#: src/view/UsersDialog.cpp:114 +#: src/view/UsersDialog.cpp:51 src/view/UsersDialog.cpp:114 msgid "New User" msgstr "Nouvel utilisateur" @@ -641,8 +592,7 @@ msgstr "Nouvel utilisateur" msgid "New password" msgstr "Nouveau mot de passe" -#: src/view/SearchPanel.cpp:101 -#: src/view/ExportPanel.cpp:95 +#: src/view/ExportPanel.cpp:95 src/view/SearchPanel.cpp:151 msgid "No entry found" msgstr "Pas d'entrée trouvée" @@ -654,20 +604,16 @@ msgstr "Aucun opération trouvée dans ce fichier" msgid "No operation to save" msgstr "Aucun opération à sauvegarder" -#: src/view/StatsPanel.cpp:138 -#: src/view/SearchBanner.cpp:75 -#: src/view/AccountPanel.cpp:292 +#: src/view/SearchBanner.cpp:80 src/view/CostRepartitionBanner.cpp:106 msgid "Non fix" msgstr "Courantes" -#: src/view/SearchPanel.cpp:139 -#: src/view/SearchPanel.cpp:179 -#: src/view/PreferencesPanel.cpp:608 -#: src/view/PreferencesPanel.cpp:700 +#: src/view/PreferencesPanel.cpp:608 src/view/PreferencesPanel.cpp:700 +#: src/view/SearchPanel.cpp:191 src/view/SearchPanel.cpp:233 msgid "None" msgstr "Aucun" -#: src/view/SearchBanner.cpp:79 +#: src/view/SearchBanner.cpp:84 msgid "Not checked" msgstr "Non rapprochée" @@ -679,10 +625,8 @@ msgstr "Numéro de compte" msgid "OFX files (*.ofx)" msgstr "Fichiers OFX (*.ofx)" -#: src/view/UsersDialog.cpp:49 -#: src/view/SnapshotsDialog.cpp:55 -#: src/view/GenerateDialog.cpp:48 -#: src/view/PasswordDialog.cpp:49 +#: src/view/PasswordDialog.cpp:49 src/view/GenerateDialog.cpp:49 +#: src/view/SnapshotsDialog.cpp:55 src/view/UsersDialog.cpp:49 msgid "OK" msgstr "OK" @@ -694,8 +638,7 @@ msgstr "Ancien mot de passe" msgid "Operation order" msgstr "Ordre des opérations" -#: src/view/SearchBanner.cpp:97 -#: src/view/AccountPanel.cpp:246 +#: src/view/SearchBanner.cpp:102 src/view/AccountPanel.cpp:198 msgid "Operations" msgstr "Opérations" @@ -707,7 +650,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:333 +#: src/controller/KissCount.cpp:345 msgid "Other" msgstr "Autres" @@ -719,7 +662,7 @@ msgstr "Mot de passe " msgid "Password changed" msgstr "Mot de passe changé" -#: src/view/wxUI.cpp:309 +#: src/view/wxUI.cpp:317 msgid "Personal accounting software" msgstr "Logiciel de comptabilité personnelle" @@ -727,20 +670,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:194 src/view/PreferencesPanel.cpp:1146 msgid "Preferences" msgstr "Préférences" -#: src/view/wxUI.cpp:314 +#: src/view/wxUI.cpp:322 msgid "Quit KissCount ?" msgstr "Quitter KissCount ?" -#: src/view/AccountPanel.cpp:163 +#: src/view/AccountPanel.cpp:118 msgid "Real" msgstr "Réel" -#: src/view/SearchPanel.cpp:53 +#: src/view/SearchPanel.cpp:55 msgid "Rename" msgstr "Renommer" @@ -752,10 +694,8 @@ msgstr "Sauvegarder sous" msgid "Save import patterns" msgstr "Sauvegarder les motifs d'import" -#: src/view/SearchPanel.cpp:38 -#: src/view/SearchPanel.cpp:79 -#: src/view/SearchPanel.cpp:230 -#: src/view/ExportPanel.cpp:38 +#: src/view/ExportPanel.cpp:38 src/view/SearchPanel.cpp:40 +#: src/view/SearchPanel.cpp:95 src/view/SearchPanel.cpp:288 msgid "Search" msgstr "Chercher" @@ -763,36 +703,35 @@ msgstr "Chercher" msgid "Shared with" msgstr "Partagé avec" -#: src/view/SnapshotsDialog.cpp:32 -#: src/view/AccountPanel.cpp:191 +#: src/view/SnapshotsDialog.cpp:32 src/view/AccountPanel.cpp:146 msgid "Snapshots" msgstr "Sauvegardes" -#: src/view/StatsPanel.cpp:207 -#: src/view/StatsPanel.cpp:408 +#: src/view/GenerateDialog.cpp:215 +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 msgid "Statistics" msgstr "Statistiques" -#: src/view/StatsPanel.cpp:80 +#: src/view/StatsPanel.cpp:78 msgid "To" msgstr "A" -#: src/view/AccountPanel.cpp:266 -#: src/view/AccountPanel.cpp:289 +#: src/view/AccountPanel.cpp:216 src/view/AccountPanel.cpp:223 msgid "Total Credit" msgstr "Total Crédit" -#: src/view/AccountPanel.cpp:267 -#: src/view/AccountPanel.cpp:290 +#: src/view/AccountPanel.cpp:217 src/view/AccountPanel.cpp:224 msgid "Total Debit" msgstr "Total Débit" -#: src/view/AccountPanel.cpp:189 +#: src/view/AccountPanel.cpp:144 msgid "UnGroup" msgstr "Dégrouper" -#: src/model/Database.cpp:105 -#: src/model/Database.cpp:111 +#: src/model/Database.cpp:105 src/model/Database.cpp:111 msgid "Unable to Create " msgstr "Impossible de créer " @@ -804,15 +743,12 @@ msgstr "Impossible de créer " 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:1720 +#: src/model/Database.cpp:47 src/model/Database.cpp:55 +#: src/model/Database.cpp:74 src/model/Database.cpp:1721 msgid "Unable to open database" msgstr "Impossible d'ouvrir la base de données" -#: src/view/SnapshotsDialog.cpp:142 -#: src/view/SnapshotsDialog.cpp:176 +#: src/view/SnapshotsDialog.cpp:142 src/view/SnapshotsDialog.cpp:176 msgid "Unable to remove " msgstr "Impossible de supprimer " @@ -820,16 +756,13 @@ msgstr "Impossible de supprimer " msgid "Unable to upgrade Database" msgstr "Impossible de mettre à jour la base de données" -#: src/controller/KissCount.cpp:333 +#: src/controller/KissCount.cpp:345 msgid "Unexpected" msgstr "Exceptionnel" -#: src/view/SearchBanner.cpp:63 -#: src/view/SearchBanner.cpp:84 -#: src/view/AccountPanel.cpp:650 -#: src/model/User.cpp:65 -#: src/model/User.cpp:83 -#: src/model/User.cpp:161 +#: 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 msgid "Unknown" msgstr "Inconnu" @@ -841,13 +774,12 @@ msgstr "Comptes non résolus" msgid "Unresolved categories" msgstr "Catégories non résolues" -#: src/model/Database.cpp:582 -#: src/model/Database.cpp:758 -#: src/model/Database.cpp:900 +#: src/model/Database.cpp:583 src/model/Database.cpp:759 +#: src/model/Database.cpp:901 msgid "Update failed !\n" msgstr "La mise à jour à échouée !\n" -#: src/view/AccountPanel.cpp:190 +#: src/view/AccountPanel.cpp:145 msgid "Update next months" msgstr "Mettre à jour mois suivants" @@ -855,9 +787,8 @@ msgstr "Mettre à jour mois suivants" msgid "User" msgstr "Utilisateur" -#: src/view/UsersDialog.cpp:40 +#: src/view/PreferencesPanel.cpp:1099 src/view/UsersDialog.cpp:40 #: src/view/UsersDialog.cpp:123 -#: src/view/PreferencesPanel.cpp:1099 msgid "User " msgstr "Utilisateur " @@ -865,17 +796,15 @@ msgstr "Utilisateur " msgid "Users" msgstr "Utilisateurs" -#: src/view/PreferencesPanel.cpp:211 -#: src/view/AccountPanel.cpp:162 +#: src/view/PreferencesPanel.cpp:211 src/view/AccountPanel.cpp:117 msgid "Virtual" msgstr "Virtuel" -#: src/view/grid/GridAccount.cpp:1111 +#: src/view/GenerateDialog.cpp:215 src/view/grid/GridAccount.cpp:1076 msgid "Warning" msgstr "Attention" -#: src/view/SnapshotsDialog.cpp:193 -#: src/view/SnapshotsDialog.cpp:203 +#: src/view/SnapshotsDialog.cpp:193 src/view/SnapshotsDialog.cpp:203 msgid "Welcome back to " msgstr "Bienvenue sur " @@ -887,7 +816,7 @@ msgstr "Quel compte va remplacer celui-ci ?" msgid "Wich category will replace this one ?" msgstr "Quelle catégorie va remplacer celle-ci" -#: src/view/grid/GridAccount.cpp:1111 +#: src/view/grid/GridAccount.cpp:1076 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/ressources/po/french.qm b/ressources/po/french.qm index 4f81a9fa105a219f354ee1360e5746c1a67a6c18..ca42ce68c85a6e85a7b579a799208832f4003585 100644 GIT binary patch delta 1712 zcmW+%2~bsK7(Hl89@fAgMrLXtF#L2LXLRN!DXJeb$g5oAGpnoiupLomzjX0s_1;Z+w zHH-rU9XfisZ}$y4U$OwZUUa^ChkelN%?>J?@V2*|-CJqn;qj0iTx8=>wUo^5ZH(fay>ap-Jz;;@jJ_kxnW6~1~I3k>uZ%B_xorc|gt&->Uayx!0PL}ZHt zKgtE%>&3~>n<&{Baanc(AWIR~yIaOk`h()Om{WkdQ#{Z>Mvk50LBn_+)QJa!_5po7 z#j7`1pih-}t#A_y2^ODyeVVPFD~a#cuJuyL?p+L6B2D~|j4@oAIP*D~w@A~=jO>iR zlsb%(_->NsEJ!BGrP91-w%wnZ;eg6f9bjY0jZvlhv$~-!oNoc!ltp8g| zsFSVmq;$U5WNW$^XXr#(S?+yye6cM4!k}lY{Dkbv=#30$mfhX%Md#mJ^pu=orVNikfyM zXRlT1agt@*&9hz=43;)!S>Y|#HeI=P9Z5RmDfc(pv4&FOdHU?K@{GKNWRsO=#h@NjbP844qTU&m zPRvp_^j%1iy45$sdO5M4@2lGl8SKkm^;3sN`ZrzOlgYKlPJTdw)7k~VQ^&~z-OEkg%t zIzA^3s?og7<9$DiR@o55i4FfzYu{{St9!JrUWrU7XrpQi$oRH)dQK}xyIi~cpS|?y zL+$Dh3_Sl*TeWL96CKfBYGgvcVcL#qMDH@~>l?N7t&h(B7CRSGqYLWZOuygJ4PJSH z_f5Lg=x7c~y>7*Uc>WR`*HwIHZId*!Gj$EwBDIazU5sI3AEWL`AP2y9mOgpiQU+L~ z&&grH!AtZzN>yxawZ5(|Cph#kef@kEGUOBextrmfaR2+|ltThBtTtQtA zP#HC`Buq&>a9|7(0vb$3Fs(rg5k|vf2Au?hdf0!S+4p;Y*YiBTw`t40j6FunD8Mcf zfIA?*3;5h5o&&~g1Uz5zoWJNyKpz0as(^Rq0PA-GVe25AJ_Q(;LMV|FA3(Sp&+k0H zpG15FaXP>~8F@WrfC%n*x3IhX7lTdAX zACT+O*~@eLMd*6N2JB1G)kicmpw~ks)6n-idYPhN7J@i-)ZySD`xw?pvy zWG&#fQi$oP1)O?>tkifwF<;o@W|_i?lZArlDnKd}PFHdwr$XV3X&SLwIOBhcRJRB> zZnMFW3Bt`y`^m^d;l=k?fuSy$)g8IZG)CT_FiAS$}OigRW zZx0m%j%i{^Su~lrA(kedr&p@P3sH~B$beYm@*gL)Q#kwH0Rnp!Q+)@3A=QfQo|Mez zYsIc^#)qaTtZV-w(|(G&u`k$ggl+3sT2OPex7S{6HJyM zjVvq+Fz0B@vxvUonn1^1jTrT1RBATa+PJ`3nv6;D9I;-L`#HHWp4XHd-UE!i ztT`L;C*ywCR9QFB3}($$k3cqeNm4uPC--K_AbN4w2q|JF9~1v(Y4VeM)GSy^4t3{( zJI6|kdpVsdSh5D!(zb0<;nn#R3&cy$9k0=y zM(Oo3{+DXBDCGd|McROaY-~)wHZCELV&BvrXrdvrJCMc%qk?qmN`Jl-PjwEB9$eVhx}n~4 zxi=Se5oH^>=vH0anpQ4utS-C%8$NLdbvr*Y0U<_RanUh8AV2CFu659DPj#Jhh~^00 z+uLQscwwsE;SQ-AQ?K{$K0sIH>4S3Wn80Lf6^ADe(O0GlluM?sk7gNjv;LVM&1{!s zNX*~H+u?>aYZx6^U^twsA&(`7au;r6pw4h{70ZTfGt@MPa48gq?pt4RN$L&HZeJ%4 Z&YuC}hm^-Dilp*z$5SK9H;-#k{|^(;n\n" "Language-Team: LANGUAGE \n" @@ -17,22 +17,22 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/view/StatsPanel.cpp:416 +#: src/view/StatsPanel.cpp:315 msgid " - " msgstr "" -#: src/view/PreferencesPanel.cpp:1164 +#: src/view/PreferencesPanel.cpp:1155 msgid " ?" msgstr "" -#: src/view/UsersDialog.cpp:123 src/view/PreferencesPanel.cpp:868 -#: src/view/PreferencesPanel.cpp:878 src/view/PreferencesPanel.cpp:901 -#: src/view/PreferencesPanel.cpp:1043 src/view/PreferencesPanel.cpp:1065 -#: src/view/PreferencesPanel.cpp:1108 +#: 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/UsersDialog.cpp:123 msgid " already exists" msgstr "" -#: src/view/ImportPanel.cpp:282 +#: src/view/ImportPanel.cpp:274 msgid " and " msgstr "" @@ -40,11 +40,11 @@ msgstr "" msgid " does not exist" msgstr "" -#: src/view/SearchPanel.cpp:104 src/view/ExportPanel.cpp:98 +#: src/view/ExportPanel.cpp:90 src/view/SearchPanel.cpp:146 msgid " entries found" msgstr "" -#: src/view/ImportPanel.cpp:304 src/view/ImportPanel.cpp:328 +#: src/view/ImportPanel.cpp:296 src/view/ImportPanel.cpp:320 msgid " must have a name" msgstr "" @@ -52,7 +52,7 @@ msgstr "" msgid " not found, aborting" msgstr "" -#: src/view/AccountPanel.cpp:941 +#: src/view/AccountPanel.cpp:839 msgid " operations ?" msgstr "" @@ -64,25 +64,25 @@ msgstr "" msgid " successfully removed" msgstr "" -#: src/view/ImportPanel.cpp:288 +#: src/view/ImportPanel.cpp:280 msgid " will be created, is it ok ?" msgstr "" -#: src/view/ImportPanel.cpp:281 +#: src/view/ImportPanel.cpp:273 #, c-format msgid "%d accounts" msgstr "" -#: src/view/ImportPanel.cpp:286 +#: src/view/ImportPanel.cpp:278 #, c-format msgid "%d categories" msgstr "" -#: src/view/StatsPanel.cpp:360 +#: src/view/StatsPanel.cpp:288 msgid "0 line" msgstr "" -#: src/view/SearchPanel.cpp:106 src/view/ExportPanel.cpp:100 +#: src/view/ExportPanel.cpp:92 src/view/SearchPanel.cpp:148 msgid "1 entry found" msgstr "" @@ -90,56 +90,56 @@ msgstr "" msgid "A new database will be created, continue ?" msgstr "" -#: src/view/SearchBanner.cpp:98 src/view/grid/GridAccount.cpp:73 +#: src/view/SearchBanner.cpp:103 src/view/grid/GridAccount.cpp:73 msgid "Account" msgstr "" -#: src/view/ImportPanel.cpp:304 src/view/PreferencesPanel.cpp:878 -#: src/view/PreferencesPanel.cpp:901 +#: src/view/PreferencesPanel.cpp:869 src/view/PreferencesPanel.cpp:892 +#: src/view/ImportPanel.cpp:296 msgid "Account " msgstr "" -#: src/controller/KissCount.cpp:341 +#: src/controller/KissCount.cpp:353 msgid "Account 1" msgstr "" -#: src/view/PreferencesPanel.cpp:868 +#: src/view/PreferencesPanel.cpp:859 msgid "Account must have a name" msgstr "" -#: src/view/ImportPanel.cpp:64 src/view/AccountPanel.cpp:507 +#: src/view/ImportPanel.cpp:68 src/view/AccountPanel.cpp:432 msgid "Account name" msgstr "" -#: src/view/AccountPanel.cpp:506 +#: src/view/AccountPanel.cpp:431 msgid "Account number" msgstr "" -#: src/view/StatsPanel.cpp:359 src/view/PreferencesPanel.cpp:47 +#: src/view/StatsPanel.cpp:287 src/view/PreferencesPanel.cpp:50 msgid "Accounts" msgstr "" -#: src/view/AccountPanel.cpp:1173 +#: src/view/AccountPanel.cpp:1024 msgid "Accounts updated until " msgstr "" -#: src/view/StatsPanel.cpp:337 +#: src/view/StatsPanel.cpp:265 msgid "Amount" msgstr "" -#: src/view/SearchBanner.cpp:94 +#: src/view/SearchBanner.cpp:99 msgid "Amount from" msgstr "" -#: src/view/SearchBanner.cpp:95 +#: src/view/SearchBanner.cpp:100 msgid "Amount to" msgstr "" -#: src/view/AccountPanel.cpp:1178 +#: src/view/AccountPanel.cpp:1029 msgid "Any account updated !" msgstr "" -#: src/view/ImportPanel.cpp:170 src/view/ExportPanel.cpp:138 +#: src/view/ExportPanel.cpp:130 src/view/ImportPanel.cpp:162 msgid "Any engine can process this file !" msgstr "" @@ -147,23 +147,23 @@ msgstr "" msgid "Are you sure want to come back to " msgstr "" -#: src/view/SnapshotsDialog.cpp:137 src/view/AccountPanel.cpp:936 +#: src/view/SnapshotsDialog.cpp:137 src/view/AccountPanel.cpp:834 msgid "Are you sure want to delete " msgstr "" -#: src/view/grid/GridAccount.cpp:793 +#: src/view/grid/GridAccount.cpp:839 msgid "Are you sure want to delete : \n" msgstr "" -#: src/view/PreferencesPanel.cpp:1164 +#: src/view/PreferencesPanel.cpp:1155 msgid "Are you sure want to delete profil of " msgstr "" -#: src/view/ImportPanel.cpp:376 +#: src/view/ImportPanel.cpp:368 msgid "Are you sure want to integrate these operations ?" msgstr "" -#: src/view/PreferencesPanel.cpp:476 +#: src/view/PreferencesPanel.cpp:467 msgid "Ascending" msgstr "" @@ -171,28 +171,32 @@ msgstr "" msgid "Back to this snapshot" msgstr "" -#: src/view/PreferencesPanel.cpp:354 +#: src/view/PreferencesPanel.cpp:345 msgid "Background color" msgstr "" -#: src/view/AccountPanel.cpp:299 +#: src/view/AccountPanel.cpp:225 msgid "Balance" msgstr "" -#: src/view/PreferencesPanel.cpp:221 +#: src/view/PreferencesPanel.cpp:212 msgid "Blocked" msgstr "" -#: src/view/UsersDialog.cpp:50 src/view/GenerateDialog.cpp:49 -#: src/view/PasswordDialog.cpp:50 +#: src/model/export/CSVExportEngine.cpp:34 +msgid "CSV files (*.csv)" +msgstr "" + +#: src/view/PasswordDialog.cpp:50 src/view/GenerateDialog.cpp:50 +#: src/view/UsersDialog.cpp:50 msgid "Cancel" msgstr "" -#: src/view/grid/GridAccount.cpp:1305 src/view/grid/GridAccount.cpp:1318 +#: src/view/grid/GridAccount.cpp:1189 src/view/grid/GridAccount.cpp:1202 msgid "Cannot group these operations" msgstr "" -#: src/view/grid/GridAccount.cpp:1449 src/view/grid/GridAccount.cpp:1455 +#: src/view/grid/GridAccount.cpp:1355 src/view/grid/GridAccount.cpp:1361 msgid "Cannot ungroup these operations" msgstr "" @@ -202,44 +206,44 @@ msgid "" "be deleted." msgstr "" -#: src/controller/KissCount.cpp:332 +#: src/controller/KissCount.cpp:344 msgid "Car" msgstr "" -#: src/view/PreferencesPanel.cpp:48 +#: src/view/PreferencesPanel.cpp:51 msgid "Categories" msgstr "" -#: src/view/SearchBanner.cpp:96 src/view/grid/GridAccount.cpp:73 +#: src/view/SearchBanner.cpp:101 src/view/grid/GridAccount.cpp:73 msgid "Category" msgstr "" -#: src/view/ImportPanel.cpp:328 src/view/PreferencesPanel.cpp:1043 -#: src/view/PreferencesPanel.cpp:1065 +#: src/view/PreferencesPanel.cpp:1034 src/view/PreferencesPanel.cpp:1056 +#: src/view/ImportPanel.cpp:320 msgid "Category " msgstr "" -#: src/view/PreferencesPanel.cpp:1033 +#: src/view/PreferencesPanel.cpp:1024 msgid "Category must have a name" msgstr "" -#: src/view/ImportPanel.cpp:71 +#: src/view/ImportPanel.cpp:75 msgid "Category name" msgstr "" -#: src/view/PreferencesPanel.cpp:65 +#: src/view/PreferencesPanel.cpp:68 msgid "Change Name" msgstr "" -#: src/view/PreferencesPanel.cpp:66 +#: src/view/PreferencesPanel.cpp:69 msgid "Change Password" msgstr "" -#: src/view/SearchPanel.cpp:47 +#: src/view/SearchPanel.cpp:53 msgid "Change account" msgstr "" -#: src/view/SearchPanel.cpp:48 +#: src/view/SearchPanel.cpp:54 msgid "Change category" msgstr "" @@ -247,23 +251,23 @@ msgstr "" msgid "Change password" msgstr "" -#: src/view/AccountPanel.cpp:160 +#: src/view/AccountPanel.cpp:119 msgid "Check" msgstr "" -#: src/view/SearchBanner.cpp:77 +#: src/view/SearchBanner.cpp:82 msgid "Checked" msgstr "" -#: src/view/ImportPanel.cpp:133 +#: src/view/ImportPanel.cpp:125 msgid "Choose a database to open" msgstr "" -#: src/view/SearchPanel.cpp:151 +#: src/view/SearchPanel.cpp:195 msgid "Choose a new account" msgstr "" -#: src/view/SearchPanel.cpp:191 +#: src/view/SearchPanel.cpp:237 msgid "Choose a new category" msgstr "" @@ -271,7 +275,7 @@ msgstr "" msgid "Confirm password" msgstr "" -#: src/view/StatsPanel.cpp:158 src/view/AccountPanel.cpp:109 +#: src/view/CostRepartitionBanner.cpp:46 msgid "Cost repartition" msgstr "" @@ -279,9 +283,9 @@ msgstr "" msgid "Create a snapshot" msgstr "" -#: src/view/ImportPanel.cpp:181 src/view/ImportPanel.cpp:211 -#: src/view/ImportPanel.cpp:255 src/view/ImportPanel.cpp:266 -#: src/view/ImportPanel.cpp:295 src/view/ImportPanel.cpp:318 +#: 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 msgid "Create one" msgstr "" @@ -289,15 +293,15 @@ msgstr "" msgid "Credit" msgstr "" -#: src/view/AccountPanel.cpp:295 +#: src/view/AccountPanel.cpp:221 msgid "Cur Credit" msgstr "" -#: src/view/AccountPanel.cpp:296 +#: src/view/AccountPanel.cpp:222 msgid "Cur Debit" msgstr "" -#: src/view/AccountPanel.cpp:509 +#: src/view/AccountPanel.cpp:434 msgid "Current value" msgstr "" @@ -313,7 +317,7 @@ msgstr "" msgid "Date to" msgstr "" -#: src/view/StatsPanel.cpp:351 +#: src/view/StatsPanel.cpp:279 msgid "Days" msgstr "" @@ -321,16 +325,16 @@ msgstr "" msgid "Debit" msgstr "" -#: src/view/PreferencesPanel.cpp:219 +#: src/view/PreferencesPanel.cpp:210 msgid "Default" msgstr "" -#: src/view/PreferencesPanel.cpp:674 +#: src/view/PreferencesPanel.cpp:665 msgid "Default account cannot be hidden" msgstr "" -#: src/view/PreferencesPanel.cpp:222 src/view/PreferencesPanel.cpp:357 -#: src/view/AccountPanel.cpp:794 +#: src/view/PreferencesPanel.cpp:213 src/view/PreferencesPanel.cpp:348 +#: src/view/AccountPanel.cpp:692 msgid "Delete" msgstr "" @@ -338,43 +342,43 @@ msgstr "" msgid "Delete a snapshot" msgstr "" -#: src/view/PreferencesPanel.cpp:477 +#: src/view/PreferencesPanel.cpp:468 msgid "Descending" msgstr "" -#: src/view/SearchBanner.cpp:93 src/view/grid/GridAccount.cpp:73 +#: src/view/SearchBanner.cpp:98 src/view/grid/GridAccount.cpp:73 msgid "Description" msgstr "" -#: src/view/SearchPanel.cpp:228 +#: src/view/SearchPanel.cpp:276 msgid "Enter a new description" msgstr "" -#: src/view/StatsPanel.cpp:431 src/view/UsersDialog.cpp:93 -#: src/view/UsersDialog.cpp:123 src/view/SearchBanner.cpp:156 -#: src/view/SearchBanner.cpp:166 src/view/SearchBanner.cpp:179 -#: src/view/SearchBanner.cpp:188 src/view/SnapshotsDialog.cpp:117 +#: 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/ImportPanel.cpp:170 src/view/ImportPanel.cpp:304 -#: src/view/ImportPanel.cpp:328 src/view/ExportPanel.cpp:125 -#: src/view/ExportPanel.cpp:138 src/view/ExportPanel.cpp:145 -#: src/view/PreferencesPanel.cpp:601 src/view/PreferencesPanel.cpp:674 -#: src/view/PreferencesPanel.cpp:868 src/view/PreferencesPanel.cpp:878 -#: src/view/PreferencesPanel.cpp:901 src/view/PreferencesPanel.cpp:1033 -#: src/view/PreferencesPanel.cpp:1043 src/view/PreferencesPanel.cpp:1065 -#: src/view/PreferencesPanel.cpp:1102 src/view/PreferencesPanel.cpp:1108 -#: src/view/PreferencesPanel.cpp:1150 src/view/PasswordDialog.cpp:64 -#: src/view/PasswordDialog.cpp:70 src/view/AccountPanel.cpp:932 -#: src/view/grid/GridAccount.cpp:1305 src/view/grid/GridAccount.cpp:1318 -#: src/view/grid/GridAccount.cpp:1449 src/view/grid/GridAccount.cpp:1455 -#: src/view/grid/FormulaDelegate.cpp:59 src/model/Database.cpp:47 +#: 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/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:582 -#: src/model/Database.cpp:758 src/model/Database.cpp:900 -#: src/model/Database.cpp:1720 src/model/DatabaseUpdate.cpp:31 +#: 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 msgid "Error" msgstr "" @@ -383,48 +387,48 @@ msgstr "" msgid "Error creating original database" msgstr "" -#: src/view/ExportPanel.cpp:47 src/view/ExportPanel.cpp:81 +#: src/view/ExportPanel.cpp:51 src/view/ExportPanel.cpp:73 msgid "Export" msgstr "" -#: src/view/ExportPanel.cpp:145 +#: src/view/ExportPanel.cpp:137 msgid "Failed to save operations" msgstr "" -#: src/view/ImportPanel.cpp:64 +#: src/view/ImportPanel.cpp:68 msgid "File account" msgstr "" -#: src/view/ImportPanel.cpp:71 +#: src/view/ImportPanel.cpp:75 msgid "File category" msgstr "" -#: src/view/AccountPanel.cpp:510 +#: src/view/AccountPanel.cpp:435 msgid "Final value" msgstr "" -#: src/view/SearchBanner.cpp:73 src/view/grid/GridAccount.cpp:360 -#: src/controller/KissCount.cpp:332 +#: src/controller/KissCount.cpp:344 src/view/SearchBanner.cpp:78 +#: src/view/grid/GridAccount.cpp:360 msgid "Fix" msgstr "" -#: src/view/PreferencesPanel.cpp:356 +#: src/view/PreferencesPanel.cpp:347 msgid "Font" msgstr "" -#: src/view/PreferencesPanel.cpp:355 +#: src/view/PreferencesPanel.cpp:346 msgid "Foreground color" msgstr "" -#: src/view/StatsPanel.cpp:71 +#: src/view/StatsPanel.cpp:73 msgid "From" msgstr "" -#: src/view/GenerateDialog.cpp:36 +#: src/view/GenerateDialog.cpp:37 msgid "From " msgstr "" -#: src/view/GenerateDialog.cpp:33 src/view/AccountPanel.cpp:791 +#: src/view/GenerateDialog.cpp:34 src/view/AccountPanel.cpp:689 msgid "Generate month" msgstr "" @@ -432,55 +436,55 @@ msgstr "" msgid "Grisbi files (*.gsb)" msgstr "" -#: src/controller/KissCount.cpp:332 +#: src/controller/KissCount.cpp:344 msgid "Groceries" msgstr "" -#: src/view/AccountPanel.cpp:184 +#: src/view/AccountPanel.cpp:143 msgid "Group" msgstr "" -#: src/view/PreferencesPanel.cpp:223 +#: src/view/PreferencesPanel.cpp:214 msgid "Hidden" msgstr "" -#: src/controller/KissCount.cpp:332 +#: src/controller/KissCount.cpp:344 msgid "Hobbies" msgstr "" -#: src/view/ImportPanel.cpp:121 +#: src/view/ImportPanel.cpp:113 msgid "Import" msgstr "" -#: src/view/AccountPanel.cpp:508 +#: src/view/AccountPanel.cpp:433 msgid "Initial value" msgstr "" -#: src/view/ImportPanel.cpp:47 +#: src/view/ImportPanel.cpp:51 msgid "Integrate operations" msgstr "" -#: src/view/ImportPanel.cpp:64 +#: src/view/ImportPanel.cpp:68 msgid "Internal account" msgstr "" -#: src/view/ImportPanel.cpp:71 +#: src/view/ImportPanel.cpp:75 msgid "Internal category" msgstr "" -#: src/view/SearchBanner.cpp:166 +#: src/view/SearchBanner.cpp:181 msgid "Invalid amount from" msgstr "" -#: src/view/SearchBanner.cpp:188 +#: src/view/SearchBanner.cpp:203 msgid "Invalid amount range" msgstr "" -#: src/view/SearchBanner.cpp:179 +#: src/view/SearchBanner.cpp:194 msgid "Invalid amount to" msgstr "" -#: src/view/SearchBanner.cpp:156 +#: src/view/SearchBanner.cpp:171 msgid "Invalid date range" msgstr "" @@ -488,7 +492,7 @@ msgstr "" msgid "Invalid formula !" msgstr "" -#: src/view/PreferencesPanel.cpp:1102 +#: src/view/PreferencesPanel.cpp:1093 msgid "Invalid name !" msgstr "" @@ -500,34 +504,34 @@ msgstr "" msgid "Invalid password" msgstr "" -#: src/view/StatsPanel.cpp:431 +#: src/view/StatsPanel.cpp:330 msgid "Invalide date range" msgstr "" -#: src/view/PreferencesPanel.cpp:601 +#: src/view/PreferencesPanel.cpp:592 msgid "It must be at least one account !" msgstr "" -#: src/view/AccountPanel.cpp:932 +#: src/view/AccountPanel.cpp:830 msgid "It must be at least one month !" msgstr "" -#: src/view/PreferencesPanel.cpp:67 +#: src/view/PreferencesPanel.cpp:70 msgid "Kill me" msgstr "" -#: src/view/SearchPanel.cpp:104 src/view/SearchPanel.cpp:106 -#: src/view/SearchPanel.cpp:109 src/view/ExportPanel.cpp:98 -#: src/view/ExportPanel.cpp:100 src/view/ExportPanel.cpp:103 -#: src/view/ExportPanel.cpp:143 +#: 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 msgid "KissCount" msgstr "" -#: src/view/ExportPanel.cpp:151 +#: src/view/ExportPanel.cpp:143 msgid "KissCount - Export" msgstr "" -#: src/view/ImportPanel.cpp:126 +#: src/view/ImportPanel.cpp:118 msgid "KissCount - Import" msgstr "" @@ -539,40 +543,40 @@ msgstr "" msgid "KissCount xml files (*.xml)" msgstr "" -#: src/view/PreferencesPanel.cpp:49 +#: src/view/PreferencesPanel.cpp:52 msgid "Language" msgstr "" -#: src/view/PreferencesPanel.cpp:1150 +#: src/view/PreferencesPanel.cpp:1141 msgid "Language not changed" msgstr "" -#: src/view/PreferencesPanel.cpp:1147 +#: src/view/PreferencesPanel.cpp:1138 msgid "Language successfully changed, please go to another panel" msgstr "" -#: src/view/wxUI.cpp:296 +#: src/view/wxUI.cpp:317 msgid "Licenced under GNU GPL v3" msgstr "" -#: src/view/ImportPanel.cpp:43 +#: src/view/ImportPanel.cpp:47 msgid "Load operations" msgstr "" -#: src/view/AccountPanel.cpp:156 +#: src/view/AccountPanel.cpp:115 msgid "Mode" msgstr "" -#: src/view/StatsPanel.cpp:348 +#: src/view/StatsPanel.cpp:276 msgid "Months" msgstr "" -#: src/view/PreferencesPanel.cpp:59 src/view/PreferencesPanel.cpp:217 -#: src/view/PreferencesPanel.cpp:353 +#: src/view/PreferencesPanel.cpp:62 src/view/PreferencesPanel.cpp:208 +#: src/view/PreferencesPanel.cpp:344 msgid "Name" msgstr "" -#: src/view/PreferencesPanel.cpp:1114 +#: src/view/PreferencesPanel.cpp:1105 msgid "Name changed" msgstr "" @@ -584,33 +588,32 @@ msgstr "" msgid "New password" msgstr "" -#: src/view/SearchPanel.cpp:109 src/view/ExportPanel.cpp:103 +#: src/view/ExportPanel.cpp:95 src/view/SearchPanel.cpp:151 msgid "No entry found" msgstr "" -#: src/view/ImportPanel.cpp:360 +#: src/view/ImportPanel.cpp:352 msgid "No operation found into this file" msgstr "" -#: src/view/ExportPanel.cpp:125 +#: src/view/ExportPanel.cpp:117 msgid "No operation to save" msgstr "" -#: src/view/StatsPanel.cpp:134 src/view/SearchBanner.cpp:75 -#: src/view/AccountPanel.cpp:300 +#: src/view/SearchBanner.cpp:80 src/view/CostRepartitionBanner.cpp:106 msgid "Non fix" msgstr "" -#: src/view/SearchPanel.cpp:147 src/view/SearchPanel.cpp:187 -#: src/view/PreferencesPanel.cpp:617 src/view/PreferencesPanel.cpp:709 +#: src/view/PreferencesPanel.cpp:608 src/view/PreferencesPanel.cpp:700 +#: src/view/SearchPanel.cpp:191 src/view/SearchPanel.cpp:233 msgid "None" msgstr "" -#: src/view/SearchBanner.cpp:79 +#: src/view/SearchBanner.cpp:84 msgid "Not checked" msgstr "" -#: src/view/PreferencesPanel.cpp:218 +#: src/view/PreferencesPanel.cpp:209 msgid "Number" msgstr "" @@ -618,8 +621,8 @@ msgstr "" msgid "OFX files (*.ofx)" msgstr "" -#: src/view/UsersDialog.cpp:49 src/view/SnapshotsDialog.cpp:55 -#: src/view/GenerateDialog.cpp:48 src/view/PasswordDialog.cpp:49 +#: src/view/PasswordDialog.cpp:49 src/view/GenerateDialog.cpp:49 +#: src/view/SnapshotsDialog.cpp:55 src/view/UsersDialog.cpp:49 msgid "OK" msgstr "" @@ -627,23 +630,23 @@ msgstr "" msgid "Old password" msgstr "" -#: src/view/PreferencesPanel.cpp:50 +#: src/view/PreferencesPanel.cpp:53 msgid "Operation order" msgstr "" -#: src/view/SearchBanner.cpp:97 src/view/AccountPanel.cpp:254 +#: src/view/SearchBanner.cpp:102 src/view/AccountPanel.cpp:198 msgid "Operations" msgstr "" -#: src/view/ImportPanel.cpp:433 +#: src/view/ImportPanel.cpp:425 msgid "Operations successfully imported" msgstr "" -#: src/view/ExportPanel.cpp:143 +#: src/view/ExportPanel.cpp:135 msgid "Operations successfuly saved" msgstr "" -#: src/controller/KissCount.cpp:333 +#: src/controller/KissCount.cpp:345 msgid "Other" msgstr "" @@ -655,7 +658,7 @@ msgstr "" msgid "Password changed" msgstr "" -#: src/view/wxUI.cpp:296 +#: src/view/wxUI.cpp:317 msgid "Personal accounting software" msgstr "" @@ -663,60 +666,64 @@ msgstr "" msgid "Please retype new password" msgstr "" -#: src/view/PreferencesPanel.cpp:203 src/view/PreferencesPanel.cpp:1155 +#: src/view/PreferencesPanel.cpp:194 src/view/PreferencesPanel.cpp:1146 msgid "Preferences" msgstr "" -#: src/view/wxUI.cpp:301 +#: src/view/wxUI.cpp:322 msgid "Quit KissCount ?" msgstr "" -#: src/view/AccountPanel.cpp:159 +#: src/view/AccountPanel.cpp:118 msgid "Real" msgstr "" -#: src/view/SearchPanel.cpp:49 +#: src/view/SearchPanel.cpp:55 msgid "Rename" msgstr "" -#: src/view/ExportPanel.cpp:129 +#: src/view/ExportPanel.cpp:121 msgid "Save as" msgstr "" -#: src/view/ImportPanel.cpp:51 +#: src/view/ImportPanel.cpp:55 msgid "Save import patterns" msgstr "" -#: src/view/SearchPanel.cpp:34 src/view/SearchPanel.cpp:87 -#: src/view/SearchPanel.cpp:238 src/view/ExportPanel.cpp:34 +#: src/view/ExportPanel.cpp:38 src/view/SearchPanel.cpp:40 +#: src/view/SearchPanel.cpp:95 src/view/SearchPanel.cpp:288 msgid "Search" msgstr "" -#: src/view/PreferencesPanel.cpp:51 +#: src/view/PreferencesPanel.cpp:54 msgid "Shared with" msgstr "" -#: src/view/SnapshotsDialog.cpp:32 src/view/AccountPanel.cpp:187 +#: src/view/SnapshotsDialog.cpp:32 src/view/AccountPanel.cpp:146 msgid "Snapshots" msgstr "" -#: src/view/StatsPanel.cpp:215 src/view/StatsPanel.cpp:416 +#: src/view/GenerateDialog.cpp:215 +msgid "Some operations date has been updated" +msgstr "" + +#: src/view/StatsPanel.cpp:143 src/view/StatsPanel.cpp:315 msgid "Statistics" msgstr "" -#: src/view/StatsPanel.cpp:76 +#: src/view/StatsPanel.cpp:78 msgid "To" msgstr "" -#: src/view/AccountPanel.cpp:274 src/view/AccountPanel.cpp:297 +#: src/view/AccountPanel.cpp:216 src/view/AccountPanel.cpp:223 msgid "Total Credit" msgstr "" -#: src/view/AccountPanel.cpp:275 src/view/AccountPanel.cpp:298 +#: src/view/AccountPanel.cpp:217 src/view/AccountPanel.cpp:224 msgid "Total Debit" msgstr "" -#: src/view/AccountPanel.cpp:185 +#: src/view/AccountPanel.cpp:144 msgid "UnGroup" msgstr "" @@ -733,7 +740,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:1720 +#: src/model/Database.cpp:74 src/model/Database.cpp:1721 msgid "Unable to open database" msgstr "" @@ -745,39 +752,39 @@ msgstr "" msgid "Unable to upgrade Database" msgstr "" -#: src/controller/KissCount.cpp:333 +#: src/controller/KissCount.cpp:345 msgid "Unexpected" msgstr "" -#: src/view/SearchBanner.cpp:63 src/view/SearchBanner.cpp:84 -#: src/view/AccountPanel.cpp:658 src/model/User.cpp:65 src/model/User.cpp:83 -#: src/model/User.cpp:161 +#: 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 msgid "Unknown" msgstr "" -#: src/view/ImportPanel.cpp:32 +#: src/view/ImportPanel.cpp:33 msgid "Unresolved accounts" msgstr "" -#: src/view/ImportPanel.cpp:33 +#: src/view/ImportPanel.cpp:34 msgid "Unresolved categories" msgstr "" -#: src/model/Database.cpp:582 src/model/Database.cpp:758 -#: src/model/Database.cpp:900 +#: src/model/Database.cpp:583 src/model/Database.cpp:759 +#: src/model/Database.cpp:901 msgid "Update failed !\n" msgstr "" -#: src/view/AccountPanel.cpp:186 +#: src/view/AccountPanel.cpp:145 msgid "Update next months" msgstr "" -#: src/view/PreferencesPanel.cpp:46 +#: src/view/PreferencesPanel.cpp:49 msgid "User" msgstr "" -#: src/view/UsersDialog.cpp:40 src/view/UsersDialog.cpp:123 -#: src/view/PreferencesPanel.cpp:1108 +#: src/view/PreferencesPanel.cpp:1099 src/view/UsersDialog.cpp:40 +#: src/view/UsersDialog.cpp:123 msgid "User " msgstr "" @@ -785,11 +792,11 @@ msgstr "" msgid "Users" msgstr "" -#: src/view/PreferencesPanel.cpp:220 src/view/AccountPanel.cpp:158 +#: src/view/PreferencesPanel.cpp:211 src/view/AccountPanel.cpp:117 msgid "Virtual" msgstr "" -#: src/view/grid/GridAccount.cpp:1111 +#: src/view/GenerateDialog.cpp:215 src/view/grid/GridAccount.cpp:1076 msgid "Warning" msgstr "" @@ -797,62 +804,62 @@ msgstr "" msgid "Welcome back to " msgstr "" -#: src/view/PreferencesPanel.cpp:622 +#: src/view/PreferencesPanel.cpp:613 msgid "Wich account will replace this one ?" msgstr "" -#: src/view/PreferencesPanel.cpp:715 +#: src/view/PreferencesPanel.cpp:706 msgid "Wich category will replace this one ?" msgstr "" -#: src/view/grid/GridAccount.cpp:1111 +#: src/view/grid/GridAccount.cpp:1076 msgid "You made a debit on a blocked account" msgstr "" -#: src/view/wxUI.cpp:158 +#: src/view/wxUI.cpp:167 msgid "april" msgstr "" -#: src/view/wxUI.cpp:162 +#: src/view/wxUI.cpp:171 msgid "august" msgstr "" -#: src/view/wxUI.cpp:166 +#: src/view/wxUI.cpp:175 msgid "december" msgstr "" -#: src/view/wxUI.cpp:156 +#: src/view/wxUI.cpp:165 msgid "february" msgstr "" -#: src/view/wxUI.cpp:155 +#: src/view/wxUI.cpp:164 msgid "january" msgstr "" -#: src/view/wxUI.cpp:161 +#: src/view/wxUI.cpp:170 msgid "july" msgstr "" -#: src/view/wxUI.cpp:160 +#: src/view/wxUI.cpp:169 msgid "june" msgstr "" -#: src/view/wxUI.cpp:157 +#: src/view/wxUI.cpp:166 msgid "march" msgstr "" -#: src/view/wxUI.cpp:159 +#: src/view/wxUI.cpp:168 msgid "may" msgstr "" -#: src/view/wxUI.cpp:165 +#: src/view/wxUI.cpp:174 msgid "november" msgstr "" -#: src/view/wxUI.cpp:164 +#: src/view/wxUI.cpp:173 msgid "october" msgstr "" -#: src/view/wxUI.cpp:163 +#: src/view/wxUI.cpp:172 msgid "september" msgstr "" diff --git a/src/controller/KissCount.cpp b/src/controller/KissCount.cpp index 4371890..6324a3a 100644 --- a/src/controller/KissCount.cpp +++ b/src/controller/KissCount.cpp @@ -256,11 +256,12 @@ std::map > KissCount::GetAllOperations() return _db->GetAllOperations(_user); } -void KissCount::GenerateMonth(int monthFrom, int yearFrom, int monthTo, int yearTo) +int KissCount::GenerateMonth(int monthFrom, int yearFrom, int monthTo, int yearTo) { std::vector::iterator it, it2; std::map meta; Operation op; + int nb_update_days = 0; _db->GenerateMonth(_user, monthFrom, yearFrom, monthTo, yearTo); @@ -290,6 +291,7 @@ void KissCount::GenerateMonth(int monthFrom, int yearFrom, int monthTo, int year { QDate d(op.year, op.month+1, 1); op.day = d.daysInMonth()-1; + nb_update_days++; } (*_user->_operations[yearTo])[monthTo].push_back(op); @@ -317,6 +319,8 @@ void KissCount::GenerateMonth(int monthFrom, int yearFrom, int monthTo, int year } } _wxUI->GenerateMonth(monthTo, yearTo); + + return nb_update_days; } void KissCount::ChangePassword(const QString& password) diff --git a/src/controller/KissCount.hpp b/src/controller/KissCount.hpp index 304407a..cd1222a 100644 --- a/src/controller/KissCount.hpp +++ b/src/controller/KissCount.hpp @@ -95,7 +95,7 @@ public: std::map > GetAllOperations(); - void GenerateMonth(int monthFrom, int yearFrom, int monthTo, int yearTo); + int GenerateMonth(int monthFrom, int yearFrom, int monthTo, int yearTo); void KillMe(); void SetLanguage(QString language); diff --git a/src/view/GenerateDialog.cpp b/src/view/GenerateDialog.cpp index cf19b80..59e1d40 100644 --- a/src/view/GenerateDialog.cpp +++ b/src/view/GenerateDialog.cpp @@ -18,6 +18,7 @@ */ #include "GenerateDialog.hpp" #include +#include GenerateDialog::GenerateDialog(KissCount* kiss, wxUI *parent, int month, int year) : QDialog(0, Qt::Dialog), _kiss(kiss), _wxUI(parent) { @@ -210,7 +211,9 @@ void GenerateDialog::OnOK() QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); close(); - _kiss->GenerateMonth(monthFrom, yearFrom, monthTo, yearTo); + if (_kiss->GenerateMonth(monthFrom, yearFrom, monthTo, yearTo)) + QMessageBox::warning(0, _("Warning"), _("Some operations date has been updated")); + QApplication::restoreOverrideCursor(); }