From 223106fbfc1e94f601baadc9fb7d2c14703a441e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Tue, 20 Mar 2012 09:34:30 +0100 Subject: [PATCH] Set x axis label to "days" in StatsPanel for in-month stats --- ressources/po/french.mo | Bin 10395 -> 10422 bytes ressources/po/french.po | 92 +++++++++++++++++++----------------- ressources/po/kisscount.pot | 40 +++++++++------- src/view/StatsPanel.cpp | 4 +- 4 files changed, 73 insertions(+), 63 deletions(-) diff --git a/ressources/po/french.mo b/ressources/po/french.mo index e1893d475205c0f02eefb0d19a86a2fbdef4898c..6995b9be6a8c960b554b924920e35594013444f4 100644 GIT binary patch delta 3902 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\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:415 +#: src/view/StatsPanel.cpp:416 msgid " - " msgstr " - " @@ -71,7 +71,7 @@ msgstr "%d comptes" msgid "%d categories" msgstr "%d catégories" -#: src/view/StatsPanel.cpp:355 +#: src/view/StatsPanel.cpp:360 msgid "0 line" msgstr "Limite 0" @@ -90,7 +90,7 @@ msgstr "Compte" msgid "Account " msgstr "Le compte " -#: src/controller/KissCount.cpp:345 +#: src/controller/KissCount.cpp:344 msgid "Account 1" msgstr "Compte 1" @@ -103,7 +103,7 @@ msgstr "Nom du compte" msgid "Account number" msgstr "Numéro de compte" -#: src/view/StatsPanel.cpp:354 +#: src/view/StatsPanel.cpp:359 #: src/view/PreferencesPanel.cpp:47 msgid "Accounts" msgstr "Comptes" @@ -112,7 +112,7 @@ msgstr "Comptes" msgid "Accounts updated until " msgstr "Comptes mis à jours jusqu'à " -#: src/view/StatsPanel.cpp:339 +#: src/view/StatsPanel.cpp:337 msgid "Amount" msgstr "Montant" @@ -138,7 +138,7 @@ msgstr "Format de fichier non reconnu" msgid "Are you sure want to delete " msgstr "Etes vous sûr de vouloir supprimer " -#: src/view/grid/GridAccount.cpp:757 +#: src/view/grid/GridAccount.cpp:776 msgid "Are you sure want to delete : \n" msgstr "Etes vous sûr de vouloir supprimer : \n" @@ -168,17 +168,17 @@ msgstr "Bloqué" msgid "Cancel" msgstr "Annuler" -#: src/view/grid/GridAccount.cpp:1247 -#: src/view/grid/GridAccount.cpp:1260 +#: src/view/grid/GridAccount.cpp:1266 +#: src/view/grid/GridAccount.cpp:1279 msgid "Cannot group these operations" msgstr "Impossible de grouper ces opérations" -#: src/view/grid/GridAccount.cpp:1391 -#: src/view/grid/GridAccount.cpp:1397 +#: src/view/grid/GridAccount.cpp:1410 +#: src/view/grid/GridAccount.cpp:1416 msgid "Cannot ungroup these operations" msgstr "Impossible de dégrouper ces opérations" -#: src/controller/KissCount.cpp:336 +#: src/controller/KissCount.cpp:335 msgid "Car" msgstr "Voiture" @@ -286,6 +286,10 @@ msgstr "Date min" msgid "Date to" msgstr "Date max" +#: src/view/StatsPanel.cpp:351 +msgid "Days" +msgstr "Jours" + #: src/view/grid/GridAccount.cpp:72 msgid "Debit" msgstr "Débit" @@ -313,7 +317,7 @@ msgstr "Description" msgid "Enter a new description" msgstr "Nouvelle description" -#: src/view/StatsPanel.cpp:430 +#: src/view/StatsPanel.cpp:431 #: src/view/UsersDialog.cpp:90 #: src/view/UsersDialog.cpp:120 #: src/view/SearchBanner.cpp:149 @@ -335,10 +339,10 @@ msgstr "Nouvelle description" #: src/view/PasswordDialog.cpp:64 #: src/view/PasswordDialog.cpp:70 #: src/view/AccountPanel.cpp:970 -#: src/view/grid/GridAccount.cpp:1247 -#: src/view/grid/GridAccount.cpp:1260 -#: src/view/grid/GridAccount.cpp:1391 -#: src/view/grid/GridAccount.cpp:1397 +#: src/view/grid/GridAccount.cpp:1266 +#: src/view/grid/GridAccount.cpp:1279 +#: src/view/grid/GridAccount.cpp:1410 +#: src/view/grid/GridAccount.cpp:1416 #: src/view/grid/FormulaDelegate.cpp:59 #: src/model/Database.cpp:57 #: src/model/Database.cpp:65 @@ -381,8 +385,8 @@ msgid "Final value" msgstr "Valeur finale" #: src/view/SearchBanner.cpp:70 -#: src/view/grid/GridAccount.cpp:342 -#: src/controller/KissCount.cpp:336 +#: src/view/grid/GridAccount.cpp:359 +#: src/controller/KissCount.cpp:335 msgid "Fix" msgstr "Fixe" @@ -411,7 +415,7 @@ msgstr "Générer mois" msgid "Grisbi files (*.gsb)" msgstr "Fichiers Grisbi (*.gsb)" -#: src/controller/KissCount.cpp:336 +#: src/controller/KissCount.cpp:335 msgid "Groceries" msgstr "Courses" @@ -423,7 +427,7 @@ msgstr "Grouper" msgid "Hidden" msgstr "Caché" -#: src/controller/KissCount.cpp:336 +#: src/controller/KissCount.cpp:335 msgid "Hobbies" msgstr "Loisirs" @@ -479,7 +483,7 @@ msgstr "Ancien mot de passe invalide" msgid "Invalid password" msgstr "Mot de passe invalide" -#: src/view/StatsPanel.cpp:430 +#: src/view/StatsPanel.cpp:431 msgid "Invalide date range" msgstr "Intervalle de temps invalide" @@ -541,7 +545,7 @@ msgstr "Charger les opérations" msgid "Mode" msgstr "Mode" -#: src/view/StatsPanel.cpp:338 +#: src/view/StatsPanel.cpp:348 msgid "Months" msgstr "Mois" @@ -606,7 +610,7 @@ msgstr "Non rapprochée" msgid "Number" msgstr "Numéro de compte" -#: src/model/import/OFXImportEngine.cpp:140 +#: src/model/import/OFXImportEngine.cpp:141 msgid "OFX files (*.ofx)" msgstr "Fichiers OFX (*.ofx)" @@ -637,7 +641,7 @@ msgstr "les opérations ont été importées avec succès" msgid "Operations successfuly saved" msgstr "Opérations sauvegardées avec succès" -#: src/controller/KissCount.cpp:337 +#: src/controller/KissCount.cpp:336 msgid "Other" msgstr "Autres" @@ -649,7 +653,7 @@ msgstr "Mot de passe " msgid "Password changed" msgstr "Mot de passe changé" -#: src/view/wxUI.cpp:265 +#: src/view/wxUI.cpp:287 msgid "" "Personal accounting software\n" "\n" @@ -676,7 +680,7 @@ msgstr "Re entrez le mot de passe" msgid "Preferences" msgstr "Préférences" -#: src/view/wxUI.cpp:270 +#: src/view/wxUI.cpp:292 msgid "Quit KissCount ?" msgstr "Quitter KissCount ?" @@ -707,8 +711,8 @@ msgstr "Chercher" msgid "Shared with" msgstr "Partagé avec" -#: src/view/StatsPanel.cpp:212 -#: src/view/StatsPanel.cpp:415 +#: src/view/StatsPanel.cpp:215 +#: src/view/StatsPanel.cpp:416 msgid "Statistics" msgstr "Statistiques" @@ -742,7 +746,7 @@ msgstr "Impossible de créer " msgid "Unable to open Database" msgstr "Impossible d'ouvrir la base de données" -#: src/controller/KissCount.cpp:337 +#: src/controller/KissCount.cpp:336 msgid "Unexpected" msgstr "Exceptionnel" @@ -794,7 +798,7 @@ msgstr "Utilisateurs" msgid "Virtual" msgstr "Virtuel" -#: src/view/grid/GridAccount.cpp:1053 +#: src/view/grid/GridAccount.cpp:1072 msgid "Warning" msgstr "Attention" @@ -806,55 +810,55 @@ 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:1053 +#: src/view/grid/GridAccount.cpp:1072 msgid "You made a debit on a blocked account" msgstr "Vous avez effectué une opération de débit sur un compte bloqué" -#: src/view/wxUI.cpp:135 +#: src/view/wxUI.cpp:157 msgid "april" msgstr "avril" -#: src/view/wxUI.cpp:139 +#: src/view/wxUI.cpp:161 msgid "august" msgstr "août" -#: src/view/wxUI.cpp:143 +#: src/view/wxUI.cpp:165 msgid "december" msgstr "décembre" -#: src/view/wxUI.cpp:133 +#: src/view/wxUI.cpp:155 msgid "february" msgstr "février" -#: src/view/wxUI.cpp:132 +#: src/view/wxUI.cpp:154 msgid "january" msgstr "janvier" -#: src/view/wxUI.cpp:138 +#: src/view/wxUI.cpp:160 msgid "july" msgstr "juillet" -#: src/view/wxUI.cpp:137 +#: src/view/wxUI.cpp:159 msgid "june" msgstr "juin" -#: src/view/wxUI.cpp:134 +#: src/view/wxUI.cpp:156 msgid "march" msgstr "mars" -#: src/view/wxUI.cpp:136 +#: src/view/wxUI.cpp:158 msgid "may" msgstr "mai" -#: src/view/wxUI.cpp:142 +#: src/view/wxUI.cpp:164 msgid "november" msgstr "novembre" -#: src/view/wxUI.cpp:141 +#: src/view/wxUI.cpp:163 msgid "october" msgstr "octobre" -#: src/view/wxUI.cpp:140 +#: src/view/wxUI.cpp:162 msgid "september" msgstr "septembre" diff --git a/ressources/po/kisscount.pot b/ressources/po/kisscount.pot index dcce74d..db06e7f 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: 2012-02-26 14:03+0100\n" +"POT-Creation-Date: 2012-03-20 09:31+0100\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:415 +#: src/view/StatsPanel.cpp:416 msgid " - " msgstr "" @@ -65,7 +65,7 @@ msgstr "" msgid "%d categories" msgstr "" -#: src/view/StatsPanel.cpp:355 +#: src/view/StatsPanel.cpp:360 msgid "0 line" msgstr "" @@ -93,7 +93,7 @@ msgstr "" msgid "Account number" msgstr "" -#: src/view/StatsPanel.cpp:354 src/view/PreferencesPanel.cpp:47 +#: src/view/StatsPanel.cpp:359 src/view/PreferencesPanel.cpp:47 msgid "Accounts" msgstr "" @@ -101,7 +101,7 @@ msgstr "" msgid "Accounts updated until " msgstr "" -#: src/view/StatsPanel.cpp:339 +#: src/view/StatsPanel.cpp:337 msgid "Amount" msgstr "" @@ -125,7 +125,7 @@ msgstr "" msgid "Are you sure want to delete " msgstr "" -#: src/view/grid/GridAccount.cpp:757 +#: src/view/grid/GridAccount.cpp:776 msgid "Are you sure want to delete : \n" msgstr "" @@ -154,11 +154,11 @@ msgstr "" msgid "Cancel" msgstr "" -#: src/view/grid/GridAccount.cpp:1247 src/view/grid/GridAccount.cpp:1260 +#: src/view/grid/GridAccount.cpp:1266 src/view/grid/GridAccount.cpp:1279 msgid "Cannot group these operations" msgstr "" -#: src/view/grid/GridAccount.cpp:1391 src/view/grid/GridAccount.cpp:1397 +#: src/view/grid/GridAccount.cpp:1410 src/view/grid/GridAccount.cpp:1416 msgid "Cannot ungroup these operations" msgstr "" @@ -264,6 +264,10 @@ msgstr "" msgid "Date to" msgstr "" +#: src/view/StatsPanel.cpp:351 +msgid "Days" +msgstr "" + #: src/view/grid/GridAccount.cpp:72 msgid "Debit" msgstr "" @@ -289,7 +293,7 @@ msgstr "" msgid "Enter a new description" msgstr "" -#: src/view/StatsPanel.cpp:430 src/view/UsersDialog.cpp:90 +#: src/view/StatsPanel.cpp:431 src/view/UsersDialog.cpp:90 #: src/view/UsersDialog.cpp:120 src/view/SearchBanner.cpp:149 #: src/view/SearchBanner.cpp:159 src/view/SearchBanner.cpp:172 #: src/view/SearchBanner.cpp:181 src/view/ImportPanel.cpp:170 @@ -300,8 +304,8 @@ msgstr "" #: src/view/PreferencesPanel.cpp:1032 src/view/PreferencesPanel.cpp:1038 #: src/view/PreferencesPanel.cpp:1078 src/view/PasswordDialog.cpp:64 #: src/view/PasswordDialog.cpp:70 src/view/AccountPanel.cpp:970 -#: src/view/grid/GridAccount.cpp:1247 src/view/grid/GridAccount.cpp:1260 -#: src/view/grid/GridAccount.cpp:1391 src/view/grid/GridAccount.cpp:1397 +#: src/view/grid/GridAccount.cpp:1266 src/view/grid/GridAccount.cpp:1279 +#: src/view/grid/GridAccount.cpp:1410 src/view/grid/GridAccount.cpp:1416 #: src/view/grid/FormulaDelegate.cpp:59 src/model/Database.cpp:57 #: src/model/Database.cpp:65 src/model/Database.cpp:84 #: src/model/Database.cpp:112 src/model/Database.cpp:118 @@ -336,7 +340,7 @@ msgstr "" msgid "Final value" msgstr "" -#: src/view/SearchBanner.cpp:70 src/view/grid/GridAccount.cpp:342 +#: src/view/SearchBanner.cpp:70 src/view/grid/GridAccount.cpp:359 #: src/controller/KissCount.cpp:335 msgid "Fix" msgstr "" @@ -433,7 +437,7 @@ msgstr "" msgid "Invalid password" msgstr "" -#: src/view/StatsPanel.cpp:430 +#: src/view/StatsPanel.cpp:431 msgid "Invalide date range" msgstr "" @@ -492,7 +496,7 @@ msgstr "" msgid "Mode" msgstr "" -#: src/view/StatsPanel.cpp:338 +#: src/view/StatsPanel.cpp:348 msgid "Months" msgstr "" @@ -549,7 +553,7 @@ msgstr "" msgid "Number" msgstr "" -#: src/model/import/OFXImportEngine.cpp:140 +#: src/model/import/OFXImportEngine.cpp:141 msgid "OFX files (*.ofx)" msgstr "" @@ -638,7 +642,7 @@ msgstr "" msgid "Shared with" msgstr "" -#: src/view/StatsPanel.cpp:212 src/view/StatsPanel.cpp:415 +#: src/view/StatsPanel.cpp:215 src/view/StatsPanel.cpp:416 msgid "Statistics" msgstr "" @@ -712,7 +716,7 @@ msgstr "" msgid "Virtual" msgstr "" -#: src/view/grid/GridAccount.cpp:1053 +#: src/view/grid/GridAccount.cpp:1072 msgid "Warning" msgstr "" @@ -724,7 +728,7 @@ msgstr "" msgid "Wich category will replace this one ?" msgstr "" -#: src/view/grid/GridAccount.cpp:1053 +#: src/view/grid/GridAccount.cpp:1072 msgid "You made a debit on a blocked account" msgstr "" diff --git a/src/view/StatsPanel.cpp b/src/view/StatsPanel.cpp index 96a26e8..ca7f016 100644 --- a/src/view/StatsPanel.cpp +++ b/src/view/StatsPanel.cpp @@ -334,7 +334,6 @@ void StatsPanel::UpdateStats(int monthFrom, int yearFrom, int monthTo, int yearT KDChart::CartesianAxis *yAxis = new KDChart::CartesianAxis (_plot->lineDiagram()); xAxis->setPosition (KDChart::CartesianAxis::Bottom); yAxis->setPosition (KDChart::CartesianAxis::Left); - xAxis->setTitleText (_("Months")); yAxis->setTitleText (_("Amount")); xAxis->setLabels(xlabels); @@ -346,7 +345,10 @@ void StatsPanel::UpdateStats(int monthFrom, int yearFrom, int monthTo, int yearT KDChart::TextAttributes axisTextAttr(xAxis->textAttributes()); axisTextAttr.setRotation(-60); xAxis->setTextAttributes(axisTextAttr); + xAxis->setTitleText (_("Months")); } + else + xAxis->setTitleText (_("Days")); _plot->lineDiagram()->addAxis(xAxis); _plot->lineDiagram()->addAxis(yAxis);