diff --git a/ChangeLog b/ChangeLog index 559050cee8..8e2a7a7a0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-11-12 Christian Stimming + + * src/*/*.glade: String improvements: Fix typos, remove + unnecessary spaces from translations. + 2005-11-11 Christian Stimming * po/*.po: Copy translations from old 1.8 branch to HEAD and merge diff --git a/src/backend/file/gnc-backend-file.c b/src/backend/file/gnc-backend-file.c index a9303aa1f1..409606c1a4 100644 --- a/src/backend/file/gnc-backend-file.c +++ b/src/backend/file/gnc-backend-file.c @@ -87,8 +87,8 @@ gnc_file_be_get_config(QofBackend *be) option = g_new0(QofBackendOption, 1); option->option_name = GNC_BE_DAYS; option->description = _("Number of days to retain old files"); - option->tooltip = _("GnuCash keeps backups of old files, " - "this setting dictates how long each is kept"); + option->tooltip = _("GnuCash keeps backups of old files. " + "This setting specifies how long each is kept."); option->type = KVP_TYPE_GINT64; option->value = (gpointer)&file_retention_days; qof_backend_prepare_option(be, option); diff --git a/src/backend/file/io-gncbin-r.c b/src/backend/file/io-gncbin-r.c index c14568d2b3..fd7238bcf2 100644 --- a/src/backend/file/io-gncbin-r.c +++ b/src/backend/file/io-gncbin-r.c @@ -505,6 +505,8 @@ gnc_load_financials_from_fd(QofBook *book, int fd) /* create a lost account, put the missing accounts there */ acc = xaccMallocAccount(book); xaccAccountBeginEdit (acc); + /* Translators: Name of the account where all the missing accounts + are put into. (FIXME: is this correct?) */ xaccAccountSetName (acc, _("Lost Accounts")); acc -> children = holder; xaccAccountCommitEdit (acc); diff --git a/src/gnome-utils/gnc-date-format.glade b/src/gnome-utils/gnc-date-format.glade index f8530ee3ab..028f261957 100644 --- a/src/gnome-utils/gnc-date-format.glade +++ b/src/gnome-utils/gnc-date-format.glade @@ -77,7 +77,7 @@ True True - include century + Include Century True GTK_RELIEF_NORMAL True @@ -106,7 +106,7 @@ True True - number + Number True GTK_RELIEF_NORMAL True @@ -126,7 +126,7 @@ True True - abbreviation + Abbreviation True GTK_RELIEF_NORMAL True @@ -147,7 +147,7 @@ True True - name + Name True GTK_RELIEF_NORMAL True diff --git a/src/gnome-utils/gnc-file.c b/src/gnome-utils/gnc-file.c index a7236da773..827960a9aa 100644 --- a/src/gnome-utils/gnc-file.c +++ b/src/gnome-utils/gnc-file.c @@ -323,20 +323,20 @@ show_session_error (QofBackendError io_error, const char *newfile) break; } case ERR_QSF_MAP_NOT_OBJ: { - fmt = _("The selected file %s is a QSF map and cannot be " + fmt = _("The selected file \n %s\n is a QSF map and cannot be " "opened as a QSF object."); gnc_error_dialog(parent, fmt, newfile); break; } case ERR_QSF_OVERFLOW : { fmt = _("When converting XML strings into numbers, an overflow " - "has been detected. The QSF object file\n%s\n contains invalid " + "has been detected. The QSF object file\n %s\ncontains invalid " "data in a field that is meant to hold a number."); gnc_error_dialog(parent, fmt, newfile); break; } case ERR_QSF_OPEN_NOT_MERGE : { - fmt = _("The QSF object file\n%s\nis valid and contains GnuCash " + fmt = _("The QSF object file\n %s\nis valid and contains GnuCash " "objects. However, GnuCash cannot open the file directly because " "the data needs to be merged into an existing GnuCash data book. " "Please open a GnuCash file or create a new one, then import " @@ -352,17 +352,17 @@ show_session_error (QofBackendError io_error, const char *newfile) break; case ERR_FILEIO_PARSE_ERROR: - fmt = _("There was an error parsing the file \n %s\n"); + fmt = _("There was an error parsing the file\n %s"); gnc_error_dialog (parent, fmt, newfile); break; case ERR_FILEIO_FILE_EMPTY: - fmt = _("The file \n %s\n is empty."); + fmt = _("The file \n %s\nis empty."); gnc_error_dialog (parent, fmt, newfile); break; case ERR_FILEIO_FILE_NOT_FOUND: - fmt = _("The file \n %s\n could not be found."); + fmt = _("The file \n %s\ncould not be found."); gnc_error_dialog (parent, fmt, newfile); break; @@ -373,19 +373,19 @@ show_session_error (QofBackendError io_error, const char *newfile) break; case ERR_FILEIO_UNKNOWN_FILE_TYPE: - fmt = _("Unknown file type"); + fmt = _("The file type of file\n %s\nis unknown."); gnc_error_dialog(parent, fmt, newfile); break; case ERR_FILEIO_BACKUP_ERROR: - fmt = _("Could not make a backup of %s\n"); + fmt = _("Could not make a backup of the file\n %s"); gnc_error_dialog(parent, fmt, newfile); break; case ERR_FILEIO_WRITE_ERROR: - fmt = _("Could not write to %s\nCheck that you have" - " permission to write to this file and that " - " there is sufficient space to create it."); + fmt = _("Could not write to file\n %s\nCheck that you have " + "permission to write to this file and that " + "there is sufficient space to create it."); gnc_error_dialog(parent, fmt, newfile); break; diff --git a/src/gnome-utils/gnc-gui-query.c b/src/gnome-utils/gnc-gui-query.c index 4c83ea3b15..a20a6df6a9 100644 --- a/src/gnome-utils/gnc-gui-query.c +++ b/src/gnome-utils/gnc-gui-query.c @@ -159,6 +159,7 @@ gnc_ok_cancel_dialog(gncUIWidget parent, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_OK_CANCEL, + "%s", buffer); g_free(buffer); va_end(args); @@ -206,6 +207,7 @@ gnc_verify_cancel_dialog(GtkWidget *parent, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, + "%s", buffer); g_free(buffer); va_end(args); @@ -255,6 +257,7 @@ gnc_verify_dialog(gncUIWidget parent, gboolean yes_is_default, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, + "%s", buffer); g_free(buffer); va_end(args); @@ -315,6 +318,7 @@ gnc_info_dialog(GtkWidget *parent, const gchar *format, ...) GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, + "%s", buffer); va_end(args); @@ -349,6 +353,7 @@ gnc_warning_dialog_common(GtkWidget *parent, const gchar *format, va_list args) GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, GTK_BUTTONS_CLOSE, + "%s", buffer); g_free(buffer); @@ -420,6 +425,7 @@ gnc_error_dialog_common(GtkWidget *parent, const gchar *format, va_list args) GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, + "%s", buffer); g_free(buffer); diff --git a/src/gnome-utils/transfer.glade b/src/gnome-utils/transfer.glade index 05365dad7e..a2d5b4741a 100644 --- a/src/gnome-utils/transfer.glade +++ b/src/gnome-utils/transfer.glade @@ -110,7 +110,7 @@ True - + False False GTK_JUSTIFY_LEFT @@ -390,7 +390,7 @@ True - + False False GTK_JUSTIFY_LEFT @@ -518,7 +518,7 @@ True - + False False GTK_JUSTIFY_LEFT @@ -566,7 +566,7 @@ True - + False False GTK_JUSTIFY_LEFT @@ -782,7 +782,7 @@ True - + False False GTK_JUSTIFY_LEFT diff --git a/src/gnome/druid-acct-period.c b/src/gnome/druid-acct-period.c index 063bfb4b4d..920798a40b 100644 --- a/src/gnome/druid-acct-period.c +++ b/src/gnome/druid-acct-period.c @@ -170,7 +170,7 @@ get_close_status_str (AcctPeriodInfo *info) switch (info->close_status) { case -1: str = ""; break; - case 0: str = _("The book was closed suscessfully\n"); break; + case 0: str = _("The book was closed successfully."); break; default: str = ""; } return str; @@ -490,7 +490,11 @@ ap_show_done (GnomeDruidPageEdge *druidpage, AcctPeriodInfo *info = user_data; ENTER ("info=%p", info); - msg = _("%s\nCongradulations! You are done closing books!"); + /* Translation FIXME: Can this %s-containing message please be + replaced by one single message? Either this closing went + successfully ("success", "congratulations") or something else + should be displayed anyway. */ + msg = _("%s\nCongratulations! You are done closing books!"); str = g_strdup_printf (msg, get_close_status_str (info)); gnome_druid_page_edge_set_text (druidpage, str); diff --git a/src/gnome/glade/account.glade b/src/gnome/glade/account.glade index e70f5a4026..8b73546f71 100644 --- a/src/gnome/glade/account.glade +++ b/src/gnome/glade/account.glade @@ -138,7 +138,7 @@ True - + False False GTK_JUSTIFY_LEFT @@ -617,7 +617,7 @@ True - + False False GTK_JUSTIFY_LEFT @@ -641,7 +641,7 @@ True - + False False GTK_JUSTIFY_LEFT @@ -689,7 +689,7 @@ True - + False False GTK_JUSTIFY_LEFT @@ -1945,7 +1945,7 @@ additional accounts by hand later. True - USD + USD GBP EUR diff --git a/src/gnome/glade/budget.glade b/src/gnome/glade/budget.glade index afc76937c5..0b85daccf5 100644 --- a/src/gnome/glade/budget.glade +++ b/src/gnome/glade/budget.glade @@ -929,7 +929,7 @@ to financial happiness! True - + False False GTK_JUSTIFY_LEFT diff --git a/src/gnome/glade/commodities.glade b/src/gnome/glade/commodities.glade index ad18d5d97e..aeda71cbb4 100644 --- a/src/gnome/glade/commodities.glade +++ b/src/gnome/glade/commodities.glade @@ -192,7 +192,7 @@ True - + False False GTK_JUSTIFY_LEFT diff --git a/src/gnome/glade/merge.glade b/src/gnome/glade/merge.glade index 9a6f16373c..856b94f4b1 100644 --- a/src/gnome/glade/merge.glade +++ b/src/gnome/glade/merge.glade @@ -75,13 +75,11 @@ account types now. True - The next screen will allow you to resolve -any conflicts in merging your new account -tree into your current GnuCash file. + The next screen will allow you to resolve any conflicts in merging your new account tree into your current GnuCash file. False False GTK_JUSTIFY_CENTER - False + True False 0.5 0.5 @@ -271,7 +269,7 @@ The import object can be created as a new object in the existing book.True Add the import as a new object, leave original in place True - 3. Import the data as a NEW object + 3. Import the data as a NEW object True GTK_RELIEF_NORMAL True diff --git a/src/gnome/glade/print.glade b/src/gnome/glade/print.glade index 68c5e8917f..09440ad03e 100644 --- a/src/gnome/glade/print.glade +++ b/src/gnome/glade/print.glade @@ -890,7 +890,7 @@ True - + False False GTK_JUSTIFY_CENTER @@ -911,7 +911,7 @@ True - + False False GTK_JUSTIFY_CENTER diff --git a/src/gnome/glade/sched-xact.glade b/src/gnome/glade/sched-xact.glade index bae09ee58f..fde915ea9e 100644 --- a/src/gnome/glade/sched-xact.glade +++ b/src/gnome/glade/sched-xact.glade @@ -5519,7 +5519,7 @@ True - Number of Occurences: + Number of Occurrences: False False GTK_JUSTIFY_LEFT diff --git a/src/gnome/glade/totd.glade b/src/gnome/glade/totd.glade index 20f96917ec..b356457b38 100644 --- a/src/gnome/glade/totd.glade +++ b/src/gnome/glade/totd.glade @@ -125,7 +125,7 @@ True - + False False GTK_JUSTIFY_LEFT diff --git a/src/import-export/hbci/glade/hbciprefs.glade b/src/import-export/hbci/glade/hbciprefs.glade index f2ece54905..6ff3a4cd51 100644 --- a/src/import-export/hbci/glade/hbciprefs.glade +++ b/src/import-export/hbci/glade/hbciprefs.glade @@ -55,7 +55,7 @@ True Remember the PIN for HBCI in memory during a session. True - Remember _pin + Remember _PIN True GTK_RELIEF_NORMAL True diff --git a/src/import-export/qif/qif-parse.c b/src/import-export/qif/qif-parse.c index 5079768a93..1a7017b893 100644 --- a/src/import-export/qif/qif-parse.c +++ b/src/import-export/qif/qif-parse.c @@ -97,6 +97,8 @@ build_bangtype_map() qif_bangtype_map = g_hash_table_new(g_str_hash, g_str_equal); g_assert(qif_bangtype_map); + /* Translators FIXME: It is unclear whether these strings should + really be translated, and if yes, into which translation. */ QIF_ADD_TYPE(N_("type:bank"), QIF_TYPE_BANK); QIF_ADD_TYPE(N_("type:cash"), QIF_TYPE_CASH); QIF_ADD_TYPE(N_("type:ccard"), QIF_TYPE_CCARD); diff --git a/src/report/report-gnome/report.glade b/src/report/report-gnome/report.glade index 3c5be10743..23a7f94806 100644 --- a/src/report/report-gnome/report.glade +++ b/src/report/report-gnome/report.glade @@ -328,7 +328,7 @@ True - + False False GTK_JUSTIFY_CENTER