diff --git a/debian/control b/debian/control index ed6d6f2..0e8763c 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: kisscount Section: misc Priority: extra Maintainer: Grégory Soutadé -Build-Depends: debhelper (>= 7.0.50~), libsqlite3-dev, libwxgtk2.8-dev (>= 2.8.10) +Build-Depends: debhelper (>= 7.0.50~), libsqlite3-dev, libwxgtk2.8-dev (>= 2.8.10), libofx-dev Standards-Version: 3.9.1 Homepage: http://indefero.soutade.fr/p/kisscount/ Vcs-Git: git://soutade.fr/kisscount.git diff --git a/ressources/po/french.mo b/ressources/po/french.mo index 86795ed..c828549 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 b7269a0..ce4436f 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: 2011-02-20 12:04+0100\n" +"POT-Creation-Date: 2011-03-24 19:19+0100\n" "PO-Revision-Date: \n" "Last-Translator: Soutadé \n" "Language-Team: \n" @@ -24,6 +24,10 @@ msgstr "" msgid " - " msgstr " - " +#: src/view/ImportPanel.cpp:222 +msgid " account(s) will be created, is it ok ?" +msgstr " comptes vont être créés, êtes vous d'accord ?" + #: src/view/UsersDialog.cpp:120 #: src/view/PreferencesPanel.cpp:495 #: src/view/PreferencesPanel.cpp:515 @@ -58,7 +62,7 @@ msgid "1 entry found" msgstr "1 entrée trouvée" #: src/view/SearchPanel.cpp:99 -#: src/view/grid/GridAccount.cpp:67 +#: src/view/grid/GridAccount.cpp:68 msgid "Account" msgstr "Compte" @@ -67,7 +71,7 @@ msgstr "Compte" msgid "Account " msgstr "Le compte " -#: src/controller/KissCount.cpp:370 +#: src/controller/KissCount.cpp:364 msgid "Account 1" msgstr "Compte 1" @@ -92,15 +96,23 @@ msgstr "Montant min" msgid "Amount to" msgstr "Montant max" +#: src/view/ImportPanel.cpp:156 +msgid "Any engine can process this file !" +msgstr "Format de fichier non reconnu" + #: src/view/PreferencesPanel.cpp:838 #: src/view/AccountPanel.cpp:847 msgid "Are you sure want to delete " msgstr "Etes vous sûr de vouloir supprimer " -#: src/view/grid/GridAccount.cpp:836 +#: src/view/grid/GridAccount.cpp:853 msgid "Are you sure want to delete : \n" msgstr "Etes vous sûr de vouloir supprimer : \n" +#: src/view/ImportPanel.cpp:277 +msgid "Are you sure want to integrate these operations ?" +msgstr "Etes vous sûr de vouloir intégreer ces opérations" + #: src/view/PreferencesPanel.cpp:368 msgid "Ascending" msgstr "Croissant" @@ -119,13 +131,13 @@ msgstr "Bloqué" msgid "Cancel" msgstr "Annuler" -#: src/view/grid/GridAccount.cpp:1271 -#: src/view/grid/GridAccount.cpp:1278 +#: src/view/grid/GridAccount.cpp:1288 +#: src/view/grid/GridAccount.cpp:1295 msgid "Cannot group these operations" msgstr "Impossible de grouper ces opérations" -#: src/view/grid/GridAccount.cpp:1397 -#: src/view/grid/GridAccount.cpp:1403 +#: src/view/grid/GridAccount.cpp:1414 +#: src/view/grid/GridAccount.cpp:1420 msgid "Cannot ungroup these operations" msgstr "Impossible de dégrouper ces opérations" @@ -134,7 +146,7 @@ msgid "Categories" msgstr "Catégories" #: src/view/SearchPanel.cpp:97 -#: src/view/grid/GridAccount.cpp:67 +#: src/view/grid/GridAccount.cpp:68 msgid "Category" msgstr "Catégorie" @@ -171,6 +183,10 @@ msgstr "Rapprochement" msgid "Checked" msgstr "Rapprochée" +#: src/view/ImportPanel.cpp:117 +msgid "Choose a database to open" +msgstr "Choisissez une base de données à ouvrir" + #: src/view/SearchPanel.cpp:309 msgid "Choose a new account" msgstr "Nouveau compte" @@ -188,7 +204,13 @@ msgstr "Confirmer le mot de passe " msgid "Cost repartition" msgstr "Répartition des coûts" -#: src/view/grid/GridAccount.cpp:67 +#: src/view/ImportPanel.cpp:168 +#: src/view/ImportPanel.cpp:215 +#: src/view/ImportPanel.cpp:230 +msgid "Create one" +msgstr "En créer un" + +#: src/view/grid/GridAccount.cpp:68 msgid "Credit" msgstr "Crédit" @@ -204,7 +226,7 @@ msgstr "Cur Débit" msgid "Current value" msgstr "Valeur courante" -#: src/view/grid/GridAccount.cpp:67 +#: src/view/grid/GridAccount.cpp:68 msgid "Date" msgstr "Date" @@ -216,7 +238,7 @@ msgstr "Date min" msgid "Date to" msgstr "Date max" -#: src/view/grid/GridAccount.cpp:67 +#: src/view/grid/GridAccount.cpp:68 msgid "Debit" msgstr "Débit" @@ -235,7 +257,7 @@ msgid "Descending" msgstr "Décroissant" #: src/view/SearchPanel.cpp:94 -#: src/view/grid/GridAccount.cpp:67 +#: src/view/grid/GridAccount.cpp:68 msgid "Description" msgstr "Description" @@ -259,10 +281,10 @@ msgstr "Nouvelle description" #: src/view/PasswordDialog.cpp:72 #: src/view/PasswordDialog.cpp:78 #: src/view/AccountPanel.cpp:843 -#: src/view/grid/GridAccount.cpp:1271 -#: src/view/grid/GridAccount.cpp:1278 -#: src/view/grid/GridAccount.cpp:1397 -#: src/view/grid/GridAccount.cpp:1403 +#: src/view/grid/GridAccount.cpp:1288 +#: src/view/grid/GridAccount.cpp:1295 +#: src/view/grid/GridAccount.cpp:1414 +#: src/view/grid/GridAccount.cpp:1420 #: src/view/grid/wxGridCellFormulaEditor.cpp:69 #: src/model/Database.cpp:45 #: src/model/Database.cpp:52 @@ -280,13 +302,17 @@ msgstr "Erreur" msgid "Error creating original database" msgstr "Erreur durant la création de la base de données initiale" +#: src/view/ImportPanel.cpp:71 +msgid "File account" +msgstr "Compte du fichier" + #: src/view/AccountPanel.cpp:111 msgid "Final value" msgstr "Valeur finale" #: src/view/SearchPanel.cpp:84 -#: src/view/grid/GridAccount.cpp:329 -#: src/controller/KissCount.cpp:361 +#: src/view/grid/GridAccount.cpp:345 +#: src/controller/KissCount.cpp:355 msgid "Fix" msgstr "Fixe" @@ -311,7 +337,7 @@ msgstr "A partir de " msgid "Generate month" msgstr "Générer mois" -#: src/controller/KissCount.cpp:361 +#: src/controller/KissCount.cpp:355 msgid "Groceries" msgstr "Courses" @@ -319,14 +345,22 @@ msgstr "Courses" msgid "Group" msgstr "Grouper" -#: src/controller/KissCount.cpp:361 +#: src/controller/KissCount.cpp:355 msgid "Hobbies" msgstr "Loisirs" +#: src/view/ImportPanel.cpp:107 +msgid "Import" +msgstr "Import" + #: src/view/AccountPanel.cpp:109 msgid "Initial value" msgstr "Valeur initiale" +#: src/view/ImportPanel.cpp:72 +msgid "Internal account" +msgstr "Compte interne" + #: src/view/SearchPanel.cpp:189 msgid "Invalid amount from" msgstr "Montant min invalide" @@ -378,10 +412,14 @@ msgstr "Kill me" #: src/view/StatsPanel.cpp:377 #: src/view/PreferencesPanel.cpp:823 #: src/view/PreferencesPanel.cpp:826 -#: src/model/Database_Update.cpp:135 +#: src/model/Database_Update.cpp:140 msgid "KissCount" msgstr "KissCount" +#: src/view/ImportPanel.cpp:112 +msgid "KissCount - Import" +msgstr "KissCount - Import" + #: src/view/PreferencesPanel.cpp:62 msgid "Language" msgstr "Langue" @@ -429,6 +467,10 @@ msgstr "" msgid "No entry found" msgstr "Pas d'entrée trouvée" +#: src/view/ImportPanel.cpp:267 +msgid "No operation found into this file" +msgstr "Aucun opération trouvée dans ce fichier" + #: src/view/SearchPanel.cpp:84 msgid "Non fix" msgstr "Courantes" @@ -448,6 +490,10 @@ msgstr "Non rapprochée" msgid "Number" msgstr "Numéro de compte" +#: src/model/import/OFXImportEngine.cpp:124 +msgid "OFX files (*.ofx)|*.ofx" +msgstr "Fichiers OFX (*.ofx)|*.ofx" + #: src/view/UsersDialog.cpp:51 #: src/view/GenerateDialog.cpp:60 #: src/view/PasswordDialog.cpp:55 @@ -458,7 +504,7 @@ msgstr "OK" msgid "Old password " msgstr "Ancien mot de passe " -#: src/controller/KissCount.cpp:361 +#: src/controller/KissCount.cpp:355 msgid "Operating expense" msgstr "Fonctionnement" @@ -471,7 +517,11 @@ msgstr "Ordre des opérations" msgid "Operations" msgstr "Opérations" -#: src/controller/KissCount.cpp:362 +#: src/view/ImportPanel.cpp:292 +msgid "Operations successfully imported" +msgstr "les opérations ont été importées avec succès" + +#: src/controller/KissCount.cpp:356 msgid "Other" msgstr "Autres" @@ -483,7 +533,7 @@ msgstr "Mot de passe " msgid "Password changed" msgstr "Mot de passe changé" -#: src/view/wxUI.cpp:247 +#: src/view/wxUI.cpp:248 msgid "" "Personal accounting software\n" "\n" @@ -511,7 +561,7 @@ msgstr "Re entrez le mot de passe" msgid "Preferences" msgstr "Préférences" -#: src/view/wxUI.cpp:254 +#: src/view/wxUI.cpp:255 msgid "Quit KissCount ?" msgstr "Quitter KissCount ?" @@ -579,7 +629,7 @@ msgstr "Impossible de créer " msgid "Unable to open Database" msgstr "Impossible d'ouvrir la base de données" -#: src/controller/KissCount.cpp:362 +#: src/controller/KissCount.cpp:356 msgid "Unexpected" msgstr "Exceptionnel" @@ -591,6 +641,10 @@ msgstr "Exceptionnel" msgid "Unknown" msgstr "Inconnu" +#: src/view/ImportPanel.cpp:41 +msgid "Unresolved accounts" +msgstr "Comptes non résolus" + #: src/view/PreferencesPanel.cpp:59 msgid "User" msgstr "Utilisateur" @@ -610,7 +664,7 @@ msgstr "Utilisateurs" msgid "Virtual" msgstr "Virtuel" -#: src/view/grid/GridAccount.cpp:1048 +#: src/view/grid/GridAccount.cpp:1065 msgid "Warning" msgstr "Attention" @@ -622,7 +676,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:1048 +#: src/view/grid/GridAccount.cpp:1065 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/kisscount.pot b/ressources/po/kisscount.pot index edc14d7..0e3490f 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: 2011-02-20 12:04+0100\n" +"POT-Creation-Date: 2011-03-24 19:19+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,6 +21,10 @@ msgstr "" msgid " - " msgstr "" +#: src/view/ImportPanel.cpp:222 +msgid " account(s) will be created, is it ok ?" +msgstr "" + #: src/view/UsersDialog.cpp:120 src/view/PreferencesPanel.cpp:495 #: src/view/PreferencesPanel.cpp:515 src/view/PreferencesPanel.cpp:726 #: src/view/PreferencesPanel.cpp:745 src/view/PreferencesPanel.cpp:789 @@ -51,7 +55,7 @@ msgstr "" msgid "1 entry found" msgstr "" -#: src/view/SearchPanel.cpp:99 src/view/grid/GridAccount.cpp:67 +#: src/view/SearchPanel.cpp:99 src/view/grid/GridAccount.cpp:68 msgid "Account" msgstr "" @@ -59,7 +63,7 @@ msgstr "" msgid "Account " msgstr "" -#: src/controller/KissCount.cpp:370 +#: src/controller/KissCount.cpp:364 msgid "Account 1" msgstr "" @@ -83,14 +87,22 @@ msgstr "" msgid "Amount to" msgstr "" +#: src/view/ImportPanel.cpp:156 +msgid "Any engine can process this file !" +msgstr "" + #: src/view/PreferencesPanel.cpp:838 src/view/AccountPanel.cpp:847 msgid "Are you sure want to delete " msgstr "" -#: src/view/grid/GridAccount.cpp:836 +#: src/view/grid/GridAccount.cpp:853 msgid "Are you sure want to delete : \n" msgstr "" +#: src/view/ImportPanel.cpp:277 +msgid "Are you sure want to integrate these operations ?" +msgstr "" + #: src/view/PreferencesPanel.cpp:368 msgid "Ascending" msgstr "" @@ -108,11 +120,11 @@ msgstr "" msgid "Cancel" msgstr "" -#: src/view/grid/GridAccount.cpp:1271 src/view/grid/GridAccount.cpp:1278 +#: src/view/grid/GridAccount.cpp:1288 src/view/grid/GridAccount.cpp:1295 msgid "Cannot group these operations" msgstr "" -#: src/view/grid/GridAccount.cpp:1397 src/view/grid/GridAccount.cpp:1403 +#: src/view/grid/GridAccount.cpp:1414 src/view/grid/GridAccount.cpp:1420 msgid "Cannot ungroup these operations" msgstr "" @@ -120,7 +132,7 @@ msgstr "" msgid "Categories" msgstr "" -#: src/view/SearchPanel.cpp:97 src/view/grid/GridAccount.cpp:67 +#: src/view/SearchPanel.cpp:97 src/view/grid/GridAccount.cpp:68 msgid "Category" msgstr "" @@ -156,6 +168,10 @@ msgstr "" msgid "Checked" msgstr "" +#: src/view/ImportPanel.cpp:117 +msgid "Choose a database to open" +msgstr "" + #: src/view/SearchPanel.cpp:309 msgid "Choose a new account" msgstr "" @@ -172,7 +188,12 @@ msgstr "" msgid "Cost repartition" msgstr "" -#: src/view/grid/GridAccount.cpp:67 +#: src/view/ImportPanel.cpp:168 src/view/ImportPanel.cpp:215 +#: src/view/ImportPanel.cpp:230 +msgid "Create one" +msgstr "" + +#: src/view/grid/GridAccount.cpp:68 msgid "Credit" msgstr "" @@ -188,7 +209,7 @@ msgstr "" msgid "Current value" msgstr "" -#: src/view/grid/GridAccount.cpp:67 +#: src/view/grid/GridAccount.cpp:68 msgid "Date" msgstr "" @@ -200,7 +221,7 @@ msgstr "" msgid "Date to" msgstr "" -#: src/view/grid/GridAccount.cpp:67 +#: src/view/grid/GridAccount.cpp:68 msgid "Debit" msgstr "" @@ -217,7 +238,7 @@ msgstr "" msgid "Descending" msgstr "" -#: src/view/SearchPanel.cpp:94 src/view/grid/GridAccount.cpp:67 +#: src/view/SearchPanel.cpp:94 src/view/grid/GridAccount.cpp:68 msgid "Description" msgstr "" @@ -233,8 +254,8 @@ msgstr "" #: src/view/PreferencesPanel.cpp:745 src/view/PreferencesPanel.cpp:783 #: src/view/PreferencesPanel.cpp:789 src/view/PasswordDialog.cpp:72 #: src/view/PasswordDialog.cpp:78 src/view/AccountPanel.cpp:843 -#: src/view/grid/GridAccount.cpp:1271 src/view/grid/GridAccount.cpp:1278 -#: src/view/grid/GridAccount.cpp:1397 src/view/grid/GridAccount.cpp:1403 +#: src/view/grid/GridAccount.cpp:1288 src/view/grid/GridAccount.cpp:1295 +#: src/view/grid/GridAccount.cpp:1414 src/view/grid/GridAccount.cpp:1420 #: src/view/grid/wxGridCellFormulaEditor.cpp:69 src/model/Database.cpp:45 #: src/model/Database.cpp:52 src/model/Database.cpp:70 #: src/model/Database.cpp:103 src/model/Database.cpp:109 @@ -247,12 +268,16 @@ msgstr "" msgid "Error creating original database" msgstr "" +#: src/view/ImportPanel.cpp:71 +msgid "File account" +msgstr "" + #: src/view/AccountPanel.cpp:111 msgid "Final value" msgstr "" -#: src/view/SearchPanel.cpp:84 src/view/grid/GridAccount.cpp:329 -#: src/controller/KissCount.cpp:361 +#: src/view/SearchPanel.cpp:84 src/view/grid/GridAccount.cpp:345 +#: src/controller/KissCount.cpp:355 msgid "Fix" msgstr "" @@ -276,7 +301,7 @@ msgstr "" msgid "Generate month" msgstr "" -#: src/controller/KissCount.cpp:361 +#: src/controller/KissCount.cpp:355 msgid "Groceries" msgstr "" @@ -284,14 +309,22 @@ msgstr "" msgid "Group" msgstr "" -#: src/controller/KissCount.cpp:361 +#: src/controller/KissCount.cpp:355 msgid "Hobbies" msgstr "" +#: src/view/ImportPanel.cpp:107 +msgid "Import" +msgstr "" + #: src/view/AccountPanel.cpp:109 msgid "Initial value" msgstr "" +#: src/view/ImportPanel.cpp:72 +msgid "Internal account" +msgstr "" + #: src/view/SearchPanel.cpp:189 msgid "Invalid amount from" msgstr "" @@ -341,10 +374,14 @@ msgid "Kill me" msgstr "" #: src/view/StatsPanel.cpp:377 src/view/PreferencesPanel.cpp:823 -#: src/view/PreferencesPanel.cpp:826 src/model/Database_Update.cpp:135 +#: src/view/PreferencesPanel.cpp:826 src/model/Database_Update.cpp:140 msgid "KissCount" msgstr "" +#: src/view/ImportPanel.cpp:112 +msgid "KissCount - Import" +msgstr "" + #: src/view/PreferencesPanel.cpp:62 msgid "Language" msgstr "" @@ -388,6 +425,10 @@ msgstr "" msgid "No entry found" msgstr "" +#: src/view/ImportPanel.cpp:267 +msgid "No operation found into this file" +msgstr "" + #: src/view/SearchPanel.cpp:84 msgid "Non fix" msgstr "" @@ -405,6 +446,10 @@ msgstr "" msgid "Number" msgstr "" +#: src/model/import/OFXImportEngine.cpp:124 +msgid "OFX files (*.ofx)|*.ofx" +msgstr "" + #: src/view/UsersDialog.cpp:51 src/view/GenerateDialog.cpp:60 #: src/view/PasswordDialog.cpp:55 msgid "OK" @@ -414,7 +459,7 @@ msgstr "" msgid "Old password " msgstr "" -#: src/controller/KissCount.cpp:361 +#: src/controller/KissCount.cpp:355 msgid "Operating expense" msgstr "" @@ -426,7 +471,11 @@ msgstr "" msgid "Operations" msgstr "" -#: src/controller/KissCount.cpp:362 +#: src/view/ImportPanel.cpp:292 +msgid "Operations successfully imported" +msgstr "" + +#: src/controller/KissCount.cpp:356 msgid "Other" msgstr "" @@ -438,7 +487,7 @@ msgstr "" msgid "Password changed" msgstr "" -#: src/view/wxUI.cpp:247 +#: src/view/wxUI.cpp:248 msgid "" "Personal accounting software\n" "\n" @@ -458,7 +507,7 @@ msgstr "" msgid "Preferences" msgstr "" -#: src/view/wxUI.cpp:254 +#: src/view/wxUI.cpp:255 msgid "Quit KissCount ?" msgstr "" @@ -520,7 +569,7 @@ msgstr "" msgid "Unable to open Database" msgstr "" -#: src/controller/KissCount.cpp:362 +#: src/controller/KissCount.cpp:356 msgid "Unexpected" msgstr "" @@ -529,6 +578,10 @@ msgstr "" msgid "Unknown" msgstr "" +#: src/view/ImportPanel.cpp:41 +msgid "Unresolved accounts" +msgstr "" + #: src/view/PreferencesPanel.cpp:59 msgid "User" msgstr "" @@ -546,7 +599,7 @@ msgstr "" msgid "Virtual" msgstr "" -#: src/view/grid/GridAccount.cpp:1048 +#: src/view/grid/GridAccount.cpp:1065 msgid "Warning" msgstr "" @@ -558,7 +611,7 @@ msgstr "" msgid "Wich category will replace this one ?" msgstr "" -#: src/view/grid/GridAccount.cpp:1048 +#: src/view/grid/GridAccount.cpp:1065 msgid "You made a debit on a blocked account" msgstr ""