Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve translatable strings. #1903

Open
wants to merge 5 commits into
base: stable
Choose a base branch
from
Open

Improve translatable strings. #1903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cfd2068
Improve translatable strings.
CWehli Mar 24, 2024
cad061f
glade-files: Use of stylesheets for labels
CWehli Apr 20, 2024
548f6e0
glade-files: Separate bold formatted label "Note:" ...
CWehli May 18, 2024
5f0b900
glade-files: Replace other inline formattings with stylesheets
CWehli May 18, 2024
beaab58
glade-files: Replace 'italic' formatting with "" or remove it.
CWehli May 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions gnucash/gnome/assistant-stock-transaction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,9 +268,9 @@ static const TxnTypeVec long_types
// Translators: this is a stock transaction describing a stock
// split
N_("Stock split"),
N_("Company issues additional units, thereby reducing the stock price by a divisor "
", while keeping the total monetary value of the overall investment constant. "
"\n\nIf the split results in a cash in lieu for remainder units, please "
N_("Company issues additional units, thereby reducing the stock price by a divisor, "
"while keeping the total monetary value of the overall investment constant.\n\nIf "
"the split results in a cash in lieu for remainder units, please "
"record the sale using the Stock Transaction Assistant first, then record the split.")
},
{
Expand Down Expand Up @@ -310,8 +310,8 @@ 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 position, and record capital gain/loss. "
"\n\nIf you are unable to calculate capital gains you can enter a placeholder "
N_("Buy back stock to cover short position, and record capital gain/loss.\n\nIf "
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better split the message and keep the layout "\n\n" outside of the translation, e.g.:
printf ("%s\n\n%s", _(para1), _(para2))

"you are unable to calculate capital gains you can enter a placeholder "
"amount and correct it in the transaction later.")
},
{
Expand Down Expand Up @@ -352,7 +352,7 @@ static const TxnTypeVec short_types
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.00 value) without affecting # units. A distribution previously recorded "
"as a compensatory dividend is reclassified to compensatory return of capital,"
"as a compensatory dividend is reclassified to compensatory return of capital, "
"often due to end-of-year tax information.")
},
{
Expand Down Expand Up @@ -395,8 +395,8 @@ static const TxnTypeVec short_types
// split when shorting stock
N_("Stock split"),
N_("Company issues additional units, thereby reducing the stock price by a divisor, "
"while keeping the total monetary value of the overall investment constant. "
"\n\nIf the split results in a cash in lieu for remainder units, please "
"while keeping the total monetary value of the overall investment constant.\n\nIf "
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above

"the split results in a cash in lieu for remainder units, please "
"record the cover buy using the Stock Transaction Assistant first, then record the split.")
},
{
Expand Down
2 changes: 1 addition & 1 deletion gnucash/gnome/gnc-plugin-page-report.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ static GncToolBarShortNames toolbar_labels[] =
/* Translators: This string is meant to be a short alternative for "Save Report Configuration As…"
to be used as toolbar button label. */
{ "ReportSaveAsAction", N_("Save Config As…") },
{ "FilePrintPDFAction", N_("Make Pdf") },
{ "FilePrintPDFAction", N_("Export as PDF") },
{ nullptr, nullptr },
};

Expand Down
24 changes: 12 additions & 12 deletions gnucash/gtkbuilder/assistant-csv-export.glade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ Select the type of Export required and the separator that will be used.
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Options</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
<style>
<class name="gnc-class-strong"/>
</style>
</object>
</child>
</object>
Expand Down Expand Up @@ -212,9 +212,9 @@ Select the type of Export required and the separator that will be used.
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Select Separator Character</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
<style>
<class name="gnc-class-strong"/>
</style>
</object>
</child>
</object>
Expand Down Expand Up @@ -268,9 +268,9 @@ Select the type of Export required and the separator that will be used.
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Accounts</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
<style>
<class name="gnc-class-strong"/>
</style>
</object>
<packing>
<property name="expand">False</property>
Expand Down Expand Up @@ -424,9 +424,9 @@ Select the type of Export required and the separator that will be used.
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Date Range</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
<style>
<class name="gnc-class-strong"/>
</style>
</object>
<packing>
<property name="expand">False</property>
Expand Down
33 changes: 24 additions & 9 deletions gnucash/gtkbuilder/assistant-csv-price-import.glade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,10 @@ There are two reserved names which can't be used to save custom settings:
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">&lt;b&gt;Load and Save Settings&lt;/b&gt;</property>
<property name="label" translatable="yes">Load and Save Settings</property>
<style>
<class name="gnc-class-strong"/>
</style>
<property name="use-markup">True</property>
<property name="track-visited-links">False</property>
</object>
Expand Down Expand Up @@ -556,7 +559,10 @@ There are two reserved names which can't be used to save custom settings:
<property name="can-focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="halign">start</property>
<property name="label" translatable="yes">&lt;b&gt;File Format&lt;/b&gt;</property>
<property name="label" translatable="yes">File Format</property>
<style>
<class name="gnc-class-strong"/>
</style>
<property name="use-markup">True</property>
</object>
</child>
Expand Down Expand Up @@ -778,7 +784,10 @@ For example
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">&lt;b&gt;Miscellaneous&lt;/b&gt;</property>
<property name="label" translatable="yes">Miscellaneous</property>
<style>
<class name="gnc-class-strong"/>
</style>
<property name="use-markup">True</property>
</object>
</child>
Expand Down Expand Up @@ -838,7 +847,10 @@ For example
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Commodity From&lt;/b&gt;</property>
<property name="label" translatable="yes">Commodity From</property>
<style>
<class name="gnc-class-strong"/>
</style>
<property name="use-markup">True</property>
</object>
</child>
Expand Down Expand Up @@ -884,9 +896,9 @@ For example
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Currency To</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
<style>
<class name="gnc-class-strong"/>
</style>
</object>
</child>
</object>
Expand Down Expand Up @@ -1011,8 +1023,11 @@ For example
<object class="GtkLabel" id="finish_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Press "Apply" to add the Prices.
"Cancel" to abort.&lt;/b&gt;</property>
<property name="label" translatable="yes">Press "Apply" to add the Prices.
"Cancel" to abort.</property>
<style>
<class name="gnc-class-strong"/>
</style>
<property name="use-markup">True</property>
<property name="justify">center</property>
<property name="wrap">True</property>
Expand Down
26 changes: 19 additions & 7 deletions gnucash/gtkbuilder/assistant-csv-trans-import.glade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,10 @@ There are two reserved names which can't be used to save custom settings:
<object class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Load and Save Settings&lt;/b&gt;</property>
<property name="label" translatable="yes">Load and Save Settings</property>
<style>
<class name="gnc-class-strong"/>
</style>
<property name="use-markup">True</property>
<property name="track-visited-links">False</property>
</object>
Expand Down Expand Up @@ -548,7 +551,10 @@ To know which lines belong to the same transaction, the importer will compare th
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">&lt;b&gt;File Format&lt;/b&gt;</property>
<property name="label" translatable="yes">File Format</property>
<style>
<class name="gnc-class-strong"/>
</style>
<property name="use-markup">True</property>
</object>
</child>
Expand Down Expand Up @@ -781,7 +787,10 @@ For example
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Miscellaneous&lt;/b&gt;</property>
<property name="label" translatable="yes">Miscellaneous</property>
<style>
<class name="gnc-class-strong"/>
</style>
<property name="use-markup">True</property>
</object>
</child>
Expand Down Expand Up @@ -812,7 +821,10 @@ For example
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">&lt;b&gt;Account&lt;/b&gt;</property>
<property name="label" translatable="yes">Account</property>
<style>
<class name="gnc-class-strong"/>
</style>
<property name="use-markup">True</property>
</object>
</child>
Expand Down Expand Up @@ -1059,13 +1071,13 @@ For example
<property name="margin-end">12</property>
<property name="label" translatable="yes">If you click "Next" Gnucash will perform a number of checks.

If one of those &lt;i&gt;checks fails&lt;/i&gt; you'll be automatically redirected to the preview page to try and correct.
If one of those "checks fails" you'll be automatically redirected to the preview page to try and correct.

On the following page you will be able to associate each transaction to a category.

If this is your &lt;i&gt;initial import into a new file&lt;/i&gt;, you will first see a dialog for setting book options, since these can affect how imported data are converted to GnuCash transactions. If this is an existing file, the dialog will not be shown.
If this is your "initial import into a new file", you will first see a dialog for setting book options, since these can affect how imported data are converted to GnuCash transactions. If this is an existing file, the dialog will not be shown.

If this is the &lt;i&gt;first time importing&lt;/i&gt;, you will find that all lines may need to be associated. On subsequent imports, the importer will try to associate the transactions based on previous imports.
If this is the "first time importing", you will find that all lines may need to be associated. On subsequent imports, the importer will try to associate the transactions based on previous imports.

The confidence of a correct association is displayed as a colored bar.

Expand Down
Loading