[gcalctool] Miscellaneous string fixes
- From: Philip Withnall <pwithnall src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gcalctool] Miscellaneous string fixes
- Date: Wed, 3 Feb 2010 15:33:15 +0000 (UTC)
commit b6ea864a68e12eaebe0883c786fb1b3eb68873ba
Author: Philip Withnall <philip tecnocode co uk>
Date: Wed Feb 3 15:30:23 2010 +0000
Miscellaneous string fixes
Various small string fixes, including using "undefined" instead of
"not defined" wrt. mathematical functions, using proper Unicode em-dashes
instead of ASCII hyphens, and fixing a few typos/missing words.
Closes: bgo#608798
data/financial.ui | 18 +++++++++---------
data/gcalctool.schemas.in | 4 ++--
data/gcalctool.ui | 2 +-
src/calctool.c | 4 ++--
src/display.c | 2 +-
src/gtk.c | 20 ++++++++++----------
src/mp-binary.c | 10 +++++-----
src/mp-trigonometric.c | 10 +++++-----
src/mp.c | 24 ++++++++++++------------
9 files changed, 47 insertions(+), 47 deletions(-)
---
diff --git a/data/financial.ui b/data/financial.ui
index b127b25..e29410b 100644
--- a/data/financial.ui
+++ b/data/financial.ui
@@ -421,7 +421,7 @@
<object class="GtkLabel" id="label15">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" comments="Future Value Dialog: Label before number of periods input">_Number Of Periods:</property>
+ <property name="label" translatable="yes" comments="Future Value Dialog: Label before number of periods input">_Number of Periods:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">fv_n</property>
</object>
@@ -922,7 +922,7 @@
<object class="GtkLabel" id="label26">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" comments="Present Value Dialog: Label before number of periods input">_Number Of Periods:</property>
+ <property name="label" translatable="yes" comments="Present Value Dialog: Label before number of periods input">_Number of Periods:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">pv_n</property>
</object>
@@ -1392,7 +1392,7 @@
</object>
<object class="GtkDialog" id="syd_dialog">
<property name="border_width">6</property>
- <property name="title" translatable="yes" comments="Title of Sum-Of-The-Years'-Digits Depreciation dialog">Sum-Of-The-Years'-Digits Depreciation</property>
+ <property name="title" translatable="yes" comments="Title of Sum-of-the-Years'-Digits Depreciation dialog">Sum-of-the-Years'-Digits Depreciation</property>
<property name="resizable">False</property>
<property name="type_hint">dialog</property>
<property name="has_separator">False</property>
@@ -1413,7 +1413,7 @@
<object class="GtkLabel" id="label37">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" comments="Sum-Of-The-Years'-Digits Depreciation Dialog: Label before period input">_Period:</property>
+ <property name="label" translatable="yes" comments="Sum-of-the-Years'-Digits Depreciation Dialog: Label before period input">_Period:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">syd_period</property>
</object>
@@ -1428,7 +1428,7 @@
<object class="GtkLabel" id="label38">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" comments="Sum-Of-The-Years'-Digits Depreciation Dialog: Label before life input">_Life:</property>
+ <property name="label" translatable="yes" comments="Sum-of-the-Years'-Digits Depreciation Dialog: Label before life input">_Life:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">syd_life</property>
</object>
@@ -1443,7 +1443,7 @@
<object class="GtkLabel" id="label39">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" comments="Sum-Of-The-Years'-Digits Depreciation Dialog: Label before salvage input">_Salvage:</property>
+ <property name="label" translatable="yes" comments="Sum-of-the-Years'-Digits Depreciation Dialog: Label before salvage input">_Salvage:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">syd_salvage</property>
</object>
@@ -1458,7 +1458,7 @@
<object class="GtkLabel" id="label40">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" comments="Sum-Of-The-Years'-Digits Depreciation Dialog: Label before cost input">_Cost:</property>
+ <property name="label" translatable="yes" comments="Sum-of-the-Years'-Digits Depreciation Dialog: Label before cost input">_Cost:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">syd_cost</property>
</object>
@@ -1537,7 +1537,7 @@
<object class="GtkLabel" id="label41">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes" comments="Sum-Of-The-Years'-Digits Depreciation Dialog: Description of calculation">Calculates the depreciation allowance on an asset for a specified period of time, using the Sum-Of-The-Years'-Digits method. This method of depreciation accelerates the rate of depreciation, so that more depreciation expense occurs in earlier periods than in later ones. The useful life is the number of periods, typically years, over which an asset is depreciated. </property>
+ <property name="label" translatable="yes" comments="Sum-of-the-Years'-Digits Depreciation Dialog: Description of calculation">Calculates the depreciation allowance on an asset for a specified period of time, using the Sum-of-the-Years'-Digits method. This method of depreciation accelerates the rate of depreciation, so that more depreciation expense occurs in earlier periods than in later ones. The useful life is the number of periods, typically years, over which an asset is depreciated. </property>
<property name="wrap">True</property>
</object>
<packing>
@@ -1572,7 +1572,7 @@
</child>
<child>
<object class="GtkButton" id="button16">
- <property name="label" translatable="yes" comments="Sum-Of-The-Years'-Digits Depreciation Dialog: Calculate result button">C_alculate</property>
+ <property name="label" translatable="yes" comments="Sum-of-the-Years'-Digits Depreciation Dialog: Calculate result button">C_alculate</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
diff --git a/data/gcalctool.schemas.in b/data/gcalctool.schemas.in
index 9cdb120..59515cf 100644
--- a/data/gcalctool.schemas.in
+++ b/data/gcalctool.schemas.in
@@ -85,7 +85,7 @@ To change the gconftool target use the - -config-source=blah option to gconftool
<short>Show Trailing Zeroes</short>
<long>
Indicates whether any trailing zeroes after the
- number point should be shown in the display value.
+ numeric point should be shown in the display value.
</long>
</locale>
</schema>
@@ -96,7 +96,7 @@ To change the gconftool target use the - -config-source=blah option to gconftool
<type>bool</type>
<default>FALSE</default>
<locale name="C">
- <short>Show Thousands Separator</short>
+ <short>Show Thousands Separators</short>
<long>
Indicates whether thousands separators are shown in large numbers.
</long>
diff --git a/data/gcalctool.ui b/data/gcalctool.ui
index 14c1b29..7e8db07 100644
--- a/data/gcalctool.ui
+++ b/data/gcalctool.ui
@@ -2722,7 +2722,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes" comments="Tooltip for the eulers number button">Eulers number</property>
+ <property name="tooltip_text" translatable="yes" comments="Tooltip for the Euler's number button">Euler's number</property>
<property name="border_width">3</property>
<property name="use_underline">True</property>
<property name="focus_on_click">False</property>
diff --git a/src/calctool.c b/src/calctool.c
index b68d7f4..46b1070 100644
--- a/src/calctool.c
+++ b/src/calctool.c
@@ -77,7 +77,7 @@ usage(int show_gtk)
fprintf(stderr,
/* Description on how to use gcalctool displayed on command-line */
_("Usage:\n"
- " %s - Perform mathematical calculations"), v->progname);
+ " %s â?? Perform mathematical calculations"), v->progname);
fprintf(stderr,
"\n\n");
@@ -109,7 +109,7 @@ usage(int show_gtk)
fprintf(stderr,
/* Description on gcalctool application options displayed on command-line */
_("Application Options:\n"
- " -u, --unittest Perform unittests\n"
+ " -u, --unittest Perform unit tests\n"
" -s, --solve <equation> Solve the given equation"));
fprintf(stderr,
"\n\n");
diff --git a/src/display.c b/src/display.c
index aef037b..c9b5ef6 100644
--- a/src/display.c
+++ b/src/display.c
@@ -1026,7 +1026,7 @@ do_shift(GCDisplay *display, int count)
if (!display_is_usable_number(display, &z)) {
/* Translators: This message is displayed in the status bar when a bit
shift operation is performed and the display does not contain a number */
- ui_set_statusbar(_("No sane value to do bitwise shift"));
+ ui_set_statusbar(_("No sane value to bitwise shift"));
}
else {
mp_shift(&z, count, display_get_answer(display));
diff --git a/src/gtk.c b/src/gtk.c
index d2ea15b..3261f59 100644
--- a/src/gtk.c
+++ b/src/gtk.c
@@ -100,13 +100,13 @@ static char *titles[] = {
/* Translators: The window title when in basic mode */
N_("Calculator"),
/* Translators: The window title when in advanced mode */
- N_("Calculator - Advanced"),
+ N_("Calculator â?? Advanced"),
/* Translators: The window title when in financial mode */
- N_("Calculator - Financial"),
+ N_("Calculator â?? Financial"),
/* Translators: The window title when in scientific mode */
- N_("Calculator - Scientific"),
+ N_("Calculator â?? Scientific"),
/* Translators: The window title when in programming mode */
- N_("Calculator - Programming")
+ N_("Calculator â?? Programming")
};
/* The names of each field in the dialogs for the financial functions */
@@ -238,7 +238,7 @@ static void load_ui(GtkBuilder *ui, const gchar *filename)
N_("Error loading user interface"));
gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
/* Translators: Description in UI error dialog when unable to load the UI files. %s is replaced with the error message provided by GTK+ */
- N_("A required file is missing or damaged, please check your installation.\n\n%s"), error->message);
+ N_("A required file is missing or damaged. Please check your installation.\n\n%s"), error->message);
gtk_dialog_add_buttons(GTK_DIALOG(dialog), GTK_STOCK_QUIT, GTK_RESPONSE_ACCEPT, NULL);
gtk_dialog_run(GTK_DIALOG(dialog));
@@ -575,7 +575,7 @@ about_cb(GtkWidget *widget)
"name", _("Gcalctool"),
"version", VERSION,
/* Translators: Copyright notice in the about dialog */
- "copyright", _("\xc2\xa9 1986-2008 The Gcalctool authors"),
+ "copyright", _("\xc2\xa9 1986â??2008 The Gcalctool authors"),
"license", license,
/* Translators: Short description in the about dialog */
"comments", _("Calculator with financial and scientific modes."),
@@ -1001,8 +1001,8 @@ setup_currency_rates ()
GtkWidget *dialog = gtk_message_dialog_new(NULL, 0,
GTK_MESSAGE_INFO,
GTK_BUTTONS_YES_NO,
- /* Translators: Title of the error dialog when unable to load the UI files */
- N_("You don't have any recent currency rates. Should I download some now?"));
+ /* Translators: Title of the error dialog when prompting to download currency rates */
+ N_("You don't have any recent currency rates. Should some be downloaded now?"));
int response = gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
@@ -1011,8 +1011,8 @@ setup_currency_rates ()
dialog = gtk_message_dialog_new(NULL, 0,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_OK,
- /* Translators: Title of the error dialog when unable to load the UI files */
- N_("I could not download any currency rates. You may receive inaccurate results, or you may not receive any results at all."));
+ /* Translators: Title of the error dialog when unable to download currency rates */
+ N_("Currency rates could not be downloaded. You may receive inaccurate results, or you may not receive any results at all."));
}
}
}
diff --git a/src/mp-binary.c b/src/mp-binary.c
index b27b467..acd4ec9 100644
--- a/src/mp-binary.c
+++ b/src/mp-binary.c
@@ -100,7 +100,7 @@ mp_and(const MPNumber *x, const MPNumber *y, MPNumber *z)
if (!mp_is_natural(x) || !mp_is_natural(y))
{
/* Translators: Error displayed when boolean AND attempted on non-integer values */
- mperr(_("Boolean AND only defined for natural numbers"));
+ mperr(_("Boolean AND is only defined for natural numbers"));
}
mp_bitwise(x, y, mp_bitwise_and, z, 0);
@@ -113,7 +113,7 @@ mp_or(const MPNumber *x, const MPNumber *y, MPNumber *z)
if (!mp_is_natural(x) || !mp_is_natural(y))
{
/* Translators: Error displayed when boolean OR attempted on non-integer values */
- mperr(_("Boolean OR only defined for natural numbers"));
+ mperr(_("Boolean OR is only defined for natural numbers"));
}
mp_bitwise(x, y, mp_bitwise_or, z, 0);
@@ -126,7 +126,7 @@ mp_xor(const MPNumber *x, const MPNumber *y, MPNumber *z)
if (!mp_is_natural(x) || !mp_is_natural(y))
{
/* Translators: Error displayed when boolean XOR attempted on non-integer values */
- mperr(_("Boolean XOR only defined for natural numbers"));
+ mperr(_("Boolean XOR is only defined for natural numbers"));
}
mp_bitwise(x, y, mp_bitwise_xor, z, 0);
@@ -141,7 +141,7 @@ mp_not(const MPNumber *x, int wordlen, MPNumber *z)
if (!mp_is_natural(x))
{
/* Translators: Error displayed when boolean XOR attempted on non-integer values */
- mperr(_("Boolean NOT only defined for natural numbers"));
+ mperr(_("Boolean NOT is only defined for natural numbers"));
}
mp_set_from_integer(0, &temp);
@@ -171,7 +171,7 @@ mp_shift(const MPNumber *x, int count, MPNumber *z)
if (!mp_is_integer(x)) {
/* Translators: Error displayed when bit shift attempted on non-integer values */
- mperr(_("Shift only possible on integer values"));
+ mperr(_("Shift is only possible on integer values"));
return;
}
diff --git a/src/mp-trigonometric.c b/src/mp-trigonometric.c
index b1e6f23..f8b973c 100644
--- a/src/mp-trigonometric.c
+++ b/src/mp-trigonometric.c
@@ -275,7 +275,7 @@ mp_tan(const MPNumber *x, MPAngleUnit unit, MPNumber *z)
mp_cos(x, unit, &cos_x);
if (mp_is_zero(&cos_x)) {
/* Translators: Error displayed when tangent value is undefined */
- mperr(_("Tangent not defined for angles that are multiples of Ï?â??2 (180°) from Ï?â??4 (90°)"));
+ mperr(_("Tangent is undefined for angles that are multiples of Ï?â??2 (180°) from Ï?â??4 (90°)"));
mp_set_from_integer(0, z);
return;
}
@@ -320,7 +320,7 @@ mp_asin(const MPNumber *x, MPAngleUnit unit, MPNumber *z)
}
/* Translators: Error displayed when inverse sine value is undefined */
- mperr(_("Inverse sine not defined for values outside [-1, 1]"));
+ mperr(_("Inverse sine is undefined for values outside [-1, 1]"));
mp_set_from_integer(0, z);
}
@@ -337,7 +337,7 @@ mp_acos(const MPNumber *x, MPAngleUnit unit, MPNumber *z)
if (mp_is_greater_than(x, &t1) || mp_is_less_than(x, &MPn1)) {
/* Translators: Error displayed when inverse cosine value is undefined */
- mperr(_("Inverse cosine not defined for values outside [-1, 1]"));
+ mperr(_("Inverse cosine is undefined for values outside [-1, 1]"));
mp_set_from_integer(0, z);
} else if (mp_is_zero(x)) {
mp_divide_integer(&pi, 2, z);
@@ -555,7 +555,7 @@ mp_acosh(const MPNumber *x, MPNumber *z)
mp_set_from_integer(1, &t);
if (mp_is_less_than(x, &t)) {
/* Translators: Error displayed when inverse hyperbolic cosine value is undefined */
- mperr(_("Inverse hyperbolic cosine not defined for values less than or equal to one"));
+ mperr(_("Inverse hyperbolic cosine is undefined for values less than or equal to one"));
mp_set_from_integer(0, z);
return;
}
@@ -579,7 +579,7 @@ mp_atanh(const MPNumber *x, MPNumber *z)
mp_set_from_integer(-1, &minus_one);
if (mp_is_greater_equal(x, &one) || mp_is_less_equal(x, &minus_one)) {
/* Translators: Error displayed when inverse hyperbolic tangent value is undefined */
- mperr(_("Inverse hyperbolic tangent not defined for values outside [-1, 1]"));
+ mperr(_("Inverse hyperbolic tangent is undefined for values outside [-1, 1]"));
mp_set_from_integer(0, z);
return;
}
diff --git a/src/mp.c b/src/mp.c
index bd0e963..ee70319 100644
--- a/src/mp.c
+++ b/src/mp.c
@@ -526,7 +526,7 @@ mp_divide(const MPNumber *x, const MPNumber *y, MPNumber *z)
/* x/0 */
if (mp_is_zero(y)) {
/* Translators: Error displayed attempted to divide by zero */
- mperr(_("Division by zero is not defined"));
+ mperr(_("Division by zero is undefined"));
mp_set_from_integer(0, z);
return;
}
@@ -559,7 +559,7 @@ mp_divide_integer(const MPNumber *x, int y, MPNumber *z)
/* x/0 */
if (y == 0) {
/* Translators: Error displayed attempted to divide by zero */
- mperr(_("Division by zero is not defined"));
+ mperr(_("Division by zero is undefined"));
mp_set_from_integer(0, z);
return;
}
@@ -1473,7 +1473,7 @@ void
mp_multiply_fraction(const MPNumber *x, int numerator, int denominator, MPNumber *z)
{
if (denominator == 0) {
- mperr(_("Division by zero is not defined"));
+ mperr(_("Division by zero is undefined"));
mp_set_from_integer(0, z);
return;
}
@@ -1538,14 +1538,14 @@ mp_pwr(const MPNumber *x, const MPNumber *y, MPNumber *z)
/* (-x)^y imaginary */
if (x->sign < 0) {
- mperr(_("The power of negative numbers only defined for integer exponents"));
+ mperr(_("The power of negative numbers is only defined for integer exponents"));
mp_set_from_integer(0, z);
return;
}
/* 0^-y illegal */
if (mp_is_zero(x) && y->sign < 0) {
- mperr(_("The power of zero is not defined for a negative exponent"));
+ mperr(_("The power of zero is undefined for a negative exponent"));
mp_set_from_integer(0, z);
return;
}
@@ -1570,7 +1570,7 @@ mp_reciprocal_real(const MPNumber *x, MPNumber *z)
/* 1/0 invalid */
if (mp_is_zero(x)) {
- mperr(_("Reciprocal of zero is not defined"));
+ mperr(_("Reciprocal of zero is undefined"));
mp_set_from_integer(0, z);
return;
}
@@ -1655,7 +1655,7 @@ mp_root(const MPNumber *x, int n, MPNumber *z)
/* x^(1/0) invalid */
if (n == 0) {
- mperr(_("Root must non-zero"));
+ mperr(_("Root must be non-zero"));
mp_set_from_integer(0, z);
return;
}
@@ -1679,7 +1679,7 @@ mp_root(const MPNumber *x, int n, MPNumber *z)
// FIXME: Imaginary root
if (x->sign < 0 && np % 2 == 0) {
- mperr(_("nth root of negative number not defined for even n"));
+ mperr(_("nth root of negative number is undefined for even n"));
mp_set_from_integer(0, z);
return;
}
@@ -1749,7 +1749,7 @@ void
mp_sqrt(const MPNumber *x, MPNumber *z)
{
if (x->sign < 0) {
- mperr(_("Square root is not defined for negative values"));
+ mperr(_("Square root is undefined for negative values"));
mp_set_from_integer(0, z);
}
else if (mp_is_zero(x))
@@ -1778,7 +1778,7 @@ mp_factorial(const MPNumber *x, MPNumber *z)
}
if (!mp_is_natural(x)) {
/* Translators: Error displayed when attempted take the factorial of a fractional number */
- mperr(_("Factorial only defined for natural numbers"));
+ mperr(_("Factorial is only defined for natural numbers"));
mp_set_from_integer(0, z);
return;
}
@@ -1798,7 +1798,7 @@ mp_modulus_divide(const MPNumber *x, const MPNumber *y, MPNumber *z)
if (!mp_is_integer(x) || !mp_is_integer(y)) {
/* Translators: Error displayed when attemping to do a modulus division on non-integer numbers */
- mperr(_("Modulus division only defined for integers"));
+ mperr(_("Modulus division is only defined for integers"));
mp_set_from_integer(0, z);
}
@@ -1838,7 +1838,7 @@ mp_xpowy_integer(const MPNumber *x, int n, MPNumber *z)
/* 0^-n invalid */
if (mp_is_zero(x) && n < 0) {
/* Translators: Error displayed when attempted to raise 0 to a negative exponent */
- mperr(_("The power of zero is not defined for a negative exponent"));
+ mperr(_("The power of zero is undefined for a negative exponent"));
mp_set_from_integer(0, z);
return;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
