Fix a few more translation issues discovered during code review

This commit is contained in:
Geert Janssens 2018-01-27 13:47:56 +01:00
parent 4aa1062045
commit c7415102fd
5 changed files with 45 additions and 10 deletions

View File

@ -309,7 +309,7 @@ Cancel to abort.</property>
<object class="GtkLabel" id="summary_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">label</property>
<property name="label">label</property>
<property name="use_markup">True</property>
</object>
<packing>
@ -354,6 +354,9 @@ Cancel to abort.</property>
<object class="GtkBox" id="assistant-action_area2">
<property name="can_focus">False</property>
</object>
<packing>
<property name="has_padding">False</property>
</packing>
</child>
</object>
</interface>

View File

@ -501,7 +501,7 @@ CsvImpPriceAssist::CsvImpPriceAssist ()
file_chooser = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_OPEN);
g_signal_connect (G_OBJECT(file_chooser), "file-activated",
G_CALLBACK(csv_price_imp_file_confirm_cb), this);
auto button = gtk_button_new_with_label (_("OK"));
auto button = gtk_button_new_with_mnemonic (_("_OK"));
gtk_widget_set_size_request (button, 100, -1);
gtk_widget_show (button);
auto h_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
@ -1761,11 +1761,34 @@ void
CsvImpPriceAssist::assist_summary_page_prepare ()
{
auto text = std::string("<span size=\"medium\"><b>");
text += _("The prices were imported from the file '") + m_file_name + "'.";
text += _("\n\nThere were ") + std::to_string(price_imp->m_prices_added);
text += _(" Prices added, ") + std::to_string(price_imp->m_prices_duplicated);
text += _(" duplicated and ") + std::to_string(price_imp->m_prices_replaced);
text += _(" replaced.</b></span>");
/* Translators: This is a ngettext(3) message, %d is the number of prices added */
auto added_str = g_strdup_printf (ngettext ("%d added price",
"%d added prices",
price_imp->m_prices_added),
price_imp->m_prices_added);
/* Translators: This is a ngettext(3) message, %d is the number of duplicate prices */
auto dupl_str = g_strdup_printf (ngettext ("%d duplicate price",
"%d duplicate prices",
price_imp->m_prices_duplicated),
price_imp->m_prices_duplicated);
/* Translators: This is a ngettext(3) message, %d is the number of replaced prices */
auto repl_str = g_strdup_printf (ngettext ("%d replaced price",
"%d replaced prices",
price_imp->m_prices_replaced),
price_imp->m_prices_replaced);
auto msg = g_strdup_printf (
_("The prices were imported from file '%s'.\n\n"
"Import summary:\n"
"- %s\n"
"- %s\n"
"- %s"),
m_file_name.c_str(), added_str, dupl_str,repl_str);
text += msg;
text += "</b></span>";
g_free (added_str);
g_free (dupl_str);
g_free (repl_str);
gtk_label_set_markup (GTK_LABEL(summary_label), text.c_str());
}

View File

@ -73,6 +73,7 @@ Click on 'Forward' to proceed or 'Cancel' to Abort Import.</property>
<packing>
<property name="page_type">intro</property>
<property name="complete">True</property>
<property name="has_padding">False</property>
</packing>
</child>
<child>
@ -99,6 +100,7 @@ Select location and file name for the Import, then click 'OK'...
</object>
<packing>
<property name="title" translatable="yes">Select File for Import</property>
<property name="has_padding">False</property>
</packing>
</child>
<child>
@ -1048,6 +1050,7 @@ For example
<packing>
<property name="page_type">intro</property>
<property name="complete">True</property>
<property name="has_padding">False</property>
</packing>
</child>
<child>
@ -1082,6 +1085,7 @@ Cancel to abort.&lt;/b&gt;</property>
<packing>
<property name="page_type">confirm</property>
<property name="title" translatable="yes">Import Prices Now</property>
<property name="has_padding">False</property>
</packing>
</child>
<child>
@ -1094,7 +1098,7 @@ Cancel to abort.&lt;/b&gt;</property>
<object class="GtkLabel" id="summary_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">label</property>
<property name="label">label</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</object>
@ -1109,6 +1113,7 @@ Cancel to abort.&lt;/b&gt;</property>
<property name="page_type">summary</property>
<property name="title" translatable="yes">Import Summary</property>
<property name="complete">True</property>
<property name="has_padding">False</property>
</packing>
</child>
<child internal-child="action_area">
@ -1116,6 +1121,7 @@ Cancel to abort.&lt;/b&gt;</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="has_padding">False</property>
</packing>
</child>
</object>

View File

@ -423,7 +423,7 @@ CsvImpTransAssist::CsvImpTransAssist ()
file_chooser = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_OPEN);
g_signal_connect (G_OBJECT(file_chooser), "file-activated",
G_CALLBACK(csv_tximp_file_confirm_cb), this);
auto button = gtk_button_new_with_label (_("OK"));
auto button = gtk_button_new_with_mnemonic (_("_OK"));
gtk_widget_set_size_request (button, 100, -1);
gtk_widget_show (button);
auto h_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);

View File

@ -1174,7 +1174,7 @@ More information can be displayed by using the help button.</property>
<object class="GtkLabel" id="summary_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">label</property>
<property name="label">label</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</object>
@ -1196,6 +1196,9 @@ More information can be displayed by using the help button.</property>
<object class="GtkBox" id="assistant-action_area2">
<property name="can_focus">False</property>
</object>
<packing>
<property name="has_padding">False</property>
</packing>
</child>
</object>
</interface>