Skip to content

Commit

Permalink
Pull request for updated wording
Browse files Browse the repository at this point in the history
On the long side of the transaction list, dividend reinvestments with and without remainder can be merged.

On the short side of the transaction list, the 2 dividend reinvestment transactions are not relevant and should be deleted.  There is no such thing as a "compensatory dividend reinvestment".
  • Loading branch information
CDB-Man committed Sep 11, 2022
1 parent cb1bdb8 commit e19308b
Showing 1 changed file with 31 additions and 31 deletions.
62 changes: 31 additions & 31 deletions gnucash/gnome/assistant-stock-transaction.cpp
Expand Up @@ -138,9 +138,9 @@ static const TxnTypeVec starting_types
FieldMask::DISABLED, // dividend_amt
FieldMask::DISABLED, // capg_amt
// Translators: this is a stock transaction describing an
// Initial stock purchase
// Initial stock long purchase
N_("Open buy"),
N_("Initial stock purchase")
N_("Initial stock long purchase.")
},
{
FieldMask::ENABLED_CREDIT, // stock_amt
Expand All @@ -151,9 +151,9 @@ static const TxnTypeVec starting_types
FieldMask::DISABLED, // dividend_amt
FieldMask::DISABLED, // capg_amt
// Translators: this is a stock transaction describing an
// initial stock short-sale
// initial stock short sale
N_("Open short"),
N_("Initial stock short-sale")
N_("Initial stock short sale.")
}
};

Expand All @@ -170,7 +170,7 @@ static const TxnTypeVec long_types
// Translators: this is a stock transaction describing
// purchase of stock.
N_("Buy"),
N_("Buying stock.")
N_("Buying stock long.")
},
{
FieldMask::ENABLED_CREDIT, // stock_amt
Expand All @@ -183,7 +183,7 @@ static const TxnTypeVec long_types
// Translators: this is a stock transaction describing sale of
// stock, and recording capital gain/loss
N_("Sell"),
N_("Selling stock, and record capital gain/loss")
N_("Selling stock long, and record capital gain/loss.")
},
{
FieldMask::DISABLED, // stock_amt
Expand All @@ -196,7 +196,7 @@ static const TxnTypeVec long_types
// Translators: this is a stock transaction describing
// dividends issued to holder
N_("Dividend"),
N_("Company issues dividends to holder")
N_("Company issues cash dividends to holder.")
},
{
FieldMask::ENABLED_DEBIT, // stock_amt
Expand All @@ -207,10 +207,10 @@ static const TxnTypeVec long_types
FieldMask::ENABLED_CREDIT, // dividend_amt
FieldMask::DISABLED, // capg_amt
// Translators: this is a stock transaction describing
// dividend issued to holder, and is reinvested. Some
// dividend issued to holder, and it may be reinvested. Some
// dividends are distributed as cash.
N_("Dividend reinvestment (with remainder)"),
N_("Company issues dividend which is reinvested. Some dividends are paid to holder")
N_("Dividend reinvestment"),
N_("Company issues dividend, which may be reinvested. Non-reinvested dividends are paid out as cash.")
},
{
FieldMask::ENABLED_DEBIT, // stock_amt
Expand All @@ -222,7 +222,7 @@ static const TxnTypeVec long_types
FieldMask::DISABLED, // capg_amt
// Translators: this is a stock transaction describing
// dividend which is wholly reinvested.
N_("Dividend reinvestment (without remainder)"),
N_("Dividend reinvestment (without remainder) - N/A"),
N_("Company issues dividend which is wholly reinvested.")
},
{
Expand All @@ -235,8 +235,8 @@ static const TxnTypeVec long_types
FieldMask::DISABLED, // capg_amt
// Translators: this is a stock transaction describing return
// of capital
N_("Return of Capital"),
N_("Stock returns capital to holder")
N_("Return of capital"),
N_("Company returns capital, reducing the cost basis without affecting # units.")
},
{
FieldMask::DISABLED, // stock_amt
Expand All @@ -249,7 +249,7 @@ static const TxnTypeVec long_types
// Translators: this is a stock transaction describing a
// notional distribution
N_("Notional distribution"),
N_("Stock returns a notional distribution")
N_("Company issues a notional distribution, which is recorded as dividend income and increases the cost basis without affecting # units.")
},
{
FieldMask::ENABLED_DEBIT, // stock_amt
Expand All @@ -262,7 +262,7 @@ static const TxnTypeVec long_types
// Translators: this is a stock transaction describing a stock
// split
N_("Stock split"),
N_("Stock price is fractionally reduced")
N_("Company issues additional units, thereby reducing the stock price by a divisor, while keeping the $ value of shares constant.")
},
{
FieldMask::ENABLED_CREDIT, // stock_amt
Expand All @@ -274,7 +274,7 @@ static const TxnTypeVec long_types
FieldMask::DISABLED, // capg_amt
// Translators: this is a stock transaction describing a reverse split
N_("Reverse split"),
N_("Stock price is fractionally increased.")
N_("Company redeems units, thereby increasing the stock price by a multiple, while keeping the $ value of shares constant.")
},
{
FieldMask::ENABLED_CREDIT, // stock_amt
Expand All @@ -286,8 +286,8 @@ static const TxnTypeVec long_types
FieldMask::ENABLED_CREDIT | FieldMask::ALLOW_ZERO | FieldMask::ALLOW_NEGATIVE, // capgains_amt
// Translators: this is a stock transaction describing a
// reverse split. Some fractional stock is returned as cash.
N_("Reverse split with cash in lieu for fractionals"),
N_("Stock price is fractionally increased. Fractional remaining stock is returned as cash.")
N_("Reverse split with cash in lieu for fractional unit remainders"),
N_("Company redeems units, thereby increasing the stock price by a multiple, while keeping the $ value of shares constant. Any remainder units are sold/redeemed for cash, with a capital gain/loss realized.")
},
};

Expand All @@ -304,7 +304,7 @@ static const TxnTypeVec short_types
// Translators: this is a stock transaction describing
// shorting of stock.
N_("Short sell"),
N_("Shorting stock.")
N_("Selling stock short.")
},
{
FieldMask::ENABLED_DEBIT, // stock_amt
Expand All @@ -317,7 +317,7 @@ static const TxnTypeVec short_types
// Translators: this is a stock transaction describing cover
// buying stock, and recording capital gain/loss
N_("Buy to cover short"),
N_("Buy back stock to cover short and record capital gain/loss")
N_("Buy back stock to cover short position, and record capital gain/loss.")
},
{
FieldMask::DISABLED, // stock_amt
Expand All @@ -329,8 +329,8 @@ static const TxnTypeVec short_types
FieldMask::DISABLED, // capg_amt
// Translators: this is a stock transaction describing
// dividends retrieved from holder when shorting stock
N_("Compensatory Dividend"),
N_("Company issues dividends to holder when shorting stock")
N_("Compensatory dividend"),
N_("Company issues dividends, and the short stock holder must make a compensatory payment for the dividend.")
},
{
FieldMask::ENABLED_CREDIT, // stock_amt
Expand All @@ -343,7 +343,7 @@ static const TxnTypeVec short_types
// Translators: this is a stock transaction describing
// dividends retrieved from holder when shorting stock. Some
// dividends are recovered from holder
N_("Dividend reinvestment (with remainder)"),
N_("Dividend reinvestment (with remainder) - N/A"),
N_("Company issues dividends to holder when shorting stock. Some dividends are recovered from holder")
},
{
Expand All @@ -356,7 +356,7 @@ static const TxnTypeVec short_types
FieldMask::DISABLED, // capg_amt
// Translators: this is a stock transaction describing
// dividends retrieved from holder when shorting stock,
N_("Dividend reinvestment (without remainder)"),
N_("Dividend reinvestment (without remainder) - N/A"),
N_("Company issues dividend when shorting stock, which are wholly recovered from holder.")
},
{
Expand All @@ -369,8 +369,8 @@ static const TxnTypeVec short_types
FieldMask::DISABLED, // capg_amt
// Translators: this is a stock transaction describing return
// of capital retrieved from holder when shorting stock
N_("Compensatory Return of Capital"),
N_("Return retrieves capital from holder when shorting stock")
N_("Compensatory return of capital"),
N_("Company returns capital, and the short stock holder must make a compensatory payment for the returned capital. This reduces the cost basis (less negative towards $0) without affecting # units.")
},
{
FieldMask::DISABLED, // stock_amt
Expand All @@ -382,8 +382,8 @@ static const TxnTypeVec short_types
FieldMask::DISABLED, // capg_amt
// Translators: this is a stock transaction describing a
// notional distribution when shorting stock
N_("Compensatory Notional distribution"),
N_("Stock retrieves a notional distribution")
N_("Compensatory notional distribution"),
N_("Company issues a notional distribution, and the short stock holder must make a compensatory payment for the notional distribution. This is recorded as a loss/negative dividend income amount, and increases the cost basis (more negative away from $0) without affecting # units.")
},
{
FieldMask::ENABLED_CREDIT, // stock_amt
Expand All @@ -396,7 +396,7 @@ static const TxnTypeVec short_types
// Translators: this is a stock transaction describing a stock
// split when shorting stock
N_("Stock split"),
N_("Stock price is fractionally reduced when shorting stock")
N_("Company issues additional units, thereby reducing the stock price by a divisor, while keeping the $ value of shares constant.")
},
{
FieldMask::ENABLED_DEBIT, // stock_amt
Expand All @@ -409,7 +409,7 @@ static const TxnTypeVec short_types
// Translators: this is a stock transaction describing a
// reverse split when shorting stock.
N_("Reverse split"),
N_("Stock price is fractionally increased when shorting stock.")
N_("Company redeems units, thereby increasing the stock price by a multiple, while keeping the $ value of shares constant.")
},
{
FieldMask::ENABLED_DEBIT, // stock_amt
Expand All @@ -423,7 +423,7 @@ static const TxnTypeVec short_types
// reverse split when shorting stock. Fractional remaining
// stock is retrieved as cash.
N_("Reverse split with cash in lieu for fractionals"),
N_("Stock price is fractionally increased when shorting stock. Fractional remaining stock is retrieved as cash.")
N_("Company redeems units, thereby increasing the stock price by a multiple, while keeping the $ value of shares constant. Any remainder units are closed and covered with a cash payment, with a capital gain/loss realized.")
},
};

Expand Down

0 comments on commit e19308b

Please sign in to comment.