diff --git a/ressources/po/french.mo b/ressources/po/french.mo index d8457b8..b82cc67 100644 Binary files a/ressources/po/french.mo and b/ressources/po/french.mo differ diff --git a/ressources/po/french.po b/ressources/po/french.po index 0d9af51..5ee4538 100644 --- a/ressources/po/french.po +++ b/ressources/po/french.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-15 20:08+0100\n" +"POT-Creation-Date: 2010-11-20 17:16+0100\n" "PO-Revision-Date: \n" "Last-Translator: Soutadé \n" "Language-Team: \n" @@ -19,17 +19,17 @@ msgstr "" # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#: src/view/StatsPanel.cpp:282 -#: src/view/PreferencesPanel.cpp:767 +#: src/view/StatsPanel.cpp:327 +#: src/view/PreferencesPanel.cpp:764 msgid " - " msgstr " - " #: src/view/UsersDialog.cpp:118 -#: src/view/PreferencesPanel.cpp:420 -#: src/view/PreferencesPanel.cpp:439 -#: src/view/PreferencesPanel.cpp:660 -#: src/view/PreferencesPanel.cpp:679 -#: src/view/PreferencesPanel.cpp:725 +#: src/view/PreferencesPanel.cpp:417 +#: src/view/PreferencesPanel.cpp:436 +#: src/view/PreferencesPanel.cpp:657 +#: src/view/PreferencesPanel.cpp:676 +#: src/view/PreferencesPanel.cpp:722 msgid " already exists" msgstr " existe déjà " @@ -45,7 +45,7 @@ msgstr " non trouvé, arrêt" msgid " operations ?" msgstr " opérations ?" -#: src/view/PreferencesPanel.cpp:774 +#: src/view/PreferencesPanel.cpp:771 msgid " profil ?" msgstr " profil ?" @@ -66,12 +66,12 @@ msgstr "A propos" msgid "Account" msgstr "Compte" -#: src/view/PreferencesPanel.cpp:420 -#: src/view/PreferencesPanel.cpp:439 +#: src/view/PreferencesPanel.cpp:417 +#: src/view/PreferencesPanel.cpp:436 msgid "Account " msgstr "Le compte " -#: src/controller/KissCount.cpp:326 +#: src/controller/KissCount.cpp:337 msgid "Account 1" msgstr "Compte 1" @@ -83,7 +83,7 @@ msgstr "Nom du compte" msgid "Account number" msgstr "Numéro de compte" -#: src/view/StatsPanel.cpp:247 +#: src/view/StatsPanel.cpp:292 #: src/view/PreferencesPanel.cpp:59 msgid "Accounts" msgstr "Comptes" @@ -96,14 +96,14 @@ msgstr "Montant min" msgid "Amount to" msgstr "Montant max" -#: src/view/PreferencesPanel.cpp:401 -#: src/view/PreferencesPanel.cpp:774 +#: src/view/PreferencesPanel.cpp:398 +#: src/view/PreferencesPanel.cpp:771 #: src/view/AccountPanel.cpp:728 msgid "Are you sure want to delete " msgstr "Etes vous sûr de vouloir supprimer " -#: src/view/PreferencesPanel.cpp:641 -#: src/view/grid/GridAccount.cpp:761 +#: src/view/PreferencesPanel.cpp:638 +#: src/view/grid/GridAccount.cpp:783 msgid "Are you sure want to delete : \n" msgstr "Etes vous sûr de vouloir supprimer : \n" @@ -129,13 +129,13 @@ msgstr "Les deux" msgid "Cancel" msgstr "Annuler" -#: src/view/grid/GridAccount.cpp:1145 -#: src/view/grid/GridAccount.cpp:1152 +#: src/view/grid/GridAccount.cpp:1190 +#: src/view/grid/GridAccount.cpp:1197 msgid "Cannot group these operations" msgstr "Impossible de grouper ces opérations" -#: src/view/grid/GridAccount.cpp:1271 -#: src/view/grid/GridAccount.cpp:1277 +#: src/view/grid/GridAccount.cpp:1316 +#: src/view/grid/GridAccount.cpp:1322 msgid "Cannot ungroup these operations" msgstr "Impossible de dégrouper ces opérations" @@ -148,8 +148,8 @@ msgstr "Catégories" msgid "Category" msgstr "Catégorie" -#: src/view/PreferencesPanel.cpp:660 -#: src/view/PreferencesPanel.cpp:679 +#: src/view/PreferencesPanel.cpp:657 +#: src/view/PreferencesPanel.cpp:676 msgid "Category " msgstr "Catégorie" @@ -239,20 +239,20 @@ msgstr "Description" #: src/view/SearchPanel.cpp:150 #: src/view/SearchPanel.cpp:164 #: src/view/SearchPanel.cpp:175 -#: src/view/PreferencesPanel.cpp:397 -#: src/view/PreferencesPanel.cpp:420 -#: src/view/PreferencesPanel.cpp:439 -#: src/view/PreferencesPanel.cpp:660 -#: src/view/PreferencesPanel.cpp:679 -#: src/view/PreferencesPanel.cpp:719 -#: src/view/PreferencesPanel.cpp:725 +#: src/view/PreferencesPanel.cpp:394 +#: src/view/PreferencesPanel.cpp:417 +#: src/view/PreferencesPanel.cpp:436 +#: src/view/PreferencesPanel.cpp:657 +#: src/view/PreferencesPanel.cpp:676 +#: src/view/PreferencesPanel.cpp:716 +#: src/view/PreferencesPanel.cpp:722 #: src/view/PasswordDialog.cpp:72 #: src/view/PasswordDialog.cpp:78 #: src/view/AccountPanel.cpp:724 -#: src/view/grid/GridAccount.cpp:1145 -#: src/view/grid/GridAccount.cpp:1152 -#: src/view/grid/GridAccount.cpp:1271 -#: src/view/grid/GridAccount.cpp:1277 +#: src/view/grid/GridAccount.cpp:1190 +#: src/view/grid/GridAccount.cpp:1197 +#: src/view/grid/GridAccount.cpp:1316 +#: src/view/grid/GridAccount.cpp:1322 #: src/view/grid/wxGridCellFormulaEditor.cpp:69 #: src/model/Database.cpp:38 #: src/model/Database.cpp:55 @@ -274,9 +274,9 @@ msgid "Final value" msgstr "Valeur finale" #: src/view/SearchPanel.cpp:76 -#: src/view/grid/GridAccount.cpp:301 +#: src/view/grid/GridAccount.cpp:307 #: src/model/Database.cpp:331 -#: src/controller/KissCount.cpp:342 +#: src/controller/KissCount.cpp:353 msgid "Fix" msgstr "Fixe" @@ -301,7 +301,7 @@ msgstr "A partir de " msgid "Generate month" msgstr "Générer mois" -#: src/controller/KissCount.cpp:344 +#: src/controller/KissCount.cpp:355 msgid "Groceries" msgstr "Courses" @@ -309,7 +309,7 @@ msgstr "Courses" msgid "Group" msgstr "Grouper" -#: src/controller/KissCount.cpp:346 +#: src/controller/KissCount.cpp:357 msgid "Hobbies" msgstr "Loisirs" @@ -337,7 +337,7 @@ msgstr "Intervalle de temps invalide" msgid "Invalid formula !" msgstr "Formule invalide !" -#: src/view/PreferencesPanel.cpp:719 +#: src/view/PreferencesPanel.cpp:716 msgid "Invalid name" msgstr "Nom invalide" @@ -349,11 +349,11 @@ msgstr "Ancien mot de passe invalide" msgid "Invalid password" msgstr "Mot de passe invalide" -#: src/view/StatsPanel.cpp:302 +#: src/view/StatsPanel.cpp:346 msgid "Invalide date range" msgstr "Intervalle de temps invalide" -#: src/view/PreferencesPanel.cpp:397 +#: src/view/PreferencesPanel.cpp:394 msgid "It must be at least one account !" msgstr "Il doit y avoir au moins un compte !" @@ -365,9 +365,9 @@ msgstr "Il doit rester au mois un mois" msgid "Kill me" msgstr "Kill me" -#: src/view/StatsPanel.cpp:302 +#: src/view/StatsPanel.cpp:346 +#: src/view/PreferencesPanel.cpp:756 #: src/view/PreferencesPanel.cpp:759 -#: src/view/PreferencesPanel.cpp:762 msgid "KissCount" msgstr "KissCount" @@ -375,11 +375,11 @@ msgstr "KissCount" msgid "Language" msgstr "Langue" -#: src/view/PreferencesPanel.cpp:762 +#: src/view/PreferencesPanel.cpp:759 msgid "Language not changed" msgstr "Langue non changée" -#: src/view/PreferencesPanel.cpp:759 +#: src/view/PreferencesPanel.cpp:756 msgid "Language successfully changed, please go to another panel" msgstr "Langue changée, allez sur un autre panneau pour rendre le changement effectif" @@ -389,7 +389,7 @@ msgstr "Langue changée, allez sur un autre panneau pour rendre le changement ef msgid "Name" msgstr "Nom" -#: src/view/PreferencesPanel.cpp:731 +#: src/view/PreferencesPanel.cpp:728 msgid "Name changed" msgstr "Nom changé" @@ -432,7 +432,7 @@ msgstr "OK" msgid "Old password " msgstr "Ancien mot de passe" -#: src/controller/KissCount.cpp:348 +#: src/controller/KissCount.cpp:359 msgid "Operating exepense" msgstr "Frais de fonctionnement" @@ -445,7 +445,7 @@ msgstr "Ordre des opérations" msgid "Operations" msgstr "Opérations" -#: src/controller/KissCount.cpp:352 +#: src/controller/KissCount.cpp:363 msgid "Other" msgstr "Autres" @@ -479,8 +479,8 @@ msgstr "" msgid "Please retype new password" msgstr "Re entrez le mot de passe" -#: src/view/PreferencesPanel.cpp:733 -#: src/view/PreferencesPanel.cpp:767 +#: src/view/PreferencesPanel.cpp:730 +#: src/view/PreferencesPanel.cpp:764 #: src/view/ButtonPanel.cpp:72 msgid "Preferences" msgstr "Préférences" @@ -516,7 +516,7 @@ msgstr "Série 1" msgid "Shared with" msgstr "Partagé avec" -#: src/view/StatsPanel.cpp:282 +#: src/view/StatsPanel.cpp:327 #: src/view/ButtonPanel.cpp:70 msgid "Statistics" msgstr "Statistiques" @@ -548,7 +548,7 @@ msgstr "Dégrouper" msgid "Unable to open Database" msgstr "Impossible d'ouvrir la base de données" -#: src/controller/KissCount.cpp:350 +#: src/controller/KissCount.cpp:361 msgid "Unexpected" msgstr "Exceptionnel" @@ -568,7 +568,7 @@ msgstr "Utilisateur" #: src/view/UsersDialog.cpp:38 #: src/view/UsersDialog.cpp:118 -#: src/view/PreferencesPanel.cpp:725 +#: src/view/PreferencesPanel.cpp:722 msgid "User " msgstr "Utilisateur" @@ -576,6 +576,14 @@ msgstr "Utilisateur" msgid "Users" msgstr "Utilisateurs" +#: src/view/grid/GridAccount.cpp:993 +msgid "Warning" +msgstr "Attention" + +#: src/view/grid/GridAccount.cpp:993 +msgid "You made a debit on a blocked account" +msgstr "Vous avez effectué une opération de débit sur un compte bloqué" + #: src/view/wxUI.cpp:110 msgid "april" msgstr "avril" diff --git a/ressources/po/kisscount.pot b/ressources/po/kisscount.pot index 4564f11..34ddd37 100644 --- a/ressources/po/kisscount.pot +++ b/ressources/po/kisscount.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-15 20:08+0100\n" +"POT-Creation-Date: 2010-11-20 17:16+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,13 +17,13 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/view/StatsPanel.cpp:282 src/view/PreferencesPanel.cpp:767 +#: src/view/StatsPanel.cpp:327 src/view/PreferencesPanel.cpp:764 msgid " - " msgstr "" -#: src/view/UsersDialog.cpp:118 src/view/PreferencesPanel.cpp:420 -#: src/view/PreferencesPanel.cpp:439 src/view/PreferencesPanel.cpp:660 -#: src/view/PreferencesPanel.cpp:679 src/view/PreferencesPanel.cpp:725 +#: src/view/UsersDialog.cpp:118 src/view/PreferencesPanel.cpp:417 +#: src/view/PreferencesPanel.cpp:436 src/view/PreferencesPanel.cpp:657 +#: src/view/PreferencesPanel.cpp:676 src/view/PreferencesPanel.cpp:722 msgid " already exists" msgstr "" @@ -39,7 +39,7 @@ msgstr "" msgid " operations ?" msgstr "" -#: src/view/PreferencesPanel.cpp:774 +#: src/view/PreferencesPanel.cpp:771 msgid " profil ?" msgstr "" @@ -59,11 +59,11 @@ msgstr "" msgid "Account" msgstr "" -#: src/view/PreferencesPanel.cpp:420 src/view/PreferencesPanel.cpp:439 +#: src/view/PreferencesPanel.cpp:417 src/view/PreferencesPanel.cpp:436 msgid "Account " msgstr "" -#: src/controller/KissCount.cpp:326 +#: src/controller/KissCount.cpp:337 msgid "Account 1" msgstr "" @@ -75,7 +75,7 @@ msgstr "" msgid "Account number" msgstr "" -#: src/view/StatsPanel.cpp:247 src/view/PreferencesPanel.cpp:59 +#: src/view/StatsPanel.cpp:292 src/view/PreferencesPanel.cpp:59 msgid "Accounts" msgstr "" @@ -87,12 +87,12 @@ msgstr "" msgid "Amount to" msgstr "" -#: src/view/PreferencesPanel.cpp:401 src/view/PreferencesPanel.cpp:774 +#: src/view/PreferencesPanel.cpp:398 src/view/PreferencesPanel.cpp:771 #: src/view/AccountPanel.cpp:728 msgid "Are you sure want to delete " msgstr "" -#: src/view/PreferencesPanel.cpp:641 src/view/grid/GridAccount.cpp:761 +#: src/view/PreferencesPanel.cpp:638 src/view/grid/GridAccount.cpp:783 msgid "Are you sure want to delete : \n" msgstr "" @@ -117,11 +117,11 @@ msgstr "" msgid "Cancel" msgstr "" -#: src/view/grid/GridAccount.cpp:1145 src/view/grid/GridAccount.cpp:1152 +#: src/view/grid/GridAccount.cpp:1190 src/view/grid/GridAccount.cpp:1197 msgid "Cannot group these operations" msgstr "" -#: src/view/grid/GridAccount.cpp:1271 src/view/grid/GridAccount.cpp:1277 +#: src/view/grid/GridAccount.cpp:1316 src/view/grid/GridAccount.cpp:1322 msgid "Cannot ungroup these operations" msgstr "" @@ -133,7 +133,7 @@ msgstr "" msgid "Category" msgstr "" -#: src/view/PreferencesPanel.cpp:660 src/view/PreferencesPanel.cpp:679 +#: src/view/PreferencesPanel.cpp:657 src/view/PreferencesPanel.cpp:676 msgid "Category " msgstr "" @@ -217,13 +217,13 @@ msgstr "" #: src/view/UsersDialog.cpp:88 src/view/UsersDialog.cpp:118 #: src/view/SearchPanel.cpp:140 src/view/SearchPanel.cpp:150 #: src/view/SearchPanel.cpp:164 src/view/SearchPanel.cpp:175 -#: src/view/PreferencesPanel.cpp:397 src/view/PreferencesPanel.cpp:420 -#: src/view/PreferencesPanel.cpp:439 src/view/PreferencesPanel.cpp:660 -#: src/view/PreferencesPanel.cpp:679 src/view/PreferencesPanel.cpp:719 -#: src/view/PreferencesPanel.cpp:725 src/view/PasswordDialog.cpp:72 +#: src/view/PreferencesPanel.cpp:394 src/view/PreferencesPanel.cpp:417 +#: src/view/PreferencesPanel.cpp:436 src/view/PreferencesPanel.cpp:657 +#: src/view/PreferencesPanel.cpp:676 src/view/PreferencesPanel.cpp:716 +#: src/view/PreferencesPanel.cpp:722 src/view/PasswordDialog.cpp:72 #: src/view/PasswordDialog.cpp:78 src/view/AccountPanel.cpp:724 -#: src/view/grid/GridAccount.cpp:1145 src/view/grid/GridAccount.cpp:1152 -#: src/view/grid/GridAccount.cpp:1271 src/view/grid/GridAccount.cpp:1277 +#: src/view/grid/GridAccount.cpp:1190 src/view/grid/GridAccount.cpp:1197 +#: src/view/grid/GridAccount.cpp:1316 src/view/grid/GridAccount.cpp:1322 #: 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:102 src/model/Database.cpp:120 @@ -240,8 +240,8 @@ msgstr "" msgid "Final value" msgstr "" -#: src/view/SearchPanel.cpp:76 src/view/grid/GridAccount.cpp:301 -#: src/model/Database.cpp:331 src/controller/KissCount.cpp:342 +#: src/view/SearchPanel.cpp:76 src/view/grid/GridAccount.cpp:307 +#: src/model/Database.cpp:331 src/controller/KissCount.cpp:353 msgid "Fix" msgstr "" @@ -265,7 +265,7 @@ msgstr "" msgid "Generate month" msgstr "" -#: src/controller/KissCount.cpp:344 +#: src/controller/KissCount.cpp:355 msgid "Groceries" msgstr "" @@ -273,7 +273,7 @@ msgstr "" msgid "Group" msgstr "" -#: src/controller/KissCount.cpp:346 +#: src/controller/KissCount.cpp:357 msgid "Hobbies" msgstr "" @@ -301,7 +301,7 @@ msgstr "" msgid "Invalid formula !" msgstr "" -#: src/view/PreferencesPanel.cpp:719 +#: src/view/PreferencesPanel.cpp:716 msgid "Invalid name" msgstr "" @@ -313,11 +313,11 @@ msgstr "" msgid "Invalid password" msgstr "" -#: src/view/StatsPanel.cpp:302 +#: src/view/StatsPanel.cpp:346 msgid "Invalide date range" msgstr "" -#: src/view/PreferencesPanel.cpp:397 +#: src/view/PreferencesPanel.cpp:394 msgid "It must be at least one account !" msgstr "" @@ -329,8 +329,8 @@ msgstr "" msgid "Kill me" msgstr "" -#: src/view/StatsPanel.cpp:302 src/view/PreferencesPanel.cpp:759 -#: src/view/PreferencesPanel.cpp:762 +#: src/view/StatsPanel.cpp:346 src/view/PreferencesPanel.cpp:756 +#: src/view/PreferencesPanel.cpp:759 msgid "KissCount" msgstr "" @@ -338,11 +338,11 @@ msgstr "" msgid "Language" msgstr "" -#: src/view/PreferencesPanel.cpp:762 +#: src/view/PreferencesPanel.cpp:759 msgid "Language not changed" msgstr "" -#: src/view/PreferencesPanel.cpp:759 +#: src/view/PreferencesPanel.cpp:756 msgid "Language successfully changed, please go to another panel" msgstr "" @@ -351,7 +351,7 @@ msgstr "" msgid "Name" msgstr "" -#: src/view/PreferencesPanel.cpp:731 +#: src/view/PreferencesPanel.cpp:728 msgid "Name changed" msgstr "" @@ -390,7 +390,7 @@ msgstr "" msgid "Old password " msgstr "" -#: src/controller/KissCount.cpp:348 +#: src/controller/KissCount.cpp:359 msgid "Operating exepense" msgstr "" @@ -402,7 +402,7 @@ msgstr "" msgid "Operations" msgstr "" -#: src/controller/KissCount.cpp:352 +#: src/controller/KissCount.cpp:363 msgid "Other" msgstr "" @@ -429,7 +429,7 @@ msgstr "" msgid "Please retype new password" msgstr "" -#: src/view/PreferencesPanel.cpp:733 src/view/PreferencesPanel.cpp:767 +#: src/view/PreferencesPanel.cpp:730 src/view/PreferencesPanel.cpp:764 #: src/view/ButtonPanel.cpp:72 msgid "Preferences" msgstr "" @@ -463,7 +463,7 @@ msgstr "" msgid "Shared with" msgstr "" -#: src/view/StatsPanel.cpp:282 src/view/ButtonPanel.cpp:70 +#: src/view/StatsPanel.cpp:327 src/view/ButtonPanel.cpp:70 msgid "Statistics" msgstr "" @@ -492,7 +492,7 @@ msgstr "" msgid "Unable to open Database" msgstr "" -#: src/controller/KissCount.cpp:350 +#: src/controller/KissCount.cpp:361 msgid "Unexpected" msgstr "" @@ -509,7 +509,7 @@ msgid "User" msgstr "" #: src/view/UsersDialog.cpp:38 src/view/UsersDialog.cpp:118 -#: src/view/PreferencesPanel.cpp:725 +#: src/view/PreferencesPanel.cpp:722 msgid "User " msgstr "" @@ -517,6 +517,14 @@ msgstr "" msgid "Users" msgstr "" +#: src/view/grid/GridAccount.cpp:993 +msgid "Warning" +msgstr "" + +#: src/view/grid/GridAccount.cpp:993 +msgid "You made a debit on a blocked account" +msgstr "" + #: src/view/wxUI.cpp:110 msgid "april" msgstr "" diff --git a/src/view/grid/GridAccount.cpp b/src/view/grid/GridAccount.cpp index f540aa2..a319b18 100644 --- a/src/view/grid/GridAccount.cpp +++ b/src/view/grid/GridAccount.cpp @@ -989,6 +989,9 @@ void GridAccount::OnOperationModified(wxGridEvent& event) new_op.id = _kiss->AddOperation(new_op); } + if (user->GetAccount(new_op.account).blocked && new_op.amount < 0) + wxMessageBox(_("You made a debit on a blocked account"), _("Warning"), wxICON_WARNING | wxOK); + if (need_insertion) InsertIntoGrid(new_op);