Fix Bug : find meta operations when search previous operations (same description)

Fix Bug : Don't update meta amount when removing one operation
Update locales
This commit is contained in:
Grégory Soutadé 2010-12-02 19:12:27 +01:00
parent 84bd6d8b42
commit 5a50a53b7a
5 changed files with 186 additions and 168 deletions

Binary file not shown.

View File

@ -2,7 +2,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-11-20 17:16+0100\n" "POT-Creation-Date: 2010-12-02 19:11+0100\n"
"PO-Revision-Date: \n" "PO-Revision-Date: \n"
"Last-Translator: Soutadé <soutade@gmail.com>\n" "Last-Translator: Soutadé <soutade@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
@ -20,20 +20,20 @@ msgstr ""
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# #
#: src/view/StatsPanel.cpp:327 #: src/view/StatsPanel.cpp:327
#: src/view/PreferencesPanel.cpp:764 #: src/view/PreferencesPanel.cpp:775
msgid " - " msgid " - "
msgstr " - " msgstr " - "
#: src/view/UsersDialog.cpp:118 #: src/view/UsersDialog.cpp:118
#: src/view/PreferencesPanel.cpp:417 #: src/view/PreferencesPanel.cpp:456
#: src/view/PreferencesPanel.cpp:436 #: src/view/PreferencesPanel.cpp:476
#: src/view/PreferencesPanel.cpp:657 #: src/view/PreferencesPanel.cpp:677
#: src/view/PreferencesPanel.cpp:676 #: src/view/PreferencesPanel.cpp:696
#: src/view/PreferencesPanel.cpp:722 #: src/view/PreferencesPanel.cpp:733
msgid " already exists" msgid " already exists"
msgstr " existe déjà" msgstr " existe déjà"
#: src/view/SearchPanel.cpp:222 #: src/view/SearchPanel.cpp:226
msgid " entries found" msgid " entries found"
msgstr " entrées trouvées" msgstr " entrées trouvées"
@ -41,11 +41,11 @@ msgstr " entrées trouvées"
msgid " not found, aborting" msgid " not found, aborting"
msgstr " non trouvé, arrêt" msgstr " non trouvé, arrêt"
#: src/view/AccountPanel.cpp:733 #: src/view/AccountPanel.cpp:742
msgid " operations ?" msgid " operations ?"
msgstr " opérations ?" msgstr " opérations ?"
#: src/view/PreferencesPanel.cpp:771 #: src/view/PreferencesPanel.cpp:782
msgid " profil ?" msgid " profil ?"
msgstr " profil ?" msgstr " profil ?"
@ -53,7 +53,7 @@ msgstr " profil ?"
msgid "!! Warning !! If there was a bug, the old database will be suppressed !" msgid "!! Warning !! If there was a bug, the old database will be suppressed !"
msgstr "!! Attention !! S'il y a eu un bug, l'ancienne base de donnée va être supprimée !" msgstr "!! Attention !! S'il y a eu un bug, l'ancienne base de donnée va être supprimée !"
#: src/view/SearchPanel.cpp:224 #: src/view/SearchPanel.cpp:228
msgid "1 entry found" msgid "1 entry found"
msgstr "1 entrée trouvée" msgstr "1 entrée trouvée"
@ -61,17 +61,17 @@ msgstr "1 entrée trouvée"
msgid "About" msgid "About"
msgstr "A propos" msgstr "A propos"
#: src/view/SearchPanel.cpp:89 #: src/view/SearchPanel.cpp:90
#: src/view/grid/GridAccount.cpp:63 #: src/view/grid/GridAccount.cpp:64
msgid "Account" msgid "Account"
msgstr "Compte" msgstr "Compte"
#: src/view/PreferencesPanel.cpp:417 #: src/view/PreferencesPanel.cpp:456
#: src/view/PreferencesPanel.cpp:436 #: src/view/PreferencesPanel.cpp:476
msgid "Account " msgid "Account "
msgstr "Le compte " msgstr "Le compte "
#: src/controller/KissCount.cpp:337 #: src/controller/KissCount.cpp:343
msgid "Account 1" msgid "Account 1"
msgstr "Compte 1" msgstr "Compte 1"
@ -88,30 +88,30 @@ msgstr "Numéro de compte"
msgid "Accounts" msgid "Accounts"
msgstr "Comptes" msgstr "Comptes"
#: src/view/SearchPanel.cpp:86 #: src/view/SearchPanel.cpp:87
msgid "Amount from" msgid "Amount from"
msgstr "Montant min" msgstr "Montant min"
#: src/view/SearchPanel.cpp:87 #: src/view/SearchPanel.cpp:88
msgid "Amount to" msgid "Amount to"
msgstr "Montant max" msgstr "Montant max"
#: src/view/PreferencesPanel.cpp:398 #: src/view/PreferencesPanel.cpp:408
#: src/view/PreferencesPanel.cpp:771 #: src/view/PreferencesPanel.cpp:782
#: src/view/AccountPanel.cpp:728 #: src/view/AccountPanel.cpp:737
msgid "Are you sure want to delete " msgid "Are you sure want to delete "
msgstr "Etes vous sûr de vouloir supprimer " msgstr "Etes vous sûr de vouloir supprimer "
#: src/view/PreferencesPanel.cpp:638 #: src/view/PreferencesPanel.cpp:657
#: src/view/grid/GridAccount.cpp:783 #: src/view/grid/GridAccount.cpp:814
msgid "Are you sure want to delete : \n" msgid "Are you sure want to delete : \n"
msgstr "Etes vous sûr de vouloir supprimer : \n" msgstr "Etes vous sûr de vouloir supprimer : \n"
#: src/view/PreferencesPanel.cpp:315 #: src/view/PreferencesPanel.cpp:343
msgid "Ascending" msgid "Ascending"
msgstr "Croissant" msgstr "Croissant"
#: src/view/PreferencesPanel.cpp:254 #: src/view/PreferencesPanel.cpp:267
msgid "Background color" msgid "Background color"
msgstr "Couleur d'arrière plan" msgstr "Couleur d'arrière plan"
@ -119,23 +119,19 @@ msgstr "Couleur d'arrière plan"
msgid "Blocked" msgid "Blocked"
msgstr "Bloqué" msgstr "Bloqué"
#: src/view/SearchPanel.cpp:76
msgid "Both"
msgstr "Les deux"
#: src/view/UsersDialog.cpp:51 #: src/view/UsersDialog.cpp:51
#: src/view/GenerateDialog.cpp:60 #: src/view/GenerateDialog.cpp:60
#: src/view/PasswordDialog.cpp:56 #: src/view/PasswordDialog.cpp:56
msgid "Cancel" msgid "Cancel"
msgstr "Annuler" msgstr "Annuler"
#: src/view/grid/GridAccount.cpp:1190 #: src/view/grid/GridAccount.cpp:1245
#: src/view/grid/GridAccount.cpp:1197 #: src/view/grid/GridAccount.cpp:1252
msgid "Cannot group these operations" msgid "Cannot group these operations"
msgstr "Impossible de grouper ces opérations" msgstr "Impossible de grouper ces opérations"
#: src/view/grid/GridAccount.cpp:1316 #: src/view/grid/GridAccount.cpp:1371
#: src/view/grid/GridAccount.cpp:1322 #: src/view/grid/GridAccount.cpp:1377
msgid "Cannot ungroup these operations" msgid "Cannot ungroup these operations"
msgstr "Impossible de dégrouper ces opérations" msgstr "Impossible de dégrouper ces opérations"
@ -143,13 +139,13 @@ msgstr "Impossible de dégrouper ces opérations"
msgid "Categories" msgid "Categories"
msgstr "Catégories" msgstr "Catégories"
#: src/view/SearchPanel.cpp:88 #: src/view/SearchPanel.cpp:89
#: src/view/grid/GridAccount.cpp:63 #: src/view/grid/GridAccount.cpp:64
msgid "Category" msgid "Category"
msgstr "Catégorie" msgstr "Catégorie"
#: src/view/PreferencesPanel.cpp:657 #: src/view/PreferencesPanel.cpp:677
#: src/view/PreferencesPanel.cpp:676 #: src/view/PreferencesPanel.cpp:696
msgid "Category " msgid "Category "
msgstr "La catégorie " msgstr "La catégorie "
@ -173,6 +169,10 @@ msgstr "Changer d'utilisateur"
msgid "Check mode" msgid "Check mode"
msgstr "Mode rapprochement" msgstr "Mode rapprochement"
#: src/view/SearchPanel.cpp:76
msgid "Checked"
msgstr "Rapprochée"
#: src/view/PasswordDialog.cpp:46 #: src/view/PasswordDialog.cpp:46
msgid "Confirm password " msgid "Confirm password "
msgstr "Confirmer le mot de passe " msgstr "Confirmer le mot de passe "
@ -182,7 +182,7 @@ msgstr "Confirmer le mot de passe "
msgid "Cost repartition" msgid "Cost repartition"
msgstr "Répartition des coûts" msgstr "Répartition des coûts"
#: src/view/grid/GridAccount.cpp:63 #: src/view/grid/GridAccount.cpp:64
msgid "Credit" msgid "Credit"
msgstr "Crédit" msgstr "Crédit"
@ -198,7 +198,7 @@ msgstr "Cur Débit"
msgid "Current value" msgid "Current value"
msgstr "Valeur courante" msgstr "Valeur courante"
#: src/view/grid/GridAccount.cpp:63 #: src/view/grid/GridAccount.cpp:64
msgid "Date" msgid "Date"
msgstr "Date" msgstr "Date"
@ -210,7 +210,7 @@ msgstr "Date min"
msgid "Date to" msgid "Date to"
msgstr "Date max" msgstr "Date max"
#: src/view/grid/GridAccount.cpp:63 #: src/view/grid/GridAccount.cpp:64
msgid "Debit" msgid "Debit"
msgstr "Débit" msgstr "Débit"
@ -219,40 +219,40 @@ msgid "Default"
msgstr "Défaut" msgstr "Défaut"
#: src/view/PreferencesPanel.cpp:188 #: src/view/PreferencesPanel.cpp:188
#: src/view/PreferencesPanel.cpp:257 #: src/view/PreferencesPanel.cpp:270
#: src/view/AccountPanel.cpp:587 #: src/view/AccountPanel.cpp:596
msgid "Delete" msgid "Delete"
msgstr "Supprimer" msgstr "Supprimer"
#: src/view/PreferencesPanel.cpp:316 #: src/view/PreferencesPanel.cpp:344
msgid "Descending" msgid "Descending"
msgstr "Décroissant" msgstr "Décroissant"
#: src/view/SearchPanel.cpp:85 #: src/view/SearchPanel.cpp:86
#: src/view/grid/GridAccount.cpp:63 #: src/view/grid/GridAccount.cpp:64
msgid "Description" msgid "Description"
msgstr "Description" msgstr "Description"
#: src/view/UsersDialog.cpp:88 #: src/view/UsersDialog.cpp:88
#: src/view/UsersDialog.cpp:118 #: src/view/UsersDialog.cpp:118
#: src/view/SearchPanel.cpp:140 #: src/view/SearchPanel.cpp:141
#: src/view/SearchPanel.cpp:150 #: src/view/SearchPanel.cpp:151
#: src/view/SearchPanel.cpp:164 #: src/view/SearchPanel.cpp:165
#: src/view/SearchPanel.cpp:175 #: src/view/SearchPanel.cpp:176
#: src/view/PreferencesPanel.cpp:394 #: src/view/PreferencesPanel.cpp:404
#: src/view/PreferencesPanel.cpp:417 #: src/view/PreferencesPanel.cpp:456
#: src/view/PreferencesPanel.cpp:436 #: src/view/PreferencesPanel.cpp:476
#: src/view/PreferencesPanel.cpp:657 #: src/view/PreferencesPanel.cpp:677
#: src/view/PreferencesPanel.cpp:676 #: src/view/PreferencesPanel.cpp:696
#: src/view/PreferencesPanel.cpp:716 #: src/view/PreferencesPanel.cpp:727
#: src/view/PreferencesPanel.cpp:722 #: src/view/PreferencesPanel.cpp:733
#: src/view/PasswordDialog.cpp:72 #: src/view/PasswordDialog.cpp:72
#: src/view/PasswordDialog.cpp:78 #: src/view/PasswordDialog.cpp:78
#: src/view/AccountPanel.cpp:724 #: src/view/AccountPanel.cpp:733
#: src/view/grid/GridAccount.cpp:1190 #: src/view/grid/GridAccount.cpp:1245
#: src/view/grid/GridAccount.cpp:1197 #: src/view/grid/GridAccount.cpp:1252
#: src/view/grid/GridAccount.cpp:1316 #: src/view/grid/GridAccount.cpp:1371
#: src/view/grid/GridAccount.cpp:1322 #: src/view/grid/GridAccount.cpp:1377
#: src/view/grid/wxGridCellFormulaEditor.cpp:69 #: src/view/grid/wxGridCellFormulaEditor.cpp:69
#: src/model/Database.cpp:38 #: src/model/Database.cpp:38
#: src/model/Database.cpp:55 #: src/model/Database.cpp:55
@ -274,17 +274,17 @@ msgid "Final value"
msgstr "Valeur finale" msgstr "Valeur finale"
#: src/view/SearchPanel.cpp:76 #: src/view/SearchPanel.cpp:76
#: src/view/grid/GridAccount.cpp:307 #: src/view/grid/GridAccount.cpp:323
#: src/model/Database.cpp:331 #: src/model/Database.cpp:331
#: src/controller/KissCount.cpp:353 #: src/controller/KissCount.cpp:359
msgid "Fix" msgid "Fix"
msgstr "Fixe" msgstr "Fixe"
#: src/view/PreferencesPanel.cpp:256 #: src/view/PreferencesPanel.cpp:269
msgid "Font" msgid "Font"
msgstr "Police" msgstr "Police"
#: src/view/PreferencesPanel.cpp:255 #: src/view/PreferencesPanel.cpp:268
msgid "Foreground color" msgid "Foreground color"
msgstr "Couleur d'avant plan" msgstr "Couleur d'avant plan"
@ -297,11 +297,11 @@ msgid "From "
msgstr "A partir de " msgstr "A partir de "
#: src/view/GenerateDialog.cpp:31 #: src/view/GenerateDialog.cpp:31
#: src/view/AccountPanel.cpp:584 #: src/view/AccountPanel.cpp:593
msgid "Generate month" msgid "Generate month"
msgstr "Générer mois" msgstr "Générer mois"
#: src/controller/KissCount.cpp:355 #: src/controller/KissCount.cpp:361
msgid "Groceries" msgid "Groceries"
msgstr "Courses" msgstr "Courses"
@ -309,7 +309,7 @@ msgstr "Courses"
msgid "Group" msgid "Group"
msgstr "Grouper" msgstr "Grouper"
#: src/controller/KissCount.cpp:357 #: src/controller/KissCount.cpp:363
msgid "Hobbies" msgid "Hobbies"
msgstr "Loisirs" msgstr "Loisirs"
@ -317,19 +317,19 @@ msgstr "Loisirs"
msgid "Initial value" msgid "Initial value"
msgstr "Valeur initiale" msgstr "Valeur initiale"
#: src/view/SearchPanel.cpp:150 #: src/view/SearchPanel.cpp:151
msgid "Invalid amount from" msgid "Invalid amount from"
msgstr "Montant min invalide" msgstr "Montant min invalide"
#: src/view/SearchPanel.cpp:175 #: src/view/SearchPanel.cpp:176
msgid "Invalid amount range" msgid "Invalid amount range"
msgstr "Intervalle des montants invalide" msgstr "Intervalle des montants invalide"
#: src/view/SearchPanel.cpp:164 #: src/view/SearchPanel.cpp:165
msgid "Invalid amount to" msgid "Invalid amount to"
msgstr "Montant max invalide" msgstr "Montant max invalide"
#: src/view/SearchPanel.cpp:140 #: src/view/SearchPanel.cpp:141
msgid "Invalid date range" msgid "Invalid date range"
msgstr "Intervalle de temps invalide" msgstr "Intervalle de temps invalide"
@ -337,7 +337,7 @@ msgstr "Intervalle de temps invalide"
msgid "Invalid formula !" msgid "Invalid formula !"
msgstr "Formule invalide !" msgstr "Formule invalide !"
#: src/view/PreferencesPanel.cpp:716 #: src/view/PreferencesPanel.cpp:727
msgid "Invalid name" msgid "Invalid name"
msgstr "Nom invalide" msgstr "Nom invalide"
@ -353,11 +353,11 @@ msgstr "Mot de passe invalide"
msgid "Invalide date range" msgid "Invalide date range"
msgstr "Intervalle de temps invalide" msgstr "Intervalle de temps invalide"
#: src/view/PreferencesPanel.cpp:394 #: src/view/PreferencesPanel.cpp:404
msgid "It must be at least one account !" msgid "It must be at least one account !"
msgstr "Il doit y avoir au moins un compte !" msgstr "Il doit y avoir au moins un compte !"
#: src/view/AccountPanel.cpp:724 #: src/view/AccountPanel.cpp:733
msgid "It must be at least one month !" msgid "It must be at least one month !"
msgstr "Il doit rester au moins un mois" msgstr "Il doit rester au moins un mois"
@ -366,8 +366,8 @@ msgid "Kill me"
msgstr "Kill me" msgstr "Kill me"
#: src/view/StatsPanel.cpp:346 #: src/view/StatsPanel.cpp:346
#: src/view/PreferencesPanel.cpp:756 #: src/view/PreferencesPanel.cpp:767
#: src/view/PreferencesPanel.cpp:759 #: src/view/PreferencesPanel.cpp:770
msgid "KissCount" msgid "KissCount"
msgstr "KissCount" msgstr "KissCount"
@ -375,21 +375,21 @@ msgstr "KissCount"
msgid "Language" msgid "Language"
msgstr "Langue" msgstr "Langue"
#: src/view/PreferencesPanel.cpp:759 #: src/view/PreferencesPanel.cpp:770
msgid "Language not changed" msgid "Language not changed"
msgstr "Langue non changée" msgstr "Langue non changée"
#: src/view/PreferencesPanel.cpp:756 #: src/view/PreferencesPanel.cpp:767
msgid "Language successfully changed, please go to another panel" 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/PreferencesPanel.cpp:71 #: src/view/PreferencesPanel.cpp:71
#: src/view/PreferencesPanel.cpp:184 #: src/view/PreferencesPanel.cpp:184
#: src/view/PreferencesPanel.cpp:253 #: src/view/PreferencesPanel.cpp:266
msgid "Name" msgid "Name"
msgstr "Nom" msgstr "Nom"
#: src/view/PreferencesPanel.cpp:728 #: src/view/PreferencesPanel.cpp:739
msgid "Name changed" msgid "Name changed"
msgstr "Nom changé" msgstr "Nom changé"
@ -410,7 +410,7 @@ msgstr ""
"Aucune base de données trouvée, voulez vous en créer une nouvelle ?\n" "Aucune base de données trouvée, voulez vous en créer une nouvelle ?\n"
"\n" "\n"
#: src/view/SearchPanel.cpp:227 #: src/view/SearchPanel.cpp:231
msgid "No entry found" msgid "No entry found"
msgstr "Pas d'entrée trouvée" msgstr "Pas d'entrée trouvée"
@ -418,6 +418,10 @@ msgstr "Pas d'entrée trouvée"
msgid "Non fix" msgid "Non fix"
msgstr "Courantes" msgstr "Courantes"
#: src/view/SearchPanel.cpp:76
msgid "Not checked"
msgstr "Non rapprochée"
#: src/view/PreferencesPanel.cpp:185 #: src/view/PreferencesPanel.cpp:185
msgid "Number" msgid "Number"
msgstr "Numéro de compte" msgstr "Numéro de compte"
@ -432,7 +436,7 @@ msgstr "OK"
msgid "Old password " msgid "Old password "
msgstr "Ancien mot de passe " msgstr "Ancien mot de passe "
#: src/controller/KissCount.cpp:359 #: src/controller/KissCount.cpp:365
msgid "Operating exepense" msgid "Operating exepense"
msgstr "Fonctionnement" msgstr "Fonctionnement"
@ -440,12 +444,11 @@ msgstr "Fonctionnement"
msgid "Operation order" msgid "Operation order"
msgstr "Ordre des opérations" msgstr "Ordre des opérations"
#: src/view/SearchPanel.cpp:77
#: src/view/ButtonPanel.cpp:69 #: src/view/ButtonPanel.cpp:69
msgid "Operations" msgid "Operations"
msgstr "Opérations" msgstr "Opérations"
#: src/controller/KissCount.cpp:363 #: src/controller/KissCount.cpp:369
msgid "Other" msgid "Other"
msgstr "Autres" msgstr "Autres"
@ -479,8 +482,8 @@ msgstr ""
msgid "Please retype new password" msgid "Please retype new password"
msgstr "Re entrez le mot de passe" msgstr "Re entrez le mot de passe"
#: src/view/PreferencesPanel.cpp:730 #: src/view/PreferencesPanel.cpp:741
#: src/view/PreferencesPanel.cpp:764 #: src/view/PreferencesPanel.cpp:775
#: src/view/ButtonPanel.cpp:72 #: src/view/ButtonPanel.cpp:72
msgid "Preferences" msgid "Preferences"
msgstr "Préférences" msgstr "Préférences"
@ -501,8 +504,8 @@ msgstr "Quitter KissCount ?"
msgid "Remains" msgid "Remains"
msgstr "Restant" msgstr "Restant"
#: src/view/SearchPanel.cpp:83 #: src/view/SearchPanel.cpp:84
#: src/view/SearchPanel.cpp:238 #: src/view/SearchPanel.cpp:242
#: src/view/ButtonPanel.cpp:71 #: src/view/ButtonPanel.cpp:71
msgid "Search" msgid "Search"
msgstr "Chercher" msgstr "Chercher"
@ -548,7 +551,7 @@ msgstr "Dégrouper"
msgid "Unable to open Database" msgid "Unable to open Database"
msgstr "Impossible d'ouvrir la base de données" msgstr "Impossible d'ouvrir la base de données"
#: src/controller/KissCount.cpp:361 #: src/controller/KissCount.cpp:367
msgid "Unexpected" msgid "Unexpected"
msgstr "Exceptionnel" msgstr "Exceptionnel"
@ -568,7 +571,7 @@ msgstr "Utilisateur"
#: src/view/UsersDialog.cpp:38 #: src/view/UsersDialog.cpp:38
#: src/view/UsersDialog.cpp:118 #: src/view/UsersDialog.cpp:118
#: src/view/PreferencesPanel.cpp:722 #: src/view/PreferencesPanel.cpp:733
msgid "User " msgid "User "
msgstr "Utilisateur " msgstr "Utilisateur "
@ -576,11 +579,11 @@ msgstr "Utilisateur "
msgid "Users" msgid "Users"
msgstr "Utilisateurs" msgstr "Utilisateurs"
#: src/view/grid/GridAccount.cpp:993 #: src/view/grid/GridAccount.cpp:1022
msgid "Warning" msgid "Warning"
msgstr "Attention" msgstr "Attention"
#: src/view/grid/GridAccount.cpp:993 #: src/view/grid/GridAccount.cpp:1022
msgid "You made a debit on a blocked account" msgid "You made a debit on a blocked account"
msgstr "Vous avez effectué une opération de débit sur un compte bloqué" msgstr "Vous avez effectué une opération de débit sur un compte bloqué"
@ -632,6 +635,8 @@ msgstr "octobre"
msgid "september" msgid "september"
msgstr "septembre" msgstr "septembre"
#~ msgid "Both"
#~ msgstr "Les deux"
#~ msgid "Color" #~ msgid "Color"
#~ msgstr "Couleur" #~ msgstr "Couleur"
#~ msgid "Fixe" #~ msgid "Fixe"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-11-20 17:16+0100\n" "POT-Creation-Date: 2010-12-02 19:11+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,17 +17,17 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: src/view/StatsPanel.cpp:327 src/view/PreferencesPanel.cpp:764 #: src/view/StatsPanel.cpp:327 src/view/PreferencesPanel.cpp:775
msgid " - " msgid " - "
msgstr "" msgstr ""
#: src/view/UsersDialog.cpp:118 src/view/PreferencesPanel.cpp:417 #: src/view/UsersDialog.cpp:118 src/view/PreferencesPanel.cpp:456
#: src/view/PreferencesPanel.cpp:436 src/view/PreferencesPanel.cpp:657 #: src/view/PreferencesPanel.cpp:476 src/view/PreferencesPanel.cpp:677
#: src/view/PreferencesPanel.cpp:676 src/view/PreferencesPanel.cpp:722 #: src/view/PreferencesPanel.cpp:696 src/view/PreferencesPanel.cpp:733
msgid " already exists" msgid " already exists"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:222 #: src/view/SearchPanel.cpp:226
msgid " entries found" msgid " entries found"
msgstr "" msgstr ""
@ -35,11 +35,11 @@ msgstr ""
msgid " not found, aborting" msgid " not found, aborting"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:733 #: src/view/AccountPanel.cpp:742
msgid " operations ?" msgid " operations ?"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:771 #: src/view/PreferencesPanel.cpp:782
msgid " profil ?" msgid " profil ?"
msgstr "" msgstr ""
@ -47,7 +47,7 @@ msgstr ""
msgid "!! Warning !! If there was a bug, the old database will be suppressed !" msgid "!! Warning !! If there was a bug, the old database will be suppressed !"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:224 #: src/view/SearchPanel.cpp:228
msgid "1 entry found" msgid "1 entry found"
msgstr "" msgstr ""
@ -55,15 +55,15 @@ msgstr ""
msgid "About" msgid "About"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:89 src/view/grid/GridAccount.cpp:63 #: src/view/SearchPanel.cpp:90 src/view/grid/GridAccount.cpp:64
msgid "Account" msgid "Account"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:417 src/view/PreferencesPanel.cpp:436 #: src/view/PreferencesPanel.cpp:456 src/view/PreferencesPanel.cpp:476
msgid "Account " msgid "Account "
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:337 #: src/controller/KissCount.cpp:343
msgid "Account 1" msgid "Account 1"
msgstr "" msgstr ""
@ -79,28 +79,28 @@ msgstr ""
msgid "Accounts" msgid "Accounts"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:86 #: src/view/SearchPanel.cpp:87
msgid "Amount from" msgid "Amount from"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:87 #: src/view/SearchPanel.cpp:88
msgid "Amount to" msgid "Amount to"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:398 src/view/PreferencesPanel.cpp:771 #: src/view/PreferencesPanel.cpp:408 src/view/PreferencesPanel.cpp:782
#: src/view/AccountPanel.cpp:728 #: src/view/AccountPanel.cpp:737
msgid "Are you sure want to delete " msgid "Are you sure want to delete "
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:638 src/view/grid/GridAccount.cpp:783 #: src/view/PreferencesPanel.cpp:657 src/view/grid/GridAccount.cpp:814
msgid "Are you sure want to delete : \n" msgid "Are you sure want to delete : \n"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:315 #: src/view/PreferencesPanel.cpp:343
msgid "Ascending" msgid "Ascending"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:254 #: src/view/PreferencesPanel.cpp:267
msgid "Background color" msgid "Background color"
msgstr "" msgstr ""
@ -108,20 +108,16 @@ msgstr ""
msgid "Blocked" msgid "Blocked"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:76
msgid "Both"
msgstr ""
#: src/view/UsersDialog.cpp:51 src/view/GenerateDialog.cpp:60 #: src/view/UsersDialog.cpp:51 src/view/GenerateDialog.cpp:60
#: src/view/PasswordDialog.cpp:56 #: src/view/PasswordDialog.cpp:56
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
#: src/view/grid/GridAccount.cpp:1190 src/view/grid/GridAccount.cpp:1197 #: src/view/grid/GridAccount.cpp:1245 src/view/grid/GridAccount.cpp:1252
msgid "Cannot group these operations" msgid "Cannot group these operations"
msgstr "" msgstr ""
#: src/view/grid/GridAccount.cpp:1316 src/view/grid/GridAccount.cpp:1322 #: src/view/grid/GridAccount.cpp:1371 src/view/grid/GridAccount.cpp:1377
msgid "Cannot ungroup these operations" msgid "Cannot ungroup these operations"
msgstr "" msgstr ""
@ -129,11 +125,11 @@ msgstr ""
msgid "Categories" msgid "Categories"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:88 src/view/grid/GridAccount.cpp:63 #: src/view/SearchPanel.cpp:89 src/view/grid/GridAccount.cpp:64
msgid "Category" msgid "Category"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:657 src/view/PreferencesPanel.cpp:676 #: src/view/PreferencesPanel.cpp:677 src/view/PreferencesPanel.cpp:696
msgid "Category " msgid "Category "
msgstr "" msgstr ""
@ -157,6 +153,10 @@ msgstr ""
msgid "Check mode" msgid "Check mode"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:76
msgid "Checked"
msgstr ""
#: src/view/PasswordDialog.cpp:46 #: src/view/PasswordDialog.cpp:46
msgid "Confirm password " msgid "Confirm password "
msgstr "" msgstr ""
@ -165,7 +165,7 @@ msgstr ""
msgid "Cost repartition" msgid "Cost repartition"
msgstr "" msgstr ""
#: src/view/grid/GridAccount.cpp:63 #: src/view/grid/GridAccount.cpp:64
msgid "Credit" msgid "Credit"
msgstr "" msgstr ""
@ -181,7 +181,7 @@ msgstr ""
msgid "Current value" msgid "Current value"
msgstr "" msgstr ""
#: src/view/grid/GridAccount.cpp:63 #: src/view/grid/GridAccount.cpp:64
msgid "Date" msgid "Date"
msgstr "" msgstr ""
@ -193,7 +193,7 @@ msgstr ""
msgid "Date to" msgid "Date to"
msgstr "" msgstr ""
#: src/view/grid/GridAccount.cpp:63 #: src/view/grid/GridAccount.cpp:64
msgid "Debit" msgid "Debit"
msgstr "" msgstr ""
@ -201,29 +201,29 @@ msgstr ""
msgid "Default" msgid "Default"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:188 src/view/PreferencesPanel.cpp:257 #: src/view/PreferencesPanel.cpp:188 src/view/PreferencesPanel.cpp:270
#: src/view/AccountPanel.cpp:587 #: src/view/AccountPanel.cpp:596
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:316 #: src/view/PreferencesPanel.cpp:344
msgid "Descending" msgid "Descending"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:85 src/view/grid/GridAccount.cpp:63 #: src/view/SearchPanel.cpp:86 src/view/grid/GridAccount.cpp:64
msgid "Description" msgid "Description"
msgstr "" msgstr ""
#: src/view/UsersDialog.cpp:88 src/view/UsersDialog.cpp:118 #: src/view/UsersDialog.cpp:88 src/view/UsersDialog.cpp:118
#: src/view/SearchPanel.cpp:140 src/view/SearchPanel.cpp:150 #: src/view/SearchPanel.cpp:141 src/view/SearchPanel.cpp:151
#: src/view/SearchPanel.cpp:164 src/view/SearchPanel.cpp:175 #: src/view/SearchPanel.cpp:165 src/view/SearchPanel.cpp:176
#: src/view/PreferencesPanel.cpp:394 src/view/PreferencesPanel.cpp:417 #: src/view/PreferencesPanel.cpp:404 src/view/PreferencesPanel.cpp:456
#: src/view/PreferencesPanel.cpp:436 src/view/PreferencesPanel.cpp:657 #: src/view/PreferencesPanel.cpp:476 src/view/PreferencesPanel.cpp:677
#: src/view/PreferencesPanel.cpp:676 src/view/PreferencesPanel.cpp:716 #: src/view/PreferencesPanel.cpp:696 src/view/PreferencesPanel.cpp:727
#: src/view/PreferencesPanel.cpp:722 src/view/PasswordDialog.cpp:72 #: src/view/PreferencesPanel.cpp:733 src/view/PasswordDialog.cpp:72
#: src/view/PasswordDialog.cpp:78 src/view/AccountPanel.cpp:724 #: src/view/PasswordDialog.cpp:78 src/view/AccountPanel.cpp:733
#: src/view/grid/GridAccount.cpp:1190 src/view/grid/GridAccount.cpp:1197 #: src/view/grid/GridAccount.cpp:1245 src/view/grid/GridAccount.cpp:1252
#: src/view/grid/GridAccount.cpp:1316 src/view/grid/GridAccount.cpp:1322 #: src/view/grid/GridAccount.cpp:1371 src/view/grid/GridAccount.cpp:1377
#: src/view/grid/wxGridCellFormulaEditor.cpp:69 src/model/Database.cpp:38 #: src/view/grid/wxGridCellFormulaEditor.cpp:69 src/model/Database.cpp:38
#: src/model/Database.cpp:55 src/model/Database.cpp:95 #: src/model/Database.cpp:55 src/model/Database.cpp:95
#: src/model/Database.cpp:102 src/model/Database.cpp:120 #: src/model/Database.cpp:102 src/model/Database.cpp:120
@ -240,16 +240,16 @@ msgstr ""
msgid "Final value" msgid "Final value"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:76 src/view/grid/GridAccount.cpp:307 #: src/view/SearchPanel.cpp:76 src/view/grid/GridAccount.cpp:323
#: src/model/Database.cpp:331 src/controller/KissCount.cpp:353 #: src/model/Database.cpp:331 src/controller/KissCount.cpp:359
msgid "Fix" msgid "Fix"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:256 #: src/view/PreferencesPanel.cpp:269
msgid "Font" msgid "Font"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:255 #: src/view/PreferencesPanel.cpp:268
msgid "Foreground color" msgid "Foreground color"
msgstr "" msgstr ""
@ -261,11 +261,11 @@ msgstr ""
msgid "From " msgid "From "
msgstr "" msgstr ""
#: src/view/GenerateDialog.cpp:31 src/view/AccountPanel.cpp:584 #: src/view/GenerateDialog.cpp:31 src/view/AccountPanel.cpp:593
msgid "Generate month" msgid "Generate month"
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:355 #: src/controller/KissCount.cpp:361
msgid "Groceries" msgid "Groceries"
msgstr "" msgstr ""
@ -273,7 +273,7 @@ msgstr ""
msgid "Group" msgid "Group"
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:357 #: src/controller/KissCount.cpp:363
msgid "Hobbies" msgid "Hobbies"
msgstr "" msgstr ""
@ -281,19 +281,19 @@ msgstr ""
msgid "Initial value" msgid "Initial value"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:150 #: src/view/SearchPanel.cpp:151
msgid "Invalid amount from" msgid "Invalid amount from"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:175 #: src/view/SearchPanel.cpp:176
msgid "Invalid amount range" msgid "Invalid amount range"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:164 #: src/view/SearchPanel.cpp:165
msgid "Invalid amount to" msgid "Invalid amount to"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:140 #: src/view/SearchPanel.cpp:141
msgid "Invalid date range" msgid "Invalid date range"
msgstr "" msgstr ""
@ -301,7 +301,7 @@ msgstr ""
msgid "Invalid formula !" msgid "Invalid formula !"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:716 #: src/view/PreferencesPanel.cpp:727
msgid "Invalid name" msgid "Invalid name"
msgstr "" msgstr ""
@ -317,11 +317,11 @@ msgstr ""
msgid "Invalide date range" msgid "Invalide date range"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:394 #: src/view/PreferencesPanel.cpp:404
msgid "It must be at least one account !" msgid "It must be at least one account !"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:724 #: src/view/AccountPanel.cpp:733
msgid "It must be at least one month !" msgid "It must be at least one month !"
msgstr "" msgstr ""
@ -329,8 +329,8 @@ msgstr ""
msgid "Kill me" msgid "Kill me"
msgstr "" msgstr ""
#: src/view/StatsPanel.cpp:346 src/view/PreferencesPanel.cpp:756 #: src/view/StatsPanel.cpp:346 src/view/PreferencesPanel.cpp:767
#: src/view/PreferencesPanel.cpp:759 #: src/view/PreferencesPanel.cpp:770
msgid "KissCount" msgid "KissCount"
msgstr "" msgstr ""
@ -338,20 +338,20 @@ msgstr ""
msgid "Language" msgid "Language"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:759 #: src/view/PreferencesPanel.cpp:770
msgid "Language not changed" msgid "Language not changed"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:756 #: src/view/PreferencesPanel.cpp:767
msgid "Language successfully changed, please go to another panel" msgid "Language successfully changed, please go to another panel"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:71 src/view/PreferencesPanel.cpp:184 #: src/view/PreferencesPanel.cpp:71 src/view/PreferencesPanel.cpp:184
#: src/view/PreferencesPanel.cpp:253 #: src/view/PreferencesPanel.cpp:266
msgid "Name" msgid "Name"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:728 #: src/view/PreferencesPanel.cpp:739
msgid "Name changed" msgid "Name changed"
msgstr "" msgstr ""
@ -369,7 +369,7 @@ msgid ""
"\n" "\n"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:227 #: src/view/SearchPanel.cpp:231
msgid "No entry found" msgid "No entry found"
msgstr "" msgstr ""
@ -377,6 +377,10 @@ msgstr ""
msgid "Non fix" msgid "Non fix"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:76
msgid "Not checked"
msgstr ""
#: src/view/PreferencesPanel.cpp:185 #: src/view/PreferencesPanel.cpp:185
msgid "Number" msgid "Number"
msgstr "" msgstr ""
@ -390,7 +394,7 @@ msgstr ""
msgid "Old password " msgid "Old password "
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:359 #: src/controller/KissCount.cpp:365
msgid "Operating exepense" msgid "Operating exepense"
msgstr "" msgstr ""
@ -398,11 +402,11 @@ msgstr ""
msgid "Operation order" msgid "Operation order"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:77 src/view/ButtonPanel.cpp:69 #: src/view/ButtonPanel.cpp:69
msgid "Operations" msgid "Operations"
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:363 #: src/controller/KissCount.cpp:369
msgid "Other" msgid "Other"
msgstr "" msgstr ""
@ -429,7 +433,7 @@ msgstr ""
msgid "Please retype new password" msgid "Please retype new password"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:730 src/view/PreferencesPanel.cpp:764 #: src/view/PreferencesPanel.cpp:741 src/view/PreferencesPanel.cpp:775
#: src/view/ButtonPanel.cpp:72 #: src/view/ButtonPanel.cpp:72
msgid "Preferences" msgid "Preferences"
msgstr "" msgstr ""
@ -450,7 +454,7 @@ msgstr ""
msgid "Remains" msgid "Remains"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:83 src/view/SearchPanel.cpp:238 #: src/view/SearchPanel.cpp:84 src/view/SearchPanel.cpp:242
#: src/view/ButtonPanel.cpp:71 #: src/view/ButtonPanel.cpp:71
msgid "Search" msgid "Search"
msgstr "" msgstr ""
@ -492,7 +496,7 @@ msgstr ""
msgid "Unable to open Database" msgid "Unable to open Database"
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:361 #: src/controller/KissCount.cpp:367
msgid "Unexpected" msgid "Unexpected"
msgstr "" msgstr ""
@ -509,7 +513,7 @@ msgid "User"
msgstr "" msgstr ""
#: src/view/UsersDialog.cpp:38 src/view/UsersDialog.cpp:118 #: src/view/UsersDialog.cpp:38 src/view/UsersDialog.cpp:118
#: src/view/PreferencesPanel.cpp:722 #: src/view/PreferencesPanel.cpp:733
msgid "User " msgid "User "
msgstr "" msgstr ""
@ -517,11 +521,11 @@ msgstr ""
msgid "Users" msgid "Users"
msgstr "" msgstr ""
#: src/view/grid/GridAccount.cpp:993 #: src/view/grid/GridAccount.cpp:1022
msgid "Warning" msgid "Warning"
msgstr "" msgstr ""
#: src/view/grid/GridAccount.cpp:993 #: src/view/grid/GridAccount.cpp:1022
msgid "You made a debit on a blocked account" msgid "You made a debit on a blocked account"
msgstr "" msgstr ""

View File

@ -412,6 +412,7 @@ bool KissCount::SearchPreviousOperation(Operation* res, Operation& op, int month
wxDateTime* date ; wxDateTime* date ;
//wxDateSpan threeMonths(0, 3); Not working :( //wxDateSpan threeMonths(0, 3); Not working :(
std::vector<wxString> v; std::vector<wxString> v;
int i;
month -= 3; month -= 3;
if (month < 0) if (month < 0)
@ -432,11 +433,17 @@ bool KissCount::SearchPreviousOperation(Operation* res, Operation& op, int month
return false; return false;
} }
*res = (*operations)[operations->size()-1]; for(i=operations->size()-1; i>=0; i--)
if (!(*operations)[i].meta)
{
*res = (*operations)[i];
delete operations;
return true;
}
delete operations; delete operations;
return true; return false;
} }
void KissCount::GetStats(int monthFrom, int yearFrom, int monthTo, int yearTo, void KissCount::GetStats(int monthFrom, int yearFrom, int monthTo, int yearTo,

View File

@ -1440,6 +1440,8 @@ removeLastGroup:
op2.childs.erase(op2.childs.begin()+a); op2.childs.erase(op2.childs.begin()+a);
break; break;
} }
UpdateMeta(op2);
UpdateOperation(op2);
} }
line = GetDisplayedRow(parent); line = GetDisplayedRow(parent);