Merge branch 'maint'

2025-02-25 18:55:30 -06:00 · 2022-11-27 16:12:46 +08:00
parent 3e5fcc8709 5dc52459a1
commit bfc325f63c
18 changed files with 932 additions and 1000 deletions
--- a/bindings/engine.i
+++ b/bindings/engine.i
@@ -154,8 +154,6 @@ functions. */
 %newobject gnc_localtime;
 %newobject gnc_gmtime;

-%newobject gnc_budget_get_account_period_note;
-
 /* Parse the header file to generate wrappers */
 %inline {
  static QofIdType QOF_ID_BOOK_SCM (void) { return QOF_ID_BOOK; }
--- a/gnucash/gnome/assistant-stock-transaction.cpp
+++ b/gnucash/gnome/assistant-stock-transaction.cpp
@@ -239,7 +239,7 @@ reinvested must be subsequently recorded as a regular stock purchase.")
        FieldMask::ENABLED_DEBIT,          // stock_amt
        true,                              // input_new_balance
        FieldMask::DISABLED,               // stock_val
-        FieldMask::DISABLED,               // cash_amt
+        FieldMask::ENABLED_CREDIT | FieldMask::ALLOW_ZERO,          // cash_amt
        FieldMask::ENABLED_DEBIT | FieldMask::ALLOW_ZERO,          // fees_amt
        true,                   // fees_capitalize
        FieldMask::DISABLED,               // dividend_amt
@@ -253,7 +253,7 @@ reinvested must be subsequently recorded as a regular stock purchase.")
        FieldMask::ENABLED_CREDIT,         // stock_amt
        true,                              // input_new_balance
        FieldMask::DISABLED,               // stock_val
-        FieldMask::DISABLED,               // cash_amt
+        FieldMask::ENABLED_CREDIT | FieldMask::ALLOW_ZERO,          // cash_amt
        FieldMask::ENABLED_DEBIT | FieldMask::ALLOW_ZERO,          // fees_amt
        true,                   // fees_capitalize
        FieldMask::DISABLED,               // dividend_amt
@@ -344,7 +344,7 @@ static const TxnTypeVec short_types
        FieldMask::ENABLED_CREDIT,         // stock_amt
        true,                              // input_new_balance
        FieldMask::DISABLED,               // stock_val
-        FieldMask::DISABLED,               // cash_amt
+        FieldMask::ENABLED_CREDIT | FieldMask::ALLOW_ZERO,          // cash_amt
        FieldMask::ENABLED_DEBIT | FieldMask::ALLOW_ZERO,          // fees_amt
        true,                   // fees_capitalize
        FieldMask::DISABLED,               // dividend_amt
@@ -358,7 +358,7 @@ static const TxnTypeVec short_types
        FieldMask::ENABLED_DEBIT,          // stock_amt
        true,                              // input_new_balance
        FieldMask::DISABLED,               // stock_val
-        FieldMask::DISABLED,               // cash_amt
+        FieldMask::ENABLED_CREDIT | FieldMask::ALLOW_ZERO,          // cash_amt
        FieldMask::ENABLED_DEBIT | FieldMask::ALLOW_ZERO,          // fees_amt
        true,                   // fees_capitalize
        FieldMask::DISABLED,               // dividend_amt
--- a/gnucash/gnome/gnc-budget-view.c
+++ b/gnucash/gnome/gnc-budget-view.c
@@ -925,7 +925,7 @@ query_tooltip_tree_view_cb (GtkWidget *widget, gint x, gint y,
    GncBudgetViewPrivate *priv = GNC_BUDGET_VIEW_GET_PRIVATE(view);
    GtkTreePath          *path  = NULL;
    GtkTreeViewColumn    *column = NULL;
-    gchar                *note;
+    const gchar          *note;
    guint                 period_num;
    Account              *account;

@@ -962,7 +962,6 @@ query_tooltip_tree_view_cb (GtkWidget *widget, gint x, gint y,
    gtk_tooltip_set_text (tooltip, note);
    gtk_tree_view_set_tooltip_cell (tree_view, tooltip, path, column, NULL);
    gtk_tree_path_free (path);
-    g_free (note);

    return TRUE;
 }
@@ -1085,7 +1084,7 @@ budget_col_source (Account *account, GtkTreeViewColumn *col,
    guint period_num;
    gnc_numeric numeric;
    gchar amtbuff[100]; //FIXME: overkill, where's the #define?
-    gchar *note;
+    const gchar *note;

    budget_view = GNC_BUDGET_VIEW(g_object_get_data (G_OBJECT(col), "budget_view"));
    period_num = GPOINTER_TO_UINT(g_object_get_data (G_OBJECT(col), "period_num"));
@@ -1149,7 +1148,6 @@ budget_col_source (Account *account, GtkTreeViewColumn *col,

    note = gnc_budget_get_account_period_note (priv->budget, account, period_num);
    g_object_set (cell, "flagged", note != NULL, NULL);
-    g_free (note);

    return g_strdup (amtbuff);
 }
--- a/gnucash/gnome/gnc-plugin-budget.c
+++ b/gnucash/gnome/gnc-plugin-budget.c
@@ -345,7 +345,11 @@ gnc_budget_gui_select_budget (GtkWindow *parent, QofBook *book)
    bgt = gnc_budget_get_default (book);

    if (bgt && gnc_tree_model_budget_get_iter_for_budget (tm, &iter, bgt))
-        gtk_tree_view_set_cursor (tv, gtk_tree_model_get_path (tm, &iter), NULL, FALSE);
+    {
+        GtkTreePath *path = gtk_tree_model_get_path (tm, &iter);
+        gtk_tree_view_set_cursor (tv, path, NULL, FALSE);
+        gtk_tree_path_free (path);
+    }

    bgt = NULL;
    response = gtk_dialog_run (dlg);
--- a/gnucash/gnome/gnc-plugin-page-budget.c
+++ b/gnucash/gnome/gnc-plugin-page-budget.c
@@ -1287,9 +1287,8 @@ gnc_plugin_page_budget_cmd_budget_note(GtkAction *action,
        GTK_WINDOW(gnc_plugin_page_get_window(GNC_PLUGIN_PAGE(page))));

    note = GTK_WIDGET(gtk_builder_get_object(builder, "BudgetNote"));
-    txt  = gnc_budget_get_account_period_note(priv->budget, acc, period_num);
-    xxxgtk_textview_set_text(GTK_TEXT_VIEW(note), txt);
-    g_free (txt);
+    xxxgtk_textview_set_text(GTK_TEXT_VIEW(note),
+                             gnc_budget_get_account_period_note(priv->budget, acc, period_num));

    gtk_widget_show_all(dialog);
    result = gtk_dialog_run(GTK_DIALOG(dialog));
--- a/gnucash/gnome/gnc-plugin-page-register.c
+++ b/gnucash/gnome/gnc-plugin-page-register.c
@@ -5231,6 +5231,11 @@ gnc_plugin_page_help_changed_cb (GNCSplitReg* gsr,
        return;
    }

+    // only update status text if on current page
+    if (GNC_IS_MAIN_WINDOW(window) && (gnc_main_window_get_current_page 
+       (GNC_MAIN_WINDOW(window)) != GNC_PLUGIN_PAGE(register_page)))
+       return;
+
    /* Get the text from the ledger */
    priv = GNC_PLUGIN_PAGE_REGISTER_GET_PRIVATE (register_page);
    reg = gnc_ledger_display_get_split_register (priv->ledger);
--- a/gnucash/register/register-gnome/gnucash-item-list.c
+++ b/gnucash/register/register-gnome/gnucash-item-list.c
@@ -224,7 +224,6 @@ gnc_item_list_show_selected (GncItemList* item_list)
 {
    GtkTreeSelection* selection;
    GtkTreeIter iter;
-    GtkTreePath* path;
    GtkTreeModel* model;

    g_return_if_fail (item_list != NULL);
@@ -234,10 +233,11 @@ gnc_item_list_show_selected (GncItemList* item_list)

    if (gtk_tree_selection_get_selected (selection, &model, &iter))
    {
-        path = gtk_tree_model_get_path (model, &iter);
+        GtkTreePath* path = gtk_tree_model_get_path (model, &iter);

        gtk_tree_view_scroll_to_cell (item_list->tree_view,
                                      path, NULL, TRUE, 0.5, 0.0);
+        gtk_tree_path_free (path);
    }
 }

--- a/gnucash/report/reports/standard/balsheet-pnl.scm
+++ b/gnucash/report/reports/standard/balsheet-pnl.scm
@@ -1116,7 +1116,7 @@ also show overall period profit & loss."))

        (if (and common-currency show-rates?)
            (add-to-table multicol-table-right (G_ "Exchange Rates")
-                          asset-liability
+                          (append asset-liability equity-accounts)
                          #:get-col-header-fn get-exchange-rates-fn
                          #:show-accounts? #f
                          #:show-total? #f))
--- a/gnucash/report/reports/standard/ifrs-cost-basis.scm
+++ b/gnucash/report/reports/standard/ifrs-cost-basis.scm
@@ -198,11 +198,11 @@ the split action field to detect capitalized fees on stock activity")
   (list N100 N100 N011 N000 N011 N000 N111 #f #t "Sell")
   (list N000 N000 N001 N000 N011 N100 N000 #f #f "Dividend")
   (list N001 N001 N001 N011 N000 N100 N000 #t #f "Dividend reinvestment (w/ remainder)")
-   (list N001 N001 N000 N011 N000 N100 N000 #t #f "Dividend reinvestment (w/o remainder)")
+   (list N001 N001 N110 N011 N000 N100 N000 #t #f "Dividend reinvestment (w/o remainder)")
   (list N000 N100 N001 N011 N000 N000 N000 #t #f "Return of Capital")
   (list N000 N001 N000 N000 N011 N100 N000 #t #f "Notional distribution")
-   (list N001 N000 N000 N011 N000 N000 N000 #f #f "Stock split")
-   (list N100 N000 N000 N011 N000 N000 N000 #f #f "Reverse split")
+   (list N001 N000 N110 N011 N000 N000 N000 #f #f "Stock split")
+   (list N100 N000 N110 N011 N000 N000 N000 #f #f "Reverse split")
   (list N100 N100 N001 N000 N011 N000 N111 #f #t "Reverse split w/ cash in lieu for fractionals")))

 (define short-types
@@ -210,12 +210,10 @@ the split action field to detect capitalized fees on stock activity")
   (list N100 N100 N001 N011 N000 N000 N000 #t #f "Short Sell")
   (list N001 N001 N110 N000 N011 N000 N111 #f #t "Cover Buy")
   (list N000 N000 N100 N000 N011 N001 N000 #f #f "Compensatory dividend")
-   (list N000 N000 N000 N011 N000 N000 N000 #t #f "Dividend reinvestment (w remainder)")
-   (list N000 N000 N000 N011 N000 N000 N000 #t #f "Dividend reinvestment (w/o remainder)")
   (list N000 N001 N100 N011 N000 N000 N000 #t #f "Compensatory return of capital")
   (list N000 N100 N000 N000 N011 N001 N000 #t #f "Compensatory notional distribution")
-   (list N100 N000 N000 N011 N000 N000 N000 #f #f "Stock split")
-   (list N001 N000 N000 N011 N000 N000 N000 #f #f "Reverse split")
+   (list N100 N000 N110 N011 N000 N000 N000 #f #f "Stock split")
+   (list N001 N000 N110 N011 N000 N000 N000 #f #f "Reverse split")
   (list N001 N001 N100 N000 N011 N000 N111 #f #t "Reverse split w/ cash in lieu for fractionals")))

 (define (cmp amt neg zero pos)
--- a/libgnucash/engine/gnc-budget.cpp
+++ b/libgnucash/engine/gnc-budget.cpp
@@ -23,10 +23,6 @@
 \********************************************************************/

 #include <config.h>
-#include <glib.h>
-#include <glib/gprintf.h>
-#include <glib/gi18n.h>
-#include <time.h>
 #include <qof.h>
 #include <qofbookslots.h>
 #include <qofinstance-p.h>
@@ -67,6 +63,11 @@ struct PeriodData
    std::string note;
    bool value_is_set;
    gnc_numeric value;
+    PeriodData () = default;
+    PeriodData (const char* note, bool value_is_set, gnc_numeric value)
+        : note (note)
+        , value_is_set (value_is_set)
+        , value (value) {};
 };

 using PeriodDataVec = std::vector<PeriodData>;
@@ -470,6 +471,7 @@ gnc_budget_set_num_periods(GncBudget* budget, guint num_periods)
    GncBudgetPrivate* priv;

    g_return_if_fail(GNC_IS_BUDGET(budget));
+    g_return_if_fail(num_periods > 0);

    priv = GET_PRIVATE(budget);
    if ( priv->num_periods == num_periods ) return;
@@ -642,13 +644,13 @@ gnc_budget_set_account_period_note(GncBudget *budget, const Account *account,

 }

-gchar *
+const gchar *
 gnc_budget_get_account_period_note (const GncBudget *budget,
                                    const Account *account, guint period_num)
 {
    g_return_val_if_fail (period_num < GET_PRIVATE(budget)->num_periods, nullptr);
    auto& data = get_perioddata (budget, account, period_num);
-    return data.note.empty () ? nullptr : g_strdup (data.note.c_str());
+    return data.note.empty () ? nullptr : data.note.c_str();
 }

 time64
@@ -683,35 +685,27 @@ get_perioddata (const GncBudget *budget, const Account *account, guint period_nu
    if (period_num >= priv->num_periods)
        throw std::out_of_range("period_num >= num_periods");

-    auto& map = priv->acct_map;
-    auto map_iter = map->find (account);
+    auto& vec = priv->acct_map->operator[](account);

-    if (map_iter == map->end ())
+    if (vec.empty())
    {
        auto budget_kvp { QOF_INSTANCE (budget)->kvp_data };
-
-        PeriodDataVec vec {};
        vec.reserve (priv->num_periods);

        for (guint i = 0; i < priv->num_periods; i++)
        {
-            std::string note;
            auto kval1 { budget_kvp->get_slot (make_period_data_path (account, i)) };
            auto kval2 { budget_kvp->get_slot (make_period_note_path (account, i)) };

            auto is_set = kval1 && kval1->get_type() == KvpValue::Type::NUMERIC;
            auto num = is_set ? kval1->get<gnc_numeric>() : gnc_numeric_zero ();
+            auto note = (kval2 && kval2->get_type() == KvpValue::Type::STRING) ?
+                kval2->get<const char*>() : "";

-            if (kval2 && kval2->get_type() == KvpValue::Type::STRING)
-                note = kval2->get<const char*>();
-
-            PeriodData data { std::move (note), is_set, num };
-            vec.push_back (std::move(data));
+            vec.emplace_back (note, is_set, num);
        }
-        map_iter = map->insert_or_assign(account, std::move(vec)).first;
    }

-    auto& vec = map_iter->second;
    return vec.at(period_num);
 }

--- a/libgnucash/engine/gnc-budget.h
+++ b/libgnucash/engine/gnc-budget.h
@@ -161,11 +161,10 @@ gnc_numeric gnc_budget_get_account_period_value(
 gnc_numeric gnc_budget_get_account_period_actual_value(
    const GncBudget *budget, Account *account, guint period_num);

-/* get/set the budget account period's note, beware when retrieving
-   the period note, the latter must be g_freed by the caller */
+/* get/set the budget account period's note */
 void gnc_budget_set_account_period_note(GncBudget *budget,
    const Account *account, guint period_num, const gchar *note);
-gchar *gnc_budget_get_account_period_note (const GncBudget *budget,
+const gchar *gnc_budget_get_account_period_note (const GncBudget *budget,
    const Account *account, guint period_num);

 /* Returns some budget in the book, or NULL. */
--- a/libgnucash/engine/gncInvoice.c
+++ b/libgnucash/engine/gncInvoice.c
@@ -379,7 +379,10 @@ GncInvoice *gncInvoiceCopy (const GncInvoice *from)
    // Oops. Do not forget to copy the pointer to the correct currency here.
    invoice->currency = from->currency;

-    invoice->doclink = from->doclink;
+    if (from->doclink == is_unset)
+        invoice->doclink = (char*)is_unset;
+    else
+        gncInvoiceSetDocLink (invoice, from->doclink);

    // Copy all invoice->entries
    for (node = from->entries; node; node = node->next)
--- a/libgnucash/engine/mocks/fake-qofquery.cpp
+++ b/libgnucash/engine/mocks/fake-qofquery.cpp
@@ -59,8 +59,8 @@ public:
    {
        ASSERT_TRUE(query_used((QofQuery*)query));
        auto it = std::find(m_queriesUsed.begin(), m_queriesUsed.end(), query);
-        m_queriesUsed.erase(it);
        m_queriesConsumed.push_back(*it);
+        m_queriesUsed.erase(it);
    }

    /* Remove a formerly added QofFakeQueryObject from the pool */
--- a/libgnucash/engine/test/utest-Budget.c
+++ b/libgnucash/engine/test/utest-Budget.c
@@ -78,7 +78,7 @@ test_gnc_set_budget_num_periods_data_retention ()
    QofBook *book = qof_book_new();
    GncBudget* budget = gnc_budget_new(book);
    Account *acc = gnc_account_create_root(book);
-    gchar *note;
+    const gchar *note;

    /* initially has 20 periods */
    gnc_budget_set_num_periods(budget, 20);
@@ -100,7 +100,6 @@ test_gnc_set_budget_num_periods_data_retention ()
    g_assert (!gnc_budget_is_account_period_value_set(budget, acc, 15));
    note = gnc_budget_get_account_period_note (budget, acc, 11);
    g_assert_cmpstr (note, ==, NULL);
-    g_free (note);

    gnc_budget_destroy(budget);
    qof_book_destroy(book);
--- a/po/glossary/mk.po
+++ b/po/glossary/mk.po
--- a/po/mk.po
+++ b/po/mk.po
@@ -3,78 +3,81 @@
 # This file is distributed under the same license as the GnuCash package.
 # Automatically generated, 2022.
 #
+# Vesna Micajkova <vmicajkova@institutpraktikum.mk>, 2022.
 msgid ""
 msgstr ""
 "Project-Id-Version: GnuCash 4.12\n"
-"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug.cgi?"
-"product=GnuCash&component=Translations\n"
+"Report-Msgid-Bugs-To: https://bugs.gnucash.org/enter_bug."
+"cgi?product=GnuCash&component=Translations\n"
 "POT-Creation-Date: 2022-11-08 02:22+0100\n"
-"PO-Revision-Date: 2022-11-08 02:22+0100\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
+"PO-Revision-Date: 2022-11-25 16:48+0000\n"
+"Last-Translator: Vesna Micajkova <vmicajkova@institutpraktikum.mk>\n"
+"Language-Team: Macedonian <https://hosted.weblate.org/projects/gnucash/"
+"gnucash/mk/>\n"
 "Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"Plural-Forms: nplurals=2; plural=n==1 || n%10==1 ? 0 : 1;\n"
+"X-Generator: Weblate 4.15-dev\n"

 #: borrowed/goffice/go-charmap-sel.c:70
 msgid "Arabic"
-msgstr ""
+msgstr "Арапски"

 #: borrowed/goffice/go-charmap-sel.c:71
 msgid "Baltic"
-msgstr ""
+msgstr "Балтички"

 #: borrowed/goffice/go-charmap-sel.c:72
 msgid "Central European"
-msgstr ""
+msgstr "Централноевропски"

 #: borrowed/goffice/go-charmap-sel.c:73
 msgid "Chinese"
-msgstr ""
+msgstr "Кинески"

 #: borrowed/goffice/go-charmap-sel.c:74
 #: gnucash/gnome-utils/assistant-xml-encoding.c:242
 msgid "Cyrillic"
-msgstr ""
+msgstr "Кирилица"

 #: borrowed/goffice/go-charmap-sel.c:75
 msgid "Greek"
-msgstr ""
+msgstr "Грчки"

 #: borrowed/goffice/go-charmap-sel.c:76
 msgid "Hebrew"
-msgstr ""
+msgstr "Еврејски"

 #: borrowed/goffice/go-charmap-sel.c:77
 msgid "Indian"
-msgstr ""
+msgstr "Индиски"

 #: borrowed/goffice/go-charmap-sel.c:78
 msgid "Japanese"
-msgstr ""
+msgstr "Јапонски"

 #: borrowed/goffice/go-charmap-sel.c:79
 msgid "Korean"
-msgstr ""
+msgstr "Корејски"

 #: borrowed/goffice/go-charmap-sel.c:80
 msgid "Turkish"
-msgstr ""
+msgstr "турски"

 #: borrowed/goffice/go-charmap-sel.c:81
 #: gnucash/gnome-utils/assistant-xml-encoding.c:224
 msgid "Unicode"
-msgstr ""
+msgstr "Unicode"

 #: borrowed/goffice/go-charmap-sel.c:82
 msgid "Vietnamese"
-msgstr ""
+msgstr "виетнамски"

 #: borrowed/goffice/go-charmap-sel.c:83
 msgid "Western"
-msgstr ""
+msgstr "западен"

 #: borrowed/goffice/go-charmap-sel.c:84
 #: gnucash/gtkbuilder/assistant-loan.glade:966
@@ -82,343 +85,343 @@ msgstr ""
 #: gnucash/report/reports/standard/account-piecharts.scm:473
 #: gnucash/report/reports/standard/category-barchart.scm:564
 msgid "Other"
-msgstr ""
+msgstr "останато"

 #: borrowed/goffice/go-charmap-sel.c:115
 msgid "Arabic (IBM-864)"
-msgstr ""
+msgstr "арапски (IBM-864)"

 #: borrowed/goffice/go-charmap-sel.c:116
 msgid "Arabic (IBM-864-I)"
-msgstr ""
+msgstr "арапски (IBM-864-I)"

 #: borrowed/goffice/go-charmap-sel.c:117
 msgid "Arabic (ISO-8859-6)"
-msgstr ""
+msgstr "арапски (ISO-8859-6)"

 #: borrowed/goffice/go-charmap-sel.c:118
 msgid "Arabic (ISO-8859-6-E)"
-msgstr ""
+msgstr "арапски (ISO-8859-6-E)"

 #: borrowed/goffice/go-charmap-sel.c:120
 msgid "Arabic (ISO-8859-6-I)"
-msgstr ""
+msgstr "арапски (ISO-8859-6-I)"

 #: borrowed/goffice/go-charmap-sel.c:121
 msgid "Arabic (MacArabic)"
-msgstr ""
+msgstr "арапски (MacArabic)"

 #: borrowed/goffice/go-charmap-sel.c:122
 msgid "Arabic (Windows-1256)"
-msgstr ""
+msgstr "арапски (Windows-1256)"

 #: borrowed/goffice/go-charmap-sel.c:123
 msgid "Armenian (ARMSCII-8)"
-msgstr ""
+msgstr "ерменски (ARMSCII-8)"

 #: borrowed/goffice/go-charmap-sel.c:124
 msgid "Baltic (ISO-8859-13)"
-msgstr ""
+msgstr "балтички (ISO-8859-13)"

 #: borrowed/goffice/go-charmap-sel.c:125
 msgid "Baltic (ISO-8859-4)"
-msgstr ""
+msgstr "балтички (ISO-8859-4)"

 #: borrowed/goffice/go-charmap-sel.c:126
 msgid "Baltic (Windows-1257)"
-msgstr ""
+msgstr "балтички (Windows-1257)"

 #: borrowed/goffice/go-charmap-sel.c:127
 msgid "Celtic (ISO-8859-14)"
-msgstr ""
+msgstr "целтички (ISO-8859-14)"

 #: borrowed/goffice/go-charmap-sel.c:128
 msgid "Central European (IBM-852)"
-msgstr ""
+msgstr "централно европски (IBM-852)"

 #: borrowed/goffice/go-charmap-sel.c:130
 msgid "Central European (ISO-8859-2)"
-msgstr ""
+msgstr "централно европски (ISO-8859-2)"

 #: borrowed/goffice/go-charmap-sel.c:132
 msgid "Central European (MacCE)"
-msgstr ""
+msgstr "централно европски (MacCE)"

 #: borrowed/goffice/go-charmap-sel.c:134
 msgid "Central European (Windows-1250)"
-msgstr ""
+msgstr "централно европски (Windows-1250)"

 #: borrowed/goffice/go-charmap-sel.c:136
 msgid "Chinese Simplified (GB18030)"
-msgstr ""
+msgstr "кинески поедноставено (GB18030)"

 #: borrowed/goffice/go-charmap-sel.c:137
 msgid "Chinese Simplified (GB2312)"
-msgstr ""
+msgstr "кинески поедноставено (GB2312)"

 #: borrowed/goffice/go-charmap-sel.c:138
 msgid "Chinese Simplified (GBK)"
-msgstr ""
+msgstr "Кинески поедноставено (GBK)"

 #: borrowed/goffice/go-charmap-sel.c:139
 msgid "Chinese Simplified (HZ)"
-msgstr ""
+msgstr "Кинески поедноставено (HZ)"

 #: borrowed/goffice/go-charmap-sel.c:140
 msgid "Chinese Simplified (Windows-936)"
-msgstr ""
+msgstr "Кинески поедноставено (Windows-936)"

 #: borrowed/goffice/go-charmap-sel.c:142
 msgid "Chinese Traditional (Big5)"
-msgstr ""
+msgstr "Кинески традиционално (Big5)"

 #: borrowed/goffice/go-charmap-sel.c:143
 msgid "Chinese Traditional (Big5-HKSCS)"
-msgstr ""
+msgstr "Традиционален кинески (Big5-HKSCS)"

 #: borrowed/goffice/go-charmap-sel.c:145
 msgid "Chinese Traditional (EUC-TW)"
-msgstr ""
+msgstr "Традиционален кинески (EUC-TW)"

 #: borrowed/goffice/go-charmap-sel.c:147
 msgid "Croatian (MacCroatian)"
-msgstr ""
+msgstr "хрватски (MacХрватски)"

 #: borrowed/goffice/go-charmap-sel.c:149
 msgid "Cyrillic (IBM-855)"
-msgstr ""
+msgstr "кирилица (IBM-855)"

 #: borrowed/goffice/go-charmap-sel.c:150
 msgid "Cyrillic (ISO-8859-5)"
-msgstr ""
+msgstr "кирилица (ISO-8859-5)"

 #: borrowed/goffice/go-charmap-sel.c:152
 msgid "Cyrillic (ISO-IR-111)"
-msgstr ""
+msgstr "кирилица (ISO-IR-111)"

 #: borrowed/goffice/go-charmap-sel.c:154
 msgid "Cyrillic (KOI8-R)"
-msgstr ""
+msgstr "кирилица (KOI8-R)"

 #: borrowed/goffice/go-charmap-sel.c:155
 msgid "Cyrillic (MacCyrillic)"
-msgstr ""
+msgstr "кирилица  (MacCyrillic)"

 #: borrowed/goffice/go-charmap-sel.c:157
 msgid "Cyrillic (Windows-1251)"
-msgstr ""
+msgstr "кирилица (Windows-1251)"

 #: borrowed/goffice/go-charmap-sel.c:159
 msgid "Russian (CP-866)"
-msgstr ""
+msgstr "руски (CP-866)"

 #: borrowed/goffice/go-charmap-sel.c:160
 msgid "Ukrainian (KOI8-U)"
-msgstr ""
+msgstr "украински (KOI8-U)"

 #: borrowed/goffice/go-charmap-sel.c:161
 msgid "Ukrainian (MacUkrainian)"
-msgstr ""
+msgstr "украински (MacUkrainian)"

 #: borrowed/goffice/go-charmap-sel.c:163
 msgid "English (ASCII)"
-msgstr ""
+msgstr "англиски (ASCII)"

 #: borrowed/goffice/go-charmap-sel.c:165
 msgid "Farsi (MacFarsi)"
-msgstr ""
+msgstr "фарси (MacFarsi)"

 #: borrowed/goffice/go-charmap-sel.c:166
 msgid "Georgian (GEOSTD8)"
-msgstr ""
+msgstr "естонски (GEOSTD8)"

 #: borrowed/goffice/go-charmap-sel.c:167
 msgid "Greek (ISO-8859-7)"
-msgstr ""
+msgstr "грчки (ISO-8859-7)"

 #: borrowed/goffice/go-charmap-sel.c:168
 msgid "Greek (MacGreek)"
-msgstr ""
+msgstr "грчки (MacGreek)"

 #: borrowed/goffice/go-charmap-sel.c:169
 msgid "Greek (Windows-1253)"
-msgstr ""
+msgstr "грчки (Windows-1253)"

 #: borrowed/goffice/go-charmap-sel.c:170
 msgid "Gujarati (MacGujarati)"
-msgstr ""
+msgstr "Гујарани (MacGujarati)"

 #: borrowed/goffice/go-charmap-sel.c:172
 msgid "Gurmukhi (MacGurmukhi)"
-msgstr ""
+msgstr "Гурмукхи (MacGurmukhi)"

 #: borrowed/goffice/go-charmap-sel.c:174
 msgid "Hebrew (IBM-862)"
-msgstr ""
+msgstr "еврејски  (IBM-862)"

 #: borrowed/goffice/go-charmap-sel.c:175
 msgid "Hebrew (ISO-8859-8-E)"
-msgstr ""
+msgstr "еврејски (ISO-8859-8-E)"

 #: borrowed/goffice/go-charmap-sel.c:177
 msgid "Hebrew (ISO-8859-8-I)"
-msgstr ""
+msgstr "еврејски (ISO-8859-8-I)"

 #: borrowed/goffice/go-charmap-sel.c:179
 msgid "Hebrew (MacHebrew)"
-msgstr ""
+msgstr "еврејски (MacHebrew)"

 #: borrowed/goffice/go-charmap-sel.c:180
 msgid "Hebrew (Windows-1255)"
-msgstr ""
+msgstr "еврејски (Windows-1255)"

 #: borrowed/goffice/go-charmap-sel.c:182
 msgid "Hindi (MacDevanagari)"
-msgstr ""
+msgstr "хинду (MacDevanagari)"

 #: borrowed/goffice/go-charmap-sel.c:184
 msgid "Icelandic (MacIcelandic)"
-msgstr ""
+msgstr "исландски (MacIcelandic)"

 #: borrowed/goffice/go-charmap-sel.c:186
 msgid "Japanese (EUC-JP)"
-msgstr ""
+msgstr "јапонски (EUC-JP)"

 #: borrowed/goffice/go-charmap-sel.c:187
 msgid "Japanese (ISO-2022-JP)"
-msgstr ""
+msgstr "јапонски (ISO-2022-JP)"

 #: borrowed/goffice/go-charmap-sel.c:189
 msgid "Japanese (Shift_JIS)"
-msgstr ""
+msgstr "јапонски (Shift_JIS)"

 #: borrowed/goffice/go-charmap-sel.c:190
 msgid "Korean (EUC-KR)"
-msgstr ""
+msgstr "корејски (EUC-KR)"

 #: borrowed/goffice/go-charmap-sel.c:191
 msgid "Korean (ISO-2022-KR)"
-msgstr ""
+msgstr "корејски (ISO-2022-KR)"

 #: borrowed/goffice/go-charmap-sel.c:192
 msgid "Korean (JOHAB)"
-msgstr ""
+msgstr "корејски (JOHAB)"

 #: borrowed/goffice/go-charmap-sel.c:193
 msgid "Korean (UHC)"
-msgstr ""
+msgstr "корејски (UHC)"

 #: borrowed/goffice/go-charmap-sel.c:194
 msgid "Nordic (ISO-8859-10)"
-msgstr ""
+msgstr "нордиски  (ISO-8859-10)"

 #: borrowed/goffice/go-charmap-sel.c:195
 msgid "Romanian (MacRomanian)"
-msgstr ""
+msgstr "романски (Macромански)"

 #: borrowed/goffice/go-charmap-sel.c:197
 msgid "Romanian (ISO-8859-16)"
-msgstr ""
+msgstr "романски (ISO-8859-16)"

 #: borrowed/goffice/go-charmap-sel.c:199
 msgid "South European (ISO-8859-3)"
-msgstr ""
+msgstr "јужно европски (ISO-8859-3)"

 #: borrowed/goffice/go-charmap-sel.c:201
 msgid "Thai (TIS-620)"
-msgstr ""
+msgstr "таи (TIS-620)"

 #: borrowed/goffice/go-charmap-sel.c:202
 msgid "Turkish (IBM-857)"
-msgstr ""
+msgstr "турски (IBM-857)"

 #: borrowed/goffice/go-charmap-sel.c:203
 msgid "Turkish (ISO-8859-9)"
-msgstr ""
+msgstr "турски (ISO-8859-9)"

 #: borrowed/goffice/go-charmap-sel.c:204
 msgid "Turkish (MacTurkish)"
-msgstr ""
+msgstr "турски (Macтурски)"

 #: borrowed/goffice/go-charmap-sel.c:206
 msgid "Turkish (Windows-1254)"
-msgstr ""
+msgstr "турски (Windows-1254)"

 #: borrowed/goffice/go-charmap-sel.c:208
 msgid "Unicode (UTF-7)"
-msgstr ""
+msgstr "Unicode (UTF-7)"

 #: borrowed/goffice/go-charmap-sel.c:209
 msgid "Unicode (UTF-8)"
-msgstr ""
+msgstr "Unicode (UTF-8)"

 #: borrowed/goffice/go-charmap-sel.c:210
 msgid "Unicode (UTF-16BE)"
-msgstr ""
+msgstr "Unicode (UTF-16BE)"

 #: borrowed/goffice/go-charmap-sel.c:211
 msgid "Unicode (UTF-16LE)"
-msgstr ""
+msgstr "Unicode (UTF-16LE)"

 #: borrowed/goffice/go-charmap-sel.c:212
 msgid "Unicode (UTF-32BE)"
-msgstr ""
+msgstr "Unicode (UTF-32BE)"

 #: borrowed/goffice/go-charmap-sel.c:213
 msgid "Unicode (UTF-32LE)"
-msgstr ""
+msgstr "Unicode (UTF-32LE)"

 #: borrowed/goffice/go-charmap-sel.c:214
 msgid "User Defined"
-msgstr ""
+msgstr "Корисникот е дефиниран"

 #: borrowed/goffice/go-charmap-sel.c:215
 msgid "Vietnamese (TCVN)"
-msgstr ""
+msgstr "виетнамски (TCVN)"

 #: borrowed/goffice/go-charmap-sel.c:217
 msgid "Vietnamese (VISCII)"
-msgstr ""
+msgstr "виетнамски (VISCII)"

 #: borrowed/goffice/go-charmap-sel.c:218
 msgid "Vietnamese (VPS)"
-msgstr ""
+msgstr "виетнамски (VPS)"

 #: borrowed/goffice/go-charmap-sel.c:219
 msgid "Vietnamese (Windows-1258)"
-msgstr ""
+msgstr "виетнамски (Windows-1258)"

 #: borrowed/goffice/go-charmap-sel.c:221
 msgid "Visual Hebrew (ISO-8859-8)"
-msgstr ""
+msgstr "визуелен еврејски (ISO-8859-8)"

 #: borrowed/goffice/go-charmap-sel.c:223
 msgid "Western (IBM-850)"
-msgstr ""
+msgstr "западен (IBM-850)"

 #: borrowed/goffice/go-charmap-sel.c:224
 msgid "Western (ISO-8859-1)"
-msgstr ""
+msgstr "западен (ISO-8859-1)"

 #: borrowed/goffice/go-charmap-sel.c:225
 msgid "Western (ISO-8859-15)"
-msgstr ""
+msgstr "западен (ISO-8859-15)"

 #: borrowed/goffice/go-charmap-sel.c:227
 msgid "Western (MacRoman)"
-msgstr ""
+msgstr "западен (Macромански)"

 #: borrowed/goffice/go-charmap-sel.c:228
 msgid "Western (Windows-1252)"
-msgstr ""
+msgstr "западен (Windows-1252)"

 #: borrowed/goffice/go-charmap-sel.c:441
 msgid "Locale: "
-msgstr ""
+msgstr "Локален: "

 #: borrowed/goffice/go-charmap-sel.c:476
 msgid "Conversion Direction"
-msgstr ""
+msgstr "Насока на конверзија"

 #: borrowed/goffice/go-charmap-sel.c:477
 msgid "This value determines which iconv test to perform."
@@ -426,7 +429,7 @@ msgstr ""

 #: borrowed/goffice/go-optionmenu.c:339
 msgid "Menu"
-msgstr ""
+msgstr "Мени"

 #: borrowed/goffice/go-optionmenu.c:339
 msgid "The menu of options"
@@ -896,7 +899,7 @@ msgstr ""
 #: gnucash/report/trep-engine.scm:183 gnucash/report/trep-engine.scm:943
 #: gnucash/report/trep-engine.scm:1065 gnucash/report/trep-engine.scm:1161
 msgid "Date"
-msgstr ""
+msgstr "Датум"

 #: gnucash/gnome/assistant-loan.cpp:1888 gnucash/gnome/assistant-loan.cpp:2867
 #: gnucash/gnome/assistant-loan.cpp:2929 gnucash/gnome/assistant-loan.cpp:2942
@@ -1960,7 +1963,7 @@ msgstr ""
 #: gnucash/report/trep-engine.scm:1093 gnucash/report/trep-engine.scm:1223
 #: gnucash/report/trep-engine.scm:1224
 msgid "Memo"
-msgstr ""
+msgstr "Потсетник"

 #: gnucash/gnome/dialog-find-transactions2.c:155
 #: gnucash/gnome/dialog-find-transactions.c:155
@@ -2847,7 +2850,7 @@ msgstr ""
 #: gnucash/gtkbuilder/dialog-print-check.glade:290
 #: gnucash/gtkbuilder/gnc-date-format.glade:30
 msgid "Custom"
-msgstr ""
+msgstr "Прилагодена"

 #: gnucash/gnome/dialog-print-check.c:2602
 #: gnucash/gtkbuilder/dialog-preferences.glade:3984
@@ -4244,7 +4247,7 @@ msgstr ""
 #: gnucash/report/reports/standard/budget-income-statement.scm:58
 #: gnucash/report/reports/standard/budget.scm:93
 msgid "Budget"
-msgstr ""
+msgstr "Буџет/План"

 #: gnucash/gnome/gnc-plugin-page-budget.c:945
 #: libgnucash/engine/gnc-budget.cpp:111
@@ -20145,7 +20148,7 @@ msgstr ""
 #: gnucash/report/reports/support/balsheet-eg.eguile.scm:189
 #: libgnucash/app-utils/gnc-ui-util.c:955
 msgid "Retained Earnings"
-msgstr ""
+msgstr "Задржана добивка"

 #: gnucash/import-export/qif-imp/qif-dialog-utils.scm:118
 msgid "Commissions"
@@ -24731,7 +24734,7 @@ msgstr ""

 #: gnucash/report/reports/standard/income-statement.scm:588
 msgid "Profit & Loss"
-msgstr ""
+msgstr "Добивка&Загуба"

 #: gnucash/report/reports/standard/invoice.scm:102
 #: gnucash/report/reports/standard/invoice.scm:234
@@ -25770,7 +25773,7 @@ msgstr ""
 #: gnucash/report/reports/standard/register.scm:388
 #: libgnucash/engine/gnc-lot.c:823
 msgid "Lot"
-msgstr ""
+msgstr "Лот"

 #: gnucash/report/reports/standard/register.scm:160
 msgid "Debit Value"
@@ -27838,7 +27841,7 @@ msgstr ""

 #: libgnucash/engine/Account.cpp:4497
 msgid "Credit Card"
-msgstr ""
+msgstr "Кредитна картичка"

 #: libgnucash/engine/Account.cpp:4499
 msgid "Stock"
--- a/po/pl.po
+++ b/po/pl.po
--- a/test-templates/testmain.c
+++ b/test-templates/testmain.c
@@ -89,7 +89,7 @@ main (int argc, char *argv[])
    /* Add test functions. See
     * http://library.gnome.org/devel/glib/stable/glib-Testing.html for
     * details. Unfortunately, GLib-Testing doesn't provide the automatic
-     * registration features of more sophisitcated frameworks. */
+     * registration features of more sophisticated frameworks. */
    g_test_add_func ("/TESTPROG/Test Case Name 1", example_without_fixture);
    g_test_add_data_func ("/TESTPROG/Test Case Name 2", NULL);
    g_test_add ("/TESTPROG/Test Case Name", Fixture, NULL, setup,