Git commit 0dc28a8ebced1aa80358f53db5949595ce53e467 by Pino Toscano. Committed on 11/01/2016 at 17:23. Pushed by pino into branch 'master'.
18n: typo fixes - "an other" -> "another" - "can't" -> "cannot" - "don't" -> "do not" - "it's" -> "it is" / "its" - "methode" -> "method" - "unknow" -> "unknown" - "you're" -> you are" M +14 -14 CHANGELOG M +1 -1 TODO M +15 -15 doc/index.docbook M +1 -1 plugins/generic/skg_file/skgfileplugin.cpp M +1 -1 plugins/generic/skg_statistic/skgstatisticplugin.cpp M +4 -4 plugins/import/skrooge_import_csv/skgimportplugincsv.cpp M +1 -1 plugins/skrooge/skrooge_bank/skgbankplugin.cpp M +13 -13 plugins/skrooge/skrooge_operation/skgoperationplugin.cpp M +2 -2 plugins/skrooge/skrooge_operation/skgoperationpluginwidget.cpp M +1 -1 plugins/skrooge/skrooge_search/skgsearchpluginwidget.cpp M +1 -1 plugins/skrooge/skrooge_unit/skgunitplugin.cpp M +1 -1 scripts/addNewImportPlugin.sh.in M +1 -1 scripts/addNewPlugin.sh.in M +1 -1 skgbankmodeler/skgbudgetruleobject.h M +1 -1 skgbankmodeler/skgcategoryobject.cpp M +1 -1 skgbankmodeler/skgdocumentbank.cpp M +1 -1 skgbankmodeler/skgdocumentbank.h M +1 -1 skgbankmodeler/skgimportexportmanager.cpp M +1 -1 skgbankmodeler/skgoperationobject.h M +17 -17 skgbankmodeler/skgreportbank.h M +1 -1 skgbasegui/skgmainpanel.h M +3 -3 skgbasegui/skgobjectmodelbase.h M +1 -1 skgbasegui/skgtablewithgraph.cpp M +3 -3 skgbasemodeler/skgdocument.cpp M +4 -4 skgbasemodeler/skgdocument.h M +18 -18 skgbasemodeler/skgerror.h M +1 -1 skgbasemodeler/skgnodeobject.cpp M +2 -2 skgbasemodeler/skgobjectbase.h M +4 -4 skgbasemodeler/skgreport.h M +2 -2 skgbasemodeler/skgservices.h M +3 -3 skgbasemodeler/skgtraces.cpp M +7 -7 skgbasemodeler/skgtraces.h M +1 -1 skgbasemodeler/skgtransactionmng.h M +2 -2 tests/skgbankmodelertest/skgtestobjects.cpp http://commits.kde.org/skrooge/0dc28a8ebced1aa80358f53db5949595ce53e467 diff --git a/CHANGELOG b/CHANGELOG index 1f5c948..2a001d6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -96,7 +96,7 @@ skrooge (2.1.0) skrooge (2.0.0) *Correction bug 347762: Invalid error message for SQLite version check after an update of SQLite *Correction bug 324653: Auto-Hide Scrollbars for Report Graphs - *Correction bug 348865: Don't show translated tooltip + *Correction bug 348865: Do not show translated tooltip *Correction bug 348490: Split with almost 0 operation *Correction: Porting on KF5 / QT5 *Correction: Use of Q_DECL_OVERRIDE @@ -117,7 +117,7 @@ skrooge (1.12.5) skrooge (1.12.0) *Correction bug 345974: Skrooge alarms keep firing up regardless of specified alert amount - *Correction bug 346151: Fast edition don't fill operation sign + *Correction bug 346151: Fast edition do not fill operation sign *Correction bug 345998: Add tooltip for all history actions *Correction bug 345799: Moved then hiden column displayed *New feature: Automatic point operations created during reconciliation @@ -274,7 +274,7 @@ skrooge (1.8.0) *Correction bug 325675: Build error in skgfileplugin.cpp for openSUSE 12.2 KDE 4.9 *Correction: KMyMoney exports does not need a check of integrity anymore *Correction: Addition of all icons in size 256 and 512 - *Correction: Block drop of a bookmark under an other bookmark + *Correction: Block drop of a bookmark under another bookmark *Correction: Bad date format detection when the second value is 9 (example: 3/9/04) *Correction: Remove the "Bank account " string in the name of the account name created by an OFX import *Correction: Icon for "Amount entered" @@ -478,7 +478,7 @@ skrooge (1.4.0) skrooge (1.3.3) *Correction bug 305880: On the Dashboard, scheduled transactions have wrong number of decimal places - *Correction bug 306119: Can't open document created in 1.3.0 with 1.3.2 + *Correction bug 306119: Cannot open document created in 1.3.0 with 1.3.2 *Correction bug 305879: Account panel shows Edition - should be Addition *Correction: Smaller bank icon selector in "Accounts" page *Correction: Set default type as "currency" in "Units" page when primary and secondary units are already defined @@ -576,7 +576,7 @@ skrooge (1.2.0) *New feature: Import of non local files (example: http://myserver/document.qif) *New feature: Export of non local files (example: http://myserver/document.qif) *New feature: Dashboard > Shares & Indexes renamed to "Quotes" and provide a possibility to select all available Units (Objects, Currencies etc.) - *New feature: Operations > Transfer: don't display a name of a chosen source account in the field of target account + *New feature: Operations > Transfer: do not display a name of a chosen source account in the field of target account *New feature: New mode in reports *New feature: Memorize expanded groups in bookmarks *New feature: "Incomes & Expenditures" widget is clickable @@ -606,7 +606,7 @@ skrooge (1.1.0) *Correction bug 284752: Skrooge does not look for Grantlee at build time *Correction bug 284843: OFX import does not work on UTF-8 encoded files *Correction bug 285289: Misspell found: reconcilation instead of reconciliation - *Correction bug 285880: Cumulative amount of main categories don't appear + *Correction bug 285880: Cumulative amount of main categories do not appear *Correction bug 286538: Renaming categories doesn't rename relevant search/process rules (not fixed but better error management) *Correction: Better colors in "5 main variations" widget for dashboard *Correction: Installation of grantlee_skroogefilters.so in only one place and not hardcoded @@ -894,7 +894,7 @@ skrooge (0.7.3) skrooge (0.7.2) *Correction bug 237498: Skrooge crash on saving preferences (when system tray is not available) *Correction bug 238087: kAmountEdit widget in Operations plugin isn't properly localized - *Correction bug 238477: Can't open base if partition is full + *Correction bug 238477: Cannot open base if partition is full *Correction bug 240600: Skrooge must be able to export as a sqlite database *Correction bug 240640: Skrooge crash after password entered - input file DELETED at failure *Correction bug 234597: Gnucash import issues with two accounts with the same name @@ -930,7 +930,7 @@ skrooge (0.7.1) *Correction bug 234608: Some gnucash notes are lost during import phase *Correction bug 234771: Problem importing ofx file *Correction bug 234845: Bad Account after importing ofx - *Correction bug 235689: Can't localize quotation marks + *Correction bug 235689: Cannot localize quotation marks *Correction bug 234596: Customisable date format in operations panel *Correction bug 236753: Search but not process on attribute *Correction: Rename "Import CSV unit..." in "Import currency values..." @@ -1023,7 +1023,7 @@ skrooge (0.6.0) *New gui for search and process *Delete icon on each suboperation line *Compatibility with bespin theme - *Do not collapse tree after editing one of it's items + *Do not collapse tree after editing one of its items *More options in "Report" page *New function to delete unused categories *Selection in pages list is now synchronized with current page @@ -1040,7 +1040,7 @@ skrooge (0.6.0) *"Account position" is replaced by "Ending balance" *Avoid cpu loop when double click on operation fields on KDE 4.4 *Completion based on substrings - *Better import of QIF files when both side of the import don't have exactly the same date + *Better import of QIF files when both side of the import do not have exactly the same date *Correction on update category and tracker for transfers *Completion on comments @@ -1153,7 +1153,7 @@ skrooge (0.5.1) *Correction bug 205471: Impossible to know how to check an operation *Correction bug 205466: Date missing in reports *Correction bug 193426: Ability to create from scratch a "recurrent operation" - *Correction bug 203787: Balance should be displayed for each operation in the operation context. Correction done: balance is displayed on tooltip because it's better for performances than in column. + *Correction bug 203787: Balance should be displayed for each operation in the operation context. Correction done: balance is displayed on tooltip because it is better for performances than in column. *Correction bug 206894: Crash second import CSV *Correction bug 206459: "Search & process" must be able to do complex update *Correction bug 199539: Dashboard must be customisable @@ -1216,7 +1216,7 @@ skrooge (0.5.0) *New settings for import CSV *Dashboard is now clickable *Dashboard is modifiable (see contextual menu on each widget) and state can be saved - *Addition of "Fast edition" without amount modification. It's useful to modify imported operations + *Addition of "Fast edition" without amount modification. It is useful to modify imported operations *Only one instance of skrooge can be launched. *Imports can be done in command line. Example "skrooge myfile.ofx" with skrooge running *If an invalid expression is entered for the amount, the field is written in red, and the expression is kept to allow correction from the user (previously, 0 was displayed). @@ -1229,7 +1229,7 @@ skrooge (0.5.0) skrooge (0.3.0) *Correction bug 191970: Attach receipts (images) to transactions *Addition of "Trackers" for lines in report - *Correction bug 195254: Don't allow to link operations to a closed tracker + *Correction bug 195254: Do not allow to link operations to a closed tracker *Correction bug 195026: A setting must allow to clean history when the application is [saved] *Correction bug 194826: End user must be to validate an import *Correction bug 196444: Can not validate reconciliation (delta = -0.00) @@ -1477,7 +1477,7 @@ skrooge (0.1.5) *Better performances (x100) in report. *Correction bug 2316459: skrooge does not support out-of-source build *Correction bug 2298621: Unable to delete a "principal currency". - ==> It's now possible to delete a unit except if this unit is already used by at least one operation + ==> It is now possible to delete a unit except if this unit is already used by at least one operation *Correction bug 2326576: Field empty by default *Correction bug 2306914: "Tip of the day" dialog can not be removed diff --git a/TODO b/TODO index 90c833c..aea463b 100644 --- a/TODO +++ b/TODO @@ -27,7 +27,7 @@ 123:P1: "Rename" for all dashboard widget -127:P1: Stooq monthly history.txt don't work +127:P1: Stooq monthly history.txt do not work 128:P1: How to translate x-skg.xml? diff --git a/doc/index.docbook b/doc/index.docbook index 64ae7eb..b597ac5 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -222,7 +222,7 @@ <sect2 id="main_area"> <title>The main area</title> <para> - This is where &appname; will display the information you're interested in. It can contain <link linkend="multi-tabs">many tabs</link>, each one with the view you assigned to it. + This is where &appname; will display the information you are interested in. It can contain <link linkend="multi-tabs">many tabs</link>, each one with the view you assigned to it. </para> </sect2> @@ -306,7 +306,7 @@ </mediaobject> </screenshot> - <para>To create a bookmark, select a page from the <link linkend="page_chooser">page chooser</link> you want to bookmark, and customize its content to your liking. Once you're done with that, in the Bookmarks <link linkend="docks">dock</link>, bring up the contextual menu, and select <menuchoice><guimenu>Bookmark current page</guimenu></menuchoice>.</para> + <para>To create a bookmark, select a page from the <link linkend="page_chooser">page chooser</link> you want to bookmark, and customize its content to your liking. Once you are done with that, in the Bookmarks <link linkend="docks">dock</link>, bring up the contextual menu, and select <menuchoice><guimenu>Bookmark current page</guimenu></menuchoice>.</para> <para>Each bookmark or bookmark folder can be "autostarted", &ie; it will be automatically opened when starting &appname;. This way, you can fully customize the default &appname; layout.</para> <para>You can select the text and icon you want for each bookmark or bookmark folder.</para> @@ -611,11 +611,11 @@ <sect2 id="save_customized_content"> <title>Save Customized Content</title> - <para>As explained in the <link linkend="tables">previous chapter</link>, tables can be totally customized to your liking. But you probably don't want to loose all the customization work you made upon closing a tab. There are two ways to save this work.</para> + <para>As explained in the <link linkend="tables">previous chapter</link>, tables can be totally customized to your liking. But you probably do not want to loose all the customization work you made upon closing a tab. There are two ways to save this work.</para> <sect3 id="save_default_context"> <title>Save page state</title> - <para>This option allows you saving the current tab state as the default state that will always be called when opening this page. For example, you may want your <link linkend="dashboard">Dashboard</link> to contain 4 widgets, organized to your liking. What's even more important is that you always want the Dashboard to look the same, you don't want to repeat the customization work every time you open it.</para> + <para>This option allows you saving the current tab state as the default state that will always be called when opening this page. For example, you may want your <link linkend="dashboard">Dashboard</link> to contain 4 widgets, organized to your liking. What's even more important is that you always want the Dashboard to look the same, you do not want to repeat the customization work every time you open it.</para> <para>To do this, you simply need to do customization work once, then to save the tab state as the Default State for the page being displayed. Setting the default state is done either by right clicking on the tab and selecting <guimenuitem>Save page state</guimenuitem>. If you want to keep more than one state for a page then you must use <link linkend="bookmarks">bookmarks</link>.</para> <screenshot> @@ -671,7 +671,7 @@ <sect1 id="import"> <title>Import Files</title> - <para>&appname; is able to import files from other financial applications or from your bank. So, whether you're coming from another application, or simply don't want to go through the hassle of manually entering your operations, &appname; has a fast lane for you.</para> + <para>&appname; is able to import files from other financial applications or from your bank. So, whether you are coming from another application, or simply do not want to go through the hassle of manually entering your operations, &appname; has a fast lane for you.</para> <sect2 id="supported_file_formats"> <title>Supported File Formats</title> @@ -694,7 +694,7 @@ <listitem><para>IIF: <trademark>Intuit</trademark> Interchange Format is used by <trademark>QuickBooks</trademark>.</para></listitem> <listitem><para>SKG: This is useful to merge 2 &appname; documents</para></listitem> <listitem><para>Backend: &appname; can also import operations by using a backend. The only one supported is <ulink url="http://weboob.org/";>WEBOOB</ulink>. By using this backend you can import all operations from all your banks in only one click. For that, you just have to install <ulink url="http://weboob.org/";>WEBOOB</ulink> and activate the corresponding backend from settings.</para> - <tip><para>If you don't want to store your bank passwords in the configuration file of WEBOOB, you can do that: + <tip><para>If you do not want to store your bank passwords in the configuration file of WEBOOB, you can do that: <itemizedlist> <listitem><para>Install kwalletcli</para></listitem> @@ -737,7 +737,7 @@ <sect3 id="import_status"> <title>Import Status</title> <para>Imported Operations have a specific status. Right after import, they are considered as "Imported, not yet validated". The idea here is that you may want to check if the import went as expected, so you need to identify quickly those operations. As per default settings, those operations will also appear in blue.</para> - <tip><para>If you don't want this behaviour, you can set the option <guilabel>Automatic Validation after Import</guilabel> in the application's <!-- TODO: Put a link here-->settings.</para></tip> + <tip><para>If you do not want this behaviour, you can set the option <guilabel>Automatic Validation after Import</guilabel> in the application's <!-- TODO: Put a link here-->settings.</para></tip> <tip><para>The <link linkend="search_and_process">Search & Process</link> function can be automatically launched after import to categorize operations.</para></tip> </sect3> </sect2> @@ -859,7 +859,7 @@ <listitem><para><guimenuitem>Merge sub operations</guimenuitem>: Merge selected operations in one split operation</para></listitem> <listitem><para><guimenuitem>Schedule</guimenuitem>: Schedule the selected operation</para></listitem> <listitem><para><guimenuitem>Validate imported operations</guimenuitem>: Validate all selected imported operations</para></listitem> - <listitem><para><guimenuitem>Merge imported operations</guimenuitem>: Merge one imported operation with an other operation entered manually. If amounts are different then a confirmation is requested</para></listitem> + <listitem><para><guimenuitem>Merge imported operations</guimenuitem>: Merge one imported operation with another operation entered manually. If amounts are different then a confirmation is requested</para></listitem> <listitem><para><guimenuitem>Split shares</guimenuitem>: Split selected <link linkend="units">shares</link></para></listitem> </itemizedlist> </sect2> @@ -1459,7 +1459,7 @@ <sect2 id="shares"> <title>Shares</title> <para>First of all you have to create some units with the shares you want to track, from the settings you can choose to update the data automatically when the -file is opened. It's also recommended to create a different account (⪚ "ETF") in order to keep the investments separated and be able to see them from the dashboard. +file is opened. It is also recommended to create a different account (⪚ "ETF") in order to keep the investments separated and be able to see them from the dashboard. </para> <para>Now you can add your operations as "shares": <screenshot> @@ -1928,7 +1928,7 @@ file is opened. It's also recommended to create a different account (⪚ "ETF") <title>Going Deeper</title> <para>By double clicking on an item of a graph, you will open the operations included in this item.</para> <para>You can open a new report based on an item of a graph too.</para> - <para>So you know you can make a deep analysis of your finances thanks to reports. But how deep is deep ? Well, that's even deeper than you imagined... If you're interested, read the <link linkend="holidays_expenses_analysis">hands on exercise</link> analysing this author's expenses during its holidays :)</para> + <para>So you know you can make a deep analysis of your finances thanks to reports. But how deep is deep ? Well, that's even deeper than you imagined... If you are interested, read the <link linkend="holidays_expenses_analysis">hands on exercise</link> analysing this author's expenses during its holidays :)</para> </sect2> @@ -2295,7 +2295,7 @@ file is opened. It's also recommended to create a different account (⪚ "ETF") <para>This, of course, works also the other way round: if someone lends you some money, you are able to monitor how much you still have to reimburse.</para> <para>Double clicking on a tracker in the track view will open a new tab containing all operations attached to this tracker.</para> - <tip><para>Sometimes, you would like to track the refund of a payment done before you started to use &appname;. How to do that because it's not possible to set an initial amount on a tracker?</para> + <tip><para>Sometimes, you would like to track the refund of a payment done before you started to use &appname;. How to do that because it is not possible to set an initial amount on a tracker?</para> <para>You can create a split operation with: <itemizedlist> @@ -2436,7 +2436,7 @@ file is opened. It's also recommended to create a different account (⪚ "ETF") <listitem><para>Define a budget amount for a category for a specific month of a year.</para></listitem> <listitem><para>Define if income or expenditure of sub categories must be taken into account in the define budget (example: if the option is selected then a budget for the category "Car" will take into account the category "Car > Fuel").</para></listitem> </itemizedlist> - <tip><para>You can define a budget capturing all income or expenditure not defined in an other budget by leaving the category empty. This is really useful to be sure that you don't miss an expenditure.</para></tip> + <tip><para>You can define a budget capturing all income or expenditure not defined in another budget by leaving the category empty. This is really useful to be sure that you do not miss an expenditure.</para></tip> </para> <para>In automatic mode, you can: @@ -2483,7 +2483,7 @@ file is opened. It's also recommended to create a different account (⪚ "ETF") <sect1 id="howto_language"> <title>How to have &appname; in my language?</title> <para>First, check if &appname; is well <ulink url="http://l10n.kde.org/stats/gui/trunk-kde4/po/skrooge.po/";>translated to your language</ulink>.</para> - <para>Second, don't forget to install packages for your language. Example for french (fr): <literal>language-pack-kde-fr</literal> and <literal>kde-l10n-fr</literal>.</para> + <para>Second, do not forget to install packages for your language. Example for french (fr): <literal>language-pack-kde-fr</literal> and <literal>kde-l10n-fr</literal>.</para> </sect1> <sect1 id="howto_currency"> @@ -2641,7 +2641,7 @@ file is opened. It's also recommended to create a different account (⪚ "ETF") </mediaobject> </screenshot> - <para>That's it ! If you go back to the operations view, you will notice that all concerned operations have been updated. In case anything went wrong, don't forget that <link linkend="undo_redo">Undo</link> is your friend ! Even if the process modified 2327 operations, this is still one undoable action for &appname;.</para> + <para>That's it ! If you go back to the operations view, you will notice that all concerned operations have been updated. In case anything went wrong, do not forget that <link linkend="undo_redo">Undo</link> is your friend ! Even if the process modified 2327 operations, this is still one undoable action for &appname;.</para> </appendix> @@ -2668,7 +2668,7 @@ file is opened. It's also recommended to create a different account (⪚ "ETF") <sect1 id="analysis_total_cost"> <title>Finding the holidays total cost</title> - <para>This is so easy, it's not even funny: open the Trackers view, read the "Amount" column for our tracker:</para> + <para>This is so easy, it is not even funny: open the Trackers view, read the "Amount" column for our tracker:</para> <screenshot> <mediaobject> <imageobject> diff --git a/plugins/generic/skg_file/skgfileplugin.cpp b/plugins/generic/skg_file/skgfileplugin.cpp index be0389b..d1b638e 100644 --- a/plugins/generic/skg_file/skgfileplugin.cpp +++ b/plugins/generic/skg_file/skgfileplugin.cpp @@ -601,7 +601,7 @@ SKGAdviceList SKGFilePlugin::advice(const QStringList& iIgnoredAdvice) ad.setUUID(QStringLiteral("skgfileplugin_notvalidated")); ad.setPriority(2); ad.setShortMessage(i18nc("Advice to the user that he should backup his document", "Backup your document")); - ad.setLongMessage(i18nc("Explain the user that he should backup his document", "Don't forget to backup your document on an other device.")); + ad.setLongMessage(i18nc("Explain the user that he should backup his document", "Do not forget to backup your document on another device.")); output.push_back(ad); } diff --git a/plugins/generic/skg_statistic/skgstatisticplugin.cpp b/plugins/generic/skg_statistic/skgstatisticplugin.cpp index ac7a3de..f5a04c7 100644 --- a/plugins/generic/skg_statistic/skgstatisticplugin.cpp +++ b/plugins/generic/skg_statistic/skgstatisticplugin.cpp @@ -136,7 +136,7 @@ void SKGStatisticPlugin::refresh() #elseifdef Q_OS_MAC QString os = "Mac OS"; #else - QString os = QStringLiteral("Unknow"); + QString os = QStringLiteral("Unknown"); #endif m_stats[QStringLiteral("current.os")] = os; QRect scr = QApplication::desktop()->screenGeometry(); diff --git a/plugins/import/skrooge_import_csv/skgimportplugincsv.cpp b/plugins/import/skrooge_import_csv/skgimportplugincsv.cpp index 6246d08..13a610d 100644 --- a/plugins/import/skrooge_import_csv/skgimportplugincsv.cpp +++ b/plugins/import/skrooge_import_csv/skgimportplugincsv.cpp @@ -109,12 +109,12 @@ QStringList SKGImportPluginCsv::getCSVMappingFromLine(const QString& iLine) QStringList csvAttributes = SKGServices::splitCSVLine(line, ';', true, &m_csvSeparator); int nb = csvAttributes.count(); - // If the split fails, we try with an other separator + // If the split fails, we try with another separator if (nb == 1) { csvAttributes = SKGServices::splitCSVLine(line, ',', true, &m_csvSeparator); nb = csvAttributes.count(); - // If the split fails, we try with an other separator + // If the split fails, we try with another separator if (nb == 1) { csvAttributes = SKGServices::splitCSVLine(line, '\t', true, &m_csvSeparator); nb = csvAttributes.count(); @@ -543,7 +543,7 @@ SKGError SKGImportPluginCsv::importFile() err = unit.save(false); // Save only } - // This unit is now the default one, it's better for performance + // This unit is now the default one, it is better for performance defUnit = unit; } else { unit = defUnit; @@ -585,7 +585,7 @@ SKGError SKGImportPluginCsv::importFile() } } - // This account is now the default one, it's better for performance + // This account is now the default one, it is better for performance defAccount = account; } IFOKDO(err, currentOperation.setParentAccount(defAccount)) diff --git a/plugins/skrooge/skrooge_bank/skgbankplugin.cpp b/plugins/skrooge/skrooge_bank/skgbankplugin.cpp index efb579c..bf7e9c8 100644 --- a/plugins/skrooge/skrooge_bank/skgbankplugin.cpp +++ b/plugins/skrooge/skrooge_bank/skgbankplugin.cpp @@ -201,7 +201,7 @@ SKGAdviceList SKGBankPlugin::advice(const QStringList& iIgnoredAdvice) ad.setUUID("skgbankplugin_withoutaccount|" % bank); ad.setPriority(3); ad.setShortMessage(i18nc("A bank is in the list of used banks, but it doesn't have any account attached", "Bank '%1' has no account", bank)); - ad.setLongMessage(i18nc("User can delete banks with no accounts", "Don't forget to remove useless banks")); + ad.setLongMessage(i18nc("User can delete banks with no accounts", "Do not forget to remove useless banks")); QStringList autoCorrections; autoCorrections.push_back(i18nc("Action to delete a bank", "Delete '%1'", bank)); ad.setAutoCorrections(autoCorrections); diff --git a/plugins/skrooge/skrooge_operation/skgoperationplugin.cpp b/plugins/skrooge/skrooge_operation/skgoperationplugin.cpp index 1fad708..f883c6e 100644 --- a/plugins/skrooge/skrooge_operation/skgoperationplugin.cpp +++ b/plugins/skrooge/skrooge_operation/skgoperationplugin.cpp @@ -1002,7 +1002,7 @@ SKGAdviceList SKGOperationPlugin::advice(const QStringList& iIgnoredAdvice) ad.setUUID("skgoperationplugin_notreconciliated|" % account); ad.setPriority(9); ad.setShortMessage(i18nc("Advice on making the best (short)", "Many operations of '%1' not reconciliated", account)); - ad.setLongMessage(i18nc("Advice on making the best (long)", "Don't forget to reconciliate your accounts. By doing so, you acknowledge that your bank has indeed processed these operations on your account. This is how you enforce compliance with your bank's statements. See online help for more details")); + ad.setLongMessage(i18nc("Advice on making the best (long)", "Do not forget to reconciliate your accounts. By doing so, you acknowledge that your bank has indeed processed these operations on your account. This is how you enforce compliance with your bank's statements. See online help for more details")); SKGAdvice::SKGAdviceActionList autoCorrections; { SKGAdvice::SKGAdviceAction a; @@ -1024,8 +1024,8 @@ SKGAdviceList SKGOperationPlugin::advice(const QStringList& iIgnoredAdvice) SKGAdvice ad; ad.setUUID(QStringLiteral("skgimportexportplugin_notvalidated")); ad.setPriority(5); - ad.setShortMessage(i18nc("Advice on making the best (short)", "Many operations don't have mode")); - ad.setLongMessage(i18nc("Advice on making the best (long)", "Don't forget to set a mode for each operation. This will allow you to generate better reports.")); + ad.setShortMessage(i18nc("Advice on making the best (short)", "Many operations do not have mode")); + ad.setLongMessage(i18nc("Advice on making the best (long)", "Do not forget to set a mode for each operation. This will allow you to generate better reports.")); QStringList autoCorrections; autoCorrections.push_back(QStringLiteral("skg://view_open_operation_without_mode")); ad.setAutoCorrections(autoCorrections); @@ -1041,8 +1041,8 @@ SKGAdviceList SKGOperationPlugin::advice(const QStringList& iIgnoredAdvice) SKGAdvice ad; ad.setUUID(QStringLiteral("skgoperationplugin_nocategory")); ad.setPriority(5); - ad.setShortMessage(i18nc("Advice on making the best (short)", "Many operations don't have category")); - ad.setLongMessage(i18nc("Advice on making the best (long)", "Don't forget to associate a category for each operation. This will allow you to generate better reports.")); + ad.setShortMessage(i18nc("Advice on making the best (short)", "Many operations do not have category")); + ad.setLongMessage(i18nc("Advice on making the best (long)", "Do not forget to associate a category for each operation. This will allow you to generate better reports.")); QStringList autoCorrections; autoCorrections.push_back(QStringLiteral("skg://view_open_operation_without_category")); ad.setAutoCorrections(autoCorrections); @@ -1057,8 +1057,8 @@ SKGAdviceList SKGOperationPlugin::advice(const QStringList& iIgnoredAdvice) SKGAdvice ad; ad.setUUID(QStringLiteral("skgoperationplugin_transfer_nocategory")); ad.setPriority(3); - ad.setShortMessage(i18nc("Advice on making the best (short)", "Many transfers don't have category")); - ad.setLongMessage(i18nc("Advice on making the best (long)", "Don't forget to associate a category for each transfer.")); + ad.setShortMessage(i18nc("Advice on making the best (short)", "Many transfers do not have category")); + ad.setLongMessage(i18nc("Advice on making the best (long)", "Do not forget to associate a category for each transfer.")); QStringList autoCorrections; autoCorrections.push_back(QStringLiteral("skg://view_open_transfers_without_category")); ad.setAutoCorrections(autoCorrections); @@ -1074,8 +1074,8 @@ SKGAdviceList SKGOperationPlugin::advice(const QStringList& iIgnoredAdvice) SKGAdvice ad; ad.setUUID(QStringLiteral("skgoperationplugin_nopayee")); ad.setPriority(5); - ad.setShortMessage(i18nc("Advice on making the best (short)", "Many operations don't have payee")); - ad.setLongMessage(i18nc("Advice on making the best (long)", "Don't forget to associate a payee for each operation. This will allow you to generate better reports.")); + ad.setShortMessage(i18nc("Advice on making the best (short)", "Many operations do not have payee")); + ad.setLongMessage(i18nc("Advice on making the best (long)", "Do not forget to associate a payee for each operation. This will allow you to generate better reports.")); QStringList autoCorrections; autoCorrections.push_back(QStringLiteral("skg://view_open_operation_without_payee")); ad.setAutoCorrections(autoCorrections); @@ -1090,8 +1090,8 @@ SKGAdviceList SKGOperationPlugin::advice(const QStringList& iIgnoredAdvice) SKGAdvice ad; ad.setUUID(QStringLiteral("skgoperationplugin_transfer_nopayee")); ad.setPriority(3); - ad.setShortMessage(i18nc("Advice on making the best (short)", "Many transfers don't have payee")); - ad.setLongMessage(i18nc("Advice on making the best (long)", "Don't forget to associate a payee for each transfer.")); + ad.setShortMessage(i18nc("Advice on making the best (short)", "Many transfers do not have payee")); + ad.setLongMessage(i18nc("Advice on making the best (long)", "Do not forget to associate a payee for each transfer.")); QStringList autoCorrections; autoCorrections.push_back(QStringLiteral("skg://view_open_transfers_without_payee")); ad.setAutoCorrections(autoCorrections); @@ -1135,7 +1135,7 @@ SKGAdviceList SKGOperationPlugin::advice(const QStringList& iIgnoredAdvice) SKGAdvice ad; ad.setUUID(QStringLiteral("skgoperationplugin_commentsnotaligned")); ad.setPriority(5); - ad.setShortMessage(i18nc("Advice on making the best (short)", "Some simple operations don't have their comments aligned")); + ad.setShortMessage(i18nc("Advice on making the best (short)", "Some simple operations do not have their comments aligned")); ad.setLongMessage(i18nc("Advice on making the best (long)", "The comment of the operation is not aligned with the comment of the suboperation.")); SKGAdvice::SKGAdviceActionList autoCorrections; { @@ -1163,7 +1163,7 @@ SKGAdviceList SKGOperationPlugin::advice(const QStringList& iIgnoredAdvice) SKGAdvice ad; ad.setUUID(QStringLiteral("skgoperationplugin_datesnotaligned")); ad.setPriority(5); - ad.setShortMessage(i18nc("Advice on making the best (short)", "Some operations don't have their dates aligned")); + ad.setShortMessage(i18nc("Advice on making the best (short)", "Some operations do not have their dates aligned")); ad.setLongMessage(i18nc("Advice on making the best (long)", "The date of the operation is not aligned with the date of the suboperation. This case seems to be abnormal.")); SKGAdvice::SKGAdviceActionList autoCorrections; { diff --git a/plugins/skrooge/skrooge_operation/skgoperationpluginwidget.cpp b/plugins/skrooge/skrooge_operation/skgoperationpluginwidget.cpp index 357a5e5..f8fdf03 100644 --- a/plugins/skrooge/skrooge_operation/skgoperationpluginwidget.cpp +++ b/plugins/skrooge/skrooge_operation/skgoperationpluginwidget.cpp @@ -701,11 +701,11 @@ SKGError SKGOperationPluginWidget::updateSelection(const SKGObjectBase::SKGListS SKGSubOperationObject subOp; int nbSubop = 0; if (obj.getTable() == QStringLiteral("v_suboperation_consolidated")) { - // It's a sub operation + // It is a sub operation subOp = SKGSubOperationObject(obj.getDocument(), SKGServices::stringToInt(obj.getAttribute(QStringLiteral("i_SUBOPID")))); nbSubop = 1; } else { - // It's a real operation, we take the first one + // It is a real operation, we take the first one SKGObjectBase::SKGListSKGObjectBase subOps; IFOKDO(err, operationObj.getSubOperations(subOps)) nbSubop = subOps.count(); diff --git a/plugins/skrooge/skrooge_search/skgsearchpluginwidget.cpp b/plugins/skrooge/skrooge_search/skgsearchpluginwidget.cpp index 9494655..8f939eb 100644 --- a/plugins/skrooge/skrooge_search/skgsearchpluginwidget.cpp +++ b/plugins/skrooge/skrooge_search/skgsearchpluginwidget.cpp @@ -212,7 +212,7 @@ SKGObjectBase::SKGListSKGObjectBase SKGSearchPluginWidget::getSelectedObjects() { SKGObjectBase::SKGListSKGObjectBase list = ui.kView->getView()->getSelectedObjects(); - // Sort selection by f_sortorder. It's mandatory for reorder functions + // Sort selection by f_sortorder. It is mandatory for reorder functions qStableSort(list.begin(), list.end()); return list; diff --git a/plugins/skrooge/skrooge_unit/skgunitplugin.cpp b/plugins/skrooge/skrooge_unit/skgunitplugin.cpp index 3fb1924..ea0cb5d 100644 --- a/plugins/skrooge/skrooge_unit/skgunitplugin.cpp +++ b/plugins/skrooge/skrooge_unit/skgunitplugin.cpp @@ -354,7 +354,7 @@ SKGAdviceList SKGUnitPlugin::advice(const QStringList& iIgnoredAdvice) ad.setUUID("skgunitplugin_notdownloaded|" % unit); ad.setPriority(5); ad.setShortMessage(i18nc("Advice on making the best (short)", "Unit '%1' has not been downloaded for more than a month", unit)); - ad.setLongMessage(i18nc("Advice on making the best (long)", "Don't forget download units to have a better view of your accounts")); + ad.setLongMessage(i18nc("Advice on making the best (long)", "Do not forget download units to have a better view of your accounts")); SKGAdvice::SKGAdviceActionList autoCorrections; { SKGAdvice::SKGAdviceAction a; diff --git a/scripts/addNewImportPlugin.sh.in b/scripts/addNewImportPlugin.sh.in index 13f7122..43bedf0 100755 --- a/scripts/addNewImportPlugin.sh.in +++ b/scripts/addNewImportPlugin.sh.in @@ -18,5 +18,5 @@ do cat $i | sed -e "s,XXX,${idupper},g" | sed -e "s,xxx,${idlower},g" | sed -e "s,##DESCRIPTION##,${description},g" | sed -e "s,##AUTHOR##,${author},g" > ${P}/skrooge_import_${idlower}/${file} done -echo "Don't forget to add this line in CMakeLists.txt:" +echo "Do not forget to add this line in CMakeLists.txt:" echo " ADD_SUBDIRECTORY(skrooge_import_${idlower})" diff --git a/scripts/addNewPlugin.sh.in b/scripts/addNewPlugin.sh.in index 31ccc06..4ac5987 100755 --- a/scripts/addNewPlugin.sh.in +++ b/scripts/addNewPlugin.sh.in @@ -18,5 +18,5 @@ do cat $i | sed -e "s,XXX,${idupper},g" | sed -e "s,xxx,${idlower},g" | sed -e "s,##DESCRIPTION##,${description},g" | sed -e "s,##AUTHOR##,${author},g" > ${P}/skrooge_${idlower}/${file} done -echo "Don't forget to add this line in CMakeLists.txt:" +echo "Do not forget to add this line in CMakeLists.txt:" echo " ADD_SUBDIRECTORY(skrooge_${idlower})" diff --git a/skgbankmodeler/skgbudgetruleobject.h b/skgbankmodeler/skgbudgetruleobject.h index 1e65788..bbc0244 100644 --- a/skgbankmodeler/skgbudgetruleobject.h +++ b/skgbankmodeler/skgbudgetruleobject.h @@ -239,7 +239,7 @@ public: /** * Set the transfer to apply - * @param iMode the mode (NEXT=same category but for following budget, CURRENT=same period but for an other category, YEAR=period of same year) + * @param iMode the mode (NEXT=same category but for following budget, CURRENT=same period but for another category, YEAR=period of same year) * @param iCategory the category * @return an object managing the error * @see SKGError diff --git a/skgbankmodeler/skgcategoryobject.cpp b/skgbankmodeler/skgcategoryobject.cpp index 127ef5c..5ccc894 100644 --- a/skgbankmodeler/skgcategoryobject.cpp +++ b/skgbankmodeler/skgcategoryobject.cpp @@ -187,7 +187,7 @@ SKGError SKGCategoryObject::setParentCategory(const SKGCategoryObject& iCategory if (iCategory.getID() == 0) { err = SKGError(ERR_FAIL, i18nc("Error message", "%1 failed because linked object is not yet saved in the database." , QStringLiteral("SKGCategoryObject::setParentCategory"))); } else { - // Check if it's a loop + // Check if it is a loop SKGCategoryObject current = iCategory; do { if (current == *this) { diff --git a/skgbankmodeler/skgdocumentbank.cpp b/skgbankmodeler/skgdocumentbank.cpp index fb578dd..9d390d1 100644 --- a/skgbankmodeler/skgdocumentbank.cpp +++ b/skgbankmodeler/skgdocumentbank.cpp @@ -206,7 +206,7 @@ SKGError SKGDocumentBank::refreshViewsIndexesAndTriggers(bool iForce) negativePrefixCurrencySymbol = loc->negativePrefixCurrencySymbol(); } - // WARNING: Don't forget to update getViewVersion when this methode is modified + // WARNING: Do not forget to update getViewVersion when this method is modified /** * This constant is used to initialized the data model (trigger creation) * IF YOU MODIFY THIS METHOD, DO NOT FORGET TO MODIFY getViewsIndexesAndTriggersVersion TOO diff --git a/skgbankmodeler/skgdocumentbank.h b/skgbankmodeler/skgdocumentbank.h index c5b703a..5566049 100644 --- a/skgbankmodeler/skgdocumentbank.h +++ b/skgbankmodeler/skgdocumentbank.h @@ -62,7 +62,7 @@ public Q_SLOTS: /** * dump the document in the std output. - * It's useful for debug. + * It is useful for debug. * @param iMode to select what you want to dump. * @code * document->dump (DUMPUNIT|DUMPPARAMETERS); diff --git a/skgbankmodeler/skgimportexportmanager.cpp b/skgbankmodeler/skgimportexportmanager.cpp index 6619d27..8fed56f 100644 --- a/skgbankmodeler/skgimportexportmanager.cpp +++ b/skgbankmodeler/skgimportexportmanager.cpp @@ -764,7 +764,7 @@ SKGError SKGImportExportManager::findAndGroupTransfers(int& oNbOperationsMerged, { oNbOperationsMerged = listTmp.count(); IFOKDO(err, m_document->beginTransaction("#INTERNAL#" % i18nc("Progression step", "Find and group transfers"), oNbOperationsMerged - 1)) - for (int i = 1; !err && i < oNbOperationsMerged ; ++i) { // First line ignored because of it's header + for (int i = 1; !err && i < oNbOperationsMerged ; ++i) { // First line ignored because of its header SKGOperationObject op1(m_document, SKGServices::stringToInt(listTmp.at(i).at(0))); SKGOperationObject op2(m_document, SKGServices::stringToInt(listTmp.at(i).at(1))); diff --git a/skgbankmodeler/skgoperationobject.h b/skgbankmodeler/skgoperationobject.h index f0979ca..764aadf 100644 --- a/skgbankmodeler/skgoperationobject.h +++ b/skgbankmodeler/skgoperationobject.h @@ -295,7 +295,7 @@ public: /** * Set the import identifier of operation, t_imported is set to 'T' - * @param iImportID the import identifier (it's used to check if the operation is already imported) + * @param iImportID the import identifier (it is used to check if the operation is already imported) * @return an object managing the error * @see SKGError */ diff --git a/skgbankmodeler/skgreportbank.h b/skgbankmodeler/skgreportbank.h index 13b9d24..d57f7f2 100644 --- a/skgbankmodeler/skgreportbank.h +++ b/skgbankmodeler/skgreportbank.h @@ -37,103 +37,103 @@ class SKGBANKMODELER_EXPORT SKGReportBank : public SKGReport Q_OBJECT /** * The budget table - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(QVariantList budget_table READ getBudgetTable NOTIFY changed2) /** * The unit table - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(QVariantList unit_table READ getUnitTable NOTIFY changed2) /** * The portfolio - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(QVariantList portfolio READ getPortfolio NOTIFY changed2) /** * The account table - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(QVariantList account_table READ getAccountTable NOTIFY changed2) /** * The bank table - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(QVariantList bank_table READ getBankTable NOTIFY changed2) /** * The scheduled operations - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(QVariantList scheduled_operations READ getScheduledOperations NOTIFY changed2) /** * The main categories of the period - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(QVariantList categories_period READ getMainCategoriesForPeriod NOTIFY changed2) /** * The main categories of the previous period - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(QVariantList categories_previous_period READ getMainCategoriesForPreviousPeriod NOTIFY changed2) /** * The main categories of the period (for compatibility) - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(QVariantList categories_month READ getMainCategoriesForPeriod NOTIFY changed2) /** * The main categories of the previous period (for compatibility) - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(QVariantList categories_previous_month READ getMainCategoriesForPreviousPeriod NOTIFY changed2) /** * The income versus expenditure - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(QVariantList income_vs_expenditure READ getIncomeVsExpenditure NOTIFY changed2) /** * The net worth - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(double networth READ getNetWorth NOTIFY changed2) /** * The annual spending - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(double annual_spending READ getAnnualSpending NOTIFY changed2) /** * The personal finance score - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(double personal_finance_score READ getPersonalFinanceScore NOTIFY changed2) /** * The personal finance score details - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(QVariantMap personal_finance_score_details READ getPersonalFinanceScoreDetails NOTIFY changed2) /** * The main categories variations - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(QStringList categories_variations READ get5MainCategoriesVariation NOTIFY changed2) /** * The main categories variations which are issues (expenditure increasing or incomes decreasing - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(QStringList categories_variations_issues READ get5MainCategoriesVariationIssue NOTIFY changed2) diff --git a/skgbasegui/skgmainpanel.h b/skgbasegui/skgmainpanel.h index 75ded9b..c32f952 100644 --- a/skgbasegui/skgmainpanel.h +++ b/skgbasegui/skgmainpanel.h @@ -377,7 +377,7 @@ public Q_SLOTS: * * Actions can be set in differents groups by changing hundred: * 0 to 99 is a group - * 100 to 200 is an other group + * 100 to 200 is another group */ virtual void registerGlobalAction(const QString& iIdentifier, QAction* iAction, bool iAddInCollection = true, diff --git a/skgbasegui/skgobjectmodelbase.h b/skgbasegui/skgobjectmodelbase.h index a5cde32..5a78521 100644 --- a/skgbasegui/skgobjectmodelbase.h +++ b/skgbasegui/skgobjectmodelbase.h @@ -190,7 +190,7 @@ public: virtual SKGServices::AttributeType getAttributeType(int iIndex) const; /** - * Set the table. Don't forget to do a reset after that. + * Set the table. Do not forget to do a reset after that. * @param iTable the table name */ virtual void setTable(const QString& iTable); @@ -238,14 +238,14 @@ public: virtual SKGDocument* getDocument() const; /** - * Set the list of supported attributes. Don't forget to do a reset after that. + * Set the list of supported attributes. Do not forget to do a reset after that. * @param iListAttribute the list of attributes. If the list is empty then the default list is set. * The format of this string is the following one: attribute name[|visibility Y or N[|size]];attribute name[|visibility Y or N[|size]];... */ virtual void setSupportedAttributes(const QStringList& iListAttribute); /** - * Set the filter. Don't forget to do a reset after that. + * Set the filter. Do not forget to do a reset after that. * @param iWhereClause the where clause * @return true is the filter is really changed */ diff --git a/skgbasegui/skgtablewithgraph.cpp b/skgbasegui/skgtablewithgraph.cpp index 0e3f61b..66bf4ad 100644 --- a/skgbasegui/skgtablewithgraph.cpp +++ b/skgbasegui/skgtablewithgraph.cpp @@ -851,7 +851,7 @@ void SKGTableWithGraph::refresh() // Check all lines int nblists = criterias.count(); if (nblists && nbCols) { - for (int i = groupedTable.count() - 1; i >= 1; --i) { // The first line is not filtered because it's the title + for (int i = groupedTable.count() - 1; i >= 1; --i) { // The first line is not filtered because it is the title QStringList line = groupedTable.at(i); // Get title of the line diff --git a/skgbasemodeler/skgdocument.cpp b/skgbasemodeler/skgdocument.cpp index 3cf86ea..c98419b 100644 --- a/skgbasemodeler/skgdocument.cpp +++ b/skgbasemodeler/skgdocument.cpp @@ -486,7 +486,7 @@ SKGError SKGDocument::endTransaction(bool succeedded) err.setReturnCode(ERR_ABORT).setMessage(i18nc("Something went wrong with SQL transactions", "Closing transaction failed because too many transactions ended")); } else { stepForward(m_nbStepForTransaction.at(m_nbStepForTransaction.count() - 1)); // =100% - if (Q_LIKELY(m_nbStepForTransaction.size())) { // This test is needed. It's a security in some cases. + if (Q_LIKELY(m_nbStepForTransaction.size())) { // This test is needed. It is a security in some cases. m_nbStepForTransaction.pop_back(); m_posStepForTransaction.pop_back(); m_nameForTransaction.pop_back(); @@ -876,7 +876,7 @@ SKGError SKGDocument::groupTransactions(int iFrom, int iTo) SKGError err; SKGTRACEINFUNCRC(5, err); - ++m_inundoRedoTransaction; // It's a kind of undo redo + ++m_inundoRedoTransaction; // It is a kind of undo redo // Check if a transaction is still opened err = checkExistingTransaction(); @@ -1502,7 +1502,7 @@ SKGError SKGDocument::saveAs(const QString& name, bool overwrite) err = executeSqliteOrder(QStringLiteral("delete from doctransaction")); } - // No transaction opened ==> it's ok + // No transaction opened ==> it is ok // We mark the last transaction as a save point IFOKDO(err, executeSqliteOrder(QStringLiteral("update doctransaction set t_savestep='Y' where id in (select A.id from doctransaction A where " "NOT EXISTS(select 1 from doctransaction B where B.i_parent=A.id) " diff --git a/skgbasemodeler/skgdocument.h b/skgbasemodeler/skgdocument.h index 28573a4..29d94f5 100644 --- a/skgbasemodeler/skgdocument.h +++ b/skgbasemodeler/skgdocument.h @@ -212,7 +212,7 @@ public Q_SLOTS: * @see endTransaction * @param iName the name of the transaction * @param iNbStep the number of step in this transaction. - * It's used to call the progress callback. + * It is used to call the progress callback. * @param iDate date of the transaction. * @param iRefreshViews at the end of the transaction, computed views will be recomputed. * @return an object managing the error @@ -317,7 +317,7 @@ public Q_SLOTS: * which must be treated for an undo or a redo * @param iMode the mode * @param oName if you want also the name of the transaction - * @param oSaveStep if you want also to know if it's a save step + * @param oSaveStep if you want also to know if it is a save step * @param oDate if you want also the date of the transaction * @param oRefreshViews if you want also to know if views must be refreshed * @return the internal identifier of the last transaction @@ -546,7 +546,7 @@ public Q_SLOTS: /** * dump the document in the std output. - * It's useful for debug. + * It is useful for debug. * @param iMode the select what you want to dump. * @code * document->dump (DUMPPARAMETERS|DUMPTRANSACTIONS); @@ -852,7 +852,7 @@ public Q_SLOTS: /** * Execute a select sqlite order and return the result in @p oResult * @param iSqlOrder the sql order - * @param oResult the result of the select. It's a vector of vector of QString + * @param oResult the result of the select. It is a vector of vector of QString * @return An object managing the error * @see SKGError */ diff --git a/skgbasemodeler/skgerror.h b/skgbasemodeler/skgerror.h index 7689f0f..bd98cab 100644 --- a/skgbasemodeler/skgerror.h +++ b/skgbasemodeler/skgerror.h @@ -116,40 +116,40 @@ public: public Q_SLOTS: /** - * To know if it's an error or not - * @return true: It's an error - * false: It's not an error (it could be a warning) + * To know if it is an error or not + * @return true: It is an error + * false: It is not an error (it could be a warning) */ virtual bool isFailed() const; /** - * To know if it's an error or not - * @return true: It's not an error (it could be a warning) - * false: It's an error + * To know if it is an error or not + * @return true: It is not an error (it could be a warning) + * false: It is an error */ virtual bool isSucceeded() const; /** - * To know if it's a warning or not - * @return true: It's a warning - * false: It's not a warning + * To know if it is a warning or not + * @return true: It is a warning + * false: It is not a warning */ virtual bool isWarning() const; /** * Return the return code associated to this error - * @return 0 : It's not an error (SUCCEEDED) - * <0: It's just a warning (SUCCEEDED) - * >0: It's not error (FAILED) + * @return 0 : It is not an error (SUCCEEDED) + * <0: It is just a warning (SUCCEEDED) + * >0: It is not error (FAILED) */ virtual int getReturnCode() const; /** * Set the return code associated to this error * @param iReturnCode the return code - * 0 : It's not an error (SUCCEEDED) - * <0: It's just a warning (SUCCEEDED) - * >0: It's not error (FAILED) + * 0 : It is not an error (SUCCEEDED) + * <0: It is just a warning (SUCCEEDED) + * >0: It is not error (FAILED) * @return itself to facilitate usage */ virtual SKGError& setReturnCode(int iReturnCode); @@ -224,9 +224,9 @@ public Q_SLOTS: private: /** * the return code of the error - * 0 : It's not an error (SUCCEEDED) - * <0: It's just a warning (SUCCEEDED) - * >0: It's not error (FAILED) + * 0 : It is not an error (SUCCEEDED) + * <0: It is just a warning (SUCCEEDED) + * >0: It is not error (FAILED) */ int m_rc; diff --git a/skgbasemodeler/skgnodeobject.cpp b/skgbasemodeler/skgnodeobject.cpp index 12a07b2..b3afbee 100644 --- a/skgbasemodeler/skgnodeobject.cpp +++ b/skgbasemodeler/skgnodeobject.cpp @@ -239,7 +239,7 @@ SKGError SKGNodeObject::setParentNode(const SKGNodeObject& iNode) if (iNode.getID() == 0) { err = SKGError(ERR_FAIL, i18nc("Error message: Something failed because of a database issue", "%1 failed because linked object is not yet saved in the database.", QStringLiteral("SKGNodeObject::setParentNode"))); } else { - // Check if it's a loop + // Check if it is a loop SKGNodeObject current = iNode; do { if (current == *this) { diff --git a/skgbasemodeler/skgobjectbase.h b/skgbasemodeler/skgobjectbase.h index 695e8c4..041a5db 100644 --- a/skgbasemodeler/skgobjectbase.h +++ b/skgbasemodeler/skgobjectbase.h @@ -152,7 +152,7 @@ public: /** * Reset the ID of this object. - * It's used to create a new object based on an existing one. + * It is used to create a new object based on an existing one. * By reseting the ID, the save will try an INSERT instead of an UPDATE. * @return an object managing the error * @see SKGError @@ -198,7 +198,7 @@ public: virtual QString getAttribute(const QString& iName) const; /** - * Get the value for an attribute for an other view + * Get the value for an attribute for another view * @param iView the name of the view * @param iName the name of the attribute * @return the value of this attribute diff --git a/skgbasemodeler/skgreport.h b/skgbasemodeler/skgreport.h index 926a019..4c9b83b 100644 --- a/skgbasemodeler/skgreport.h +++ b/skgbasemodeler/skgreport.h @@ -41,25 +41,25 @@ class SKGBASEMODELER_EXPORT SKGReport : public QObject /** * The month (for compatibility in templates) - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(QString month READ getPeriod NOTIFY changed) /** * The previous object - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(SKGReport* previous READ getPrevious NOTIFY changed) /** * The previous period - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(QString previous_period READ getPreviousPeriod NOTIFY changed) /** * The previous month (for compatibility in templates) - * WARNING: Notification is launched only when cleanCache or setPeriod are called. So don't forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded + * WARNING: Notification is launched only when cleanCache or setPeriod are called. So do not forget to connect cleanCache with SKGDocument::transactionSuccessfullyEnded */ Q_PROPERTY(QString previous_month READ getPreviousPeriod NOTIFY changed) diff --git a/skgbasemodeler/skgservices.h b/skgbasemodeler/skgservices.h index 8ae1a61..5b84c80 100644 --- a/skgbasemodeler/skgservices.h +++ b/skgbasemodeler/skgservices.h @@ -412,7 +412,7 @@ public: /** * Copy a sqlite database from memory to file or from file to memory. - * It's used to do a load or a save + * It is used to do a load or a save * @param iFileDb the sqlite pointer corresponding to a file database * @param iMemoryDb the sqlite pointer corresponding to memory database * @param iFromFileToMemory @@ -477,7 +477,7 @@ public: * Execute a select sqlite order and return the result in @p oResult * @param iDb A database pointer * @param iSqlOrder the sql order - * @param oResult the result of the select. It's a vector of vector of QString + * @param oResult the result of the select. It is a vector of vector of QString * @return An object managing the error * @see SKGError */ diff --git a/skgbasemodeler/skgtraces.cpp b/skgbasemodeler/skgtraces.cpp index 0734ff2..996d34e 100644 --- a/skgbasemodeler/skgtraces.cpp +++ b/skgbasemodeler/skgtraces.cpp @@ -78,7 +78,7 @@ void SKGTraces::init(int iLevel, const QString& iName, SKGError* iRC) m_profiling = true; m_mame = iName; - // Push the methode in the stack + // Push the method in the stack SKGTraces::m_SKGPerfoPathMethode.push(m_mame); // Pour les mesures de perfos @@ -155,10 +155,10 @@ SKGTraces::~SKGTraces() } if (!SKGTraces::m_SKGPerfoPathMethode.empty() && SKGTraces::m_SKGPerfoPathMethode.top() == m_mame) { - // Remove current methode from stack + // Remove current method from stack SKGTraces::m_SKGPerfoPathMethode.pop(); - // Get previous methode name + // Get previous method name if (!SKGTraces::m_SKGPerfoPathMethode.empty()) { QString previousMethode = SKGTraces::m_SKGPerfoPathMethode.top(); diff --git a/skgbasemodeler/skgtraces.h b/skgbasemodeler/skgtraces.h index 5f3f050..370d1c8 100644 --- a/skgbasemodeler/skgtraces.h +++ b/skgbasemodeler/skgtraces.h @@ -66,15 +66,15 @@ * This structure represents one performance measure */ struct SKGPerfoInfo { - /** The number of call for the methode */ + /** The number of call for the method */ int NbCall; - /** The global time passed in the methode */ + /** The global time passed in the method */ double Time; - /** The time consumed by the methode */ + /** The time consumed by the method */ double TimePropre; - /** The minimum time passed in the methode */ + /** The minimum time passed in the method */ double TimeMin; - /** The maximum time passed in the methode */ + /** The maximum time passed in the method */ double TimeMax; }; @@ -109,7 +109,7 @@ public: * @param iLevel The level to display this error. * The error will be display if the level of traces asked is greater or equal than * the level of this trace (iLevel) - * @param iRC A pointer of the error object of the calling methode + * @param iRC A pointer of the error object of the calling method * The SKGError */ explicit SKGTraces(int iLevel, const char* iName, SKGError* iRC); @@ -120,7 +120,7 @@ public: * @param iLevel The level to display this error. * The error will be display if the level of traces asked is greater or equal than * the level of this trace (iLevel) - * @param iRC A pointer of the error object of the calling methode + * @param iRC A pointer of the error object of the calling method * The SKGError */ SKGTraces(int iLevel, const QString& iName, SKGError* iRC); diff --git a/skgbasemodeler/skgtransactionmng.h b/skgbasemodeler/skgtransactionmng.h index 960eeed..2074acc 100644 --- a/skgbasemodeler/skgtransactionmng.h +++ b/skgbasemodeler/skgtransactionmng.h @@ -122,7 +122,7 @@ public: * @param iError A pointer of the error object of the calling scope * @param iNbStep the number of step in this transaction. * @param iRefreshViews at the end of the transaction, computed views will be recomputed. - * It's used to call the progress callback. + * It is used to call the progress callback. * @see The SKGError */ explicit SKGTransactionMng(SKGDocument* iDocument, const QString& iName, SKGError* iError, int iNbStep = 1, bool iRefreshViews = true); diff --git a/tests/skgbankmodelertest/skgtestobjects.cpp b/tests/skgbankmodelertest/skgtestobjects.cpp index 6323a3f..a35ff52 100644 --- a/tests/skgbankmodelertest/skgtestobjects.cpp +++ b/tests/skgbankmodelertest/skgtestobjects.cpp @@ -164,8 +164,8 @@ int main(int argc, char** argv) // Test units SKGTESTERROR(QStringLiteral("BANK:addOrModifyUnitValue"), document1.addOrModifyUnitValue(QStringLiteral("E"), now, 1), true); - SKGTESTERROR(QStringLiteral("BANK:addOrModifyUnitValue"), document1.addOrModifyUnitValue(QStringLiteral("$"), now, 1.6), true); // Oups, it's an error - SKGTESTERROR(QStringLiteral("BANK:addOrModifyUnitValue"), document1.addOrModifyUnitValue(QStringLiteral("$"), now, 0.625), true); // it's better now + SKGTESTERROR(QStringLiteral("BANK:addOrModifyUnitValue"), document1.addOrModifyUnitValue(QStringLiteral("$"), now, 1.6), true); // Oups, it is an error + SKGTESTERROR(QStringLiteral("BANK:addOrModifyUnitValue"), document1.addOrModifyUnitValue(QStringLiteral("$"), now, 0.625), true); // it is better now SKGTESTERROR(QStringLiteral("BANK:getDistinctValues"), document1.getDistinctValues(QStringLiteral("unitvalue"), QStringLiteral("rd_unit_id"), oResult), true); SKGTEST(QStringLiteral("BANK:oResult.size"), oResult.size(), 2); } _______________________________________________ kde-doc-english mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-doc-english
