soutade/KissCount
1
0
Fork 0
Code Issues Pull Requests Packages Releases 1 Wiki Activity

better translation and fix bug on user deletion

Browse Source
This commit is contained in:
Grégory Soutadé 2010-07-08 20:12:49 +02:00
parent cef0e4eb3c
commit a6475759f1
6 changed files with 205 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ressources/po/french.mo
View File

Binary file not shown.

161
ressources/po/french.po
View File

@ -1,12 +1,13 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"POT-Creation-Date: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-07-08 19:24+0200\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"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"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"
"X-Poedit-Language: French\n" "X-Poedit-Language: French\n"
"X-Poedit-Country: FRANCE\n" "X-Poedit-Country: FRANCE\n"
@ -17,28 +18,28 @@ msgstr ""
# This file is distributed under the same license as the PACKAGE package. # This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# #
#: src/view/PreferencesPanel.cpp:448 #: src/view/PreferencesPanel.cpp:493
msgid " - " msgid " - "
msgstr " - " msgstr " - "
#: src/view/PreferencesPanel.cpp:284 #: src/view/PreferencesPanel.cpp:315
#: src/view/PreferencesPanel.cpp:384 #: src/view/PreferencesPanel.cpp:415
#: src/view/PreferencesPanel.cpp:429 #: src/view/PreferencesPanel.cpp:460
#: src/view/UsersDialog.cpp:95 #: src/view/UsersDialog.cpp:95
msgid " already exists" msgid " already exists"
msgstr "existe déjà " msgstr " existe déjà "
#: src/model/Database.cpp:83 #: src/model/Database.cpp:83
msgid " not found, aborting" msgid " not found, aborting"
msgstr "non trouvé, arrêt" msgstr " non trouvé, arrêt"
#: src/view/AccountPanel.cpp:979 #: src/view/AccountPanel.cpp:979
msgid " operations ?" msgid " operations ?"
msgstr "opérations ?" msgstr " opérations ?"
#: src/view/PreferencesPanel.cpp:455 #: src/view/PreferencesPanel.cpp:500
msgid " profil ?" msgid " profil ?"
msgstr "profil ?" msgstr " profil ?"
#: src/view/ButtonPanel.cpp:31 #: src/view/ButtonPanel.cpp:31
msgid "About" msgid "About"
@ -48,7 +49,7 @@ msgstr "A propos"
msgid "Account" msgid "Account"
msgstr "Compte" msgstr "Compte"
#: src/view/PreferencesPanel.cpp:284 #: src/view/PreferencesPanel.cpp:315
msgid "Account " msgid "Account "
msgstr "Compte" msgstr "Compte"
@ -58,19 +59,19 @@ msgstr "Nom du compte"
#: src/view/AccountPanel.cpp:119 #: src/view/AccountPanel.cpp:119
msgid "Account number" msgid "Account number"
msgstr "numéro de compte" msgstr "Numéro de compte"
#: src/view/PreferencesPanel.cpp:31 #: src/view/PreferencesPanel.cpp:32
msgid "Accounts" msgid "Accounts"
msgstr "Comptes" msgstr "Comptes"
#: src/view/PreferencesPanel.cpp:255 #: src/view/PreferencesPanel.cpp:286
#: src/view/PreferencesPanel.cpp:455 #: src/view/PreferencesPanel.cpp:500
#: src/view/AccountPanel.cpp:974 #: src/view/AccountPanel.cpp:974
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:355 #: src/view/PreferencesPanel.cpp:386
#: src/view/AccountPanel.cpp:684 #: src/view/AccountPanel.cpp:684
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"
@ -81,7 +82,7 @@ msgstr "Etes vous sûr de vouloir supprimer : \n"
msgid "Cancel" msgid "Cancel"
msgstr "Annuler" msgstr "Annuler"
#: src/view/PreferencesPanel.cpp:32 #: src/view/PreferencesPanel.cpp:33
msgid "Categories" msgid "Categories"
msgstr "Catégories" msgstr "Catégories"
@ -89,15 +90,15 @@ msgstr "Catégories"
msgid "Category" msgid "Category"
msgstr "Catégorie" msgstr "Catégorie"
#: src/view/PreferencesPanel.cpp:384 #: src/view/PreferencesPanel.cpp:415
msgid "Category " msgid "Category "
msgstr "Catégorie" msgstr "Catégorie"
#: src/view/PreferencesPanel.cpp:46 #: src/view/PreferencesPanel.cpp:48
msgid "Change Name" msgid "Change Name"
msgstr "Changer de nom" msgstr "Changer de nom"
#: src/view/PreferencesPanel.cpp:47 #: src/view/PreferencesPanel.cpp:49
msgid "Change Password" msgid "Change Password"
msgstr "Changer le mot de passe" msgstr "Changer le mot de passe"
@ -109,7 +110,7 @@ msgstr "Changer le mot de passe"
msgid "Change user" msgid "Change user"
msgstr "Changer d'utilisateur" msgstr "Changer d'utilisateur"
#: src/view/PreferencesPanel.cpp:147 #: src/view/PreferencesPanel.cpp:164
msgid "Color" msgid "Color"
msgstr "Couleur" msgstr "Couleur"
@ -145,12 +146,12 @@ msgstr "Date"
msgid "Debit" msgid "Debit"
msgstr "Débit" msgstr "Débit"
#: src/view/PreferencesPanel.cpp:98 #: src/view/PreferencesPanel.cpp:115
msgid "Default" msgid "Default"
msgstr "Défaut" msgstr "Défaut"
#: src/view/PreferencesPanel.cpp:99 #: src/view/PreferencesPanel.cpp:116
#: src/view/PreferencesPanel.cpp:149 #: src/view/PreferencesPanel.cpp:166
#: src/view/AccountPanel.cpp:833 #: src/view/AccountPanel.cpp:833
msgid "Delete" msgid "Delete"
msgstr "Supprimer" msgstr "Supprimer"
@ -163,11 +164,11 @@ msgstr "Description"
#: src/model/Database.cpp:106 #: src/model/Database.cpp:106
#: src/view/PasswordDialog.cpp:53 #: src/view/PasswordDialog.cpp:53
#: src/view/PasswordDialog.cpp:59 #: src/view/PasswordDialog.cpp:59
#: src/view/PreferencesPanel.cpp:251 #: src/view/PreferencesPanel.cpp:282
#: src/view/PreferencesPanel.cpp:284 #: src/view/PreferencesPanel.cpp:315
#: src/view/PreferencesPanel.cpp:384 #: src/view/PreferencesPanel.cpp:415
#: src/view/PreferencesPanel.cpp:423 #: src/view/PreferencesPanel.cpp:454
#: src/view/PreferencesPanel.cpp:429 #: src/view/PreferencesPanel.cpp:460
#: src/view/AccountPanel.cpp:970 #: src/view/AccountPanel.cpp:970
#: src/view/UsersDialog.cpp:67 #: src/view/UsersDialog.cpp:67
#: src/view/UsersDialog.cpp:95 #: src/view/UsersDialog.cpp:95
@ -182,11 +183,16 @@ msgstr "Erreur durant la création de la base de données initiale"
msgid "Final value" msgid "Final value"
msgstr "Valeur finale" msgstr "Valeur finale"
#: src/controller/KissCount.cpp:239
msgid "Fix"
msgstr "Fixe"
#: src/model/Database.cpp:239
#: src/view/AccountPanel.cpp:406 #: src/view/AccountPanel.cpp:406
msgid "Fixe" msgid "Fixe"
msgstr "Fixe" msgstr "Fixe"
#: src/view/PreferencesPanel.cpp:148 #: src/view/PreferencesPanel.cpp:165
msgid "Font" msgid "Font"
msgstr "Police" msgstr "Police"
@ -199,11 +205,19 @@ msgstr "De"
msgid "Generate month" msgid "Generate month"
msgstr "Générer mois" msgstr "Générer mois"
#: src/controller/KissCount.cpp:241
msgid "Groceries"
msgstr "Courses"
#: src/controller/KissCount.cpp:243
msgid "Hobbies"
msgstr "Loisirs"
#: src/view/AccountPanel.cpp:121 #: src/view/AccountPanel.cpp:121
msgid "Initial value" msgid "Initial value"
msgstr "Valeur initiale" msgstr "Valeur initiale"
#: src/view/PreferencesPanel.cpp:423 #: src/view/PreferencesPanel.cpp:454
msgid "Invalid name" msgid "Invalid name"
msgstr "Nom invalide" msgstr "Nom invalide"
@ -215,7 +229,7 @@ msgstr "Ancien mot de passe invalide"
msgid "Invalid password" msgid "Invalid password"
msgstr "Mot de passe invalide" msgstr "Mot de passe invalide"
#: src/view/PreferencesPanel.cpp:251 #: src/view/PreferencesPanel.cpp:282
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 !"
@ -223,17 +237,22 @@ msgstr "Il doit y avoir au moins un compte !"
msgid "It must be at least one month !" msgid "It must be at least one month !"
msgstr "Il doit rester au mois un mois" msgstr "Il doit rester au mois un mois"
#: src/view/PreferencesPanel.cpp:48 #: src/view/PreferencesPanel.cpp:50
msgid "Kill me" msgid "Kill me"
msgstr "Kill me" msgstr "Kill me"
#: src/view/PreferencesPanel.cpp:484
#: src/view/PreferencesPanel.cpp:487
msgid "KissCount"
msgstr "KissCount"
#: src/view/ButtonPanel.cpp:71 #: src/view/ButtonPanel.cpp:71
msgid "" msgid ""
"KissCount v0.1\n" "KissCount v0.1\n"
"\n" "\n"
"Personal accounting software\n" "Personal accounting software\n"
"\n" "\n"
"Copyright (C) 2010 Grégory Soutadé" "Copyright (C) 2010 Grégory Soutadé"
msgstr "" msgstr ""
"KissCount v0.1\n" "KissCount v0.1\n"
"\n" "\n"
@ -241,13 +260,25 @@ msgstr ""
"\n" "\n"
"Copyright (C) 2010 Grégory Soutadé" "Copyright (C) 2010 Grégory Soutadé"
#: src/view/PreferencesPanel.cpp:40 #: src/view/PreferencesPanel.cpp:34
#: src/view/PreferencesPanel.cpp:95 msgid "Language"
#: src/view/PreferencesPanel.cpp:146 msgstr "Langue"
#: src/view/PreferencesPanel.cpp:487
msgid "Language not changed"
msgstr "Langue non changée"
#: src/view/PreferencesPanel.cpp:484
msgid "Language successfully changed, please go to another panel"
msgstr "Langue changée, allez sur un autre panneau pour rendre le changement effectif"
#: src/view/PreferencesPanel.cpp:42
#: src/view/PreferencesPanel.cpp:112
#: src/view/PreferencesPanel.cpp:163
msgid "Name" msgid "Name"
msgstr "Nom" msgstr "Nom"
#: src/view/PreferencesPanel.cpp:435 #: src/view/PreferencesPanel.cpp:466
msgid "Name changed" msgid "Name changed"
msgstr "Nom changé" msgstr "Nom changé"
@ -264,9 +295,9 @@ msgstr "Nouveau mot de passe"
msgid "No database found, creating a new one" msgid "No database found, creating a new one"
msgstr "Aucune base de données trouvée, création d'une nouvelle" msgstr "Aucune base de données trouvée, création d'une nouvelle"
#: src/view/PreferencesPanel.cpp:96 #: src/view/PreferencesPanel.cpp:113
msgid "Number" msgid "Number"
msgstr "Nombre" msgstr "Numéro de compte"
#: src/view/PasswordDialog.cpp:36 #: src/view/PasswordDialog.cpp:36
#: src/view/GenerateDialog.cpp:40 #: src/view/GenerateDialog.cpp:40
@ -278,10 +309,18 @@ msgstr "OK"
msgid "Old password " msgid "Old password "
msgstr "Ancien mot de passe" msgstr "Ancien mot de passe"
#: src/controller/KissCount.cpp:245
msgid "Operating exepense"
msgstr "Frais de fonctionnement"
#: src/view/ButtonPanel.cpp:26 #: src/view/ButtonPanel.cpp:26
msgid "Operations" msgid "Operations"
msgstr "Opérations" msgstr "Opérations"
#: src/controller/KissCount.cpp:249
msgid "Other"
msgstr "Autres"
#: src/view/UsersDialog.cpp:24 #: src/view/UsersDialog.cpp:24
msgid "Password " msgid "Password "
msgstr "Mot de passe" msgstr "Mot de passe"
@ -294,8 +333,8 @@ msgstr "Mot de passe changé"
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:437 #: src/view/PreferencesPanel.cpp:468
#: src/view/PreferencesPanel.cpp:448 #: src/view/PreferencesPanel.cpp:493
#: src/view/ButtonPanel.cpp:29 #: src/view/ButtonPanel.cpp:29
msgid "Preferences" msgid "Preferences"
msgstr "Préférences" msgstr "Préférences"
@ -320,7 +359,7 @@ msgstr "Chercher"
msgid "Serie 1" msgid "Serie 1"
msgstr "Série 1" msgstr "Série 1"
#: src/view/PreferencesPanel.cpp:97 #: src/view/PreferencesPanel.cpp:114
msgid "Shared" msgid "Shared"
msgstr "Partagé" msgstr "Partagé"
@ -340,17 +379,21 @@ msgstr "Total Crédit"
msgid "Total Debit" msgid "Total Debit"
msgstr "Total Débit" msgstr "Total Débit"
#: src/controller/KissCount.cpp:247
msgid "Unexpected"
msgstr "Exceptionnel"
#: src/model/User.cpp:27 #: src/model/User.cpp:27
#: src/model/User.cpp:41 #: src/model/User.cpp:41
#: src/model/User.cpp:61 #: src/model/User.cpp:61
msgid "Unknown" msgid "Unknown"
msgstr "Inconnu" msgstr "Inconnu"
#: src/view/PreferencesPanel.cpp:30 #: src/view/PreferencesPanel.cpp:31
msgid "User" msgid "User"
msgstr "Utilisateur" msgstr "Utilisateur"
#: src/view/PreferencesPanel.cpp:429 #: src/view/PreferencesPanel.cpp:460
#: src/view/UsersDialog.cpp:19 #: src/view/UsersDialog.cpp:19
#: src/view/UsersDialog.cpp:95 #: src/view/UsersDialog.cpp:95
msgid "User " msgid "User "
@ -360,51 +403,51 @@ msgstr "Utilisateur"
msgid "Users" msgid "Users"
msgstr "Utilisateurs" msgstr "Utilisateurs"
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:77
msgid "april" msgid "april"
msgstr "avril" msgstr "avril"
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:81
msgid "august" msgid "august"
msgstr "août" msgstr "août"
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:85
msgid "december" msgid "december"
msgstr "décembre" msgstr "décembre"
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:75
msgid "february" msgid "february"
msgstr "février" msgstr "février"
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:74
msgid "january" msgid "january"
msgstr "janvier" msgstr "janvier"
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:80
msgid "july" msgid "july"
msgstr "juillet" msgstr "juillet"
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:79
msgid "june" msgid "june"
msgstr "juin" msgstr "juin"
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:76
msgid "march" msgid "march"
msgstr "mars" msgstr "mars"
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:78
msgid "may" msgid "may"
msgstr "mai" msgstr "mai"
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:84
msgid "november" msgid "november"
msgstr "novembre" msgstr "novembre"
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:83
msgid "october" msgid "october"
msgstr "octobre" msgstr "octobre"
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:82
msgid "september" msgid "september"
msgstr "septembre" msgstr "septembre"

176
ressources/po/kisscount.pot
View File

@ -3,28 +3,25 @@
# This file is distributed under the same license as the PACKAGE package. # This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# #
#, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-07-04 18:22+0200\n" "POT-Creation-Date: 2010-07-08 19:24+0200\n"
"PO-Revision-Date: 2010-07-04 19:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Soutadé <soutade@gmail.com>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: \n" "Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"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"
"X-Poedit-Language: English\n"
"X-Poedit-Country: UNITED KINGDOM\n"
#: src/view/PreferencesPanel.cpp:448 #: src/view/PreferencesPanel.cpp:493
msgid " - " msgid " - "
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:284 #: src/view/PreferencesPanel.cpp:315 src/view/PreferencesPanel.cpp:415
#: src/view/PreferencesPanel.cpp:384 #: src/view/PreferencesPanel.cpp:460 src/view/UsersDialog.cpp:95
#: src/view/PreferencesPanel.cpp:429
#: src/view/UsersDialog.cpp:95
msgid " already exists" msgid " already exists"
msgstr "" msgstr ""
@ -36,7 +33,7 @@ msgstr ""
msgid " operations ?" msgid " operations ?"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:455 #: src/view/PreferencesPanel.cpp:500
msgid " profil ?" msgid " profil ?"
msgstr "" msgstr ""
@ -48,7 +45,7 @@ msgstr ""
msgid "Account" msgid "Account"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:284 #: src/view/PreferencesPanel.cpp:315
msgid "Account " msgid "Account "
msgstr "" msgstr ""
@ -60,28 +57,25 @@ msgstr ""
msgid "Account number" msgid "Account number"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:31 #: src/view/PreferencesPanel.cpp:32
msgid "Accounts" msgid "Accounts"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:255 #: src/view/PreferencesPanel.cpp:286 src/view/PreferencesPanel.cpp:500
#: src/view/PreferencesPanel.cpp:455
#: src/view/AccountPanel.cpp:974 #: src/view/AccountPanel.cpp:974
msgid "Are you sure want to delete " msgid "Are you sure want to delete "
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:355 #: src/view/PreferencesPanel.cpp:386 src/view/AccountPanel.cpp:684
#: src/view/AccountPanel.cpp:684
msgid "Are you sure want to delete : \n" msgid "Are you sure want to delete : \n"
msgstr "" msgstr ""
#: src/view/PasswordDialog.cpp:37 #: src/view/PasswordDialog.cpp:37 src/view/GenerateDialog.cpp:41
#: src/view/GenerateDialog.cpp:41
#: src/view/UsersDialog.cpp:32 #: src/view/UsersDialog.cpp:32
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:32 #: src/view/PreferencesPanel.cpp:33
msgid "Categories" msgid "Categories"
msgstr "" msgstr ""
@ -89,15 +83,15 @@ msgstr ""
msgid "Category" msgid "Category"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:384 #: src/view/PreferencesPanel.cpp:415
msgid "Category " msgid "Category "
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:46 #: src/view/PreferencesPanel.cpp:48
msgid "Change Name" msgid "Change Name"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:47 #: src/view/PreferencesPanel.cpp:49
msgid "Change Password" msgid "Change Password"
msgstr "" msgstr ""
@ -109,7 +103,7 @@ msgstr ""
msgid "Change user" msgid "Change user"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:147 #: src/view/PreferencesPanel.cpp:164
msgid "Color" msgid "Color"
msgstr "" msgstr ""
@ -145,12 +139,11 @@ msgstr ""
msgid "Debit" msgid "Debit"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:98 #: src/view/PreferencesPanel.cpp:115
msgid "Default" msgid "Default"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:99 #: src/view/PreferencesPanel.cpp:116 src/view/PreferencesPanel.cpp:166
#: src/view/PreferencesPanel.cpp:149
#: src/view/AccountPanel.cpp:833 #: src/view/AccountPanel.cpp:833
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
@ -159,18 +152,12 @@ msgstr ""
msgid "Description" msgid "Description"
msgstr "" msgstr ""
#: src/model/Database.cpp:83 #: src/model/Database.cpp:83 src/model/Database.cpp:106
#: src/model/Database.cpp:106 #: src/view/PasswordDialog.cpp:53 src/view/PasswordDialog.cpp:59
#: src/view/PasswordDialog.cpp:53 #: src/view/PreferencesPanel.cpp:282 src/view/PreferencesPanel.cpp:315
#: src/view/PasswordDialog.cpp:59 #: src/view/PreferencesPanel.cpp:415 src/view/PreferencesPanel.cpp:454
#: src/view/PreferencesPanel.cpp:251 #: src/view/PreferencesPanel.cpp:460 src/view/AccountPanel.cpp:970
#: src/view/PreferencesPanel.cpp:284 #: src/view/UsersDialog.cpp:67 src/view/UsersDialog.cpp:95
#: src/view/PreferencesPanel.cpp:384
#: src/view/PreferencesPanel.cpp:423
#: src/view/PreferencesPanel.cpp:429
#: src/view/AccountPanel.cpp:970
#: src/view/UsersDialog.cpp:67
#: src/view/UsersDialog.cpp:95
msgid "Error" msgid "Error"
msgstr "" msgstr ""
@ -182,11 +169,15 @@ msgstr ""
msgid "Final value" msgid "Final value"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:406 #: src/controller/KissCount.cpp:239
msgid "Fix"
msgstr ""
#: src/model/Database.cpp:239 src/view/AccountPanel.cpp:406
msgid "Fixe" msgid "Fixe"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:148 #: src/view/PreferencesPanel.cpp:165
msgid "Font" msgid "Font"
msgstr "" msgstr ""
@ -194,16 +185,23 @@ msgstr ""
msgid "From " msgid "From "
msgstr "" msgstr ""
#: src/view/GenerateDialog.cpp:12 #: src/view/GenerateDialog.cpp:12 src/view/AccountPanel.cpp:830
#: src/view/AccountPanel.cpp:830
msgid "Generate month" msgid "Generate month"
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:241
msgid "Groceries"
msgstr ""
#: src/controller/KissCount.cpp:243
msgid "Hobbies"
msgstr ""
#: src/view/AccountPanel.cpp:121 #: src/view/AccountPanel.cpp:121
msgid "Initial value" msgid "Initial value"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:423 #: src/view/PreferencesPanel.cpp:454
msgid "Invalid name" msgid "Invalid name"
msgstr "" msgstr ""
@ -215,7 +213,7 @@ msgstr ""
msgid "Invalid password" msgid "Invalid password"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:251 #: src/view/PreferencesPanel.cpp:282
msgid "It must be at least one account !" msgid "It must be at least one account !"
msgstr "" msgstr ""
@ -223,10 +221,14 @@ msgstr ""
msgid "It must be at least one month !" msgid "It must be at least one month !"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:48 #: src/view/PreferencesPanel.cpp:50
msgid "Kill me" msgid "Kill me"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:484 src/view/PreferencesPanel.cpp:487
msgid "KissCount"
msgstr ""
#: src/view/ButtonPanel.cpp:71 #: src/view/ButtonPanel.cpp:71
msgid "" msgid ""
"KissCount v0.1\n" "KissCount v0.1\n"
@ -236,18 +238,28 @@ msgid ""
"Copyright (C) 2010 Grégory Soutadé" "Copyright (C) 2010 Grégory Soutadé"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:40 #: src/view/PreferencesPanel.cpp:34
#: src/view/PreferencesPanel.cpp:95 msgid "Language"
#: src/view/PreferencesPanel.cpp:146 msgstr ""
#: src/view/PreferencesPanel.cpp:487
msgid "Language not changed"
msgstr ""
#: src/view/PreferencesPanel.cpp:484
msgid "Language successfully changed, please go to another panel"
msgstr ""
#: src/view/PreferencesPanel.cpp:42 src/view/PreferencesPanel.cpp:112
#: src/view/PreferencesPanel.cpp:163
msgid "Name" msgid "Name"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:435 #: src/view/PreferencesPanel.cpp:466
msgid "Name changed" msgid "Name changed"
msgstr "" msgstr ""
#: src/view/UsersDialog.cpp:33 #: src/view/UsersDialog.cpp:33 src/view/UsersDialog.cpp:84
#: src/view/UsersDialog.cpp:84
msgid "New User" msgid "New User"
msgstr "" msgstr ""
@ -259,12 +271,11 @@ msgstr ""
msgid "No database found, creating a new one" msgid "No database found, creating a new one"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:96 #: src/view/PreferencesPanel.cpp:113
msgid "Number" msgid "Number"
msgstr "" msgstr ""
#: src/view/PasswordDialog.cpp:36 #: src/view/PasswordDialog.cpp:36 src/view/GenerateDialog.cpp:40
#: src/view/GenerateDialog.cpp:40
#: src/view/UsersDialog.cpp:31 #: src/view/UsersDialog.cpp:31
msgid "OK" msgid "OK"
msgstr "" msgstr ""
@ -273,10 +284,18 @@ msgstr ""
msgid "Old password " msgid "Old password "
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:245
msgid "Operating exepense"
msgstr ""
#: src/view/ButtonPanel.cpp:26 #: src/view/ButtonPanel.cpp:26
msgid "Operations" msgid "Operations"
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:249
msgid "Other"
msgstr ""
#: src/view/UsersDialog.cpp:24 #: src/view/UsersDialog.cpp:24
msgid "Password " msgid "Password "
msgstr "" msgstr ""
@ -289,8 +308,7 @@ msgstr ""
msgid "Please retype new password" msgid "Please retype new password"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:437 #: src/view/PreferencesPanel.cpp:468 src/view/PreferencesPanel.cpp:493
#: src/view/PreferencesPanel.cpp:448
#: src/view/ButtonPanel.cpp:29 #: src/view/ButtonPanel.cpp:29
msgid "Preferences" msgid "Preferences"
msgstr "" msgstr ""
@ -315,7 +333,7 @@ msgstr ""
msgid "Serie 1" msgid "Serie 1"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:97 #: src/view/PreferencesPanel.cpp:114
msgid "Shared" msgid "Shared"
msgstr "" msgstr ""
@ -335,18 +353,19 @@ msgstr ""
msgid "Total Debit" msgid "Total Debit"
msgstr "" msgstr ""
#: src/model/User.cpp:27 #: src/controller/KissCount.cpp:247
#: src/model/User.cpp:41 msgid "Unexpected"
#: src/model/User.cpp:61 msgstr ""
#: src/model/User.cpp:27 src/model/User.cpp:41 src/model/User.cpp:61
msgid "Unknown" msgid "Unknown"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:30 #: src/view/PreferencesPanel.cpp:31
msgid "User" msgid "User"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:429 #: src/view/PreferencesPanel.cpp:460 src/view/UsersDialog.cpp:19
#: src/view/UsersDialog.cpp:19
#: src/view/UsersDialog.cpp:95 #: src/view/UsersDialog.cpp:95
msgid "User " msgid "User "
msgstr "" msgstr ""
@ -355,51 +374,50 @@ msgstr ""
msgid "Users" msgid "Users"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:77
msgid "april" msgid "april"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:81
msgid "august" msgid "august"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:85
msgid "december" msgid "december"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:75
msgid "february" msgid "february"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:74
msgid "january" msgid "january"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:80
msgid "july" msgid "july"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:79
msgid "june" msgid "june"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:76
msgid "march" msgid "march"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:78
msgid "may" msgid "may"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:84
msgid "november" msgid "november"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:83
msgid "october" msgid "october"
msgstr "" msgstr ""
#: src/view/wxUI.cpp:3 #: src/view/wxUI.cpp:82
msgid "september" msgid "september"
msgstr "" msgstr ""

4
src/controller/KissCount.cpp
View File

@ -240,9 +240,9 @@ void KissCount::NewUser(const wxString& name)
AddCategory(cat); AddCategory(cat);
cat.parent = wxT("0") ; cat.name = _("Groceries") ; cat.color = OWN_GREEN; cat.parent = wxT("0") ; cat.name = _("Groceries") ; cat.color = OWN_GREEN;
AddCategory(cat); AddCategory(cat);
cat.parent = wxT("0") ; cat.name = _("Loisirs") ; cat.color = OWN_GREEN; cat.parent = wxT("0") ; cat.name = _("Hobbies") ; cat.color = OWN_GREEN;
AddCategory(cat); AddCategory(cat);
cat.parent = wxT("0") ; cat.name = _("Normal life") ; cat.color = OWN_GREEN; cat.parent = wxT("0") ; cat.name = _("Operating exepense") ; cat.color = OWN_GREEN;
AddCategory(cat); AddCategory(cat);
cat.parent = wxT("0") ; cat.name = _("Unexpected") ; cat.color = OWN_GREEN; cat.parent = wxT("0") ; cat.name = _("Unexpected") ; cat.color = OWN_GREEN;
AddCategory(cat); AddCategory(cat);

6
src/model/Database.cpp
View File

@ -236,7 +236,7 @@ User* Database::LoadUser(const wxString& name)
category.name = set.GetAsString(wxT("name")); category.name = set.GetAsString(wxT("name"));
category.color = wxColour(set.GetAsString(wxT("color"))); category.color = wxColour(set.GetAsString(wxT("color")));
category.font = set.GetAsString(wxT("font")); category.font = set.GetAsString(wxT("font"));
if (category.name != _("Fixe")) if (category.name != _("Fix"))
user->_categories.push_back(category); user->_categories.push_back(category);
else else
user->_categories.insert(user->_categories.begin(), category); user->_categories.insert(user->_categories.begin(), category);
@ -429,7 +429,7 @@ void Database::DeleteOperations(User* user, int month, int year)
req += wxT("', '") + it->id ; req += wxT("', '") + it->id ;
} }
req += wxT("')"); req += wxT("')");
req += wxT(" OR user='") + user->_id + wxT("')"); req += wxT(" OR user='") + user->_id + wxT("'");
req += wxT(" AND year='") + wxString::Format(wxT("%d"), year) + wxT("'"); req += wxT(" AND year='") + wxString::Format(wxT("%d"), year) + wxT("'");
if (month != -1) if (month != -1)
req += wxT(" AND month='") + wxString::Format(wxT("%d"), month) + wxT("'"); req += wxT(" AND month='") + wxString::Format(wxT("%d"), month) + wxT("'");
@ -849,7 +849,7 @@ void Database::KillMe(User* user)
req += wxT("', '") + it->id ; req += wxT("', '") + it->id ;
} }
req += wxT("')"); req += wxT("')");
req += wxT(" OR user='") + user->_id + wxT("')"); req += wxT(" OR user='") + user->_id + wxT("'");
EXECUTE_SQL_UPDATE(req, ); EXECUTE_SQL_UPDATE(req, );
} }

2
src/view/AccountPanel.cpp
View File

@ -403,7 +403,7 @@ void AccountPanel::InsertOperation(User* user, Operation* op, int line, bool fix
if (fix) if (fix)
{ {
_fixCosts++; _fixCosts++;
_grid->SetCellValue(line, CATEGORY, _("Fixe")); _grid->SetCellValue(line, CATEGORY, _("Fix"));
_grid->SetReadOnly(line, CATEGORY); _grid->SetReadOnly(line, CATEGORY);
} }