[grisbi-cvs] grisbi/po de.po, 1.43, 1.44 grisbi.pot, 1.50, 1.51 zh_CN.po, 1.3, 1.4

Martin Stromberger fabiolla at users.sourceforge.net
Fri Nov 14 22:23:20 CET 2008


Update of /cvsroot/grisbi/grisbi/po
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10750/po

Modified Files:
	de.po grisbi.pot zh_CN.po 
Log Message:
update strings and recreation of pot file

Index: grisbi.pot
===================================================================
RCS file: /cvsroot/grisbi/grisbi/po/grisbi.pot,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- grisbi.pot	9 Nov 2008 23:07:42 -0000	1.50
+++ grisbi.pot	14 Nov 2008 21:23:18 -0000	1.51
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-09 23:45+0100\n"
+"POT-Creation-Date: 2008-11-14 22:00+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -156,100 +156,104 @@
 msgid "Colors"
 msgstr ""
 
-#: src/affichage.c:243
+#: src/affichage.c:229
+msgid "Choosing color"
+msgstr ""
+
+#: src/affichage.c:244
 msgid "Back to default"
 msgstr ""
 
-#: src/affichage.c:353 src/parametres.c:331
+#: src/affichage.c:354 src/parametres.c:331
 msgid "Addresses & titles"
 msgstr ""
 
-#: src/affichage.c:358 src/etats_config.c:622 src/etats_config.c:625
+#: src/affichage.c:359 src/etats_config.c:622 src/etats_config.c:625
 #: src/etats_config.c:7137
 msgid "Titles"
 msgstr ""
 
 #. label account name
-#: src/affichage.c:363 src/gsb_assistant_file.c:277
+#: src/affichage.c:364 src/gsb_assistant_file.c:277
 msgid "Accounts file title"
 msgstr ""
 
-#: src/affichage.c:374
+#: src/affichage.c:375
 msgid "Addresses"
 msgstr ""
 
 #. Common address
-#: src/affichage.c:377
+#: src/affichage.c:378
 msgid "Common address"
 msgstr ""
 
 #. Secondary address
 #. * \note This is not implemented yet
-#: src/affichage.c:396
+#: src/affichage.c:397
 msgid "Secondary address"
 msgstr ""
 
-#: src/affichage.c:499
+#: src/affichage.c:500
 msgid "Select a new logo"
 msgstr ""
 
-#: src/affichage.c:628 src/parametres.c:349
+#: src/affichage.c:629 src/parametres.c:349
 msgid "Toolbars"
 msgstr ""
 
-#: src/affichage.c:631
+#: src/affichage.c:632
 msgid "Display toolbar buttons as"
 msgstr ""
 
-#: src/affichage.c:633
+#: src/affichage.c:634
 msgid "Text"
 msgstr ""
 
-#: src/affichage.c:642
+#: src/affichage.c:643
 msgid "Icons"
 msgstr ""
 
-#: src/affichage.c:651
+#: src/affichage.c:652
 msgid "Both"
 msgstr ""
 
-#: src/affichage.c:673
+#: src/affichage.c:674
 msgid "Display headings bar"
 msgstr ""
 
-#: src/affichage.c:702
+#: src/affichage.c:703
 msgid "Transaction list background 1"
 msgstr ""
 
-#: src/affichage.c:703
+#: src/affichage.c:704
 msgid "Transaction list background 2"
 msgstr ""
 
-#: src/affichage.c:704
+#: src/affichage.c:705
 msgid "Color of transaction's text"
 msgstr ""
 
-#: src/affichage.c:705
+#: src/affichage.c:706
 msgid "Text of unfinished splitted transaction"
 msgstr ""
 
-#: src/affichage.c:706
+#: src/affichage.c:707
 msgid "Children of splitted transaction"
 msgstr ""
 
-#: src/affichage.c:707
+#: src/affichage.c:708
 msgid "Selection color"
 msgstr ""
 
-#: src/affichage.c:708
+#: src/affichage.c:709
 msgid "Background of non selectable scheduled transactions"
 msgstr ""
 
-#: src/affichage.c:709
+#: src/affichage.c:710
 msgid "Archive color"
 msgstr ""
 
-#: src/affichage.c:710
+#: src/affichage.c:711
 msgid "Background of invalid date entry"
 msgstr ""
 
@@ -407,7 +411,7 @@
 #: src/export_csv.c:747 src/gsb_assistant_reconcile_config.c:612
 #: src/gsb_form.c:1271 src/gsb_form_widget.c:394 src/gsb_reconcile.c:155
 #: src/gsb_scheduler_list.c:331 src/gsb_transactions_list.c:143
-#: src/import.c:2734 src/import_csv.c:78 src/traitement_variables.c:74
+#: src/import.c:2749 src/import_csv.c:78 src/traitement_variables.c:74
 msgid "Date"
 msgstr ""
 
@@ -694,7 +698,7 @@
 msgstr ""
 
 #: src/categories_onglet.c:468 src/etats_onglet.c:131 src/import.c:327
-#: src/import.c:2951 src/imputation_budgetaire.c:499 src/parametres.c:286
+#: src/import.c:2966 src/imputation_budgetaire.c:499 src/parametres.c:286
 msgid "Import"
 msgstr ""
 
@@ -917,7 +921,7 @@
 "versions)."
 msgstr ""
 
-#: src/dialog.c:286 src/tip.c:83
+#: src/dialog.c:286
 msgid "Do not show this message again"
 msgstr ""
 
@@ -1322,7 +1326,7 @@
 #: src/etats_config.c:683 src/etats_config.c:7175 src/export_csv.c:762
 #: src/fenetre_principale.c:270 src/gsb_assistant_reconcile_config.c:612
 #: src/gsb_form.c:1298 src/gsb_form_widget.c:414 src/gsb_scheduler_list.c:331
-#: src/gsb_transactions_list.c:145 src/import.c:2741 src/import_csv.c:80
+#: src/gsb_transactions_list.c:145 src/import.c:2756 src/import_csv.c:80
 #: src/meta_payee.c:76 src/traitement_variables.c:76
 msgid "Payee"
 msgstr ""
@@ -1860,7 +1864,7 @@
 
 #: src/etats_config.c:5305 src/export_csv.c:771
 #: src/gsb_assistant_reconcile_config.c:612 src/gsb_scheduler_list.c:332
-#: src/gsb_transactions_list.c:150 src/import.c:2749
+#: src/gsb_transactions_list.c:150 src/import.c:2764
 #: src/traitement_variables.c:81
 msgid "Amount"
 msgstr ""
@@ -5841,7 +5845,7 @@
 msgstr ""
 
 #. TODO dOm : the return value of g_strdup_printf was not used ! I add the devel_debug to print it. Is it OK to do that ?
-#: src/gsb_data_account.c:1176
+#: src/gsb_data_account.c:1174
 #, c-format
 msgid ""
 "Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -5849,7 +5853,7 @@
 msgstr ""
 
 #. TODO dOm : the value of g_strdup_printf was not used. I add the devel_debug function to print it. Is it OK ?
-#: src/gsb_data_account.c:1214
+#: src/gsb_data_account.c:1212
 #, c-format
 msgid ""
 "Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -6942,27 +6946,31 @@
 msgid "Delete a payment method"
 msgstr ""
 
-#: src/gsb_payment_method_config.c:1275
+#: src/gsb_payment_method_config.c:1267
+msgid "Payment method is used by transactions"
+msgstr ""
+
+#: src/gsb_payment_method_config.c:1281
 msgid ""
 "Problem while filling the target method of payment to delete it.\n"
 "This is not normal, please contact the grisbi team."
 msgstr ""
 
-#: src/gsb_payment_method_config.c:1280
+#: src/gsb_payment_method_config.c:1286
 msgid ""
 "Some transactions still use that payment method.  As deletion of this method "
 "is irreversible, these transactions are to be associated with another "
 "payment method."
 msgstr ""
 
-#: src/gsb_payment_method_config.c:1282
+#: src/gsb_payment_method_config.c:1288
 msgid ""
 "No target method of payment to switch the transactions to another method of "
 "payment. If you continue, the transactions with this method of payment will "
 "have no new one."
 msgstr ""
 
-#: src/gsb_payment_method_config.c:1299
+#: src/gsb_payment_method_config.c:1298
 msgid "Associate transactions with"
 msgstr ""
 
@@ -7489,11 +7497,11 @@
 msgid "File name"
 msgstr ""
 
-#: src/import.c:503 src/import.c:585 src/import.c:3046 src/import.c:3069
+#: src/import.c:503 src/import.c:585 src/import.c:3061 src/import.c:3084
 msgid "Unknown"
 msgstr ""
 
-#: src/import.c:545 src/import.c:3149 src/import_csv.c:1045
+#: src/import.c:545 src/import.c:3164 src/import_csv.c:1045
 #, c-format
 msgid "Unable to read file: %s\n"
 msgstr ""
@@ -7657,128 +7665,131 @@
 
 #. l'id du compte choisi et l'id du compte importé sont différents
 #. on propose encore d'arrêter...
-#: src/import.c:1709 src/import.c:2371
+#: src/import.c:1709 src/import.c:2383
 msgid "The id of the imported and chosen accounts are different"
 msgstr ""
 
-#: src/import.c:1933
+#: src/import.c:1934
 msgid "Confirmation of importation of transactions"
 msgstr ""
 
-#: src/import.c:1942
+#: src/import.c:1944
 msgid ""
 "Some imported transactions seem to be already saved. Please select the "
 "transactions to import."
 msgstr ""
 
-#: src/import.c:2008
+#: src/import.c:2020
 #, c-format
 msgid "Transactions to import : %s ; %s ; %s"
 msgstr ""
 
-#: src/import.c:2047
+#: src/import.c:2059
 #, c-format
 msgid "Transaction found : %s ; %s ; %s ; %s"
 msgstr ""
 
-#: src/import.c:2060
+#: src/import.c:2072
 #, c-format
 msgid "Transaction found : %s ; %s ; %s"
 msgstr ""
 
-#: src/import.c:2307
+#: src/import.c:2319
 #, c-format
 msgid ""
 "Warning : the cheque number %ld is already used.\n"
 "We skip it"
 msgstr ""
 
-#: src/import.c:2372
+#: src/import.c:2384
 msgid ""
 "Perhaps you choose a wrong account ?  If you choose to continue, the id of "
 "the account will be changed.  Do you want to continue ?"
 msgstr ""
 
-#: src/import.c:2649
+#: src/import.c:2661
 msgid "Orphaned transactions"
 msgstr ""
 
-#: src/import.c:2659
+#: src/import.c:2672
 msgid "Mark transactions you want to add to the list and click the add button"
 msgstr ""
 
-#: src/import.c:2726
+#: src/import.c:2741
 msgid "Mark"
 msgstr ""
 
-#: src/import.c:2927
+#: src/import.c:2942
 #, c-format
 msgid "%s #%d"
 msgstr ""
 
-#: src/import.c:2962
+#: src/import.c:2977
 msgid "Threshold while matching transaction date during import (in days)"
 msgstr ""
 
-#: src/import.c:2988
+#: src/import.c:3003
 msgid "Set the financial year"
 msgstr ""
 
-#: src/import.c:2989
+#: src/import.c:3004
 msgid "According to the date"
 msgstr ""
 
-#: src/import.c:2990
+#: src/import.c:3005
 msgid "According to the value date (if fail, try with the date)"
 msgstr ""
 
-#: src/import.c:3134
+#: src/import.c:3149
 #, c-format
 msgid ""
 "%s is neither an OFX file, neither a QIF file. Nothing will be done for that "
 "file."
 msgstr ""
 
-#: src/import.c:3192
+#: src/import.c:3207
 #, c-format
 msgid ""
 "%s was not imported successfully. An error occured while getting the "
 "transactions."
 msgstr ""
 
-#: src/import.c:3271
+#: src/import.c:3285
 msgid "Import a file with a rule"
 msgstr ""
 
-#: src/import.c:3279
+#. text for paddingbox
+#: src/import.c:3293
 #, c-format
-msgid "Properties of the rule %s :\n"
+msgid "Properties of the rule %s"
 msgstr ""
 
-#: src/import.c:3288
+#: src/import.c:3312
 #, c-format
 msgid "Imported transactions will be added to the account %s.\n"
 msgstr ""
 
-#: src/import.c:3291
+#: src/import.c:3315
 #, c-format
 msgid "Imported transactions will mark transactions in the account %s.\n"
 msgstr ""
 
-#: src/import.c:3300
+#. textstring 2
+#: src/import.c:3319
 #, c-format
 msgid "Currency to import is %s.\n"
 msgstr ""
 
-#: src/import.c:3311
+#: src/import.c:3325
 msgid "Amounts of the transactions will be inverted.\n"
 msgstr ""
 
-#: src/import.c:3328
-msgid "Name of the file to import : "
+#. label filename
+#: src/import.c:3335
+msgid "Name of the file to import"
 msgstr ""
 
-#: src/import.c:3427
+#: src/import.c:3429
 #, c-format
 msgid "Unable to create tmp file: %s\n"
 msgstr ""
@@ -8556,7 +8567,13 @@
 msgid "Lines font"
 msgstr ""
 
-#: src/print_report.c:435
+#: src/print_report.c:425 src/print_report.c:445
+#: src/print_transactions_list.c:281 src/print_transactions_list.c:304
+#: src/utils_font.c:121
+msgid "Choosing font"
+msgstr ""
+
+#: src/print_report.c:436
 msgid "Title's font"
 msgstr ""
 
@@ -8613,7 +8630,7 @@
 msgid "Title font"
 msgstr ""
 
-#: src/print_transactions_list.c:367
+#: src/print_transactions_list.c:368
 msgid "Fonts & layout"
 msgstr ""
 
@@ -8755,6 +8772,10 @@
 msgid "Did you know that..."
 msgstr ""
 
+#: src/tip.c:83
+msgid "Display tips at next start"
+msgstr ""
+
 #: src/traitement_variables.c:83
 msgid "Reconciliation ref."
 msgstr ""
@@ -8824,10 +8845,6 @@
 msgid "Browse"
 msgstr ""
 
-#: src/utils_font.c:121
-msgid "Choosing font"
-msgstr ""
-
 #: src/utils_font.c:199
 msgid "No font defined"
 msgstr ""

Index: de.po
===================================================================
RCS file: /cvsroot/grisbi/grisbi/po/de.po,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- de.po	9 Nov 2008 23:07:42 -0000	1.43
+++ de.po	14 Nov 2008 21:23:18 -0000	1.44
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-09 23:45+0100\n"
-"PO-Revision-Date: 2008-11-09 23:41+0100\n"
+"POT-Creation-Date: 2008-11-14 22:00+0100\n"
+"PO-Revision-Date: 2008-11-14 22:22+0100\n"
 "Last-Translator: Martin Stromberger <mstromberger at aon.at>\n"
 "Language-Team: deutsch <de at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -96,8 +96,7 @@
 #: src/accueil.c:1663
 #, c-format
 msgid "balance of account %s is under desired and authorised minima!"
-msgstr ""
-"Der Saldo vom Konto %s ist unter dem festgelegten und zulässigen Minimum!"
+msgstr "Der Saldo vom Konto %s ist unter dem festgelegten und zulässigen Minimum!"
 
 #: src/accueil.c:1667
 msgid ""
@@ -165,100 +164,104 @@
 msgid "Colors"
 msgstr "Farben"
 
-#: src/affichage.c:243
+#: src/affichage.c:229
+msgid "Choosing color"
+msgstr "Farbe auswählen - Grisbi"
+
+#: src/affichage.c:244
 msgid "Back to default"
 msgstr "Voreinstellung"
 
-#: src/affichage.c:353 src/parametres.c:331
+#: src/affichage.c:354 src/parametres.c:331
 msgid "Addresses & titles"
 msgstr "Adressen & Bezeichnungen"
 
-#: src/affichage.c:358 src/etats_config.c:622 src/etats_config.c:625
+#: src/affichage.c:359 src/etats_config.c:622 src/etats_config.c:625
 #: src/etats_config.c:7137
 msgid "Titles"
 msgstr "Bezeichnungen"
 
 #. label account name
-#: src/affichage.c:363 src/gsb_assistant_file.c:277
+#: src/affichage.c:364 src/gsb_assistant_file.c:277
 msgid "Accounts file title"
 msgstr "Bezeichnung"
 
-#: src/affichage.c:374
+#: src/affichage.c:375
 msgid "Addresses"
 msgstr "Adressen"
 
 #. Common address
-#: src/affichage.c:377
+#: src/affichage.c:378
 msgid "Common address"
 msgstr "Hauptadresse"
 
 #. Secondary address
 #. * \note This is not implemented yet
-#: src/affichage.c:396
+#: src/affichage.c:397
 msgid "Secondary address"
 msgstr "Zusatzadresse"
 
-#: src/affichage.c:499
+#: src/affichage.c:500
 msgid "Select a new logo"
 msgstr "Logo auswählen - Grisbi"
 
-#: src/affichage.c:628 src/parametres.c:349
+#: src/affichage.c:629 src/parametres.c:349
 msgid "Toolbars"
 msgstr "Werkzeugleisten"
 
-#: src/affichage.c:631
+#: src/affichage.c:632
 msgid "Display toolbar buttons as"
 msgstr "Werkzeugleisten Darstellung"
 
-#: src/affichage.c:633
+#: src/affichage.c:634
 msgid "Text"
 msgstr "Text"
 
-#: src/affichage.c:642
+#: src/affichage.c:643
 msgid "Icons"
 msgstr "Symbole"
 
-#: src/affichage.c:651
+#: src/affichage.c:652
 msgid "Both"
 msgstr "Text und Symbole"
 
-#: src/affichage.c:673
+#: src/affichage.c:674
 msgid "Display headings bar"
 msgstr "Kopfzeile anzeigen"
 
-#: src/affichage.c:702
+#: src/affichage.c:703
 msgid "Transaction list background 1"
 msgstr "Hintergrund gerade Zeilen"
 
-#: src/affichage.c:703
+#: src/affichage.c:704
 msgid "Transaction list background 2"
 msgstr "Hintergrund ungerade Zeilen"
 
-#: src/affichage.c:704
+#: src/affichage.c:705
 msgid "Color of transaction's text"
 msgstr "Text Buchungen"
 
-#: src/affichage.c:705
+#: src/affichage.c:706
 msgid "Text of unfinished splitted transaction"
 msgstr "Text unvollständige Splittbuchungen"
 
-#: src/affichage.c:706
+#: src/affichage.c:707
 msgid "Children of splitted transaction"
 msgstr "Teilbuchungen von Splittbuchungen"
 
-#: src/affichage.c:707
+#: src/affichage.c:708
 msgid "Selection color"
 msgstr "Selektierte Buchung"
 
-#: src/affichage.c:708
+#: src/affichage.c:709
 msgid "Background of non selectable scheduled transactions"
 msgstr "Hintergrund nicht auswählbarer geplanter Buchungen"
 
-#: src/affichage.c:709
+#: src/affichage.c:710
 msgid "Archive color"
 msgstr "Archivierte Buchungen"
 
-#: src/affichage.c:710
+#: src/affichage.c:711
 msgid "Background of invalid date entry"
 msgstr "Hintergrund ungültiger Datumswert"
 
@@ -336,8 +339,7 @@
 
 #: src/affichage_liste.c:439
 msgid "Limit payee completion to current account"
-msgstr ""
-"Die Vervollständigung von Empfängern auf das aktuelle Konto beschränken"
+msgstr "Die Vervollständigung von Empfängern auf das aktuelle Konto beschränken"
 
 #: src/affichage_liste.c:445
 msgid "Mix credit/debit categories"
@@ -419,7 +421,7 @@
 #: src/export_csv.c:747 src/gsb_assistant_reconcile_config.c:612
 #: src/gsb_form.c:1271 src/gsb_form_widget.c:394 src/gsb_reconcile.c:155
 #: src/gsb_scheduler_list.c:331 src/gsb_transactions_list.c:143
-#: src/import.c:2734 src/import_csv.c:78 src/traitement_variables.c:74
+#: src/import.c:2749 src/import_csv.c:78 src/traitement_variables.c:74
 msgid "Date"
 msgstr "Datum"
 
@@ -718,7 +720,7 @@
 msgstr "Eine neue Unterkategorie erstellen"
 
 #: src/categories_onglet.c:468 src/etats_onglet.c:131 src/import.c:327
-#: src/import.c:2951 src/imputation_budgetaire.c:499 src/parametres.c:286
+#: src/import.c:2966 src/imputation_budgetaire.c:499 src/parametres.c:286
 msgid "Import"
 msgstr "Import"
 
@@ -767,7 +769,7 @@
 #: src/tiers_onglet.c:498
 #, c-format
 msgid "Properties for %s"
-msgstr "Eigenschaften für %s"
+msgstr "Eigenschaften von %s"
 
 #: src/categories_onglet.c:597
 msgid "No sub-category defined"
@@ -833,8 +835,7 @@
 msgstr "Kein Tipp des Tages verfügbar"
 
 #: src/dialog.c:52
-msgid ""
-"Make sure that grisbi was correctly installed and that tips file is readable."
+msgid "Make sure that grisbi was correctly installed and that tips file is readable."
 msgstr "Bitte die Installation von Grisbi überprüfen."
 
 #: src/dialog.c:55
@@ -975,7 +976,7 @@
 "Dateiformat kann sich ändern, dadurch kann diese Datei inkompatibel zu "
 "Vorversionen von Grisbi werden)."
 
-#: src/dialog.c:286 src/tip.c:83
+#: src/dialog.c:286
 msgid "Do not show this message again"
 msgstr "Diese Meldung nicht mehr anzeigen"
 
@@ -1019,10 +1020,8 @@
 msgstr "Grisbi hat eine Sicherung im Verzeichnis '%s' erstellt."
 
 #: src/erreur.c:134
-msgid ""
-"Please report this problem to <tt>http://www.grisbi.org/bugtracking/</tt>.  "
-msgstr ""
-"Bitte den Fehler unter <tt>http://www.grisbi.org/bugtracking/</tt> melden.  "
+msgid "Please report this problem to <tt>http://www.grisbi.org/bugtracking/</tt>.  "
+msgstr "Bitte den Fehler unter <tt>http://www.grisbi.org/bugtracking/</tt> melden.  "
 
 #: src/erreur.c:140
 msgid "Copy and paste the following backtrace with your bug report."
@@ -1390,7 +1389,7 @@
 #: src/etats_config.c:683 src/etats_config.c:7175 src/export_csv.c:762
 #: src/fenetre_principale.c:270 src/gsb_assistant_reconcile_config.c:612
 #: src/gsb_form.c:1298 src/gsb_form_widget.c:414 src/gsb_scheduler_list.c:331
-#: src/gsb_transactions_list.c:145 src/import.c:2741 src/import_csv.c:80
+#: src/gsb_transactions_list.c:145 src/import.c:2756 src/import_csv.c:80
 #: src/meta_payee.c:76 src/traitement_variables.c:76
 msgid "Payee"
 msgstr "Empfänger"
@@ -1707,7 +1706,7 @@
 msgid "Account selection"
 msgstr "Konten Auswahl"
 
-#. on met dans la partie de gauche une liste contenant les comptes à
+#. on met dans la partie de gauche une liste contenant les comptes Ã
 #. sélectionner
 #: src/etats_config.c:2485
 msgid "Select transactions only for given accounts"
@@ -1942,7 +1941,7 @@
 
 #: src/etats_config.c:5305 src/export_csv.c:771
 #: src/gsb_assistant_reconcile_config.c:612 src/gsb_scheduler_list.c:332
-#: src/gsb_transactions_list.c:150 src/import.c:2749
+#: src/gsb_transactions_list.c:150 src/import.c:2764
 #: src/traitement_variables.c:81
 msgid "Amount"
 msgstr "Betrag"
@@ -2298,7 +2297,7 @@
 msgid "Display \"No sub-budgetary line\" if none"
 msgstr " \"Keinen Teil-Budgeteintrag\" anzeigen wenn keiner vorhanden ist"
 
-#. on met dans la partie de gauche une liste contenant les modes de paiement à
+#. on met dans la partie de gauche une liste contenant les modes de paiement Ã
 #. sélectionner
 #: src/etats_config.c:7403
 msgid "Select the transactions by method of payment"
@@ -3941,10 +3940,8 @@
 msgstr "<span foreground=\"red\">Bitte das Enddatum eingeben</span>"
 
 #: src/gsb_assistant_archive.c:851
-msgid ""
-"<span foreground=\"red\">The initial date is after the final date</span>"
-msgstr ""
-"<span foreground=\"red\">Das Beginndatum liegt nach dem Enddatum</span>"
+msgid "<span foreground=\"red\">The initial date is after the final date</span>"
+msgstr "<span foreground=\"red\">Das Beginndatum liegt nach dem Enddatum</span>"
 
 #: src/gsb_assistant_archive.c:855
 msgid "<span foreground=\"red\">The initial date is not valid.</span>"
@@ -3963,8 +3960,7 @@
 "</span>"
 
 #: src/gsb_assistant_archive.c:867
-msgid ""
-"<span foreground=\"red\">The final date belongs already to an archive.</span>"
+msgid "<span foreground=\"red\">The final date belongs already to an archive.</span>"
 msgstr ""
 "<span foreground=\"red\">Das Enddatum ist bereits einem Archiv zugeordnet.</"
 "span>"
@@ -4194,8 +4190,7 @@
 
 #: src/gsb_assistant_file.c:487
 msgid "Import data from online bank services or from accounting software"
-msgstr ""
-"Konten und Daten von anderen Finanzprogrammen oder Ihrer Bank importieren"
+msgstr "Konten und Daten von anderen Finanzprogrammen oder Ihrer Bank importieren"
 
 #: src/gsb_assistant_file.c:559 src/navigation.c:1185
 #: src/traitement_variables.c:292
@@ -4485,14 +4480,12 @@
 msgstr "<span foreground=\"red\">Das Beginndatum ist nicht gültig</span>"
 
 #: src/gsb_assistant_reconcile_config.c:797
-msgid ""
-"<span foreground=\"red\">The final date is not valid, please check it</span>"
+msgid "<span foreground=\"red\">The final date is not valid, please check it</span>"
 msgstr "<span foreground=\"red\">Das Enddatum ist nicht gültig</span>"
 
 #: src/gsb_assistant_reconcile_config.c:806
 msgid "<span foreground=\"red\">Please give a name to the new reconcile</span>"
-msgstr ""
-"<span foreground=\"red\">Bitte einen Namen für die Abstimmung eingeben</span>"
+msgstr "<span foreground=\"red\">Bitte einen Namen für die Abstimmung eingeben</span>"
 
 #: src/gsb_assistant_reconcile_config.c:815
 msgid ""
@@ -4506,15 +4499,12 @@
 msgid ""
 "<span foreground=\"red\">Cannot allocate memory : Bad things will happen "
 "soon.</span>"
-msgstr ""
-"<span foreground=\"red\">Der Speicher kann nicht zugeordnet werden.</span>"
+msgstr "<span foreground=\"red\">Der Speicher kann nicht zugeordnet werden.</span>"
 
 #: src/gsb_assistant_reconcile_config.c:853
 #, c-format
-msgid ""
-"<span foreground=\"blue\">Reconciliation %s successfully appended !</span>"
-msgstr ""
-"<span foreground=\"blue\">Abstimmung %s erfolgreich abgeschlossen !</span>"
+msgid "<span foreground=\"blue\">Reconciliation %s successfully appended !</span>"
+msgstr "<span foreground=\"blue\">Abstimmung %s erfolgreich abgeschlossen !</span>"
 
 #. update the string containing the number of transactions to link
 #. update the labels
@@ -4563,8 +4553,7 @@
 
 #: src/gsb_assistant_reconcile_config.c:1315
 msgid "No selection found, the transactions are not modified."
-msgstr ""
-"Es wurde keine Auswahl getroffen, die Buchungen werden nicht zugeordnet."
+msgstr "Es wurde keine Auswahl getroffen, die Buchungen werden nicht zugeordnet."
 
 #: src/gsb_bank.c:380 src/gsb_reconcile.c:415
 msgid "None"
@@ -6167,8 +6156,7 @@
 msgid ""
 "Currency name and either international currency code or currency nickname "
 "should be set."
-msgstr ""
-"Es muss entweder der Währungsname oder der 'ISO-Code' eingegeben werden."
+msgstr "Es muss entweder der Währungsname oder der 'ISO-Code' eingegeben werden."
 
 #: src/gsb_currency_config.c:1041
 msgid "All fields are not filled in"
@@ -6224,13 +6212,11 @@
 
 #: src/gsb_data_account.c:519
 #, c-format
-msgid ""
-"Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
-msgstr ""
-"Bad nb rows nach gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
+msgid "Bad nb rows to gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
+msgstr "Bad nb rows nach gsb_data_account_set_nb_rows in gsb_data_account.c : %d\n"
 
 #. TODO dOm : the return value of g_strdup_printf was not used ! I add the devel_debug to print it. Is it OK to do that ?
-#: src/gsb_data_account.c:1176
+#: src/gsb_data_account.c:1174
 #, c-format
 msgid ""
 "Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -6240,7 +6226,7 @@
 "no_column = %d\n"
 
 #. TODO dOm : the value of g_strdup_printf was not used. I add the devel_debug function to print it. Is it OK ?
-#: src/gsb_data_account.c:1214
+#: src/gsb_data_account.c:1212
 #, c-format
 msgid ""
 "Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -6280,8 +6266,7 @@
 msgid ""
 "<span foreground=\"red\">Warning : the two currencies of the link are "
 "identicals</span>"
-msgstr ""
-"<span foreground=\"red\">Warnung : Die zwei Währungen sind identisch</span>"
+msgstr "<span foreground=\"red\">Warnung : Die zwei Währungen sind identisch</span>"
 
 #: src/gsb_data_currency_link.c:477
 msgid "<span foreground=\"red\">Warning : that link is already defined</span>"
@@ -6290,8 +6275,7 @@
 "span>"
 
 #: src/gsb_data_fyear.c:574
-msgid ""
-"<span foreground=\"red\">Warning : the dates are not in good order</span>"
+msgid "<span foreground=\"red\">Warning : the dates are not in good order</span>"
 msgstr "<span foreground=\"red\">Warnung : Die Daten sind inkonsistent</span>"
 
 #: src/gsb_data_fyear.c:577
@@ -6595,8 +6579,7 @@
 #: src/gsb_debug.c:594
 #, c-format
 msgid "Transaction %d has category %d but invalid sub-category %d.\n"
-msgstr ""
-"Die Buchung %d hat als Kategorie %d und eine ungültige Unterkategorie %d.\n"
+msgstr "Die Buchung %d hat als Kategorie %d und eine ungültige Unterkategorie %d.\n"
 
 #. category not found
 #: src/gsb_debug.c:608
@@ -6787,10 +6770,8 @@
 
 #: src/gsb_file.c:787
 #, c-format
-msgid ""
-"If you close without saving, all of your changes since %s will be discarded."
-msgstr ""
-"Beim Schließen ohne Speichern werden alle Änderungen seit %s verworfen."
+msgid "If you close without saving, all of your changes since %s will be discarded."
+msgstr "Beim Schließen ohne Speichern werden alle Änderungen seit %s verworfen."
 
 #: src/gsb_file.c:823
 msgid "Name the accounts file"
@@ -7061,8 +7042,7 @@
 "erstellt werden."
 
 #: src/gsb_form.c:2489
-msgid ""
-"Cannot associate a transfer to a deleted account in a scheduled transaction."
+msgid "Cannot associate a transfer to a deleted account in a scheduled transaction."
 msgstr "Das Konto für die zeitlich geplante Umbuchung ist gelöscht."
 
 #: src/gsb_form.c:2496
@@ -7102,13 +7082,11 @@
 
 #: src/gsb_form.c:2569
 msgid "A transaction with a multiple payee must be a new one."
-msgstr ""
-"Für Buchungen an mehrere Empfänger muss eine neue Buchung erfasst werden."
+msgstr "Für Buchungen an mehrere Empfänger muss eine neue Buchung erfasst werden."
 
 #: src/gsb_form.c:2574
 msgid "A transaction with a multiple payee cannot be a split child."
-msgstr ""
-"Eine Buchung an mehrere Empfänger darf kein Teil einer Splitt-Buchung sein."
+msgstr "Eine Buchung an mehrere Empfänger darf kein Teil einer Splitt-Buchung sein."
 
 #: src/gsb_form.c:2585
 msgid "The word \"Report\" is reserved. Please use another one."
@@ -7499,7 +7477,11 @@
 msgid "Delete a payment method"
 msgstr "Zahlungsweise löschen - Grisbi"
 
-#: src/gsb_payment_method_config.c:1275
+#: src/gsb_payment_method_config.c:1267
+msgid "Payment method is used by transactions"
+msgstr "Der Zahlungsweise sind Buchungen zugeordnet"
+
+#: src/gsb_payment_method_config.c:1281
 msgid ""
 "Problem while filling the target method of payment to delete it.\n"
 "This is not normal, please contact the grisbi team."
@@ -7507,28 +7489,30 @@
 "Es ist ein Problem beim Befüllen/Löschen der Zahlungsweise aufgetreten.\n"
 "Bitte kontaktieren Sie das Grisbi Team."
 
-#: src/gsb_payment_method_config.c:1280
+#: src/gsb_payment_method_config.c:1286
 msgid ""
 "Some transactions still use that payment method.  As deletion of this method "
 "is irreversible, these transactions are to be associated with another "
 "payment method."
 msgstr ""
-"Einige Buchungen verwenden noch diese Zahlungsweise. Die Löschung dieser "
-"Zahlungsweise kann nicht rückgängig gemacht werden. Die Buchungen werden "
-"einer anderen Zahlungsweise zugeordnet."
+"Der Zahlungweise sind Buchungen zugeordnet. Da die Löschung einer "
+"Zahlungsweise nicht rückgängig gemacht werden kann sollten die Buchungen "
+"einer anderen Zahlungsweise zugeordnet werden."
 
-#: src/gsb_payment_method_config.c:1282
+#: src/gsb_payment_method_config.c:1288
 msgid ""
 "No target method of payment to switch the transactions to another method of "
 "payment. If you continue, the transactions with this method of payment will "
 "have no new one."
 msgstr ""
-"Es gibt keine neue Zahlungsweise für diese Buchung. Wenn Sie den Vorgang "
-"fortsetzen wird bei dieser Buchung keine Zahlungsweise eingetragen."
+"Der Zahlungsweise sind Buchungen zugeordnet. Es gibt keine andere "
+"Zahlungsweise welcher die Buchungen zugeordnet werden können. Wenn Sie den "
+"Vorgang fortsetzen wird bei diesen Buchungen die Zahlungsweise "
+"unwiederbringlich entfernt."
 
-#: src/gsb_payment_method_config.c:1299
+#: src/gsb_payment_method_config.c:1298
 msgid "Associate transactions with"
-msgstr "Die Buchungen verbinden mit"
+msgstr "Zahlungsweise für Neuzuordnung"
 
 #: src/gsb_plugins.c:195
 msgid "with plugins"
@@ -7757,8 +7741,7 @@
 
 #: src/gsb_scheduler_list.c:1640
 #, c-format
-msgid ""
-"Do you really want to delete the scheduled transaction with party '%s' ?"
+msgid "Do you really want to delete the scheduled transaction with party '%s' ?"
 msgstr "Soll die geplante Buchung mit dem Empfänger '%s' gelöscht werden?"
 
 #: src/gsb_scheduler_list.c:1673
@@ -7937,8 +7920,7 @@
 
 #: src/gsb_transactions_list.c:1809
 msgid "Grisbi couldn't get the selection, operation canceled..."
-msgstr ""
-"Grisbi konnte die Auswahl nicht übernehmen, der Vorgang wurde abgebrochen..."
+msgstr "Grisbi konnte die Auswahl nicht übernehmen, der Vorgang wurde abgebrochen..."
 
 #: src/gsb_transactions_list.c:1851
 msgid "Impossible to delete an archived transaction."
@@ -7958,8 +7940,7 @@
 
 #: src/gsb_transactions_list.c:1870
 #, c-format
-msgid ""
-"Do you really want to delete the child of the transaction with party '%s' ?"
+msgid "Do you really want to delete the child of the transaction with party '%s' ?"
 msgstr "Soll die Teil-Buchung mit dem Empfänger '%s' gelöscht werden?"
 
 #: src/gsb_transactions_list.c:1885
@@ -8139,11 +8120,11 @@
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/import.c:503 src/import.c:585 src/import.c:3046 src/import.c:3069
+#: src/import.c:503 src/import.c:585 src/import.c:3061 src/import.c:3084
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: src/import.c:545 src/import.c:3149 src/import_csv.c:1045
+#: src/import.c:545 src/import.c:3164 src/import_csv.c:1045
 #, c-format
 msgid "Unable to read file: %s\n"
 msgstr "Die Datei kann nicht gelesen werden: %s\n"
@@ -8342,39 +8323,38 @@
 
 #. l'id du compte choisi et l'id du compte importé sont différents
 #. on propose encore d'arrêter...
-#: src/import.c:1709 src/import.c:2371
+#: src/import.c:1709 src/import.c:2383
 msgid "The id of the imported and chosen accounts are different"
-msgstr ""
-"Die ID's des importieren und des selektierten Kontos sind unterschiedlich"
+msgstr "Die ID's des importieren und des selektierten Kontos sind unterschiedlich"
 
-#: src/import.c:1933
+#: src/import.c:1934
 msgid "Confirmation of importation of transactions"
 msgstr "Import von Buchungen bestätigen - Grisbi"
 
-#: src/import.c:1942
+#: src/import.c:1944
 msgid ""
 "Some imported transactions seem to be already saved. Please select the "
 "transactions to import."
 msgstr ""
-"Einige der importieren Buchungen sind bereits vorhanden. Bitte wählen Sie "
-"die Buchungen aus, welche importiert werden sollen."
+"Die aufgelisteten Buchungen sind bereits vorhanden - bitte treffen Sie eine "
+"Auswahl welche Buchungen importiert werden sollen."
 
-#: src/import.c:2008
+#: src/import.c:2020
 #, c-format
 msgid "Transactions to import : %s ; %s ; %s"
 msgstr "Zu importierende Buchungen : %s ; %s ; %s"
 
-#: src/import.c:2047
+#: src/import.c:2059
 #, c-format
 msgid "Transaction found : %s ; %s ; %s ; %s"
 msgstr "Buchungen gefunden : %s ; %s ; %s ; %s"
 
-#: src/import.c:2060
+#: src/import.c:2072
 #, c-format
 msgid "Transaction found : %s ; %s ; %s"
 msgstr "Buchungen gefunden : %s ; %s ; %s"
 
-#: src/import.c:2307
+#: src/import.c:2319
 #, c-format
 msgid ""
 "Warning : the cheque number %ld is already used.\n"
@@ -8383,7 +8363,7 @@
 "Achtung: Diese Schecknummer %ld wird bereit benützt.\n"
 "Die Auswahl wird verworfen"
 
-#: src/import.c:2372
+#: src/import.c:2384
 msgid ""
 "Perhaps you choose a wrong account ?  If you choose to continue, the id of "
 "the account will be changed.  Do you want to continue ?"
@@ -8392,42 +8372,42 @@
 "entscheiden den Vorgang fortzusetzen wird die Id des Kontos geändert. Soll "
 "der Vorgang fortgesetzt werden?"
 
-#: src/import.c:2649
+#: src/import.c:2661
 msgid "Orphaned transactions"
 msgstr "Buchungen auswählen - Grisbi"
 
-#: src/import.c:2659
+#: src/import.c:2672
 msgid "Mark transactions you want to add to the list and click the add button"
 msgstr ""
-"Bitte wählen Sie die Buchungen aus, welche importiert werden sollen. Mit "
-"'Anwenden' werden die Buchungen importiert."
+"Die Buchungen für den Import auswählen - mit 'Anwenden' werden die Buchungen "
+"importiert."
 
-#: src/import.c:2726
+#: src/import.c:2741
 msgid "Mark"
 msgstr "Markieren"
 
-#: src/import.c:2927
+#: src/import.c:2942
 #, c-format
 msgid "%s #%d"
 msgstr "%s #%d"
 
-#: src/import.c:2962
+#: src/import.c:2977
 msgid "Threshold while matching transaction date during import (in days)"
 msgstr "Datumsbereich in Tagen für den Import von Buchungen : "
 
-#: src/import.c:2988
+#: src/import.c:3003
 msgid "Set the financial year"
 msgstr "Geschäftsjahr Zuordnung"
 
-#: src/import.c:2989
+#: src/import.c:3004
 msgid "According to the date"
 msgstr "entsprechend Datum der Buchung"
 
-#: src/import.c:2990
+#: src/import.c:3005
 msgid "According to the value date (if fail, try with the date)"
 msgstr "entsprechend Datum der Durchführung"
 
-#: src/import.c:3134
+#: src/import.c:3149
 #, c-format
 msgid ""
 "%s is neither an OFX file, neither a QIF file. Nothing will be done for that "
@@ -8436,7 +8416,7 @@
 "%s ist keine Ofx oder Qif Datei, es werden keine Daten aus dieser Datei "
 "importiert."
 
-#: src/import.c:3192
+#: src/import.c:3207
 #, c-format
 msgid ""
 "%s was not imported successfully. An error occured while getting the "
@@ -8445,39 +8425,42 @@
 "%s konnte nicht erfolgreich importiert werden. Es ist ein Fehler beim "
 "Ermitteln der Buchungen aufgetreten."
 
-#: src/import.c:3271
+#: src/import.c:3285
 msgid "Import a file with a rule"
 msgstr "Regelbasierender Import - Grisbi"
 
-#: src/import.c:3279
+#. text for paddingbox
+#: src/import.c:3293
 #, c-format
-msgid "Properties of the rule %s :\n"
-msgstr "Eigenschaften für die Regel %s :\n"
+msgid "Properties of the rule %s"
+msgstr "Eigenschaften von Importregel %s"
 
-#: src/import.c:3288
+#: src/import.c:3312
 #, c-format
 msgid "Imported transactions will be added to the account %s.\n"
 msgstr "Die importierten Buchungen werden dem Konto %s zugeordnet.\n"
 
-#: src/import.c:3291
+#: src/import.c:3315
 #, c-format
 msgid "Imported transactions will mark transactions in the account %s.\n"
 msgstr "Die importierten Buchungen erhalten eine Markierung im Konto %s.\n"
 
-#: src/import.c:3300
+#. textstring 2
+#: src/import.c:3319
 #, c-format
 msgid "Currency to import is %s.\n"
 msgstr "Die Währung für den Import ist %s.\n"
 
-#: src/import.c:3311
+#: src/import.c:3325
 msgid "Amounts of the transactions will be inverted.\n"
 msgstr "Die Beträge der Buchungen werden invertiert.\n"
 
-#: src/import.c:3328
-msgid "Name of the file to import : "
-msgstr "Name der Importdatei : "
+#. label filename
+#: src/import.c:3335
+msgid "Name of the file to import"
+msgstr "Importdatei"
 
-#: src/import.c:3427
+#: src/import.c:3429
 #, c-format
 msgid "Unable to create tmp file: %s\n"
 msgstr "Die temporäre Datei kann nicht erstellt werden: %s\n"
@@ -9111,8 +9094,7 @@
 
 #: src/parametres.c:930
 msgid "Warn/Execute the scheduled transactions arriving at expiration date"
-msgstr ""
-"Am Fälligkeitsdatum einen Hinweis anzeigen und die geplante Buchung ausführen"
+msgstr "Am Fälligkeitsdatum einen Hinweis anzeigen und die geplante Buchung ausführen"
 
 #: src/parametres.c:931
 msgid "Warn/Execute the scheduled transactions of the month"
@@ -9302,7 +9284,13 @@
 msgid "Lines font"
 msgstr "Schrift Zeilen"
 
-#: src/print_report.c:435
+#: src/print_report.c:425 src/print_report.c:445
+#: src/print_transactions_list.c:281 src/print_transactions_list.c:304
+#: src/utils_font.c:121
+msgid "Choosing font"
+msgstr "Schrift auswählen - Grisbi"
+
+#: src/print_report.c:436
 msgid "Title's font"
 msgstr "Schrift Titel"
 
@@ -9359,7 +9347,7 @@
 msgid "Title font"
 msgstr "Schrift Titel"
 
-#: src/print_transactions_list.c:367
+#: src/print_transactions_list.c:368
 msgid "Fonts & layout"
 msgstr "Schriften & Layout"
 
@@ -9523,6 +9511,10 @@
 msgid "Did you know that..."
 msgstr "Wussten Sie dass ..."
 
+#: src/tip.c:83
+msgid "Display tips at next start"
+msgstr "Tipps beim nächsten Start anzeigen"
+
 #: src/traitement_variables.c:83
 msgid "Reconciliation ref."
 msgstr "Abstimmung Ref."
@@ -9562,8 +9554,7 @@
 
 #: src/transaction_list_sort.c:136
 #, c-format
-msgid ""
-"Asked to sort by column %d, wich is bigger than the visible columns (%d)"
+msgid "Asked to sort by column %d, wich is bigger than the visible columns (%d)"
 msgstr ""
 "Es wurde ein Sortierung nach Spalte %d aufgerufen, dieses Spalte ist breiter "
 "als die sichtbaren Spalten (%d)"
@@ -9605,10 +9596,7 @@
 msgid "Browse"
 msgstr "durchsuchen"
 
-#: src/utils_font.c:121
-msgid "Choosing font"
-msgstr "Schrift auswählen - Grisbi"
-
 #: src/utils_font.c:199
 msgid "No font defined"
 msgstr "Keine Schrift definiert"
+

Index: zh_CN.po
===================================================================
RCS file: /cvsroot/grisbi/grisbi/po/zh_CN.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- zh_CN.po	9 Nov 2008 23:07:42 -0000	1.3
+++ zh_CN.po	14 Nov 2008 21:23:18 -0000	1.4
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-09 23:45+0100\n"
+"POT-Creation-Date: 2008-11-14 22:00+0100\n"
 "PO-Revision-Date: 2005-12-19 11:25+0100\n"
 "Last-Translator: Jianyu Tang <jianyunet at gmail.com>\n"
 "Language-Team: zh_CN <LL at li.org>\n"
@@ -163,115 +163,119 @@
 msgid "Colors"
 msgstr "Comoros"
 
-#: src/affichage.c:243
+#: src/affichage.c:229
+msgid "Choosing color"
+msgstr ""
+
+#: src/affichage.c:244
 #, fuzzy
 msgid "Back to default"
 msgstr "恢复默认值"
 
-#: src/affichage.c:353 src/parametres.c:331
+#: src/affichage.c:354 src/parametres.c:331
 msgid "Addresses & titles"
 msgstr "地址和名称抬头"
 
-#: src/affichage.c:358 src/etats_config.c:622 src/etats_config.c:625
+#: src/affichage.c:359 src/etats_config.c:622 src/etats_config.c:625
 #: src/etats_config.c:7137
 msgid "Titles"
 msgstr "名称抬头"
 
 #. label account name
-#: src/affichage.c:363 src/gsb_assistant_file.c:277
+#: src/affichage.c:364 src/gsb_assistant_file.c:277
 msgid "Accounts file title"
 msgstr "账户文件标题"
 
-#: src/affichage.c:374
+#: src/affichage.c:375
 msgid "Addresses"
 msgstr "地址"
 
 #. Common address
-#: src/affichage.c:377
+#: src/affichage.c:378
 msgid "Common address"
 msgstr "地址"
 
 #. Secondary address
 #. * \note This is not implemented yet
-#: src/affichage.c:396
+#: src/affichage.c:397
 msgid "Secondary address"
 msgstr "备用地址"
 
-#: src/affichage.c:499
+#: src/affichage.c:500
 msgid "Select a new logo"
 msgstr "选择一个新标志图"
 
-#: src/affichage.c:628 src/parametres.c:349
+#: src/affichage.c:629 src/parametres.c:349
 msgid "Toolbars"
 msgstr ""
 
-#: src/affichage.c:631
+#: src/affichage.c:632
 #, fuzzy
 msgid "Display toolbar buttons as"
 msgstr "显示交易"
 
-#: src/affichage.c:633
+#: src/affichage.c:634
 #, fuzzy
 msgid "Text"
 msgstr "文本"
 
-#: src/affichage.c:642
+#: src/affichage.c:643
 #, fuzzy
 msgid "Icons"
 msgstr "收入"
 
-#: src/affichage.c:651
+#: src/affichage.c:652
 #, fuzzy
 msgid "Both"
 msgstr "总计"
 
-#: src/affichage.c:673
+#: src/affichage.c:674
 #, fuzzy
 msgid "Display headings bar"
 msgstr "显示关于...的信息"
 
-#: src/affichage.c:702
+#: src/affichage.c:703
 #, fuzzy
 msgid "Transaction list background 1"
 msgstr "交易清单字体"
 
-#: src/affichage.c:703
+#: src/affichage.c:704
 #, fuzzy
 msgid "Transaction list background 2"
 msgstr "交易清单字体"
 
-#: src/affichage.c:704
+#: src/affichage.c:705
 #, fuzzy
 msgid "Color of transaction's text"
 msgstr "复制交易"
 
-#: src/affichage.c:705
+#: src/affichage.c:706
 #, fuzzy
 msgid "Text of unfinished splitted transaction"
 msgstr "删除一条定期交易"
 
-#: src/affichage.c:706
+#: src/affichage.c:707
 #, fuzzy
 msgid "Children of splitted transaction"
 msgstr "已结清预定交易"
 
-#: src/affichage.c:707
+#: src/affichage.c:708
 #, fuzzy
 msgid "Selection color"
 msgstr "选择所有"
 
-#: src/affichage.c:708
+#: src/affichage.c:709
 #, fuzzy
 msgid "Background of non selectable scheduled transactions"
 msgstr ""
 "到期选择的\n"
 "定期交易"
 
-#: src/affichage.c:709
+#: src/affichage.c:710
 msgid "Archive color"
 msgstr ""
 
-#: src/affichage.c:710
+#: src/affichage.c:711
 msgid "Background of invalid date entry"
 msgstr ""
 
@@ -442,7 +446,7 @@
 #: src/export_csv.c:747 src/gsb_assistant_reconcile_config.c:612
 #: src/gsb_form.c:1271 src/gsb_form_widget.c:394 src/gsb_reconcile.c:155
 #: src/gsb_scheduler_list.c:331 src/gsb_transactions_list.c:143
-#: src/import.c:2734 src/import_csv.c:78 src/traitement_variables.c:74
+#: src/import.c:2749 src/import_csv.c:78 src/traitement_variables.c:74
 msgid "Date"
 msgstr "日期"
 
@@ -763,7 +767,7 @@
 msgstr "请输入新增子类的名称"
 
 #: src/categories_onglet.c:468 src/etats_onglet.c:131 src/import.c:327
-#: src/import.c:2951 src/imputation_budgetaire.c:499 src/parametres.c:286
+#: src/import.c:2966 src/imputation_budgetaire.c:499 src/parametres.c:286
 msgid "Import"
 msgstr "导入"
 
@@ -1005,7 +1009,7 @@
 "versions)."
 msgstr ""
 
-#: src/dialog.c:286 src/tip.c:83
+#: src/dialog.c:286
 msgid "Do not show this message again"
 msgstr "不再显示本消息"
 
@@ -1416,7 +1420,7 @@
 #: src/etats_config.c:683 src/etats_config.c:7175 src/export_csv.c:762
 #: src/fenetre_principale.c:270 src/gsb_assistant_reconcile_config.c:612
 #: src/gsb_form.c:1298 src/gsb_form_widget.c:414 src/gsb_scheduler_list.c:331
-#: src/gsb_transactions_list.c:145 src/import.c:2741 src/import_csv.c:80
+#: src/gsb_transactions_list.c:145 src/import.c:2756 src/import_csv.c:80
 #: src/meta_payee.c:76 src/traitement_variables.c:76
 #, fuzzy
 msgid "Payee"
@@ -1992,7 +1996,7 @@
 
 #: src/etats_config.c:5305 src/export_csv.c:771
 #: src/gsb_assistant_reconcile_config.c:612 src/gsb_scheduler_list.c:332
-#: src/gsb_transactions_list.c:150 src/import.c:2749
+#: src/gsb_transactions_list.c:150 src/import.c:2764
 #: src/traitement_variables.c:81
 msgid "Amount"
 msgstr "总计"
@@ -6146,7 +6150,7 @@
 msgstr ""
 
 #. TODO dOm : the return value of g_strdup_printf was not used ! I add the devel_debug to print it. Is it OK to do that ?
-#: src/gsb_data_account.c:1176
+#: src/gsb_data_account.c:1174
 #, c-format
 msgid ""
 "Bad no column to gsb_data_account_get_element_sort () in data_account.c\n"
@@ -6154,7 +6158,7 @@
 msgstr ""
 
 #. TODO dOm : the value of g_strdup_printf was not used. I add the devel_debug function to print it. Is it OK ?
-#: src/gsb_data_account.c:1214
+#: src/gsb_data_account.c:1212
 #, c-format
 msgid ""
 "Bad no column to gsb_data_account_set_element_sort () in data_account.c\n"
@@ -7338,13 +7342,19 @@
 msgid "Delete a payment method"
 msgstr "删除支付方式"
 
-#: src/gsb_payment_method_config.c:1275
+#: src/gsb_payment_method_config.c:1267
+#, fuzzy
+msgid "Payment method is used by transactions"
+msgstr "支付方式明细"
+
+#: src/gsb_payment_method_config.c:1281
 msgid ""
 "Problem while filling the target method of payment to delete it.\n"
 "This is not normal, please contact the grisbi team."
 msgstr ""
 
-#: src/gsb_payment_method_config.c:1280
+#: src/gsb_payment_method_config.c:1286
+#, fuzzy
 msgid ""
 "Some transactions still use that payment method.  As deletion of this method "
 "is irreversible, these transactions are to be associated with another "
@@ -7353,14 +7363,14 @@
 "有些交易仍在使用该支付方式。由于删除该方式是不能撤消的,这些交易将被关联到另"
 "一种支付方式。"
 
-#: src/gsb_payment_method_config.c:1282
+#: src/gsb_payment_method_config.c:1288
 msgid ""
 "No target method of payment to switch the transactions to another method of "
 "payment. If you continue, the transactions with this method of payment will "
 "have no new one."
 msgstr ""
 
-#: src/gsb_payment_method_config.c:1299
+#: src/gsb_payment_method_config.c:1298
 msgid "Associate transactions with"
 msgstr "用...关联交易"
 
@@ -7930,11 +7940,11 @@
 msgid "File name"
 msgstr "所有者名称"
 
-#: src/import.c:503 src/import.c:585 src/import.c:3046 src/import.c:3069
+#: src/import.c:503 src/import.c:585 src/import.c:3061 src/import.c:3084
 msgid "Unknown"
 msgstr "为止"
 
-#: src/import.c:545 src/import.c:3149 src/import_csv.c:1045
+#: src/import.c:545 src/import.c:3164 src/import_csv.c:1045
 #, c-format
 msgid "Unable to read file: %s\n"
 msgstr ""
@@ -8110,36 +8120,36 @@
 
 #. l'id du compte choisi et l'id du compte importé sont différents
 #. on propose encore d'arrêter...
-#: src/import.c:1709 src/import.c:2371
+#: src/import.c:1709 src/import.c:2383
 msgid "The id of the imported and chosen accounts are different"
 msgstr "导入和选择账户的ID不同"
 
-#: src/import.c:1933
+#: src/import.c:1934
 msgid "Confirmation of importation of transactions"
 msgstr "导入交易确认"
 
-#: src/import.c:1942
+#: src/import.c:1944
 msgid ""
 "Some imported transactions seem to be already saved. Please select the "
 "transactions to import."
 msgstr "一些导入的交易似乎已经被保存过了。请选择导入的交易。"
 
-#: src/import.c:2008
+#: src/import.c:2020
 #, fuzzy, c-format
 msgid "Transactions to import : %s ; %s ; %s"
 msgstr "导入的交易:%02d/%02d/%04d ; %s ; %4.2f"
 
-#: src/import.c:2047
+#: src/import.c:2059
 #, fuzzy, c-format
 msgid "Transaction found : %s ; %s ; %s ; %s"
 msgstr "找到交易:%02d/%02d/%04d ; %s ; %4.2f ; %s"
 
-#: src/import.c:2060
+#: src/import.c:2072
 #, fuzzy, c-format
 msgid "Transaction found : %s ; %s ; %s"
 msgstr "找到交易:%02d/%02d/%04d ; %s ; %4.2f"
 
-#: src/import.c:2307
+#: src/import.c:2319
 #, fuzzy, c-format
 msgid ""
 "Warning : the cheque number %ld is already used.\n"
@@ -8148,99 +8158,102 @@
 "警告:该支票的编号已经使用过了。\n"
 "仍然继续?"
 
-#: src/import.c:2372
+#: src/import.c:2384
 msgid ""
 "Perhaps you choose a wrong account ?  If you choose to continue, the id of "
 "the account will be changed.  Do you want to continue ?"
 msgstr ""
 "也许您选择了错误的账户?如果您选择继续,本账户的ID将被改变。您确定要继续吗?"
 
-#: src/import.c:2649
+#: src/import.c:2661
 msgid "Orphaned transactions"
 msgstr "孤儿交易"
 
-#: src/import.c:2659
+#: src/import.c:2672
 msgid "Mark transactions you want to add to the list and click the add button"
 msgstr "标记您想增加到清单的交易,点击增加按钮"
 
-#: src/import.c:2726
+#: src/import.c:2741
 msgid "Mark"
 msgstr "标记"
 
-#: src/import.c:2927
+#: src/import.c:2942
 #, fuzzy, c-format
 msgid "%s #%d"
 msgstr "%s %d"
 
-#: src/import.c:2962
+#: src/import.c:2977
 msgid "Threshold while matching transaction date during import (in days)"
 msgstr ""
 
-#: src/import.c:2988
+#: src/import.c:3003
 #, fuzzy
 msgid "Set the financial year"
 msgstr "财年"
 
-#: src/import.c:2989
+#: src/import.c:3004
 #, fuzzy
 msgid "According to the date"
 msgstr "根据交易日期"
 
-#: src/import.c:2990
+#: src/import.c:3005
 msgid "According to the value date (if fail, try with the date)"
 msgstr ""
 
-#: src/import.c:3134
+#: src/import.c:3149
 #, c-format
 msgid ""
 "%s is neither an OFX file, neither a QIF file. Nothing will be done for that "
 "file."
 msgstr ""
 
-#: src/import.c:3192
+#: src/import.c:3207
 #, c-format
 msgid ""
 "%s was not imported successfully. An error occured while getting the "
 "transactions."
 msgstr ""
 
-#: src/import.c:3271
+#: src/import.c:3285
 msgid "Import a file with a rule"
 msgstr ""
 
-#: src/import.c:3279
+#. text for paddingbox
+#: src/import.c:3293
 #, fuzzy, c-format
-msgid "Properties of the rule %s :\n"
+msgid "Properties of the rule %s"
 msgstr ""
 "文件 \"%s\" 发现错误:\n"
 "%s"
 
-#: src/import.c:3288
+#: src/import.c:3312
 #, fuzzy, c-format
 msgid "Imported transactions will be added to the account %s.\n"
 msgstr "所有交易将被转化为它们账户的货币。"
 
-#: src/import.c:3291
+#: src/import.c:3315
 #, fuzzy, c-format
 msgid "Imported transactions will mark transactions in the account %s.\n"
 msgstr "交易的细目分类是本账户的转帐。\n"
 
-#: src/import.c:3300
+#. textstring 2
+#: src/import.c:3319
 #, fuzzy, c-format
 msgid "Currency to import is %s.\n"
 msgstr "货币属性"
 
-#: src/import.c:3311
+#: src/import.c:3325
 #, fuzzy
 msgid "Amounts of the transactions will be inverted.\n"
 msgstr "录入自动预定的交易"
 
-#: src/import.c:3328
+#. label filename
+#: src/import.c:3335
 #, fuzzy
-msgid "Name of the file to import : "
+msgid "Name of the file to import"
 msgstr "选择导入的文件"
 
-#: src/import.c:3427
+#: src/import.c:3429
 #, c-format
 msgid "Unable to create tmp file: %s\n"
 msgstr ""
@@ -9106,7 +9119,13 @@
 msgid "Lines font"
 msgstr ""
 
-#: src/print_report.c:435
+#: src/print_report.c:425 src/print_report.c:445
+#: src/print_transactions_list.c:281 src/print_transactions_list.c:304
+#: src/utils_font.c:121
+msgid "Choosing font"
+msgstr ""
+
+#: src/print_report.c:436
 #, fuzzy
 msgid "Title's font"
 msgstr "名称抬头"
@@ -9174,7 +9193,7 @@
 msgid "Title font"
 msgstr "名称抬头"
 
-#: src/print_transactions_list.c:367
+#: src/print_transactions_list.c:368
 #, fuzzy
 msgid "Fonts & layout"
 msgstr "字体和标志"
@@ -9332,6 +9351,11 @@
 msgid "Did you know that..."
 msgstr ""
 
+#: src/tip.c:83
+#, fuzzy
+msgid "Display tips at next start"
+msgstr "显示交易"
+
 #: src/traitement_variables.c:83
 msgid "Reconciliation ref."
 msgstr "调整参考"
@@ -9406,10 +9430,6 @@
 msgid "Browse"
 msgstr "浏览"
 
-#: src/utils_font.c:121
-msgid "Choosing font"
-msgstr ""
-
 #: src/utils_font.c:199
 #, fuzzy
 msgid "No font defined"



More information about the cvs mailing list