diff --git a/ressources/po/french.mo b/ressources/po/french.mo index 70fd673..c16724f 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 e2aa3d0..20f08da 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-04-30 12:37+0200\n" +"POT-Creation-Date: 2011-07-04 20:23+0200\n" "PO-Revision-Date: \n" "Last-Translator: Soutadé \n" "Language-Team: \n" @@ -19,7 +19,7 @@ msgstr "" # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#: src/view/StatsPanel.cpp:361 +#: src/view/StatsPanel.cpp:384 #: src/view/PreferencesPanel.cpp:832 msgid " - " msgstr " - " @@ -33,19 +33,20 @@ msgstr " - " msgid " already exists" msgstr " existe déjà" -#: src/view/ImportPanel.cpp:284 +#: src/view/ImportPanel.cpp:283 msgid " and " msgstr " et " -#: src/view/SearchPanel.cpp:276 +#: src/view/SearchPanel.cpp:114 +#: src/view/ExportPanel.cpp:106 msgid " entries found" msgstr " entrées trouvées" -#: src/model/Database.cpp:103 +#: src/model/Database.cpp:106 msgid " not found, aborting" msgstr " non trouvé, arrêt" -#: src/view/AccountPanel.cpp:858 +#: src/view/AccountPanel.cpp:879 msgid " operations ?" msgstr " opérations ?" @@ -53,7 +54,7 @@ msgstr " opérations ?" msgid " profil ?" msgstr " profil ?" -#: src/view/ImportPanel.cpp:290 +#: src/view/ImportPanel.cpp:289 msgid " will be created, is it ok ?" msgstr " vont être créés, êtes vous d'accord ?" @@ -61,22 +62,23 @@ msgstr " vont être créés, êtes vous d'accord ?" 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 !" -#: src/view/ImportPanel.cpp:283 +#: src/view/ImportPanel.cpp:282 #, c-format msgid "%d accounts" msgstr "%d comptes" -#: src/view/ImportPanel.cpp:288 +#: src/view/ImportPanel.cpp:287 #, c-format msgid "%d categories" msgstr "%d catégories" -#: src/view/SearchPanel.cpp:278 +#: src/view/SearchPanel.cpp:116 +#: src/view/ExportPanel.cpp:108 msgid "1 entry found" msgstr "1 entrée trouvée" -#: src/view/SearchPanel.cpp:101 -#: src/view/grid/GridAccount.cpp:68 +#: src/view/SearchBanner.cpp:83 +#: src/view/grid/GridAccount.cpp:63 msgid "Account" msgstr "Compte" @@ -85,7 +87,7 @@ msgstr "Compte" msgid "Account " msgstr "Le compte " -#: src/controller/KissCount.cpp:364 +#: src/controller/KissCount.cpp:372 msgid "Account 1" msgstr "Compte 1" @@ -98,37 +100,38 @@ msgstr "Nom du compte" msgid "Account number" msgstr "Numéro de compte" -#: src/view/StatsPanel.cpp:326 +#: src/view/StatsPanel.cpp:336 #: src/view/PreferencesPanel.cpp:60 msgid "Accounts" msgstr "Comptes" -#: src/view/AccountPanel.cpp:1086 +#: src/view/AccountPanel.cpp:1107 msgid "Accounts updated until " msgstr "Comptes mis à jours jusqu'à " -#: src/view/SearchPanel.cpp:97 +#: src/view/SearchBanner.cpp:79 msgid "Amount from" msgstr "Montant min" -#: src/view/SearchPanel.cpp:98 +#: src/view/SearchBanner.cpp:80 msgid "Amount to" msgstr "Montant max" -#: src/view/AccountPanel.cpp:1093 +#: src/view/AccountPanel.cpp:1114 msgid "Any account updated !" msgstr "Aucun compte mis à jour" -#: src/view/ImportPanel.cpp:177 +#: src/view/ImportPanel.cpp:175 +#: src/view/ExportPanel.cpp:138 msgid "Any engine can process this file !" msgstr "Format de fichier non reconnu" #: src/view/PreferencesPanel.cpp:839 -#: src/view/AccountPanel.cpp:853 +#: src/view/AccountPanel.cpp:874 msgid "Are you sure want to delete " msgstr "Etes vous sûr de vouloir supprimer " -#: src/view/grid/GridAccount.cpp:854 +#: src/view/grid/GridAccount.cpp:859 msgid "Are you sure want to delete : \n" msgstr "Etes vous sûr de vouloir supprimer : \n" @@ -154,17 +157,17 @@ msgstr "Bloqué" msgid "Cancel" msgstr "Annuler" -#: src/view/grid/GridAccount.cpp:1289 -#: src/view/grid/GridAccount.cpp:1296 +#: src/view/grid/GridAccount.cpp:1294 +#: src/view/grid/GridAccount.cpp:1301 msgid "Cannot group these operations" msgstr "Impossible de grouper ces opérations" -#: src/view/grid/GridAccount.cpp:1415 -#: src/view/grid/GridAccount.cpp:1421 +#: src/view/grid/GridAccount.cpp:1420 +#: src/view/grid/GridAccount.cpp:1426 msgid "Cannot ungroup these operations" msgstr "Impossible de dégrouper ces opérations" -#: src/controller/KissCount.cpp:355 +#: src/controller/KissCount.cpp:363 msgid "Car" msgstr "Voiture" @@ -172,8 +175,8 @@ msgstr "Voiture" msgid "Categories" msgstr "Catégories" -#: src/view/SearchPanel.cpp:99 -#: src/view/grid/GridAccount.cpp:68 +#: src/view/SearchBanner.cpp:81 +#: src/view/grid/GridAccount.cpp:63 msgid "Category" msgstr "Catégorie" @@ -194,11 +197,11 @@ msgstr "Changer de nom" msgid "Change Password" msgstr "Changer le mot de passe" -#: src/view/SearchPanel.cpp:127 +#: src/view/SearchPanel.cpp:59 msgid "Change account" msgstr "Changer de compte" -#: src/view/SearchPanel.cpp:128 +#: src/view/SearchPanel.cpp:60 msgid "Change category" msgstr "Changer la catégorie" @@ -210,7 +213,7 @@ msgstr "Changer le mot de passe" msgid "Check" msgstr "Rapprochement" -#: src/view/SearchPanel.cpp:86 +#: src/view/SearchBanner.cpp:70 msgid "Checked" msgstr "Rapprochée" @@ -218,11 +221,11 @@ msgstr "Rapprochée" msgid "Choose a database to open" msgstr "Choisissez une base de données à ouvrir" -#: src/view/SearchPanel.cpp:316 +#: src/view/SearchPanel.cpp:154 msgid "Choose a new account" msgstr "Nouveau compte" -#: src/view/SearchPanel.cpp:358 +#: src/view/SearchPanel.cpp:196 msgid "Choose a new category" msgstr "Nouvelle catégorie" @@ -230,29 +233,29 @@ msgstr "Nouvelle catégorie" msgid "Confirm password " msgstr "Confirmer le mot de passe " -#: src/view/StatsPanel.cpp:131 +#: src/view/StatsPanel.cpp:142 #: src/view/AccountPanel.cpp:122 msgid "Cost repartition" msgstr "Répartition des coûts" -#: src/view/ImportPanel.cpp:189 -#: src/view/ImportPanel.cpp:219 -#: src/view/ImportPanel.cpp:261 -#: src/view/ImportPanel.cpp:270 -#: src/view/ImportPanel.cpp:298 -#: src/view/ImportPanel.cpp:319 +#: src/view/ImportPanel.cpp:187 +#: src/view/ImportPanel.cpp:217 +#: src/view/ImportPanel.cpp:260 +#: src/view/ImportPanel.cpp:269 +#: src/view/ImportPanel.cpp:297 +#: src/view/ImportPanel.cpp:315 msgid "Create one" msgstr "En créer un" -#: src/view/grid/GridAccount.cpp:68 +#: src/view/grid/GridAccount.cpp:63 msgid "Credit" msgstr "Crédit" -#: src/view/AccountPanel.cpp:225 +#: src/view/AccountPanel.cpp:234 msgid "Cur Credit" msgstr "Cur Crédit" -#: src/view/AccountPanel.cpp:226 +#: src/view/AccountPanel.cpp:235 msgid "Cur Debit" msgstr "Cur Débit" @@ -260,19 +263,19 @@ msgstr "Cur Débit" msgid "Current value" msgstr "Valeur courante" -#: src/view/grid/GridAccount.cpp:68 +#: src/view/grid/GridAccount.cpp:63 msgid "Date" msgstr "Date" -#: src/view/SearchPanel.cpp:57 +#: src/view/SearchBanner.cpp:41 msgid "Date from" msgstr "Date min" -#: src/view/SearchPanel.cpp:58 +#: src/view/SearchBanner.cpp:42 msgid "Date to" msgstr "Date max" -#: src/view/grid/GridAccount.cpp:68 +#: src/view/grid/GridAccount.cpp:63 msgid "Debit" msgstr "Débit" @@ -282,7 +285,7 @@ msgstr "Défaut" #: src/view/PreferencesPanel.cpp:201 #: src/view/PreferencesPanel.cpp:296 -#: src/view/AccountPanel.cpp:712 +#: src/view/AccountPanel.cpp:733 msgid "Delete" msgstr "Supprimer" @@ -290,21 +293,21 @@ msgstr "Supprimer" msgid "Descending" msgstr "Décroissant" -#: src/view/SearchPanel.cpp:96 -#: src/view/grid/GridAccount.cpp:68 +#: src/view/SearchBanner.cpp:78 +#: src/view/grid/GridAccount.cpp:63 msgid "Description" msgstr "Description" -#: src/view/SearchPanel.cpp:400 +#: src/view/SearchPanel.cpp:238 msgid "Enter a new description" msgstr "Nouvelle description" #: src/view/UsersDialog.cpp:95 #: src/view/UsersDialog.cpp:125 -#: src/view/SearchPanel.cpp:181 -#: src/view/SearchPanel.cpp:191 -#: src/view/SearchPanel.cpp:205 -#: src/view/SearchPanel.cpp:216 +#: src/view/SearchBanner.cpp:140 +#: src/view/SearchBanner.cpp:150 +#: src/view/SearchBanner.cpp:163 +#: src/view/SearchBanner.cpp:172 #: src/view/PreferencesPanel.cpp:436 #: src/view/PreferencesPanel.cpp:496 #: src/view/PreferencesPanel.cpp:516 @@ -314,28 +317,37 @@ msgstr "Nouvelle description" #: src/view/PreferencesPanel.cpp:790 #: src/view/PasswordDialog.cpp:72 #: src/view/PasswordDialog.cpp:78 -#: src/view/AccountPanel.cpp:849 -#: src/view/grid/GridAccount.cpp:1289 -#: src/view/grid/GridAccount.cpp:1296 -#: src/view/grid/GridAccount.cpp:1415 -#: src/view/grid/GridAccount.cpp:1421 +#: src/view/AccountPanel.cpp:870 +#: src/view/grid/GridAccount.cpp:1294 +#: src/view/grid/GridAccount.cpp:1301 +#: src/view/grid/GridAccount.cpp:1420 +#: src/view/grid/GridAccount.cpp:1426 #: 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 -#: src/model/Database.cpp:115 -#: src/model/Database.cpp:123 -#: src/model/Database.cpp:144 +#: src/model/Database.cpp:106 +#: src/model/Database.cpp:112 +#: src/model/Database.cpp:118 +#: src/model/Database.cpp:126 +#: src/model/Database.cpp:147 #: src/model/Database_Update.cpp:23 msgid "Error" msgstr "Erreur" -#: src/model/Database.cpp:144 +#: src/model/Database.cpp:147 msgid "Error creating original database" msgstr "Erreur durant la création de la base de données initiale" +#: src/view/ExportPanel.cpp:55 +#: src/view/ExportPanel.cpp:89 +msgid "Export" +msgstr "Export" + +#: src/view/ExportPanel.cpp:146 +msgid "Failed to save operations" +msgstr "Erreur lors de la sauvegarde des opérations" + #: src/view/ImportPanel.cpp:73 msgid "File account" msgstr "Compte du fichier" @@ -348,9 +360,9 @@ msgstr "Catégorie du fichier" msgid "Final value" msgstr "Valeur finale" -#: src/view/SearchPanel.cpp:86 -#: src/view/grid/GridAccount.cpp:345 -#: src/controller/KissCount.cpp:355 +#: src/view/SearchBanner.cpp:70 +#: src/view/grid/GridAccount.cpp:340 +#: src/controller/KissCount.cpp:363 msgid "Fix" msgstr "Fixe" @@ -371,15 +383,15 @@ msgid "From " msgstr "A partir de " #: src/view/GenerateDialog.cpp:31 -#: src/view/AccountPanel.cpp:709 +#: src/view/AccountPanel.cpp:730 msgid "Generate month" msgstr "Générer mois" -#: src/model/import/GrisbiImportEngine.cpp:185 +#: src/model/import/GrisbiImportEngine.cpp:201 msgid "Grisbi files (*.gsb)|*.gsb" msgstr "Fichiers Grisbi (*.gsb)|*.gsb" -#: src/controller/KissCount.cpp:355 +#: src/controller/KissCount.cpp:363 msgid "Groceries" msgstr "Courses" @@ -387,7 +399,7 @@ msgstr "Courses" msgid "Group" msgstr "Grouper" -#: src/controller/KissCount.cpp:355 +#: src/controller/KissCount.cpp:363 msgid "Hobbies" msgstr "Loisirs" @@ -411,19 +423,19 @@ msgstr "Compte interne" msgid "Internal category" msgstr "Catégorie interne" -#: src/view/SearchPanel.cpp:191 +#: src/view/SearchBanner.cpp:150 msgid "Invalid amount from" msgstr "Montant min invalide" -#: src/view/SearchPanel.cpp:216 +#: src/view/SearchBanner.cpp:172 msgid "Invalid amount range" msgstr "Intervalle des montants invalide" -#: src/view/SearchPanel.cpp:205 +#: src/view/SearchBanner.cpp:163 msgid "Invalid amount to" msgstr "Montant max invalide" -#: src/view/SearchPanel.cpp:181 +#: src/view/SearchBanner.cpp:140 msgid "Invalid date range" msgstr "Intervalle de temps invalide" @@ -443,7 +455,7 @@ msgstr "Ancien mot de passe invalide" msgid "Invalid password" msgstr "Mot de passe invalide" -#: src/view/StatsPanel.cpp:380 +#: src/view/StatsPanel.cpp:403 msgid "Invalide date range" msgstr "Intervalle de temps invalide" @@ -451,7 +463,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:849 +#: src/view/AccountPanel.cpp:870 msgid "It must be at least one month !" msgstr "Il doit rester au moins un mois" @@ -459,17 +471,25 @@ msgstr "Il doit rester au moins un mois" msgid "Kill me" msgstr "Kill me" -#: src/view/StatsPanel.cpp:380 +#: src/view/StatsPanel.cpp:403 #: src/view/PreferencesPanel.cpp:824 #: src/view/PreferencesPanel.cpp:827 #: src/model/Database_Update.cpp:140 msgid "KissCount" msgstr "KissCount" +#: src/view/ExportPanel.cpp:152 +msgid "KissCount - Export" +msgstr "KissCount - Export" + #: src/view/ImportPanel.cpp:128 msgid "KissCount - Import" msgstr "KissCount - Import" +#: src/model/import/XMLImportEngine.cpp:268 +msgid "KissCount xml files (*.xml)|*.xml" +msgstr "Fichiers KissCount xml (*.xml)|*.xml" + #: src/view/PreferencesPanel.cpp:62 msgid "Language" msgstr "Langue" @@ -517,26 +537,33 @@ msgstr "" "Aucune base de données trouvée, voulez vous en créer une nouvelle ?\n" "\n" -#: src/view/SearchPanel.cpp:281 +#: src/view/SearchPanel.cpp:119 +#: src/view/ExportPanel.cpp:111 msgid "No entry found" msgstr "Pas d'entrée trouvée" -#: src/view/ImportPanel.cpp:357 +#: src/view/ImportPanel.cpp:351 msgid "No operation found into this file" msgstr "Aucun opération trouvée dans ce fichier" -#: src/view/SearchPanel.cpp:86 +#: src/view/ExportPanel.cpp:124 +msgid "No operation to save" +msgstr "Aucun opération à sauvegarder" + +#: src/view/StatsPanel.cpp:117 +#: src/view/SearchBanner.cpp:70 +#: src/view/AccountPanel.cpp:237 msgid "Non fix" msgstr "Courantes" -#: src/view/SearchPanel.cpp:311 -#: src/view/SearchPanel.cpp:353 +#: src/view/SearchPanel.cpp:149 +#: src/view/SearchPanel.cpp:191 #: src/view/PreferencesPanel.cpp:441 #: src/view/PreferencesPanel.cpp:702 msgid "None" msgstr "Aucun" -#: src/view/SearchPanel.cpp:86 +#: src/view/SearchBanner.cpp:70 msgid "Not checked" msgstr "Non rapprochée" @@ -544,7 +571,7 @@ msgstr "Non rapprochée" msgid "Number" msgstr "Numéro de compte" -#: src/model/import/OFXImportEngine.cpp:126 +#: src/model/import/OFXImportEngine.cpp:135 msgid "OFX files (*.ofx)|*.ofx" msgstr "Fichiers OFX (*.ofx)|*.ofx" @@ -562,16 +589,20 @@ msgstr "Ancien mot de passe " msgid "Operation order" msgstr "Ordre des opérations" -#: src/view/SearchPanel.cpp:100 -#: src/view/AccountPanel.cpp:185 +#: src/view/SearchBanner.cpp:82 +#: src/view/AccountPanel.cpp:186 msgid "Operations" msgstr "Opérations" -#: src/view/ImportPanel.cpp:382 +#: src/view/ImportPanel.cpp:421 msgid "Operations successfully imported" msgstr "les opérations ont été importées avec succès" -#: src/controller/KissCount.cpp:356 +#: src/view/ExportPanel.cpp:144 +msgid "Operations successfuly saved" +msgstr "Opérations sauvegardées avec succès" + +#: src/controller/KissCount.cpp:364 msgid "Other" msgstr "Autres" @@ -583,7 +614,7 @@ msgstr "Mot de passe " msgid "Password changed" msgstr "Mot de passe changé" -#: src/view/wxUI.cpp:248 +#: src/view/wxUI.cpp:249 msgid "" "Personal accounting software\n" "\n" @@ -611,7 +642,7 @@ msgstr "Re entrez le mot de passe" msgid "Preferences" msgstr "Préférences" -#: src/view/wxUI.cpp:255 +#: src/view/wxUI.cpp:256 msgid "Quit KissCount ?" msgstr "Quitter KissCount ?" @@ -619,25 +650,30 @@ msgstr "Quitter KissCount ?" msgid "Real" msgstr "Réel" -#: src/view/AccountPanel.cpp:227 +#: src/view/AccountPanel.cpp:236 msgid "Remains" msgstr "Restant" -#: src/view/SearchPanel.cpp:129 +#: src/view/SearchPanel.cpp:61 msgid "Rename" msgstr "Renommer" +#: src/view/ExportPanel.cpp:128 +msgid "Save as" +msgstr "Sauvegarder sous" + #: src/view/ImportPanel.cpp:60 msgid "Save import patterns" msgstr "Sauvegarder les motifs d'import" -#: src/view/SearchPanel.cpp:94 -#: src/view/SearchPanel.cpp:166 -#: src/view/SearchPanel.cpp:416 +#: src/view/SearchPanel.cpp:48 +#: src/view/SearchPanel.cpp:97 +#: src/view/SearchPanel.cpp:254 +#: src/view/ExportPanel.cpp:44 msgid "Search" msgstr "Chercher" -#: src/view/StatsPanel.cpp:123 +#: src/view/StatsPanel.cpp:134 #: src/view/AccountPanel.cpp:95 msgid "Serie 1" msgstr "Série 1" @@ -646,8 +682,8 @@ msgstr "Série 1" msgid "Shared with" msgstr "Partagé avec" -#: src/view/StatsPanel.cpp:163 -#: src/view/StatsPanel.cpp:361 +#: src/view/StatsPanel.cpp:172 +#: src/view/StatsPanel.cpp:384 msgid "Statistics" msgstr "Statistiques" @@ -659,11 +695,11 @@ msgstr "A" msgid "To " msgstr "Vers " -#: src/view/AccountPanel.cpp:209 +#: src/view/AccountPanel.cpp:210 msgid "Total Credit" msgstr "Total Crédit" -#: src/view/AccountPanel.cpp:210 +#: src/view/AccountPanel.cpp:211 msgid "Total Debit" msgstr "Total Débit" @@ -671,27 +707,27 @@ msgstr "Total Débit" msgid "UnGroup" msgstr "Dégrouper" -#: src/model/Database.cpp:109 -#: src/model/Database.cpp:115 +#: src/model/Database.cpp:112 +#: src/model/Database.cpp:118 msgid "Unable to Create " msgstr "Impossible de créer " #: src/model/Database.cpp:45 #: src/model/Database.cpp:52 #: src/model/Database.cpp:70 -#: src/model/Database.cpp:123 +#: src/model/Database.cpp:126 msgid "Unable to open Database" msgstr "Impossible d'ouvrir la base de données" -#: src/controller/KissCount.cpp:356 +#: src/controller/KissCount.cpp:364 msgid "Unexpected" msgstr "Exceptionnel" -#: src/view/SearchPanel.cpp:82 -#: src/view/SearchPanel.cpp:90 -#: src/view/AccountPanel.cpp:518 -#: src/view/AccountPanel.cpp:554 -#: src/view/AccountPanel.cpp:592 +#: src/view/SearchBanner.cpp:66 +#: src/view/SearchBanner.cpp:74 +#: src/view/AccountPanel.cpp:529 +#: src/view/AccountPanel.cpp:565 +#: src/view/AccountPanel.cpp:603 #: src/model/User.cpp:59 #: src/model/User.cpp:79 #: src/model/User.cpp:127 @@ -729,7 +765,7 @@ msgstr "Utilisateurs" msgid "Virtual" msgstr "Virtuel" -#: src/view/grid/GridAccount.cpp:1066 +#: src/view/grid/GridAccount.cpp:1071 msgid "Warning" msgstr "Attention" @@ -741,7 +777,11 @@ 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:1066 +#: src/model/export/XMLExportEngine.cpp:29 +msgid "XML files (*.xml)|*.xml" +msgstr "Fichiers XML (*.xml)|*.xml" + +#: src/view/grid/GridAccount.cpp:1071 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 ab074bb..6101e75 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-04-30 12:37+0200\n" +"POT-Creation-Date: 2011-07-04 20:23+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/view/StatsPanel.cpp:361 src/view/PreferencesPanel.cpp:832 +#: src/view/StatsPanel.cpp:384 src/view/PreferencesPanel.cpp:832 msgid " - " msgstr "" @@ -27,19 +27,19 @@ msgstr "" msgid " already exists" msgstr "" -#: src/view/ImportPanel.cpp:284 +#: src/view/ImportPanel.cpp:283 msgid " and " msgstr "" -#: src/view/SearchPanel.cpp:276 +#: src/view/SearchPanel.cpp:114 src/view/ExportPanel.cpp:106 msgid " entries found" msgstr "" -#: src/model/Database.cpp:103 +#: src/model/Database.cpp:106 msgid " not found, aborting" msgstr "" -#: src/view/AccountPanel.cpp:858 +#: src/view/AccountPanel.cpp:879 msgid " operations ?" msgstr "" @@ -47,7 +47,7 @@ msgstr "" msgid " profil ?" msgstr "" -#: src/view/ImportPanel.cpp:290 +#: src/view/ImportPanel.cpp:289 msgid " will be created, is it ok ?" msgstr "" @@ -55,21 +55,21 @@ msgstr "" msgid "!! Warning !! If there was a bug, the old database will be suppressed !" msgstr "" -#: src/view/ImportPanel.cpp:283 +#: src/view/ImportPanel.cpp:282 #, c-format msgid "%d accounts" msgstr "" -#: src/view/ImportPanel.cpp:288 +#: src/view/ImportPanel.cpp:287 #, c-format msgid "%d categories" msgstr "" -#: src/view/SearchPanel.cpp:278 +#: src/view/SearchPanel.cpp:116 src/view/ExportPanel.cpp:108 msgid "1 entry found" msgstr "" -#: src/view/SearchPanel.cpp:101 src/view/grid/GridAccount.cpp:68 +#: src/view/SearchBanner.cpp:83 src/view/grid/GridAccount.cpp:63 msgid "Account" msgstr "" @@ -77,7 +77,7 @@ msgstr "" msgid "Account " msgstr "" -#: src/controller/KissCount.cpp:364 +#: src/controller/KissCount.cpp:372 msgid "Account 1" msgstr "" @@ -89,35 +89,35 @@ msgstr "" msgid "Account number" msgstr "" -#: src/view/StatsPanel.cpp:326 src/view/PreferencesPanel.cpp:60 +#: src/view/StatsPanel.cpp:336 src/view/PreferencesPanel.cpp:60 msgid "Accounts" msgstr "" -#: src/view/AccountPanel.cpp:1086 +#: src/view/AccountPanel.cpp:1107 msgid "Accounts updated until " msgstr "" -#: src/view/SearchPanel.cpp:97 +#: src/view/SearchBanner.cpp:79 msgid "Amount from" msgstr "" -#: src/view/SearchPanel.cpp:98 +#: src/view/SearchBanner.cpp:80 msgid "Amount to" msgstr "" -#: src/view/AccountPanel.cpp:1093 +#: src/view/AccountPanel.cpp:1114 msgid "Any account updated !" msgstr "" -#: src/view/ImportPanel.cpp:177 +#: src/view/ImportPanel.cpp:175 src/view/ExportPanel.cpp:138 msgid "Any engine can process this file !" msgstr "" -#: src/view/PreferencesPanel.cpp:839 src/view/AccountPanel.cpp:853 +#: src/view/PreferencesPanel.cpp:839 src/view/AccountPanel.cpp:874 msgid "Are you sure want to delete " msgstr "" -#: src/view/grid/GridAccount.cpp:854 +#: src/view/grid/GridAccount.cpp:859 msgid "Are you sure want to delete : \n" msgstr "" @@ -142,15 +142,15 @@ msgstr "" msgid "Cancel" msgstr "" -#: src/view/grid/GridAccount.cpp:1289 src/view/grid/GridAccount.cpp:1296 +#: src/view/grid/GridAccount.cpp:1294 src/view/grid/GridAccount.cpp:1301 msgid "Cannot group these operations" msgstr "" -#: src/view/grid/GridAccount.cpp:1415 src/view/grid/GridAccount.cpp:1421 +#: src/view/grid/GridAccount.cpp:1420 src/view/grid/GridAccount.cpp:1426 msgid "Cannot ungroup these operations" msgstr "" -#: src/controller/KissCount.cpp:355 +#: src/controller/KissCount.cpp:363 msgid "Car" msgstr "" @@ -158,7 +158,7 @@ msgstr "" msgid "Categories" msgstr "" -#: src/view/SearchPanel.cpp:99 src/view/grid/GridAccount.cpp:68 +#: src/view/SearchBanner.cpp:81 src/view/grid/GridAccount.cpp:63 msgid "Category" msgstr "" @@ -178,11 +178,11 @@ msgstr "" msgid "Change Password" msgstr "" -#: src/view/SearchPanel.cpp:127 +#: src/view/SearchPanel.cpp:59 msgid "Change account" msgstr "" -#: src/view/SearchPanel.cpp:128 +#: src/view/SearchPanel.cpp:60 msgid "Change category" msgstr "" @@ -194,7 +194,7 @@ msgstr "" msgid "Check" msgstr "" -#: src/view/SearchPanel.cpp:86 +#: src/view/SearchBanner.cpp:70 msgid "Checked" msgstr "" @@ -202,11 +202,11 @@ msgstr "" msgid "Choose a database to open" msgstr "" -#: src/view/SearchPanel.cpp:316 +#: src/view/SearchPanel.cpp:154 msgid "Choose a new account" msgstr "" -#: src/view/SearchPanel.cpp:358 +#: src/view/SearchPanel.cpp:196 msgid "Choose a new category" msgstr "" @@ -214,25 +214,25 @@ msgstr "" msgid "Confirm password " msgstr "" -#: src/view/StatsPanel.cpp:131 src/view/AccountPanel.cpp:122 +#: src/view/StatsPanel.cpp:142 src/view/AccountPanel.cpp:122 msgid "Cost repartition" msgstr "" -#: src/view/ImportPanel.cpp:189 src/view/ImportPanel.cpp:219 -#: src/view/ImportPanel.cpp:261 src/view/ImportPanel.cpp:270 -#: src/view/ImportPanel.cpp:298 src/view/ImportPanel.cpp:319 +#: src/view/ImportPanel.cpp:187 src/view/ImportPanel.cpp:217 +#: src/view/ImportPanel.cpp:260 src/view/ImportPanel.cpp:269 +#: src/view/ImportPanel.cpp:297 src/view/ImportPanel.cpp:315 msgid "Create one" msgstr "" -#: src/view/grid/GridAccount.cpp:68 +#: src/view/grid/GridAccount.cpp:63 msgid "Credit" msgstr "" -#: src/view/AccountPanel.cpp:225 +#: src/view/AccountPanel.cpp:234 msgid "Cur Credit" msgstr "" -#: src/view/AccountPanel.cpp:226 +#: src/view/AccountPanel.cpp:235 msgid "Cur Debit" msgstr "" @@ -240,19 +240,19 @@ msgstr "" msgid "Current value" msgstr "" -#: src/view/grid/GridAccount.cpp:68 +#: src/view/grid/GridAccount.cpp:63 msgid "Date" msgstr "" -#: src/view/SearchPanel.cpp:57 +#: src/view/SearchBanner.cpp:41 msgid "Date from" msgstr "" -#: src/view/SearchPanel.cpp:58 +#: src/view/SearchBanner.cpp:42 msgid "Date to" msgstr "" -#: src/view/grid/GridAccount.cpp:68 +#: src/view/grid/GridAccount.cpp:63 msgid "Debit" msgstr "" @@ -261,7 +261,7 @@ msgid "Default" msgstr "" #: src/view/PreferencesPanel.cpp:201 src/view/PreferencesPanel.cpp:296 -#: src/view/AccountPanel.cpp:712 +#: src/view/AccountPanel.cpp:733 msgid "Delete" msgstr "" @@ -269,36 +269,44 @@ msgstr "" msgid "Descending" msgstr "" -#: src/view/SearchPanel.cpp:96 src/view/grid/GridAccount.cpp:68 +#: src/view/SearchBanner.cpp:78 src/view/grid/GridAccount.cpp:63 msgid "Description" msgstr "" -#: src/view/SearchPanel.cpp:400 +#: src/view/SearchPanel.cpp:238 msgid "Enter a new description" msgstr "" #: src/view/UsersDialog.cpp:95 src/view/UsersDialog.cpp:125 -#: src/view/SearchPanel.cpp:181 src/view/SearchPanel.cpp:191 -#: src/view/SearchPanel.cpp:205 src/view/SearchPanel.cpp:216 +#: src/view/SearchBanner.cpp:140 src/view/SearchBanner.cpp:150 +#: src/view/SearchBanner.cpp:163 src/view/SearchBanner.cpp:172 #: src/view/PreferencesPanel.cpp:436 src/view/PreferencesPanel.cpp:496 #: src/view/PreferencesPanel.cpp:516 src/view/PreferencesPanel.cpp:727 #: src/view/PreferencesPanel.cpp:746 src/view/PreferencesPanel.cpp:784 #: src/view/PreferencesPanel.cpp:790 src/view/PasswordDialog.cpp:72 -#: src/view/PasswordDialog.cpp:78 src/view/AccountPanel.cpp:849 -#: src/view/grid/GridAccount.cpp:1289 src/view/grid/GridAccount.cpp:1296 -#: src/view/grid/GridAccount.cpp:1415 src/view/grid/GridAccount.cpp:1421 +#: src/view/PasswordDialog.cpp:78 src/view/AccountPanel.cpp:870 +#: src/view/grid/GridAccount.cpp:1294 src/view/grid/GridAccount.cpp:1301 +#: src/view/grid/GridAccount.cpp:1420 src/view/grid/GridAccount.cpp:1426 #: 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 -#: src/model/Database.cpp:115 src/model/Database.cpp:123 -#: src/model/Database.cpp:144 src/model/Database_Update.cpp:23 +#: src/model/Database.cpp:106 src/model/Database.cpp:112 +#: src/model/Database.cpp:118 src/model/Database.cpp:126 +#: src/model/Database.cpp:147 src/model/Database_Update.cpp:23 msgid "Error" msgstr "" -#: src/model/Database.cpp:144 +#: src/model/Database.cpp:147 msgid "Error creating original database" msgstr "" +#: src/view/ExportPanel.cpp:55 src/view/ExportPanel.cpp:89 +msgid "Export" +msgstr "" + +#: src/view/ExportPanel.cpp:146 +msgid "Failed to save operations" +msgstr "" + #: src/view/ImportPanel.cpp:73 msgid "File account" msgstr "" @@ -311,8 +319,8 @@ msgstr "" msgid "Final value" msgstr "" -#: src/view/SearchPanel.cpp:86 src/view/grid/GridAccount.cpp:345 -#: src/controller/KissCount.cpp:355 +#: src/view/SearchBanner.cpp:70 src/view/grid/GridAccount.cpp:340 +#: src/controller/KissCount.cpp:363 msgid "Fix" msgstr "" @@ -332,15 +340,15 @@ msgstr "" msgid "From " msgstr "" -#: src/view/GenerateDialog.cpp:31 src/view/AccountPanel.cpp:709 +#: src/view/GenerateDialog.cpp:31 src/view/AccountPanel.cpp:730 msgid "Generate month" msgstr "" -#: src/model/import/GrisbiImportEngine.cpp:185 +#: src/model/import/GrisbiImportEngine.cpp:201 msgid "Grisbi files (*.gsb)|*.gsb" msgstr "" -#: src/controller/KissCount.cpp:355 +#: src/controller/KissCount.cpp:363 msgid "Groceries" msgstr "" @@ -348,7 +356,7 @@ msgstr "" msgid "Group" msgstr "" -#: src/controller/KissCount.cpp:355 +#: src/controller/KissCount.cpp:363 msgid "Hobbies" msgstr "" @@ -372,19 +380,19 @@ msgstr "" msgid "Internal category" msgstr "" -#: src/view/SearchPanel.cpp:191 +#: src/view/SearchBanner.cpp:150 msgid "Invalid amount from" msgstr "" -#: src/view/SearchPanel.cpp:216 +#: src/view/SearchBanner.cpp:172 msgid "Invalid amount range" msgstr "" -#: src/view/SearchPanel.cpp:205 +#: src/view/SearchBanner.cpp:163 msgid "Invalid amount to" msgstr "" -#: src/view/SearchPanel.cpp:181 +#: src/view/SearchBanner.cpp:140 msgid "Invalid date range" msgstr "" @@ -404,7 +412,7 @@ msgstr "" msgid "Invalid password" msgstr "" -#: src/view/StatsPanel.cpp:380 +#: src/view/StatsPanel.cpp:403 msgid "Invalide date range" msgstr "" @@ -412,7 +420,7 @@ msgstr "" msgid "It must be at least one account !" msgstr "" -#: src/view/AccountPanel.cpp:849 +#: src/view/AccountPanel.cpp:870 msgid "It must be at least one month !" msgstr "" @@ -420,15 +428,23 @@ msgstr "" msgid "Kill me" msgstr "" -#: src/view/StatsPanel.cpp:380 src/view/PreferencesPanel.cpp:824 +#: src/view/StatsPanel.cpp:403 src/view/PreferencesPanel.cpp:824 #: src/view/PreferencesPanel.cpp:827 src/model/Database_Update.cpp:140 msgid "KissCount" msgstr "" +#: src/view/ExportPanel.cpp:152 +msgid "KissCount - Export" +msgstr "" + #: src/view/ImportPanel.cpp:128 msgid "KissCount - Import" msgstr "" +#: src/model/import/XMLImportEngine.cpp:268 +msgid "KissCount xml files (*.xml)|*.xml" +msgstr "" + #: src/view/PreferencesPanel.cpp:62 msgid "Language" msgstr "" @@ -472,24 +488,29 @@ msgid "" "\n" msgstr "" -#: src/view/SearchPanel.cpp:281 +#: src/view/SearchPanel.cpp:119 src/view/ExportPanel.cpp:111 msgid "No entry found" msgstr "" -#: src/view/ImportPanel.cpp:357 +#: src/view/ImportPanel.cpp:351 msgid "No operation found into this file" msgstr "" -#: src/view/SearchPanel.cpp:86 +#: src/view/ExportPanel.cpp:124 +msgid "No operation to save" +msgstr "" + +#: src/view/StatsPanel.cpp:117 src/view/SearchBanner.cpp:70 +#: src/view/AccountPanel.cpp:237 msgid "Non fix" msgstr "" -#: src/view/SearchPanel.cpp:311 src/view/SearchPanel.cpp:353 +#: src/view/SearchPanel.cpp:149 src/view/SearchPanel.cpp:191 #: src/view/PreferencesPanel.cpp:441 src/view/PreferencesPanel.cpp:702 msgid "None" msgstr "" -#: src/view/SearchPanel.cpp:86 +#: src/view/SearchBanner.cpp:70 msgid "Not checked" msgstr "" @@ -497,7 +518,7 @@ msgstr "" msgid "Number" msgstr "" -#: src/model/import/OFXImportEngine.cpp:126 +#: src/model/import/OFXImportEngine.cpp:135 msgid "OFX files (*.ofx)|*.ofx" msgstr "" @@ -514,15 +535,19 @@ msgstr "" msgid "Operation order" msgstr "" -#: src/view/SearchPanel.cpp:100 src/view/AccountPanel.cpp:185 +#: src/view/SearchBanner.cpp:82 src/view/AccountPanel.cpp:186 msgid "Operations" msgstr "" -#: src/view/ImportPanel.cpp:382 +#: src/view/ImportPanel.cpp:421 msgid "Operations successfully imported" msgstr "" -#: src/controller/KissCount.cpp:356 +#: src/view/ExportPanel.cpp:144 +msgid "Operations successfuly saved" +msgstr "" + +#: src/controller/KissCount.cpp:364 msgid "Other" msgstr "" @@ -534,7 +559,7 @@ msgstr "" msgid "Password changed" msgstr "" -#: src/view/wxUI.cpp:248 +#: src/view/wxUI.cpp:249 msgid "" "Personal accounting software\n" "\n" @@ -554,7 +579,7 @@ msgstr "" msgid "Preferences" msgstr "" -#: src/view/wxUI.cpp:255 +#: src/view/wxUI.cpp:256 msgid "Quit KissCount ?" msgstr "" @@ -562,24 +587,28 @@ msgstr "" msgid "Real" msgstr "" -#: src/view/AccountPanel.cpp:227 +#: src/view/AccountPanel.cpp:236 msgid "Remains" msgstr "" -#: src/view/SearchPanel.cpp:129 +#: src/view/SearchPanel.cpp:61 msgid "Rename" msgstr "" +#: src/view/ExportPanel.cpp:128 +msgid "Save as" +msgstr "" + #: src/view/ImportPanel.cpp:60 msgid "Save import patterns" msgstr "" -#: src/view/SearchPanel.cpp:94 src/view/SearchPanel.cpp:166 -#: src/view/SearchPanel.cpp:416 +#: src/view/SearchPanel.cpp:48 src/view/SearchPanel.cpp:97 +#: src/view/SearchPanel.cpp:254 src/view/ExportPanel.cpp:44 msgid "Search" msgstr "" -#: src/view/StatsPanel.cpp:123 src/view/AccountPanel.cpp:95 +#: src/view/StatsPanel.cpp:134 src/view/AccountPanel.cpp:95 msgid "Serie 1" msgstr "" @@ -587,7 +616,7 @@ msgstr "" msgid "Shared with" msgstr "" -#: src/view/StatsPanel.cpp:163 src/view/StatsPanel.cpp:361 +#: src/view/StatsPanel.cpp:172 src/view/StatsPanel.cpp:384 msgid "Statistics" msgstr "" @@ -599,11 +628,11 @@ msgstr "" msgid "To " msgstr "" -#: src/view/AccountPanel.cpp:209 +#: src/view/AccountPanel.cpp:210 msgid "Total Credit" msgstr "" -#: src/view/AccountPanel.cpp:210 +#: src/view/AccountPanel.cpp:211 msgid "Total Debit" msgstr "" @@ -611,22 +640,22 @@ msgstr "" msgid "UnGroup" msgstr "" -#: src/model/Database.cpp:109 src/model/Database.cpp:115 +#: src/model/Database.cpp:112 src/model/Database.cpp:118 msgid "Unable to Create " msgstr "" #: src/model/Database.cpp:45 src/model/Database.cpp:52 -#: src/model/Database.cpp:70 src/model/Database.cpp:123 +#: src/model/Database.cpp:70 src/model/Database.cpp:126 msgid "Unable to open Database" msgstr "" -#: src/controller/KissCount.cpp:356 +#: src/controller/KissCount.cpp:364 msgid "Unexpected" msgstr "" -#: src/view/SearchPanel.cpp:82 src/view/SearchPanel.cpp:90 -#: src/view/AccountPanel.cpp:518 src/view/AccountPanel.cpp:554 -#: src/view/AccountPanel.cpp:592 src/model/User.cpp:59 src/model/User.cpp:79 +#: src/view/SearchBanner.cpp:66 src/view/SearchBanner.cpp:74 +#: src/view/AccountPanel.cpp:529 src/view/AccountPanel.cpp:565 +#: src/view/AccountPanel.cpp:603 src/model/User.cpp:59 src/model/User.cpp:79 #: src/model/User.cpp:127 msgid "Unknown" msgstr "" @@ -660,7 +689,7 @@ msgstr "" msgid "Virtual" msgstr "" -#: src/view/grid/GridAccount.cpp:1066 +#: src/view/grid/GridAccount.cpp:1071 msgid "Warning" msgstr "" @@ -672,7 +701,11 @@ msgstr "" msgid "Wich category will replace this one ?" msgstr "" -#: src/view/grid/GridAccount.cpp:1066 +#: src/model/export/XMLExportEngine.cpp:29 +msgid "XML files (*.xml)|*.xml" +msgstr "" + +#: src/view/grid/GridAccount.cpp:1071 msgid "You made a debit on a blocked account" msgstr ""