Searchs aren't case sensitive enough. Default categories in native language (even if switching language at runtime)

This commit is contained in:
Grégory Soutadé 2011-02-15 19:17:18 +01:00
parent bf417a503d
commit 92252f33c3
9 changed files with 148 additions and 132 deletions

View File

@ -1,4 +1,4 @@
v0.2_dev (14/02/2011) v0.2_dev (15/02/2011)
** User ** ** User **
Better use of sizers (so better interface!) Better use of sizers (so better interface!)
@ -9,6 +9,8 @@ v0.2_dev (14/02/2011)
Possibility to find operations with unknown category/account Possibility to find operations with unknown category/account
Possibility to work on multiple operations (rename, change category, change account) Possibility to work on multiple operations (rename, change category, change account)
Add virtual accounts Add virtual accounts
Searchs aren't case sensitive enough
Default categories in native language (even if switching language at runtime)
** Dev ** ** Dev **
Use a factory to create panels (prepare for plug-in) Use a factory to create panels (prepare for plug-in)

Binary file not shown.

View File

@ -2,7 +2,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-02-13 19:27+0100\n" "POT-Creation-Date: 2011-02-15 19:15+0100\n"
"PO-Revision-Date: \n" "PO-Revision-Date: \n"
"Last-Translator: Soutadé <soutade@gmail.com>\n" "Last-Translator: Soutadé <soutade@gmail.com>\n"
"Language-Team: \n" "Language-Team: \n"
@ -20,16 +20,16 @@ msgstr ""
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
# #
#: src/view/StatsPanel.cpp:358 #: src/view/StatsPanel.cpp:358
#: src/view/PreferencesPanel.cpp:817 #: src/view/PreferencesPanel.cpp:831
msgid " - " msgid " - "
msgstr " - " msgstr " - "
#: src/view/UsersDialog.cpp:120 #: src/view/UsersDialog.cpp:120
#: src/view/PreferencesPanel.cpp:482 #: src/view/PreferencesPanel.cpp:495
#: src/view/PreferencesPanel.cpp:502 #: src/view/PreferencesPanel.cpp:515
#: src/view/PreferencesPanel.cpp:712 #: src/view/PreferencesPanel.cpp:726
#: src/view/PreferencesPanel.cpp:731 #: src/view/PreferencesPanel.cpp:745
#: src/view/PreferencesPanel.cpp:775 #: src/view/PreferencesPanel.cpp:789
msgid " already exists" msgid " already exists"
msgstr " existe déjà" msgstr " existe déjà"
@ -41,11 +41,11 @@ msgstr " entrées trouvées"
msgid " not found, aborting" msgid " not found, aborting"
msgstr " non trouvé, arrêt" msgstr " non trouvé, arrêt"
#: src/view/AccountPanel.cpp:757 #: src/view/AccountPanel.cpp:766
msgid " operations ?" msgid " operations ?"
msgstr " opérations ?" msgstr " opérations ?"
#: src/view/PreferencesPanel.cpp:824 #: src/view/PreferencesPanel.cpp:838
msgid " profil ?" msgid " profil ?"
msgstr " profil ?" msgstr " profil ?"
@ -62,12 +62,12 @@ msgstr "1 entrée trouvée"
msgid "Account" msgid "Account"
msgstr "Compte" msgstr "Compte"
#: src/view/PreferencesPanel.cpp:482 #: src/view/PreferencesPanel.cpp:495
#: src/view/PreferencesPanel.cpp:502 #: src/view/PreferencesPanel.cpp:515
msgid "Account " msgid "Account "
msgstr "Le compte " msgstr "Le compte "
#: src/controller/KissCount.cpp:363 #: src/controller/KissCount.cpp:370
msgid "Account 1" msgid "Account 1"
msgstr "Compte 1" msgstr "Compte 1"
@ -92,8 +92,8 @@ msgstr "Montant min"
msgid "Amount to" msgid "Amount to"
msgstr "Montant max" msgstr "Montant max"
#: src/view/PreferencesPanel.cpp:824 #: src/view/PreferencesPanel.cpp:838
#: src/view/AccountPanel.cpp:752 #: src/view/AccountPanel.cpp:761
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 "
@ -101,15 +101,15 @@ msgstr "Etes vous sûr de vouloir supprimer "
msgid "Are you sure want to delete : \n" msgid "Are you sure want to delete : \n"
msgstr "Etes vous sûr de vouloir supprimer : \n" msgstr "Etes vous sûr de vouloir supprimer : \n"
#: src/view/PreferencesPanel.cpp:361 #: src/view/PreferencesPanel.cpp:368
msgid "Ascending" msgid "Ascending"
msgstr "Croissant" msgstr "Croissant"
#: src/view/PreferencesPanel.cpp:285 #: src/view/PreferencesPanel.cpp:292
msgid "Background color" msgid "Background color"
msgstr "Couleur d'arrière plan" msgstr "Couleur d'arrière plan"
#: src/view/PreferencesPanel.cpp:199 #: src/view/PreferencesPanel.cpp:200
msgid "Blocked" msgid "Blocked"
msgstr "Bloqué" msgstr "Bloqué"
@ -119,13 +119,13 @@ msgstr "Bloqué"
msgid "Cancel" msgid "Cancel"
msgstr "Annuler" msgstr "Annuler"
#: src/view/grid/GridAccount.cpp:1267 #: src/view/grid/GridAccount.cpp:1271
#: src/view/grid/GridAccount.cpp:1274 #: src/view/grid/GridAccount.cpp:1278
msgid "Cannot group these operations" msgid "Cannot group these operations"
msgstr "Impossible de grouper ces opérations" msgstr "Impossible de grouper ces opérations"
#: src/view/grid/GridAccount.cpp:1393 #: src/view/grid/GridAccount.cpp:1397
#: src/view/grid/GridAccount.cpp:1399 #: src/view/grid/GridAccount.cpp:1403
msgid "Cannot ungroup these operations" msgid "Cannot ungroup these operations"
msgstr "Impossible de dégrouper ces opérations" msgstr "Impossible de dégrouper ces opérations"
@ -138,8 +138,8 @@ msgstr "Catégories"
msgid "Category" msgid "Category"
msgstr "Catégorie" msgstr "Catégorie"
#: src/view/PreferencesPanel.cpp:712 #: src/view/PreferencesPanel.cpp:726
#: src/view/PreferencesPanel.cpp:731 #: src/view/PreferencesPanel.cpp:745
msgid "Category " msgid "Category "
msgstr "La catégorie " msgstr "La catégorie "
@ -224,13 +224,13 @@ msgstr "Débit"
msgid "Default" msgid "Default"
msgstr "Défaut" msgstr "Défaut"
#: src/view/PreferencesPanel.cpp:200 #: src/view/PreferencesPanel.cpp:201
#: src/view/PreferencesPanel.cpp:288 #: src/view/PreferencesPanel.cpp:295
#: src/view/AccountPanel.cpp:611 #: src/view/AccountPanel.cpp:620
msgid "Delete" msgid "Delete"
msgstr "Supprimer" msgstr "Supprimer"
#: src/view/PreferencesPanel.cpp:362 #: src/view/PreferencesPanel.cpp:369
msgid "Descending" msgid "Descending"
msgstr "Décroissant" msgstr "Décroissant"
@ -249,20 +249,20 @@ msgstr "Nouvelle description"
#: src/view/SearchPanel.cpp:189 #: src/view/SearchPanel.cpp:189
#: src/view/SearchPanel.cpp:203 #: src/view/SearchPanel.cpp:203
#: src/view/SearchPanel.cpp:214 #: src/view/SearchPanel.cpp:214
#: src/view/PreferencesPanel.cpp:422 #: src/view/PreferencesPanel.cpp:435
#: src/view/PreferencesPanel.cpp:482 #: src/view/PreferencesPanel.cpp:495
#: src/view/PreferencesPanel.cpp:502 #: src/view/PreferencesPanel.cpp:515
#: src/view/PreferencesPanel.cpp:712 #: src/view/PreferencesPanel.cpp:726
#: src/view/PreferencesPanel.cpp:731 #: src/view/PreferencesPanel.cpp:745
#: src/view/PreferencesPanel.cpp:769 #: src/view/PreferencesPanel.cpp:783
#: src/view/PreferencesPanel.cpp:775 #: src/view/PreferencesPanel.cpp:789
#: src/view/PasswordDialog.cpp:72 #: src/view/PasswordDialog.cpp:72
#: src/view/PasswordDialog.cpp:78 #: src/view/PasswordDialog.cpp:78
#: src/view/AccountPanel.cpp:748 #: src/view/AccountPanel.cpp:757
#: src/view/grid/GridAccount.cpp:1267 #: src/view/grid/GridAccount.cpp:1271
#: src/view/grid/GridAccount.cpp:1274 #: src/view/grid/GridAccount.cpp:1278
#: src/view/grid/GridAccount.cpp:1393 #: src/view/grid/GridAccount.cpp:1397
#: src/view/grid/GridAccount.cpp:1399 #: src/view/grid/GridAccount.cpp:1403
#: src/view/grid/wxGridCellFormulaEditor.cpp:69 #: src/view/grid/wxGridCellFormulaEditor.cpp:69
#: src/model/Database.cpp:42 #: src/model/Database.cpp:42
#: src/model/Database.cpp:49 #: src/model/Database.cpp:49
@ -284,15 +284,15 @@ msgstr "Valeur finale"
#: src/view/SearchPanel.cpp:84 #: src/view/SearchPanel.cpp:84
#: src/view/grid/GridAccount.cpp:329 #: src/view/grid/GridAccount.cpp:329
#: src/controller/KissCount.cpp:379 #: src/controller/KissCount.cpp:361
msgid "Fix" msgid "Fix"
msgstr "Fixe" msgstr "Fixe"
#: src/view/PreferencesPanel.cpp:287 #: src/view/PreferencesPanel.cpp:294
msgid "Font" msgid "Font"
msgstr "Police" msgstr "Police"
#: src/view/PreferencesPanel.cpp:286 #: src/view/PreferencesPanel.cpp:293
msgid "Foreground color" msgid "Foreground color"
msgstr "Couleur d'avant plan" msgstr "Couleur d'avant plan"
@ -305,11 +305,11 @@ msgid "From "
msgstr "A partir de " msgstr "A partir de "
#: src/view/GenerateDialog.cpp:31 #: src/view/GenerateDialog.cpp:31
#: src/view/AccountPanel.cpp:608 #: src/view/AccountPanel.cpp:617
msgid "Generate month" msgid "Generate month"
msgstr "Générer mois" msgstr "Générer mois"
#: src/controller/KissCount.cpp:381 #: src/controller/KissCount.cpp:361
msgid "Groceries" msgid "Groceries"
msgstr "Courses" msgstr "Courses"
@ -317,7 +317,7 @@ msgstr "Courses"
msgid "Group" msgid "Group"
msgstr "Grouper" msgstr "Grouper"
#: src/controller/KissCount.cpp:383 #: src/controller/KissCount.cpp:361
msgid "Hobbies" msgid "Hobbies"
msgstr "Loisirs" msgstr "Loisirs"
@ -345,7 +345,7 @@ msgstr "Intervalle de temps invalide"
msgid "Invalid formula !" msgid "Invalid formula !"
msgstr "Formule invalide !" msgstr "Formule invalide !"
#: src/view/PreferencesPanel.cpp:769 #: src/view/PreferencesPanel.cpp:783
msgid "Invalid name" msgid "Invalid name"
msgstr "Nom invalide" msgstr "Nom invalide"
@ -361,11 +361,11 @@ msgstr "Mot de passe invalide"
msgid "Invalide date range" msgid "Invalide date range"
msgstr "Intervalle de temps invalide" msgstr "Intervalle de temps invalide"
#: src/view/PreferencesPanel.cpp:422 #: src/view/PreferencesPanel.cpp:435
msgid "It must be at least one account !" msgid "It must be at least one account !"
msgstr "Il doit y avoir au moins un compte !" msgstr "Il doit y avoir au moins un compte !"
#: src/view/AccountPanel.cpp:748 #: src/view/AccountPanel.cpp:757
msgid "It must be at least one month !" msgid "It must be at least one month !"
msgstr "Il doit rester au moins un mois" msgstr "Il doit rester au moins un mois"
@ -374,9 +374,9 @@ msgid "Kill me"
msgstr "Kill me" msgstr "Kill me"
#: src/view/StatsPanel.cpp:377 #: src/view/StatsPanel.cpp:377
#: src/view/PreferencesPanel.cpp:809 #: src/view/PreferencesPanel.cpp:823
#: src/view/PreferencesPanel.cpp:812 #: src/view/PreferencesPanel.cpp:826
#: src/model/Database_Update.cpp:127 #: src/model/Database_Update.cpp:135
msgid "KissCount" msgid "KissCount"
msgstr "KissCount" msgstr "KissCount"
@ -384,21 +384,21 @@ msgstr "KissCount"
msgid "Language" msgid "Language"
msgstr "Langue" msgstr "Langue"
#: src/view/PreferencesPanel.cpp:812 #: src/view/PreferencesPanel.cpp:826
msgid "Language not changed" msgid "Language not changed"
msgstr "Langue non changée" msgstr "Langue non changée"
#: src/view/PreferencesPanel.cpp:809 #: src/view/PreferencesPanel.cpp:823
msgid "Language successfully changed, please go to another panel" msgid "Language successfully changed, please go to another panel"
msgstr "Langue changée, allez sur un autre panneau pour rendre le changement effectif" msgstr "Langue changée, allez sur un autre panneau pour rendre le changement effectif"
#: src/view/PreferencesPanel.cpp:72 #: src/view/PreferencesPanel.cpp:72
#: src/view/PreferencesPanel.cpp:196 #: src/view/PreferencesPanel.cpp:196
#: src/view/PreferencesPanel.cpp:284 #: src/view/PreferencesPanel.cpp:291
msgid "Name" msgid "Name"
msgstr "Nom" msgstr "Nom"
#: src/view/PreferencesPanel.cpp:781 #: src/view/PreferencesPanel.cpp:795
msgid "Name changed" msgid "Name changed"
msgstr "Nom changé" msgstr "Nom changé"
@ -429,8 +429,8 @@ msgstr "Courantes"
#: src/view/SearchPanel.cpp:304 #: src/view/SearchPanel.cpp:304
#: src/view/SearchPanel.cpp:346 #: src/view/SearchPanel.cpp:346
#: src/view/PreferencesPanel.cpp:427 #: src/view/PreferencesPanel.cpp:440
#: src/view/PreferencesPanel.cpp:687 #: src/view/PreferencesPanel.cpp:701
msgid "None" msgid "None"
msgstr "Aucun" msgstr "Aucun"
@ -452,8 +452,8 @@ msgstr "OK"
msgid "Old password " msgid "Old password "
msgstr "Ancien mot de passe " msgstr "Ancien mot de passe "
#: src/controller/KissCount.cpp:385 #: src/controller/KissCount.cpp:361
msgid "Operating exepense" msgid "Operating expense"
msgstr "Fonctionnement" msgstr "Fonctionnement"
#: src/view/PreferencesPanel.cpp:63 #: src/view/PreferencesPanel.cpp:63
@ -465,7 +465,7 @@ msgstr "Ordre des opérations"
msgid "Operations" msgid "Operations"
msgstr "Opérations" msgstr "Opérations"
#: src/controller/KissCount.cpp:389 #: src/controller/KissCount.cpp:362
msgid "Other" msgid "Other"
msgstr "Autres" msgstr "Autres"
@ -500,8 +500,8 @@ msgid "Please retype new password"
msgstr "Re entrez le mot de passe" msgstr "Re entrez le mot de passe"
#: src/view/PreferencesPanel.cpp:184 #: src/view/PreferencesPanel.cpp:184
#: src/view/PreferencesPanel.cpp:783 #: src/view/PreferencesPanel.cpp:797
#: src/view/PreferencesPanel.cpp:817 #: src/view/PreferencesPanel.cpp:831
msgid "Preferences" msgid "Preferences"
msgstr "Préférences" msgstr "Préférences"
@ -564,7 +564,7 @@ msgstr "Dégrouper"
msgid "Unable to open Database" msgid "Unable to open Database"
msgstr "Impossible d'ouvrir la base de données" msgstr "Impossible d'ouvrir la base de données"
#: src/controller/KissCount.cpp:387 #: src/controller/KissCount.cpp:362
msgid "Unexpected" msgid "Unexpected"
msgstr "Exceptionnel" msgstr "Exceptionnel"
@ -582,7 +582,7 @@ msgstr "Utilisateur"
#: src/view/UsersDialog.cpp:39 #: src/view/UsersDialog.cpp:39
#: src/view/UsersDialog.cpp:120 #: src/view/UsersDialog.cpp:120
#: src/view/PreferencesPanel.cpp:775 #: src/view/PreferencesPanel.cpp:789
msgid "User " msgid "User "
msgstr "Utilisateur " msgstr "Utilisateur "
@ -590,19 +590,23 @@ msgstr "Utilisateur "
msgid "Users" msgid "Users"
msgstr "Utilisateurs" msgstr "Utilisateurs"
#: src/view/grid/GridAccount.cpp:1044 #: src/view/PreferencesPanel.cpp:199
msgid "Virtual"
msgstr "Virtuel"
#: src/view/grid/GridAccount.cpp:1048
msgid "Warning" msgid "Warning"
msgstr "Attention" msgstr "Attention"
#: src/view/PreferencesPanel.cpp:432 #: src/view/PreferencesPanel.cpp:445
msgid "Wich account will replace this one ?" msgid "Wich account will replace this one ?"
msgstr "Quel compte va remplacer celui-ci ?" msgstr "Quel compte va remplacer celui-ci ?"
#: src/view/PreferencesPanel.cpp:692 #: src/view/PreferencesPanel.cpp:706
msgid "Wich category will replace this one ?" msgid "Wich category will replace this one ?"
msgstr "Quelle catégorie va remplacer celle-ci" msgstr "Quelle catégorie va remplacer celle-ci"
#: src/view/grid/GridAccount.cpp:1044 #: src/view/grid/GridAccount.cpp:1048
msgid "You made a debit on a blocked account" msgid "You made a debit on a blocked account"
msgstr "Vous avez effectué une opération de débit sur un compte bloqué" msgstr "Vous avez effectué une opération de débit sur un compte bloqué"

View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-02-13 19:27+0100\n" "POT-Creation-Date: 2011-02-15 19:15+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,13 +17,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: src/view/StatsPanel.cpp:358 src/view/PreferencesPanel.cpp:817 #: src/view/StatsPanel.cpp:358 src/view/PreferencesPanel.cpp:831
msgid " - " msgid " - "
msgstr "" msgstr ""
#: src/view/UsersDialog.cpp:120 src/view/PreferencesPanel.cpp:482 #: src/view/UsersDialog.cpp:120 src/view/PreferencesPanel.cpp:495
#: src/view/PreferencesPanel.cpp:502 src/view/PreferencesPanel.cpp:712 #: src/view/PreferencesPanel.cpp:515 src/view/PreferencesPanel.cpp:726
#: src/view/PreferencesPanel.cpp:731 src/view/PreferencesPanel.cpp:775 #: src/view/PreferencesPanel.cpp:745 src/view/PreferencesPanel.cpp:789
msgid " already exists" msgid " already exists"
msgstr "" msgstr ""
@ -35,11 +35,11 @@ msgstr ""
msgid " not found, aborting" msgid " not found, aborting"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:757 #: src/view/AccountPanel.cpp:766
msgid " operations ?" msgid " operations ?"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:824 #: src/view/PreferencesPanel.cpp:838
msgid " profil ?" msgid " profil ?"
msgstr "" msgstr ""
@ -55,11 +55,11 @@ msgstr ""
msgid "Account" msgid "Account"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:482 src/view/PreferencesPanel.cpp:502 #: src/view/PreferencesPanel.cpp:495 src/view/PreferencesPanel.cpp:515
msgid "Account " msgid "Account "
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:363 #: src/controller/KissCount.cpp:370
msgid "Account 1" msgid "Account 1"
msgstr "" msgstr ""
@ -83,7 +83,7 @@ msgstr ""
msgid "Amount to" msgid "Amount to"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:824 src/view/AccountPanel.cpp:752 #: src/view/PreferencesPanel.cpp:838 src/view/AccountPanel.cpp:761
msgid "Are you sure want to delete " msgid "Are you sure want to delete "
msgstr "" msgstr ""
@ -91,15 +91,15 @@ msgstr ""
msgid "Are you sure want to delete : \n" msgid "Are you sure want to delete : \n"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:361 #: src/view/PreferencesPanel.cpp:368
msgid "Ascending" msgid "Ascending"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:285 #: src/view/PreferencesPanel.cpp:292
msgid "Background color" msgid "Background color"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:199 #: src/view/PreferencesPanel.cpp:200
msgid "Blocked" msgid "Blocked"
msgstr "" msgstr ""
@ -108,11 +108,11 @@ msgstr ""
msgid "Cancel" msgid "Cancel"
msgstr "" msgstr ""
#: src/view/grid/GridAccount.cpp:1267 src/view/grid/GridAccount.cpp:1274 #: src/view/grid/GridAccount.cpp:1271 src/view/grid/GridAccount.cpp:1278
msgid "Cannot group these operations" msgid "Cannot group these operations"
msgstr "" msgstr ""
#: src/view/grid/GridAccount.cpp:1393 src/view/grid/GridAccount.cpp:1399 #: src/view/grid/GridAccount.cpp:1397 src/view/grid/GridAccount.cpp:1403
msgid "Cannot ungroup these operations" msgid "Cannot ungroup these operations"
msgstr "" msgstr ""
@ -124,7 +124,7 @@ msgstr ""
msgid "Category" msgid "Category"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:712 src/view/PreferencesPanel.cpp:731 #: src/view/PreferencesPanel.cpp:726 src/view/PreferencesPanel.cpp:745
msgid "Category " msgid "Category "
msgstr "" msgstr ""
@ -208,12 +208,12 @@ msgstr ""
msgid "Default" msgid "Default"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:200 src/view/PreferencesPanel.cpp:288 #: src/view/PreferencesPanel.cpp:201 src/view/PreferencesPanel.cpp:295
#: src/view/AccountPanel.cpp:611 #: src/view/AccountPanel.cpp:620
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:362 #: src/view/PreferencesPanel.cpp:369
msgid "Descending" msgid "Descending"
msgstr "" msgstr ""
@ -228,13 +228,13 @@ msgstr ""
#: src/view/UsersDialog.cpp:90 src/view/UsersDialog.cpp:120 #: src/view/UsersDialog.cpp:90 src/view/UsersDialog.cpp:120
#: src/view/SearchPanel.cpp:179 src/view/SearchPanel.cpp:189 #: src/view/SearchPanel.cpp:179 src/view/SearchPanel.cpp:189
#: src/view/SearchPanel.cpp:203 src/view/SearchPanel.cpp:214 #: src/view/SearchPanel.cpp:203 src/view/SearchPanel.cpp:214
#: src/view/PreferencesPanel.cpp:422 src/view/PreferencesPanel.cpp:482 #: src/view/PreferencesPanel.cpp:435 src/view/PreferencesPanel.cpp:495
#: src/view/PreferencesPanel.cpp:502 src/view/PreferencesPanel.cpp:712 #: src/view/PreferencesPanel.cpp:515 src/view/PreferencesPanel.cpp:726
#: src/view/PreferencesPanel.cpp:731 src/view/PreferencesPanel.cpp:769 #: src/view/PreferencesPanel.cpp:745 src/view/PreferencesPanel.cpp:783
#: src/view/PreferencesPanel.cpp:775 src/view/PasswordDialog.cpp:72 #: src/view/PreferencesPanel.cpp:789 src/view/PasswordDialog.cpp:72
#: src/view/PasswordDialog.cpp:78 src/view/AccountPanel.cpp:748 #: src/view/PasswordDialog.cpp:78 src/view/AccountPanel.cpp:757
#: src/view/grid/GridAccount.cpp:1267 src/view/grid/GridAccount.cpp:1274 #: src/view/grid/GridAccount.cpp:1271 src/view/grid/GridAccount.cpp:1278
#: src/view/grid/GridAccount.cpp:1393 src/view/grid/GridAccount.cpp:1399 #: src/view/grid/GridAccount.cpp:1397 src/view/grid/GridAccount.cpp:1403
#: src/view/grid/wxGridCellFormulaEditor.cpp:69 src/model/Database.cpp:42 #: src/view/grid/wxGridCellFormulaEditor.cpp:69 src/model/Database.cpp:42
#: src/model/Database.cpp:49 src/model/Database.cpp:67 #: src/model/Database.cpp:49 src/model/Database.cpp:67
#: src/model/Database.cpp:96 src/model/Database.cpp:104 #: src/model/Database.cpp:96 src/model/Database.cpp:104
@ -251,15 +251,15 @@ msgid "Final value"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:84 src/view/grid/GridAccount.cpp:329 #: src/view/SearchPanel.cpp:84 src/view/grid/GridAccount.cpp:329
#: src/controller/KissCount.cpp:379 #: src/controller/KissCount.cpp:361
msgid "Fix" msgid "Fix"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:287 #: src/view/PreferencesPanel.cpp:294
msgid "Font" msgid "Font"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:286 #: src/view/PreferencesPanel.cpp:293
msgid "Foreground color" msgid "Foreground color"
msgstr "" msgstr ""
@ -271,11 +271,11 @@ msgstr ""
msgid "From " msgid "From "
msgstr "" msgstr ""
#: src/view/GenerateDialog.cpp:31 src/view/AccountPanel.cpp:608 #: src/view/GenerateDialog.cpp:31 src/view/AccountPanel.cpp:617
msgid "Generate month" msgid "Generate month"
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:381 #: src/controller/KissCount.cpp:361
msgid "Groceries" msgid "Groceries"
msgstr "" msgstr ""
@ -283,7 +283,7 @@ msgstr ""
msgid "Group" msgid "Group"
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:383 #: src/controller/KissCount.cpp:361
msgid "Hobbies" msgid "Hobbies"
msgstr "" msgstr ""
@ -311,7 +311,7 @@ msgstr ""
msgid "Invalid formula !" msgid "Invalid formula !"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:769 #: src/view/PreferencesPanel.cpp:783
msgid "Invalid name" msgid "Invalid name"
msgstr "" msgstr ""
@ -327,11 +327,11 @@ msgstr ""
msgid "Invalide date range" msgid "Invalide date range"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:422 #: src/view/PreferencesPanel.cpp:435
msgid "It must be at least one account !" msgid "It must be at least one account !"
msgstr "" msgstr ""
#: src/view/AccountPanel.cpp:748 #: src/view/AccountPanel.cpp:757
msgid "It must be at least one month !" msgid "It must be at least one month !"
msgstr "" msgstr ""
@ -339,8 +339,8 @@ msgstr ""
msgid "Kill me" msgid "Kill me"
msgstr "" msgstr ""
#: src/view/StatsPanel.cpp:377 src/view/PreferencesPanel.cpp:809 #: src/view/StatsPanel.cpp:377 src/view/PreferencesPanel.cpp:823
#: src/view/PreferencesPanel.cpp:812 src/model/Database_Update.cpp:127 #: src/view/PreferencesPanel.cpp:826 src/model/Database_Update.cpp:135
msgid "KissCount" msgid "KissCount"
msgstr "" msgstr ""
@ -348,20 +348,20 @@ msgstr ""
msgid "Language" msgid "Language"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:812 #: src/view/PreferencesPanel.cpp:826
msgid "Language not changed" msgid "Language not changed"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:809 #: src/view/PreferencesPanel.cpp:823
msgid "Language successfully changed, please go to another panel" msgid "Language successfully changed, please go to another panel"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:72 src/view/PreferencesPanel.cpp:196 #: src/view/PreferencesPanel.cpp:72 src/view/PreferencesPanel.cpp:196
#: src/view/PreferencesPanel.cpp:284 #: src/view/PreferencesPanel.cpp:291
msgid "Name" msgid "Name"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:781 #: src/view/PreferencesPanel.cpp:795
msgid "Name changed" msgid "Name changed"
msgstr "" msgstr ""
@ -388,7 +388,7 @@ msgid "Non fix"
msgstr "" msgstr ""
#: src/view/SearchPanel.cpp:304 src/view/SearchPanel.cpp:346 #: src/view/SearchPanel.cpp:304 src/view/SearchPanel.cpp:346
#: src/view/PreferencesPanel.cpp:427 src/view/PreferencesPanel.cpp:687 #: src/view/PreferencesPanel.cpp:440 src/view/PreferencesPanel.cpp:701
msgid "None" msgid "None"
msgstr "" msgstr ""
@ -409,8 +409,8 @@ msgstr ""
msgid "Old password " msgid "Old password "
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:385 #: src/controller/KissCount.cpp:361
msgid "Operating exepense" msgid "Operating expense"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:63 #: src/view/PreferencesPanel.cpp:63
@ -421,7 +421,7 @@ msgstr ""
msgid "Operations" msgid "Operations"
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:389 #: src/controller/KissCount.cpp:362
msgid "Other" msgid "Other"
msgstr "" msgstr ""
@ -448,8 +448,8 @@ msgstr ""
msgid "Please retype new password" msgid "Please retype new password"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:184 src/view/PreferencesPanel.cpp:783 #: src/view/PreferencesPanel.cpp:184 src/view/PreferencesPanel.cpp:797
#: src/view/PreferencesPanel.cpp:817 #: src/view/PreferencesPanel.cpp:831
msgid "Preferences" msgid "Preferences"
msgstr "" msgstr ""
@ -507,7 +507,7 @@ msgstr ""
msgid "Unable to open Database" msgid "Unable to open Database"
msgstr "" msgstr ""
#: src/controller/KissCount.cpp:387 #: src/controller/KissCount.cpp:362
msgid "Unexpected" msgid "Unexpected"
msgstr "" msgstr ""
@ -521,7 +521,7 @@ msgid "User"
msgstr "" msgstr ""
#: src/view/UsersDialog.cpp:39 src/view/UsersDialog.cpp:120 #: src/view/UsersDialog.cpp:39 src/view/UsersDialog.cpp:120
#: src/view/PreferencesPanel.cpp:775 #: src/view/PreferencesPanel.cpp:789
msgid "User " msgid "User "
msgstr "" msgstr ""
@ -529,19 +529,23 @@ msgstr ""
msgid "Users" msgid "Users"
msgstr "" msgstr ""
#: src/view/grid/GridAccount.cpp:1044 #: src/view/PreferencesPanel.cpp:199
msgid "Virtual"
msgstr ""
#: src/view/grid/GridAccount.cpp:1048
msgid "Warning" msgid "Warning"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:432 #: src/view/PreferencesPanel.cpp:445
msgid "Wich account will replace this one ?" msgid "Wich account will replace this one ?"
msgstr "" msgstr ""
#: src/view/PreferencesPanel.cpp:692 #: src/view/PreferencesPanel.cpp:706
msgid "Wich category will replace this one ?" msgid "Wich category will replace this one ?"
msgstr "" msgstr ""
#: src/view/grid/GridAccount.cpp:1044 #: src/view/grid/GridAccount.cpp:1048
msgid "You made a debit on a blocked account" msgid "You made a debit on a blocked account"
msgstr "" msgstr ""

View File

@ -356,6 +356,12 @@ void KissCount::ChangeName(const wxString& name)
_user->_name = name; _user->_name = name;
} }
// To enable translation during xgettext
wxString default_cats[] = {
_("Fix"), _("Groceries"), _("Hobbies"), _("Operating expense"),
_("Unexpected"), _("Other")
};
void KissCount::NewUser(const wxString& name) void KissCount::NewUser(const wxString& name)
{ {
wxDateTime curDate; wxDateTime curDate;
@ -377,17 +383,17 @@ void KissCount::NewUser(const wxString& name)
AddAccount(ac); AddAccount(ac);
cat.parent = wxT("0") ; cat.name = _("Fix") ; cat.backcolor = OWN_YELLOW ; cat.forecolor = *wxBLACK; cat.fix_cost = true; cat.parent = wxT("0") ; cat.name = wxT("Fix") ; cat.backcolor = OWN_YELLOW ; cat.forecolor = *wxBLACK; cat.fix_cost = true;
AddCategory(cat); AddCategory(cat);
cat.parent = wxT("0") ; cat.name = _("Groceries") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false; cat.parent = wxT("0") ; cat.name = wxT("Groceries") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false;
AddCategory(cat); AddCategory(cat);
cat.parent = wxT("0") ; cat.name = _("Hobbies") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false; cat.parent = wxT("0") ; cat.name = wxT("Hobbies") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false;
AddCategory(cat); AddCategory(cat);
cat.parent = wxT("0") ; cat.name = _("Operating exepense") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false; cat.parent = wxT("0") ; cat.name = wxT("Operating exepense") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false;
AddCategory(cat); AddCategory(cat);
cat.parent = wxT("0") ; cat.name = _("Unexpected") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false; cat.parent = wxT("0") ; cat.name = wxT("Unexpected") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false;
AddCategory(cat); AddCategory(cat);
cat.parent = wxT("0") ; cat.name = _("Other") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false; cat.parent = wxT("0") ; cat.name = wxT("Other") ; cat.backcolor = OWN_GREEN; cat.forecolor = *wxBLACK; cat.fix_cost = false;
AddCategory(cat); AddCategory(cat);
SetOperationOrder(wxT("ASC")); SetOperationOrder(wxT("ASC"));

View File

@ -1331,7 +1331,7 @@ std::vector<Operation>* Database::Search(User* user, wxString* description, wxDa
ESCAPE_CHARS(desc); ESCAPE_CHARS(desc);
if (wildcards) if (wildcards)
req += wxT("description LIKE '%") + desc + wxT("%'"); req += wxT("UPPER(description) LIKE UPPER('%") + desc + wxT("%')");
else else
req += wxT("description=\"") + desc + wxT("\""); req += wxT("description=\"") + desc + wxT("\"");
firstCond = true; firstCond = true;

View File

@ -77,7 +77,7 @@ AccountPanel::AccountPanel(KissCount* kiss, wxUI *parent) : KissPanel(kiss, pare
categoryIt != user->_categories.end(); categoryIt != user->_categories.end();
categoryIt++, i++) categoryIt++, i++)
{ {
_categories[i] = categoryIt->name ; _categories[i] = wxGetTranslation(categoryIt->name) ;
_categoriesIndexes[categoryIt->name] = i; _categoriesIndexes[categoryIt->name] = i;
} }

View File

@ -314,7 +314,7 @@ void PreferencesPanel::AddCategory(int line, Category cat)
if (cat.id != wxT("0")) if (cat.id != wxT("0"))
{ {
_categoriesGrid->SetCellValue(line, CATEGORY_NAME, cat.name); _categoriesGrid->SetCellValue(line, CATEGORY_NAME, wxGetTranslation(cat.name));
SET_ROW_COLOR(line, cat.backcolor, cat.forecolor); SET_ROW_COLOR(line, cat.backcolor, cat.forecolor);
if (line) if (line)
{ {

View File

@ -352,7 +352,7 @@ void GridAccount::InsertOperation(User* user, Operation& op, int line, bool fix,
if (!op.meta) if (!op.meta)
SetCellValue(line, ACCOUNT, user->GetAccountName(op.account)); SetCellValue(line, ACCOUNT, user->GetAccountName(op.account));
if (!fix && !op.meta) if (!fix && !op.meta)
SetCellValue(line, CATEGORY, cat.name); SetCellValue(line, CATEGORY, wxGetTranslation(cat.name));
SetCellRenderer(line, OP_DELETE, new wxGridCellBoolRenderer ()); SetCellRenderer(line, OP_DELETE, new wxGridCellBoolRenderer ());
SetCellEditor(line, OP_DELETE, new wxGridCellBoolEditor ()); SetCellEditor(line, OP_DELETE, new wxGridCellBoolEditor ());
SetCellRenderer(line, CHECKED, new wxGridCellBoolRenderer ()); SetCellRenderer(line, CHECKED, new wxGridCellBoolRenderer ());