[grisbi-cvs] grisbi/po cs.po, 1.22, 1.23 da.po, 1.29, 1.30 de.po, 1.66, 1.67 es.po, 1.64, 1.65 fa.po, 1.16, 1.17 fr.po, 1.142, 1.143 grisbi.pot, 1.64, 1.65 he.po, 1.22, 1.23 it.po, 1.22, 1.23 nl.po, 1.21, 1.22 pl.po, 1.27, 1.28 pt_BR.po, 1.24, 1.25 ro.po, 1.22, 1.23 ru.po, 1.21, 1.22 zh_CN.po, 1.16, 1.17
Pierre Biava
pbiava at users.sourceforge.net
Tue Mar 17 23:05:35 CET 2009
- Previous message: [grisbi-cvs] grisbi/po fr.po,1.141,1.142
- Next message: [grisbi-cvs] grisbi/src gsb_file_load.c, 1.153, 1.154 gsb_file_save.c, 1.114, 1.115 gsb_form.c, 1.113, 1.114 import.c, 1.264, 1.265 structures.h, 1.225, 1.226
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/grisbi/grisbi/po
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv1505/po
Modified Files:
cs.po da.po de.po es.po fa.po fr.po grisbi.pot he.po it.po
nl.po pl.po pt_BR.po ro.po ru.po zh_CN.po
Log Message:
new feature : opportunity to merge the imported transactions with the existing operations found
Index: it.po
===================================================================
RCS file: /cvsroot/grisbi/grisbi/po/it.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- it.po 13 Mar 2009 20:15:36 -0000 1.22
+++ it.po 17 Mar 2009 22:05:33 -0000 1.23
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 20:58+0100\n"
+"POT-Creation-Date: 2009-03-17 21:51+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Fabio Erculiani <fabio.erculiani at gmail.com>\n"
"Language-Team: Italian <LL at li.org>\n"
@@ -444,7 +444,7 @@
#: src/gsb_assistant_reconcile_config.c:612
#: src/gsb_payment_method_config.c:159 src/gsb_reconcile_config.c:96
#: src/gsb_scheduler_list.c:331 src/imputation_budgetaire.c:164
-#: src/tiers_onglet.c:226
+#: src/tiers_onglet.c:227
msgid "Account"
msgstr "Conto"
@@ -457,13 +457,13 @@
#: src/export_csv.c:747 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1281 src/gsb_form_widget.c:400 src/gsb_reconcile.c:154
#: src/gsb_scheduler_list.c:331 src/gsb_transactions_list.c:143
-#: src/import.c:2882 src/import_csv.c:78 src/traitement_variables.c:74
+#: src/import.c:2906 src/import_csv.c:78 src/traitement_variables.c:74
msgid "Date"
msgstr "Data"
#. Description entry
#: src/balance_estimate_tab.c:300 src/etats_onglet.c:287
-#: src/tiers_onglet.c:591
+#: src/tiers_onglet.c:592
msgid "Description"
msgstr "Descrizione"
@@ -512,7 +512,7 @@
#: src/barre_outils.c:107 src/barre_outils.c:453 src/categories_onglet.c:499
#: src/etats_onglet.c:173 src/imputation_budgetaire.c:532
-#: src/tiers_onglet.c:307
+#: src/tiers_onglet.c:308
#, fuzzy
msgid "Delete"
msgstr "Seleziona"
@@ -552,7 +552,7 @@
msgstr "Ordina la lista delle registrazioni"
#: src/barre_outils.c:153 src/barre_outils.c:513 src/categories_onglet.c:518
-#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:334
+#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:335
msgid "View"
msgstr ""
@@ -584,7 +584,7 @@
msgstr "Tre linee alla volta"
#: src/barre_outils.c:237 src/categories_onglet.c:562
-#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:417
+#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:418
#, fuzzy
msgid "Complete view"
msgstr "Ripartizione incopleta"
@@ -703,7 +703,7 @@
#: src/categories_onglet.c:160 src/export_csv.c:774 src/gsb_reconcile.c:157
#: src/gsb_scheduler_list.c:332 src/gsb_transactions_list.c:149
#: src/gsb_transactions_list.c:2867 src/import_csv.c:86
-#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:235
+#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:236
#: src/traitement_variables.c:80
msgid "Balance"
msgstr "Saldo"
@@ -782,7 +782,7 @@
msgstr "Inserire nome per nuova sottocategoria"
#: src/categories_onglet.c:480 src/etats_onglet.c:130 src/import.c:350
-#: src/import.c:3099 src/imputation_budgetaire.c:513 src/parametres.c:287
+#: src/import.c:3123 src/imputation_budgetaire.c:513 src/parametres.c:287
msgid "Import"
msgstr "Importa"
@@ -808,7 +808,7 @@
#: src/categories_onglet.c:508 src/etats_onglet.c:184
#: src/fenetre_principale.c:251 src/imputation_budgetaire.c:542
-#: src/tiers_onglet.c:316
+#: src/tiers_onglet.c:317
#, fuzzy
msgid "Properties"
msgstr "Proprietà moneta"
@@ -818,7 +818,7 @@
msgid "Edit selected category"
msgstr "la categoria"
-#: src/categories_onglet.c:522 src/tiers_onglet.c:338
+#: src/categories_onglet.c:522 src/tiers_onglet.c:339
#, fuzzy
msgid "Change view mode"
msgstr "Una linea alla volta"
@@ -836,7 +836,7 @@
#: src/categories_onglet.c:607 src/categories_onglet.c:611
#: src/imputation_budgetaire.c:640 src/imputation_budgetaire.c:645
-#: src/tiers_onglet.c:553
+#: src/tiers_onglet.c:554
#, fuzzy, c-format
msgid "Properties for %s"
msgstr "Risultato per %s"
@@ -866,7 +866,7 @@
#: src/gsb_bank.c:832 src/gsb_currency_config.c:355 src/gsb_fyear_config.c:191
#: src/gsb_fyear_config.c:278 src/gsb_payment_method_config.c:239
#: src/gsb_reconcile_config.c:179 src/gsb_transactions_list.c:1733
-#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:578
+#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:579
msgid "Name"
msgstr "Nome"
@@ -1384,13 +1384,13 @@
#. Transfer = Virement
#. Direct deposit remplacé par Transfert = Virement
-#: src/etats_affiche.c:1837 src/import.c:2349 src/import.c:2367
+#: src/etats_affiche.c:1837 src/import.c:2373 src/import.c:2391
#, fuzzy
msgid "Transfert"
msgstr "Tasferimento"
#: src/etats_affiche.c:1846 src/export_csv.c:561 src/gsb_data_category.c:1039
-#: src/gsb_form.c:740 src/gsb_form.c:2465 src/gsb_form.c:2837
+#: src/gsb_form.c:740 src/gsb_form.c:2476 src/gsb_form.c:2848
#: src/gsb_form_scheduler.c:321 src/gsb_transactions_list.c:3216
msgid "Split of transaction"
msgstr "Ripartizione della categoria"
@@ -1447,7 +1447,7 @@
#: src/etats_config.c:687 src/etats_config.c:7193 src/export_csv.c:762
#: src/fenetre_principale.c:266 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1308 src/gsb_form_widget.c:420 src/gsb_scheduler_list.c:331
-#: src/gsb_transactions_list.c:145 src/import.c:2889 src/import_csv.c:80
+#: src/gsb_transactions_list.c:145 src/import.c:2913 src/import_csv.c:80
#: src/meta_payee.c:76 src/traitement_variables.c:76
#, fuzzy
msgid "Payee"
@@ -1787,14 +1787,14 @@
#: src/etats_config.c:2581 src/etats_config.c:2848 src/etats_config.c:3138
#: src/etats_config.c:3951 src/etats_config.c:4147 src/etats_config.c:7512
-#: src/tiers_onglet.c:1263 src/tiers_onglet.c:1283
+#: src/tiers_onglet.c:1306 src/tiers_onglet.c:1326
msgid "Select all"
msgstr "Seleziona tutto"
#. ajoute le bouton (dé)sélectionne tout
#: src/etats_config.c:2596 src/etats_config.c:2863 src/etats_config.c:3153
#: src/etats_config.c:3966 src/etats_config.c:4162 src/etats_config.c:7527
-#: src/tiers_onglet.c:1062 src/tiers_onglet.c:1265
+#: src/tiers_onglet.c:1105 src/tiers_onglet.c:1308
msgid "Unselect all"
msgstr "Deseleziona tutto"
@@ -1907,7 +1907,7 @@
#. set the title
#: src/etats_config.c:4041 src/navigation.c:290 src/navigation.c:1228
-#: src/tiers_onglet.c:214
+#: src/tiers_onglet.c:215
#, fuzzy
msgid "Payees"
msgstr "Giorni"
@@ -2030,7 +2030,7 @@
#: src/etats_config.c:5310 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:2897
+#: src/gsb_transactions_list.c:150 src/import.c:2921
#: src/traitement_variables.c:81
msgid "Amount"
msgstr "Totale"
@@ -3907,7 +3907,7 @@
msgstr ""
#: src/gsb_assistant_archive.c:354 src/gsb_data_payee.c:511
-#: src/gsb_form.c:2572 src/gsb_form.c:2573 src/navigation.c:1289
+#: src/gsb_form.c:2583 src/gsb_form.c:2584 src/navigation.c:1289
msgid "Report"
msgstr "Rapporto"
@@ -6265,19 +6265,19 @@
msgstr ""
#. Deposit = Dépôt
-#: src/gsb_data_payment.c:714 src/import.c:2331 src/plugins/ofx/ofx.c:451
+#: src/gsb_data_payment.c:714 src/import.c:2355 src/plugins/ofx/ofx.c:451
msgid "Deposit"
msgstr "Deposito"
#. pas trouvé de définition remplacé par carte de crédit
#. Point of sale = Point de vente remplacé par carte de crédit
-#: src/gsb_data_payment.c:723 src/import.c:2337 src/import.c:2343
+#: src/gsb_data_payment.c:723 src/import.c:2361 src/import.c:2367
msgid "Credit card"
msgstr "Carta di credito"
#. Electronic payment remplacé par Direct debit = Prélèvement
#. Merchant initiated debit remplacé par Direct debit = Prélèvement
-#: src/gsb_data_payment.c:732 src/import.c:2355 src/import.c:2373
+#: src/gsb_data_payment.c:732 src/import.c:2379 src/import.c:2397
msgid "Direct debit"
msgstr "Bancomat"
@@ -6777,7 +6777,7 @@
msgid "Encryption plugin not found."
msgstr "Conto %s non trovato.\n"
-#: src/gsb_file_load.c:410 src/gsb_file_load.c:4364
+#: src/gsb_file_load.c:410 src/gsb_file_load.c:4370
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Il file non è un Rapporto Grisbi valido"
@@ -6792,14 +6792,14 @@
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: src/gsb_file_load.c:7582
+#: src/gsb_file_load.c:7588
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "Grisbi versione %s è richiesta per aprire il file"
-#: src/gsb_file_load.c:7621
+#: src/gsb_file_load.c:7627
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6807,11 +6807,11 @@
"transactions or important informations."
msgstr ""
-#: src/gsb_file_load.c:7622
+#: src/gsb_file_load.c:7628
msgid "Grisbi archive opened"
msgstr ""
-#: src/gsb_file_load.c:7714
+#: src/gsb_file_load.c:7720
#, c-format
msgid ""
"Your old file grisbi was saved as: \n"
@@ -6942,53 +6942,53 @@
msgid "Cheque/Transfer number"
msgstr "Numero di assegno"
-#: src/gsb_form.c:2157
+#: src/gsb_form.c:2168
#, fuzzy
msgid "No payee selected for this report."
msgstr "Nessua categoria personalizzata selezionata per questo rapporto."
-#: src/gsb_form.c:2415
+#: src/gsb_form.c:2426
msgid "You must enter a date."
msgstr "Devi impostare una data."
-#: src/gsb_form.c:2422
+#: src/gsb_form.c:2433
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "Data non valida"
-#: src/gsb_form.c:2441
+#: src/gsb_form.c:2452
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "Data non valida"
-#: src/gsb_form.c:2467
+#: src/gsb_form.c:2478
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: src/gsb_form.c:2500
+#: src/gsb_form.c:2511
#, fuzzy
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr "Converti la transazione in una transazione schedulata"
-#: src/gsb_form.c:2507
+#: src/gsb_form.c:2518
#, fuzzy
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr "Il conto associato a questo trasferimento non è valido"
-#: src/gsb_form.c:2515
+#: src/gsb_form.c:2526
msgid "Can't issue a transfer its own account."
msgstr "Impossibile eseguire un trasferimento a sé stessi."
-#: src/gsb_form.c:2520
+#: src/gsb_form.c:2531
msgid "Can't issue a transfer on a closed account."
msgstr "Impossible effettuare un trasferimento su un conto chiuso."
-#: src/gsb_form.c:2546
+#: src/gsb_form.c:2557
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -6998,7 +6998,7 @@
"ma non contiene alcun numero.\n"
"Continuare?"
-#: src/gsb_form.c:2560
+#: src/gsb_form.c:2571
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -7006,33 +7006,33 @@
"Attenzione: questo numero di assegno è già usato.\n"
"Continuare?"
-#: src/gsb_form.c:2580
+#: src/gsb_form.c:2591
#, fuzzy
msgid "A transaction with a multiple payee must be a new one."
msgstr ""
"Una transazione con più categorie personalizzate deve averne una nuova."
-#: src/gsb_form.c:2585
+#: src/gsb_form.c:2596
#, fuzzy
msgid "A transaction with a multiple payee cannot be a split child."
msgstr ""
"Una transazione con più categorie personalizzate deve averne una nuova."
-#: src/gsb_form.c:2596
+#: src/gsb_form.c:2607
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: src/gsb_form.c:2603
+#: src/gsb_form.c:2614
#, fuzzy
msgid "Invalid multiple payee."
msgstr "Categoria multipla personalizzata non valida."
-#: src/gsb_form.c:2860
+#: src/gsb_form.c:2871
#, fuzzy
msgid "Modifying a transaction"
msgstr "Modifica transazione"
-#: src/gsb_form.c:2861
+#: src/gsb_form.c:2872
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7042,7 +7042,7 @@
msgstr ""
#. propose to configure the form
-#: src/gsb_form.c:3161
+#: src/gsb_form.c:3172
msgid "Configure the form"
msgstr ""
@@ -8043,11 +8043,11 @@
msgid "File name"
msgstr "Nome possessore"
-#: src/import.c:526 src/import.c:608 src/import.c:3207 src/import.c:3230
+#: src/import.c:526 src/import.c:608 src/import.c:3244 src/import.c:3267
msgid "Unknown"
msgstr "Sconosciuto"
-#: src/import.c:568 src/import.c:3310 src/import_csv.c:1045
+#: src/import.c:568 src/import.c:3347 src/import_csv.c:1045
#, fuzzy, c-format
msgid "Unable to read file: %s\n"
msgstr "Impossibile aprire il file '%s': %s"
@@ -8214,7 +8214,7 @@
#. there is a difference between the imported account id and grisbi account id,
#. * ask to be sure
-#: src/import.c:1730
+#: src/import.c:1731
#, fuzzy, c-format
msgid ""
"The Grisbi's id account is %s, but the imported id account is %s.\n"
@@ -8228,49 +8228,65 @@
#. l'id du compte choisi et l'id du compte importé sont différents
#. on propose encore d'arrêter...
-#: src/import.c:1733 src/import.c:2515
+#: src/import.c:1734 src/import.c:2539
msgid "The id of the imported and chosen accounts are different"
msgstr "Gli ID dei conti selezionati e importati sono differenti"
-#: src/import.c:1963
+#: src/import.c:1968
+#, fuzzy
+msgid "Confirmation of transactions to be merged"
+msgstr "Conferma per la cancellazione della banca"
+
+#: src/import.c:1971
msgid "Confirmation of importation of transactions"
msgstr "Conferma di importanti transazioni"
-#: src/import.c:1975
+#: src/import.c:1987
+#, fuzzy
+msgid "Please select the transactions to be merged"
+msgstr "Usa le transazioni selezionate come template"
+
+#: src/import.c:1990
+#, fuzzy
msgid ""
-"Some imported transactions seem to be already saved. Please select the "
+"Some imported transactions seem to be already saved.Please select the "
"transactions to import."
msgstr ""
"Qualche transazione importata sembra essere già salvata. Seleziona la "
"transazione da importare."
-#: src/import.c:2051
+#: src/import.c:2070
+#, fuzzy, c-format
+msgid "Transactions to be merged : %s ; %s ; %s"
+msgstr "Transazione da importare : %02d/%02d/%04d ; %s ; %4.2f"
+
+#: src/import.c:2075
#, fuzzy, c-format
msgid "Transactions to import : %s ; %s ; %s"
msgstr "Transazione da importare : %02d/%02d/%04d ; %s ; %4.2f"
-#: src/import.c:2090
+#: src/import.c:2114
#, fuzzy, c-format
msgid "Transaction found : %s ; %s ; %s ; %s"
msgstr "Transazione trovata : %02d/%02d/%04d ; %s ; %4.2f ; %s"
-#: src/import.c:2103
+#: src/import.c:2127
#, fuzzy, c-format
msgid "Transaction found : %s ; %s ; %s"
msgstr "Transazione trovata : %02d/%02d/%04d ; %s ; %4.2f"
#. Check = Chèque
-#: src/import.c:2317 src/plugins/ofx/ofx.c:431
+#: src/import.c:2341 src/plugins/ofx/ofx.c:431
#, fuzzy
msgid "Check"
msgstr "Controllo"
#. Cash withdrawal = retrait en liquide
-#: src/import.c:2361
+#: src/import.c:2385
msgid "Cash withdrawal"
msgstr ""
-#: src/import.c:2451
+#: src/import.c:2475
#, fuzzy, c-format
msgid ""
"Warning : the cheque number %ld is already used.\n"
@@ -8279,7 +8295,7 @@
"Attenzione: questo numero di assegno è già usato.\n"
"Continuare?"
-#: src/import.c:2516
+#: src/import.c:2540
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 ?"
@@ -8287,101 +8303,106 @@
"Per esempio hai scelto il conto sbagliato? Se scegli di continuare, l'ID "
"delconto sarà cambiato. Vuoi continuare ?"
-#: src/import.c:2792
+#: src/import.c:2816
msgid "Orphaned transactions"
msgstr "Transazione orfana"
-#: src/import.c:2805
+#: src/import.c:2829
msgid "Mark transactions you want to add to the list and click the add button"
msgstr ""
"Marca le transazioni che vuoi aggiungere alla liste e clicca sul bottone "
"aggiungi"
-#: src/import.c:2874
+#: src/import.c:2898
msgid "Mark"
msgstr "Marca"
-#: src/import.c:3075
+#: src/import.c:3099
#, fuzzy, c-format
msgid "%s #%d"
msgstr "a %s %d"
-#: src/import.c:3110
+#: src/import.c:3134
msgid "Threshold while matching transaction date during import (in days)"
msgstr ""
-#: src/import.c:3136
+#: src/import.c:3160
+#, fuzzy
+msgid "merge transactions imported with planned transactions"
+msgstr "Converti la transazione in una transazione schedulata"
+
+#: src/import.c:3173
msgid "automatically associate the category of the payee if it is possible"
msgstr ""
-#: src/import.c:3149
+#: src/import.c:3186
#, fuzzy
msgid "Set the financial year"
msgstr "Scegli l'anno finanziario"
-#: src/import.c:3150
+#: src/import.c:3187
#, fuzzy
msgid "According to the date"
msgstr "a seconda della data di registrazione"
-#: src/import.c:3151
+#: src/import.c:3188
msgid "According to the value date (if fail, try with the date)"
msgstr ""
-#: src/import.c:3295
+#: src/import.c:3332
#, c-format
msgid ""
"%s is neither an OFX file, neither a QIF file. Nothing will be done for that "
"file."
msgstr ""
-#: src/import.c:3353
+#: src/import.c:3390
#, c-format
msgid ""
"%s was not imported successfully. An error occured while getting the "
"transactions."
msgstr ""
-#: src/import.c:3431
+#: src/import.c:3468
msgid "Import a file with a rule"
msgstr ""
#. text for paddingbox
-#: src/import.c:3442
+#: src/import.c:3479
#, fuzzy, c-format
msgid "Properties of the rule : %s\n"
msgstr "Risultato per %s"
-#: src/import.c:3461
+#: src/import.c:3498
#, fuzzy, c-format
msgid "Imported transactions will be added to the account %s.\n"
msgstr ""
"Tutte le transazioni saranno convertite in correnze dei rispettivi account."
-#: src/import.c:3464
+#: src/import.c:3501
#, fuzzy, c-format
msgid "Imported transactions will mark transactions in the account %s.\n"
msgstr ""
"Una ripartizione della transazione è un trasferimento a questo conto.\n"
#. textstring 2
-#: src/import.c:3468
+#: src/import.c:3505
#, fuzzy, c-format
msgid "Currency to import is %s.\n"
msgstr "Proprietà moneta"
-#: src/import.c:3474
+#: src/import.c:3511
#, fuzzy
msgid "Amounts of the transactions will be inverted.\n"
msgstr "Transazioni automatiche pianificate"
#. label filename
-#: src/import.c:3484
+#: src/import.c:3521
#, fuzzy
msgid "Name of the file to import "
msgstr "Nome del documento dei conti"
-#: src/import.c:3578
+#: src/import.c:3615
#, fuzzy, c-format
msgid "Unable to create tmp file: %s\n"
msgstr "Impossibile aprire il file '%s': %s"
@@ -8876,7 +8897,7 @@
msgstr "Nessuna sottocategoria"
#. * Find a unique name for payee
-#: src/meta_payee.c:320 src/tiers_onglet.c:299
+#: src/meta_payee.c:320 src/tiers_onglet.c:300
#, fuzzy
msgid "New payee"
msgstr "Nuovo metodo di pagamento"
@@ -9553,41 +9574,41 @@
msgid "Error opening file '%s'"
msgstr "Errore nell'apertura del file '%s'."
-#: src/tiers_onglet.c:303
+#: src/tiers_onglet.c:304
#, fuzzy
msgid "Create a new payee"
msgstr "Crea un nuovo conto"
-#: src/tiers_onglet.c:312
+#: src/tiers_onglet.c:313
#, fuzzy
msgid "Delete selected payee"
msgstr "Elimina una categoria personalizzata"
-#: src/tiers_onglet.c:321
+#: src/tiers_onglet.c:322
msgid "Edit selected payee"
msgstr ""
-#: src/tiers_onglet.c:325
+#: src/tiers_onglet.c:326
#, fuzzy
msgid "Remove unused payees"
msgstr "Nome del documento dei conti"
-#: src/tiers_onglet.c:329 src/tiers_onglet.c:373
+#: src/tiers_onglet.c:330 src/tiers_onglet.c:374
#, fuzzy
msgid "Remove orphan payees"
msgstr "Nome del documento dei conti"
-#: src/tiers_onglet.c:343
+#: src/tiers_onglet.c:344
#, fuzzy
msgid "Manage payees"
msgstr "Pagina principale"
-#: src/tiers_onglet.c:347 src/tiers_onglet.c:729
+#: src/tiers_onglet.c:348 src/tiers_onglet.c:730
#, fuzzy
msgid "Manage the payees"
msgstr "Dettagli categorie"
-#: src/tiers_onglet.c:374
+#: src/tiers_onglet.c:375
msgid ""
"This will remove all the payees wich are not used in any transactions. "
"Payees linked to an archived transactions will not be removed, even if not "
@@ -9596,29 +9617,29 @@
"Are you sure you want to do that?"
msgstr ""
-#: src/tiers_onglet.c:386 src/tiers_onglet.c:819
+#: src/tiers_onglet.c:387 src/tiers_onglet.c:862
#, c-format
msgid "Removed %d payees."
msgstr ""
#. Edit transaction
-#: src/tiers_onglet.c:411
+#: src/tiers_onglet.c:412
msgid "Payee view"
msgstr ""
-#: src/tiers_onglet.c:633
+#: src/tiers_onglet.c:634
#, c-format
msgid ""
"You tried to rename current payee to '%s' but this payee already exists. "
"Please choose another name."
msgstr ""
-#: src/tiers_onglet.c:637
+#: src/tiers_onglet.c:638
#, fuzzy
msgid "Payee already exists"
msgstr "Il file esiste già "
-#: src/tiers_onglet.c:730
+#: src/tiers_onglet.c:731
msgid ""
"This wizard will help you to simplify the list of payees.\n"
"\n"
@@ -9627,12 +9648,12 @@
"It is better to make a backup of your Grisbi file if you have not yet done. "
msgstr ""
-#: src/tiers_onglet.c:873
+#: src/tiers_onglet.c:916
#, fuzzy
msgid "Choose a payee"
msgstr "Seleziona i file da importare"
-#: src/tiers_onglet.c:875
+#: src/tiers_onglet.c:918
msgid ""
"Select one payee in the list that you modify to serve as the basis for your "
"research.\n"
@@ -9643,69 +9664,69 @@
"string_1%string_2"
msgstr ""
-#: src/tiers_onglet.c:896
+#: src/tiers_onglet.c:939
#, fuzzy
msgid "Enter the new payee"
msgstr "Inserisci il nuovo nome della categoria personalizzata"
-#: src/tiers_onglet.c:898
+#: src/tiers_onglet.c:941
#, fuzzy
msgid "Enter the name of the new payee"
msgstr "Inserisci il nome della linea sotto-budget"
-#: src/tiers_onglet.c:911
+#: src/tiers_onglet.c:954
#, fuzzy
msgid "Options"
msgstr "Uscite"
-#: src/tiers_onglet.c:913
+#: src/tiers_onglet.c:956
msgid "Extracting a number and save it in the field No Cheque/Virement"
msgstr ""
-#: src/tiers_onglet.c:919
+#: src/tiers_onglet.c:962
msgid "Save the payees in the notes"
msgstr ""
-#: src/tiers_onglet.c:952
+#: src/tiers_onglet.c:995
msgid "List of payees who will be modified"
msgstr ""
-#: src/tiers_onglet.c:994
+#: src/tiers_onglet.c:1037
#, fuzzy
msgid "Select"
msgstr "Seleziona tutto"
-#: src/tiers_onglet.c:1002
+#: src/tiers_onglet.c:1045
#, fuzzy
msgid "Payee number"
msgstr "il numero dell'assegno"
-#: src/tiers_onglet.c:1012
+#: src/tiers_onglet.c:1055
#, fuzzy
msgid "Payee name"
msgstr "Totale generale"
-#: src/tiers_onglet.c:1028
+#: src/tiers_onglet.c:1071
msgid "Total number of payees :"
msgstr ""
#. ajoute le nombre de tiers sélectionnés
-#: src/tiers_onglet.c:1045
+#: src/tiers_onglet.c:1088
#, fuzzy
msgid "Number of selected payees :"
msgstr "Elimina una categoria personalizzata"
-#: src/tiers_onglet.c:1147
+#: src/tiers_onglet.c:1190
#, c-format
msgid "Payee sought : %s\n"
msgstr ""
-#: src/tiers_onglet.c:1153
+#: src/tiers_onglet.c:1196
#, fuzzy, c-format
msgid "New payee : %s"
msgstr "Nuovo metodo di pagamento"
-#: src/tiers_onglet.c:1229
+#: src/tiers_onglet.c:1272
#, c-format
msgid ""
"You are about to replace %d payees whose names contain %s\n"
@@ -9714,11 +9735,11 @@
"<span weight=\"bold\">Are you sure?</span>"
msgstr ""
-#: src/tiers_onglet.c:1393
+#: src/tiers_onglet.c:1436
msgid "You must choose a payee for searching."
msgstr ""
-#: src/tiers_onglet.c:1397
+#: src/tiers_onglet.c:1440
msgid "Beware you don't use one of models for the research."
msgstr ""
@@ -11131,10 +11152,6 @@
#~ msgstr "Ripartizione conto"
#, fuzzy
-#~ msgid "Confirmation of transaction removal"
-#~ msgstr "Conferma per la cancellazione della banca"
-
-#, fuzzy
#~ msgid ""
#~ "You are currently trying to remove a transaction. There is no undo for "
#~ "this. Do you confirm the removal?"
Index: da.po
===================================================================
RCS file: /cvsroot/grisbi/grisbi/po/da.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- da.po 13 Mar 2009 20:15:35 -0000 1.29
+++ da.po 17 Mar 2009 22:05:32 -0000 1.30
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: da\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 20:58+0100\n"
+"POT-Creation-Date: 2009-03-17 21:51+0100\n"
"PO-Revision-Date: 2006-03-25 13:23+0100\n"
"Last-Translator: Dmitri Popov <dmpop at openoffice.org>\n"
"Language-Team: \n"
@@ -436,7 +436,7 @@
#: src/gsb_assistant_reconcile_config.c:612
#: src/gsb_payment_method_config.c:159 src/gsb_reconcile_config.c:96
#: src/gsb_scheduler_list.c:331 src/imputation_budgetaire.c:164
-#: src/tiers_onglet.c:226
+#: src/tiers_onglet.c:227
msgid "Account"
msgstr "Konto"
@@ -449,13 +449,13 @@
#: src/export_csv.c:747 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1281 src/gsb_form_widget.c:400 src/gsb_reconcile.c:154
#: src/gsb_scheduler_list.c:331 src/gsb_transactions_list.c:143
-#: src/import.c:2882 src/import_csv.c:78 src/traitement_variables.c:74
+#: src/import.c:2906 src/import_csv.c:78 src/traitement_variables.c:74
msgid "Date"
msgstr "Dato"
#. Description entry
#: src/balance_estimate_tab.c:300 src/etats_onglet.c:287
-#: src/tiers_onglet.c:591
+#: src/tiers_onglet.c:592
msgid "Description"
msgstr ""
@@ -504,7 +504,7 @@
#: src/barre_outils.c:107 src/barre_outils.c:453 src/categories_onglet.c:499
#: src/etats_onglet.c:173 src/imputation_budgetaire.c:532
-#: src/tiers_onglet.c:307
+#: src/tiers_onglet.c:308
#, fuzzy
msgid "Delete"
msgstr "Dato"
@@ -543,7 +543,7 @@
msgstr "Sorter transaktionsliste"
#: src/barre_outils.c:153 src/barre_outils.c:513 src/categories_onglet.c:518
-#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:334
+#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:335
msgid "View"
msgstr "Gennemse"
@@ -575,7 +575,7 @@
msgstr "3 linjer"
#: src/barre_outils.c:237 src/categories_onglet.c:562
-#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:417
+#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:418
msgid "Complete view"
msgstr ""
@@ -692,7 +692,7 @@
#: src/categories_onglet.c:160 src/export_csv.c:774 src/gsb_reconcile.c:157
#: src/gsb_scheduler_list.c:332 src/gsb_transactions_list.c:149
#: src/gsb_transactions_list.c:2867 src/import_csv.c:86
-#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:235
+#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:236
#: src/traitement_variables.c:80
msgid "Balance"
msgstr "Balance"
@@ -768,7 +768,7 @@
msgstr "Giv den nye underkategori et navn"
#: src/categories_onglet.c:480 src/etats_onglet.c:130 src/import.c:350
-#: src/import.c:3099 src/imputation_budgetaire.c:513 src/parametres.c:287
+#: src/import.c:3123 src/imputation_budgetaire.c:513 src/parametres.c:287
msgid "Import"
msgstr "Importér"
@@ -794,7 +794,7 @@
#: src/categories_onglet.c:508 src/etats_onglet.c:184
#: src/fenetre_principale.c:251 src/imputation_budgetaire.c:542
-#: src/tiers_onglet.c:316
+#: src/tiers_onglet.c:317
msgid "Properties"
msgstr ""
@@ -803,7 +803,7 @@
msgid "Edit selected category"
msgstr "Tilføj kategori"
-#: src/categories_onglet.c:522 src/tiers_onglet.c:338
+#: src/categories_onglet.c:522 src/tiers_onglet.c:339
#, fuzzy
msgid "Change view mode"
msgstr "1 linje"
@@ -821,7 +821,7 @@
#: src/categories_onglet.c:607 src/categories_onglet.c:611
#: src/imputation_budgetaire.c:640 src/imputation_budgetaire.c:645
-#: src/tiers_onglet.c:553
+#: src/tiers_onglet.c:554
#, c-format
msgid "Properties for %s"
msgstr ""
@@ -851,7 +851,7 @@
#: src/gsb_bank.c:832 src/gsb_currency_config.c:355 src/gsb_fyear_config.c:191
#: src/gsb_fyear_config.c:278 src/gsb_payment_method_config.c:239
#: src/gsb_reconcile_config.c:179 src/gsb_transactions_list.c:1733
-#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:578
+#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:579
msgid "Name"
msgstr "Navn"
@@ -1353,13 +1353,13 @@
#. Transfer = Virement
#. Direct deposit remplacé par Transfert = Virement
-#: src/etats_affiche.c:1837 src/import.c:2349 src/import.c:2367
+#: src/etats_affiche.c:1837 src/import.c:2373 src/import.c:2391
#, fuzzy
msgid "Transfert"
msgstr "Overførsel"
#: src/etats_affiche.c:1846 src/export_csv.c:561 src/gsb_data_category.c:1039
-#: src/gsb_form.c:740 src/gsb_form.c:2465 src/gsb_form.c:2837
+#: src/gsb_form.c:740 src/gsb_form.c:2476 src/gsb_form.c:2848
#: src/gsb_form_scheduler.c:321 src/gsb_transactions_list.c:3216
msgid "Split of transaction"
msgstr ""
@@ -1415,7 +1415,7 @@
#: src/etats_config.c:687 src/etats_config.c:7193 src/export_csv.c:762
#: src/fenetre_principale.c:266 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1308 src/gsb_form_widget.c:420 src/gsb_scheduler_list.c:331
-#: src/gsb_transactions_list.c:145 src/import.c:2889 src/import_csv.c:80
+#: src/gsb_transactions_list.c:145 src/import.c:2913 src/import_csv.c:80
#: src/meta_payee.c:76 src/traitement_variables.c:76
#, fuzzy
msgid "Payee"
@@ -1742,14 +1742,14 @@
#: src/etats_config.c:2581 src/etats_config.c:2848 src/etats_config.c:3138
#: src/etats_config.c:3951 src/etats_config.c:4147 src/etats_config.c:7512
-#: src/tiers_onglet.c:1263 src/tiers_onglet.c:1283
+#: src/tiers_onglet.c:1306 src/tiers_onglet.c:1326
msgid "Select all"
msgstr ""
#. ajoute le bouton (dé)sélectionne tout
#: src/etats_config.c:2596 src/etats_config.c:2863 src/etats_config.c:3153
#: src/etats_config.c:3966 src/etats_config.c:4162 src/etats_config.c:7527
-#: src/tiers_onglet.c:1062 src/tiers_onglet.c:1265
+#: src/tiers_onglet.c:1105 src/tiers_onglet.c:1308
msgid "Unselect all"
msgstr ""
@@ -1855,7 +1855,7 @@
#. set the title
#: src/etats_config.c:4041 src/navigation.c:290 src/navigation.c:1228
-#: src/tiers_onglet.c:214
+#: src/tiers_onglet.c:215
#, fuzzy
msgid "Payees"
msgstr "Dage"
@@ -1975,7 +1975,7 @@
#: src/etats_config.c:5310 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:2897
+#: src/gsb_transactions_list.c:150 src/import.c:2921
#: src/traitement_variables.c:81
msgid "Amount"
msgstr "Beløb"
@@ -3776,7 +3776,7 @@
msgstr ""
#: src/gsb_assistant_archive.c:354 src/gsb_data_payee.c:511
-#: src/gsb_form.c:2572 src/gsb_form.c:2573 src/navigation.c:1289
+#: src/gsb_form.c:2583 src/gsb_form.c:2584 src/navigation.c:1289
msgid "Report"
msgstr "Rapport"
@@ -6128,19 +6128,19 @@
msgstr ""
#. Deposit = Dépôt
-#: src/gsb_data_payment.c:714 src/import.c:2331 src/plugins/ofx/ofx.c:451
+#: src/gsb_data_payment.c:714 src/import.c:2355 src/plugins/ofx/ofx.c:451
msgid "Deposit"
msgstr ""
#. pas trouvé de définition remplacé par carte de crédit
#. Point of sale = Point de vente remplacé par carte de crédit
-#: src/gsb_data_payment.c:723 src/import.c:2337 src/import.c:2343
+#: src/gsb_data_payment.c:723 src/import.c:2361 src/import.c:2367
msgid "Credit card"
msgstr "Kreditkort"
#. Electronic payment remplacé par Direct debit = Prélèvement
#. Merchant initiated debit remplacé par Direct debit = Prélèvement
-#: src/gsb_data_payment.c:732 src/import.c:2355 src/import.c:2373
+#: src/gsb_data_payment.c:732 src/import.c:2379 src/import.c:2397
msgid "Direct debit"
msgstr ""
@@ -6615,7 +6615,7 @@
msgid "Encryption plugin not found."
msgstr "Konto %s blev ikke fundet.\n"
-#: src/gsb_file_load.c:410 src/gsb_file_load.c:4364
+#: src/gsb_file_load.c:410 src/gsb_file_load.c:4370
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Denne fil er ikke en Grisbi-rapport"
@@ -6630,14 +6630,14 @@
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: src/gsb_file_load.c:7582
+#: src/gsb_file_load.c:7588
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr ""
-#: src/gsb_file_load.c:7621
+#: src/gsb_file_load.c:7627
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6645,11 +6645,11 @@
"transactions or important informations."
msgstr ""
-#: src/gsb_file_load.c:7622
+#: src/gsb_file_load.c:7628
msgid "Grisbi archive opened"
msgstr ""
-#: src/gsb_file_load.c:7714
+#: src/gsb_file_load.c:7720
#, c-format
msgid ""
"Your old file grisbi was saved as: \n"
@@ -6777,84 +6777,84 @@
msgid "Cheque/Transfer number"
msgstr "Check/Ãverførselsnr."
-#: src/gsb_form.c:2157
+#: src/gsb_form.c:2168
msgid "No payee selected for this report."
msgstr ""
-#: src/gsb_form.c:2415
+#: src/gsb_form.c:2426
msgid "You must enter a date."
msgstr ""
-#: src/gsb_form.c:2422
+#: src/gsb_form.c:2433
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "Forkert dato"
-#: src/gsb_form.c:2441
+#: src/gsb_form.c:2452
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "Forkert dato"
-#: src/gsb_form.c:2467
+#: src/gsb_form.c:2478
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: src/gsb_form.c:2500
+#: src/gsb_form.c:2511
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr ""
-#: src/gsb_form.c:2507
+#: src/gsb_form.c:2518
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr ""
-#: src/gsb_form.c:2515
+#: src/gsb_form.c:2526
msgid "Can't issue a transfer its own account."
msgstr ""
-#: src/gsb_form.c:2520
+#: src/gsb_form.c:2531
msgid "Can't issue a transfer on a closed account."
msgstr ""
-#: src/gsb_form.c:2546
+#: src/gsb_form.c:2557
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
"Continue anyway?"
msgstr ""
-#: src/gsb_form.c:2560
+#: src/gsb_form.c:2571
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
msgstr ""
-#: src/gsb_form.c:2580
+#: src/gsb_form.c:2591
msgid "A transaction with a multiple payee must be a new one."
msgstr ""
-#: src/gsb_form.c:2585
+#: src/gsb_form.c:2596
msgid "A transaction with a multiple payee cannot be a split child."
msgstr ""
-#: src/gsb_form.c:2596
+#: src/gsb_form.c:2607
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: src/gsb_form.c:2603
+#: src/gsb_form.c:2614
msgid "Invalid multiple payee."
msgstr ""
-#: src/gsb_form.c:2860
+#: src/gsb_form.c:2871
#, fuzzy
msgid "Modifying a transaction"
msgstr "Vis transaktioner"
-#: src/gsb_form.c:2861
+#: src/gsb_form.c:2872
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -6864,7 +6864,7 @@
msgstr ""
#. propose to configure the form
-#: src/gsb_form.c:3161
+#: src/gsb_form.c:3172
msgid "Configure the form"
msgstr ""
@@ -7823,11 +7823,11 @@
msgid "File name"
msgstr "Indehaver"
-#: src/import.c:526 src/import.c:608 src/import.c:3207 src/import.c:3230
+#: src/import.c:526 src/import.c:608 src/import.c:3244 src/import.c:3267
msgid "Unknown"
msgstr "Ukendt"
-#: src/import.c:568 src/import.c:3310 src/import_csv.c:1045
+#: src/import.c:568 src/import.c:3347 src/import_csv.c:1045
#, c-format
msgid "Unable to read file: %s\n"
msgstr ""
@@ -7985,7 +7985,7 @@
#. there is a difference between the imported account id and grisbi account id,
#. * ask to be sure
-#: src/import.c:1730
+#: src/import.c:1731
#, c-format
msgid ""
"The Grisbi's id account is %s, but the imported id account is %s.\n"
@@ -7997,148 +7997,168 @@
#. l'id du compte choisi et l'id du compte importé sont différents
#. on propose encore d'arrêter...
-#: src/import.c:1733 src/import.c:2515
+#: src/import.c:1734 src/import.c:2539
msgid "The id of the imported and chosen accounts are different"
msgstr ""
-#: src/import.c:1963
+#: src/import.c:1968
+#, fuzzy
+msgid "Confirmation of transactions to be merged"
+msgstr "Lukkede planlagte transaktioner"
+
+#: src/import.c:1971
msgid "Confirmation of importation of transactions"
msgstr ""
-#: src/import.c:1975
+#: src/import.c:1987
+#, fuzzy
+msgid "Please select the transactions to be merged"
+msgstr "Lukkede planlagte transaktioner"
+
+#: src/import.c:1990
msgid ""
-"Some imported transactions seem to be already saved. Please select the "
+"Some imported transactions seem to be already saved.Please select the "
"transactions to import."
msgstr ""
-#: src/import.c:2051
+#: src/import.c:2070
+#, c-format
+msgid "Transactions to be merged : %s ; %s ; %s"
+msgstr ""
+
+#: src/import.c:2075
#, c-format
msgid "Transactions to import : %s ; %s ; %s"
msgstr ""
-#: src/import.c:2090
+#: src/import.c:2114
#, c-format
msgid "Transaction found : %s ; %s ; %s ; %s"
msgstr ""
-#: src/import.c:2103
+#: src/import.c:2127
#, c-format
msgid "Transaction found : %s ; %s ; %s"
msgstr ""
#. Check = Chèque
-#: src/import.c:2317 src/plugins/ofx/ofx.c:431
+#: src/import.c:2341 src/plugins/ofx/ofx.c:431
#, fuzzy
msgid "Check"
msgstr "Fil"
#. Cash withdrawal = retrait en liquide
-#: src/import.c:2361
+#: src/import.c:2385
msgid "Cash withdrawal"
msgstr ""
-#: src/import.c:2451
+#: src/import.c:2475
#, c-format
msgid ""
"Warning : the cheque number %ld is already used.\n"
"We skip it"
msgstr ""
-#: src/import.c:2516
+#: src/import.c:2540
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:2792
+#: src/import.c:2816
msgid "Orphaned transactions"
msgstr ""
-#: src/import.c:2805
+#: src/import.c:2829
msgid "Mark transactions you want to add to the list and click the add button"
msgstr ""
-#: src/import.c:2874
+#: src/import.c:2898
msgid "Mark"
msgstr ""
-#: src/import.c:3075
+#: src/import.c:3099
#, c-format
msgid "%s #%d"
msgstr ""
-#: src/import.c:3110
+#: src/import.c:3134
msgid "Threshold while matching transaction date during import (in days)"
msgstr ""
-#: src/import.c:3136
+#: src/import.c:3160
+#, fuzzy
+msgid "merge transactions imported with planned transactions"
+msgstr "Opret en planlagt transaktion"
+
+#: src/import.c:3173
msgid "automatically associate the category of the payee if it is possible"
msgstr ""
-#: src/import.c:3149
+#: src/import.c:3186
#, fuzzy
msgid "Set the financial year"
msgstr "Vælg regnskabsår"
-#: src/import.c:3150
+#: src/import.c:3187
msgid "According to the date"
msgstr ""
-#: src/import.c:3151
+#: src/import.c:3188
msgid "According to the value date (if fail, try with the date)"
msgstr ""
-#: src/import.c:3295
+#: src/import.c:3332
#, c-format
msgid ""
"%s is neither an OFX file, neither a QIF file. Nothing will be done for that "
"file."
msgstr ""
-#: src/import.c:3353
+#: src/import.c:3390
#, c-format
msgid ""
"%s was not imported successfully. An error occured while getting the "
"transactions."
msgstr ""
-#: src/import.c:3431
+#: src/import.c:3468
msgid "Import a file with a rule"
msgstr ""
#. text for paddingbox
-#: src/import.c:3442
+#: src/import.c:3479
#, c-format
msgid "Properties of the rule : %s\n"
msgstr ""
-#: src/import.c:3461
+#: src/import.c:3498
#, fuzzy, c-format
msgid "Imported transactions will be added to the account %s.\n"
msgstr "Fly transaktioner til kategori"
-#: src/import.c:3464
+#: src/import.c:3501
#, fuzzy, c-format
msgid "Imported transactions will mark transactions in the account %s.\n"
msgstr "Fly transaktioner til kategori"
#. textstring 2
-#: src/import.c:3468
+#: src/import.c:3505
#, c-format
msgid "Currency to import is %s.\n"
msgstr ""
-#: src/import.c:3474
+#: src/import.c:3511
#, fuzzy
msgid "Amounts of the transactions will be inverted.\n"
msgstr "Fly transaktioner til kategori"
#. label filename
-#: src/import.c:3484
+#: src/import.c:3521
msgid "Name of the file to import "
msgstr ""
-#: src/import.c:3578
+#: src/import.c:3615
#, c-format
msgid "Unable to create tmp file: %s\n"
msgstr ""
@@ -8622,7 +8642,7 @@
msgstr "Ingen underkategori"
#. * Find a unique name for payee
-#: src/meta_payee.c:320 src/tiers_onglet.c:299
+#: src/meta_payee.c:320 src/tiers_onglet.c:300
msgid "New payee"
msgstr ""
@@ -9269,39 +9289,39 @@
msgid "Error opening file '%s'"
msgstr ""
-#: src/tiers_onglet.c:303
+#: src/tiers_onglet.c:304
msgid "Create a new payee"
msgstr ""
-#: src/tiers_onglet.c:312
+#: src/tiers_onglet.c:313
msgid "Delete selected payee"
msgstr ""
-#: src/tiers_onglet.c:321
+#: src/tiers_onglet.c:322
msgid "Edit selected payee"
msgstr ""
-#: src/tiers_onglet.c:325
+#: src/tiers_onglet.c:326
#, fuzzy
msgid "Remove unused payees"
msgstr "Fjern kategori"
-#: src/tiers_onglet.c:329 src/tiers_onglet.c:373
+#: src/tiers_onglet.c:330 src/tiers_onglet.c:374
#, fuzzy
msgid "Remove orphan payees"
msgstr "Fjern kategori"
-#: src/tiers_onglet.c:343
+#: src/tiers_onglet.c:344
#, fuzzy
msgid "Manage payees"
msgstr "Hovedside"
-#: src/tiers_onglet.c:347 src/tiers_onglet.c:729
+#: src/tiers_onglet.c:348 src/tiers_onglet.c:730
#, fuzzy
msgid "Manage the payees"
msgstr "Yderligere info"
-#: src/tiers_onglet.c:374
+#: src/tiers_onglet.c:375
msgid ""
"This will remove all the payees wich are not used in any transactions. "
"Payees linked to an archived transactions will not be removed, even if not "
@@ -9310,29 +9330,29 @@
"Are you sure you want to do that?"
msgstr ""
-#: src/tiers_onglet.c:386 src/tiers_onglet.c:819
+#: src/tiers_onglet.c:387 src/tiers_onglet.c:862
#, c-format
msgid "Removed %d payees."
msgstr ""
#. Edit transaction
-#: src/tiers_onglet.c:411
+#: src/tiers_onglet.c:412
msgid "Payee view"
msgstr ""
-#: src/tiers_onglet.c:633
+#: src/tiers_onglet.c:634
#, c-format
msgid ""
"You tried to rename current payee to '%s' but this payee already exists. "
"Please choose another name."
msgstr ""
-#: src/tiers_onglet.c:637
+#: src/tiers_onglet.c:638
#, fuzzy
msgid "Payee already exists"
msgstr "Valutaen findes allerede."
-#: src/tiers_onglet.c:730
+#: src/tiers_onglet.c:731
msgid ""
"This wizard will help you to simplify the list of payees.\n"
"\n"
@@ -9341,12 +9361,12 @@
"It is better to make a backup of your Grisbi file if you have not yet done. "
msgstr ""
-#: src/tiers_onglet.c:873
+#: src/tiers_onglet.c:916
#, fuzzy
msgid "Choose a payee"
msgstr "Vælg regnskabsår"
-#: src/tiers_onglet.c:875
+#: src/tiers_onglet.c:918
msgid ""
"Select one payee in the list that you modify to serve as the basis for your "
"research.\n"
@@ -9357,65 +9377,65 @@
"string_1%string_2"
msgstr ""
-#: src/tiers_onglet.c:896
+#: src/tiers_onglet.c:939
msgid "Enter the new payee"
msgstr ""
-#: src/tiers_onglet.c:898
+#: src/tiers_onglet.c:941
msgid "Enter the name of the new payee"
msgstr ""
-#: src/tiers_onglet.c:911
+#: src/tiers_onglet.c:954
msgid "Options"
msgstr ""
-#: src/tiers_onglet.c:913
+#: src/tiers_onglet.c:956
msgid "Extracting a number and save it in the field No Cheque/Virement"
msgstr ""
-#: src/tiers_onglet.c:919
+#: src/tiers_onglet.c:962
msgid "Save the payees in the notes"
msgstr ""
-#: src/tiers_onglet.c:952
+#: src/tiers_onglet.c:995
msgid "List of payees who will be modified"
msgstr ""
-#: src/tiers_onglet.c:994
+#: src/tiers_onglet.c:1037
#, fuzzy
msgid "Select"
msgstr "Dato"
-#: src/tiers_onglet.c:1002
+#: src/tiers_onglet.c:1045
#, fuzzy
msgid "Payee number"
msgstr "Check/Ãverførselsnr."
-#: src/tiers_onglet.c:1012
+#: src/tiers_onglet.c:1055
#, fuzzy
msgid "Payee name"
msgstr "Kategori ialt"
-#: src/tiers_onglet.c:1028
+#: src/tiers_onglet.c:1071
msgid "Total number of payees :"
msgstr ""
#. ajoute le nombre de tiers sélectionnés
-#: src/tiers_onglet.c:1045
+#: src/tiers_onglet.c:1088
msgid "Number of selected payees :"
msgstr ""
-#: src/tiers_onglet.c:1147
+#: src/tiers_onglet.c:1190
#, c-format
msgid "Payee sought : %s\n"
msgstr ""
-#: src/tiers_onglet.c:1153
+#: src/tiers_onglet.c:1196
#, fuzzy, c-format
msgid "New payee : %s"
msgstr "Ingen navn %d"
-#: src/tiers_onglet.c:1229
+#: src/tiers_onglet.c:1272
#, c-format
msgid ""
"You are about to replace %d payees whose names contain %s\n"
@@ -9424,11 +9444,11 @@
"<span weight=\"bold\">Are you sure?</span>"
msgstr ""
-#: src/tiers_onglet.c:1393
+#: src/tiers_onglet.c:1436
msgid "You must choose a payee for searching."
msgstr ""
-#: src/tiers_onglet.c:1397
+#: src/tiers_onglet.c:1440
msgid "Beware you don't use one of models for the research."
msgstr ""
Index: fr.po
===================================================================
RCS file: /cvsroot/grisbi/grisbi/po/fr.po,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- fr.po 16 Mar 2009 21:34:10 -0000 1.142
+++ fr.po 17 Mar 2009 22:05:33 -0000 1.143
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 20:58+0100\n"
+"POT-Creation-Date: 2009-03-17 21:51+0100\n"
"PO-Revision-Date: 2009-03-05 20:37+0100\n"
"Last-Translator: Pierre Biava <pierre at pierre.biava.name>\n"
"Language-Team: GNOME French Team <gnomefr at traduc.org>\n"
@@ -426,7 +426,7 @@
#: src/gsb_assistant_reconcile_config.c:612
#: src/gsb_payment_method_config.c:159 src/gsb_reconcile_config.c:96
#: src/gsb_scheduler_list.c:331 src/imputation_budgetaire.c:164
-#: src/tiers_onglet.c:226
+#: src/tiers_onglet.c:227
msgid "Account"
msgstr "Compte"
@@ -439,13 +439,13 @@
#: src/export_csv.c:747 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1281 src/gsb_form_widget.c:400 src/gsb_reconcile.c:154
#: src/gsb_scheduler_list.c:331 src/gsb_transactions_list.c:143
-#: src/import.c:2882 src/import_csv.c:78 src/traitement_variables.c:74
+#: src/import.c:2906 src/import_csv.c:78 src/traitement_variables.c:74
msgid "Date"
msgstr "Date"
#. Description entry
#: src/balance_estimate_tab.c:300 src/etats_onglet.c:287
-#: src/tiers_onglet.c:591
+#: src/tiers_onglet.c:592
msgid "Description"
msgstr "Description"
@@ -493,7 +493,7 @@
#: src/barre_outils.c:107 src/barre_outils.c:453 src/categories_onglet.c:499
#: src/etats_onglet.c:173 src/imputation_budgetaire.c:532
-#: src/tiers_onglet.c:307
+#: src/tiers_onglet.c:308
msgid "Delete"
msgstr "Supprimer"
@@ -528,7 +528,7 @@
msgstr "Imprimer la liste des opérations"
#: src/barre_outils.c:153 src/barre_outils.c:513 src/categories_onglet.c:518
-#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:334
+#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:335
msgid "View"
msgstr "Affichage"
@@ -557,7 +557,7 @@
msgstr "Mode « trois lignes »"
#: src/barre_outils.c:237 src/categories_onglet.c:562
-#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:417
+#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:418
msgid "Complete view"
msgstr "Vue complète"
@@ -660,7 +660,7 @@
#: src/categories_onglet.c:160 src/export_csv.c:774 src/gsb_reconcile.c:157
#: src/gsb_scheduler_list.c:332 src/gsb_transactions_list.c:149
#: src/gsb_transactions_list.c:2867 src/import_csv.c:86
-#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:235
+#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:236
#: src/traitement_variables.c:80
msgid "Balance"
msgstr "Solde"
@@ -737,7 +737,7 @@
msgstr "Créer une nouvelle sous-catégorie"
#: src/categories_onglet.c:480 src/etats_onglet.c:130 src/import.c:350
-#: src/import.c:3099 src/imputation_budgetaire.c:513 src/parametres.c:287
+#: src/import.c:3123 src/imputation_budgetaire.c:513 src/parametres.c:287
msgid "Import"
msgstr "Importer"
@@ -760,7 +760,7 @@
#: src/categories_onglet.c:508 src/etats_onglet.c:184
#: src/fenetre_principale.c:251 src/imputation_budgetaire.c:542
-#: src/tiers_onglet.c:316
+#: src/tiers_onglet.c:317
msgid "Properties"
msgstr "Propriétés"
@@ -768,7 +768,7 @@
msgid "Edit selected category"
msgstr "Editer la catégorie sélectionnée"
-#: src/categories_onglet.c:522 src/tiers_onglet.c:338
+#: src/categories_onglet.c:522 src/tiers_onglet.c:339
msgid "Change view mode"
msgstr "Changer le mode d'affichage"
@@ -783,7 +783,7 @@
#: src/categories_onglet.c:607 src/categories_onglet.c:611
#: src/imputation_budgetaire.c:640 src/imputation_budgetaire.c:645
-#: src/tiers_onglet.c:553
+#: src/tiers_onglet.c:554
#, c-format
msgid "Properties for %s"
msgstr "Propriétés pour %s"
@@ -811,7 +811,7 @@
#: src/gsb_bank.c:832 src/gsb_currency_config.c:355 src/gsb_fyear_config.c:191
#: src/gsb_fyear_config.c:278 src/gsb_payment_method_config.c:239
#: src/gsb_reconcile_config.c:179 src/gsb_transactions_list.c:1733
-#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:578
+#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:579
msgid "Name"
msgstr "Nom"
@@ -881,12 +881,13 @@
"I repeat: if you ever forget your password, there is no coming back, we "
"cannot help you."
msgstr ""
-"Grisbi chiffre ses fichiers d'une manière totalement sécurisée qui ne permet pas de "
-"récupérer le fichier sans le mot de passe. Cela signifie que si "
-"vous oubliez votre mot de passe, vous perdrez toutes vos données. C'est à utiliser avec précaution.\n"
+"Grisbi chiffre ses fichiers d'une manière totalement sécurisée qui ne permet "
+"pas de récupérer le fichier sans le mot de passe. Cela signifie que si vous "
+"oubliez votre mot de passe, vous perdrez toutes vos données. C'est à "
+"utiliser avec précaution.\n"
"\n"
-"Je répète : si jamais vous oubliez votre mot de passe, il n'y aura pas de solution, "
-"nous ne pourrons rien pour vous."
+"Je répète : si jamais vous oubliez votre mot de passe, il n'y aura pas de "
+"solution, nous ne pourrons rien pour vous."
#: src/dialog.c:63
msgid "Account file is world readable."
@@ -1354,12 +1355,12 @@
#. Transfer = Virement
#. Direct deposit remplacé par Transfert = Virement
-#: src/etats_affiche.c:1837 src/import.c:2349 src/import.c:2367
+#: src/etats_affiche.c:1837 src/import.c:2373 src/import.c:2391
msgid "Transfert"
msgstr "Virement"
#: src/etats_affiche.c:1846 src/export_csv.c:561 src/gsb_data_category.c:1039
-#: src/gsb_form.c:740 src/gsb_form.c:2465 src/gsb_form.c:2837
+#: src/gsb_form.c:740 src/gsb_form.c:2476 src/gsb_form.c:2848
#: src/gsb_form_scheduler.c:321 src/gsb_transactions_list.c:3216
msgid "Split of transaction"
msgstr "Opération ventilée"
@@ -1414,7 +1415,7 @@
#: src/etats_config.c:687 src/etats_config.c:7193 src/export_csv.c:762
#: src/fenetre_principale.c:266 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1308 src/gsb_form_widget.c:420 src/gsb_scheduler_list.c:331
-#: src/gsb_transactions_list.c:145 src/import.c:2889 src/import_csv.c:80
+#: src/gsb_transactions_list.c:145 src/import.c:2913 src/import_csv.c:80
#: src/meta_payee.c:76 src/traitement_variables.c:76
msgid "Payee"
msgstr "Tiers"
@@ -1744,14 +1745,14 @@
#: src/etats_config.c:2581 src/etats_config.c:2848 src/etats_config.c:3138
#: src/etats_config.c:3951 src/etats_config.c:4147 src/etats_config.c:7512
-#: src/tiers_onglet.c:1263 src/tiers_onglet.c:1283
+#: src/tiers_onglet.c:1306 src/tiers_onglet.c:1326
msgid "Select all"
msgstr "Sélectionner tout"
#. ajoute le bouton (dé)sélectionne tout
#: src/etats_config.c:2596 src/etats_config.c:2863 src/etats_config.c:3153
#: src/etats_config.c:3966 src/etats_config.c:4162 src/etats_config.c:7527
-#: src/tiers_onglet.c:1062 src/tiers_onglet.c:1265
+#: src/tiers_onglet.c:1105 src/tiers_onglet.c:1308
msgid "Unselect all"
msgstr "Désélectionner tout"
@@ -1860,7 +1861,7 @@
#. set the title
#: src/etats_config.c:4041 src/navigation.c:290 src/navigation.c:1228
-#: src/tiers_onglet.c:214
+#: src/tiers_onglet.c:215
msgid "Payees"
msgstr "Tiers"
@@ -1972,7 +1973,7 @@
#: src/etats_config.c:5310 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:2897
+#: src/gsb_transactions_list.c:150 src/import.c:2921
#: src/traitement_variables.c:81
msgid "Amount"
msgstr "Montant"
@@ -3883,7 +3884,7 @@
"Grisbi archivera toutes les transactions appartenant à l'état sélectionné"
#: src/gsb_assistant_archive.c:354 src/gsb_data_payee.c:511
-#: src/gsb_form.c:2572 src/gsb_form.c:2573 src/navigation.c:1289
+#: src/gsb_form.c:2583 src/gsb_form.c:2584 src/navigation.c:1289
msgid "Report"
msgstr "Ãtat"
@@ -6351,19 +6352,19 @@
msgstr "Le tiers %d de la transaction %d est invalide.\n"
#. Deposit = Dépôt
-#: src/gsb_data_payment.c:714 src/import.c:2331 src/plugins/ofx/ofx.c:451
+#: src/gsb_data_payment.c:714 src/import.c:2355 src/plugins/ofx/ofx.c:451
msgid "Deposit"
msgstr "Dépôt"
#. pas trouvé de définition remplacé par carte de crédit
#. Point of sale = Point de vente remplacé par carte de crédit
-#: src/gsb_data_payment.c:723 src/import.c:2337 src/import.c:2343
+#: src/gsb_data_payment.c:723 src/import.c:2361 src/import.c:2367
msgid "Credit card"
msgstr "Carte de crédit"
#. Electronic payment remplacé par Direct debit = Prélèvement
#. Merchant initiated debit remplacé par Direct debit = Prélèvement
-#: src/gsb_data_payment.c:732 src/import.c:2355 src/import.c:2373
+#: src/gsb_data_payment.c:732 src/import.c:2379 src/import.c:2397
msgid "Direct debit"
msgstr "Prélèvement"
@@ -6940,7 +6941,7 @@
msgid "Encryption plugin not found."
msgstr "Plugin de cryptage non trouvé"
-#: src/gsb_file_load.c:410 src/gsb_file_load.c:4364
+#: src/gsb_file_load.c:410 src/gsb_file_load.c:4370
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Ce n'est pas un fichier Grisbi...chargement interrompu"
@@ -6957,7 +6958,7 @@
"%s"
#. we don't know here the release of that file, give the release needed
-#: src/gsb_file_load.c:7582
+#: src/gsb_file_load.c:7588
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
@@ -6966,7 +6967,7 @@
"Pour ouvrir ce fichier, il vous faut la version %s de GrisbiVous utilisez la "
"version %s."
-#: src/gsb_file_load.c:7621
+#: src/gsb_file_load.c:7627
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6979,11 +6980,11 @@
"c'est une archive avant de modifier certaines transactions ou informations "
"importantes."
-#: src/gsb_file_load.c:7622
+#: src/gsb_file_load.c:7628
msgid "Grisbi archive opened"
msgstr "Archive grisbi ouverte"
-#: src/gsb_file_load.c:7714
+#: src/gsb_file_load.c:7720
#, c-format
msgid ""
"Your old file grisbi was saved as: \n"
@@ -7130,25 +7131,25 @@
msgid "Cheque/Transfer number"
msgstr "N° Chèque/Virement"
-#: src/gsb_form.c:2157
+#: src/gsb_form.c:2168
msgid "No payee selected for this report."
msgstr "Cet état ne comporte pas de tiers sélectionnés."
-#: src/gsb_form.c:2415
+#: src/gsb_form.c:2426
msgid "You must enter a date."
msgstr "Une date est obligatoire."
-#: src/gsb_form.c:2422
+#: src/gsb_form.c:2433
#, c-format
msgid "Invalid date %s"
msgstr "Date invalide %s"
-#: src/gsb_form.c:2441
+#: src/gsb_form.c:2452
#, c-format
msgid "Invalid value date %s"
msgstr "La date est invalide %s"
-#: src/gsb_form.c:2467
+#: src/gsb_form.c:2478
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
@@ -7156,7 +7157,7 @@
"Vous ne pouvez pas choisir la catégorie « opération ventilée » pour une "
"opération fille"
-#: src/gsb_form.c:2500
+#: src/gsb_form.c:2511
#, fuzzy
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
@@ -7164,21 +7165,21 @@
"Vous ne pouvez pas associer un virement pour un compte supprimé dans une "
"opération programmée."
-#: src/gsb_form.c:2507
+#: src/gsb_form.c:2518
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr "Il n'y a pas de compte associé à ce virement où il est invalide"
-#: src/gsb_form.c:2515
+#: src/gsb_form.c:2526
msgid "Can't issue a transfer its own account."
msgstr "Impossible d'effectuer un virement sur son propre compte"
-#: src/gsb_form.c:2520
+#: src/gsb_form.c:2531
msgid "Can't issue a transfer on a closed account."
msgstr "Impossible d'effectuer un virement sur un compte clos"
-#: src/gsb_form.c:2546
+#: src/gsb_form.c:2557
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -7188,7 +7189,7 @@
"aucun numéro.\n"
"Souhaitez-vous continuer ?"
-#: src/gsb_form.c:2560
+#: src/gsb_form.c:2571
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -7196,33 +7197,33 @@
"Attention, le numéro du chèque est déjà utilisé.\n"
"Souhaitez-vous continuer ?"
-#: src/gsb_form.c:2580
+#: src/gsb_form.c:2591
#, fuzzy
msgid "A transaction with a multiple payee must be a new one."
msgstr ""
"Une opération dont le tiers est un état doit forcément être une nouvelle "
"opération."
-#: src/gsb_form.c:2585
+#: src/gsb_form.c:2596
#, fuzzy
msgid "A transaction with a multiple payee cannot be a split child."
msgstr ""
"Une opération dont le tiers est un état doit forcément être une nouvelle "
"opération."
-#: src/gsb_form.c:2596
+#: src/gsb_form.c:2607
msgid "The word \"Report\" is reserved. Please use another one."
msgstr "Le mot « Ãtat » est réservé. Veuillez en utiliser un autre."
-#: src/gsb_form.c:2603
+#: src/gsb_form.c:2614
msgid "Invalid multiple payee."
msgstr "Nom de tiers déjà utilisé."
-#: src/gsb_form.c:2860
+#: src/gsb_form.c:2871
msgid "Modifying a transaction"
msgstr "Modifier une opération"
-#: src/gsb_form.c:2861
+#: src/gsb_form.c:2872
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7237,7 +7238,7 @@
"Etes vous certain ?"
#. propose to configure the form
-#: src/gsb_form.c:3161
+#: src/gsb_form.c:3172
msgid "Configure the form"
msgstr "Configurer le formulaire"
@@ -8266,11 +8267,11 @@
msgid "File name"
msgstr "Nom de fichier"
-#: src/import.c:526 src/import.c:608 src/import.c:3207 src/import.c:3230
+#: src/import.c:526 src/import.c:608 src/import.c:3244 src/import.c:3267
msgid "Unknown"
msgstr "Inconnu"
-#: src/import.c:568 src/import.c:3310 src/import_csv.c:1045
+#: src/import.c:568 src/import.c:3347 src/import_csv.c:1045
#, c-format
msgid "Unable to read file: %s\n"
msgstr "Impossible d'ouvrir le fichier '%s'.\n"
@@ -8452,7 +8453,7 @@
#. there is a difference between the imported account id and grisbi account id,
#. * ask to be sure
-#: src/import.c:1730
+#: src/import.c:1731
#, c-format
msgid ""
"The Grisbi's id account is %s, but the imported id account is %s.\n"
@@ -8464,53 +8465,66 @@
"L'id du compte Grisbi est %s et celui du compte importé est %s.\n"
"\n"
"Peut-être avez-vous choisi un mauvais compte ?\n"
-"Si vous choisissez de continuer, l'id du compte Grisbi sera changé. "
-"Voulez-vous continuer ?"
+"Si vous choisissez de continuer, l'id du compte Grisbi sera changé. Voulez-"
+"vous continuer ?"
#. l'id du compte choisi et l'id du compte importé sont différents
#. on propose encore d'arrêter...
-#: src/import.c:1733 src/import.c:2515
+#: src/import.c:1734 src/import.c:2539
msgid "The id of the imported and chosen accounts are different"
msgstr "Les identifiants du compte importé et du compte choisi sont différents"
-#: src/import.c:1963
+#: src/import.c:1968
+msgid "Confirmation of transactions to be merged"
+msgstr "Confirmation des opérations à fusionner"
+
+#: src/import.c:1971
msgid "Confirmation of importation of transactions"
msgstr "Confirmation de l'importation d'opérations"
-#: src/import.c:1975
+#: src/import.c:1987
+msgid "Please select the transactions to be merged"
+msgstr "Sélectionnez les opérations à fusionner"
+
+#: src/import.c:1990
msgid ""
-"Some imported transactions seem to be already saved. Please select the "
+"Some imported transactions seem to be already saved.Please select the "
"transactions to import."
msgstr ""
"Certaines opérations à importer semblent déjà écrites. Sélectionnez les "
"opérations à importer."
-#: src/import.c:2051
+#: src/import.c:2070
+#, c-format
+msgid "Transactions to be merged : %s ; %s ; %s"
+msgstr "Opérations à fusionner : %s ; %s ; %s"
+
+#: src/import.c:2075
#, c-format
msgid "Transactions to import : %s ; %s ; %s"
msgstr "Opérations à importer : %s ; %s ; %s"
-#: src/import.c:2090
+#: src/import.c:2114
#, c-format
msgid "Transaction found : %s ; %s ; %s ; %s"
msgstr "Opération trouvée : %s ; %s ; %s ; %s"
-#: src/import.c:2103
+#: src/import.c:2127
#, c-format
msgid "Transaction found : %s ; %s ; %s"
msgstr "Opération trouvée : %s ; %s ; %s"
#. Check = Chèque
-#: src/import.c:2317 src/plugins/ofx/ofx.c:431
+#: src/import.c:2341 src/plugins/ofx/ofx.c:431
msgid "Check"
msgstr "Chèque"
#. Cash withdrawal = retrait en liquide
-#: src/import.c:2361
+#: src/import.c:2385
msgid "Cash withdrawal"
msgstr "Liquide"
-#: src/import.c:2451
+#: src/import.c:2475
#, c-format
msgid ""
"Warning : the cheque number %ld is already used.\n"
@@ -8519,7 +8533,7 @@
"Attention, le numéro du chèque %ld est déjà utilisé.\n"
"Nous le sautons"
-#: src/import.c:2516
+#: src/import.c:2540
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 ?"
@@ -8527,96 +8541,102 @@
"Avez-vous choisi un mauvais compte ? Si vous choisissez de continuer, "
"l'identifiant du compte sera changé. Voulez-vous continuer ?"
-#: src/import.c:2792
+#: src/import.c:2816
msgid "Orphaned transactions"
msgstr "Opérations orphelines"
-#: src/import.c:2805
+#: src/import.c:2829
msgid "Mark transactions you want to add to the list and click the add button"
msgstr ""
"Marquer les opérations que vous voulez ajouter à la liste en cliquer sur le "
"bouton ajouter"
-#: src/import.c:2874
+#: src/import.c:2898
msgid "Mark"
msgstr "Marqué"
-#: src/import.c:3075
+#: src/import.c:3099
#, c-format
msgid "%s #%d"
msgstr "%s #%d"
-#: src/import.c:3110
+#: src/import.c:3134
msgid "Threshold while matching transaction date during import (in days)"
msgstr "Intervalle de recherche des opérations similaires en jour"
-#: src/import.c:3136
+#: src/import.c:3160
+msgid "merge transactions imported with planned transactions"
+msgstr ""
+"Fusionner les opérations importées avec les opération planifiée trouvées"
+
+#: src/import.c:3173
msgid "automatically associate the category of the payee if it is possible"
msgstr "associer automatiquement la catégorie du tiers si c'est possible"
-#: src/import.c:3149
+#: src/import.c:3186
msgid "Set the financial year"
msgstr "Définition de l'exercice"
-#: src/import.c:3150
+#: src/import.c:3187
msgid "According to the date"
msgstr "Utiliser la date de l'opération"
-#: src/import.c:3151
+#: src/import.c:3188
msgid "According to the value date (if fail, try with the date)"
msgstr "Utiliser la date de valeur ou la date de l'opération si non présente"
-#: src/import.c:3295
+#: src/import.c:3332
#, c-format
msgid ""
"%s is neither an OFX file, neither a QIF file. Nothing will be done for that "
"file."
msgstr "%s n'est pas un fichier OFX ou QIF. Il ne peut pas être importé"
-#: src/import.c:3353
+#: src/import.c:3390
#, c-format
msgid ""
"%s was not imported successfully. An error occured while getting the "
"transactions."
-msgstr "%s n'a pas été importé avec succès. Une erreur est survenue durant "
-"la transaction."
+msgstr ""
+"%s n'a pas été importé avec succès. Une erreur est survenue durant la "
+"transaction."
-#: src/import.c:3431
+#: src/import.c:3468
msgid "Import a file with a rule"
msgstr "Importer un fichier à partir d'une règle"
#. text for paddingbox
-#: src/import.c:3442
+#: src/import.c:3479
#, c-format
msgid "Properties of the rule : %s\n"
msgstr "Propriétés de la règle : %s\n"
-#: src/import.c:3461
+#: src/import.c:3498
#, c-format
msgid "Imported transactions will be added to the account %s.\n"
msgstr "Les opérations importées seront ajoutées au compte : %s.\n"
-#: src/import.c:3464
+#: src/import.c:3501
#, c-format
msgid "Imported transactions will mark transactions in the account %s.\n"
msgstr "Les opérations importées seront marquées dans le compte %s.\n"
#. textstring 2
-#: src/import.c:3468
+#: src/import.c:3505
#, c-format
msgid "Currency to import is %s.\n"
msgstr "La devise des opérations importées est : %s.\n"
-#: src/import.c:3474
+#: src/import.c:3511
msgid "Amounts of the transactions will be inverted.\n"
msgstr "Le montant des opérations sera inversé.\n"
#. label filename
-#: src/import.c:3484
+#: src/import.c:3521
msgid "Name of the file to import "
msgstr "Nom du fichier à importer "
-#: src/import.c:3578
+#: src/import.c:3615
#, c-format
msgid "Unable to create tmp file: %s\n"
msgstr "Impossible de créer le fichier '%s'\n"
@@ -9062,7 +9082,7 @@
msgstr "Aucun sous-tiers"
#. * Find a unique name for payee
-#: src/meta_payee.c:320 src/tiers_onglet.c:299
+#: src/meta_payee.c:320 src/tiers_onglet.c:300
msgid "New payee"
msgstr "Nouveau tiers"
@@ -9735,35 +9755,35 @@
msgid "Error opening file '%s'"
msgstr "Erreur lors de l'ouverture du fichier « %s »"
-#: src/tiers_onglet.c:303
+#: src/tiers_onglet.c:304
msgid "Create a new payee"
msgstr "Créer un nouveau tiers"
-#: src/tiers_onglet.c:312
+#: src/tiers_onglet.c:313
msgid "Delete selected payee"
msgstr "Supprimer le tiers sélectionné"
-#: src/tiers_onglet.c:321
+#: src/tiers_onglet.c:322
msgid "Edit selected payee"
msgstr "Ãditer le tiers sélectionné"
-#: src/tiers_onglet.c:325
+#: src/tiers_onglet.c:326
msgid "Remove unused payees"
msgstr "Supprimer les tiers inutilisés"
-#: src/tiers_onglet.c:329 src/tiers_onglet.c:373
+#: src/tiers_onglet.c:330 src/tiers_onglet.c:374
msgid "Remove orphan payees"
msgstr "Supprimer les tiers sans opérations"
-#: src/tiers_onglet.c:343
+#: src/tiers_onglet.c:344
msgid "Manage payees"
msgstr "Gérer les tiers"
-#: src/tiers_onglet.c:347 src/tiers_onglet.c:729
+#: src/tiers_onglet.c:348 src/tiers_onglet.c:730
msgid "Manage the payees"
msgstr "Gérer les tiers"
-#: src/tiers_onglet.c:374
+#: src/tiers_onglet.c:375
msgid ""
"This will remove all the payees wich are not used in any transactions. "
"Payees linked to an archived transactions will not be removed, even if not "
@@ -9776,17 +9796,17 @@
"\n"
"Voulez vous continuer ?"
-#: src/tiers_onglet.c:386 src/tiers_onglet.c:819
+#: src/tiers_onglet.c:387 src/tiers_onglet.c:862
#, c-format
msgid "Removed %d payees."
msgstr "Suppression de %d tiers."
#. Edit transaction
-#: src/tiers_onglet.c:411
+#: src/tiers_onglet.c:412
msgid "Payee view"
msgstr "Vue des tiers uniquement"
-#: src/tiers_onglet.c:633
+#: src/tiers_onglet.c:634
#, c-format
msgid ""
"You tried to rename current payee to '%s' but this payee already exists. "
@@ -9795,11 +9815,11 @@
"Vous avez tenté de renommer ce tiers en '%s' mais il existe déjà . Veuillez "
"choisir un autre nom."
-#: src/tiers_onglet.c:637
+#: src/tiers_onglet.c:638
msgid "Payee already exists"
msgstr "Le tiers existe déjà "
-#: src/tiers_onglet.c:730
+#: src/tiers_onglet.c:731
msgid ""
"This wizard will help you to simplify the list of payees.\n"
"\n"
@@ -9814,11 +9834,11 @@
"Il est préférable de faire une sauvegarde de votre fichier Grisbi si vous ne "
"l'avez pas encore fait."
-#: src/tiers_onglet.c:873
+#: src/tiers_onglet.c:916
msgid "Choose a payee"
msgstr "Choisir un tiers"
-#: src/tiers_onglet.c:875
+#: src/tiers_onglet.c:918
msgid ""
"Select one payee in the list that you modify to serve as the basis for your "
"research.\n"
@@ -9836,62 +9856,62 @@
"%chaine%\n"
"chaine_1%chaine_2"
-#: src/tiers_onglet.c:896
+#: src/tiers_onglet.c:939
msgid "Enter the new payee"
msgstr "Entrez le nouveau tiers"
-#: src/tiers_onglet.c:898
+#: src/tiers_onglet.c:941
msgid "Enter the name of the new payee"
msgstr "Entrez le nom du nouveau tiers : "
-#: src/tiers_onglet.c:911
+#: src/tiers_onglet.c:954
msgid "Options"
msgstr "Options"
-#: src/tiers_onglet.c:913
+#: src/tiers_onglet.c:956
msgid "Extracting a number and save it in the field No Cheque/Virement"
msgstr "Extraire un numéro à enregistrer dans N° de chèque/Virement"
-#: src/tiers_onglet.c:919
+#: src/tiers_onglet.c:962
msgid "Save the payees in the notes"
msgstr "Sauvegarder les tiers dans les notes"
-#: src/tiers_onglet.c:952
+#: src/tiers_onglet.c:995
msgid "List of payees who will be modified"
msgstr "Liste des tiers qui seront modifiés"
-#: src/tiers_onglet.c:994
+#: src/tiers_onglet.c:1037
msgid "Select"
msgstr "Sélectionner"
-#: src/tiers_onglet.c:1002
+#: src/tiers_onglet.c:1045
msgid "Payee number"
msgstr "Numéro du tiers"
-#: src/tiers_onglet.c:1012
+#: src/tiers_onglet.c:1055
msgid "Payee name"
msgstr "Nom du tiers"
-#: src/tiers_onglet.c:1028
+#: src/tiers_onglet.c:1071
msgid "Total number of payees :"
msgstr "Nombre total de tiers :"
#. ajoute le nombre de tiers sélectionnés
-#: src/tiers_onglet.c:1045
+#: src/tiers_onglet.c:1088
msgid "Number of selected payees :"
msgstr "Nombre de tiers sélectionnés"
-#: src/tiers_onglet.c:1147
+#: src/tiers_onglet.c:1190
#, c-format
msgid "Payee sought : %s\n"
msgstr "Tiers recherché : %s\n"
-#: src/tiers_onglet.c:1153
+#: src/tiers_onglet.c:1196
#, c-format
msgid "New payee : %s"
msgstr "Nouveau tiers %s"
-#: src/tiers_onglet.c:1229
+#: src/tiers_onglet.c:1272
#, c-format
msgid ""
"You are about to replace %d payees whose names contain %s\n"
@@ -9904,11 +9924,11 @@
"\n"
"<span weight=\"bold\">Etes-vous sûr ?</span>"
-#: src/tiers_onglet.c:1393
+#: src/tiers_onglet.c:1436
msgid "You must choose a payee for searching."
msgstr "Vous devez choisir un tiers pour la recherche"
-#: src/tiers_onglet.c:1397
+#: src/tiers_onglet.c:1440
msgid "Beware you don't use one of models for the research."
msgstr "Attention, vous n'utilisez pas l'un des modèles pour la recherche."
@@ -13606,9 +13626,9 @@
#~ "for this.\n"
#~ "Do you confirm this change?"
#~ msgstr ""
-#~ "Attention, vous passez d'une devise de la zone euro (%s) Ã une qui "
-#~ "n'y est pas (%s). Les transactions en euro seront perdues ! Il n'y aura "
-#~ "pas de retour possible.\n"
+#~ "Attention, vous passez d'une devise de la zone euro (%s) Ã une qui n'y "
+#~ "est pas (%s). Les transactions en euro seront perdues ! Il n'y aura pas "
+#~ "de retour possible.\n"
#~ "Confirmez-vous le changement ?"
#~ msgid "Apply changes to account?"
@@ -13688,14 +13708,16 @@
#~ msgid ""
#~ "Transfer is not associated with an account. Please associate a valid "
#~ "account with this transfer."
-#~ msgstr "Il n'y a pas de compte associé au virement. Veuillez associer un "
-#~ " compte valide avec ce virement."
+#~ msgstr ""
+#~ "Il n'y a pas de compte associé au virement. Veuillez associer un compte "
+#~ "valide avec ce virement."
#~ msgid ""
#~ "Associated account of this transfer does not exist. Please associate a "
#~ "valid account with this transfer."
-#~ msgstr "Le compte associé au virement n'existe pas. Veuillez associer un "
-#~ "compte valide avec ce virement."
+#~ msgstr ""
+#~ "Le compte associé au virement n'existe pas. Veuillez associer un compte "
+#~ "valide avec ce virement."
#, fuzzy
#~ msgid ""
@@ -13746,8 +13768,8 @@
#~ msgid "A split line is to be deleted thought it is not yet registered."
#~ msgstr ""
-#~ "Une opération de ventilation a été marquée pour la suppression alors qu'elle "
-#~ "n'était pas encore enregistrée."
+#~ "Une opération de ventilation a été marquée pour la suppression alors "
+#~ "qu'elle n'était pas encore enregistrée."
#, fuzzy
#~ msgid "Sort by date"
@@ -13757,8 +13779,8 @@
#~ "Grisbi triggered a segmentation fault and cannot continue its execution.\n"
#~ "\n"
#~ msgstr ""
-#~ "Grisbi a subi une erreur de segmentation et ne "
-#~ "peut pas continuer son exécution.\n"
+#~ "Grisbi a subi une erreur de segmentation et ne peut pas continuer son "
+#~ "exécution.\n"
#~ "\n"
#, fuzzy
@@ -13901,7 +13923,8 @@
#, fuzzy
#~ msgid "Cannot open file '%s' to mark it as used: %s"
-#~ msgstr "Impossible d'ouvrir le fichier '%s' pour l'indiquer comme utilisé : %s"
+#~ msgstr ""
+#~ "Impossible d'ouvrir le fichier '%s' pour l'indiquer comme utilisé : %s"
#, fuzzy
#~ msgid "Expander state"
@@ -14165,8 +14188,7 @@
#~ msgstr "Voulez-vous écraser le fichier ?"
#~ msgid "File \"%s\" exists and is not a regular file."
-#~ msgstr ""
-#~ "Le fichier « %s » existe mais n'est pas un fichier normal."
+#~ msgstr "Le fichier « %s » existe mais n'est pas un fichier normal."
#, fuzzy
#~ msgid "Error saving file '%s'."
@@ -14250,7 +14272,9 @@
#, fuzzy
#~ msgid ""
#~ "Do you really want to delete the child of split whith the category '%s' ?"
-#~ msgstr "Voulez vous réellement supprimer l'opération tièrce de la catégorie « %s » ?"
+#~ msgstr ""
+#~ "Voulez vous réellement supprimer l'opération tièrce de la catégorie « %"
+#~ "s » ?"
#, fuzzy
#~ msgid "Create an archive..."
Index: ru.po
===================================================================
RCS file: /cvsroot/grisbi/grisbi/po/ru.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ru.po 13 Mar 2009 20:15:37 -0000 1.21
+++ ru.po 17 Mar 2009 22:05:33 -0000 1.22
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: ru\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 20:58+0100\n"
+"POT-Creation-Date: 2009-03-17 21:51+0100\n"
"PO-Revision-Date: 2005-12-19 11:24+0100\n"
"Last-Translator: Alexandre Prokoudine <alexandre.prokoudine at gmail.com>\n"
"Language-Team: Russian <ru at li.org>\n"
@@ -439,7 +439,7 @@
#: src/gsb_assistant_reconcile_config.c:612
#: src/gsb_payment_method_config.c:159 src/gsb_reconcile_config.c:96
#: src/gsb_scheduler_list.c:331 src/imputation_budgetaire.c:164
-#: src/tiers_onglet.c:226
+#: src/tiers_onglet.c:227
msgid "Account"
msgstr ""
@@ -452,13 +452,13 @@
#: src/export_csv.c:747 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1281 src/gsb_form_widget.c:400 src/gsb_reconcile.c:154
#: src/gsb_scheduler_list.c:331 src/gsb_transactions_list.c:143
-#: src/import.c:2882 src/import_csv.c:78 src/traitement_variables.c:74
+#: src/import.c:2906 src/import_csv.c:78 src/traitement_variables.c:74
msgid "Date"
msgstr "ÐаÑа"
#. Description entry
#: src/balance_estimate_tab.c:300 src/etats_onglet.c:287
-#: src/tiers_onglet.c:591
+#: src/tiers_onglet.c:592
msgid "Description"
msgstr "ÐпиÑание"
@@ -506,7 +506,7 @@
#: src/barre_outils.c:107 src/barre_outils.c:453 src/categories_onglet.c:499
#: src/etats_onglet.c:173 src/imputation_budgetaire.c:532
-#: src/tiers_onglet.c:307
+#: src/tiers_onglet.c:308
#, fuzzy
msgid "Delete"
msgstr "УдалиÑÑ Ð¾ÑÑÑÑ"
@@ -546,7 +546,7 @@
msgstr "СоÑÑиÑоваÑÑ ÑпиÑок ÑÑанзакÑий"
#: src/barre_outils.c:153 src/barre_outils.c:513 src/categories_onglet.c:518
-#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:334
+#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:335
msgid "View"
msgstr ""
@@ -578,7 +578,7 @@
msgstr "ТÑÑÑ
ÑÑÑоÑнÑй"
#: src/barre_outils.c:237 src/categories_onglet.c:562
-#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:417
+#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:418
msgid "Complete view"
msgstr ""
@@ -693,7 +693,7 @@
#: src/categories_onglet.c:160 src/export_csv.c:774 src/gsb_reconcile.c:157
#: src/gsb_scheduler_list.c:332 src/gsb_transactions_list.c:149
#: src/gsb_transactions_list.c:2867 src/import_csv.c:86
-#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:235
+#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:236
#: src/traitement_variables.c:80
msgid "Balance"
msgstr "ÐаланÑ"
@@ -769,7 +769,7 @@
msgstr "ÐобавиÑÑ Ð¿Ð¾Ð´ÐºÐ°ÑегоÑиÑ"
#: src/categories_onglet.c:480 src/etats_onglet.c:130 src/import.c:350
-#: src/import.c:3099 src/imputation_budgetaire.c:513 src/parametres.c:287
+#: src/import.c:3123 src/imputation_budgetaire.c:513 src/parametres.c:287
msgid "Import"
msgstr "ÐмпоÑÑиÑоваÑÑ"
@@ -793,7 +793,7 @@
#: src/categories_onglet.c:508 src/etats_onglet.c:184
#: src/fenetre_principale.c:251 src/imputation_budgetaire.c:542
-#: src/tiers_onglet.c:316
+#: src/tiers_onglet.c:317
#, fuzzy
msgid "Properties"
msgstr "СвойÑÑва валÑÑÑ"
@@ -803,7 +803,7 @@
msgid "Edit selected category"
msgstr "ÐобавиÑÑ ÐºÐ°ÑегоÑиÑ"
-#: src/categories_onglet.c:522 src/tiers_onglet.c:338
+#: src/categories_onglet.c:522 src/tiers_onglet.c:339
#, fuzzy
msgid "Change view mode"
msgstr "ÐдноÑÑÑоÑнÑй"
@@ -821,7 +821,7 @@
#: src/categories_onglet.c:607 src/categories_onglet.c:611
#: src/imputation_budgetaire.c:640 src/imputation_budgetaire.c:645
-#: src/tiers_onglet.c:553
+#: src/tiers_onglet.c:554
#, c-format
msgid "Properties for %s"
msgstr ""
@@ -851,7 +851,7 @@
#: src/gsb_bank.c:832 src/gsb_currency_config.c:355 src/gsb_fyear_config.c:191
#: src/gsb_fyear_config.c:278 src/gsb_payment_method_config.c:239
#: src/gsb_reconcile_config.c:179 src/gsb_transactions_list.c:1733
-#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:578
+#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:579
msgid "Name"
msgstr "ÐмÑ"
@@ -1352,12 +1352,12 @@
#. Transfer = Virement
#. Direct deposit remplacé par Transfert = Virement
-#: src/etats_affiche.c:1837 src/import.c:2349 src/import.c:2367
+#: src/etats_affiche.c:1837 src/import.c:2373 src/import.c:2391
msgid "Transfert"
msgstr ""
#: src/etats_affiche.c:1846 src/export_csv.c:561 src/gsb_data_category.c:1039
-#: src/gsb_form.c:740 src/gsb_form.c:2465 src/gsb_form.c:2837
+#: src/gsb_form.c:740 src/gsb_form.c:2476 src/gsb_form.c:2848
#: src/gsb_form_scheduler.c:321 src/gsb_transactions_list.c:3216
msgid "Split of transaction"
msgstr ""
@@ -1413,7 +1413,7 @@
#: src/etats_config.c:687 src/etats_config.c:7193 src/export_csv.c:762
#: src/fenetre_principale.c:266 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1308 src/gsb_form_widget.c:420 src/gsb_scheduler_list.c:331
-#: src/gsb_transactions_list.c:145 src/import.c:2889 src/import_csv.c:80
+#: src/gsb_transactions_list.c:145 src/import.c:2913 src/import_csv.c:80
#: src/meta_payee.c:76 src/traitement_variables.c:76
msgid "Payee"
msgstr ""
@@ -1737,14 +1737,14 @@
#: src/etats_config.c:2581 src/etats_config.c:2848 src/etats_config.c:3138
#: src/etats_config.c:3951 src/etats_config.c:4147 src/etats_config.c:7512
-#: src/tiers_onglet.c:1263 src/tiers_onglet.c:1283
+#: src/tiers_onglet.c:1306 src/tiers_onglet.c:1326
msgid "Select all"
msgstr ""
#. ajoute le bouton (dé)sélectionne tout
#: src/etats_config.c:2596 src/etats_config.c:2863 src/etats_config.c:3153
#: src/etats_config.c:3966 src/etats_config.c:4162 src/etats_config.c:7527
-#: src/tiers_onglet.c:1062 src/tiers_onglet.c:1265
+#: src/tiers_onglet.c:1105 src/tiers_onglet.c:1308
msgid "Unselect all"
msgstr ""
@@ -1850,7 +1850,7 @@
#. set the title
#: src/etats_config.c:4041 src/navigation.c:290 src/navigation.c:1228
-#: src/tiers_onglet.c:214
+#: src/tiers_onglet.c:215
msgid "Payees"
msgstr ""
@@ -1968,7 +1968,7 @@
#: src/etats_config.c:5310 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:2897
+#: src/gsb_transactions_list.c:150 src/import.c:2921
#: src/traitement_variables.c:81
msgid "Amount"
msgstr "Ðол-во"
@@ -3779,7 +3779,7 @@
msgstr ""
#: src/gsb_assistant_archive.c:354 src/gsb_data_payee.c:511
-#: src/gsb_form.c:2572 src/gsb_form.c:2573 src/navigation.c:1289
+#: src/gsb_form.c:2583 src/gsb_form.c:2584 src/navigation.c:1289
msgid "Report"
msgstr ""
@@ -6105,19 +6105,19 @@
msgstr ""
#. Deposit = Dépôt
-#: src/gsb_data_payment.c:714 src/import.c:2331 src/plugins/ofx/ofx.c:451
+#: src/gsb_data_payment.c:714 src/import.c:2355 src/plugins/ofx/ofx.c:451
msgid "Deposit"
msgstr "ÐепозиÑ"
#. pas trouvé de définition remplacé par carte de crédit
#. Point of sale = Point de vente remplacé par carte de crédit
-#: src/gsb_data_payment.c:723 src/import.c:2337 src/import.c:2343
+#: src/gsb_data_payment.c:723 src/import.c:2361 src/import.c:2367
msgid "Credit card"
msgstr "ÐÑедиÑÐ½Ð°Ñ ÐºÐ°ÑÑа"
#. Electronic payment remplacé par Direct debit = Prélèvement
#. Merchant initiated debit remplacé par Direct debit = Prélèvement
-#: src/gsb_data_payment.c:732 src/import.c:2355 src/import.c:2373
+#: src/gsb_data_payment.c:732 src/import.c:2379 src/import.c:2397
msgid "Direct debit"
msgstr ""
@@ -6593,7 +6593,7 @@
msgid "Encryption plugin not found."
msgstr ""
-#: src/gsb_file_load.c:410 src/gsb_file_load.c:4364
+#: src/gsb_file_load.c:410 src/gsb_file_load.c:4370
msgid "This is not a Grisbi file... Loading aborted."
msgstr ""
@@ -6607,14 +6607,14 @@
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: src/gsb_file_load.c:7582
+#: src/gsb_file_load.c:7588
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr ""
-#: src/gsb_file_load.c:7621
+#: src/gsb_file_load.c:7627
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6622,11 +6622,11 @@
"transactions or important informations."
msgstr ""
-#: src/gsb_file_load.c:7622
+#: src/gsb_file_load.c:7628
msgid "Grisbi archive opened"
msgstr ""
-#: src/gsb_file_load.c:7714
+#: src/gsb_file_load.c:7720
#, c-format
msgid ""
"Your old file grisbi was saved as: \n"
@@ -6755,85 +6755,85 @@
msgid "Cheque/Transfer number"
msgstr ""
-#: src/gsb_form.c:2157
+#: src/gsb_form.c:2168
msgid "No payee selected for this report."
msgstr ""
-#: src/gsb_form.c:2415
+#: src/gsb_form.c:2426
msgid "You must enter a date."
msgstr ""
-#: src/gsb_form.c:2422
+#: src/gsb_form.c:2433
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "вÑе даÑÑ"
-#: src/gsb_form.c:2441
+#: src/gsb_form.c:2452
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "вÑе даÑÑ"
-#: src/gsb_form.c:2467
+#: src/gsb_form.c:2478
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: src/gsb_form.c:2500
+#: src/gsb_form.c:2511
#, fuzzy
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr "ÐÑеобÑазоваÑÑ ÑÑанзакÑÐ¸Ñ Ð² _запланиÑованнÑÑ"
-#: src/gsb_form.c:2507
+#: src/gsb_form.c:2518
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr ""
-#: src/gsb_form.c:2515
+#: src/gsb_form.c:2526
msgid "Can't issue a transfer its own account."
msgstr ""
-#: src/gsb_form.c:2520
+#: src/gsb_form.c:2531
msgid "Can't issue a transfer on a closed account."
msgstr ""
-#: src/gsb_form.c:2546
+#: src/gsb_form.c:2557
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
"Continue anyway?"
msgstr ""
-#: src/gsb_form.c:2560
+#: src/gsb_form.c:2571
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
msgstr ""
-#: src/gsb_form.c:2580
+#: src/gsb_form.c:2591
msgid "A transaction with a multiple payee must be a new one."
msgstr ""
-#: src/gsb_form.c:2585
+#: src/gsb_form.c:2596
msgid "A transaction with a multiple payee cannot be a split child."
msgstr ""
-#: src/gsb_form.c:2596
+#: src/gsb_form.c:2607
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: src/gsb_form.c:2603
+#: src/gsb_form.c:2614
msgid "Invalid multiple payee."
msgstr ""
-#: src/gsb_form.c:2860
+#: src/gsb_form.c:2871
#, fuzzy
msgid "Modifying a transaction"
msgstr "_ÐзмениÑÑ ÑÑанзакÑиÑ"
-#: src/gsb_form.c:2861
+#: src/gsb_form.c:2872
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -6843,7 +6843,7 @@
msgstr ""
#. propose to configure the form
-#: src/gsb_form.c:3161
+#: src/gsb_form.c:3172
msgid "Configure the form"
msgstr ""
@@ -7804,11 +7804,11 @@
msgid "File name"
msgstr "ÐÐ¼Ñ Ð²Ð»Ð°Ð´ÐµÐ»ÑÑа"
-#: src/import.c:526 src/import.c:608 src/import.c:3207 src/import.c:3230
+#: src/import.c:526 src/import.c:608 src/import.c:3244 src/import.c:3267
msgid "Unknown"
msgstr ""
-#: src/import.c:568 src/import.c:3310 src/import_csv.c:1045
+#: src/import.c:568 src/import.c:3347 src/import_csv.c:1045
#, fuzzy, c-format
msgid "Unable to read file: %s\n"
msgstr "ÐÐ¼Ñ Ñайла Ñо ÑÑеÑами"
@@ -7969,7 +7969,7 @@
#. there is a difference between the imported account id and grisbi account id,
#. * ask to be sure
-#: src/import.c:1730
+#: src/import.c:1731
#, c-format
msgid ""
"The Grisbi's id account is %s, but the imported id account is %s.\n"
@@ -7981,149 +7981,169 @@
#. l'id du compte choisi et l'id du compte importé sont différents
#. on propose encore d'arrêter...
-#: src/import.c:1733 src/import.c:2515
+#: src/import.c:1734 src/import.c:2539
msgid "The id of the imported and chosen accounts are different"
msgstr ""
-#: src/import.c:1963
+#: src/import.c:1968
+#, fuzzy
+msgid "Confirmation of transactions to be merged"
+msgstr "ÐÑполÑзоваÑÑ ÑÑÑ ÑÑанзакÑÐ¸Ñ ÐºÐ°Ðº _Ñаблон"
+
+#: src/import.c:1971
msgid "Confirmation of importation of transactions"
msgstr ""
-#: src/import.c:1975
+#: src/import.c:1987
+#, fuzzy
+msgid "Please select the transactions to be merged"
+msgstr "ÐÑполÑзоваÑÑ ÑÑÑ ÑÑанзакÑÐ¸Ñ ÐºÐ°Ðº _Ñаблон"
+
+#: src/import.c:1990
msgid ""
-"Some imported transactions seem to be already saved. Please select the "
+"Some imported transactions seem to be already saved.Please select the "
"transactions to import."
msgstr ""
-#: src/import.c:2051
+#: src/import.c:2070
+#, c-format
+msgid "Transactions to be merged : %s ; %s ; %s"
+msgstr ""
+
+#: src/import.c:2075
#, c-format
msgid "Transactions to import : %s ; %s ; %s"
msgstr ""
-#: src/import.c:2090
+#: src/import.c:2114
#, c-format
msgid "Transaction found : %s ; %s ; %s ; %s"
msgstr ""
-#: src/import.c:2103
+#: src/import.c:2127
#, c-format
msgid "Transaction found : %s ; %s ; %s"
msgstr ""
#. Check = Chèque
-#: src/import.c:2317 src/plugins/ofx/ofx.c:431
+#: src/import.c:2341 src/plugins/ofx/ofx.c:431
#, fuzzy
msgid "Check"
msgstr "Чили"
#. Cash withdrawal = retrait en liquide
-#: src/import.c:2361
+#: src/import.c:2385
msgid "Cash withdrawal"
msgstr ""
-#: src/import.c:2451
+#: src/import.c:2475
#, c-format
msgid ""
"Warning : the cheque number %ld is already used.\n"
"We skip it"
msgstr ""
-#: src/import.c:2516
+#: src/import.c:2540
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:2792
+#: src/import.c:2816
msgid "Orphaned transactions"
msgstr ""
-#: src/import.c:2805
+#: src/import.c:2829
msgid "Mark transactions you want to add to the list and click the add button"
msgstr ""
-#: src/import.c:2874
+#: src/import.c:2898
msgid "Mark"
msgstr ""
-#: src/import.c:3075
+#: src/import.c:3099
#, fuzzy, c-format
msgid "%s #%d"
msgstr "%s %d"
-#: src/import.c:3110
+#: src/import.c:3134
msgid "Threshold while matching transaction date during import (in days)"
msgstr ""
-#: src/import.c:3136
+#: src/import.c:3160
+#, fuzzy
+msgid "merge transactions imported with planned transactions"
+msgstr "ÐÑеобÑазоваÑÑ ÑÑанзакÑÐ¸Ñ Ð² _запланиÑованнÑÑ"
+
+#: src/import.c:3173
msgid "automatically associate the category of the payee if it is possible"
msgstr ""
-#: src/import.c:3149
+#: src/import.c:3186
#, fuzzy
msgid "Set the financial year"
msgstr "ÐовÑй ÑинанÑовÑй год"
-#: src/import.c:3150
+#: src/import.c:3187
#, fuzzy
msgid "According to the date"
msgstr "ÑоглаÑно даÑе ÑÑанзакÑии"
-#: src/import.c:3151
+#: src/import.c:3188
msgid "According to the value date (if fail, try with the date)"
msgstr ""
-#: src/import.c:3295
+#: src/import.c:3332
#, c-format
msgid ""
"%s is neither an OFX file, neither a QIF file. Nothing will be done for that "
"file."
msgstr ""
-#: src/import.c:3353
+#: src/import.c:3390
#, c-format
msgid ""
"%s was not imported successfully. An error occured while getting the "
"transactions."
msgstr ""
-#: src/import.c:3431
+#: src/import.c:3468
msgid "Import a file with a rule"
msgstr ""
#. text for paddingbox
-#: src/import.c:3442
+#: src/import.c:3479
#, fuzzy, c-format
msgid "Properties of the rule : %s\n"
msgstr "ÐÐ¼Ñ Ñайла Ñо ÑÑеÑами"
-#: src/import.c:3461
+#: src/import.c:3498
#, fuzzy, c-format
msgid "Imported transactions will be added to the account %s.\n"
msgstr "_ÐеÑенеÑÑи ÑÑанзакÑÐ¸Ñ Ð½Ð° дÑÑгой ÑÑÑÑ"
-#: src/import.c:3464
+#: src/import.c:3501
#, fuzzy, c-format
msgid "Imported transactions will mark transactions in the account %s.\n"
msgstr "_ÐеÑенеÑÑи ÑÑанзакÑÐ¸Ñ Ð½Ð° дÑÑгой ÑÑÑÑ"
#. textstring 2
-#: src/import.c:3468
+#: src/import.c:3505
#, fuzzy, c-format
msgid "Currency to import is %s.\n"
msgstr "СвойÑÑва валÑÑÑ"
-#: src/import.c:3474
+#: src/import.c:3511
msgid "Amounts of the transactions will be inverted.\n"
msgstr ""
#. label filename
-#: src/import.c:3484
+#: src/import.c:3521
#, fuzzy
msgid "Name of the file to import "
msgstr "ÐÐ¼Ñ Ñайла Ñо ÑÑеÑами"
-#: src/import.c:3578
+#: src/import.c:3615
#, c-format
msgid "Unable to create tmp file: %s\n"
msgstr ""
@@ -8604,7 +8624,7 @@
msgstr ""
#. * Find a unique name for payee
-#: src/meta_payee.c:320 src/tiers_onglet.c:299
+#: src/meta_payee.c:320 src/tiers_onglet.c:300
msgid "New payee"
msgstr ""
@@ -9254,40 +9274,40 @@
msgid "Error opening file '%s'"
msgstr ""
-#: src/tiers_onglet.c:303
+#: src/tiers_onglet.c:304
#, fuzzy
msgid "Create a new payee"
msgstr "СоздаÑÑ Ð½Ð¾Ð²Ñй ÑÑÑÑ"
-#: src/tiers_onglet.c:312
+#: src/tiers_onglet.c:313
#, fuzzy
msgid "Delete selected payee"
msgstr "ÐоÑледний вÑбÑаннÑй ÑинанÑовÑй год"
-#: src/tiers_onglet.c:321
+#: src/tiers_onglet.c:322
msgid "Edit selected payee"
msgstr ""
-#: src/tiers_onglet.c:325
+#: src/tiers_onglet.c:326
#, fuzzy
msgid "Remove unused payees"
msgstr "ÐÐ¼Ñ Ñайла Ñо ÑÑеÑами"
-#: src/tiers_onglet.c:329 src/tiers_onglet.c:373
+#: src/tiers_onglet.c:330 src/tiers_onglet.c:374
#, fuzzy
msgid "Remove orphan payees"
msgstr "ÐÐ¼Ñ Ñайла Ñо ÑÑеÑами"
-#: src/tiers_onglet.c:343
+#: src/tiers_onglet.c:344
#, fuzzy
msgid "Manage payees"
msgstr "РезÑме"
-#: src/tiers_onglet.c:347 src/tiers_onglet.c:729
+#: src/tiers_onglet.c:348 src/tiers_onglet.c:730
msgid "Manage the payees"
msgstr ""
-#: src/tiers_onglet.c:374
+#: src/tiers_onglet.c:375
msgid ""
"This will remove all the payees wich are not used in any transactions. "
"Payees linked to an archived transactions will not be removed, even if not "
@@ -9296,29 +9316,29 @@
"Are you sure you want to do that?"
msgstr ""
-#: src/tiers_onglet.c:386 src/tiers_onglet.c:819
+#: src/tiers_onglet.c:387 src/tiers_onglet.c:862
#, c-format
msgid "Removed %d payees."
msgstr ""
#. Edit transaction
-#: src/tiers_onglet.c:411
+#: src/tiers_onglet.c:412
msgid "Payee view"
msgstr ""
-#: src/tiers_onglet.c:633
+#: src/tiers_onglet.c:634
#, c-format
msgid ""
"You tried to rename current payee to '%s' but this payee already exists. "
"Please choose another name."
msgstr ""
-#: src/tiers_onglet.c:637
+#: src/tiers_onglet.c:638
#, fuzzy
msgid "Payee already exists"
msgstr "Файл Ñ Ñаким именем Ñже еÑÑÑ"
-#: src/tiers_onglet.c:730
+#: src/tiers_onglet.c:731
msgid ""
"This wizard will help you to simplify the list of payees.\n"
"\n"
@@ -9327,12 +9347,12 @@
"It is better to make a backup of your Grisbi file if you have not yet done. "
msgstr ""
-#: src/tiers_onglet.c:873
+#: src/tiers_onglet.c:916
#, fuzzy
msgid "Choose a payee"
msgstr "ÐÑбÑаÑÑ Ñаблон Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ оÑÑÑÑа"
-#: src/tiers_onglet.c:875
+#: src/tiers_onglet.c:918
msgid ""
"Select one payee in the list that you modify to serve as the basis for your "
"research.\n"
@@ -9343,69 +9363,69 @@
"string_1%string_2"
msgstr ""
-#: src/tiers_onglet.c:896
+#: src/tiers_onglet.c:939
#, fuzzy
msgid "Enter the new payee"
msgstr "СоздаÑÑ Ð½Ð¾Ð²Ñй ÑÑÑÑ"
-#: src/tiers_onglet.c:898
+#: src/tiers_onglet.c:941
#, fuzzy
msgid "Enter the name of the new payee"
msgstr "СоздаÑÑ Ð½Ð¾Ð²Ñй ÑÑÑÑ"
-#: src/tiers_onglet.c:911
+#: src/tiers_onglet.c:954
#, fuzzy
msgid "Options"
msgstr "ÐейÑÑвие"
-#: src/tiers_onglet.c:913
+#: src/tiers_onglet.c:956
msgid "Extracting a number and save it in the field No Cheque/Virement"
msgstr ""
-#: src/tiers_onglet.c:919
+#: src/tiers_onglet.c:962
msgid "Save the payees in the notes"
msgstr ""
-#: src/tiers_onglet.c:952
+#: src/tiers_onglet.c:995
msgid "List of payees who will be modified"
msgstr ""
-#: src/tiers_onglet.c:994
+#: src/tiers_onglet.c:1037
#, fuzzy
msgid "Select"
msgstr "УдалиÑÑ Ð¾ÑÑÑÑ"
-#: src/tiers_onglet.c:1002
+#: src/tiers_onglet.c:1045
#, fuzzy
msgid "Payee number"
msgstr "ÐÐ¾Ð¼ÐµÑ Ð¿Ð¾ÑÑÑиÑелÑ"
-#: src/tiers_onglet.c:1012
+#: src/tiers_onglet.c:1055
#, fuzzy
msgid "Payee name"
msgstr "Ð ÐµÐ¶Ð¸Ð¼Ñ Ð¾ÑобÑажениÑ"
-#: src/tiers_onglet.c:1028
+#: src/tiers_onglet.c:1071
msgid "Total number of payees :"
msgstr ""
#. ajoute le nombre de tiers sélectionnés
-#: src/tiers_onglet.c:1045
+#: src/tiers_onglet.c:1088
#, fuzzy
msgid "Number of selected payees :"
msgstr "ÐоÑледний вÑбÑаннÑй ÑинанÑовÑй год"
-#: src/tiers_onglet.c:1147
+#: src/tiers_onglet.c:1190
#, c-format
msgid "Payee sought : %s\n"
msgstr ""
-#: src/tiers_onglet.c:1153
+#: src/tiers_onglet.c:1196
#, fuzzy, c-format
msgid "New payee : %s"
msgstr "ÐиÑего"
-#: src/tiers_onglet.c:1229
+#: src/tiers_onglet.c:1272
#, c-format
msgid ""
"You are about to replace %d payees whose names contain %s\n"
@@ -9414,11 +9434,11 @@
"<span weight=\"bold\">Are you sure?</span>"
msgstr ""
-#: src/tiers_onglet.c:1393
+#: src/tiers_onglet.c:1436
msgid "You must choose a payee for searching."
msgstr ""
-#: src/tiers_onglet.c:1397
+#: src/tiers_onglet.c:1440
msgid "Beware you don't use one of models for the research."
msgstr ""
Index: nl.po
===================================================================
RCS file: /cvsroot/grisbi/grisbi/po/nl.po,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- nl.po 13 Mar 2009 20:15:37 -0000 1.21
+++ nl.po 17 Mar 2009 22:05:33 -0000 1.22
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: nl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 20:58+0100\n"
+"POT-Creation-Date: 2009-03-17 21:51+0100\n"
"PO-Revision-Date: 2007-02-11 22:04+0100\n"
"Last-Translator: E.Huijsing <lighthous at users.sourceforge.net>\n"
"Language-Team: Dutch <en at li.org>\n"
@@ -459,7 +459,7 @@
#: src/gsb_assistant_reconcile_config.c:612
#: src/gsb_payment_method_config.c:159 src/gsb_reconcile_config.c:96
#: src/gsb_scheduler_list.c:331 src/imputation_budgetaire.c:164
-#: src/tiers_onglet.c:226
+#: src/tiers_onglet.c:227
msgid "Account"
msgstr "Rekening"
@@ -472,13 +472,13 @@
#: src/export_csv.c:747 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1281 src/gsb_form_widget.c:400 src/gsb_reconcile.c:154
#: src/gsb_scheduler_list.c:331 src/gsb_transactions_list.c:143
-#: src/import.c:2882 src/import_csv.c:78 src/traitement_variables.c:74
+#: src/import.c:2906 src/import_csv.c:78 src/traitement_variables.c:74
msgid "Date"
msgstr "Datum"
#. Description entry
#: src/balance_estimate_tab.c:300 src/etats_onglet.c:287
-#: src/tiers_onglet.c:591
+#: src/tiers_onglet.c:592
msgid "Description"
msgstr "Omschrijving"
@@ -527,7 +527,7 @@
#: src/barre_outils.c:107 src/barre_outils.c:453 src/categories_onglet.c:499
#: src/etats_onglet.c:173 src/imputation_budgetaire.c:532
-#: src/tiers_onglet.c:307
+#: src/tiers_onglet.c:308
#, fuzzy
msgid "Delete"
msgstr "Kies"
@@ -567,7 +567,7 @@
msgstr "Sorteer transactielijst"
#: src/barre_outils.c:153 src/barre_outils.c:513 src/categories_onglet.c:518
-#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:334
+#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:335
msgid "View"
msgstr ""
@@ -599,7 +599,7 @@
msgstr "Drie regels stand"
#: src/barre_outils.c:237 src/categories_onglet.c:562
-#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:417
+#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:418
#, fuzzy
msgid "Complete view"
msgstr "Fout: opsplitsing niet compleet !"
@@ -719,7 +719,7 @@
#: src/categories_onglet.c:160 src/export_csv.c:774 src/gsb_reconcile.c:157
#: src/gsb_scheduler_list.c:332 src/gsb_transactions_list.c:149
#: src/gsb_transactions_list.c:2867 src/import_csv.c:86
-#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:235
+#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:236
#: src/traitement_variables.c:80
msgid "Balance"
msgstr "Saldo"
@@ -800,7 +800,7 @@
msgstr "Vul een naam in voor de sub-categorie"
#: src/categories_onglet.c:480 src/etats_onglet.c:130 src/import.c:350
-#: src/import.c:3099 src/imputation_budgetaire.c:513 src/parametres.c:287
+#: src/import.c:3123 src/imputation_budgetaire.c:513 src/parametres.c:287
msgid "Import"
msgstr "Importeren"
@@ -828,7 +828,7 @@
#: src/categories_onglet.c:508 src/etats_onglet.c:184
#: src/fenetre_principale.c:251 src/imputation_budgetaire.c:542
-#: src/tiers_onglet.c:316
+#: src/tiers_onglet.c:317
#, fuzzy
msgid "Properties"
msgstr "Valuta eigenschappen"
@@ -838,7 +838,7 @@
msgid "Edit selected category"
msgstr "de categorie"
-#: src/categories_onglet.c:522 src/tiers_onglet.c:338
+#: src/categories_onglet.c:522 src/tiers_onglet.c:339
#, fuzzy
msgid "Change view mode"
msgstr "Een regel stand"
@@ -856,7 +856,7 @@
#: src/categories_onglet.c:607 src/categories_onglet.c:611
#: src/imputation_budgetaire.c:640 src/imputation_budgetaire.c:645
-#: src/tiers_onglet.c:553
+#: src/tiers_onglet.c:554
#, fuzzy, c-format
msgid "Properties for %s"
msgstr "Resultaat van %s"
@@ -886,7 +886,7 @@
#: src/gsb_bank.c:832 src/gsb_currency_config.c:355 src/gsb_fyear_config.c:191
#: src/gsb_fyear_config.c:278 src/gsb_payment_method_config.c:239
#: src/gsb_reconcile_config.c:179 src/gsb_transactions_list.c:1733
-#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:578
+#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:579
msgid "Name"
msgstr "Naam"
@@ -1403,12 +1403,12 @@
#. Transfer = Virement
#. Direct deposit remplacé par Transfert = Virement
-#: src/etats_affiche.c:1837 src/import.c:2349 src/import.c:2367
+#: src/etats_affiche.c:1837 src/import.c:2373 src/import.c:2391
msgid "Transfert"
msgstr "Overgeschreven"
#: src/etats_affiche.c:1846 src/export_csv.c:561 src/gsb_data_category.c:1039
-#: src/gsb_form.c:740 src/gsb_form.c:2465 src/gsb_form.c:2837
+#: src/gsb_form.c:740 src/gsb_form.c:2476 src/gsb_form.c:2848
#: src/gsb_form_scheduler.c:321 src/gsb_transactions_list.c:3216
msgid "Split of transaction"
msgstr "Opsplitsen van transactie"
@@ -1464,7 +1464,7 @@
#: src/etats_config.c:687 src/etats_config.c:7193 src/export_csv.c:762
#: src/fenetre_principale.c:266 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1308 src/gsb_form_widget.c:420 src/gsb_scheduler_list.c:331
-#: src/gsb_transactions_list.c:145 src/import.c:2889 src/import_csv.c:80
+#: src/gsb_transactions_list.c:145 src/import.c:2913 src/import_csv.c:80
#: src/meta_payee.c:76 src/traitement_variables.c:76
#, fuzzy
msgid "Payee"
@@ -1805,14 +1805,14 @@
#: src/etats_config.c:2581 src/etats_config.c:2848 src/etats_config.c:3138
#: src/etats_config.c:3951 src/etats_config.c:4147 src/etats_config.c:7512
-#: src/tiers_onglet.c:1263 src/tiers_onglet.c:1283
+#: src/tiers_onglet.c:1306 src/tiers_onglet.c:1326
msgid "Select all"
msgstr "Selecteer alles"
#. ajoute le bouton (dé)sélectionne tout
#: src/etats_config.c:2596 src/etats_config.c:2863 src/etats_config.c:3153
#: src/etats_config.c:3966 src/etats_config.c:4162 src/etats_config.c:7527
-#: src/tiers_onglet.c:1062 src/tiers_onglet.c:1265
+#: src/tiers_onglet.c:1105 src/tiers_onglet.c:1308
msgid "Unselect all"
msgstr "Selectie opheffen"
@@ -1927,7 +1927,7 @@
#. set the title
#: src/etats_config.c:4041 src/navigation.c:290 src/navigation.c:1228
-#: src/tiers_onglet.c:214
+#: src/tiers_onglet.c:215
#, fuzzy
msgid "Payees"
msgstr "Dagen"
@@ -2051,7 +2051,7 @@
#: src/etats_config.c:5310 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:2897
+#: src/gsb_transactions_list.c:150 src/import.c:2921
#: src/traitement_variables.c:81
msgid "Amount"
msgstr "Bedrag"
@@ -3925,7 +3925,7 @@
msgstr ""
#: src/gsb_assistant_archive.c:354 src/gsb_data_payee.c:511
-#: src/gsb_form.c:2572 src/gsb_form.c:2573 src/navigation.c:1289
+#: src/gsb_form.c:2583 src/gsb_form.c:2584 src/navigation.c:1289
msgid "Report"
msgstr "Rapport"
@@ -6291,19 +6291,19 @@
"Transactie #%d moet een tegenrekening hebben #%d maar deze bestaat niet.\n"
#. Deposit = Dépôt
-#: src/gsb_data_payment.c:714 src/import.c:2331 src/plugins/ofx/ofx.c:451
+#: src/gsb_data_payment.c:714 src/import.c:2355 src/plugins/ofx/ofx.c:451
msgid "Deposit"
msgstr "Storting"
#. pas trouvé de définition remplacé par carte de crédit
#. Point of sale = Point de vente remplacé par carte de crédit
-#: src/gsb_data_payment.c:723 src/import.c:2337 src/import.c:2343
+#: src/gsb_data_payment.c:723 src/import.c:2361 src/import.c:2367
msgid "Credit card"
msgstr "Creditcard"
#. Electronic payment remplacé par Direct debit = Prélèvement
#. Merchant initiated debit remplacé par Direct debit = Prélèvement
-#: src/gsb_data_payment.c:732 src/import.c:2355 src/import.c:2373
+#: src/gsb_data_payment.c:732 src/import.c:2379 src/import.c:2397
msgid "Direct debit"
msgstr "Automatische afschrijving"
@@ -6834,7 +6834,7 @@
msgid "Encryption plugin not found."
msgstr "Rekening %s niet gevonden. \n"
-#: src/gsb_file_load.c:410 src/gsb_file_load.c:4364
+#: src/gsb_file_load.c:410 src/gsb_file_load.c:4370
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Dit bestand is geen Grisbi rapport bestand"
@@ -6849,14 +6849,14 @@
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: src/gsb_file_load.c:7582
+#: src/gsb_file_load.c:7588
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "Grisbi versie %s is nodig om dit bestand te openen"
-#: src/gsb_file_load.c:7621
+#: src/gsb_file_load.c:7627
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6864,11 +6864,11 @@
"transactions or important informations."
msgstr ""
-#: src/gsb_file_load.c:7622
+#: src/gsb_file_load.c:7628
msgid "Grisbi archive opened"
msgstr ""
-#: src/gsb_file_load.c:7714
+#: src/gsb_file_load.c:7720
#, c-format
msgid ""
"Your old file grisbi was saved as: \n"
@@ -7001,53 +7001,53 @@
msgid "Cheque/Transfer number"
msgstr "Cheque/overschrijvings-nummer"
-#: src/gsb_form.c:2157
+#: src/gsb_form.c:2168
#, fuzzy
msgid "No payee selected for this report."
msgstr "Er is geen begunstigde geselecteerd voor dit rapport"
-#: src/gsb_form.c:2415
+#: src/gsb_form.c:2426
msgid "You must enter a date."
msgstr "U moet een datum invullen."
-#: src/gsb_form.c:2422
+#: src/gsb_form.c:2433
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "Datum onbekende"
-#: src/gsb_form.c:2441
+#: src/gsb_form.c:2452
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "Datum onbekende"
-#: src/gsb_form.c:2467
+#: src/gsb_form.c:2478
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: src/gsb_form.c:2500
+#: src/gsb_form.c:2511
#, fuzzy
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr "Transactie omzetten naar een geplande transactie"
-#: src/gsb_form.c:2507
+#: src/gsb_form.c:2518
#, fuzzy
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr "De bijbehorende rekening voor deze overschrijving bestaat niet"
-#: src/gsb_form.c:2515
+#: src/gsb_form.c:2526
msgid "Can't issue a transfer its own account."
msgstr "U kunt geen overschrijving maken naar dezelfde rekening"
-#: src/gsb_form.c:2520
+#: src/gsb_form.c:2531
msgid "Can't issue a transfer on a closed account."
msgstr "Kan geen transactie uitvoeren op/naar een gesloten rekening."
-#: src/gsb_form.c:2546
+#: src/gsb_form.c:2557
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -7057,7 +7057,7 @@
"maar heeft geen nummer.\n"
"Toch door gaan?"
-#: src/gsb_form.c:2560
+#: src/gsb_form.c:2571
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -7065,31 +7065,31 @@
"Waarschuwing dit chequenummer wordt al gebruikt.\n"
"Toch door gaan?"
-#: src/gsb_form.c:2580
+#: src/gsb_form.c:2591
#, fuzzy
msgid "A transaction with a multiple payee must be a new one."
msgstr "Een transactie met meerdere begunstigden moet een nieuwe zijn"
-#: src/gsb_form.c:2585
+#: src/gsb_form.c:2596
#, fuzzy
msgid "A transaction with a multiple payee cannot be a split child."
msgstr "Een transactie met meerdere begunstigden moet een nieuwe zijn"
-#: src/gsb_form.c:2596
+#: src/gsb_form.c:2607
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: src/gsb_form.c:2603
+#: src/gsb_form.c:2614
#, fuzzy
msgid "Invalid multiple payee."
msgstr "Ongeldige meervoudige begunstigde"
-#: src/gsb_form.c:2860
+#: src/gsb_form.c:2871
#, fuzzy
msgid "Modifying a transaction"
msgstr "Bewerk transacties"
-#: src/gsb_form.c:2861
+#: src/gsb_form.c:2872
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7099,7 +7099,7 @@
msgstr ""
#. propose to configure the form
-#: src/gsb_form.c:3161
+#: src/gsb_form.c:3172
msgid "Configure the form"
msgstr ""
@@ -8118,11 +8118,11 @@
msgid "File name"
msgstr "Naam"
-#: src/import.c:526 src/import.c:608 src/import.c:3207 src/import.c:3230
+#: src/import.c:526 src/import.c:608 src/import.c:3244 src/import.c:3267
msgid "Unknown"
msgstr "Onbekend"
-#: src/import.c:568 src/import.c:3310 src/import_csv.c:1045
+#: src/import.c:568 src/import.c:3347 src/import_csv.c:1045
#, fuzzy, c-format
msgid "Unable to read file: %s\n"
msgstr "Kan het bestand '%s' niet openen %s"
@@ -8290,7 +8290,7 @@
#. there is a difference between the imported account id and grisbi account id,
#. * ask to be sure
-#: src/import.c:1730
+#: src/import.c:1731
#, fuzzy, c-format
msgid ""
"The Grisbi's id account is %s, but the imported id account is %s.\n"
@@ -8304,48 +8304,64 @@
#. l'id du compte choisi et l'id du compte importé sont différents
#. on propose encore d'arrêter...
-#: src/import.c:1733 src/import.c:2515
+#: src/import.c:1734 src/import.c:2539
msgid "The id of the imported and chosen accounts are different"
msgstr "De id voor de geïmporteerde en gekozen rekeningen is niet hetzelfde."
-#: src/import.c:1963
+#: src/import.c:1968
+#, fuzzy
+msgid "Confirmation of transactions to be merged"
+msgstr "Verwijderen van transactie bevestigen"
+
+#: src/import.c:1971
msgid "Confirmation of importation of transactions"
msgstr "Bevestig het importeren van de transacties"
-#: src/import.c:1975
+#: src/import.c:1987
+#, fuzzy
+msgid "Please select the transactions to be merged"
+msgstr "Gebruik de gekozen transactie als sjabloon"
+
+#: src/import.c:1990
+#, fuzzy
msgid ""
-"Some imported transactions seem to be already saved. Please select the "
+"Some imported transactions seem to be already saved.Please select the "
"transactions to import."
msgstr ""
"Sommige van de te importeren transacties lijken al te bestaan. Selecteer de "
"transacties die u wilt importeren."
-#: src/import.c:2051
+#: src/import.c:2070
+#, fuzzy, c-format
+msgid "Transactions to be merged : %s ; %s ; %s"
+msgstr "Transacties om te importeren : %02d/%02d/%04d ; %s ; %4.2f"
+
+#: src/import.c:2075
#, fuzzy, c-format
msgid "Transactions to import : %s ; %s ; %s"
msgstr "Transacties om te importeren : %02d/%02d/%04d ; %s ; %4.2f"
-#: src/import.c:2090
+#: src/import.c:2114
#, fuzzy, c-format
msgid "Transaction found : %s ; %s ; %s ; %s"
msgstr "Gevonden transactie : %02d/%02d/%04d ; %s ; %4.2f ; %s"
-#: src/import.c:2103
+#: src/import.c:2127
#, fuzzy, c-format
msgid "Transaction found : %s ; %s ; %s"
msgstr "Gevonden transactie : %02d/%02d/%04d ; %s ; %4.2f"
#. Check = Chèque
-#: src/import.c:2317 src/plugins/ofx/ofx.c:431
+#: src/import.c:2341 src/plugins/ofx/ofx.c:431
msgid "Check"
msgstr "Controleer"
#. Cash withdrawal = retrait en liquide
-#: src/import.c:2361
+#: src/import.c:2385
msgid "Cash withdrawal"
msgstr ""
-#: src/import.c:2451
+#: src/import.c:2475
#, fuzzy, c-format
msgid ""
"Warning : the cheque number %ld is already used.\n"
@@ -8354,7 +8370,7 @@
"Waarschuwing dit chequenummer wordt al gebruikt.\n"
"Toch door gaan?"
-#: src/import.c:2516
+#: src/import.c:2540
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 ?"
@@ -8362,102 +8378,107 @@
"Misschien heeft u een verkeerde rekening gekozen? Als u doorgaat wordt het "
"id van de rekening aangepast. Wil u doorgaan?"
-#: src/import.c:2792
+#: src/import.c:2816
msgid "Orphaned transactions"
msgstr "Verweesde transacties"
-#: src/import.c:2805
+#: src/import.c:2829
msgid "Mark transactions you want to add to the list and click the add button"
msgstr ""
"Markeer de transacties die u wilt toevoegen en klik op de knop\"Toevoegen\" "
-#: src/import.c:2874
+#: src/import.c:2898
msgid "Mark"
msgstr "Markeren"
-#: src/import.c:3075
+#: src/import.c:3099
#, fuzzy, c-format
msgid "%s #%d"
msgstr "%s %d"
-#: src/import.c:3110
+#: src/import.c:3134
msgid "Threshold while matching transaction date during import (in days)"
msgstr ""
-#: src/import.c:3136
+#: src/import.c:3160
+#, fuzzy
+msgid "merge transactions imported with planned transactions"
+msgstr "Transactie omzetten naar een geplande transactie"
+
+#: src/import.c:3173
msgid "automatically associate the category of the payee if it is possible"
msgstr ""
-#: src/import.c:3149
+#: src/import.c:3186
#, fuzzy
msgid "Set the financial year"
msgstr "Kies een financieel jaar"
# optie voor "laatst gekozen financieel jaar"
-#: src/import.c:3150
+#: src/import.c:3187
#, fuzzy
msgid "According to the date"
msgstr "transactiedatum"
-#: src/import.c:3151
+#: src/import.c:3188
msgid "According to the value date (if fail, try with the date)"
msgstr ""
-#: src/import.c:3295
+#: src/import.c:3332
#, c-format
msgid ""
"%s is neither an OFX file, neither a QIF file. Nothing will be done for that "
"file."
msgstr ""
-#: src/import.c:3353
+#: src/import.c:3390
#, c-format
msgid ""
"%s was not imported successfully. An error occured while getting the "
"transactions."
msgstr ""
-#: src/import.c:3431
+#: src/import.c:3468
msgid "Import a file with a rule"
msgstr ""
#. text for paddingbox
-#: src/import.c:3442
+#: src/import.c:3479
#, fuzzy, c-format
msgid "Properties of the rule : %s\n"
msgstr "Resultaat van %s"
-#: src/import.c:3461
+#: src/import.c:3498
#, fuzzy, c-format
msgid "Imported transactions will be added to the account %s.\n"
msgstr ""
"Alle transacties zullen worden omgeschreven naar de valuta van hun rekening."
-#: src/import.c:3464
+#: src/import.c:3501
#, fuzzy, c-format
msgid "Imported transactions will mark transactions in the account %s.\n"
msgstr ""
"Een deel van de opsplits transactie is naar deze rekening overgeschreven.\n"
#. textstring 2
-#: src/import.c:3468
+#: src/import.c:3505
#, fuzzy, c-format
msgid "Currency to import is %s.\n"
msgstr "Valuta eigenschappen"
-#: src/import.c:3474
+#: src/import.c:3511
#, fuzzy
msgid "Amounts of the transactions will be inverted.\n"
msgstr "Automatisch uitgevoerde geplande transacties"
# titel van scherm bij het opslaan met een nieuwe naam (dus ook bij de eerste keer)
#. label filename
-#: src/import.c:3484
+#: src/import.c:3521
#, fuzzy
msgid "Name of the file to import "
msgstr "Bestand opslaan als"
-#: src/import.c:3578
+#: src/import.c:3615
#, fuzzy, c-format
msgid "Unable to create tmp file: %s\n"
msgstr "Kan het bestand '%s' niet openen %s"
@@ -8956,7 +8977,7 @@
msgstr "Geen sub-categorie"
#. * Find a unique name for payee
-#: src/meta_payee.c:320 src/tiers_onglet.c:299
+#: src/meta_payee.c:320 src/tiers_onglet.c:300
#, fuzzy
msgid "New payee"
msgstr "Nieuwe betalingsmethode"
@@ -9634,43 +9655,43 @@
msgid "Error opening file '%s'"
msgstr "Er is een fout opgetreden bij het openen van het bestand '%s'."
-#: src/tiers_onglet.c:303
+#: src/tiers_onglet.c:304
#, fuzzy
msgid "Create a new payee"
msgstr "Nieuwe rekening maken"
-#: src/tiers_onglet.c:312
+#: src/tiers_onglet.c:313
#, fuzzy
msgid "Delete selected payee"
msgstr "Verwijder begunstigde"
-#: src/tiers_onglet.c:321
+#: src/tiers_onglet.c:322
msgid "Edit selected payee"
msgstr ""
# titel van scherm bij het opslaan met een nieuwe naam (dus ook bij de eerste keer)
-#: src/tiers_onglet.c:325
+#: src/tiers_onglet.c:326
#, fuzzy
msgid "Remove unused payees"
msgstr "Bestand opslaan als"
# titel van scherm bij het opslaan met een nieuwe naam (dus ook bij de eerste keer)
-#: src/tiers_onglet.c:329 src/tiers_onglet.c:373
+#: src/tiers_onglet.c:330 src/tiers_onglet.c:374
#, fuzzy
msgid "Remove orphan payees"
msgstr "Bestand opslaan als"
-#: src/tiers_onglet.c:343
+#: src/tiers_onglet.c:344
#, fuzzy
msgid "Manage payees"
msgstr "Hoofdpagina"
-#: src/tiers_onglet.c:347 src/tiers_onglet.c:729
+#: src/tiers_onglet.c:348 src/tiers_onglet.c:730
#, fuzzy
msgid "Manage the payees"
msgstr "Gebruik categorieën."
-#: src/tiers_onglet.c:374
+#: src/tiers_onglet.c:375
msgid ""
"This will remove all the payees wich are not used in any transactions. "
"Payees linked to an archived transactions will not be removed, even if not "
@@ -9679,29 +9700,29 @@
"Are you sure you want to do that?"
msgstr ""
-#: src/tiers_onglet.c:386 src/tiers_onglet.c:819
+#: src/tiers_onglet.c:387 src/tiers_onglet.c:862
#, c-format
msgid "Removed %d payees."
msgstr ""
#. Edit transaction
-#: src/tiers_onglet.c:411
+#: src/tiers_onglet.c:412
msgid "Payee view"
msgstr ""
-#: src/tiers_onglet.c:633
+#: src/tiers_onglet.c:634
#, c-format
msgid ""
"You tried to rename current payee to '%s' but this payee already exists. "
"Please choose another name."
msgstr ""
-#: src/tiers_onglet.c:637
+#: src/tiers_onglet.c:638
#, fuzzy
msgid "Payee already exists"
msgstr "Bestand bestaat reeds"
-#: src/tiers_onglet.c:730
+#: src/tiers_onglet.c:731
msgid ""
"This wizard will help you to simplify the list of payees.\n"
"\n"
@@ -9710,12 +9731,12 @@
"It is better to make a backup of your Grisbi file if you have not yet done. "
msgstr ""
-#: src/tiers_onglet.c:873
+#: src/tiers_onglet.c:916
#, fuzzy
msgid "Choose a payee"
msgstr "Kies het te importeren bestand"
-#: src/tiers_onglet.c:875
+#: src/tiers_onglet.c:918
msgid ""
"Select one payee in the list that you modify to serve as the basis for your "
"research.\n"
@@ -9727,69 +9748,69 @@
msgstr ""
# vraag in popup na klikken van nieuwe begunstigde
-#: src/tiers_onglet.c:896
+#: src/tiers_onglet.c:939
#, fuzzy
msgid "Enter the new payee"
msgstr "Geef de naam van de begunstigde"
-#: src/tiers_onglet.c:898
+#: src/tiers_onglet.c:941
#, fuzzy
msgid "Enter the name of the new payee"
msgstr "Geef een naam voor de nieuwe sub-budgetregel"
-#: src/tiers_onglet.c:911
+#: src/tiers_onglet.c:954
#, fuzzy
msgid "Options"
msgstr "Uitgaven"
-#: src/tiers_onglet.c:913
+#: src/tiers_onglet.c:956
msgid "Extracting a number and save it in the field No Cheque/Virement"
msgstr ""
-#: src/tiers_onglet.c:919
+#: src/tiers_onglet.c:962
msgid "Save the payees in the notes"
msgstr ""
-#: src/tiers_onglet.c:952
+#: src/tiers_onglet.c:995
msgid "List of payees who will be modified"
msgstr ""
-#: src/tiers_onglet.c:994
+#: src/tiers_onglet.c:1037
#, fuzzy
msgid "Select"
msgstr "Selecteer alles"
-#: src/tiers_onglet.c:1002
+#: src/tiers_onglet.c:1045
#, fuzzy
msgid "Payee number"
msgstr "het cheque nummer"
-#: src/tiers_onglet.c:1012
+#: src/tiers_onglet.c:1055
#, fuzzy
msgid "Payee name"
msgstr "Totaal algemeen"
-#: src/tiers_onglet.c:1028
+#: src/tiers_onglet.c:1071
msgid "Total number of payees :"
msgstr ""
#. ajoute le nombre de tiers sélectionnés
-#: src/tiers_onglet.c:1045
+#: src/tiers_onglet.c:1088
#, fuzzy
msgid "Number of selected payees :"
msgstr "Verwijder begunstigde"
-#: src/tiers_onglet.c:1147
+#: src/tiers_onglet.c:1190
#, c-format
msgid "Payee sought : %s\n"
msgstr ""
-#: src/tiers_onglet.c:1153
+#: src/tiers_onglet.c:1196
#, fuzzy, c-format
msgid "New payee : %s"
msgstr "Nieuwe betalingsmethode"
-#: src/tiers_onglet.c:1229
+#: src/tiers_onglet.c:1272
#, c-format
msgid ""
"You are about to replace %d payees whose names contain %s\n"
@@ -9798,11 +9819,11 @@
"<span weight=\"bold\">Are you sure?</span>"
msgstr ""
-#: src/tiers_onglet.c:1393
+#: src/tiers_onglet.c:1436
msgid "You must choose a payee for searching."
msgstr ""
-#: src/tiers_onglet.c:1397
+#: src/tiers_onglet.c:1440
msgid "Beware you don't use one of models for the research."
msgstr ""
@@ -11443,9 +11464,6 @@
#~ msgid "Curent balance"
#~ msgstr "Huidig saldo"
-#~ msgid "Confirmation of transaction removal"
-#~ msgstr "Verwijderen van transactie bevestigen"
-
#~ msgid ""
#~ "You are currently trying to remove a transaction. There is no undo for "
#~ "this. Do you confirm the removal?"
Index: de.po
===================================================================
RCS file: /cvsroot/grisbi/grisbi/po/de.po,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- de.po 14 Mar 2009 19:17:21 -0000 1.66
+++ de.po 17 Mar 2009 22:05:32 -0000 1.67
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-14 12:38+0100\n"
+"POT-Creation-Date: 2009-03-17 21:51+0100\n"
"PO-Revision-Date: 2009-03-14 12:58+0100\n"
"Last-Translator: Martin Stromberger <mstromberger at aon.at>\n"
"Language-Team: deutsch <de at li.org>\n"
@@ -96,7 +96,8 @@
#: src/accueil.c:1668
#, 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:1672
msgid ""
@@ -348,7 +349,8 @@
#: 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"
@@ -430,7 +432,7 @@
#: src/export_csv.c:747 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1281 src/gsb_form_widget.c:400 src/gsb_reconcile.c:154
#: src/gsb_scheduler_list.c:331 src/gsb_transactions_list.c:143
-#: src/import.c:2882 src/import_csv.c:78 src/traitement_variables.c:74
+#: src/import.c:2906 src/import_csv.c:78 src/traitement_variables.c:74
msgid "Date"
msgstr "Datum"
@@ -733,7 +735,7 @@
msgstr "Eine neue Unterkategorie erstellen"
#: src/categories_onglet.c:480 src/etats_onglet.c:130 src/import.c:350
-#: src/import.c:3099 src/imputation_budgetaire.c:513 src/parametres.c:287
+#: src/import.c:3123 src/imputation_budgetaire.c:513 src/parametres.c:287
msgid "Import"
msgstr "Import"
@@ -848,7 +850,8 @@
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
@@ -1033,8 +1036,10 @@
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."
@@ -1344,12 +1349,12 @@
#. Transfer = Virement
#. Direct deposit remplacé par Transfert = Virement
-#: src/etats_affiche.c:1837 src/import.c:2349 src/import.c:2367
+#: src/etats_affiche.c:1837 src/import.c:2373 src/import.c:2391
msgid "Transfert"
msgstr "Umbuchung"
#: src/etats_affiche.c:1846 src/export_csv.c:561 src/gsb_data_category.c:1039
-#: src/gsb_form.c:740 src/gsb_form.c:2465 src/gsb_form.c:2837
+#: src/gsb_form.c:740 src/gsb_form.c:2476 src/gsb_form.c:2848
#: src/gsb_form_scheduler.c:321 src/gsb_transactions_list.c:3216
msgid "Split of transaction"
msgstr "Buchung splitten"
@@ -1404,7 +1409,7 @@
#: src/etats_config.c:687 src/etats_config.c:7193 src/export_csv.c:762
#: src/fenetre_principale.c:266 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1308 src/gsb_form_widget.c:420 src/gsb_scheduler_list.c:331
-#: src/gsb_transactions_list.c:145 src/import.c:2889 src/import_csv.c:80
+#: src/gsb_transactions_list.c:145 src/import.c:2913 src/import_csv.c:80
#: src/meta_payee.c:76 src/traitement_variables.c:76
msgid "Payee"
msgstr "Empfänger"
@@ -1721,7 +1726,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:2490
msgid "Select transactions only for given accounts"
@@ -1733,14 +1738,14 @@
#: src/etats_config.c:2581 src/etats_config.c:2848 src/etats_config.c:3138
#: src/etats_config.c:3951 src/etats_config.c:4147 src/etats_config.c:7512
-#: src/tiers_onglet.c:1296 src/tiers_onglet.c:1316
+#: src/tiers_onglet.c:1306 src/tiers_onglet.c:1326
msgid "Select all"
msgstr "Alle auswählen"
#. ajoute le bouton (dé)sélectionne tout
#: src/etats_config.c:2596 src/etats_config.c:2863 src/etats_config.c:3153
#: src/etats_config.c:3966 src/etats_config.c:4162 src/etats_config.c:7527
-#: src/tiers_onglet.c:1095 src/tiers_onglet.c:1298
+#: src/tiers_onglet.c:1105 src/tiers_onglet.c:1308
msgid "Unselect all"
msgstr "Alle abwählen"
@@ -1959,7 +1964,7 @@
#: src/etats_config.c:5310 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:2897
+#: src/gsb_transactions_list.c:150 src/import.c:2921
#: src/traitement_variables.c:81
msgid "Amount"
msgstr "Betrag"
@@ -2311,7 +2316,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:7421
msgid "Select the transactions by method of payment"
@@ -3846,7 +3851,7 @@
msgstr "Es werden alle Buchungen aus einem gewählten Bericht archiviert."
#: src/gsb_assistant_archive.c:354 src/gsb_data_payee.c:511
-#: src/gsb_form.c:2572 src/gsb_form.c:2573 src/navigation.c:1289
+#: src/gsb_form.c:2583 src/gsb_form.c:2584 src/navigation.c:1289
msgid "Report"
msgstr "Bericht"
@@ -3933,8 +3938,10 @@
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>"
@@ -3953,7 +3960,8 @@
"</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>"
@@ -4178,7 +4186,8 @@
#: src/gsb_assistant_file.c:492
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:564 src/navigation.c:1158
#: src/traitement_variables.c:284
@@ -4476,12 +4485,14 @@
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 ""
@@ -4495,12 +4506,15 @@
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>"
#: src/gsb_assistant_reconcile_config.c:959
#, c-format
@@ -4537,7 +4551,8 @@
#: src/gsb_assistant_reconcile_config.c:1316
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:418
msgid "None"
@@ -6102,7 +6117,8 @@
#: src/gsb_currency_config.c:641
#, c-format
msgid "Currency '%s' is used in current file. Grisbi can't delete it."
-msgstr "Die Währung '%s' ist in Verwendung und kann daher nicht gelöscht werden."
+msgstr ""
+"Die Währung '%s' ist in Verwendung und kann daher nicht gelöscht werden."
#: src/gsb_currency_config.c:822
msgid "Currency for payees tree"
@@ -6146,7 +6162,8 @@
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:1073
msgid "All fields are not filled in"
@@ -6202,8 +6219,10 @@
#: src/gsb_data_account.c:522
#, 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:1177
@@ -6256,7 +6275,8 @@
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>"
@@ -6265,7 +6285,8 @@
"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
@@ -6292,19 +6313,19 @@
"vorhanden."
#. Deposit = Dépôt
-#: src/gsb_data_payment.c:714 src/import.c:2331 src/plugins/ofx/ofx.c:451
+#: src/gsb_data_payment.c:714 src/import.c:2355 src/plugins/ofx/ofx.c:451
msgid "Deposit"
msgstr "Einzahlung"
#. pas trouvé de définition remplacé par carte de crédit
#. Point of sale = Point de vente remplacé par carte de crédit
-#: src/gsb_data_payment.c:723 src/import.c:2337 src/import.c:2343
+#: src/gsb_data_payment.c:723 src/import.c:2361 src/import.c:2367
msgid "Credit card"
msgstr "Kreditkarte"
#. Electronic payment remplacé par Direct debit = Prélèvement
#. Merchant initiated debit remplacé par Direct debit = Prélèvement
-#: src/gsb_data_payment.c:732 src/import.c:2355 src/import.c:2373
+#: src/gsb_data_payment.c:732 src/import.c:2379 src/import.c:2397
msgid "Direct debit"
msgstr "Barzahlung"
@@ -6574,7 +6595,8 @@
#: 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
@@ -6765,8 +6787,10 @@
#: src/gsb_file.c:795
#, 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:831
msgid "Name the accounts file"
@@ -6866,7 +6890,7 @@
msgid "Encryption plugin not found."
msgstr "Das Modul für die Verschlüsselung kann nicht gefunden werden."
-#: src/gsb_file_load.c:410 src/gsb_file_load.c:4364
+#: src/gsb_file_load.c:410 src/gsb_file_load.c:4370
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Diese Datei ist kein Grisbi-Datei...der Ladevorgang wird abgebrochen."
@@ -6883,7 +6907,7 @@
"%s"
#. we don't know here the release of that file, give the release needed
-#: src/gsb_file_load.c:7582
+#: src/gsb_file_load.c:7588
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
@@ -6892,7 +6916,7 @@
"Grisbi mit Version %s ist zum Ãffnen der Datei notwendig.\n"
"Sie verwenden Version %s."
-#: src/gsb_file_load.c:7621
+#: src/gsb_file_load.c:7627
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6903,11 +6927,11 @@
"Bevor Buchungen oder wichtige Informationen geändert werden sollten Sie "
"beachten, dass es sich um ein Archiv handelt."
-#: src/gsb_file_load.c:7622
+#: src/gsb_file_load.c:7628
msgid "Grisbi archive opened"
msgstr "Grisbi Archiv geöffnet"
-#: src/gsb_file_load.c:7714
+#: src/gsb_file_load.c:7720
#, c-format
msgid ""
"Your old file grisbi was saved as: \n"
@@ -7053,25 +7077,25 @@
msgid "Cheque/Transfer number"
msgstr "Nr"
-#: src/gsb_form.c:2157
+#: src/gsb_form.c:2168
msgid "No payee selected for this report."
msgstr "Für den Bericht wurden keine Empfänger ausgewählt."
-#: src/gsb_form.c:2415
+#: src/gsb_form.c:2426
msgid "You must enter a date."
msgstr "Sie müssen ein Datum eingeben."
-#: src/gsb_form.c:2422
+#: src/gsb_form.c:2433
#, c-format
msgid "Invalid date %s"
msgstr "Ungültiges Datum %s"
-#: src/gsb_form.c:2441
+#: src/gsb_form.c:2452
#, c-format
msgid "Invalid value date %s"
msgstr "Ungültiges Betragsdatum %s"
-#: src/gsb_form.c:2467
+#: src/gsb_form.c:2478
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
@@ -7079,11 +7103,12 @@
"Für eine Element einer Splitt-Buchung kann keine weitere Splitt-Buchung "
"erstellt werden."
-#: src/gsb_form.c:2500
-msgid "Cannot associate a transfer to a deleted account in a scheduled transaction."
+#: src/gsb_form.c:2511
+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:2507
+#: src/gsb_form.c:2518
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
@@ -7091,15 +7116,15 @@
"Das zugeordnete Konto für diese Umbuchung ist nicht mehr vorhanden oder "
"geschlossen."
-#: src/gsb_form.c:2515
+#: src/gsb_form.c:2526
msgid "Can't issue a transfer its own account."
msgstr "Eine Umbuchung auf das gleiche Konto ist nicht möglich."
-#: src/gsb_form.c:2520
+#: src/gsb_form.c:2531
msgid "Can't issue a transfer on a closed account."
msgstr "Eine Umbuchung auf ein geschlossenes Konto ist nicht möglich."
-#: src/gsb_form.c:2546
+#: src/gsb_form.c:2557
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -7110,7 +7135,7 @@
"jedoch sind keine Nummern vorhanden.\n"
"Soll der Vorgang fortgesetzt werden?"
-#: src/gsb_form.c:2560
+#: src/gsb_form.c:2571
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -7118,27 +7143,29 @@
"Achtung: Diese Schecknummer wird bereit benützt.\n"
"Soll der Vorgang fortgesetzt werden?"
-#: src/gsb_form.c:2580
+#: src/gsb_form.c:2591
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:2585
+#: src/gsb_form.c:2596
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:2596
+#: src/gsb_form.c:2607
msgid "The word \"Report\" is reserved. Please use another one."
msgstr "Das Wort \"Report\" ist reserviert, bitte ein anderes Wort verwenden."
-#: src/gsb_form.c:2603
+#: src/gsb_form.c:2614
msgid "Invalid multiple payee."
msgstr "Ungültige Gruppe von Empfängern."
-#: src/gsb_form.c:2860
+#: src/gsb_form.c:2871
msgid "Modifying a transaction"
msgstr "Eine Buchung bearbeiten"
-#: src/gsb_form.c:2861
+#: src/gsb_form.c:2872
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7151,7 +7178,7 @@
"Soll der Vorgang fortgesetzt werden?"
#. propose to configure the form
-#: src/gsb_form.c:3161
+#: src/gsb_form.c:3172
msgid "Configure the form"
msgstr "Buchungsformular Einstellungen"
@@ -7781,7 +7808,8 @@
#: 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
@@ -7982,7 +8010,8 @@
#: src/gsb_transactions_list.c:1818
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:1860
msgid "Impossible to delete an archived transaction."
@@ -8002,7 +8031,8 @@
#: src/gsb_transactions_list.c:1879
#, 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:1894
@@ -8182,11 +8212,11 @@
msgid "File name"
msgstr "Dateiname"
-#: src/import.c:526 src/import.c:608 src/import.c:3207 src/import.c:3230
+#: src/import.c:526 src/import.c:608 src/import.c:3244 src/import.c:3267
msgid "Unknown"
msgstr "Unbekannt"
-#: src/import.c:568 src/import.c:3310 src/import_csv.c:1045
+#: src/import.c:568 src/import.c:3347 src/import_csv.c:1045
#, c-format
msgid "Unable to read file: %s\n"
msgstr "Die Datei kann nicht gelesen werden: %s\n"
@@ -8368,7 +8398,7 @@
#. there is a difference between the imported account id and grisbi account id,
#. * ask to be sure
-#: src/import.c:1730
+#: src/import.c:1731
#, c-format
msgid ""
"The Grisbi's id account is %s, but the imported id account is %s.\n"
@@ -8385,48 +8415,65 @@
#. l'id du compte choisi et l'id du compte importé sont différents
#. on propose encore d'arrêter...
-#: src/import.c:1733 src/import.c:2515
+#: src/import.c:1734 src/import.c:2539
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:1963
+#: src/import.c:1968
+#, fuzzy
+msgid "Confirmation of transactions to be merged"
+msgstr "Import von Buchungen bestätigen - Grisbi"
+
+#: src/import.c:1971
msgid "Confirmation of importation of transactions"
msgstr "Import von Buchungen bestätigen - Grisbi"
-#: src/import.c:1975
+#: src/import.c:1987
+#, fuzzy
+msgid "Please select the transactions to be merged"
+msgstr "Buchung als Vorlage verwenden"
+
+#: src/import.c:1990
+#, fuzzy
msgid ""
-"Some imported transactions seem to be already saved. Please select the "
+"Some imported transactions seem to be already saved.Please select the "
"transactions to import."
msgstr ""
"Die aufgelisteten Buchungen sind bereits vorhanden - bitte treffen Sie eine "
"Auswahl welche Buchungen importiert werden sollen."
-#: src/import.c:2051
+#: src/import.c:2070
+#, fuzzy, c-format
+msgid "Transactions to be merged : %s ; %s ; %s"
+msgstr "Zu importierende Buchungen : %s ; %s ; %s"
+
+#: src/import.c:2075
#, c-format
msgid "Transactions to import : %s ; %s ; %s"
msgstr "Zu importierende Buchungen : %s ; %s ; %s"
-#: src/import.c:2090
+#: src/import.c:2114
#, c-format
msgid "Transaction found : %s ; %s ; %s ; %s"
msgstr "Buchungen gefunden : %s ; %s ; %s ; %s"
-#: src/import.c:2103
+#: src/import.c:2127
#, c-format
msgid "Transaction found : %s ; %s ; %s"
msgstr "Buchungen gefunden : %s ; %s ; %s"
#. Check = Chèque
-#: src/import.c:2317 src/plugins/ofx/ofx.c:431
+#: src/import.c:2341 src/plugins/ofx/ofx.c:431
msgid "Check"
msgstr "Ãberprüfen"
#. Cash withdrawal = retrait en liquide
-#: src/import.c:2361
+#: src/import.c:2385
msgid "Cash withdrawal"
msgstr "Barzahlung"
-#: src/import.c:2451
+#: src/import.c:2475
#, c-format
msgid ""
"Warning : the cheque number %ld is already used.\n"
@@ -8435,7 +8482,7 @@
"Achtung: Diese Schecknummer %ld wird bereit benützt.\n"
"Die Auswahl wird verworfen"
-#: src/import.c:2516
+#: src/import.c:2540
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 ?"
@@ -8444,48 +8491,53 @@
"entscheiden den Vorgang fortzusetzen wird die ID des Kontos geändert. Soll "
"der Vorgang fortgesetzt werden?"
-#: src/import.c:2792
+#: src/import.c:2816
msgid "Orphaned transactions"
msgstr "Buchungen auswählen - Grisbi"
-#: src/import.c:2805
+#: src/import.c:2829
msgid "Mark transactions you want to add to the list and click the add button"
msgstr ""
"Die Buchungen für den Import auswählen - mit 'Anwenden' werden die Buchungen "
"importiert."
-#: src/import.c:2874
+#: src/import.c:2898
msgid "Mark"
msgstr "Markieren"
-#: src/import.c:3075
+#: src/import.c:3099
#, c-format
msgid "%s #%d"
msgstr "%s #%d"
-#: src/import.c:3110
+#: src/import.c:3134
msgid "Threshold while matching transaction date during import (in days)"
msgstr "Datumsbereich in Tagen für den Import von Buchungen : "
-#: src/import.c:3136
+#: src/import.c:3160
+#, fuzzy
+msgid "merge transactions imported with planned transactions"
+msgstr "Buchung regelmäÃig ausführen"
+
+#: src/import.c:3173
msgid "automatically associate the category of the payee if it is possible"
msgstr ""
"Die Kategorien dem Empfänger automatisch zuordnen wenn die Möglichkeit "
"besteht"
-#: src/import.c:3149
+#: src/import.c:3186
msgid "Set the financial year"
msgstr "Geschäftsjahr Zuordnung"
-#: src/import.c:3150
+#: src/import.c:3187
msgid "According to the date"
msgstr "entsprechend Datum der Buchung"
-#: src/import.c:3151
+#: src/import.c:3188
msgid "According to the value date (if fail, try with the date)"
msgstr "entsprechend Datum der Durchführung"
-#: src/import.c:3295
+#: src/import.c:3332
#, c-format
msgid ""
"%s is neither an OFX file, neither a QIF file. Nothing will be done for that "
@@ -8494,7 +8546,7 @@
"%s ist keine Ofx oder Qif Datei, es werden keine Daten aus dieser Datei "
"importiert."
-#: src/import.c:3353
+#: src/import.c:3390
#, c-format
msgid ""
"%s was not imported successfully. An error occured while getting the "
@@ -8503,42 +8555,42 @@
"%s konnte nicht erfolgreich importiert werden. Es ist ein Fehler beim "
"Ermitteln der Buchungen aufgetreten."
-#: src/import.c:3431
+#: src/import.c:3468
msgid "Import a file with a rule"
msgstr "Regelbasierender Import - Grisbi"
#. text for paddingbox
-#: src/import.c:3442
+#: src/import.c:3479
#, c-format
msgid "Properties of the rule : %s\n"
msgstr "Eigenschaften der Importregel : %s\n"
-#: src/import.c:3461
+#: src/import.c:3498
#, 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:3464
+#: src/import.c:3501
#, c-format
msgid "Imported transactions will mark transactions in the account %s.\n"
msgstr "Die importierten Buchungen erhalten eine Markierung im Konto %s.\n"
#. textstring 2
-#: src/import.c:3468
+#: src/import.c:3505
#, c-format
msgid "Currency to import is %s.\n"
msgstr "Die Währung für den Import ist %s.\n"
-#: src/import.c:3474
+#: src/import.c:3511
msgid "Amounts of the transactions will be inverted.\n"
msgstr "Die Beträge der Buchungen werden invertiert.\n"
#. label filename
-#: src/import.c:3484
+#: src/import.c:3521
msgid "Name of the file to import "
msgstr "Importdatei"
-#: src/import.c:3578
+#: src/import.c:3615
#, c-format
msgid "Unable to create tmp file: %s\n"
msgstr "Die temporäre Datei kann nicht erstellt werden: %s\n"
@@ -9168,7 +9220,8 @@
#: src/parametres.c:940
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:941
msgid "Warn/Execute the scheduled transactions of the month"
@@ -9310,7 +9363,8 @@
#: src/plugins/ofx/ofx.c:212
msgid "OFX processing returned following message:\n"
-msgstr "Bei der Verarbeitung der Ofx-Datei wurde folgende Warnung zurückgegeben:\n"
+msgstr ""
+"Bei der Verarbeitung der Ofx-Datei wurde folgende Warnung zurückgegeben:\n"
#: src/plugins/ofx/ofx.c:218
msgid "OFX processing ended in a warning message which is not valid."
@@ -9318,7 +9372,8 @@
#: src/plugins/ofx/ofx.c:224
msgid "OFX processing returned following error message:\n"
-msgstr "Bei der Verarbeitung der Ofx-Datei wurde folgender Fehler zurückgegeben:\n"
+msgstr ""
+"Bei der Verarbeitung der Ofx-Datei wurde folgender Fehler zurückgegeben:\n"
#: src/plugins/ofx/ofx.c:230
msgid "OFX processing returned an error message which is not valid."
@@ -9696,7 +9751,7 @@
"\n"
"Sollen diese Empfänger gelöscht werden?"
-#: src/tiers_onglet.c:387 src/tiers_onglet.c:852
+#: src/tiers_onglet.c:387 src/tiers_onglet.c:862
#, c-format
msgid "Removed %d payees."
msgstr "Es wurden %d Empfänger gelöscht."
@@ -9732,13 +9787,14 @@
"\n"
"Achtung: Die Ãnderungen vom Assistenten sind nicht reversibel.\n"
"\n"
-"Es wird empfohlen eine Sicherungskopie zu erstellen bevor mit dem Assistenten Daten geändert werden."
+"Es wird empfohlen eine Sicherungskopie zu erstellen bevor mit dem "
+"Assistenten Daten geändert werden."
-#: src/tiers_onglet.c:906
+#: src/tiers_onglet.c:916
msgid "Choose a payee"
msgstr "Einen Empfänger auswählen"
-#: src/tiers_onglet.c:908
+#: src/tiers_onglet.c:918
msgid ""
"Select one payee in the list that you modify to serve as the basis for your "
"research.\n"
@@ -9748,69 +9804,70 @@
"%string%\n"
"string_1%string_2"
msgstr ""
-"Einen Empfänger auswählen - dieser Empfänger ist die Basis für weitere Aktionen.\n"
+"Einen Empfänger auswählen - dieser Empfänger ist die Basis für weitere "
+"Aktionen.\n"
"Das '%' Zeichen kann als \"Joker\" verwendet werden, Beispiele:\n"
"Zeichenkette%\n"
"%Zeichenkette\n"
"%Zeichenkette%\n"
"Zeichenkette%Zeichenkette"
-#: src/tiers_onglet.c:929
+#: src/tiers_onglet.c:939
msgid "Enter the new payee"
msgstr "Den Empfänger eingeben"
-#: src/tiers_onglet.c:931
+#: src/tiers_onglet.c:941
msgid "Enter the name of the new payee"
msgstr "Den Namen vom neuen Empfänger eingeben"
-#: src/tiers_onglet.c:944
+#: src/tiers_onglet.c:954
msgid "Options"
msgstr "Optionen"
-#: src/tiers_onglet.c:946
+#: src/tiers_onglet.c:956
msgid "Extracting a number and save it in the field No Cheque/Virement"
msgstr "Eine Zahl ermitteln und in das Feld für die Schecknummer einfügen"
-#: src/tiers_onglet.c:952
+#: src/tiers_onglet.c:962
msgid "Save the payees in the notes"
msgstr "Die Empfänger in das Feld Notizen eintragen"
-#: src/tiers_onglet.c:985
+#: src/tiers_onglet.c:995
msgid "List of payees who will be modified"
msgstr "Auflistung der Empfänger welche geändert werden"
-#: src/tiers_onglet.c:1027
+#: src/tiers_onglet.c:1037
msgid "Select"
msgstr "Auswählen"
-#: src/tiers_onglet.c:1035
+#: src/tiers_onglet.c:1045
msgid "Payee number"
msgstr "Empfänger Nummer"
-#: src/tiers_onglet.c:1045
+#: src/tiers_onglet.c:1055
msgid "Payee name"
msgstr "Empfänger Name"
-#: src/tiers_onglet.c:1061
+#: src/tiers_onglet.c:1071
msgid "Total number of payees :"
msgstr "Gesamtanzahl der Empfänger :"
#. ajoute le nombre de tiers sélectionnés
-#: src/tiers_onglet.c:1078
+#: src/tiers_onglet.c:1088
msgid "Number of selected payees :"
msgstr "Anzahl der ausgewählten Empfänger :"
-#: src/tiers_onglet.c:1180
+#: src/tiers_onglet.c:1190
#, c-format
msgid "Payee sought : %s\n"
msgstr "Empfänger gesucht :%s\n"
-#: src/tiers_onglet.c:1186
+#: src/tiers_onglet.c:1196
#, c-format
msgid "New payee : %s"
msgstr "Neuer Empfänger : %s"
-#: src/tiers_onglet.c:1262
+#: src/tiers_onglet.c:1272
#, c-format
msgid ""
"You are about to replace %d payees whose names contain %s\n"
@@ -9823,11 +9880,11 @@
"\n"
"<span weight=\"bold\">Soll der Vorgang fortgesetzt werden?</span>"
-#: src/tiers_onglet.c:1426
+#: src/tiers_onglet.c:1436
msgid "You must choose a payee for searching."
msgstr "Es muss der Name von einem Empfänger für die Suche eingegeben werden."
-#: src/tiers_onglet.c:1430
+#: src/tiers_onglet.c:1440
msgid "Beware you don't use one of models for the research."
msgstr "Bitte beachten dass keine Vorlage für die Suche verwendet wird."
@@ -9878,7 +9935,8 @@
#: 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)"
@@ -9919,4 +9977,3 @@
#: src/utils_font.c:199
msgid "No font defined"
msgstr "Keine Schrift definiert"
-
Index: pt_BR.po
===================================================================
RCS file: /cvsroot/grisbi/grisbi/po/pt_BR.po,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- pt_BR.po 13 Mar 2009 20:15:37 -0000 1.24
+++ pt_BR.po 17 Mar 2009 22:05:33 -0000 1.25
@@ -44,7 +44,7 @@
msgstr ""
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 20:58+0100\n"
+"POT-Creation-Date: 2009-03-17 21:51+0100\n"
"PO-Revision-Date: 2005-12-19 09:07-0200\n"
"Last-Translator: \n"
"Language-Team: <pt at li.org>\n"
@@ -484,7 +484,7 @@
#: src/gsb_assistant_reconcile_config.c:612
#: src/gsb_payment_method_config.c:159 src/gsb_reconcile_config.c:96
#: src/gsb_scheduler_list.c:331 src/imputation_budgetaire.c:164
-#: src/tiers_onglet.c:226
+#: src/tiers_onglet.c:227
msgid "Account"
msgstr "Conta"
@@ -497,13 +497,13 @@
#: src/export_csv.c:747 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1281 src/gsb_form_widget.c:400 src/gsb_reconcile.c:154
#: src/gsb_scheduler_list.c:331 src/gsb_transactions_list.c:143
-#: src/import.c:2882 src/import_csv.c:78 src/traitement_variables.c:74
+#: src/import.c:2906 src/import_csv.c:78 src/traitement_variables.c:74
msgid "Date"
msgstr "Data"
#. Description entry
#: src/balance_estimate_tab.c:300 src/etats_onglet.c:287
-#: src/tiers_onglet.c:591
+#: src/tiers_onglet.c:592
msgid "Description"
msgstr "Descrição"
@@ -552,7 +552,7 @@
#: src/barre_outils.c:107 src/barre_outils.c:453 src/categories_onglet.c:499
#: src/etats_onglet.c:173 src/imputation_budgetaire.c:532
-#: src/tiers_onglet.c:307
+#: src/tiers_onglet.c:308
#, fuzzy
msgid "Delete"
msgstr "Selecionar"
@@ -592,7 +592,7 @@
msgstr "Organizar lista de lançamentos"
#: src/barre_outils.c:153 src/barre_outils.c:513 src/categories_onglet.c:518
-#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:334
+#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:335
msgid "View"
msgstr "Visualizar"
@@ -624,7 +624,7 @@
msgstr "Modo três linhas"
#: src/barre_outils.c:237 src/categories_onglet.c:562
-#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:417
+#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:418
#, fuzzy
msgid "Complete view"
msgstr "Divisão incompleta"
@@ -745,7 +745,7 @@
#: src/categories_onglet.c:160 src/export_csv.c:774 src/gsb_reconcile.c:157
#: src/gsb_scheduler_list.c:332 src/gsb_transactions_list.c:149
#: src/gsb_transactions_list.c:2867 src/import_csv.c:86
-#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:235
+#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:236
#: src/traitement_variables.c:80
msgid "Balance"
msgstr "Saldo"
@@ -825,7 +825,7 @@
msgstr "Informe um nome para a nova sub-categoria"
#: src/categories_onglet.c:480 src/etats_onglet.c:130 src/import.c:350
-#: src/import.c:3099 src/imputation_budgetaire.c:513 src/parametres.c:287
+#: src/import.c:3123 src/imputation_budgetaire.c:513 src/parametres.c:287
msgid "Import"
msgstr "Importar"
@@ -851,7 +851,7 @@
#: src/categories_onglet.c:508 src/etats_onglet.c:184
#: src/fenetre_principale.c:251 src/imputation_budgetaire.c:542
-#: src/tiers_onglet.c:316
+#: src/tiers_onglet.c:317
#, fuzzy
msgid "Properties"
msgstr "CaracterÃsticas da moeda"
@@ -861,7 +861,7 @@
msgid "Edit selected category"
msgstr "a categoria"
-#: src/categories_onglet.c:522 src/tiers_onglet.c:338
+#: src/categories_onglet.c:522 src/tiers_onglet.c:339
#, fuzzy
msgid "Change view mode"
msgstr "Modo uma linha"
@@ -879,7 +879,7 @@
#: src/categories_onglet.c:607 src/categories_onglet.c:611
#: src/imputation_budgetaire.c:640 src/imputation_budgetaire.c:645
-#: src/tiers_onglet.c:553
+#: src/tiers_onglet.c:554
#, fuzzy, c-format
msgid "Properties for %s"
msgstr "Resultado para %s"
@@ -909,7 +909,7 @@
#: src/gsb_bank.c:832 src/gsb_currency_config.c:355 src/gsb_fyear_config.c:191
#: src/gsb_fyear_config.c:278 src/gsb_payment_method_config.c:239
#: src/gsb_reconcile_config.c:179 src/gsb_transactions_list.c:1733
-#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:578
+#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:579
msgid "Name"
msgstr "Nome"
@@ -1423,12 +1423,12 @@
#. Transfer = Virement
#. Direct deposit remplacé par Transfert = Virement
-#: src/etats_affiche.c:1837 src/import.c:2349 src/import.c:2367
+#: src/etats_affiche.c:1837 src/import.c:2373 src/import.c:2391
msgid "Transfert"
msgstr "Transferir"
#: src/etats_affiche.c:1846 src/export_csv.c:561 src/gsb_data_category.c:1039
-#: src/gsb_form.c:740 src/gsb_form.c:2465 src/gsb_form.c:2837
+#: src/gsb_form.c:740 src/gsb_form.c:2476 src/gsb_form.c:2848
#: src/gsb_form_scheduler.c:321 src/gsb_transactions_list.c:3216
msgid "Split of transaction"
msgstr "Divisão do lançamento"
@@ -1484,7 +1484,7 @@
#: src/etats_config.c:687 src/etats_config.c:7193 src/export_csv.c:762
#: src/fenetre_principale.c:266 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1308 src/gsb_form_widget.c:420 src/gsb_scheduler_list.c:331
-#: src/gsb_transactions_list.c:145 src/import.c:2889 src/import_csv.c:80
+#: src/gsb_transactions_list.c:145 src/import.c:2913 src/import_csv.c:80
#: src/meta_payee.c:76 src/traitement_variables.c:76
#, fuzzy
msgid "Payee"
@@ -1825,14 +1825,14 @@
#: src/etats_config.c:2581 src/etats_config.c:2848 src/etats_config.c:3138
#: src/etats_config.c:3951 src/etats_config.c:4147 src/etats_config.c:7512
-#: src/tiers_onglet.c:1263 src/tiers_onglet.c:1283
+#: src/tiers_onglet.c:1306 src/tiers_onglet.c:1326
msgid "Select all"
msgstr "Selecionar todas"
#. ajoute le bouton (dé)sélectionne tout
#: src/etats_config.c:2596 src/etats_config.c:2863 src/etats_config.c:3153
#: src/etats_config.c:3966 src/etats_config.c:4162 src/etats_config.c:7527
-#: src/tiers_onglet.c:1062 src/tiers_onglet.c:1265
+#: src/tiers_onglet.c:1105 src/tiers_onglet.c:1308
msgid "Unselect all"
msgstr "Desselecionar todas"
@@ -1950,7 +1950,7 @@
#. set the title
#: src/etats_config.c:4041 src/navigation.c:290 src/navigation.c:1228
-#: src/tiers_onglet.c:214
+#: src/tiers_onglet.c:215
#, fuzzy
msgid "Payees"
msgstr "Dias"
@@ -2072,7 +2072,7 @@
#: src/etats_config.c:5310 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:2897
+#: src/gsb_transactions_list.c:150 src/import.c:2921
#: src/traitement_variables.c:81
msgid "Amount"
msgstr "Valor"
@@ -3941,7 +3941,7 @@
msgstr ""
#: src/gsb_assistant_archive.c:354 src/gsb_data_payee.c:511
-#: src/gsb_form.c:2572 src/gsb_form.c:2573 src/navigation.c:1289
+#: src/gsb_form.c:2583 src/gsb_form.c:2584 src/navigation.c:1289
msgid "Report"
msgstr "Relatório"
@@ -6300,19 +6300,19 @@
"Lançamento #%d deveria ter uma contra-lançamento #%d, mas esta não existe.\n"
#. Deposit = Dépôt
-#: src/gsb_data_payment.c:714 src/import.c:2331 src/plugins/ofx/ofx.c:451
+#: src/gsb_data_payment.c:714 src/import.c:2355 src/plugins/ofx/ofx.c:451
msgid "Deposit"
msgstr "Depósito"
#. pas trouvé de définition remplacé par carte de crédit
#. Point of sale = Point de vente remplacé par carte de crédit
-#: src/gsb_data_payment.c:723 src/import.c:2337 src/import.c:2343
+#: src/gsb_data_payment.c:723 src/import.c:2361 src/import.c:2367
msgid "Credit card"
msgstr "Cartão de crédito"
#. Electronic payment remplacé par Direct debit = Prélèvement
#. Merchant initiated debit remplacé par Direct debit = Prélèvement
-#: src/gsb_data_payment.c:732 src/import.c:2355 src/import.c:2373
+#: src/gsb_data_payment.c:732 src/import.c:2379 src/import.c:2397
msgid "Direct debit"
msgstr "Débito direto"
@@ -6839,7 +6839,7 @@
msgid "Encryption plugin not found."
msgstr "Conta %s não encontrada.\n"
-#: src/gsb_file_load.c:410 src/gsb_file_load.c:4364
+#: src/gsb_file_load.c:410 src/gsb_file_load.c:4370
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Este arquivo não é um relatório do Grisbi"
@@ -6854,14 +6854,14 @@
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: src/gsb_file_load.c:7582
+#: src/gsb_file_load.c:7588
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "Grisbi versão %s é necessário para abrir este arquivo"
-#: src/gsb_file_load.c:7621
+#: src/gsb_file_load.c:7627
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6869,12 +6869,12 @@
"transactions or important informations."
msgstr ""
-#: src/gsb_file_load.c:7622
+#: src/gsb_file_load.c:7628
#, fuzzy
msgid "Grisbi archive opened"
msgstr "Preferências"
-#: src/gsb_file_load.c:7714
+#: src/gsb_file_load.c:7720
#, c-format
msgid ""
"Your old file grisbi was saved as: \n"
@@ -7005,53 +7005,53 @@
msgid "Cheque/Transfer number"
msgstr "Número do Cheque/Ordem de Pagamento"
-#: src/gsb_form.c:2157
+#: src/gsb_form.c:2168
#, fuzzy
msgid "No payee selected for this report."
msgstr "Nenhum terceiro selecionado para este relatório."
-#: src/gsb_form.c:2415
+#: src/gsb_form.c:2426
msgid "You must enter a date."
msgstr "Você deve informar uma data."
-#: src/gsb_form.c:2422
+#: src/gsb_form.c:2433
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "Data inválida"
-#: src/gsb_form.c:2441
+#: src/gsb_form.c:2452
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "Data inválida."
-#: src/gsb_form.c:2467
+#: src/gsb_form.c:2478
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: src/gsb_form.c:2500
+#: src/gsb_form.c:2511
#, fuzzy
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr "Converter lançamento para lançamentos agendados"
-#: src/gsb_form.c:2507
+#: src/gsb_form.c:2518
#, fuzzy
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr "A conta associadas para esta transferência é inválida"
-#: src/gsb_form.c:2515
+#: src/gsb_form.c:2526
msgid "Can't issue a transfer its own account."
msgstr "Não é possÃvel fazer uma transferência para a própria conta."
-#: src/gsb_form.c:2520
+#: src/gsb_form.c:2531
msgid "Can't issue a transfer on a closed account."
msgstr "Não é possÃvel efetuar uma transferência em uma conta fechada."
-#: src/gsb_form.c:2546
+#: src/gsb_form.c:2557
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -7061,7 +7061,7 @@
"não contém nenhum número.\n"
"Continuar mesmo assim ?"
-#: src/gsb_form.c:2560
+#: src/gsb_form.c:2571
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -7069,31 +7069,31 @@
"Atenção: este número de cheque já foi usado.\n"
"Continuar mesmo assim ?"
-#: src/gsb_form.c:2580
+#: src/gsb_form.c:2591
#, fuzzy
msgid "A transaction with a multiple payee must be a new one."
msgstr "Cada lançamento com vários terceiros deverá ser única."
-#: src/gsb_form.c:2585
+#: src/gsb_form.c:2596
#, fuzzy
msgid "A transaction with a multiple payee cannot be a split child."
msgstr "Cada lançamento com vários terceiros deverá ser única."
-#: src/gsb_form.c:2596
+#: src/gsb_form.c:2607
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: src/gsb_form.c:2603
+#: src/gsb_form.c:2614
#, fuzzy
msgid "Invalid multiple payee."
msgstr "Vários terceiros inválido"
-#: src/gsb_form.c:2860
+#: src/gsb_form.c:2871
#, fuzzy
msgid "Modifying a transaction"
msgstr "Editar lançamento"
-#: src/gsb_form.c:2861
+#: src/gsb_form.c:2872
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7103,7 +7103,7 @@
msgstr ""
#. propose to configure the form
-#: src/gsb_form.c:3161
+#: src/gsb_form.c:3172
msgid "Configure the form"
msgstr ""
@@ -8116,11 +8116,11 @@
msgid "File name"
msgstr "Nome do titular"
-#: src/import.c:526 src/import.c:608 src/import.c:3207 src/import.c:3230
+#: src/import.c:526 src/import.c:608 src/import.c:3244 src/import.c:3267
msgid "Unknown"
msgstr "Desconhecido"
-#: src/import.c:568 src/import.c:3310 src/import_csv.c:1045
+#: src/import.c:568 src/import.c:3347 src/import_csv.c:1045
#, fuzzy, c-format
msgid "Unable to read file: %s\n"
msgstr "Não posso abrir arquivo '%s': %s"
@@ -8284,7 +8284,7 @@
#. there is a difference between the imported account id and grisbi account id,
#. * ask to be sure
-#: src/import.c:1730
+#: src/import.c:1731
#, fuzzy, c-format
msgid ""
"The Grisbi's id account is %s, but the imported id account is %s.\n"
@@ -8298,48 +8298,64 @@
#. l'id du compte choisi et l'id du compte importé sont différents
#. on propose encore d'arrêter...
-#: src/import.c:1733 src/import.c:2515
+#: src/import.c:1734 src/import.c:2539
msgid "The id of the imported and chosen accounts are different"
msgstr "Os códigos da conta importada e da alterada são diferentes"
-#: src/import.c:1963
+#: src/import.c:1968
+#, fuzzy
+msgid "Confirmation of transactions to be merged"
+msgstr "Confirmação da importação dos lançamentos"
+
+#: src/import.c:1971
msgid "Confirmation of importation of transactions"
msgstr "Confirmação da importação dos lançamentos"
-#: src/import.c:1975
+#: src/import.c:1987
+#, fuzzy
+msgid "Please select the transactions to be merged"
+msgstr "Use os lançamentos como modelo"
+
+#: src/import.c:1990
+#, fuzzy
msgid ""
-"Some imported transactions seem to be already saved. Please select the "
+"Some imported transactions seem to be already saved.Please select the "
"transactions to import."
msgstr ""
"Alguns lançamentos importados parecem já ter sido salvos. Por favor, "
"selecione os lançamentos para importar."
-#: src/import.c:2051
+#: src/import.c:2070
+#, fuzzy, c-format
+msgid "Transactions to be merged : %s ; %s ; %s"
+msgstr "Lançamentos a importar : %02d/%02d/%04d ; %s ; %4.2f"
+
+#: src/import.c:2075
#, fuzzy, c-format
msgid "Transactions to import : %s ; %s ; %s"
msgstr "Lançamentos a importar : %02d/%02d/%04d ; %s ; %4.2f"
-#: src/import.c:2090
+#: src/import.c:2114
#, fuzzy, c-format
msgid "Transaction found : %s ; %s ; %s ; %s"
msgstr "Lançamento não encontrado : %02d/%02d/%04d ; %s ; %4.2f ; %s"
-#: src/import.c:2103
+#: src/import.c:2127
#, fuzzy, c-format
msgid "Transaction found : %s ; %s ; %s"
msgstr "Lançamento encontrado : %02d/%02d/%04d ; %s ; %4.2f"
#. Check = Chèque
-#: src/import.c:2317 src/plugins/ofx/ofx.c:431
+#: src/import.c:2341 src/plugins/ofx/ofx.c:431
msgid "Check"
msgstr "Checar"
#. Cash withdrawal = retrait en liquide
-#: src/import.c:2361
+#: src/import.c:2385
msgid "Cash withdrawal"
msgstr ""
-#: src/import.c:2451
+#: src/import.c:2475
#, fuzzy, c-format
msgid ""
"Warning : the cheque number %ld is already used.\n"
@@ -8348,7 +8364,7 @@
"Atenção: este número de cheque já foi usado.\n"
"Continuar mesmo assim ?"
-#: src/import.c:2516
+#: src/import.c:2540
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 ?"
@@ -8356,99 +8372,104 @@
"Talvez você escolheu a conta errada. Se você escolher continuar o código da "
"conta será alterado. Você tem certeza que quer continuar ?"
-#: src/import.c:2792
+#: src/import.c:2816
msgid "Orphaned transactions"
msgstr "Lançamentos órfãs"
-#: src/import.c:2805
+#: src/import.c:2829
msgid "Mark transactions you want to add to the list and click the add button"
msgstr ""
"Selecione os lançamentos que você quer adicionar a lista e clique no botão "
"[Adicionar] "
-#: src/import.c:2874
+#: src/import.c:2898
msgid "Mark"
msgstr "Marcar"
-#: src/import.c:3075
+#: src/import.c:3099
#, fuzzy, c-format
msgid "%s #%d"
msgstr "%s %d"
-#: src/import.c:3110
+#: src/import.c:3134
msgid "Threshold while matching transaction date during import (in days)"
msgstr ""
-#: src/import.c:3136
+#: src/import.c:3160
+#, fuzzy
+msgid "merge transactions imported with planned transactions"
+msgstr "Converter lançamento para lançamentos agendados"
+
+#: src/import.c:3173
msgid "automatically associate the category of the payee if it is possible"
msgstr ""
-#: src/import.c:3149
+#: src/import.c:3186
#, fuzzy
msgid "Set the financial year"
msgstr "Alterar o ano contábil"
-#: src/import.c:3150
+#: src/import.c:3187
#, fuzzy
msgid "According to the date"
msgstr "de acordo com a data da lançamento"
-#: src/import.c:3151
+#: src/import.c:3188
msgid "According to the value date (if fail, try with the date)"
msgstr ""
-#: src/import.c:3295
+#: src/import.c:3332
#, c-format
msgid ""
"%s is neither an OFX file, neither a QIF file. Nothing will be done for that "
"file."
msgstr ""
-#: src/import.c:3353
+#: src/import.c:3390
#, c-format
msgid ""
"%s was not imported successfully. An error occured while getting the "
"transactions."
msgstr ""
-#: src/import.c:3431
+#: src/import.c:3468
msgid "Import a file with a rule"
msgstr ""
#. text for paddingbox
-#: src/import.c:3442
+#: src/import.c:3479
#, fuzzy, c-format
msgid "Properties of the rule : %s\n"
msgstr "Resultado para %s"
-#: src/import.c:3461
+#: src/import.c:3498
#, fuzzy, c-format
msgid "Imported transactions will be added to the account %s.\n"
msgstr "Todas os lançamentos serão convertidas para a moeda desta conta."
-#: src/import.c:3464
+#: src/import.c:3501
#, fuzzy, c-format
msgid "Imported transactions will mark transactions in the account %s.\n"
msgstr "A divisão do lançamento é uma transferência para esta conta.\n"
#. textstring 2
-#: src/import.c:3468
+#: src/import.c:3505
#, fuzzy, c-format
msgid "Currency to import is %s.\n"
msgstr "CaracterÃsticas da moeda"
-#: src/import.c:3474
+#: src/import.c:3511
#, fuzzy
msgid "Amounts of the transactions will be inverted.\n"
msgstr "Lançamentos automáticos agendados encerrados"
#. label filename
-#: src/import.c:3484
+#: src/import.c:3521
#, fuzzy
msgid "Name of the file to import "
msgstr "Nome do arquivo de contas"
-#: src/import.c:3578
+#: src/import.c:3615
#, fuzzy, c-format
msgid "Unable to create tmp file: %s\n"
msgstr "Não posso abrir arquivo '%s': %s"
@@ -8946,7 +8967,7 @@
msgstr "Nenhuma sub-categoria"
#. * Find a unique name for payee
-#: src/meta_payee.c:320 src/tiers_onglet.c:299
+#: src/meta_payee.c:320 src/tiers_onglet.c:300
#, fuzzy
msgid "New payee"
msgstr "Nova forma de pagamento"
@@ -9618,41 +9639,41 @@
msgid "Error opening file '%s'"
msgstr "Erro abrindo arquivo '%s'."
-#: src/tiers_onglet.c:303
+#: src/tiers_onglet.c:304
#, fuzzy
msgid "Create a new payee"
msgstr "Criar uma nova conta"
-#: src/tiers_onglet.c:312
+#: src/tiers_onglet.c:313
#, fuzzy
msgid "Delete selected payee"
msgstr "Apagar um terceiro"
-#: src/tiers_onglet.c:321
+#: src/tiers_onglet.c:322
msgid "Edit selected payee"
msgstr ""
-#: src/tiers_onglet.c:325
+#: src/tiers_onglet.c:326
#, fuzzy
msgid "Remove unused payees"
msgstr "Nome do arquivo de contas"
-#: src/tiers_onglet.c:329 src/tiers_onglet.c:373
+#: src/tiers_onglet.c:330 src/tiers_onglet.c:374
#, fuzzy
msgid "Remove orphan payees"
msgstr "Nome do arquivo de contas"
-#: src/tiers_onglet.c:343
+#: src/tiers_onglet.c:344
#, fuzzy
msgid "Manage payees"
msgstr "Página inicial"
-#: src/tiers_onglet.c:347 src/tiers_onglet.c:729
+#: src/tiers_onglet.c:348 src/tiers_onglet.c:730
#, fuzzy
msgid "Manage the payees"
msgstr "Detalhes das categorias"
-#: src/tiers_onglet.c:374
+#: src/tiers_onglet.c:375
msgid ""
"This will remove all the payees wich are not used in any transactions. "
"Payees linked to an archived transactions will not be removed, even if not "
@@ -9661,29 +9682,29 @@
"Are you sure you want to do that?"
msgstr ""
-#: src/tiers_onglet.c:386 src/tiers_onglet.c:819
+#: src/tiers_onglet.c:387 src/tiers_onglet.c:862
#, c-format
msgid "Removed %d payees."
msgstr ""
#. Edit transaction
-#: src/tiers_onglet.c:411
+#: src/tiers_onglet.c:412
msgid "Payee view"
msgstr ""
-#: src/tiers_onglet.c:633
+#: src/tiers_onglet.c:634
#, c-format
msgid ""
"You tried to rename current payee to '%s' but this payee already exists. "
"Please choose another name."
msgstr ""
-#: src/tiers_onglet.c:637
+#: src/tiers_onglet.c:638
#, fuzzy
msgid "Payee already exists"
msgstr "Arquivo já existe"
-#: src/tiers_onglet.c:730
+#: src/tiers_onglet.c:731
msgid ""
"This wizard will help you to simplify the list of payees.\n"
"\n"
@@ -9692,12 +9713,12 @@
"It is better to make a backup of your Grisbi file if you have not yet done. "
msgstr ""
-#: src/tiers_onglet.c:873
+#: src/tiers_onglet.c:916
#, fuzzy
msgid "Choose a payee"
msgstr "Selecionar arquivo para importar"
-#: src/tiers_onglet.c:875
+#: src/tiers_onglet.c:918
msgid ""
"Select one payee in the list that you modify to serve as the basis for your "
"research.\n"
@@ -9708,69 +9729,69 @@
"string_1%string_2"
msgstr ""
-#: src/tiers_onglet.c:896
+#: src/tiers_onglet.c:939
#, fuzzy
msgid "Enter the new payee"
msgstr "Informe um nome para o novo terceiro"
-#: src/tiers_onglet.c:898
+#: src/tiers_onglet.c:941
#, fuzzy
msgid "Enter the name of the new payee"
msgstr "Informe o nome para o novo sub-orçamento"
-#: src/tiers_onglet.c:911
+#: src/tiers_onglet.c:954
#, fuzzy
msgid "Options"
msgstr "Despesas"
-#: src/tiers_onglet.c:913
+#: src/tiers_onglet.c:956
msgid "Extracting a number and save it in the field No Cheque/Virement"
msgstr ""
-#: src/tiers_onglet.c:919
+#: src/tiers_onglet.c:962
msgid "Save the payees in the notes"
msgstr ""
-#: src/tiers_onglet.c:952
+#: src/tiers_onglet.c:995
msgid "List of payees who will be modified"
msgstr ""
-#: src/tiers_onglet.c:994
+#: src/tiers_onglet.c:1037
#, fuzzy
msgid "Select"
msgstr "Selecionar todas"
-#: src/tiers_onglet.c:1002
+#: src/tiers_onglet.c:1045
#, fuzzy
msgid "Payee number"
msgstr "o cheque número"
-#: src/tiers_onglet.c:1012
+#: src/tiers_onglet.c:1055
#, fuzzy
msgid "Payee name"
msgstr "Total geral"
-#: src/tiers_onglet.c:1028
+#: src/tiers_onglet.c:1071
msgid "Total number of payees :"
msgstr ""
#. ajoute le nombre de tiers sélectionnés
-#: src/tiers_onglet.c:1045
+#: src/tiers_onglet.c:1088
#, fuzzy
msgid "Number of selected payees :"
msgstr "Apagar um terceiro"
-#: src/tiers_onglet.c:1147
+#: src/tiers_onglet.c:1190
#, c-format
msgid "Payee sought : %s\n"
msgstr ""
-#: src/tiers_onglet.c:1153
+#: src/tiers_onglet.c:1196
#, fuzzy, c-format
msgid "New payee : %s"
msgstr "Nova forma de pagamento"
-#: src/tiers_onglet.c:1229
+#: src/tiers_onglet.c:1272
#, c-format
msgid ""
"You are about to replace %d payees whose names contain %s\n"
@@ -9779,11 +9800,11 @@
"<span weight=\"bold\">Are you sure?</span>"
msgstr ""
-#: src/tiers_onglet.c:1393
+#: src/tiers_onglet.c:1436
msgid "You must choose a payee for searching."
msgstr ""
-#: src/tiers_onglet.c:1397
+#: src/tiers_onglet.c:1440
msgid "Beware you don't use one of models for the research."
msgstr ""
Index: es.po
===================================================================
RCS file: /cvsroot/grisbi/grisbi/po/es.po,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- es.po 13 Mar 2009 20:15:35 -0000 1.64
+++ es.po 17 Mar 2009 22:05:33 -0000 1.65
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 20:58+0100\n"
+"POT-Creation-Date: 2009-03-17 21:51+0100\n"
"PO-Revision-Date: 2009-02-15 12:03+0100\n"
"Last-Translator: Carlos M. Cámara Mora <carcam_moceu at yahoo.es>\n"
"Language-Team: Spanish <es at li.org>\n"
@@ -420,7 +420,7 @@
#: src/gsb_assistant_reconcile_config.c:612
#: src/gsb_payment_method_config.c:159 src/gsb_reconcile_config.c:96
#: src/gsb_scheduler_list.c:331 src/imputation_budgetaire.c:164
-#: src/tiers_onglet.c:226
+#: src/tiers_onglet.c:227
msgid "Account"
msgstr "Cuenta"
@@ -433,13 +433,13 @@
#: src/export_csv.c:747 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1281 src/gsb_form_widget.c:400 src/gsb_reconcile.c:154
#: src/gsb_scheduler_list.c:331 src/gsb_transactions_list.c:143
-#: src/import.c:2882 src/import_csv.c:78 src/traitement_variables.c:74
+#: src/import.c:2906 src/import_csv.c:78 src/traitement_variables.c:74
msgid "Date"
msgstr "Fecha"
#. Description entry
#: src/balance_estimate_tab.c:300 src/etats_onglet.c:287
-#: src/tiers_onglet.c:591
+#: src/tiers_onglet.c:592
msgid "Description"
msgstr "Descripción"
@@ -487,7 +487,7 @@
#: src/barre_outils.c:107 src/barre_outils.c:453 src/categories_onglet.c:499
#: src/etats_onglet.c:173 src/imputation_budgetaire.c:532
-#: src/tiers_onglet.c:307
+#: src/tiers_onglet.c:308
msgid "Delete"
msgstr "Borrar"
@@ -522,7 +522,7 @@
msgstr "Imprimir la lista de transacciones"
#: src/barre_outils.c:153 src/barre_outils.c:513 src/categories_onglet.c:518
-#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:334
+#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:335
msgid "View"
msgstr "Vista"
@@ -551,7 +551,7 @@
msgstr "Vista de tres lÃneas"
#: src/barre_outils.c:237 src/categories_onglet.c:562
-#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:417
+#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:418
msgid "Complete view"
msgstr "Vista completa"
@@ -655,7 +655,7 @@
#: src/categories_onglet.c:160 src/export_csv.c:774 src/gsb_reconcile.c:157
#: src/gsb_scheduler_list.c:332 src/gsb_transactions_list.c:149
#: src/gsb_transactions_list.c:2867 src/import_csv.c:86
-#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:235
+#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:236
#: src/traitement_variables.c:80
msgid "Balance"
msgstr "Balance"
@@ -736,7 +736,7 @@
msgstr "Crear una nueva subcategorÃa"
#: src/categories_onglet.c:480 src/etats_onglet.c:130 src/import.c:350
-#: src/import.c:3099 src/imputation_budgetaire.c:513 src/parametres.c:287
+#: src/import.c:3123 src/imputation_budgetaire.c:513 src/parametres.c:287
msgid "Import"
msgstr "Importar"
@@ -759,7 +759,7 @@
#: src/categories_onglet.c:508 src/etats_onglet.c:184
#: src/fenetre_principale.c:251 src/imputation_budgetaire.c:542
-#: src/tiers_onglet.c:316
+#: src/tiers_onglet.c:317
msgid "Properties"
msgstr "Propiedades"
@@ -767,7 +767,7 @@
msgid "Edit selected category"
msgstr "Editar la categorÃa seleccionada"
-#: src/categories_onglet.c:522 src/tiers_onglet.c:338
+#: src/categories_onglet.c:522 src/tiers_onglet.c:339
msgid "Change view mode"
msgstr "Cambiar el modo de la vista"
@@ -782,7 +782,7 @@
#: src/categories_onglet.c:607 src/categories_onglet.c:611
#: src/imputation_budgetaire.c:640 src/imputation_budgetaire.c:645
-#: src/tiers_onglet.c:553
+#: src/tiers_onglet.c:554
#, c-format
msgid "Properties for %s"
msgstr "Propiedades para %s"
@@ -810,7 +810,7 @@
#: src/gsb_bank.c:832 src/gsb_currency_config.c:355 src/gsb_fyear_config.c:191
#: src/gsb_fyear_config.c:278 src/gsb_payment_method_config.c:239
#: src/gsb_reconcile_config.c:179 src/gsb_transactions_list.c:1733
-#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:578
+#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:579
msgid "Name"
msgstr "Nombre"
@@ -1357,12 +1357,12 @@
#. Transfer = Virement
#. Direct deposit remplacé par Transfert = Virement
-#: src/etats_affiche.c:1837 src/import.c:2349 src/import.c:2367
+#: src/etats_affiche.c:1837 src/import.c:2373 src/import.c:2391
msgid "Transfert"
msgstr "Transferencia"
#: src/etats_affiche.c:1846 src/export_csv.c:561 src/gsb_data_category.c:1039
-#: src/gsb_form.c:740 src/gsb_form.c:2465 src/gsb_form.c:2837
+#: src/gsb_form.c:740 src/gsb_form.c:2476 src/gsb_form.c:2848
#: src/gsb_form_scheduler.c:321 src/gsb_transactions_list.c:3216
msgid "Split of transaction"
msgstr "Anotación en la transacción"
@@ -1417,7 +1417,7 @@
#: src/etats_config.c:687 src/etats_config.c:7193 src/export_csv.c:762
#: src/fenetre_principale.c:266 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1308 src/gsb_form_widget.c:420 src/gsb_scheduler_list.c:331
-#: src/gsb_transactions_list.c:145 src/import.c:2889 src/import_csv.c:80
+#: src/gsb_transactions_list.c:145 src/import.c:2913 src/import_csv.c:80
#: src/meta_payee.c:76 src/traitement_variables.c:76
msgid "Payee"
msgstr "Tercero"
@@ -1747,14 +1747,14 @@
#: src/etats_config.c:2581 src/etats_config.c:2848 src/etats_config.c:3138
#: src/etats_config.c:3951 src/etats_config.c:4147 src/etats_config.c:7512
-#: src/tiers_onglet.c:1263 src/tiers_onglet.c:1283
+#: src/tiers_onglet.c:1306 src/tiers_onglet.c:1326
msgid "Select all"
msgstr "Seleccionar todo"
#. ajoute le bouton (dé)sélectionne tout
#: src/etats_config.c:2596 src/etats_config.c:2863 src/etats_config.c:3153
#: src/etats_config.c:3966 src/etats_config.c:4162 src/etats_config.c:7527
-#: src/tiers_onglet.c:1062 src/tiers_onglet.c:1265
+#: src/tiers_onglet.c:1105 src/tiers_onglet.c:1308
msgid "Unselect all"
msgstr "Deseleccionar todo"
@@ -1863,7 +1863,7 @@
#. set the title
#: src/etats_config.c:4041 src/navigation.c:290 src/navigation.c:1228
-#: src/tiers_onglet.c:214
+#: src/tiers_onglet.c:215
msgid "Payees"
msgstr "Terceros"
@@ -1975,7 +1975,7 @@
#: src/etats_config.c:5310 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:2897
+#: src/gsb_transactions_list.c:150 src/import.c:2921
#: src/traitement_variables.c:81
msgid "Amount"
msgstr "Cantidad"
@@ -3858,7 +3858,7 @@
msgstr "Grisbi archivará todas las transacciones seleccionadas por un informe."
#: src/gsb_assistant_archive.c:354 src/gsb_data_payee.c:511
-#: src/gsb_form.c:2572 src/gsb_form.c:2573 src/navigation.c:1289
+#: src/gsb_form.c:2583 src/gsb_form.c:2584 src/navigation.c:1289
msgid "Report"
msgstr "Informe"
@@ -6325,19 +6325,19 @@
msgstr "La transacción %d tiene un tercero n°%d pero éste no existe."
#. Deposit = Dépôt
-#: src/gsb_data_payment.c:714 src/import.c:2331 src/plugins/ofx/ofx.c:451
+#: src/gsb_data_payment.c:714 src/import.c:2355 src/plugins/ofx/ofx.c:451
msgid "Deposit"
msgstr "Depósito"
#. pas trouvé de définition remplacé par carte de crédit
#. Point of sale = Point de vente remplacé par carte de crédit
-#: src/gsb_data_payment.c:723 src/import.c:2337 src/import.c:2343
+#: src/gsb_data_payment.c:723 src/import.c:2361 src/import.c:2367
msgid "Credit card"
msgstr "Tarjeta de crédito"
#. Electronic payment remplacé par Direct debit = Prélèvement
#. Merchant initiated debit remplacé par Direct debit = Prélèvement
-#: src/gsb_data_payment.c:732 src/import.c:2355 src/import.c:2373
+#: src/gsb_data_payment.c:732 src/import.c:2379 src/import.c:2397
msgid "Direct debit"
msgstr "Cargo a cuenta"
@@ -6906,7 +6906,7 @@
msgid "Encryption plugin not found."
msgstr "No se ha"
-#: src/gsb_file_load.c:410 src/gsb_file_load.c:4364
+#: src/gsb_file_load.c:410 src/gsb_file_load.c:4370
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Este fichero no es de de Grisbi... Carga interrumpida."
@@ -6923,7 +6923,7 @@
"%s"
#. we don't know here the release of that file, give the release needed
-#: src/gsb_file_load.c:7582
+#: src/gsb_file_load.c:7588
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
@@ -6932,7 +6932,7 @@
"Se necesita la versión de Grisbi %s para abrir este archivo.\n"
"Usted está usando la versión %s."
-#: src/gsb_file_load.c:7621
+#: src/gsb_file_load.c:7627
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6944,11 +6944,11 @@
"más tarde (nuevos informes...) pero recuerde que es un archivo antes de "
"modificar algunas transacciones o informaciones importantes."
-#: src/gsb_file_load.c:7622
+#: src/gsb_file_load.c:7628
msgid "Grisbi archive opened"
msgstr "Archivo de Grisbi abierto"
-#: src/gsb_file_load.c:7714
+#: src/gsb_file_load.c:7720
#, c-format
msgid ""
"Your old file grisbi was saved as: \n"
@@ -7085,25 +7085,25 @@
msgid "Cheque/Transfer number"
msgstr "Cheque/Número de transferencia"
-#: src/gsb_form.c:2157
+#: src/gsb_form.c:2168
msgid "No payee selected for this report."
msgstr "No hay terceros seleccionados para este informe."
-#: src/gsb_form.c:2415
+#: src/gsb_form.c:2426
msgid "You must enter a date."
msgstr "Debe introducir una fecha."
-#: src/gsb_form.c:2422
+#: src/gsb_form.c:2433
#, c-format
msgid "Invalid date %s"
msgstr "Fecha no válida %s"
-#: src/gsb_form.c:2441
+#: src/gsb_form.c:2452
#, c-format
msgid "Invalid value date %s"
msgstr "Fecha no válida %s"
-#: src/gsb_form.c:2467
+#: src/gsb_form.c:2478
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
@@ -7111,14 +7111,14 @@
"No puede poner una anotación de transacción en la categorÃa para un hijo de "
"una anotación de transacción."
-#: src/gsb_form.c:2500
+#: src/gsb_form.c:2511
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr ""
"No se puede asociar una transferencia a una cuenta borrada en una "
"transacción programada."
-#: src/gsb_form.c:2507
+#: src/gsb_form.c:2518
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
@@ -7126,15 +7126,15 @@
"No hay una cuenta asociada para esta transferencia o la cuenta asociada no "
"es válida."
-#: src/gsb_form.c:2515
+#: src/gsb_form.c:2526
msgid "Can't issue a transfer its own account."
msgstr "No puede emitir una transferencia hacia su propia cuenta"
-#: src/gsb_form.c:2520
+#: src/gsb_form.c:2531
msgid "Can't issue a transfer on a closed account."
msgstr "No puedo realizar una transferencia sobre una cuenta cerrada."
-#: src/gsb_form.c:2546
+#: src/gsb_form.c:2557
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -7144,7 +7144,7 @@
"pero no contiene ningún número.\n"
"¿Continuar de todas formas?"
-#: src/gsb_form.c:2560
+#: src/gsb_form.c:2571
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -7152,28 +7152,28 @@
"Aviso: Este número de cheque ya está usado.\n"
"¿Continuar de todas formas?"
-#: src/gsb_form.c:2580
+#: src/gsb_form.c:2591
msgid "A transaction with a multiple payee must be a new one."
msgstr "Una transacción con múltiples terceros debe ser nueva."
-#: src/gsb_form.c:2585
+#: src/gsb_form.c:2596
msgid "A transaction with a multiple payee cannot be a split child."
msgstr ""
"Una transacción con múltiples terceros no puede ser el hijo de un desglose."
-#: src/gsb_form.c:2596
+#: src/gsb_form.c:2607
msgid "The word \"Report\" is reserved. Please use another one."
msgstr "La palabra \"Informe\" está reservada. Por favor, use otra."
-#: src/gsb_form.c:2603
+#: src/gsb_form.c:2614
msgid "Invalid multiple payee."
msgstr "Múltiples terceros no válidos."
-#: src/gsb_form.c:2860
+#: src/gsb_form.c:2871
msgid "Modifying a transaction"
msgstr "Modificando una transacción"
-#: src/gsb_form.c:2861
+#: src/gsb_form.c:2872
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7187,7 +7187,7 @@
"¿ Está seguro ?"
#. propose to configure the form
-#: src/gsb_form.c:3161
+#: src/gsb_form.c:3172
msgid "Configure the form"
msgstr "Configurar el formulario"
@@ -8221,11 +8221,11 @@
msgid "File name"
msgstr "Nombre del archivo"
-#: src/import.c:526 src/import.c:608 src/import.c:3207 src/import.c:3230
+#: src/import.c:526 src/import.c:608 src/import.c:3244 src/import.c:3267
msgid "Unknown"
msgstr "Desconocido"
-#: src/import.c:568 src/import.c:3310 src/import_csv.c:1045
+#: src/import.c:568 src/import.c:3347 src/import_csv.c:1045
#, c-format
msgid "Unable to read file: %s\n"
msgstr "No se puede leer el fichero: %s\n"
@@ -8404,7 +8404,7 @@
#. there is a difference between the imported account id and grisbi account id,
#. * ask to be sure
-#: src/import.c:1730
+#: src/import.c:1731
#, c-format
msgid ""
"The Grisbi's id account is %s, but the imported id account is %s.\n"
@@ -8422,48 +8422,64 @@
#. l'id du compte choisi et l'id du compte importé sont différents
#. on propose encore d'arrêter...
-#: src/import.c:1733 src/import.c:2515
+#: src/import.c:1734 src/import.c:2539
msgid "The id of the imported and chosen accounts are different"
msgstr "El id de las cuentas importada y elegida son distintos"
-#: src/import.c:1963
+#: src/import.c:1968
+#, fuzzy
+msgid "Confirmation of transactions to be merged"
+msgstr "Confirmación de borrado de una transacción"
+
+#: src/import.c:1971
msgid "Confirmation of importation of transactions"
msgstr "Confirmación de la importación de transacciones"
-#: src/import.c:1975
+#: src/import.c:1987
+#, fuzzy
+msgid "Please select the transactions to be merged"
+msgstr "Usar las transacciones seleccionadas como una plantilla"
+
+#: src/import.c:1990
+#, fuzzy
msgid ""
-"Some imported transactions seem to be already saved. Please select the "
+"Some imported transactions seem to be already saved.Please select the "
"transactions to import."
msgstr ""
"Algunas de las transacciones importadas parece que ya han sido guardadas. "
"Por favor seleccione las transacciones a importar."
-#: src/import.c:2051
+#: src/import.c:2070
+#, fuzzy, c-format
+msgid "Transactions to be merged : %s ; %s ; %s"
+msgstr "Transacciones a importar : %s ; %s ; %s"
+
+#: src/import.c:2075
#, c-format
msgid "Transactions to import : %s ; %s ; %s"
msgstr "Transacciones a importar : %s ; %s ; %s"
-#: src/import.c:2090
+#: src/import.c:2114
#, c-format
msgid "Transaction found : %s ; %s ; %s ; %s"
msgstr "Transacción encontrada : %s ; %s ; %s ; %s"
-#: src/import.c:2103
+#: src/import.c:2127
#, c-format
msgid "Transaction found : %s ; %s ; %s"
msgstr "Transacción encontrada : %s ; %s ; %s"
#. Check = Chèque
-#: src/import.c:2317 src/plugins/ofx/ofx.c:431
+#: src/import.c:2341 src/plugins/ofx/ofx.c:431
msgid "Check"
msgstr "Comprobar"
#. Cash withdrawal = retrait en liquide
-#: src/import.c:2361
+#: src/import.c:2385
msgid "Cash withdrawal"
msgstr "Retirada de efectivo"
-#: src/import.c:2451
+#: src/import.c:2475
#, c-format
msgid ""
"Warning : the cheque number %ld is already used.\n"
@@ -8472,7 +8488,7 @@
"Aviso: El número de cheque %ld ya está siendo usado.\n"
"Lo saltamos"
-#: src/import.c:2516
+#: src/import.c:2540
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 ?"
@@ -8480,47 +8496,52 @@
"¿Quizá eligió una cuenta equivocada? Si elige coninuar, el id de la cuenta "
"cambiará. ¿Desea continuar ?"
-#: src/import.c:2792
+#: src/import.c:2816
msgid "Orphaned transactions"
msgstr "Transacciones huérfanas"
-#: src/import.c:2805
+#: src/import.c:2829
msgid "Mark transactions you want to add to the list and click the add button"
msgstr ""
"Marque las transacciones que desea añadir a la lista y pinche en el botón "
"añadir"
-#: src/import.c:2874
+#: src/import.c:2898
msgid "Mark"
msgstr "Marcar"
-#: src/import.c:3075
+#: src/import.c:3099
#, c-format
msgid "%s #%d"
msgstr "%s #%d"
-#: src/import.c:3110
+#: src/import.c:3134
msgid "Threshold while matching transaction date during import (in days)"
msgstr ""
"Umbral para cuadrar la fecha de transacción en la importación (en dÃas)"
-#: src/import.c:3136
+#: src/import.c:3160
+#, fuzzy
+msgid "merge transactions imported with planned transactions"
+msgstr "Convertir la transacción en un transacción programada"
+
+#: src/import.c:3173
msgid "automatically associate the category of the payee if it is possible"
msgstr "Asociar automáticamente la categorÃa del tercero si es posible"
-#: src/import.c:3149
+#: src/import.c:3186
msgid "Set the financial year"
msgstr "Configurar el año financiero"
-#: src/import.c:3150
+#: src/import.c:3187
msgid "According to the date"
msgstr "De acuerdo con la fecha"
-#: src/import.c:3151
+#: src/import.c:3188
msgid "According to the value date (if fail, try with the date)"
msgstr "De acuerdo con la fecha valor (si fall, intentar con la fecha)"
-#: src/import.c:3295
+#: src/import.c:3332
#, c-format
msgid ""
"%s is neither an OFX file, neither a QIF file. Nothing will be done for that "
@@ -8529,7 +8550,7 @@
"%s no es un fichero OFX, ni un fichero QIF. No se hará nada para este "
"fichero."
-#: src/import.c:3353
+#: src/import.c:3390
#, c-format
msgid ""
"%s was not imported successfully. An error occured while getting the "
@@ -8538,43 +8559,43 @@
"%s no se importó con éxito. Un error ocurrió mientras que se tomaban las "
"transacciones."
-#: src/import.c:3431
+#: src/import.c:3468
msgid "Import a file with a rule"
msgstr "Importar un fichero con una regla"
#. text for paddingbox
-#: src/import.c:3442
+#: src/import.c:3479
#, c-format
msgid "Properties of the rule : %s\n"
msgstr "Propiedades de la regla : %s\n"
-#: src/import.c:3461
+#: src/import.c:3498
#, c-format
msgid "Imported transactions will be added to the account %s.\n"
msgstr "Las transacciones importadas se añadirán a la cuenta %s.\n"
-#: src/import.c:3464
+#: src/import.c:3501
#, c-format
msgid "Imported transactions will mark transactions in the account %s.\n"
msgstr ""
"Las transacciones importadas marcarán las transacciones en la cuenta %s.\n"
#. textstring 2
-#: src/import.c:3468
+#: src/import.c:3505
#, c-format
msgid "Currency to import is %s.\n"
msgstr "La moneda a importar es %s.\n"
-#: src/import.c:3474
+#: src/import.c:3511
msgid "Amounts of the transactions will be inverted.\n"
msgstr "Se invertirán las cantidades de las transacciones.\n"
#. label filename
-#: src/import.c:3484
+#: src/import.c:3521
msgid "Name of the file to import "
msgstr "Nombre del fichero a importar "
-#: src/import.c:3578
+#: src/import.c:3615
#, c-format
msgid "Unable to create tmp file: %s\n"
msgstr "No se ha podido crear el fichero tmp: %s\n"
@@ -9012,7 +9033,7 @@
msgstr "Sin subtercero"
#. * Find a unique name for payee
-#: src/meta_payee.c:320 src/tiers_onglet.c:299
+#: src/meta_payee.c:320 src/tiers_onglet.c:300
msgid "New payee"
msgstr "Nuevo tercero"
@@ -9683,37 +9704,37 @@
msgid "Error opening file '%s'"
msgstr "Error abriendo el archivo '%s'"
-#: src/tiers_onglet.c:303
+#: src/tiers_onglet.c:304
msgid "Create a new payee"
msgstr "Crear un nuevo tercero"
-#: src/tiers_onglet.c:312
+#: src/tiers_onglet.c:313
msgid "Delete selected payee"
msgstr "Borrar el tercero seleccionado"
-#: src/tiers_onglet.c:321
+#: src/tiers_onglet.c:322
msgid "Edit selected payee"
msgstr "Editar el tercero seleccionado"
-#: src/tiers_onglet.c:325
+#: src/tiers_onglet.c:326
msgid "Remove unused payees"
msgstr "Eliminar terceros que no se usan"
-#: src/tiers_onglet.c:329 src/tiers_onglet.c:373
+#: src/tiers_onglet.c:330 src/tiers_onglet.c:374
msgid "Remove orphan payees"
msgstr "Eliminar terceros huérfanos"
-#: src/tiers_onglet.c:343
+#: src/tiers_onglet.c:344
#, fuzzy
msgid "Manage payees"
msgstr "Página principal"
-#: src/tiers_onglet.c:347 src/tiers_onglet.c:729
+#: src/tiers_onglet.c:348 src/tiers_onglet.c:730
#, fuzzy
msgid "Manage the payees"
msgstr "Detallar terceros"
-#: src/tiers_onglet.c:374
+#: src/tiers_onglet.c:375
msgid ""
"This will remove all the payees wich are not used in any transactions. "
"Payees linked to an archived transactions will not be removed, even if not "
@@ -9727,17 +9748,17 @@
"\n"
"¿ Está seguro de que quiere hacer esto?"
-#: src/tiers_onglet.c:386 src/tiers_onglet.c:819
+#: src/tiers_onglet.c:387 src/tiers_onglet.c:862
#, c-format
msgid "Removed %d payees."
msgstr "%d Terceros eliminados"
#. Edit transaction
-#: src/tiers_onglet.c:411
+#: src/tiers_onglet.c:412
msgid "Payee view"
msgstr "Vista de terceros"
-#: src/tiers_onglet.c:633
+#: src/tiers_onglet.c:634
#, c-format
msgid ""
"You tried to rename current payee to '%s' but this payee already exists. "
@@ -9746,11 +9767,11 @@
"Intenta renombrar el tercero actual a '%s' pero este tercero ya existe. Por "
"favor elija otro nombre."
-#: src/tiers_onglet.c:637
+#: src/tiers_onglet.c:638
msgid "Payee already exists"
msgstr "El tercero ya existe"
-#: src/tiers_onglet.c:730
+#: src/tiers_onglet.c:731
msgid ""
"This wizard will help you to simplify the list of payees.\n"
"\n"
@@ -9759,12 +9780,12 @@
"It is better to make a backup of your Grisbi file if you have not yet done. "
msgstr ""
-#: src/tiers_onglet.c:873
+#: src/tiers_onglet.c:916
#, fuzzy
msgid "Choose a payee"
msgstr "Elija un fichero"
-#: src/tiers_onglet.c:875
+#: src/tiers_onglet.c:918
msgid ""
"Select one payee in the list that you modify to serve as the basis for your "
"research.\n"
@@ -9775,68 +9796,68 @@
"string_1%string_2"
msgstr ""
-#: src/tiers_onglet.c:896
+#: src/tiers_onglet.c:939
#, fuzzy
msgid "Enter the new payee"
msgstr "Introduzca el nombre de la nueva tercera parte"
-#: src/tiers_onglet.c:898
+#: src/tiers_onglet.c:941
#, fuzzy
msgid "Enter the name of the new payee"
msgstr "Introduzca el nombre de la nueva lÃnea subresupuestaria"
-#: src/tiers_onglet.c:911
+#: src/tiers_onglet.c:954
#, fuzzy
msgid "Options"
msgstr "Salidas"
-#: src/tiers_onglet.c:913
+#: src/tiers_onglet.c:956
msgid "Extracting a number and save it in the field No Cheque/Virement"
msgstr ""
-#: src/tiers_onglet.c:919
+#: src/tiers_onglet.c:962
msgid "Save the payees in the notes"
msgstr ""
-#: src/tiers_onglet.c:952
+#: src/tiers_onglet.c:995
msgid "List of payees who will be modified"
msgstr ""
-#: src/tiers_onglet.c:994
+#: src/tiers_onglet.c:1037
msgid "Select"
msgstr "Seleccionar"
-#: src/tiers_onglet.c:1002
+#: src/tiers_onglet.c:1045
#, fuzzy
msgid "Payee number"
msgstr "número de cheque"
-#: src/tiers_onglet.c:1012
+#: src/tiers_onglet.c:1055
#, fuzzy
msgid "Payee name"
msgstr "Vista de terceros"
-#: src/tiers_onglet.c:1028
+#: src/tiers_onglet.c:1071
msgid "Total number of payees :"
msgstr ""
#. ajoute le nombre de tiers sélectionnés
-#: src/tiers_onglet.c:1045
+#: src/tiers_onglet.c:1088
#, fuzzy
msgid "Number of selected payees :"
msgstr "Borrar el tercero seleccionado"
-#: src/tiers_onglet.c:1147
+#: src/tiers_onglet.c:1190
#, c-format
msgid "Payee sought : %s\n"
msgstr ""
-#: src/tiers_onglet.c:1153
+#: src/tiers_onglet.c:1196
#, fuzzy, c-format
msgid "New payee : %s"
msgstr "Nuevo tercero #%d"
-#: src/tiers_onglet.c:1229
+#: src/tiers_onglet.c:1272
#, c-format
msgid ""
"You are about to replace %d payees whose names contain %s\n"
@@ -9845,12 +9866,12 @@
"<span weight=\"bold\">Are you sure?</span>"
msgstr ""
-#: src/tiers_onglet.c:1393
+#: src/tiers_onglet.c:1436
#, fuzzy
msgid "You must choose a payee for searching."
msgstr "Por favor, elija un nombre para el fichero"
-#: src/tiers_onglet.c:1397
+#: src/tiers_onglet.c:1440
msgid "Beware you don't use one of models for the research."
msgstr ""
@@ -11732,9 +11753,6 @@
#~ msgid "Account split"
#~ msgstr "Anotación en la cuenta"
-#~ msgid "Confirmation of transaction removal"
-#~ msgstr "Confirmación de borrado de una transacción"
-
#~ msgid ""
#~ "You are currently trying to remove a transaction. There is no undo for "
#~ "this. Do you confirm the removal?"
Index: pl.po
===================================================================
RCS file: /cvsroot/grisbi/grisbi/po/pl.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- pl.po 13 Mar 2009 20:15:37 -0000 1.27
+++ pl.po 17 Mar 2009 22:05:33 -0000 1.28
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 20:58+0100\n"
+"POT-Creation-Date: 2009-03-17 21:51+0100\n"
"PO-Revision-Date: 2006-05-15 12:44+0200\n"
"Last-Translator: Ryszard Jeziorski <r.jeziorski at dart.kielce.pl>\n"
"Language-Team: Polish\n"
@@ -447,7 +447,7 @@
#: src/gsb_assistant_reconcile_config.c:612
#: src/gsb_payment_method_config.c:159 src/gsb_reconcile_config.c:96
#: src/gsb_scheduler_list.c:331 src/imputation_budgetaire.c:164
-#: src/tiers_onglet.c:226
+#: src/tiers_onglet.c:227
msgid "Account"
msgstr "Konto"
@@ -460,13 +460,13 @@
#: src/export_csv.c:747 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1281 src/gsb_form_widget.c:400 src/gsb_reconcile.c:154
#: src/gsb_scheduler_list.c:331 src/gsb_transactions_list.c:143
-#: src/import.c:2882 src/import_csv.c:78 src/traitement_variables.c:74
+#: src/import.c:2906 src/import_csv.c:78 src/traitement_variables.c:74
msgid "Date"
msgstr "Data"
#. Description entry
#: src/balance_estimate_tab.c:300 src/etats_onglet.c:287
-#: src/tiers_onglet.c:591
+#: src/tiers_onglet.c:592
msgid "Description"
msgstr "Opis"
@@ -515,7 +515,7 @@
#: src/barre_outils.c:107 src/barre_outils.c:453 src/categories_onglet.c:499
#: src/etats_onglet.c:173 src/imputation_budgetaire.c:532
-#: src/tiers_onglet.c:307
+#: src/tiers_onglet.c:308
#, fuzzy
msgid "Delete"
msgstr "Wybierz"
@@ -555,7 +555,7 @@
msgstr "Sortuj listÄ transakcji"
#: src/barre_outils.c:153 src/barre_outils.c:513 src/categories_onglet.c:518
-#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:334
+#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:335
msgid "View"
msgstr ""
@@ -587,7 +587,7 @@
msgstr "Tryb trójwierszowy"
#: src/barre_outils.c:237 src/categories_onglet.c:562
-#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:417
+#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:418
#, fuzzy
msgid "Complete view"
msgstr "Nierozliczona transakcja zbiorcza"
@@ -707,7 +707,7 @@
#: src/categories_onglet.c:160 src/export_csv.c:774 src/gsb_reconcile.c:157
#: src/gsb_scheduler_list.c:332 src/gsb_transactions_list.c:149
#: src/gsb_transactions_list.c:2867 src/import_csv.c:86
-#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:235
+#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:236
#: src/traitement_variables.c:80
msgid "Balance"
msgstr "Saldo"
@@ -787,7 +787,7 @@
msgstr "Podaj nazwÄ nowej podkategorii"
#: src/categories_onglet.c:480 src/etats_onglet.c:130 src/import.c:350
-#: src/import.c:3099 src/imputation_budgetaire.c:513 src/parametres.c:287
+#: src/import.c:3123 src/imputation_budgetaire.c:513 src/parametres.c:287
msgid "Import"
msgstr "Import"
@@ -813,7 +813,7 @@
#: src/categories_onglet.c:508 src/etats_onglet.c:184
#: src/fenetre_principale.c:251 src/imputation_budgetaire.c:542
-#: src/tiers_onglet.c:316
+#: src/tiers_onglet.c:317
#, fuzzy
msgid "Properties"
msgstr "SzczegóÅy waluty"
@@ -823,7 +823,7 @@
msgid "Edit selected category"
msgstr "kategoria"
-#: src/categories_onglet.c:522 src/tiers_onglet.c:338
+#: src/categories_onglet.c:522 src/tiers_onglet.c:339
#, fuzzy
msgid "Change view mode"
msgstr "Tryb jednowierszowy"
@@ -841,7 +841,7 @@
#: src/categories_onglet.c:607 src/categories_onglet.c:611
#: src/imputation_budgetaire.c:640 src/imputation_budgetaire.c:645
-#: src/tiers_onglet.c:553
+#: src/tiers_onglet.c:554
#, fuzzy, c-format
msgid "Properties for %s"
msgstr "Wynik dla %s"
@@ -871,7 +871,7 @@
#: src/gsb_bank.c:832 src/gsb_currency_config.c:355 src/gsb_fyear_config.c:191
#: src/gsb_fyear_config.c:278 src/gsb_payment_method_config.c:239
#: src/gsb_reconcile_config.c:179 src/gsb_transactions_list.c:1733
-#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:578
+#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:579
msgid "Name"
msgstr "Nazwa"
@@ -1383,12 +1383,12 @@
#. Transfer = Virement
#. Direct deposit remplacé par Transfert = Virement
-#: src/etats_affiche.c:1837 src/import.c:2349 src/import.c:2367
+#: src/etats_affiche.c:1837 src/import.c:2373 src/import.c:2391
msgid "Transfert"
msgstr "Przelew"
#: src/etats_affiche.c:1846 src/export_csv.c:561 src/gsb_data_category.c:1039
-#: src/gsb_form.c:740 src/gsb_form.c:2465 src/gsb_form.c:2837
+#: src/gsb_form.c:740 src/gsb_form.c:2476 src/gsb_form.c:2848
#: src/gsb_form_scheduler.c:321 src/gsb_transactions_list.c:3216
msgid "Split of transaction"
msgstr "Transakcja zbiorcza"
@@ -1444,7 +1444,7 @@
#: src/etats_config.c:687 src/etats_config.c:7193 src/export_csv.c:762
#: src/fenetre_principale.c:266 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1308 src/gsb_form_widget.c:420 src/gsb_scheduler_list.c:331
-#: src/gsb_transactions_list.c:145 src/import.c:2889 src/import_csv.c:80
+#: src/gsb_transactions_list.c:145 src/import.c:2913 src/import_csv.c:80
#: src/meta_payee.c:76 src/traitement_variables.c:76
#, fuzzy
msgid "Payee"
@@ -1782,14 +1782,14 @@
#: src/etats_config.c:2581 src/etats_config.c:2848 src/etats_config.c:3138
#: src/etats_config.c:3951 src/etats_config.c:4147 src/etats_config.c:7512
-#: src/tiers_onglet.c:1263 src/tiers_onglet.c:1283
+#: src/tiers_onglet.c:1306 src/tiers_onglet.c:1326
msgid "Select all"
msgstr "Zaznacz wszystkie"
#. ajoute le bouton (dé)sélectionne tout
#: src/etats_config.c:2596 src/etats_config.c:2863 src/etats_config.c:3153
#: src/etats_config.c:3966 src/etats_config.c:4162 src/etats_config.c:7527
-#: src/tiers_onglet.c:1062 src/tiers_onglet.c:1265
+#: src/tiers_onglet.c:1105 src/tiers_onglet.c:1308
msgid "Unselect all"
msgstr "WyczyÅÄ wszystkie"
@@ -1902,7 +1902,7 @@
#. set the title
#: src/etats_config.c:4041 src/navigation.c:290 src/navigation.c:1228
-#: src/tiers_onglet.c:214
+#: src/tiers_onglet.c:215
#, fuzzy
msgid "Payees"
msgstr "Dni"
@@ -2024,7 +2024,7 @@
#: src/etats_config.c:5310 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:2897
+#: src/gsb_transactions_list.c:150 src/import.c:2921
#: src/traitement_variables.c:81
msgid "Amount"
msgstr "Kwota"
@@ -3886,7 +3886,7 @@
msgstr ""
#: src/gsb_assistant_archive.c:354 src/gsb_data_payee.c:511
-#: src/gsb_form.c:2572 src/gsb_form.c:2573 src/navigation.c:1289
+#: src/gsb_form.c:2583 src/gsb_form.c:2584 src/navigation.c:1289
msgid "Report"
msgstr "Raport"
@@ -6240,19 +6240,19 @@
msgstr "Dla transakcji #%d powinna istnieÄ powiÄ
zana transakcja #%d.\n"
#. Deposit = Dépôt
-#: src/gsb_data_payment.c:714 src/import.c:2331 src/plugins/ofx/ofx.c:451
+#: src/gsb_data_payment.c:714 src/import.c:2355 src/plugins/ofx/ofx.c:451
msgid "Deposit"
msgstr "WpÅata"
#. pas trouvé de définition remplacé par carte de crédit
#. Point of sale = Point de vente remplacé par carte de crédit
-#: src/gsb_data_payment.c:723 src/import.c:2337 src/import.c:2343
+#: src/gsb_data_payment.c:723 src/import.c:2361 src/import.c:2367
msgid "Credit card"
msgstr "Karta kredytowa"
#. Electronic payment remplacé par Direct debit = Prélèvement
#. Merchant initiated debit remplacé par Direct debit = Prélèvement
-#: src/gsb_data_payment.c:732 src/import.c:2355 src/import.c:2373
+#: src/gsb_data_payment.c:732 src/import.c:2379 src/import.c:2397
msgid "Direct debit"
msgstr "WypÅata"
@@ -6768,7 +6768,7 @@
msgid "Encryption plugin not found."
msgstr "Konto %s nie zostaÅo znalezione.\n"
-#: src/gsb_file_load.c:410 src/gsb_file_load.c:4364
+#: src/gsb_file_load.c:410 src/gsb_file_load.c:4370
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Ten plik nie jest plikiem raportu Grisbi"
@@ -6783,14 +6783,14 @@
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: src/gsb_file_load.c:7582
+#: src/gsb_file_load.c:7588
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "Do otwarcia tego pliku wymagane jest Grisby w wersji %s"
-#: src/gsb_file_load.c:7621
+#: src/gsb_file_load.c:7627
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6798,11 +6798,11 @@
"transactions or important informations."
msgstr ""
-#: src/gsb_file_load.c:7622
+#: src/gsb_file_load.c:7628
msgid "Grisbi archive opened"
msgstr ""
-#: src/gsb_file_load.c:7714
+#: src/gsb_file_load.c:7720
#, c-format
msgid ""
"Your old file grisbi was saved as: \n"
@@ -6933,53 +6933,53 @@
msgid "Cheque/Transfer number"
msgstr "Numer czeku/przelewu"
-#: src/gsb_form.c:2157
+#: src/gsb_form.c:2168
#, fuzzy
msgid "No payee selected for this report."
msgstr "Nie wybrano beneficjenta dla tego raportu"
-#: src/gsb_form.c:2415
+#: src/gsb_form.c:2426
msgid "You must enter a date."
msgstr "Musisz podaÄ datÄ"
-#: src/gsb_form.c:2422
+#: src/gsb_form.c:2433
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "BÅÄdna data"
-#: src/gsb_form.c:2441
+#: src/gsb_form.c:2452
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "BÅÄdna data"
-#: src/gsb_form.c:2467
+#: src/gsb_form.c:2478
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: src/gsb_form.c:2500
+#: src/gsb_form.c:2511
#, fuzzy
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr "PrzeksztaÅÄ transakcjÄ w zaplanowanÄ
transakcjÄ"
-#: src/gsb_form.c:2507
+#: src/gsb_form.c:2518
#, fuzzy
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr "Konto powiÄ
zane z tym transferem jest nieprawidÅowe"
-#: src/gsb_form.c:2515
+#: src/gsb_form.c:2526
msgid "Can't issue a transfer its own account."
msgstr "Nie można wykonaÄ transferu do tego samego konta"
-#: src/gsb_form.c:2520
+#: src/gsb_form.c:2531
msgid "Can't issue a transfer on a closed account."
msgstr "Nie można wykonaÄ transferu do zamkniÄtego konta "
-#: src/gsb_form.c:2546
+#: src/gsb_form.c:2557
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -6989,7 +6989,7 @@
"ale nie zawiera żadnego numeru.\n"
"KontynuowaÄ?"
-#: src/gsb_form.c:2560
+#: src/gsb_form.c:2571
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -6997,31 +6997,31 @@
"Ostrzeżenie: podany numer czeku zostaŠjuż użyty.\n"
" KontynuowaÄ mimo to?"
-#: src/gsb_form.c:2580
+#: src/gsb_form.c:2591
#, fuzzy
msgid "A transaction with a multiple payee must be a new one."
msgstr "Transakcja z wielokrotnym beneficjentem musi byÄ nowÄ
transakcjÄ
."
-#: src/gsb_form.c:2585
+#: src/gsb_form.c:2596
#, fuzzy
msgid "A transaction with a multiple payee cannot be a split child."
msgstr "Transakcja z wielokrotnym beneficjentem musi byÄ nowÄ
transakcjÄ
."
-#: src/gsb_form.c:2596
+#: src/gsb_form.c:2607
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: src/gsb_form.c:2603
+#: src/gsb_form.c:2614
#, fuzzy
msgid "Invalid multiple payee."
msgstr "NieprawidÅowy wielokrotny benficjent"
-#: src/gsb_form.c:2860
+#: src/gsb_form.c:2871
#, fuzzy
msgid "Modifying a transaction"
msgstr "Edytuj transakcjÄ"
-#: src/gsb_form.c:2861
+#: src/gsb_form.c:2872
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7031,7 +7031,7 @@
msgstr ""
#. propose to configure the form
-#: src/gsb_form.c:3161
+#: src/gsb_form.c:3172
msgid "Configure the form"
msgstr ""
@@ -8039,11 +8039,11 @@
msgid "File name"
msgstr "Nazwa wÅaÅciciela"
-#: src/import.c:526 src/import.c:608 src/import.c:3207 src/import.c:3230
+#: src/import.c:526 src/import.c:608 src/import.c:3244 src/import.c:3267
msgid "Unknown"
msgstr "Nieznany"
-#: src/import.c:568 src/import.c:3310 src/import_csv.c:1045
+#: src/import.c:568 src/import.c:3347 src/import_csv.c:1045
#, fuzzy, c-format
msgid "Unable to read file: %s\n"
msgstr "Nie można otworzyÄ pliku '%s': %s"
@@ -8209,7 +8209,7 @@
#. there is a difference between the imported account id and grisbi account id,
#. * ask to be sure
-#: src/import.c:1730
+#: src/import.c:1731
#, fuzzy, c-format
msgid ""
"The Grisbi's id account is %s, but the imported id account is %s.\n"
@@ -8223,48 +8223,64 @@
#. l'id du compte choisi et l'id du compte importé sont différents
#. on propose encore d'arrêter...
-#: src/import.c:1733 src/import.c:2515
+#: src/import.c:1734 src/import.c:2539
msgid "The id of the imported and chosen accounts are different"
msgstr "Identyfikatory zaimportowanego i wybranego konta sÄ
różne"
-#: src/import.c:1963
+#: src/import.c:1968
+#, fuzzy
+msgid "Confirmation of transactions to be merged"
+msgstr "Potwierdzenie usuniÄcia transakcji"
+
+#: src/import.c:1971
msgid "Confirmation of importation of transactions"
msgstr "Potwierdzenie importowania transakcji"
-#: src/import.c:1975
+#: src/import.c:1987
+#, fuzzy
+msgid "Please select the transactions to be merged"
+msgstr "Użyj zaznaczonej transakcji jako szablonu"
+
+#: src/import.c:1990
+#, fuzzy
msgid ""
-"Some imported transactions seem to be already saved. Please select the "
+"Some imported transactions seem to be already saved.Please select the "
"transactions to import."
msgstr ""
"CzÄÅÄ z importowanych transakcji byÅa uprzednio zapisana. ProszÄ wybraÄ "
"transakcje do importu."
-#: src/import.c:2051
+#: src/import.c:2070
+#, fuzzy, c-format
+msgid "Transactions to be merged : %s ; %s ; %s"
+msgstr "Transakcje do importu : %02d/%02d/%04d ; %s ; %4.2f"
+
+#: src/import.c:2075
#, fuzzy, c-format
msgid "Transactions to import : %s ; %s ; %s"
msgstr "Transakcje do importu : %02d/%02d/%04d ; %s ; %4.2f"
-#: src/import.c:2090
+#: src/import.c:2114
#, fuzzy, c-format
msgid "Transaction found : %s ; %s ; %s ; %s"
msgstr "Znaleziona transakcja : %02d/%02d/%04d ; %s ; %4.2f ; %s"
-#: src/import.c:2103
+#: src/import.c:2127
#, fuzzy, c-format
msgid "Transaction found : %s ; %s ; %s"
msgstr "Znaleziona transakcja : %02d/%02d/%04d ; %s ; %4.2f"
#. Check = Chèque
-#: src/import.c:2317 src/plugins/ofx/ofx.c:431
+#: src/import.c:2341 src/plugins/ofx/ofx.c:431
msgid "Check"
msgstr "Sprawdź"
#. Cash withdrawal = retrait en liquide
-#: src/import.c:2361
+#: src/import.c:2385
msgid "Cash withdrawal"
msgstr ""
-#: src/import.c:2451
+#: src/import.c:2475
#, fuzzy, c-format
msgid ""
"Warning : the cheque number %ld is already used.\n"
@@ -8273,7 +8289,7 @@
"Ostrzeżenie: podany numer czeku zostaŠjuż użyty.\n"
" KontynuowaÄ mimo to?"
-#: src/import.c:2516
+#: src/import.c:2540
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 ?"
@@ -8281,99 +8297,104 @@
"Prawdopodobnie wybraÅeÅ nieprawidÅowe konto? Jeżeli wybierzesz kontynuacjÄ "
"identyfikator konta zostanie zmieniony. Czy chcesz kontynuoaÄ?"
-#: src/import.c:2792
+#: src/import.c:2816
msgid "Orphaned transactions"
msgstr "Osierocona transakcja"
-#: src/import.c:2805
+#: src/import.c:2829
msgid "Mark transactions you want to add to the list and click the add button"
msgstr ""
"Zaznacz transakcje do dodania do listy i nastÄpnie kliknij na przycisk Dodaj"
-#: src/import.c:2874
+#: src/import.c:2898
msgid "Mark"
msgstr "Zanacz"
-#: src/import.c:3075
+#: src/import.c:3099
#, fuzzy, c-format
msgid "%s #%d"
msgstr "%s %d"
-#: src/import.c:3110
+#: src/import.c:3134
msgid "Threshold while matching transaction date during import (in days)"
msgstr ""
-#: src/import.c:3136
+#: src/import.c:3160
+#, fuzzy
+msgid "merge transactions imported with planned transactions"
+msgstr "PrzeksztaÅÄ transakcjÄ w zaplanowanÄ
transakcjÄ"
+
+#: src/import.c:3173
msgid "automatically associate the category of the payee if it is possible"
msgstr ""
-#: src/import.c:3149
+#: src/import.c:3186
#, fuzzy
msgid "Set the financial year"
msgstr "Wybierz rok finansowy"
-#: src/import.c:3150
+#: src/import.c:3187
#, fuzzy
msgid "According to the date"
msgstr "roku zgodnego z datÄ
transakcji"
-#: src/import.c:3151
+#: src/import.c:3188
msgid "According to the value date (if fail, try with the date)"
msgstr ""
-#: src/import.c:3295
+#: src/import.c:3332
#, c-format
msgid ""
"%s is neither an OFX file, neither a QIF file. Nothing will be done for that "
"file."
msgstr ""
-#: src/import.c:3353
+#: src/import.c:3390
#, c-format
msgid ""
"%s was not imported successfully. An error occured while getting the "
"transactions."
msgstr ""
-#: src/import.c:3431
+#: src/import.c:3468
msgid "Import a file with a rule"
msgstr ""
#. text for paddingbox
-#: src/import.c:3442
+#: src/import.c:3479
#, fuzzy, c-format
msgid "Properties of the rule : %s\n"
msgstr "Wynik dla %s"
-#: src/import.c:3461
+#: src/import.c:3498
#, fuzzy, c-format
msgid "Imported transactions will be added to the account %s.\n"
msgstr ""
"Waluta wszystkich transakcji zostanie zmieniona na walutÄ domyÅlnÄ
konta."
-#: src/import.c:3464
+#: src/import.c:3501
#, fuzzy, c-format
msgid "Imported transactions will mark transactions in the account %s.\n"
msgstr "Transakcja zbiorcza jest transferem do tego konta.\n"
#. textstring 2
-#: src/import.c:3468
+#: src/import.c:3505
#, fuzzy, c-format
msgid "Currency to import is %s.\n"
msgstr "SzczegóÅy waluty"
-#: src/import.c:3474
+#: src/import.c:3511
#, fuzzy
msgid "Amounts of the transactions will be inverted.\n"
msgstr "Wykonane automatyczne zaplanowane transakcje"
#. label filename
-#: src/import.c:3484
+#: src/import.c:3521
#, fuzzy
msgid "Name of the file to import "
msgstr "Nazwa pliku kont"
-#: src/import.c:3578
+#: src/import.c:3615
#, fuzzy, c-format
msgid "Unable to create tmp file: %s\n"
msgstr "Nie można otworzyÄ pliku '%s': %s"
@@ -8870,7 +8891,7 @@
msgstr "Brak podkategorii"
#. * Find a unique name for payee
-#: src/meta_payee.c:320 src/tiers_onglet.c:299
+#: src/meta_payee.c:320 src/tiers_onglet.c:300
#, fuzzy
msgid "New payee"
msgstr "Nowa metoda pÅatnoÅci"
@@ -9547,41 +9568,41 @@
msgid "Error opening file '%s'"
msgstr "BÅÄ
d otwarcia pliku '%s'."
-#: src/tiers_onglet.c:303
+#: src/tiers_onglet.c:304
#, fuzzy
msgid "Create a new payee"
msgstr "Twórz nowe konto"
-#: src/tiers_onglet.c:312
+#: src/tiers_onglet.c:313
#, fuzzy
msgid "Delete selected payee"
msgstr "UsuÅ beneficjenta"
-#: src/tiers_onglet.c:321
+#: src/tiers_onglet.c:322
msgid "Edit selected payee"
msgstr ""
-#: src/tiers_onglet.c:325
+#: src/tiers_onglet.c:326
#, fuzzy
msgid "Remove unused payees"
msgstr "Nazwa pliku kont"
-#: src/tiers_onglet.c:329 src/tiers_onglet.c:373
+#: src/tiers_onglet.c:330 src/tiers_onglet.c:374
#, fuzzy
msgid "Remove orphan payees"
msgstr "Nazwa pliku kont"
-#: src/tiers_onglet.c:343
+#: src/tiers_onglet.c:344
#, fuzzy
msgid "Manage payees"
msgstr "Strona gÅówna"
-#: src/tiers_onglet.c:347 src/tiers_onglet.c:729
+#: src/tiers_onglet.c:348 src/tiers_onglet.c:730
#, fuzzy
msgid "Manage the payees"
msgstr "Pokaż kategorie"
-#: src/tiers_onglet.c:374
+#: src/tiers_onglet.c:375
msgid ""
"This will remove all the payees wich are not used in any transactions. "
"Payees linked to an archived transactions will not be removed, even if not "
@@ -9590,29 +9611,29 @@
"Are you sure you want to do that?"
msgstr ""
-#: src/tiers_onglet.c:386 src/tiers_onglet.c:819
+#: src/tiers_onglet.c:387 src/tiers_onglet.c:862
#, c-format
msgid "Removed %d payees."
msgstr ""
#. Edit transaction
-#: src/tiers_onglet.c:411
+#: src/tiers_onglet.c:412
msgid "Payee view"
msgstr ""
-#: src/tiers_onglet.c:633
+#: src/tiers_onglet.c:634
#, c-format
msgid ""
"You tried to rename current payee to '%s' but this payee already exists. "
"Please choose another name."
msgstr ""
-#: src/tiers_onglet.c:637
+#: src/tiers_onglet.c:638
#, fuzzy
msgid "Payee already exists"
msgstr "Plik już istnieje"
-#: src/tiers_onglet.c:730
+#: src/tiers_onglet.c:731
msgid ""
"This wizard will help you to simplify the list of payees.\n"
"\n"
@@ -9621,12 +9642,12 @@
"It is better to make a backup of your Grisbi file if you have not yet done. "
msgstr ""
-#: src/tiers_onglet.c:873
+#: src/tiers_onglet.c:916
#, fuzzy
msgid "Choose a payee"
msgstr "Wybierz plik do importu"
-#: src/tiers_onglet.c:875
+#: src/tiers_onglet.c:918
msgid ""
"Select one payee in the list that you modify to serve as the basis for your "
"research.\n"
@@ -9637,69 +9658,69 @@
"string_1%string_2"
msgstr ""
-#: src/tiers_onglet.c:896
+#: src/tiers_onglet.c:939
#, fuzzy
msgid "Enter the new payee"
msgstr "Podaj nawÄ nowego beneficjenta"
-#: src/tiers_onglet.c:898
+#: src/tiers_onglet.c:941
#, fuzzy
msgid "Enter the name of the new payee"
msgstr "Podaj nazwÄ nowej podgrupy linii budżetowej"
-#: src/tiers_onglet.c:911
+#: src/tiers_onglet.c:954
#, fuzzy
msgid "Options"
msgstr "Wydatki"
-#: src/tiers_onglet.c:913
+#: src/tiers_onglet.c:956
msgid "Extracting a number and save it in the field No Cheque/Virement"
msgstr ""
-#: src/tiers_onglet.c:919
+#: src/tiers_onglet.c:962
msgid "Save the payees in the notes"
msgstr ""
-#: src/tiers_onglet.c:952
+#: src/tiers_onglet.c:995
msgid "List of payees who will be modified"
msgstr ""
-#: src/tiers_onglet.c:994
+#: src/tiers_onglet.c:1037
#, fuzzy
msgid "Select"
msgstr "Zaznacz wszystkie"
-#: src/tiers_onglet.c:1002
+#: src/tiers_onglet.c:1045
#, fuzzy
msgid "Payee number"
msgstr "numer czeku"
-#: src/tiers_onglet.c:1012
+#: src/tiers_onglet.c:1055
#, fuzzy
msgid "Payee name"
msgstr "Razem"
-#: src/tiers_onglet.c:1028
+#: src/tiers_onglet.c:1071
msgid "Total number of payees :"
msgstr ""
#. ajoute le nombre de tiers sélectionnés
-#: src/tiers_onglet.c:1045
+#: src/tiers_onglet.c:1088
#, fuzzy
msgid "Number of selected payees :"
msgstr "UsuÅ beneficjenta"
-#: src/tiers_onglet.c:1147
+#: src/tiers_onglet.c:1190
#, c-format
msgid "Payee sought : %s\n"
msgstr ""
-#: src/tiers_onglet.c:1153
+#: src/tiers_onglet.c:1196
#, fuzzy, c-format
msgid "New payee : %s"
msgstr "Nowa metoda pÅatnoÅci"
-#: src/tiers_onglet.c:1229
+#: src/tiers_onglet.c:1272
#, c-format
msgid ""
"You are about to replace %d payees whose names contain %s\n"
@@ -9708,11 +9729,11 @@
"<span weight=\"bold\">Are you sure?</span>"
msgstr ""
-#: src/tiers_onglet.c:1393
+#: src/tiers_onglet.c:1436
msgid "You must choose a payee for searching."
msgstr ""
-#: src/tiers_onglet.c:1397
+#: src/tiers_onglet.c:1440
msgid "Beware you don't use one of models for the research."
msgstr ""
@@ -11271,9 +11292,6 @@
#~ msgid "Account split"
#~ msgstr "Transakcja zbiorcza konta"
-#~ msgid "Confirmation of transaction removal"
-#~ msgstr "Potwierdzenie usuniÄcia transakcji"
-
#~ msgid ""
#~ "You are currently trying to remove a transaction. There is no undo for "
#~ "this. Do you confirm the removal?"
Index: grisbi.pot
===================================================================
RCS file: /cvsroot/grisbi/grisbi/po/grisbi.pot,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- grisbi.pot 13 Mar 2009 20:15:36 -0000 1.64
+++ grisbi.pot 17 Mar 2009 22:05:33 -0000 1.65
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 20:58+0100\n"
+"POT-Creation-Date: 2009-03-17 21:51+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"
@@ -407,7 +407,7 @@
#: src/gsb_assistant_reconcile_config.c:612
#: src/gsb_payment_method_config.c:159 src/gsb_reconcile_config.c:96
#: src/gsb_scheduler_list.c:331 src/imputation_budgetaire.c:164
-#: src/tiers_onglet.c:226
+#: src/tiers_onglet.c:227
msgid "Account"
msgstr ""
@@ -420,13 +420,13 @@
#: src/export_csv.c:747 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1281 src/gsb_form_widget.c:400 src/gsb_reconcile.c:154
#: src/gsb_scheduler_list.c:331 src/gsb_transactions_list.c:143
-#: src/import.c:2882 src/import_csv.c:78 src/traitement_variables.c:74
+#: src/import.c:2906 src/import_csv.c:78 src/traitement_variables.c:74
msgid "Date"
msgstr ""
#. Description entry
#: src/balance_estimate_tab.c:300 src/etats_onglet.c:287
-#: src/tiers_onglet.c:591
+#: src/tiers_onglet.c:592
msgid "Description"
msgstr ""
@@ -474,7 +474,7 @@
#: src/barre_outils.c:107 src/barre_outils.c:453 src/categories_onglet.c:499
#: src/etats_onglet.c:173 src/imputation_budgetaire.c:532
-#: src/tiers_onglet.c:307
+#: src/tiers_onglet.c:308
msgid "Delete"
msgstr ""
@@ -509,7 +509,7 @@
msgstr ""
#: src/barre_outils.c:153 src/barre_outils.c:513 src/categories_onglet.c:518
-#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:334
+#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:335
msgid "View"
msgstr ""
@@ -538,7 +538,7 @@
msgstr ""
#: src/barre_outils.c:237 src/categories_onglet.c:562
-#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:417
+#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:418
msgid "Complete view"
msgstr ""
@@ -641,7 +641,7 @@
#: src/categories_onglet.c:160 src/export_csv.c:774 src/gsb_reconcile.c:157
#: src/gsb_scheduler_list.c:332 src/gsb_transactions_list.c:149
#: src/gsb_transactions_list.c:2867 src/import_csv.c:86
-#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:235
+#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:236
#: src/traitement_variables.c:80
msgid "Balance"
msgstr ""
@@ -711,7 +711,7 @@
msgstr ""
#: src/categories_onglet.c:480 src/etats_onglet.c:130 src/import.c:350
-#: src/import.c:3099 src/imputation_budgetaire.c:513 src/parametres.c:287
+#: src/import.c:3123 src/imputation_budgetaire.c:513 src/parametres.c:287
msgid "Import"
msgstr ""
@@ -734,7 +734,7 @@
#: src/categories_onglet.c:508 src/etats_onglet.c:184
#: src/fenetre_principale.c:251 src/imputation_budgetaire.c:542
-#: src/tiers_onglet.c:316
+#: src/tiers_onglet.c:317
msgid "Properties"
msgstr ""
@@ -742,7 +742,7 @@
msgid "Edit selected category"
msgstr ""
-#: src/categories_onglet.c:522 src/tiers_onglet.c:338
+#: src/categories_onglet.c:522 src/tiers_onglet.c:339
msgid "Change view mode"
msgstr ""
@@ -757,7 +757,7 @@
#: src/categories_onglet.c:607 src/categories_onglet.c:611
#: src/imputation_budgetaire.c:640 src/imputation_budgetaire.c:645
-#: src/tiers_onglet.c:553
+#: src/tiers_onglet.c:554
#, c-format
msgid "Properties for %s"
msgstr ""
@@ -785,7 +785,7 @@
#: src/gsb_bank.c:832 src/gsb_currency_config.c:355 src/gsb_fyear_config.c:191
#: src/gsb_fyear_config.c:278 src/gsb_payment_method_config.c:239
#: src/gsb_reconcile_config.c:179 src/gsb_transactions_list.c:1733
-#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:578
+#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:579
msgid "Name"
msgstr ""
@@ -1281,12 +1281,12 @@
#. Transfer = Virement
#. Direct deposit remplacé par Transfert = Virement
-#: src/etats_affiche.c:1837 src/import.c:2349 src/import.c:2367
+#: src/etats_affiche.c:1837 src/import.c:2373 src/import.c:2391
msgid "Transfert"
msgstr ""
#: src/etats_affiche.c:1846 src/export_csv.c:561 src/gsb_data_category.c:1039
-#: src/gsb_form.c:740 src/gsb_form.c:2465 src/gsb_form.c:2837
+#: src/gsb_form.c:740 src/gsb_form.c:2476 src/gsb_form.c:2848
#: src/gsb_form_scheduler.c:321 src/gsb_transactions_list.c:3216
msgid "Split of transaction"
msgstr ""
@@ -1341,7 +1341,7 @@
#: src/etats_config.c:687 src/etats_config.c:7193 src/export_csv.c:762
#: src/fenetre_principale.c:266 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1308 src/gsb_form_widget.c:420 src/gsb_scheduler_list.c:331
-#: src/gsb_transactions_list.c:145 src/import.c:2889 src/import_csv.c:80
+#: src/gsb_transactions_list.c:145 src/import.c:2913 src/import_csv.c:80
#: src/meta_payee.c:76 src/traitement_variables.c:76
msgid "Payee"
msgstr ""
@@ -1660,14 +1660,14 @@
#: src/etats_config.c:2581 src/etats_config.c:2848 src/etats_config.c:3138
#: src/etats_config.c:3951 src/etats_config.c:4147 src/etats_config.c:7512
-#: src/tiers_onglet.c:1263 src/tiers_onglet.c:1283
+#: src/tiers_onglet.c:1306 src/tiers_onglet.c:1326
msgid "Select all"
msgstr ""
#. ajoute le bouton (dé)sélectionne tout
#: src/etats_config.c:2596 src/etats_config.c:2863 src/etats_config.c:3153
#: src/etats_config.c:3966 src/etats_config.c:4162 src/etats_config.c:7527
-#: src/tiers_onglet.c:1062 src/tiers_onglet.c:1265
+#: src/tiers_onglet.c:1105 src/tiers_onglet.c:1308
msgid "Unselect all"
msgstr ""
@@ -1770,7 +1770,7 @@
#. set the title
#: src/etats_config.c:4041 src/navigation.c:290 src/navigation.c:1228
-#: src/tiers_onglet.c:214
+#: src/tiers_onglet.c:215
msgid "Payees"
msgstr ""
@@ -1882,7 +1882,7 @@
#: src/etats_config.c:5310 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:2897
+#: src/gsb_transactions_list.c:150 src/import.c:2921
#: src/traitement_variables.c:81
msgid "Amount"
msgstr ""
@@ -3616,7 +3616,7 @@
msgstr ""
#: src/gsb_assistant_archive.c:354 src/gsb_data_payee.c:511
-#: src/gsb_form.c:2572 src/gsb_form.c:2573 src/navigation.c:1289
+#: src/gsb_form.c:2583 src/gsb_form.c:2584 src/navigation.c:1289
msgid "Report"
msgstr ""
@@ -5908,19 +5908,19 @@
msgstr ""
#. Deposit = Dépôt
-#: src/gsb_data_payment.c:714 src/import.c:2331 src/plugins/ofx/ofx.c:451
+#: src/gsb_data_payment.c:714 src/import.c:2355 src/plugins/ofx/ofx.c:451
msgid "Deposit"
msgstr ""
#. pas trouvé de définition remplacé par carte de crédit
#. Point of sale = Point de vente remplacé par carte de crédit
-#: src/gsb_data_payment.c:723 src/import.c:2337 src/import.c:2343
+#: src/gsb_data_payment.c:723 src/import.c:2361 src/import.c:2367
msgid "Credit card"
msgstr ""
#. Electronic payment remplacé par Direct debit = Prélèvement
#. Merchant initiated debit remplacé par Direct debit = Prélèvement
-#: src/gsb_data_payment.c:732 src/import.c:2355 src/import.c:2373
+#: src/gsb_data_payment.c:732 src/import.c:2379 src/import.c:2397
msgid "Direct debit"
msgstr ""
@@ -6387,7 +6387,7 @@
msgid "Encryption plugin not found."
msgstr ""
-#: src/gsb_file_load.c:410 src/gsb_file_load.c:4364
+#: src/gsb_file_load.c:410 src/gsb_file_load.c:4370
msgid "This is not a Grisbi file... Loading aborted."
msgstr ""
@@ -6401,14 +6401,14 @@
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: src/gsb_file_load.c:7582
+#: src/gsb_file_load.c:7588
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr ""
-#: src/gsb_file_load.c:7621
+#: src/gsb_file_load.c:7627
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6416,11 +6416,11 @@
"transactions or important informations."
msgstr ""
-#: src/gsb_file_load.c:7622
+#: src/gsb_file_load.c:7628
msgid "Grisbi archive opened"
msgstr ""
-#: src/gsb_file_load.c:7714
+#: src/gsb_file_load.c:7720
#, c-format
msgid ""
"Your old file grisbi was saved as: \n"
@@ -6544,83 +6544,83 @@
msgid "Cheque/Transfer number"
msgstr ""
-#: src/gsb_form.c:2157
+#: src/gsb_form.c:2168
msgid "No payee selected for this report."
msgstr ""
-#: src/gsb_form.c:2415
+#: src/gsb_form.c:2426
msgid "You must enter a date."
msgstr ""
-#: src/gsb_form.c:2422
+#: src/gsb_form.c:2433
#, c-format
msgid "Invalid date %s"
msgstr ""
-#: src/gsb_form.c:2441
+#: src/gsb_form.c:2452
#, c-format
msgid "Invalid value date %s"
msgstr ""
-#: src/gsb_form.c:2467
+#: src/gsb_form.c:2478
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: src/gsb_form.c:2500
+#: src/gsb_form.c:2511
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr ""
-#: src/gsb_form.c:2507
+#: src/gsb_form.c:2518
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr ""
-#: src/gsb_form.c:2515
+#: src/gsb_form.c:2526
msgid "Can't issue a transfer its own account."
msgstr ""
-#: src/gsb_form.c:2520
+#: src/gsb_form.c:2531
msgid "Can't issue a transfer on a closed account."
msgstr ""
-#: src/gsb_form.c:2546
+#: src/gsb_form.c:2557
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
"Continue anyway?"
msgstr ""
-#: src/gsb_form.c:2560
+#: src/gsb_form.c:2571
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
msgstr ""
-#: src/gsb_form.c:2580
+#: src/gsb_form.c:2591
msgid "A transaction with a multiple payee must be a new one."
msgstr ""
-#: src/gsb_form.c:2585
+#: src/gsb_form.c:2596
msgid "A transaction with a multiple payee cannot be a split child."
msgstr ""
-#: src/gsb_form.c:2596
+#: src/gsb_form.c:2607
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: src/gsb_form.c:2603
+#: src/gsb_form.c:2614
msgid "Invalid multiple payee."
msgstr ""
-#: src/gsb_form.c:2860
+#: src/gsb_form.c:2871
msgid "Modifying a transaction"
msgstr ""
-#: src/gsb_form.c:2861
+#: src/gsb_form.c:2872
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -6630,7 +6630,7 @@
msgstr ""
#. propose to configure the form
-#: src/gsb_form.c:3161
+#: src/gsb_form.c:3172
msgid "Configure the form"
msgstr ""
@@ -7545,11 +7545,11 @@
msgid "File name"
msgstr ""
-#: src/import.c:526 src/import.c:608 src/import.c:3207 src/import.c:3230
+#: src/import.c:526 src/import.c:608 src/import.c:3244 src/import.c:3267
msgid "Unknown"
msgstr ""
-#: src/import.c:568 src/import.c:3310 src/import_csv.c:1045
+#: src/import.c:568 src/import.c:3347 src/import_csv.c:1045
#, c-format
msgid "Unable to read file: %s\n"
msgstr ""
@@ -7701,7 +7701,7 @@
#. there is a difference between the imported account id and grisbi account id,
#. * ask to be sure
-#: src/import.c:1730
+#: src/import.c:1731
#, c-format
msgid ""
"The Grisbi's id account is %s, but the imported id account is %s.\n"
@@ -7713,145 +7713,162 @@
#. l'id du compte choisi et l'id du compte importé sont différents
#. on propose encore d'arrêter...
-#: src/import.c:1733 src/import.c:2515
+#: src/import.c:1734 src/import.c:2539
msgid "The id of the imported and chosen accounts are different"
msgstr ""
-#: src/import.c:1963
+#: src/import.c:1968
+msgid "Confirmation of transactions to be merged"
+msgstr ""
+
+#: src/import.c:1971
msgid "Confirmation of importation of transactions"
msgstr ""
-#: src/import.c:1975
+#: src/import.c:1987
+msgid "Please select the transactions to be merged"
+msgstr ""
+
+#: src/import.c:1990
msgid ""
-"Some imported transactions seem to be already saved. Please select the "
+"Some imported transactions seem to be already saved.Please select the "
"transactions to import."
msgstr ""
-#: src/import.c:2051
+#: src/import.c:2070
+#, c-format
+msgid "Transactions to be merged : %s ; %s ; %s"
+msgstr ""
+
+#: src/import.c:2075
#, c-format
msgid "Transactions to import : %s ; %s ; %s"
msgstr ""
-#: src/import.c:2090
+#: src/import.c:2114
#, c-format
msgid "Transaction found : %s ; %s ; %s ; %s"
msgstr ""
-#: src/import.c:2103
+#: src/import.c:2127
#, c-format
msgid "Transaction found : %s ; %s ; %s"
msgstr ""
#. Check = Chèque
-#: src/import.c:2317 src/plugins/ofx/ofx.c:431
+#: src/import.c:2341 src/plugins/ofx/ofx.c:431
msgid "Check"
msgstr ""
#. Cash withdrawal = retrait en liquide
-#: src/import.c:2361
+#: src/import.c:2385
msgid "Cash withdrawal"
msgstr ""
-#: src/import.c:2451
+#: src/import.c:2475
#, c-format
msgid ""
"Warning : the cheque number %ld is already used.\n"
"We skip it"
msgstr ""
-#: src/import.c:2516
+#: src/import.c:2540
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:2792
+#: src/import.c:2816
msgid "Orphaned transactions"
msgstr ""
-#: src/import.c:2805
+#: src/import.c:2829
msgid "Mark transactions you want to add to the list and click the add button"
msgstr ""
-#: src/import.c:2874
+#: src/import.c:2898
msgid "Mark"
msgstr ""
-#: src/import.c:3075
+#: src/import.c:3099
#, c-format
msgid "%s #%d"
msgstr ""
-#: src/import.c:3110
+#: src/import.c:3134
msgid "Threshold while matching transaction date during import (in days)"
msgstr ""
-#: src/import.c:3136
+#: src/import.c:3160
+msgid "merge transactions imported with planned transactions"
+msgstr ""
+
+#: src/import.c:3173
msgid "automatically associate the category of the payee if it is possible"
msgstr ""
-#: src/import.c:3149
+#: src/import.c:3186
msgid "Set the financial year"
msgstr ""
-#: src/import.c:3150
+#: src/import.c:3187
msgid "According to the date"
msgstr ""
-#: src/import.c:3151
+#: src/import.c:3188
msgid "According to the value date (if fail, try with the date)"
msgstr ""
-#: src/import.c:3295
+#: src/import.c:3332
#, c-format
msgid ""
"%s is neither an OFX file, neither a QIF file. Nothing will be done for that "
"file."
msgstr ""
-#: src/import.c:3353
+#: src/import.c:3390
#, c-format
msgid ""
"%s was not imported successfully. An error occured while getting the "
"transactions."
msgstr ""
-#: src/import.c:3431
+#: src/import.c:3468
msgid "Import a file with a rule"
msgstr ""
#. text for paddingbox
-#: src/import.c:3442
+#: src/import.c:3479
#, c-format
msgid "Properties of the rule : %s\n"
msgstr ""
-#: src/import.c:3461
+#: src/import.c:3498
#, c-format
msgid "Imported transactions will be added to the account %s.\n"
msgstr ""
-#: src/import.c:3464
+#: src/import.c:3501
#, c-format
msgid "Imported transactions will mark transactions in the account %s.\n"
msgstr ""
#. textstring 2
-#: src/import.c:3468
+#: src/import.c:3505
#, c-format
msgid "Currency to import is %s.\n"
msgstr ""
-#: src/import.c:3474
+#: src/import.c:3511
msgid "Amounts of the transactions will be inverted.\n"
msgstr ""
#. label filename
-#: src/import.c:3484
+#: src/import.c:3521
msgid "Name of the file to import "
msgstr ""
-#: src/import.c:3578
+#: src/import.c:3615
#, c-format
msgid "Unable to create tmp file: %s\n"
msgstr ""
@@ -8273,7 +8290,7 @@
msgstr ""
#. * Find a unique name for payee
-#: src/meta_payee.c:320 src/tiers_onglet.c:299
+#: src/meta_payee.c:320 src/tiers_onglet.c:300
msgid "New payee"
msgstr ""
@@ -8893,35 +8910,35 @@
msgid "Error opening file '%s'"
msgstr ""
-#: src/tiers_onglet.c:303
+#: src/tiers_onglet.c:304
msgid "Create a new payee"
msgstr ""
-#: src/tiers_onglet.c:312
+#: src/tiers_onglet.c:313
msgid "Delete selected payee"
msgstr ""
-#: src/tiers_onglet.c:321
+#: src/tiers_onglet.c:322
msgid "Edit selected payee"
msgstr ""
-#: src/tiers_onglet.c:325
+#: src/tiers_onglet.c:326
msgid "Remove unused payees"
msgstr ""
-#: src/tiers_onglet.c:329 src/tiers_onglet.c:373
+#: src/tiers_onglet.c:330 src/tiers_onglet.c:374
msgid "Remove orphan payees"
msgstr ""
-#: src/tiers_onglet.c:343
+#: src/tiers_onglet.c:344
msgid "Manage payees"
msgstr ""
-#: src/tiers_onglet.c:347 src/tiers_onglet.c:729
+#: src/tiers_onglet.c:348 src/tiers_onglet.c:730
msgid "Manage the payees"
msgstr ""
-#: src/tiers_onglet.c:374
+#: src/tiers_onglet.c:375
msgid ""
"This will remove all the payees wich are not used in any transactions. "
"Payees linked to an archived transactions will not be removed, even if not "
@@ -8930,28 +8947,28 @@
"Are you sure you want to do that?"
msgstr ""
-#: src/tiers_onglet.c:386 src/tiers_onglet.c:819
+#: src/tiers_onglet.c:387 src/tiers_onglet.c:862
#, c-format
msgid "Removed %d payees."
msgstr ""
#. Edit transaction
-#: src/tiers_onglet.c:411
+#: src/tiers_onglet.c:412
msgid "Payee view"
msgstr ""
-#: src/tiers_onglet.c:633
+#: src/tiers_onglet.c:634
#, c-format
msgid ""
"You tried to rename current payee to '%s' but this payee already exists. "
"Please choose another name."
msgstr ""
-#: src/tiers_onglet.c:637
+#: src/tiers_onglet.c:638
msgid "Payee already exists"
msgstr ""
-#: src/tiers_onglet.c:730
+#: src/tiers_onglet.c:731
msgid ""
"This wizard will help you to simplify the list of payees.\n"
"\n"
@@ -8960,11 +8977,11 @@
"It is better to make a backup of your Grisbi file if you have not yet done. "
msgstr ""
-#: src/tiers_onglet.c:873
+#: src/tiers_onglet.c:916
msgid "Choose a payee"
msgstr ""
-#: src/tiers_onglet.c:875
+#: src/tiers_onglet.c:918
msgid ""
"Select one payee in the list that you modify to serve as the basis for your "
"research.\n"
@@ -8975,62 +8992,62 @@
"string_1%string_2"
msgstr ""
-#: src/tiers_onglet.c:896
+#: src/tiers_onglet.c:939
msgid "Enter the new payee"
msgstr ""
-#: src/tiers_onglet.c:898
+#: src/tiers_onglet.c:941
msgid "Enter the name of the new payee"
msgstr ""
-#: src/tiers_onglet.c:911
+#: src/tiers_onglet.c:954
msgid "Options"
msgstr ""
-#: src/tiers_onglet.c:913
+#: src/tiers_onglet.c:956
msgid "Extracting a number and save it in the field No Cheque/Virement"
msgstr ""
-#: src/tiers_onglet.c:919
+#: src/tiers_onglet.c:962
msgid "Save the payees in the notes"
msgstr ""
-#: src/tiers_onglet.c:952
+#: src/tiers_onglet.c:995
msgid "List of payees who will be modified"
msgstr ""
-#: src/tiers_onglet.c:994
+#: src/tiers_onglet.c:1037
msgid "Select"
msgstr ""
-#: src/tiers_onglet.c:1002
+#: src/tiers_onglet.c:1045
msgid "Payee number"
msgstr ""
-#: src/tiers_onglet.c:1012
+#: src/tiers_onglet.c:1055
msgid "Payee name"
msgstr ""
-#: src/tiers_onglet.c:1028
+#: src/tiers_onglet.c:1071
msgid "Total number of payees :"
msgstr ""
#. ajoute le nombre de tiers sélectionnés
-#: src/tiers_onglet.c:1045
+#: src/tiers_onglet.c:1088
msgid "Number of selected payees :"
msgstr ""
-#: src/tiers_onglet.c:1147
+#: src/tiers_onglet.c:1190
#, c-format
msgid "Payee sought : %s\n"
msgstr ""
-#: src/tiers_onglet.c:1153
+#: src/tiers_onglet.c:1196
#, c-format
msgid "New payee : %s"
msgstr ""
-#: src/tiers_onglet.c:1229
+#: src/tiers_onglet.c:1272
#, c-format
msgid ""
"You are about to replace %d payees whose names contain %s\n"
@@ -9039,11 +9056,11 @@
"<span weight=\"bold\">Are you sure?</span>"
msgstr ""
-#: src/tiers_onglet.c:1393
+#: src/tiers_onglet.c:1436
msgid "You must choose a payee for searching."
msgstr ""
-#: src/tiers_onglet.c:1397
+#: src/tiers_onglet.c:1440
msgid "Beware you don't use one of models for the research."
msgstr ""
Index: fa.po
===================================================================
RCS file: /cvsroot/grisbi/grisbi/po/fa.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- fa.po 13 Mar 2009 20:15:36 -0000 1.16
+++ fa.po 17 Mar 2009 22:05:33 -0000 1.17
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: girisbi VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 20:58+0100\n"
+"POT-Creation-Date: 2009-03-17 21:51+0100\n"
"PO-Revision-Date: 2008-10-02 10:07+0330\n"
"Last-Translator: hadi <hadi60 at gmail.com>\n"
"Language-Team: farsi <en at li.org>\n"
@@ -432,7 +432,7 @@
#: src/gsb_assistant_reconcile_config.c:612
#: src/gsb_payment_method_config.c:159 src/gsb_reconcile_config.c:96
#: src/gsb_scheduler_list.c:331 src/imputation_budgetaire.c:164
-#: src/tiers_onglet.c:226
+#: src/tiers_onglet.c:227
msgid "Account"
msgstr "Øساب Ùا"
@@ -445,13 +445,13 @@
#: src/export_csv.c:747 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1281 src/gsb_form_widget.c:400 src/gsb_reconcile.c:154
#: src/gsb_scheduler_list.c:331 src/gsb_transactions_list.c:143
-#: src/import.c:2882 src/import_csv.c:78 src/traitement_variables.c:74
+#: src/import.c:2906 src/import_csv.c:78 src/traitement_variables.c:74
msgid "Date"
msgstr "تارÛØ®"
#. Description entry
#: src/balance_estimate_tab.c:300 src/etats_onglet.c:287
-#: src/tiers_onglet.c:591
+#: src/tiers_onglet.c:592
msgid "Description"
msgstr "تÙضÛØات"
@@ -499,7 +499,7 @@
#: src/barre_outils.c:107 src/barre_outils.c:453 src/categories_onglet.c:499
#: src/etats_onglet.c:173 src/imputation_budgetaire.c:532
-#: src/tiers_onglet.c:307
+#: src/tiers_onglet.c:308
msgid "Delete"
msgstr "ØØ°Ù"
@@ -537,7 +537,7 @@
msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
#: src/barre_outils.c:153 src/barre_outils.c:513 src/categories_onglet.c:518
-#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:334
+#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:335
msgid "View"
msgstr ""
@@ -566,7 +566,7 @@
msgstr ""
#: src/barre_outils.c:237 src/categories_onglet.c:562
-#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:417
+#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:418
msgid "Complete view"
msgstr ""
@@ -676,7 +676,7 @@
#: src/categories_onglet.c:160 src/export_csv.c:774 src/gsb_reconcile.c:157
#: src/gsb_scheduler_list.c:332 src/gsb_transactions_list.c:149
#: src/gsb_transactions_list.c:2867 src/import_csv.c:86
-#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:235
+#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:236
#: src/traitement_variables.c:80
msgid "Balance"
msgstr ""
@@ -748,7 +748,7 @@
msgstr ""
#: src/categories_onglet.c:480 src/etats_onglet.c:130 src/import.c:350
-#: src/import.c:3099 src/imputation_budgetaire.c:513 src/parametres.c:287
+#: src/import.c:3123 src/imputation_budgetaire.c:513 src/parametres.c:287
msgid "Import"
msgstr ""
@@ -771,7 +771,7 @@
#: src/categories_onglet.c:508 src/etats_onglet.c:184
#: src/fenetre_principale.c:251 src/imputation_budgetaire.c:542
-#: src/tiers_onglet.c:316
+#: src/tiers_onglet.c:317
msgid "Properties"
msgstr ""
@@ -779,7 +779,7 @@
msgid "Edit selected category"
msgstr ""
-#: src/categories_onglet.c:522 src/tiers_onglet.c:338
+#: src/categories_onglet.c:522 src/tiers_onglet.c:339
#, fuzzy
msgid "Change view mode"
msgstr "تغÛÛر Ù
ØتÙØ§Û Ø³ÙÙÙ Ùا"
@@ -795,7 +795,7 @@
#: src/categories_onglet.c:607 src/categories_onglet.c:611
#: src/imputation_budgetaire.c:640 src/imputation_budgetaire.c:645
-#: src/tiers_onglet.c:553
+#: src/tiers_onglet.c:554
#, c-format
msgid "Properties for %s"
msgstr ""
@@ -823,7 +823,7 @@
#: src/gsb_bank.c:832 src/gsb_currency_config.c:355 src/gsb_fyear_config.c:191
#: src/gsb_fyear_config.c:278 src/gsb_payment_method_config.c:239
#: src/gsb_reconcile_config.c:179 src/gsb_transactions_list.c:1733
-#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:578
+#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:579
msgid "Name"
msgstr ""
@@ -1320,12 +1320,12 @@
#. Transfer = Virement
#. Direct deposit remplacé par Transfert = Virement
-#: src/etats_affiche.c:1837 src/import.c:2349 src/import.c:2367
+#: src/etats_affiche.c:1837 src/import.c:2373 src/import.c:2391
msgid "Transfert"
msgstr ""
#: src/etats_affiche.c:1846 src/export_csv.c:561 src/gsb_data_category.c:1039
-#: src/gsb_form.c:740 src/gsb_form.c:2465 src/gsb_form.c:2837
+#: src/gsb_form.c:740 src/gsb_form.c:2476 src/gsb_form.c:2848
#: src/gsb_form_scheduler.c:321 src/gsb_transactions_list.c:3216
msgid "Split of transaction"
msgstr ""
@@ -1380,7 +1380,7 @@
#: src/etats_config.c:687 src/etats_config.c:7193 src/export_csv.c:762
#: src/fenetre_principale.c:266 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1308 src/gsb_form_widget.c:420 src/gsb_scheduler_list.c:331
-#: src/gsb_transactions_list.c:145 src/import.c:2889 src/import_csv.c:80
+#: src/gsb_transactions_list.c:145 src/import.c:2913 src/import_csv.c:80
#: src/meta_payee.c:76 src/traitement_variables.c:76
msgid "Payee"
msgstr ""
@@ -1701,14 +1701,14 @@
#: src/etats_config.c:2581 src/etats_config.c:2848 src/etats_config.c:3138
#: src/etats_config.c:3951 src/etats_config.c:4147 src/etats_config.c:7512
-#: src/tiers_onglet.c:1263 src/tiers_onglet.c:1283
+#: src/tiers_onglet.c:1306 src/tiers_onglet.c:1326
msgid "Select all"
msgstr ""
#. ajoute le bouton (dé)sélectionne tout
#: src/etats_config.c:2596 src/etats_config.c:2863 src/etats_config.c:3153
#: src/etats_config.c:3966 src/etats_config.c:4162 src/etats_config.c:7527
-#: src/tiers_onglet.c:1062 src/tiers_onglet.c:1265
+#: src/tiers_onglet.c:1105 src/tiers_onglet.c:1308
msgid "Unselect all"
msgstr ""
@@ -1813,7 +1813,7 @@
#. set the title
#: src/etats_config.c:4041 src/navigation.c:290 src/navigation.c:1228
-#: src/tiers_onglet.c:214
+#: src/tiers_onglet.c:215
msgid "Payees"
msgstr ""
@@ -1927,7 +1927,7 @@
#: src/etats_config.c:5310 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:2897
+#: src/gsb_transactions_list.c:150 src/import.c:2921
#: src/traitement_variables.c:81
msgid "Amount"
msgstr "Ù
Ùدار"
@@ -3705,7 +3705,7 @@
msgstr ""
#: src/gsb_assistant_archive.c:354 src/gsb_data_payee.c:511
-#: src/gsb_form.c:2572 src/gsb_form.c:2573 src/navigation.c:1289
+#: src/gsb_form.c:2583 src/gsb_form.c:2584 src/navigation.c:1289
msgid "Report"
msgstr "گزارش"
@@ -6043,19 +6043,19 @@
msgstr ""
#. Deposit = Dépôt
-#: src/gsb_data_payment.c:714 src/import.c:2331 src/plugins/ofx/ofx.c:451
+#: src/gsb_data_payment.c:714 src/import.c:2355 src/plugins/ofx/ofx.c:451
msgid "Deposit"
msgstr ""
#. pas trouvé de définition remplacé par carte de crédit
#. Point of sale = Point de vente remplacé par carte de crédit
-#: src/gsb_data_payment.c:723 src/import.c:2337 src/import.c:2343
+#: src/gsb_data_payment.c:723 src/import.c:2361 src/import.c:2367
msgid "Credit card"
msgstr ""
#. Electronic payment remplacé par Direct debit = Prélèvement
#. Merchant initiated debit remplacé par Direct debit = Prélèvement
-#: src/gsb_data_payment.c:732 src/import.c:2355 src/import.c:2373
+#: src/gsb_data_payment.c:732 src/import.c:2379 src/import.c:2397
msgid "Direct debit"
msgstr ""
@@ -6530,7 +6530,7 @@
msgid "Encryption plugin not found."
msgstr ""
-#: src/gsb_file_load.c:410 src/gsb_file_load.c:4364
+#: src/gsb_file_load.c:410 src/gsb_file_load.c:4370
msgid "This is not a Grisbi file... Loading aborted."
msgstr ""
@@ -6544,14 +6544,14 @@
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: src/gsb_file_load.c:7582
+#: src/gsb_file_load.c:7588
#, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr ""
-#: src/gsb_file_load.c:7621
+#: src/gsb_file_load.c:7627
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6559,11 +6559,11 @@
"transactions or important informations."
msgstr ""
-#: src/gsb_file_load.c:7622
+#: src/gsb_file_load.c:7628
msgid "Grisbi archive opened"
msgstr ""
-#: src/gsb_file_load.c:7714
+#: src/gsb_file_load.c:7720
#, c-format
msgid ""
"Your old file grisbi was saved as: \n"
@@ -6688,84 +6688,84 @@
msgid "Cheque/Transfer number"
msgstr ""
-#: src/gsb_form.c:2157
+#: src/gsb_form.c:2168
msgid "No payee selected for this report."
msgstr ""
-#: src/gsb_form.c:2415
+#: src/gsb_form.c:2426
msgid "You must enter a date."
msgstr "باÛد تارÛØ® را Ùارد Ú©ÙÛد."
-#: src/gsb_form.c:2422
+#: src/gsb_form.c:2433
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "ÙاÙ
ÙاÛÙ Ù
عتبر ÙÛست \"%s\"!"
-#: src/gsb_form.c:2441
+#: src/gsb_form.c:2452
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "ÙاÙ
ÙاÛÙ Ù
عتبر ÙÛست \"%s\"!"
-#: src/gsb_form.c:2467
+#: src/gsb_form.c:2478
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: src/gsb_form.c:2500
+#: src/gsb_form.c:2511
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr ""
-#: src/gsb_form.c:2507
+#: src/gsb_form.c:2518
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr ""
-#: src/gsb_form.c:2515
+#: src/gsb_form.c:2526
msgid "Can't issue a transfer its own account."
msgstr ""
-#: src/gsb_form.c:2520
+#: src/gsb_form.c:2531
msgid "Can't issue a transfer on a closed account."
msgstr ""
-#: src/gsb_form.c:2546
+#: src/gsb_form.c:2557
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
"Continue anyway?"
msgstr ""
-#: src/gsb_form.c:2560
+#: src/gsb_form.c:2571
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
msgstr ""
-#: src/gsb_form.c:2580
+#: src/gsb_form.c:2591
msgid "A transaction with a multiple payee must be a new one."
msgstr ""
-#: src/gsb_form.c:2585
+#: src/gsb_form.c:2596
msgid "A transaction with a multiple payee cannot be a split child."
msgstr ""
-#: src/gsb_form.c:2596
+#: src/gsb_form.c:2607
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: src/gsb_form.c:2603
+#: src/gsb_form.c:2614
msgid "Invalid multiple payee."
msgstr ""
-#: src/gsb_form.c:2860
+#: src/gsb_form.c:2871
#, fuzzy
msgid "Modifying a transaction"
msgstr "Øذ٠تراکÙØ´"
-#: src/gsb_form.c:2861
+#: src/gsb_form.c:2872
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -6775,7 +6775,7 @@
msgstr ""
#. propose to configure the form
-#: src/gsb_form.c:3161
+#: src/gsb_form.c:3172
msgid "Configure the form"
msgstr ""
@@ -7714,11 +7714,11 @@
msgid "File name"
msgstr "ÙاÙ
ÙاÛÙ"
-#: src/import.c:526 src/import.c:608 src/import.c:3207 src/import.c:3230
+#: src/import.c:526 src/import.c:608 src/import.c:3244 src/import.c:3267
msgid "Unknown"
msgstr ""
-#: src/import.c:568 src/import.c:3310 src/import_csv.c:1045
+#: src/import.c:568 src/import.c:3347 src/import_csv.c:1045
#, c-format
msgid "Unable to read file: %s\n"
msgstr ""
@@ -7871,7 +7871,7 @@
#. there is a difference between the imported account id and grisbi account id,
#. * ask to be sure
-#: src/import.c:1730
+#: src/import.c:1731
#, c-format
msgid ""
"The Grisbi's id account is %s, but the imported id account is %s.\n"
@@ -7883,146 +7883,165 @@
#. l'id du compte choisi et l'id du compte importé sont différents
#. on propose encore d'arrêter...
-#: src/import.c:1733 src/import.c:2515
+#: src/import.c:1734 src/import.c:2539
msgid "The id of the imported and chosen accounts are different"
msgstr ""
-#: src/import.c:1963
+#: src/import.c:1968
+#, fuzzy
+msgid "Confirmation of transactions to be merged"
+msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
+
+#: src/import.c:1971
msgid "Confirmation of importation of transactions"
msgstr ""
-#: src/import.c:1975
+#: src/import.c:1987
+#, fuzzy
+msgid "Please select the transactions to be merged"
+msgstr "جستجÙÛ ØªØ±Ø§Ú©ÙØ´"
+
+#: src/import.c:1990
msgid ""
-"Some imported transactions seem to be already saved. Please select the "
+"Some imported transactions seem to be already saved.Please select the "
"transactions to import."
msgstr ""
-#: src/import.c:2051
+#: src/import.c:2070
+#, c-format
+msgid "Transactions to be merged : %s ; %s ; %s"
+msgstr ""
+
+#: src/import.c:2075
#, c-format
msgid "Transactions to import : %s ; %s ; %s"
msgstr ""
-#: src/import.c:2090
+#: src/import.c:2114
#, c-format
msgid "Transaction found : %s ; %s ; %s ; %s"
msgstr ""
-#: src/import.c:2103
+#: src/import.c:2127
#, c-format
msgid "Transaction found : %s ; %s ; %s"
msgstr ""
#. Check = Chèque
-#: src/import.c:2317 src/plugins/ofx/ofx.c:431
+#: src/import.c:2341 src/plugins/ofx/ofx.c:431
msgid "Check"
msgstr "ÚÚ©"
#. Cash withdrawal = retrait en liquide
-#: src/import.c:2361
+#: src/import.c:2385
msgid "Cash withdrawal"
msgstr ""
-#: src/import.c:2451
+#: src/import.c:2475
#, c-format
msgid ""
"Warning : the cheque number %ld is already used.\n"
"We skip it"
msgstr ""
-#: src/import.c:2516
+#: src/import.c:2540
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:2792
+#: src/import.c:2816
msgid "Orphaned transactions"
msgstr ""
-#: src/import.c:2805
+#: src/import.c:2829
msgid "Mark transactions you want to add to the list and click the add button"
msgstr ""
-#: src/import.c:2874
+#: src/import.c:2898
msgid "Mark"
msgstr ""
-#: src/import.c:3075
+#: src/import.c:3099
#, c-format
msgid "%s #%d"
msgstr ""
-#: src/import.c:3110
+#: src/import.c:3134
msgid "Threshold while matching transaction date during import (in days)"
msgstr ""
-#: src/import.c:3136
+#: src/import.c:3160
+msgid "merge transactions imported with planned transactions"
+msgstr ""
+
+#: src/import.c:3173
msgid "automatically associate the category of the payee if it is possible"
msgstr ""
-#: src/import.c:3149
+#: src/import.c:3186
msgid "Set the financial year"
msgstr ""
-#: src/import.c:3150
+#: src/import.c:3187
msgid "According to the date"
msgstr ""
-#: src/import.c:3151
+#: src/import.c:3188
msgid "According to the value date (if fail, try with the date)"
msgstr ""
-#: src/import.c:3295
+#: src/import.c:3332
#, c-format
msgid ""
"%s is neither an OFX file, neither a QIF file. Nothing will be done for that "
"file."
msgstr ""
-#: src/import.c:3353
+#: src/import.c:3390
#, c-format
msgid ""
"%s was not imported successfully. An error occured while getting the "
"transactions."
msgstr ""
-#: src/import.c:3431
+#: src/import.c:3468
msgid "Import a file with a rule"
msgstr ""
#. text for paddingbox
-#: src/import.c:3442
+#: src/import.c:3479
#, c-format
msgid "Properties of the rule : %s\n"
msgstr ""
-#: src/import.c:3461
+#: src/import.c:3498
#, c-format
msgid "Imported transactions will be added to the account %s.\n"
msgstr ""
-#: src/import.c:3464
+#: src/import.c:3501
#, c-format
msgid "Imported transactions will mark transactions in the account %s.\n"
msgstr ""
#. textstring 2
-#: src/import.c:3468
+#: src/import.c:3505
#, c-format
msgid "Currency to import is %s.\n"
msgstr ""
-#: src/import.c:3474
+#: src/import.c:3511
msgid "Amounts of the transactions will be inverted.\n"
msgstr ""
#. label filename
-#: src/import.c:3484
+#: src/import.c:3521
#, fuzzy
msgid "Name of the file to import "
msgstr "ÙÛراÛØ´ گزارش"
-#: src/import.c:3578
+#: src/import.c:3615
#, c-format
msgid "Unable to create tmp file: %s\n"
msgstr ""
@@ -8454,7 +8473,7 @@
msgstr ""
#. * Find a unique name for payee
-#: src/meta_payee.c:320 src/tiers_onglet.c:299
+#: src/meta_payee.c:320 src/tiers_onglet.c:300
msgid "New payee"
msgstr ""
@@ -9089,37 +9108,37 @@
msgid "Error opening file '%s'"
msgstr ""
-#: src/tiers_onglet.c:303
+#: src/tiers_onglet.c:304
msgid "Create a new payee"
msgstr ""
-#: src/tiers_onglet.c:312
+#: src/tiers_onglet.c:313
msgid "Delete selected payee"
msgstr ""
-#: src/tiers_onglet.c:321
+#: src/tiers_onglet.c:322
msgid "Edit selected payee"
msgstr ""
-#: src/tiers_onglet.c:325
+#: src/tiers_onglet.c:326
#, fuzzy
msgid "Remove unused payees"
msgstr "Øذ٠رÙØ´ پرداخت"
-#: src/tiers_onglet.c:329 src/tiers_onglet.c:373
+#: src/tiers_onglet.c:330 src/tiers_onglet.c:374
#, fuzzy
msgid "Remove orphan payees"
msgstr "Øذ٠رÙØ´ پرداخت"
-#: src/tiers_onglet.c:343
+#: src/tiers_onglet.c:344
msgid "Manage payees"
msgstr ""
-#: src/tiers_onglet.c:347 src/tiers_onglet.c:729
+#: src/tiers_onglet.c:348 src/tiers_onglet.c:730
msgid "Manage the payees"
msgstr ""
-#: src/tiers_onglet.c:374
+#: src/tiers_onglet.c:375
msgid ""
"This will remove all the payees wich are not used in any transactions. "
"Payees linked to an archived transactions will not be removed, even if not "
@@ -9128,29 +9147,29 @@
"Are you sure you want to do that?"
msgstr ""
-#: src/tiers_onglet.c:386 src/tiers_onglet.c:819
+#: src/tiers_onglet.c:387 src/tiers_onglet.c:862
#, c-format
msgid "Removed %d payees."
msgstr ""
#. Edit transaction
-#: src/tiers_onglet.c:411
+#: src/tiers_onglet.c:412
msgid "Payee view"
msgstr ""
-#: src/tiers_onglet.c:633
+#: src/tiers_onglet.c:634
#, c-format
msgid ""
"You tried to rename current payee to '%s' but this payee already exists. "
"Please choose another name."
msgstr ""
-#: src/tiers_onglet.c:637
+#: src/tiers_onglet.c:638
#, fuzzy
msgid "Payee already exists"
msgstr "اÛÙ ÙاÛÙ Ù
ÙجÙد است."
-#: src/tiers_onglet.c:730
+#: src/tiers_onglet.c:731
msgid ""
"This wizard will help you to simplify the list of payees.\n"
"\n"
@@ -9159,12 +9178,12 @@
"It is better to make a backup of your Grisbi file if you have not yet done. "
msgstr ""
-#: src/tiers_onglet.c:873
+#: src/tiers_onglet.c:916
#, fuzzy
msgid "Choose a payee"
msgstr "اÙتخاب ÙÙع Øساب"
-#: src/tiers_onglet.c:875
+#: src/tiers_onglet.c:918
msgid ""
"Select one payee in the list that you modify to serve as the basis for your "
"research.\n"
@@ -9175,64 +9194,64 @@
"string_1%string_2"
msgstr ""
-#: src/tiers_onglet.c:896
+#: src/tiers_onglet.c:939
msgid "Enter the new payee"
msgstr ""
-#: src/tiers_onglet.c:898
+#: src/tiers_onglet.c:941
msgid "Enter the name of the new payee"
msgstr ""
-#: src/tiers_onglet.c:911
+#: src/tiers_onglet.c:954
msgid "Options"
msgstr ""
-#: src/tiers_onglet.c:913
+#: src/tiers_onglet.c:956
msgid "Extracting a number and save it in the field No Cheque/Virement"
msgstr ""
-#: src/tiers_onglet.c:919
+#: src/tiers_onglet.c:962
msgid "Save the payees in the notes"
msgstr ""
-#: src/tiers_onglet.c:952
+#: src/tiers_onglet.c:995
msgid "List of payees who will be modified"
msgstr ""
-#: src/tiers_onglet.c:994
+#: src/tiers_onglet.c:1037
#, fuzzy
msgid "Select"
msgstr "ØØ°Ù"
-#: src/tiers_onglet.c:1002
+#: src/tiers_onglet.c:1045
msgid "Payee number"
msgstr ""
-#: src/tiers_onglet.c:1012
+#: src/tiers_onglet.c:1055
#, fuzzy
msgid "Payee name"
msgstr "ÙاÙ
ÙاÛÙ"
-#: src/tiers_onglet.c:1028
+#: src/tiers_onglet.c:1071
msgid "Total number of payees :"
msgstr ""
#. ajoute le nombre de tiers sélectionnés
-#: src/tiers_onglet.c:1045
+#: src/tiers_onglet.c:1088
msgid "Number of selected payees :"
msgstr ""
-#: src/tiers_onglet.c:1147
+#: src/tiers_onglet.c:1190
#, c-format
msgid "Payee sought : %s\n"
msgstr ""
-#: src/tiers_onglet.c:1153
+#: src/tiers_onglet.c:1196
#, c-format
msgid "New payee : %s"
msgstr ""
-#: src/tiers_onglet.c:1229
+#: src/tiers_onglet.c:1272
#, c-format
msgid ""
"You are about to replace %d payees whose names contain %s\n"
@@ -9241,11 +9260,11 @@
"<span weight=\"bold\">Are you sure?</span>"
msgstr ""
-#: src/tiers_onglet.c:1393
+#: src/tiers_onglet.c:1436
msgid "You must choose a payee for searching."
msgstr ""
-#: src/tiers_onglet.c:1397
+#: src/tiers_onglet.c:1440
msgid "Beware you don't use one of models for the research."
msgstr ""
Index: ro.po
===================================================================
RCS file: /cvsroot/grisbi/grisbi/po/ro.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- ro.po 13 Mar 2009 20:15:37 -0000 1.22
+++ ro.po 17 Mar 2009 22:05:33 -0000 1.23
@@ -38,7 +38,7 @@
msgstr ""
"Project-Id-Version: ro\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 20:58+0100\n"
+"POT-Creation-Date: 2009-03-17 21:51+0100\n"
"PO-Revision-Date: 2005-12-19 11:24+0100\n"
"Last-Translator: Mircea Aronovici <bucuresti at free.fr>\n"
"Language-Team: <bucuresti at free.fr>\n"
@@ -479,7 +479,7 @@
#: src/gsb_assistant_reconcile_config.c:612
#: src/gsb_payment_method_config.c:159 src/gsb_reconcile_config.c:96
#: src/gsb_scheduler_list.c:331 src/imputation_budgetaire.c:164
-#: src/tiers_onglet.c:226
+#: src/tiers_onglet.c:227
msgid "Account"
msgstr "Cont"
@@ -492,13 +492,13 @@
#: src/export_csv.c:747 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1281 src/gsb_form_widget.c:400 src/gsb_reconcile.c:154
#: src/gsb_scheduler_list.c:331 src/gsb_transactions_list.c:143
-#: src/import.c:2882 src/import_csv.c:78 src/traitement_variables.c:74
+#: src/import.c:2906 src/import_csv.c:78 src/traitement_variables.c:74
msgid "Date"
msgstr "Data"
#. Description entry
#: src/balance_estimate_tab.c:300 src/etats_onglet.c:287
-#: src/tiers_onglet.c:591
+#: src/tiers_onglet.c:592
msgid "Description"
msgstr "Descripţiune"
@@ -547,7 +547,7 @@
#: src/barre_outils.c:107 src/barre_outils.c:453 src/categories_onglet.c:499
#: src/etats_onglet.c:173 src/imputation_budgetaire.c:532
-#: src/tiers_onglet.c:307
+#: src/tiers_onglet.c:308
#, fuzzy
msgid "Delete"
msgstr "Selecţionaţi"
@@ -587,7 +587,7 @@
msgstr "A tria lista de tranzacţiuni"
#: src/barre_outils.c:153 src/barre_outils.c:513 src/categories_onglet.c:518
-#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:334
+#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:335
msgid "View"
msgstr ""
@@ -619,7 +619,7 @@
msgstr "Mod <trei linii>"
#: src/barre_outils.c:237 src/categories_onglet.c:562
-#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:417
+#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:418
#, fuzzy
msgid "Complete view"
msgstr "VentilaÅ£ie incomplectÄ"
@@ -739,7 +739,7 @@
#: src/categories_onglet.c:160 src/export_csv.c:774 src/gsb_reconcile.c:157
#: src/gsb_scheduler_list.c:332 src/gsb_transactions_list.c:149
#: src/gsb_transactions_list.c:2867 src/import_csv.c:86
-#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:235
+#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:236
#: src/traitement_variables.c:80
msgid "Balance"
msgstr "Sold"
@@ -820,7 +820,7 @@
msgstr "Intraţi numele noii sub-categorii."
#: src/categories_onglet.c:480 src/etats_onglet.c:130 src/import.c:350
-#: src/import.c:3099 src/imputation_budgetaire.c:513 src/parametres.c:287
+#: src/import.c:3123 src/imputation_budgetaire.c:513 src/parametres.c:287
msgid "Import"
msgstr "Importare"
@@ -846,7 +846,7 @@
#: src/categories_onglet.c:508 src/etats_onglet.c:184
#: src/fenetre_principale.c:251 src/imputation_budgetaire.c:542
-#: src/tiers_onglet.c:316
+#: src/tiers_onglet.c:317
#, fuzzy
msgid "Properties"
msgstr "ProprietÄÅ£i a devizei"
@@ -856,7 +856,7 @@
msgid "Edit selected category"
msgstr "categoria"
-#: src/categories_onglet.c:522 src/tiers_onglet.c:338
+#: src/categories_onglet.c:522 src/tiers_onglet.c:339
#, fuzzy
msgid "Change view mode"
msgstr "Mod <o linie>"
@@ -874,7 +874,7 @@
#: src/categories_onglet.c:607 src/categories_onglet.c:611
#: src/imputation_budgetaire.c:640 src/imputation_budgetaire.c:645
-#: src/tiers_onglet.c:553
+#: src/tiers_onglet.c:554
#, fuzzy, c-format
msgid "Properties for %s"
msgstr "Rezultat pentru %s"
@@ -904,7 +904,7 @@
#: src/gsb_bank.c:832 src/gsb_currency_config.c:355 src/gsb_fyear_config.c:191
#: src/gsb_fyear_config.c:278 src/gsb_payment_method_config.c:239
#: src/gsb_reconcile_config.c:179 src/gsb_transactions_list.c:1733
-#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:578
+#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:579
msgid "Name"
msgstr "Nume"
@@ -1416,12 +1416,12 @@
#. Transfer = Virement
#. Direct deposit remplacé par Transfert = Virement
-#: src/etats_affiche.c:1837 src/import.c:2349 src/import.c:2367
+#: src/etats_affiche.c:1837 src/import.c:2373 src/import.c:2391
msgid "Transfert"
msgstr "Virament"
#: src/etats_affiche.c:1846 src/export_csv.c:561 src/gsb_data_category.c:1039
-#: src/gsb_form.c:740 src/gsb_form.c:2465 src/gsb_form.c:2837
+#: src/gsb_form.c:740 src/gsb_form.c:2476 src/gsb_form.c:2848
#: src/gsb_form_scheduler.c:321 src/gsb_transactions_list.c:3216
msgid "Split of transaction"
msgstr "TranzacÅ£ie ventilatÄ"
@@ -1477,7 +1477,7 @@
#: src/etats_config.c:687 src/etats_config.c:7193 src/export_csv.c:762
#: src/fenetre_principale.c:266 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1308 src/gsb_form_widget.c:420 src/gsb_scheduler_list.c:331
-#: src/gsb_transactions_list.c:145 src/import.c:2889 src/import_csv.c:80
+#: src/gsb_transactions_list.c:145 src/import.c:2913 src/import_csv.c:80
#: src/meta_payee.c:76 src/traitement_variables.c:76
#, fuzzy
msgid "Payee"
@@ -1816,14 +1816,14 @@
#: src/etats_config.c:2581 src/etats_config.c:2848 src/etats_config.c:3138
#: src/etats_config.c:3951 src/etats_config.c:4147 src/etats_config.c:7512
-#: src/tiers_onglet.c:1263 src/tiers_onglet.c:1283
+#: src/tiers_onglet.c:1306 src/tiers_onglet.c:1326
msgid "Select all"
msgstr "Selecţionaţi totul"
#. ajoute le bouton (dé)sélectionne tout
#: src/etats_config.c:2596 src/etats_config.c:2863 src/etats_config.c:3153
#: src/etats_config.c:3966 src/etats_config.c:4162 src/etats_config.c:7527
-#: src/tiers_onglet.c:1062 src/tiers_onglet.c:1265
+#: src/tiers_onglet.c:1105 src/tiers_onglet.c:1308
msgid "Unselect all"
msgstr "Deselecţionaţi totul"
@@ -1936,7 +1936,7 @@
#. set the title
#: src/etats_config.c:4041 src/navigation.c:290 src/navigation.c:1228
-#: src/tiers_onglet.c:214
+#: src/tiers_onglet.c:215
#, fuzzy
msgid "Payees"
msgstr "Zile"
@@ -2058,7 +2058,7 @@
#: src/etats_config.c:5310 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:2897
+#: src/gsb_transactions_list.c:150 src/import.c:2921
#: src/traitement_variables.c:81
msgid "Amount"
msgstr "SumÄ totalÄ"
@@ -3929,7 +3929,7 @@
msgstr ""
#: src/gsb_assistant_archive.c:354 src/gsb_data_payee.c:511
-#: src/gsb_form.c:2572 src/gsb_form.c:2573 src/navigation.c:1289
+#: src/gsb_form.c:2583 src/gsb_form.c:2584 src/navigation.c:1289
msgid "Report"
msgstr "Stare"
@@ -6295,19 +6295,19 @@
"existÄ.\n"
#. Deposit = Dépôt
-#: src/gsb_data_payment.c:714 src/import.c:2331 src/plugins/ofx/ofx.c:451
+#: src/gsb_data_payment.c:714 src/import.c:2355 src/plugins/ofx/ofx.c:451
msgid "Deposit"
msgstr "Depozit"
#. pas trouvé de définition remplacé par carte de crédit
#. Point of sale = Point de vente remplacé par carte de crédit
-#: src/gsb_data_payment.c:723 src/import.c:2337 src/import.c:2343
+#: src/gsb_data_payment.c:723 src/import.c:2361 src/import.c:2367
msgid "Credit card"
msgstr "CartÄ de credit"
#. Electronic payment remplacé par Direct debit = Prélèvement
#. Merchant initiated debit remplacé par Direct debit = Prélèvement
-#: src/gsb_data_payment.c:732 src/import.c:2355 src/import.c:2373
+#: src/gsb_data_payment.c:732 src/import.c:2379 src/import.c:2397
msgid "Direct debit"
msgstr "Prelevare"
@@ -6832,7 +6832,7 @@
msgid "Encryption plugin not found."
msgstr "Cont %s ne gÄsit.\n"
-#: src/gsb_file_load.c:410 src/gsb_file_load.c:4364
+#: src/gsb_file_load.c:410 src/gsb_file_load.c:4370
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Acest fiÅier nu este o stare Grisbi"
@@ -6847,14 +6847,14 @@
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: src/gsb_file_load.c:7582
+#: src/gsb_file_load.c:7588
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "VÄ trebuie versiunea %s de Grisbi pentru a deschide acest fiÅier"
-#: src/gsb_file_load.c:7621
+#: src/gsb_file_load.c:7627
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6862,11 +6862,11 @@
"transactions or important informations."
msgstr ""
-#: src/gsb_file_load.c:7622
+#: src/gsb_file_load.c:7628
msgid "Grisbi archive opened"
msgstr ""
-#: src/gsb_file_load.c:7714
+#: src/gsb_file_load.c:7720
#, c-format
msgid ""
"Your old file grisbi was saved as: \n"
@@ -6997,53 +6997,53 @@
msgid "Cheque/Transfer number"
msgstr "Nr cec/Virament"
-#: src/gsb_form.c:2157
+#: src/gsb_form.c:2168
#, fuzzy
msgid "No payee selected for this report."
msgstr "AceastÄ stare nu comportÄ terÅ£i selecÅ£ionaÅ£i."
-#: src/gsb_form.c:2415
+#: src/gsb_form.c:2426
msgid "You must enter a date."
msgstr "O datÄ este obligatorie."
-#: src/gsb_form.c:2422
+#: src/gsb_form.c:2433
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "DatÄ neconformÄ"
-#: src/gsb_form.c:2441
+#: src/gsb_form.c:2452
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "DatÄ neconformÄ"
-#: src/gsb_form.c:2467
+#: src/gsb_form.c:2478
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: src/gsb_form.c:2500
+#: src/gsb_form.c:2511
#, fuzzy
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr "Convertirea operaÅ£iunii în operaÅ£iune planificatÄ"
-#: src/gsb_form.c:2507
+#: src/gsb_form.c:2518
#, fuzzy
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr "Contul asociat la virament nu este valid"
-#: src/gsb_form.c:2515
+#: src/gsb_form.c:2526
msgid "Can't issue a transfer its own account."
msgstr "Impusibilitate de transfer pe contul sÄu"
-#: src/gsb_form.c:2520
+#: src/gsb_form.c:2531
msgid "Can't issue a transfer on a closed account."
msgstr "Imposibil de a efectua un virament pe un cont închis"
-#: src/gsb_form.c:2546
+#: src/gsb_form.c:2557
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -7053,7 +7053,7 @@
"numÄr.\n"
"VreÅ£i sÄ continuaÅ£i ?"
-#: src/gsb_form.c:2560
+#: src/gsb_form.c:2571
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -7061,35 +7061,35 @@
"AtenÅ£iune, numÄrul cecului este deja utilizat.\n"
"VreÅ£i sÄ continuaÅ£i ?"
-#: src/gsb_form.c:2580
+#: src/gsb_form.c:2591
#, fuzzy
msgid "A transaction with a multiple payee must be a new one."
msgstr ""
"O operaÅ£iune a cÄrui terÅ£ este o stare trebuie sÄ fie fÄrÄ Ã®ndoialÄ o nouÄ "
"operaţiune. "
-#: src/gsb_form.c:2585
+#: src/gsb_form.c:2596
#, fuzzy
msgid "A transaction with a multiple payee cannot be a split child."
msgstr ""
"O operaÅ£iune a cÄrui terÅ£ este o stare trebuie sÄ fie fÄrÄ Ã®ndoialÄ o nouÄ "
"operaţiune. "
-#: src/gsb_form.c:2596
+#: src/gsb_form.c:2607
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: src/gsb_form.c:2603
+#: src/gsb_form.c:2614
#, fuzzy
msgid "Invalid multiple payee."
msgstr "Numele de stare în terÅ£ este invalidÄ"
-#: src/gsb_form.c:2860
+#: src/gsb_form.c:2871
#, fuzzy
msgid "Modifying a transaction"
msgstr "Edtarea operaţiunii"
-#: src/gsb_form.c:2861
+#: src/gsb_form.c:2872
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7099,7 +7099,7 @@
msgstr ""
#. propose to configure the form
-#: src/gsb_form.c:3161
+#: src/gsb_form.c:3172
msgid "Configure the form"
msgstr ""
@@ -8109,11 +8109,11 @@
msgid "File name"
msgstr "Numele titularului"
-#: src/import.c:526 src/import.c:608 src/import.c:3207 src/import.c:3230
+#: src/import.c:526 src/import.c:608 src/import.c:3244 src/import.c:3267
msgid "Unknown"
msgstr "Necunoscut"
-#: src/import.c:568 src/import.c:3310 src/import_csv.c:1045
+#: src/import.c:568 src/import.c:3347 src/import_csv.c:1045
#, fuzzy, c-format
msgid "Unable to read file: %s\n"
msgstr "Imposibil de a deschide fiÅierul '%s': %s"
@@ -8279,7 +8279,7 @@
#. there is a difference between the imported account id and grisbi account id,
#. * ask to be sure
-#: src/import.c:1730
+#: src/import.c:1731
#, fuzzy, c-format
msgid ""
"The Grisbi's id account is %s, but the imported id account is %s.\n"
@@ -8293,48 +8293,64 @@
#. l'id du compte choisi et l'id du compte importé sont différents
#. on propose encore d'arrêter...
-#: src/import.c:1733 src/import.c:2515
+#: src/import.c:1734 src/import.c:2539
msgid "The id of the imported and chosen accounts are different"
msgstr "Identificaţii contului ales importat sunt diferenţi"
-#: src/import.c:1963
+#: src/import.c:1968
+#, fuzzy
+msgid "Confirmation of transactions to be merged"
+msgstr "Confirmarea de suprimare a unei operaţiuni"
+
+#: src/import.c:1971
msgid "Confirmation of importation of transactions"
msgstr "Confirmare de importare de operaţiuni"
-#: src/import.c:1975
+#: src/import.c:1987
+#, fuzzy
+msgid "Please select the transactions to be merged"
+msgstr "Utiliza operaÅ£iunea selecÅ£ionatÄ ca model"
+
+#: src/import.c:1990
+#, fuzzy
msgid ""
-"Some imported transactions seem to be already saved. Please select the "
+"Some imported transactions seem to be already saved.Please select the "
"transactions to import."
msgstr ""
"Anumite operaÅ£iuni pentru importare se pare cÄ sunt deja scrise.SelecÅ£ionaÅ£i "
"operatiunile a importa."
-#: src/import.c:2051
+#: src/import.c:2070
+#, fuzzy, c-format
+msgid "Transactions to be merged : %s ; %s ; %s"
+msgstr "Operaţiuni a importa : %02d/%02d/%04d ; %s ; %4.2f"
+
+#: src/import.c:2075
#, fuzzy, c-format
msgid "Transactions to import : %s ; %s ; %s"
msgstr "Operaţiuni a importa : %02d/%02d/%04d ; %s ; %4.2f"
-#: src/import.c:2090
+#: src/import.c:2114
#, fuzzy, c-format
msgid "Transaction found : %s ; %s ; %s ; %s"
msgstr "OperaÅ£iune gÄsitÄ : %02d/%02d/%04d ; %s ; %4.2f ; %s"
-#: src/import.c:2103
+#: src/import.c:2127
#, fuzzy, c-format
msgid "Transaction found : %s ; %s ; %s"
msgstr "OperaÅ£iune gÄsitÄ : %02d/%02d/%04d ; %s ; %4.2f"
#. Check = Chèque
-#: src/import.c:2317 src/plugins/ofx/ofx.c:431
+#: src/import.c:2341 src/plugins/ofx/ofx.c:431
msgid "Check"
msgstr "Cec"
#. Cash withdrawal = retrait en liquide
-#: src/import.c:2361
+#: src/import.c:2385
msgid "Cash withdrawal"
msgstr ""
-#: src/import.c:2451
+#: src/import.c:2475
#, fuzzy, c-format
msgid ""
"Warning : the cheque number %ld is already used.\n"
@@ -8343,7 +8359,7 @@
"AtenÅ£iune, numÄrul cecului este deja utilizat.\n"
"VreÅ£i sÄ continuaÅ£i ?"
-#: src/import.c:2516
+#: src/import.c:2540
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 ?"
@@ -8351,99 +8367,104 @@
"A-Å£i ales un cont care nu este bun ? DacÄ alegeÅ£i de a continua "
"identifiantul contului va fi schimbat. VreÅ£i sÄ continuaÅ£i ?"
-#: src/import.c:2792
+#: src/import.c:2816
msgid "Orphaned transactions"
msgstr "Operaţiuni orfane"
-#: src/import.c:2805
+#: src/import.c:2829
msgid "Mark transactions you want to add to the list and click the add button"
msgstr ""
"MarcaÅ£i operaÅ£iunile pe care vreÅ£i sÄ le adÄugaÅ£i la listÄ clicÄnd pe "
"butonul adÄuga"
-#: src/import.c:2874
+#: src/import.c:2898
msgid "Mark"
msgstr "Marcat"
-#: src/import.c:3075
+#: src/import.c:3099
#, fuzzy, c-format
msgid "%s #%d"
msgstr "%s %d"
-#: src/import.c:3110
+#: src/import.c:3134
msgid "Threshold while matching transaction date during import (in days)"
msgstr ""
-#: src/import.c:3136
+#: src/import.c:3160
+#, fuzzy
+msgid "merge transactions imported with planned transactions"
+msgstr "Convertirea operaÅ£iunii în operaÅ£iune planificatÄ"
+
+#: src/import.c:3173
msgid "automatically associate the category of the payee if it is possible"
msgstr ""
-#: src/import.c:3149
+#: src/import.c:3186
#, fuzzy
msgid "Set the financial year"
msgstr "Alegerea exerciţiului"
-#: src/import.c:3150
+#: src/import.c:3187
#, fuzzy
msgid "According to the date"
msgstr "corespundând la data operaţiei"
-#: src/import.c:3151
+#: src/import.c:3188
msgid "According to the value date (if fail, try with the date)"
msgstr ""
-#: src/import.c:3295
+#: src/import.c:3332
#, c-format
msgid ""
"%s is neither an OFX file, neither a QIF file. Nothing will be done for that "
"file."
msgstr ""
-#: src/import.c:3353
+#: src/import.c:3390
#, c-format
msgid ""
"%s was not imported successfully. An error occured while getting the "
"transactions."
msgstr ""
-#: src/import.c:3431
+#: src/import.c:3468
msgid "Import a file with a rule"
msgstr ""
#. text for paddingbox
-#: src/import.c:3442
+#: src/import.c:3479
#, fuzzy, c-format
msgid "Properties of the rule : %s\n"
msgstr "Rezultat pentru %s"
-#: src/import.c:3461
+#: src/import.c:3498
#, fuzzy, c-format
msgid "Imported transactions will be added to the account %s.\n"
msgstr "Toate operaţiunile vor fi convertite în deviza contului respectiv."
-#: src/import.c:3464
+#: src/import.c:3501
#, fuzzy, c-format
msgid "Imported transactions will mark transactions in the account %s.\n"
msgstr "O ventilaţie este un virament spre acest cont.\n"
#. textstring 2
-#: src/import.c:3468
+#: src/import.c:3505
#, fuzzy, c-format
msgid "Currency to import is %s.\n"
msgstr "ProprietÄÅ£i a devizei"
-#: src/import.c:3474
+#: src/import.c:3511
#, fuzzy
msgid "Amounts of the transactions will be inverted.\n"
msgstr "Ãnscrierea inventarului automatic de tranzacÅ£iuni "
#. label filename
-#: src/import.c:3484
+#: src/import.c:3521
#, fuzzy
msgid "Name of the file to import "
msgstr "CreaÅ£ia unui nume de fiÅier de conturi"
-#: src/import.c:3578
+#: src/import.c:3615
#, fuzzy, c-format
msgid "Unable to create tmp file: %s\n"
msgstr "Imposibil de a deschide fiÅierul '%s': %s"
@@ -8940,7 +8961,7 @@
msgstr "Nici o sub categorie"
#. * Find a unique name for payee
-#: src/meta_payee.c:320 src/tiers_onglet.c:299
+#: src/meta_payee.c:320 src/tiers_onglet.c:300
#, fuzzy
msgid "New payee"
msgstr "Nou mod de platÄ"
@@ -9614,41 +9635,41 @@
msgid "Error opening file '%s'"
msgstr "Eroare la deschiderea fiÅierului '%s'."
-#: src/tiers_onglet.c:303
+#: src/tiers_onglet.c:304
#, fuzzy
msgid "Create a new payee"
msgstr "Creaţi un nou cont"
-#: src/tiers_onglet.c:312
+#: src/tiers_onglet.c:313
#, fuzzy
msgid "Delete selected payee"
msgstr "Suprimarea unui terţ"
-#: src/tiers_onglet.c:321
+#: src/tiers_onglet.c:322
msgid "Edit selected payee"
msgstr ""
-#: src/tiers_onglet.c:325
+#: src/tiers_onglet.c:326
#, fuzzy
msgid "Remove unused payees"
msgstr "CreaÅ£ia unui nume de fiÅier de conturi"
-#: src/tiers_onglet.c:329 src/tiers_onglet.c:373
+#: src/tiers_onglet.c:330 src/tiers_onglet.c:374
#, fuzzy
msgid "Remove orphan payees"
msgstr "CreaÅ£ia unui nume de fiÅier de conturi"
-#: src/tiers_onglet.c:343
+#: src/tiers_onglet.c:344
#, fuzzy
msgid "Manage payees"
msgstr "Pagina de primire"
-#: src/tiers_onglet.c:347 src/tiers_onglet.c:729
+#: src/tiers_onglet.c:348 src/tiers_onglet.c:730
#, fuzzy
msgid "Manage the payees"
msgstr "Detailaţi categoriile utilizate"
-#: src/tiers_onglet.c:374
+#: src/tiers_onglet.c:375
msgid ""
"This will remove all the payees wich are not used in any transactions. "
"Payees linked to an archived transactions will not be removed, even if not "
@@ -9657,29 +9678,29 @@
"Are you sure you want to do that?"
msgstr ""
-#: src/tiers_onglet.c:386 src/tiers_onglet.c:819
+#: src/tiers_onglet.c:387 src/tiers_onglet.c:862
#, c-format
msgid "Removed %d payees."
msgstr ""
#. Edit transaction
-#: src/tiers_onglet.c:411
+#: src/tiers_onglet.c:412
msgid "Payee view"
msgstr ""
-#: src/tiers_onglet.c:633
+#: src/tiers_onglet.c:634
#, c-format
msgid ""
"You tried to rename current payee to '%s' but this payee already exists. "
"Please choose another name."
msgstr ""
-#: src/tiers_onglet.c:637
+#: src/tiers_onglet.c:638
#, fuzzy
msgid "Payee already exists"
msgstr "FiÅierul existÄ deja"
-#: src/tiers_onglet.c:730
+#: src/tiers_onglet.c:731
msgid ""
"This wizard will help you to simplify the list of payees.\n"
"\n"
@@ -9688,12 +9709,12 @@
"It is better to make a backup of your Grisbi file if you have not yet done. "
msgstr ""
-#: src/tiers_onglet.c:873
+#: src/tiers_onglet.c:916
#, fuzzy
msgid "Choose a payee"
msgstr "SelecÅ£ionaÅ£i fiÅierele a importa"
-#: src/tiers_onglet.c:875
+#: src/tiers_onglet.c:918
msgid ""
"Select one payee in the list that you modify to serve as the basis for your "
"research.\n"
@@ -9704,69 +9725,69 @@
"string_1%string_2"
msgstr ""
-#: src/tiers_onglet.c:896
+#: src/tiers_onglet.c:939
#, fuzzy
msgid "Enter the new payee"
msgstr "Intraţi numele noului terţ"
-#: src/tiers_onglet.c:898
+#: src/tiers_onglet.c:941
#, fuzzy
msgid "Enter the name of the new payee"
msgstr "Intraţi numele noii sub-imputaţii"
-#: src/tiers_onglet.c:911
+#: src/tiers_onglet.c:954
#, fuzzy
msgid "Options"
msgstr "Cheltueli"
-#: src/tiers_onglet.c:913
+#: src/tiers_onglet.c:956
msgid "Extracting a number and save it in the field No Cheque/Virement"
msgstr ""
-#: src/tiers_onglet.c:919
+#: src/tiers_onglet.c:962
msgid "Save the payees in the notes"
msgstr ""
-#: src/tiers_onglet.c:952
+#: src/tiers_onglet.c:995
msgid "List of payees who will be modified"
msgstr ""
-#: src/tiers_onglet.c:994
+#: src/tiers_onglet.c:1037
#, fuzzy
msgid "Select"
msgstr "Selecţionaţi totul"
-#: src/tiers_onglet.c:1002
+#: src/tiers_onglet.c:1045
#, fuzzy
msgid "Payee number"
msgstr "numÄrul de cec"
-#: src/tiers_onglet.c:1012
+#: src/tiers_onglet.c:1055
#, fuzzy
msgid "Payee name"
msgstr "Total general"
-#: src/tiers_onglet.c:1028
+#: src/tiers_onglet.c:1071
msgid "Total number of payees :"
msgstr ""
#. ajoute le nombre de tiers sélectionnés
-#: src/tiers_onglet.c:1045
+#: src/tiers_onglet.c:1088
#, fuzzy
msgid "Number of selected payees :"
msgstr "Suprimarea unui terţ"
-#: src/tiers_onglet.c:1147
+#: src/tiers_onglet.c:1190
#, c-format
msgid "Payee sought : %s\n"
msgstr ""
-#: src/tiers_onglet.c:1153
+#: src/tiers_onglet.c:1196
#, fuzzy, c-format
msgid "New payee : %s"
msgstr "Nou mod de platÄ"
-#: src/tiers_onglet.c:1229
+#: src/tiers_onglet.c:1272
#, c-format
msgid ""
"You are about to replace %d payees whose names contain %s\n"
@@ -9775,11 +9796,11 @@
"<span weight=\"bold\">Are you sure?</span>"
msgstr ""
-#: src/tiers_onglet.c:1393
+#: src/tiers_onglet.c:1436
msgid "You must choose a payee for searching."
msgstr ""
-#: src/tiers_onglet.c:1397
+#: src/tiers_onglet.c:1440
msgid "Beware you don't use one of models for the research."
msgstr ""
@@ -11369,9 +11390,6 @@
#~ msgid "Account split"
#~ msgstr "Ventilaţia contului"
-#~ msgid "Confirmation of transaction removal"
-#~ msgstr "Confirmarea de suprimare a unei operaţiuni"
-
#~ msgid ""
#~ "You are currently trying to remove a transaction. There is no undo for "
#~ "this. Do you confirm the removal?"
Index: cs.po
===================================================================
RCS file: /cvsroot/grisbi/grisbi/po/cs.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- cs.po 13 Mar 2009 20:15:35 -0000 1.22
+++ cs.po 17 Mar 2009 22:05:32 -0000 1.23
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: cs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 20:58+0100\n"
+"POT-Creation-Date: 2009-03-17 21:51+0100\n"
"PO-Revision-Date: 2006-02-20 18:30+0100\n"
"Last-Translator: Marek Donar <mdonar at post.cz>\n"
"Language-Team: \n"
@@ -448,7 +448,7 @@
#: src/gsb_assistant_reconcile_config.c:612
#: src/gsb_payment_method_config.c:159 src/gsb_reconcile_config.c:96
#: src/gsb_scheduler_list.c:331 src/imputation_budgetaire.c:164
-#: src/tiers_onglet.c:226
+#: src/tiers_onglet.c:227
msgid "Account"
msgstr "ÃÄet"
@@ -461,13 +461,13 @@
#: src/export_csv.c:747 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1281 src/gsb_form_widget.c:400 src/gsb_reconcile.c:154
#: src/gsb_scheduler_list.c:331 src/gsb_transactions_list.c:143
-#: src/import.c:2882 src/import_csv.c:78 src/traitement_variables.c:74
+#: src/import.c:2906 src/import_csv.c:78 src/traitement_variables.c:74
msgid "Date"
msgstr "Datum"
#. Description entry
#: src/balance_estimate_tab.c:300 src/etats_onglet.c:287
-#: src/tiers_onglet.c:591
+#: src/tiers_onglet.c:592
msgid "Description"
msgstr "Popis"
@@ -516,7 +516,7 @@
#: src/barre_outils.c:107 src/barre_outils.c:453 src/categories_onglet.c:499
#: src/etats_onglet.c:173 src/imputation_budgetaire.c:532
-#: src/tiers_onglet.c:307
+#: src/tiers_onglet.c:308
#, fuzzy
msgid "Delete"
msgstr "Vybrat"
@@ -556,7 +556,7 @@
msgstr "SetÅÃdit seznam transakcÃ"
#: src/barre_outils.c:153 src/barre_outils.c:513 src/categories_onglet.c:518
-#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:334
+#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:335
msgid "View"
msgstr ""
@@ -588,7 +588,7 @@
msgstr "TÅi Åádky"
#: src/barre_outils.c:237 src/categories_onglet.c:562
-#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:417
+#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:418
#, fuzzy
msgid "Complete view"
msgstr "Neúplné rozdÄlenÃ"
@@ -708,7 +708,7 @@
#: src/categories_onglet.c:160 src/export_csv.c:774 src/gsb_reconcile.c:157
#: src/gsb_scheduler_list.c:332 src/gsb_transactions_list.c:149
#: src/gsb_transactions_list.c:2867 src/import_csv.c:86
-#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:235
+#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:236
#: src/traitement_variables.c:80
msgid "Balance"
msgstr "Zůstatek"
@@ -787,7 +787,7 @@
msgstr "Zadejte jméno nové podkategorie"
#: src/categories_onglet.c:480 src/etats_onglet.c:130 src/import.c:350
-#: src/import.c:3099 src/imputation_budgetaire.c:513 src/parametres.c:287
+#: src/import.c:3123 src/imputation_budgetaire.c:513 src/parametres.c:287
msgid "Import"
msgstr "Import"
@@ -813,7 +813,7 @@
#: src/categories_onglet.c:508 src/etats_onglet.c:184
#: src/fenetre_principale.c:251 src/imputation_budgetaire.c:542
-#: src/tiers_onglet.c:316
+#: src/tiers_onglet.c:317
#, fuzzy
msgid "Properties"
msgstr "Vlastnosti mÄny"
@@ -823,7 +823,7 @@
msgid "Edit selected category"
msgstr "kategorie"
-#: src/categories_onglet.c:522 src/tiers_onglet.c:338
+#: src/categories_onglet.c:522 src/tiers_onglet.c:339
#, fuzzy
msgid "Change view mode"
msgstr "Jeden Åádek"
@@ -841,7 +841,7 @@
#: src/categories_onglet.c:607 src/categories_onglet.c:611
#: src/imputation_budgetaire.c:640 src/imputation_budgetaire.c:645
-#: src/tiers_onglet.c:553
+#: src/tiers_onglet.c:554
#, fuzzy, c-format
msgid "Properties for %s"
msgstr "Výsledek pro %s"
@@ -871,7 +871,7 @@
#: src/gsb_bank.c:832 src/gsb_currency_config.c:355 src/gsb_fyear_config.c:191
#: src/gsb_fyear_config.c:278 src/gsb_payment_method_config.c:239
#: src/gsb_reconcile_config.c:179 src/gsb_transactions_list.c:1733
-#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:578
+#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:579
msgid "Name"
msgstr "Název"
@@ -1383,12 +1383,12 @@
#. Transfer = Virement
#. Direct deposit remplacé par Transfert = Virement
-#: src/etats_affiche.c:1837 src/import.c:2349 src/import.c:2367
+#: src/etats_affiche.c:1837 src/import.c:2373 src/import.c:2391
msgid "Transfert"
msgstr "PÅevody"
#: src/etats_affiche.c:1846 src/export_csv.c:561 src/gsb_data_category.c:1039
-#: src/gsb_form.c:740 src/gsb_form.c:2465 src/gsb_form.c:2837
+#: src/gsb_form.c:740 src/gsb_form.c:2476 src/gsb_form.c:2848
#: src/gsb_form_scheduler.c:321 src/gsb_transactions_list.c:3216
msgid "Split of transaction"
msgstr "RozdÄlenà transakce"
@@ -1444,7 +1444,7 @@
#: src/etats_config.c:687 src/etats_config.c:7193 src/export_csv.c:762
#: src/fenetre_principale.c:266 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1308 src/gsb_form_widget.c:420 src/gsb_scheduler_list.c:331
-#: src/gsb_transactions_list.c:145 src/import.c:2889 src/import_csv.c:80
+#: src/gsb_transactions_list.c:145 src/import.c:2913 src/import_csv.c:80
#: src/meta_payee.c:76 src/traitement_variables.c:76
#, fuzzy
msgid "Payee"
@@ -1782,14 +1782,14 @@
#: src/etats_config.c:2581 src/etats_config.c:2848 src/etats_config.c:3138
#: src/etats_config.c:3951 src/etats_config.c:4147 src/etats_config.c:7512
-#: src/tiers_onglet.c:1263 src/tiers_onglet.c:1283
+#: src/tiers_onglet.c:1306 src/tiers_onglet.c:1326
msgid "Select all"
msgstr "OznaÄit vÅ¡e"
#. ajoute le bouton (dé)sélectionne tout
#: src/etats_config.c:2596 src/etats_config.c:2863 src/etats_config.c:3153
#: src/etats_config.c:3966 src/etats_config.c:4162 src/etats_config.c:7527
-#: src/tiers_onglet.c:1062 src/tiers_onglet.c:1265
+#: src/tiers_onglet.c:1105 src/tiers_onglet.c:1308
msgid "Unselect all"
msgstr "OdznaÄit vÅ¡e"
@@ -1902,7 +1902,7 @@
#. set the title
#: src/etats_config.c:4041 src/navigation.c:290 src/navigation.c:1228
-#: src/tiers_onglet.c:214
+#: src/tiers_onglet.c:215
#, fuzzy
msgid "Payees"
msgstr "Dny"
@@ -2024,7 +2024,7 @@
#: src/etats_config.c:5310 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:2897
+#: src/gsb_transactions_list.c:150 src/import.c:2921
#: src/traitement_variables.c:81
msgid "Amount"
msgstr "Äástka"
@@ -3888,7 +3888,7 @@
msgstr ""
#: src/gsb_assistant_archive.c:354 src/gsb_data_payee.c:511
-#: src/gsb_form.c:2572 src/gsb_form.c:2573 src/navigation.c:1289
+#: src/gsb_form.c:2583 src/gsb_form.c:2584 src/navigation.c:1289
msgid "Report"
msgstr "Sestava"
@@ -6243,19 +6243,19 @@
msgstr "Transakce #%d by mÄla mÃt protizápis #%d, ale ten neexistuje.\n"
#. Deposit = Dépôt
-#: src/gsb_data_payment.c:714 src/import.c:2331 src/plugins/ofx/ofx.c:451
+#: src/gsb_data_payment.c:714 src/import.c:2355 src/plugins/ofx/ofx.c:451
msgid "Deposit"
msgstr "Vklad"
#. pas trouvé de définition remplacé par carte de crédit
#. Point of sale = Point de vente remplacé par carte de crédit
-#: src/gsb_data_payment.c:723 src/import.c:2337 src/import.c:2343
+#: src/gsb_data_payment.c:723 src/import.c:2361 src/import.c:2367
msgid "Credit card"
msgstr "Kreditnà karta"
#. Electronic payment remplacé par Direct debit = Prélèvement
#. Merchant initiated debit remplacé par Direct debit = Prélèvement
-#: src/gsb_data_payment.c:732 src/import.c:2355 src/import.c:2373
+#: src/gsb_data_payment.c:732 src/import.c:2379 src/import.c:2397
msgid "Direct debit"
msgstr "PÅÃmý výbÄr"
@@ -6775,7 +6775,7 @@
msgid "Encryption plugin not found."
msgstr "ÃÄet %s nebyl nalezen.\n"
-#: src/gsb_file_load.c:410 src/gsb_file_load.c:4364
+#: src/gsb_file_load.c:410 src/gsb_file_load.c:4370
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "Soubor nenà sestava Grisbi"
@@ -6790,14 +6790,14 @@
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: src/gsb_file_load.c:7582
+#: src/gsb_file_load.c:7588
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "Pro otevÅenà tohoto souboru potÅebujete Grisbi verze %s"
-#: src/gsb_file_load.c:7621
+#: src/gsb_file_load.c:7627
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6805,11 +6805,11 @@
"transactions or important informations."
msgstr ""
-#: src/gsb_file_load.c:7622
+#: src/gsb_file_load.c:7628
msgid "Grisbi archive opened"
msgstr ""
-#: src/gsb_file_load.c:7714
+#: src/gsb_file_load.c:7720
#, c-format
msgid ""
"Your old file grisbi was saved as: \n"
@@ -6940,53 +6940,53 @@
msgid "Cheque/Transfer number"
msgstr "ÄÃslo pÅevodu/Å¡eku"
-#: src/gsb_form.c:2157
+#: src/gsb_form.c:2168
#, fuzzy
msgid "No payee selected for this report."
msgstr "Pro tuto sestavu nebyly vybrány žádné tÅetà strany."
-#: src/gsb_form.c:2415
+#: src/gsb_form.c:2426
msgid "You must enter a date."
msgstr "MusÃte zadat datum."
-#: src/gsb_form.c:2422
+#: src/gsb_form.c:2433
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "Neplatné datum"
-#: src/gsb_form.c:2441
+#: src/gsb_form.c:2452
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "Neplatné datum"
-#: src/gsb_form.c:2467
+#: src/gsb_form.c:2478
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: src/gsb_form.c:2500
+#: src/gsb_form.c:2511
#, fuzzy
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr "ZmÄnit transakci na plánovanou transakci"
-#: src/gsb_form.c:2507
+#: src/gsb_form.c:2518
#, fuzzy
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr "PÅipojený úÄet pro tento pÅevod je neplatný."
-#: src/gsb_form.c:2515
+#: src/gsb_form.c:2526
msgid "Can't issue a transfer its own account."
msgstr "Nelze pÅevést na ten samý úÄet"
-#: src/gsb_form.c:2520
+#: src/gsb_form.c:2531
msgid "Can't issue a transfer on a closed account."
msgstr "Nelze pÅevádÄt na uzavÅený úÄet."
-#: src/gsb_form.c:2546
+#: src/gsb_form.c:2557
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -6996,7 +6996,7 @@
"ale neobsahuje žádné ÄÃslo.\n"
"PÅesto pokraÄovat?"
-#: src/gsb_form.c:2560
+#: src/gsb_form.c:2571
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -7004,31 +7004,31 @@
"Pozor: toto ÄÃslo Å¡eku již bylo použito.\n"
"PÅesto pokraÄovat?"
-#: src/gsb_form.c:2580
+#: src/gsb_form.c:2591
#, fuzzy
msgid "A transaction with a multiple payee must be a new one."
msgstr "Transakce s vÃce tÅetÃmi stranami musà být nová."
-#: src/gsb_form.c:2585
+#: src/gsb_form.c:2596
#, fuzzy
msgid "A transaction with a multiple payee cannot be a split child."
msgstr "Transakce s vÃce tÅetÃmi stranami musà být nová."
-#: src/gsb_form.c:2596
+#: src/gsb_form.c:2607
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: src/gsb_form.c:2603
+#: src/gsb_form.c:2614
#, fuzzy
msgid "Invalid multiple payee."
msgstr "Neplatných vÃce tÅetÃch stran"
-#: src/gsb_form.c:2860
+#: src/gsb_form.c:2871
#, fuzzy
msgid "Modifying a transaction"
msgstr "Upravit transakci"
-#: src/gsb_form.c:2861
+#: src/gsb_form.c:2872
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7038,7 +7038,7 @@
msgstr ""
#. propose to configure the form
-#: src/gsb_form.c:3161
+#: src/gsb_form.c:3172
msgid "Configure the form"
msgstr ""
@@ -8043,11 +8043,11 @@
msgid "File name"
msgstr "Jméno majitele"
-#: src/import.c:526 src/import.c:608 src/import.c:3207 src/import.c:3230
+#: src/import.c:526 src/import.c:608 src/import.c:3244 src/import.c:3267
msgid "Unknown"
msgstr "Neznámý"
-#: src/import.c:568 src/import.c:3310 src/import_csv.c:1045
+#: src/import.c:568 src/import.c:3347 src/import_csv.c:1045
#, fuzzy, c-format
msgid "Unable to read file: %s\n"
msgstr "Nelze otevÅÃt soubor '%s': %s"
@@ -8211,7 +8211,7 @@
#. there is a difference between the imported account id and grisbi account id,
#. * ask to be sure
-#: src/import.c:1730
+#: src/import.c:1731
#, fuzzy, c-format
msgid ""
"The Grisbi's id account is %s, but the imported id account is %s.\n"
@@ -8225,48 +8225,64 @@
#. l'id du compte choisi et l'id du compte importé sont différents
#. on propose encore d'arrêter...
-#: src/import.c:1733 src/import.c:2515
+#: src/import.c:1734 src/import.c:2539
msgid "The id of the imported and chosen accounts are different"
msgstr "Id importovaného a vybraného úÄtu jsou různá"
-#: src/import.c:1963
+#: src/import.c:1968
+#, fuzzy
+msgid "Confirmation of transactions to be merged"
+msgstr "Potvrzenà odstranÄnà transakce"
+
+#: src/import.c:1971
msgid "Confirmation of importation of transactions"
msgstr "Potvrzenà importovaných transakcÃ"
-#: src/import.c:1975
+#: src/import.c:1987
+#, fuzzy
+msgid "Please select the transactions to be merged"
+msgstr "PoužÃt vybranou transakci jako Å¡ablonu"
+
+#: src/import.c:1990
+#, fuzzy
msgid ""
-"Some imported transactions seem to be already saved. Please select the "
+"Some imported transactions seem to be already saved.Please select the "
"transactions to import."
msgstr ""
"NÄkteré importované transakce jsou již pravdÄpodobnÄ uložené. ProsÃm oznaÄte "
"transakce pro import."
-#: src/import.c:2051
+#: src/import.c:2070
+#, fuzzy, c-format
+msgid "Transactions to be merged : %s ; %s ; %s"
+msgstr "Import transakcà : %02d/%02d/%04d ; %s ; %4.2f"
+
+#: src/import.c:2075
#, fuzzy, c-format
msgid "Transactions to import : %s ; %s ; %s"
msgstr "Import transakcà : %02d/%02d/%04d ; %s ; %4.2f"
-#: src/import.c:2090
+#: src/import.c:2114
#, fuzzy, c-format
msgid "Transaction found : %s ; %s ; %s ; %s"
msgstr "Nalezena transakce : %02d/%02d/%04d ; %s ; %4.2f ; %s"
-#: src/import.c:2103
+#: src/import.c:2127
#, fuzzy, c-format
msgid "Transaction found : %s ; %s ; %s"
msgstr "Nalezena transakce : %02d/%02d/%04d ; %s ; %4.2f"
#. Check = Chèque
-#: src/import.c:2317 src/plugins/ofx/ofx.c:431
+#: src/import.c:2341 src/plugins/ofx/ofx.c:431
msgid "Check"
msgstr "Å ek"
#. Cash withdrawal = retrait en liquide
-#: src/import.c:2361
+#: src/import.c:2385
msgid "Cash withdrawal"
msgstr ""
-#: src/import.c:2451
+#: src/import.c:2475
#, fuzzy, c-format
msgid ""
"Warning : the cheque number %ld is already used.\n"
@@ -8275,7 +8291,7 @@
"Pozor: toto ÄÃslo Å¡eku již bylo použito.\n"
"PÅesto pokraÄovat?"
-#: src/import.c:2516
+#: src/import.c:2540
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 ?"
@@ -8283,98 +8299,103 @@
"ZÅejmÄ byl vybrán chybný úÄet. Pokud zvolÃte pokraÄovat, id úÄtu bude "
"zmÄnÄno. Chcete pokraÄovat?"
-#: src/import.c:2792
+#: src/import.c:2816
msgid "Orphaned transactions"
msgstr "OsiÅelé transakce"
-#: src/import.c:2805
+#: src/import.c:2829
msgid "Mark transactions you want to add to the list and click the add button"
msgstr ""
"OznaÄte transakce které chcete pÅidat do seznamu a stisknÄte tlaÄÃtko PÅidat"
-#: src/import.c:2874
+#: src/import.c:2898
msgid "Mark"
msgstr "OznaÄit"
-#: src/import.c:3075
+#: src/import.c:3099
#, fuzzy, c-format
msgid "%s #%d"
msgstr "%s %d"
-#: src/import.c:3110
+#: src/import.c:3134
msgid "Threshold while matching transaction date during import (in days)"
msgstr ""
-#: src/import.c:3136
+#: src/import.c:3160
+#, fuzzy
+msgid "merge transactions imported with planned transactions"
+msgstr "ZmÄnit transakci na plánovanou transakci"
+
+#: src/import.c:3173
msgid "automatically associate the category of the payee if it is possible"
msgstr ""
-#: src/import.c:3149
+#: src/import.c:3186
#, fuzzy
msgid "Set the financial year"
msgstr "Zvolte fiskálnà rok"
-#: src/import.c:3150
+#: src/import.c:3187
#, fuzzy
msgid "According to the date"
msgstr "podle data transakce"
-#: src/import.c:3151
+#: src/import.c:3188
msgid "According to the value date (if fail, try with the date)"
msgstr ""
-#: src/import.c:3295
+#: src/import.c:3332
#, c-format
msgid ""
"%s is neither an OFX file, neither a QIF file. Nothing will be done for that "
"file."
msgstr ""
-#: src/import.c:3353
+#: src/import.c:3390
#, c-format
msgid ""
"%s was not imported successfully. An error occured while getting the "
"transactions."
msgstr ""
-#: src/import.c:3431
+#: src/import.c:3468
msgid "Import a file with a rule"
msgstr ""
#. text for paddingbox
-#: src/import.c:3442
+#: src/import.c:3479
#, fuzzy, c-format
msgid "Properties of the rule : %s\n"
msgstr "Výsledek pro %s"
-#: src/import.c:3461
+#: src/import.c:3498
#, fuzzy, c-format
msgid "Imported transactions will be added to the account %s.\n"
msgstr "VÅ¡echny transakce budou pÅepoÄteny na mÄnu odpovÃdajÃcÃho úÄtu."
-#: src/import.c:3464
+#: src/import.c:3501
#, fuzzy, c-format
msgid "Imported transactions will mark transactions in the account %s.\n"
msgstr "RozdÄlenà transakce je pÅevod na tento úÄet.\n"
#. textstring 2
-#: src/import.c:3468
+#: src/import.c:3505
#, fuzzy, c-format
msgid "Currency to import is %s.\n"
msgstr "Vlastnosti mÄny"
-#: src/import.c:3474
+#: src/import.c:3511
#, fuzzy
msgid "Amounts of the transactions will be inverted.\n"
msgstr "Vložené automatické plánované transakce"
#. label filename
-#: src/import.c:3484
+#: src/import.c:3521
#, fuzzy
msgid "Name of the file to import "
msgstr "Pojmenujte soubor úÄtů"
-#: src/import.c:3578
+#: src/import.c:3615
#, fuzzy, c-format
msgid "Unable to create tmp file: %s\n"
msgstr "Nelze otevÅÃt soubor '%s': %s"
@@ -8869,7 +8890,7 @@
msgstr "Žádná podkategorie"
#. * Find a unique name for payee
-#: src/meta_payee.c:320 src/tiers_onglet.c:299
+#: src/meta_payee.c:320 src/tiers_onglet.c:300
#, fuzzy
msgid "New payee"
msgstr "Nová metoda platby"
@@ -9537,41 +9558,41 @@
msgid "Error opening file '%s'"
msgstr "Chyba pÅi otevÃránà souboru '%s'."
-#: src/tiers_onglet.c:303
+#: src/tiers_onglet.c:304
#, fuzzy
msgid "Create a new payee"
msgstr "VytvoÅit nový úÄet"
-#: src/tiers_onglet.c:312
+#: src/tiers_onglet.c:313
#, fuzzy
msgid "Delete selected payee"
msgstr "Odstranit tÅetà stranu"
-#: src/tiers_onglet.c:321
+#: src/tiers_onglet.c:322
msgid "Edit selected payee"
msgstr ""
-#: src/tiers_onglet.c:325
+#: src/tiers_onglet.c:326
#, fuzzy
msgid "Remove unused payees"
msgstr "Pojmenujte soubor úÄtů"
-#: src/tiers_onglet.c:329 src/tiers_onglet.c:373
+#: src/tiers_onglet.c:330 src/tiers_onglet.c:374
#, fuzzy
msgid "Remove orphan payees"
msgstr "Pojmenujte soubor úÄtů"
-#: src/tiers_onglet.c:343
+#: src/tiers_onglet.c:344
#, fuzzy
msgid "Manage payees"
msgstr "PÅehled"
-#: src/tiers_onglet.c:347 src/tiers_onglet.c:729
+#: src/tiers_onglet.c:348 src/tiers_onglet.c:730
#, fuzzy
msgid "Manage the payees"
msgstr "Detail kategoriÃ"
-#: src/tiers_onglet.c:374
+#: src/tiers_onglet.c:375
msgid ""
"This will remove all the payees wich are not used in any transactions. "
"Payees linked to an archived transactions will not be removed, even if not "
@@ -9580,29 +9601,29 @@
"Are you sure you want to do that?"
msgstr ""
-#: src/tiers_onglet.c:386 src/tiers_onglet.c:819
+#: src/tiers_onglet.c:387 src/tiers_onglet.c:862
#, c-format
msgid "Removed %d payees."
msgstr ""
#. Edit transaction
-#: src/tiers_onglet.c:411
+#: src/tiers_onglet.c:412
msgid "Payee view"
msgstr ""
-#: src/tiers_onglet.c:633
+#: src/tiers_onglet.c:634
#, c-format
msgid ""
"You tried to rename current payee to '%s' but this payee already exists. "
"Please choose another name."
msgstr ""
-#: src/tiers_onglet.c:637
+#: src/tiers_onglet.c:638
#, fuzzy
msgid "Payee already exists"
msgstr "Soubor již existuje"
-#: src/tiers_onglet.c:730
+#: src/tiers_onglet.c:731
msgid ""
"This wizard will help you to simplify the list of payees.\n"
"\n"
@@ -9611,12 +9632,12 @@
"It is better to make a backup of your Grisbi file if you have not yet done. "
msgstr ""
-#: src/tiers_onglet.c:873
+#: src/tiers_onglet.c:916
#, fuzzy
msgid "Choose a payee"
msgstr "Vyberte soubory pro import"
-#: src/tiers_onglet.c:875
+#: src/tiers_onglet.c:918
msgid ""
"Select one payee in the list that you modify to serve as the basis for your "
"research.\n"
@@ -9627,69 +9648,69 @@
"string_1%string_2"
msgstr ""
-#: src/tiers_onglet.c:896
+#: src/tiers_onglet.c:939
#, fuzzy
msgid "Enter the new payee"
msgstr "Zadejte jméno tÅetà strany"
-#: src/tiers_onglet.c:898
+#: src/tiers_onglet.c:941
#, fuzzy
msgid "Enter the name of the new payee"
msgstr "Zvolte jméno nového podrozpoÄtu"
-#: src/tiers_onglet.c:911
+#: src/tiers_onglet.c:954
#, fuzzy
msgid "Options"
msgstr "Výdaje"
-#: src/tiers_onglet.c:913
+#: src/tiers_onglet.c:956
msgid "Extracting a number and save it in the field No Cheque/Virement"
msgstr ""
-#: src/tiers_onglet.c:919
+#: src/tiers_onglet.c:962
msgid "Save the payees in the notes"
msgstr ""
-#: src/tiers_onglet.c:952
+#: src/tiers_onglet.c:995
msgid "List of payees who will be modified"
msgstr ""
-#: src/tiers_onglet.c:994
+#: src/tiers_onglet.c:1037
#, fuzzy
msgid "Select"
msgstr "OznaÄit vÅ¡e"
-#: src/tiers_onglet.c:1002
+#: src/tiers_onglet.c:1045
#, fuzzy
msgid "Payee number"
msgstr "ÄÃslo Å¡eku"
-#: src/tiers_onglet.c:1012
+#: src/tiers_onglet.c:1055
#, fuzzy
msgid "Payee name"
msgstr "Celkový souÄet"
-#: src/tiers_onglet.c:1028
+#: src/tiers_onglet.c:1071
msgid "Total number of payees :"
msgstr ""
#. ajoute le nombre de tiers sélectionnés
-#: src/tiers_onglet.c:1045
+#: src/tiers_onglet.c:1088
#, fuzzy
msgid "Number of selected payees :"
msgstr "Odstranit tÅetà stranu"
-#: src/tiers_onglet.c:1147
+#: src/tiers_onglet.c:1190
#, c-format
msgid "Payee sought : %s\n"
msgstr ""
-#: src/tiers_onglet.c:1153
+#: src/tiers_onglet.c:1196
#, fuzzy, c-format
msgid "New payee : %s"
msgstr "Nová metoda platby"
-#: src/tiers_onglet.c:1229
+#: src/tiers_onglet.c:1272
#, c-format
msgid ""
"You are about to replace %d payees whose names contain %s\n"
@@ -9698,11 +9719,11 @@
"<span weight=\"bold\">Are you sure?</span>"
msgstr ""
-#: src/tiers_onglet.c:1393
+#: src/tiers_onglet.c:1436
msgid "You must choose a payee for searching."
msgstr ""
-#: src/tiers_onglet.c:1397
+#: src/tiers_onglet.c:1440
msgid "Beware you don't use one of models for the research."
msgstr ""
@@ -11324,9 +11345,6 @@
#~ msgid "Account split"
#~ msgstr "RozdÄlenà úÄtu"
-#~ msgid "Confirmation of transaction removal"
-#~ msgstr "Potvrzenà odstranÄnà transakce"
-
#~ msgid ""
#~ "You are currently trying to remove a transaction. There is no undo for "
#~ "this. Do you confirm the removal?"
Index: he.po
===================================================================
RCS file: /cvsroot/grisbi/grisbi/po/he.po,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- he.po 13 Mar 2009 20:15:36 -0000 1.22
+++ he.po 17 Mar 2009 22:05:33 -0000 1.23
@@ -283,7 +283,7 @@
msgstr ""
"Project-Id-Version: he\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 20:58+0100\n"
+"POT-Creation-Date: 2009-03-17 21:51+0100\n"
"PO-Revision-Date: 2006-02-11 16:08+0200\n"
"Last-Translator: dotan\n"
"Language-Team: <en at li.org>\n"
@@ -723,7 +723,7 @@
#: src/gsb_assistant_reconcile_config.c:612
#: src/gsb_payment_method_config.c:159 src/gsb_reconcile_config.c:96
#: src/gsb_scheduler_list.c:331 src/imputation_budgetaire.c:164
-#: src/tiers_onglet.c:226
+#: src/tiers_onglet.c:227
msgid "Account"
msgstr "×ש×××"
@@ -736,13 +736,13 @@
#: src/export_csv.c:747 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1281 src/gsb_form_widget.c:400 src/gsb_reconcile.c:154
#: src/gsb_scheduler_list.c:331 src/gsb_transactions_list.c:143
-#: src/import.c:2882 src/import_csv.c:78 src/traitement_variables.c:74
+#: src/import.c:2906 src/import_csv.c:78 src/traitement_variables.c:74
msgid "Date"
msgstr "ת×ר××"
#. Description entry
#: src/balance_estimate_tab.c:300 src/etats_onglet.c:287
-#: src/tiers_onglet.c:591
+#: src/tiers_onglet.c:592
msgid "Description"
msgstr "ת×××ר"
@@ -791,7 +791,7 @@
#: src/barre_outils.c:107 src/barre_outils.c:453 src/categories_onglet.c:499
#: src/etats_onglet.c:173 src/imputation_budgetaire.c:532
-#: src/tiers_onglet.c:307
+#: src/tiers_onglet.c:308
#, fuzzy
msgid "Delete"
msgstr "×××ר×"
@@ -831,7 +831,7 @@
msgstr "×××× ×¨×©××ת ×××¢×ר×ת"
#: src/barre_outils.c:153 src/barre_outils.c:513 src/categories_onglet.c:518
-#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:334
+#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:335
msgid "View"
msgstr ""
@@ -863,7 +863,7 @@
msgstr "××¦× ×©× 3 ש×ר×ת"
#: src/barre_outils.c:237 src/categories_onglet.c:562
-#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:417
+#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:418
#, fuzzy
msgid "Complete view"
msgstr "ש×××¨× ××ק×ת"
@@ -982,7 +982,7 @@
#: src/categories_onglet.c:160 src/export_csv.c:774 src/gsb_reconcile.c:157
#: src/gsb_scheduler_list.c:332 src/gsb_transactions_list.c:149
#: src/gsb_transactions_list.c:2867 src/import_csv.c:86
-#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:235
+#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:236
#: src/traitement_variables.c:80
msgid "Balance"
msgstr "××××"
@@ -1061,7 +1061,7 @@
msgstr "× × ××××× ×©× ×¢××ר תת-×ק×××ר×× ×××ש×"
#: src/categories_onglet.c:480 src/etats_onglet.c:130 src/import.c:350
-#: src/import.c:3099 src/imputation_budgetaire.c:513 src/parametres.c:287
+#: src/import.c:3123 src/imputation_budgetaire.c:513 src/parametres.c:287
msgid "Import"
msgstr "×××××"
@@ -1087,7 +1087,7 @@
#: src/categories_onglet.c:508 src/etats_onglet.c:184
#: src/fenetre_principale.c:251 src/imputation_budgetaire.c:542
-#: src/tiers_onglet.c:316
+#: src/tiers_onglet.c:317
#, fuzzy
msgid "Properties"
msgstr "××פ××× × ×××××¢"
@@ -1097,7 +1097,7 @@
msgid "Edit selected category"
msgstr "×ק×××ר××"
-#: src/categories_onglet.c:522 src/tiers_onglet.c:338
+#: src/categories_onglet.c:522 src/tiers_onglet.c:339
#, fuzzy
msgid "Change view mode"
msgstr "××¦× ×©× ×©××¨× ××ת"
@@ -1115,7 +1115,7 @@
#: src/categories_onglet.c:607 src/categories_onglet.c:611
#: src/imputation_budgetaire.c:640 src/imputation_budgetaire.c:645
-#: src/tiers_onglet.c:553
+#: src/tiers_onglet.c:554
#, fuzzy, c-format
msgid "Properties for %s"
msgstr "ת×צ×× ×¢××ר %s"
@@ -1145,7 +1145,7 @@
#: src/gsb_bank.c:832 src/gsb_currency_config.c:355 src/gsb_fyear_config.c:191
#: src/gsb_fyear_config.c:278 src/gsb_payment_method_config.c:239
#: src/gsb_reconcile_config.c:179 src/gsb_transactions_list.c:1733
-#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:578
+#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:579
msgid "Name"
msgstr "ש×"
@@ -1658,12 +1658,12 @@
#. Transfer = Virement
#. Direct deposit remplacé par Transfert = Virement
-#: src/etats_affiche.c:1837 src/import.c:2349 src/import.c:2367
+#: src/etats_affiche.c:1837 src/import.c:2373 src/import.c:2391
msgid "Transfert"
msgstr "××¢×ר×"
#: src/etats_affiche.c:1846 src/export_csv.c:561 src/gsb_data_category.c:1039
-#: src/gsb_form.c:740 src/gsb_form.c:2465 src/gsb_form.c:2837
+#: src/gsb_form.c:740 src/gsb_form.c:2476 src/gsb_form.c:2848
#: src/gsb_form_scheduler.c:321 src/gsb_transactions_list.c:3216
msgid "Split of transaction"
msgstr "ש××רת ×¢×סק×"
@@ -1719,7 +1719,7 @@
#: src/etats_config.c:687 src/etats_config.c:7193 src/export_csv.c:762
#: src/fenetre_principale.c:266 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1308 src/gsb_form_widget.c:420 src/gsb_scheduler_list.c:331
-#: src/gsb_transactions_list.c:145 src/import.c:2889 src/import_csv.c:80
+#: src/gsb_transactions_list.c:145 src/import.c:2913 src/import_csv.c:80
#: src/meta_payee.c:76 src/traitement_variables.c:76
#, fuzzy
msgid "Payee"
@@ -2057,14 +2057,14 @@
#: src/etats_config.c:2581 src/etats_config.c:2848 src/etats_config.c:3138
#: src/etats_config.c:3951 src/etats_config.c:4147 src/etats_config.c:7512
-#: src/tiers_onglet.c:1263 src/tiers_onglet.c:1283
+#: src/tiers_onglet.c:1306 src/tiers_onglet.c:1326
msgid "Select all"
msgstr "×ס×× ×××"
#. ajoute le bouton (dé)sélectionne tout
#: src/etats_config.c:2596 src/etats_config.c:2863 src/etats_config.c:3153
#: src/etats_config.c:3966 src/etats_config.c:4162 src/etats_config.c:7527
-#: src/tiers_onglet.c:1062 src/tiers_onglet.c:1265
+#: src/tiers_onglet.c:1105 src/tiers_onglet.c:1308
msgid "Unselect all"
msgstr "×ס×× ××××"
@@ -2177,7 +2177,7 @@
#. set the title
#: src/etats_config.c:4041 src/navigation.c:290 src/navigation.c:1228
-#: src/tiers_onglet.c:214
+#: src/tiers_onglet.c:215
#, fuzzy
msgid "Payees"
msgstr "××××"
@@ -2299,7 +2299,7 @@
#: src/etats_config.c:5310 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:2897
+#: src/gsb_transactions_list.c:150 src/import.c:2921
#: src/traitement_variables.c:81
msgid "Amount"
msgstr "×××ת"
@@ -4163,7 +4163,7 @@
msgstr ""
#: src/gsb_assistant_archive.c:354 src/gsb_data_payee.c:511
-#: src/gsb_form.c:2572 src/gsb_form.c:2573 src/navigation.c:1289
+#: src/gsb_form.c:2583 src/gsb_form.c:2584 src/navigation.c:1289
msgid "Report"
msgstr "××\"×"
@@ -6517,19 +6517,19 @@
msgstr "××¢××¡×§× #%d צר××× ××××ת #%d × ×××ת, ×× ×× ××× × ×§×××ת.\n"
#. Deposit = Dépôt
-#: src/gsb_data_payment.c:714 src/import.c:2331 src/plugins/ofx/ofx.c:451
+#: src/gsb_data_payment.c:714 src/import.c:2355 src/plugins/ofx/ofx.c:451
msgid "Deposit"
msgstr "×פק××"
#. pas trouvé de définition remplacé par carte de crédit
#. Point of sale = Point de vente remplacé par carte de crédit
-#: src/gsb_data_payment.c:723 src/import.c:2337 src/import.c:2343
+#: src/gsb_data_payment.c:723 src/import.c:2361 src/import.c:2367
msgid "Credit card"
msgstr "×ר××ס ×שר××"
#. Electronic payment remplacé par Direct debit = Prélèvement
#. Merchant initiated debit remplacé par Direct debit = Prélèvement
-#: src/gsb_data_payment.c:732 src/import.c:2355 src/import.c:2373
+#: src/gsb_data_payment.c:732 src/import.c:2379 src/import.c:2397
msgid "Direct debit"
msgstr "×××× ×ש×ר"
@@ -7047,7 +7047,7 @@
msgid "Encryption plugin not found."
msgstr "×ש××× %s ××× × × ×צ×.\n"
-#: src/gsb_file_load.c:410 src/gsb_file_load.c:4364
+#: src/gsb_file_load.c:410 src/gsb_file_load.c:4370
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "ק×××¥ ×× ××× × ××\"× ×©× ×ר×ס××"
@@ -7062,14 +7062,14 @@
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: src/gsb_file_load.c:7582
+#: src/gsb_file_load.c:7588
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "×ר×ס×× ××××¨×¡× %s ××× × ×ס××× ×פת×× ×§×××¥ ××"
-#: src/gsb_file_load.c:7621
+#: src/gsb_file_load.c:7627
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -7077,11 +7077,11 @@
"transactions or important informations."
msgstr ""
-#: src/gsb_file_load.c:7622
+#: src/gsb_file_load.c:7628
msgid "Grisbi archive opened"
msgstr ""
-#: src/gsb_file_load.c:7714
+#: src/gsb_file_load.c:7720
#, c-format
msgid ""
"Your old file grisbi was saved as: \n"
@@ -7212,53 +7212,53 @@
msgid "Cheque/Transfer number"
msgstr "×ספר ×××××/××¢×ר×"
-#: src/gsb_form.c:2157
+#: src/gsb_form.c:2168
#, fuzzy
msgid "No payee selected for this report."
msgstr "×× × ××ר ×× ×¦× ×©×××©× ×××\"× ××."
-#: src/gsb_form.c:2415
+#: src/gsb_form.c:2426
msgid "You must enter a date."
msgstr "×ש ×××× ×ס ת×ר××."
-#: src/gsb_form.c:2422
+#: src/gsb_form.c:2433
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "ת×ר×× ×× ×ª×§××"
-#: src/gsb_form.c:2441
+#: src/gsb_form.c:2452
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "ת×ר×× ×× ×ª×§××"
-#: src/gsb_form.c:2467
+#: src/gsb_form.c:2478
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: src/gsb_form.c:2500
+#: src/gsb_form.c:2511
#, fuzzy
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr "××רת ××¢××¡×§× ××¢××¡×§× ×ת×××× ×ª"
-#: src/gsb_form.c:2507
+#: src/gsb_form.c:2518
#, fuzzy
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr "××ש××× ××ק×שר ×××¢××¨× ×× ××× × ×ª×§××"
-#: src/gsb_form.c:2515
+#: src/gsb_form.c:2526
msgid "Can't issue a transfer its own account."
msgstr "×× × ××ª× ×××¢××ר ××××ª× ××ש××× ××××ª× ××ש×××."
-#: src/gsb_form.c:2520
+#: src/gsb_form.c:2531
msgid "Can't issue a transfer on a closed account."
msgstr "×× × ××ª× ××צע ××¢××¨× ××ש××× ×¡××ר."
-#: src/gsb_form.c:2546
+#: src/gsb_form.c:2557
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -7268,7 +7268,7 @@
"×× ××× × ××××× ××£ ×ספר.\n"
"××× ×××ש×× ××× ××ת?"
-#: src/gsb_form.c:2560
+#: src/gsb_form.c:2571
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -7276,31 +7276,31 @@
"×××ר×: ×ספר ××××× ×× ××ר × ××¦× ×ש×××ש.\n"
"××× ×××ש×× ××× ××ת?"
-#: src/gsb_form.c:2580
+#: src/gsb_form.c:2591
#, fuzzy
msgid "A transaction with a multiple payee must be a new one."
msgstr "×¢××¡×§× ×¢× ×¦× ×©×××©× ×ר××× ×שתתפ×× ××××ת ××××ת ×¢××¡×§× ××ש×."
-#: src/gsb_form.c:2585
+#: src/gsb_form.c:2596
#, fuzzy
msgid "A transaction with a multiple payee cannot be a split child."
msgstr "×¢××¡×§× ×¢× ×¦× ×©×××©× ×ר××× ×שתתפ×× ××××ת ××××ת ×¢××¡×§× ××ש×."
-#: src/gsb_form.c:2596
+#: src/gsb_form.c:2607
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: src/gsb_form.c:2603
+#: src/gsb_form.c:2614
#, fuzzy
msgid "Invalid multiple payee."
msgstr "×¦× ×©×××©× ×ר××× ×שת×ש×× ××× × ×ª×§××."
-#: src/gsb_form.c:2860
+#: src/gsb_form.c:2871
#, fuzzy
msgid "Modifying a transaction"
msgstr "ער××ת ×¢×סק×"
-#: src/gsb_form.c:2861
+#: src/gsb_form.c:2872
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -7310,7 +7310,7 @@
msgstr ""
#. propose to configure the form
-#: src/gsb_form.c:3161
+#: src/gsb_form.c:3172
msgid "Configure the form"
msgstr ""
@@ -8312,11 +8312,11 @@
msgid "File name"
msgstr "×©× ×××ק××"
-#: src/import.c:526 src/import.c:608 src/import.c:3207 src/import.c:3230
+#: src/import.c:526 src/import.c:608 src/import.c:3244 src/import.c:3267
msgid "Unknown"
msgstr "×× ××××¢"
-#: src/import.c:568 src/import.c:3310 src/import_csv.c:1045
+#: src/import.c:568 src/import.c:3347 src/import_csv.c:1045
#, fuzzy, c-format
msgid "Unable to read file: %s\n"
msgstr "×× × ××ª× ×פת×× ×ת ×ק×××¥ '%s': %s"
@@ -8480,7 +8480,7 @@
#. there is a difference between the imported account id and grisbi account id,
#. * ask to be sure
-#: src/import.c:1730
+#: src/import.c:1731
#, fuzzy, c-format
msgid ""
"The Grisbi's id account is %s, but the imported id account is %s.\n"
@@ -8494,46 +8494,62 @@
#. l'id du compte choisi et l'id du compte importé sont différents
#. on propose encore d'arrêter...
-#: src/import.c:1733 src/import.c:2515
+#: src/import.c:1734 src/import.c:2539
msgid "The id of the imported and chosen accounts are different"
msgstr "××¡×¤×¨× ×××××× ×©× ××ש××× ×××××× ×××ש××× ×× ××ר ×× ×©×× ××"
-#: src/import.c:1963
+#: src/import.c:1968
+#, fuzzy
+msgid "Confirmation of transactions to be merged"
+msgstr "××ש×ר ×סרת ×¢×סק×"
+
+#: src/import.c:1971
msgid "Confirmation of importation of transactions"
msgstr "××ש×ר ××××× ×¢×סק××ת"
-#: src/import.c:1975
+#: src/import.c:1987
+#, fuzzy
+msgid "Please select the transactions to be merged"
+msgstr "ש×××ש ××¢××¡×§× ×× ××רת ×ת×ר ת×× ×ת"
+
+#: src/import.c:1990
+#, fuzzy
msgid ""
-"Some imported transactions seem to be already saved. Please select the "
+"Some imported transactions seem to be already saved.Please select the "
"transactions to import."
msgstr "× ×¨×× ×× ×ספר ×¢×סק××ת ××××××ת ××ר × ×©×ר×. × × ××××ר ×ת ××¢×סק××ת ××××××."
-#: src/import.c:2051
+#: src/import.c:2070
+#, fuzzy, c-format
+msgid "Transactions to be merged : %s ; %s ; %s"
+msgstr "×¢×סק××ת ×××××× : %02d/%02d/%04d ; %s ; %4.2f"
+
+#: src/import.c:2075
#, fuzzy, c-format
msgid "Transactions to import : %s ; %s ; %s"
msgstr "×¢×סק××ת ×××××× : %02d/%02d/%04d ; %s ; %4.2f"
-#: src/import.c:2090
+#: src/import.c:2114
#, fuzzy, c-format
msgid "Transaction found : %s ; %s ; %s ; %s"
msgstr "×¢××¡×§× × ×צ×× : %02d/%02d/%04d ; %s ; %4.2f ; %s"
-#: src/import.c:2103
+#: src/import.c:2127
#, fuzzy, c-format
msgid "Transaction found : %s ; %s ; %s"
msgstr "×¢××¡×§× × ×צ×× : %02d/%02d/%04d ; %s ; %4.2f"
#. Check = Chèque
-#: src/import.c:2317 src/plugins/ofx/ofx.c:431
+#: src/import.c:2341 src/plugins/ofx/ofx.c:431
msgid "Check"
msgstr "×××××"
#. Cash withdrawal = retrait en liquide
-#: src/import.c:2361
+#: src/import.c:2385
msgid "Cash withdrawal"
msgstr ""
-#: src/import.c:2451
+#: src/import.c:2475
#, fuzzy, c-format
msgid ""
"Warning : the cheque number %ld is already used.\n"
@@ -8542,7 +8558,7 @@
"×××ר×: ×ספר ××××× ×× ××ר × ××¦× ×ש×××ש.\n"
"××× ×××ש×× ××× ××ת?"
-#: src/import.c:2516
+#: src/import.c:2540
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 ?"
@@ -8550,97 +8566,102 @@
"××× ××ת×× ×× × ××ר ×ש××× ×©×××? ×× ××××× ××ש××, ××× ×ספר ×××××× ×©× ××ש××× "
"××©×ª× ×. ××× ××× ×××ש×× ×¢× ×פע×××?"
-#: src/import.c:2792
+#: src/import.c:2816
msgid "Orphaned transactions"
msgstr "×¢×סק××ת ×ת×××ת"
-#: src/import.c:2805
+#: src/import.c:2829
msgid "Mark transactions you want to add to the list and click the add button"
msgstr "× × ×ס×× ×¢×סק××ת ×שר ×ש ×××ס××£ ×רש×××, ××××××¥ ×¢× ×××¦× ×××ספ×"
-#: src/import.c:2874
+#: src/import.c:2898
msgid "Mark"
msgstr "ס××××"
-#: src/import.c:3075
+#: src/import.c:3099
#, fuzzy, c-format
msgid "%s #%d"
msgstr "%s %d"
-#: src/import.c:3110
+#: src/import.c:3134
msgid "Threshold while matching transaction date during import (in days)"
msgstr ""
-#: src/import.c:3136
+#: src/import.c:3160
+#, fuzzy
+msgid "merge transactions imported with planned transactions"
+msgstr "××רת ××¢××¡×§× ××¢××¡×§× ×ת×××× ×ª"
+
+#: src/import.c:3173
msgid "automatically associate the category of the payee if it is possible"
msgstr ""
-#: src/import.c:3149
+#: src/import.c:3186
#, fuzzy
msgid "Set the financial year"
msgstr "×××רת ×©× ×ª ××ספ××"
-#: src/import.c:3150
+#: src/import.c:3187
#, fuzzy
msgid "According to the date"
msgstr "××ת×× ×ת×ר×× ××¢×סק×"
-#: src/import.c:3151
+#: src/import.c:3188
msgid "According to the value date (if fail, try with the date)"
msgstr ""
-#: src/import.c:3295
+#: src/import.c:3332
#, c-format
msgid ""
"%s is neither an OFX file, neither a QIF file. Nothing will be done for that "
"file."
msgstr ""
-#: src/import.c:3353
+#: src/import.c:3390
#, c-format
msgid ""
"%s was not imported successfully. An error occured while getting the "
"transactions."
msgstr ""
-#: src/import.c:3431
+#: src/import.c:3468
msgid "Import a file with a rule"
msgstr ""
#. text for paddingbox
-#: src/import.c:3442
+#: src/import.c:3479
#, fuzzy, c-format
msgid "Properties of the rule : %s\n"
msgstr "ת×צ×× ×¢××ר %s"
-#: src/import.c:3461
+#: src/import.c:3498
#, fuzzy, c-format
msgid "Imported transactions will be added to the account %s.\n"
msgstr "×× ××¢×סק××ת ××××¨× ×××××¢ ×©× ××ש××× ×©×××."
-#: src/import.c:3464
+#: src/import.c:3501
#, fuzzy, c-format
msgid "Imported transactions will mark transactions in the account %s.\n"
msgstr "ש××רת ×¢××¡×§× ××× ××¢××¨× ×× ×ש××× ××. \n"
#. textstring 2
-#: src/import.c:3468
+#: src/import.c:3505
#, fuzzy, c-format
msgid "Currency to import is %s.\n"
msgstr "××פ××× × ×××××¢"
-#: src/import.c:3474
+#: src/import.c:3511
#, fuzzy
msgid "Amounts of the transactions will be inverted.\n"
msgstr "×××× ×¡× ××¢×ר×ת ×©× ×§××¢× ×××××××ת ×ר×ש"
#. label filename
-#: src/import.c:3484
+#: src/import.c:3521
#, fuzzy
msgid "Name of the file to import "
msgstr "×©× ×§×××¥ ××ש××× ×ת"
-#: src/import.c:3578
+#: src/import.c:3615
#, fuzzy, c-format
msgid "Unable to create tmp file: %s\n"
msgstr "×× × ××ª× ×פת×× ×ת ×ק×××¥ '%s': %s"
@@ -9135,7 +9156,7 @@
msgstr "××× ×ª×ª-ק×××ר××"
#. * Find a unique name for payee
-#: src/meta_payee.c:320 src/tiers_onglet.c:299
+#: src/meta_payee.c:320 src/tiers_onglet.c:300
#, fuzzy
msgid "New payee"
msgstr "××¨× ×ª×©××× ××ש×"
@@ -9803,41 +9824,41 @@
msgid "Error opening file '%s'"
msgstr "ש×××× ×פת××ת ×ק×××¥ '%s'."
-#: src/tiers_onglet.c:303
+#: src/tiers_onglet.c:304
#, fuzzy
msgid "Create a new payee"
msgstr "×צ×רת ×ש××× ××ש"
-#: src/tiers_onglet.c:312
+#: src/tiers_onglet.c:313
#, fuzzy
msgid "Delete selected payee"
msgstr "×××קת ×¦× ×©××ש×"
-#: src/tiers_onglet.c:321
+#: src/tiers_onglet.c:322
msgid "Edit selected payee"
msgstr ""
-#: src/tiers_onglet.c:325
+#: src/tiers_onglet.c:326
#, fuzzy
msgid "Remove unused payees"
msgstr "×©× ×§×××¥ ××ש××× ×ת"
-#: src/tiers_onglet.c:329 src/tiers_onglet.c:373
+#: src/tiers_onglet.c:330 src/tiers_onglet.c:374
#, fuzzy
msgid "Remove orphan payees"
msgstr "×©× ×§×××¥ ××ש××× ×ת"
-#: src/tiers_onglet.c:343
+#: src/tiers_onglet.c:344
#, fuzzy
msgid "Manage payees"
msgstr "×¢××× ×¨×ש×"
-#: src/tiers_onglet.c:347 src/tiers_onglet.c:729
+#: src/tiers_onglet.c:348 src/tiers_onglet.c:730
#, fuzzy
msgid "Manage the payees"
msgstr "פ×ר×× ×§×××ר××ת"
-#: src/tiers_onglet.c:374
+#: src/tiers_onglet.c:375
msgid ""
"This will remove all the payees wich are not used in any transactions. "
"Payees linked to an archived transactions will not be removed, even if not "
@@ -9846,29 +9867,29 @@
"Are you sure you want to do that?"
msgstr ""
-#: src/tiers_onglet.c:386 src/tiers_onglet.c:819
+#: src/tiers_onglet.c:387 src/tiers_onglet.c:862
#, c-format
msgid "Removed %d payees."
msgstr ""
#. Edit transaction
-#: src/tiers_onglet.c:411
+#: src/tiers_onglet.c:412
msgid "Payee view"
msgstr ""
-#: src/tiers_onglet.c:633
+#: src/tiers_onglet.c:634
#, c-format
msgid ""
"You tried to rename current payee to '%s' but this payee already exists. "
"Please choose another name."
msgstr ""
-#: src/tiers_onglet.c:637
+#: src/tiers_onglet.c:638
#, fuzzy
msgid "Payee already exists"
msgstr "×ק×××¥ ××ר ק×××"
-#: src/tiers_onglet.c:730
+#: src/tiers_onglet.c:731
msgid ""
"This wizard will help you to simplify the list of payees.\n"
"\n"
@@ -9877,12 +9898,12 @@
"It is better to make a backup of your Grisbi file if you have not yet done. "
msgstr ""
-#: src/tiers_onglet.c:873
+#: src/tiers_onglet.c:916
#, fuzzy
msgid "Choose a payee"
msgstr "×××רת ×ק×צ×× ××××××"
-#: src/tiers_onglet.c:875
+#: src/tiers_onglet.c:918
msgid ""
"Select one payee in the list that you modify to serve as the basis for your "
"research.\n"
@@ -9893,69 +9914,69 @@
"string_1%string_2"
msgstr ""
-#: src/tiers_onglet.c:896
+#: src/tiers_onglet.c:939
#, fuzzy
msgid "Enter the new payee"
msgstr "× × ××××× ×ת ×©× ××¦× ×ש×××©× ×××ש"
-#: src/tiers_onglet.c:898
+#: src/tiers_onglet.c:941
#, fuzzy
msgid "Enter the name of the new payee"
msgstr "× × ××××× ×©× ×¢××ר תת-×§× ×תקצ×× ×××ש"
-#: src/tiers_onglet.c:911
+#: src/tiers_onglet.c:954
#, fuzzy
msgid "Options"
msgstr "××צ××ת"
-#: src/tiers_onglet.c:913
+#: src/tiers_onglet.c:956
msgid "Extracting a number and save it in the field No Cheque/Virement"
msgstr ""
-#: src/tiers_onglet.c:919
+#: src/tiers_onglet.c:962
msgid "Save the payees in the notes"
msgstr ""
-#: src/tiers_onglet.c:952
+#: src/tiers_onglet.c:995
msgid "List of payees who will be modified"
msgstr ""
-#: src/tiers_onglet.c:994
+#: src/tiers_onglet.c:1037
#, fuzzy
msgid "Select"
msgstr "×ס×× ×××"
-#: src/tiers_onglet.c:1002
+#: src/tiers_onglet.c:1045
#, fuzzy
msgid "Payee number"
msgstr "×ספר ××××××"
-#: src/tiers_onglet.c:1012
+#: src/tiers_onglet.c:1055
#, fuzzy
msgid "Payee name"
msgstr "×¡× ××× ×××××"
-#: src/tiers_onglet.c:1028
+#: src/tiers_onglet.c:1071
msgid "Total number of payees :"
msgstr ""
#. ajoute le nombre de tiers sélectionnés
-#: src/tiers_onglet.c:1045
+#: src/tiers_onglet.c:1088
#, fuzzy
msgid "Number of selected payees :"
msgstr "×××קת ×¦× ×©××ש×"
-#: src/tiers_onglet.c:1147
+#: src/tiers_onglet.c:1190
#, c-format
msgid "Payee sought : %s\n"
msgstr ""
-#: src/tiers_onglet.c:1153
+#: src/tiers_onglet.c:1196
#, fuzzy, c-format
msgid "New payee : %s"
msgstr "××¨× ×ª×©××× ××ש×"
-#: src/tiers_onglet.c:1229
+#: src/tiers_onglet.c:1272
#, c-format
msgid ""
"You are about to replace %d payees whose names contain %s\n"
@@ -9964,11 +9985,11 @@
"<span weight=\"bold\">Are you sure?</span>"
msgstr ""
-#: src/tiers_onglet.c:1393
+#: src/tiers_onglet.c:1436
msgid "You must choose a payee for searching."
msgstr ""
-#: src/tiers_onglet.c:1397
+#: src/tiers_onglet.c:1440
msgid "Beware you don't use one of models for the research."
msgstr ""
@@ -11569,9 +11590,6 @@
#~ msgid "Curent balance"
#~ msgstr "××ª×¨× × ××××ת"
-#~ msgid "Confirmation of transaction removal"
-#~ msgstr "××ש×ר ×סרת ×¢×סק×"
-
#~ msgid ""
#~ "You are currently trying to remove a transaction. There is no undo for "
#~ "this. Do you confirm the removal?"
Index: zh_CN.po
===================================================================
RCS file: /cvsroot/grisbi/grisbi/po/zh_CN.po,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- zh_CN.po 13 Mar 2009 20:15:37 -0000 1.16
+++ zh_CN.po 17 Mar 2009 22:05:33 -0000 1.17
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-13 20:58+0100\n"
+"POT-Creation-Date: 2009-03-17 21:51+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"
@@ -444,7 +444,7 @@
#: src/gsb_assistant_reconcile_config.c:612
#: src/gsb_payment_method_config.c:159 src/gsb_reconcile_config.c:96
#: src/gsb_scheduler_list.c:331 src/imputation_budgetaire.c:164
-#: src/tiers_onglet.c:226
+#: src/tiers_onglet.c:227
msgid "Account"
msgstr "è´¦æ·"
@@ -457,13 +457,13 @@
#: src/export_csv.c:747 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1281 src/gsb_form_widget.c:400 src/gsb_reconcile.c:154
#: src/gsb_scheduler_list.c:331 src/gsb_transactions_list.c:143
-#: src/import.c:2882 src/import_csv.c:78 src/traitement_variables.c:74
+#: src/import.c:2906 src/import_csv.c:78 src/traitement_variables.c:74
msgid "Date"
msgstr "æ¥æ"
#. Description entry
#: src/balance_estimate_tab.c:300 src/etats_onglet.c:287
-#: src/tiers_onglet.c:591
+#: src/tiers_onglet.c:592
msgid "Description"
msgstr "æè¿°"
@@ -512,7 +512,7 @@
#: src/barre_outils.c:107 src/barre_outils.c:453 src/categories_onglet.c:499
#: src/etats_onglet.c:173 src/imputation_budgetaire.c:532
-#: src/tiers_onglet.c:307
+#: src/tiers_onglet.c:308
#, fuzzy
msgid "Delete"
msgstr "éæ©"
@@ -552,7 +552,7 @@
msgstr "交æå表æåº"
#: src/barre_outils.c:153 src/barre_outils.c:513 src/categories_onglet.c:518
-#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:334
+#: src/imputation_budgetaire.c:553 src/tiers_onglet.c:335
msgid "View"
msgstr ""
@@ -584,7 +584,7 @@
msgstr "ä¸è¡æ¨¡å¼"
#: src/barre_outils.c:237 src/categories_onglet.c:562
-#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:417
+#: src/imputation_budgetaire.c:597 src/tiers_onglet.c:418
#, fuzzy
msgid "Complete view"
msgstr "没æå®æçç»ç®åç±»"
@@ -704,7 +704,7 @@
#: src/categories_onglet.c:160 src/export_csv.c:774 src/gsb_reconcile.c:157
#: src/gsb_scheduler_list.c:332 src/gsb_transactions_list.c:149
#: src/gsb_transactions_list.c:2867 src/import_csv.c:86
-#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:235
+#: src/imputation_budgetaire.c:173 src/tiers_onglet.c:236
#: src/traitement_variables.c:80
msgid "Balance"
msgstr "ä½é¢"
@@ -783,7 +783,7 @@
msgstr "请è¾å
¥æ°å¢åç±»çå称"
#: src/categories_onglet.c:480 src/etats_onglet.c:130 src/import.c:350
-#: src/import.c:3099 src/imputation_budgetaire.c:513 src/parametres.c:287
+#: src/import.c:3123 src/imputation_budgetaire.c:513 src/parametres.c:287
msgid "Import"
msgstr "导å
¥"
@@ -809,7 +809,7 @@
#: src/categories_onglet.c:508 src/etats_onglet.c:184
#: src/fenetre_principale.c:251 src/imputation_budgetaire.c:542
-#: src/tiers_onglet.c:316
+#: src/tiers_onglet.c:317
#, fuzzy
msgid "Properties"
msgstr "è´§å¸å±æ§"
@@ -819,7 +819,7 @@
msgid "Edit selected category"
msgstr "ç±»å«"
-#: src/categories_onglet.c:522 src/tiers_onglet.c:338
+#: src/categories_onglet.c:522 src/tiers_onglet.c:339
#, fuzzy
msgid "Change view mode"
msgstr "åè¡æ¨¡å¼"
@@ -837,7 +837,7 @@
#: src/categories_onglet.c:607 src/categories_onglet.c:611
#: src/imputation_budgetaire.c:640 src/imputation_budgetaire.c:645
-#: src/tiers_onglet.c:553
+#: src/tiers_onglet.c:554
#, fuzzy, c-format
msgid "Properties for %s"
msgstr "%s çç»æ"
@@ -867,7 +867,7 @@
#: src/gsb_bank.c:832 src/gsb_currency_config.c:355 src/gsb_fyear_config.c:191
#: src/gsb_fyear_config.c:278 src/gsb_payment_method_config.c:239
#: src/gsb_reconcile_config.c:179 src/gsb_transactions_list.c:1733
-#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:578
+#: src/imputation_budgetaire.c:673 src/tiers_onglet.c:579
msgid "Name"
msgstr "å称"
@@ -1376,12 +1376,12 @@
#. Transfer = Virement
#. Direct deposit remplacé par Transfert = Virement
-#: src/etats_affiche.c:1837 src/import.c:2349 src/import.c:2367
+#: src/etats_affiche.c:1837 src/import.c:2373 src/import.c:2391
msgid "Transfert"
msgstr "转å¸"
#: src/etats_affiche.c:1846 src/export_csv.c:561 src/gsb_data_category.c:1039
-#: src/gsb_form.c:740 src/gsb_form.c:2465 src/gsb_form.c:2837
+#: src/gsb_form.c:740 src/gsb_form.c:2476 src/gsb_form.c:2848
#: src/gsb_form_scheduler.c:321 src/gsb_transactions_list.c:3216
#, fuzzy
msgid "Split of transaction"
@@ -1438,7 +1438,7 @@
#: src/etats_config.c:687 src/etats_config.c:7193 src/export_csv.c:762
#: src/fenetre_principale.c:266 src/gsb_assistant_reconcile_config.c:612
#: src/gsb_form.c:1308 src/gsb_form_widget.c:420 src/gsb_scheduler_list.c:331
-#: src/gsb_transactions_list.c:145 src/import.c:2889 src/import_csv.c:80
+#: src/gsb_transactions_list.c:145 src/import.c:2913 src/import_csv.c:80
#: src/meta_payee.c:76 src/traitement_variables.c:76
#, fuzzy
msgid "Payee"
@@ -1776,14 +1776,14 @@
#: src/etats_config.c:2581 src/etats_config.c:2848 src/etats_config.c:3138
#: src/etats_config.c:3951 src/etats_config.c:4147 src/etats_config.c:7512
-#: src/tiers_onglet.c:1263 src/tiers_onglet.c:1283
+#: src/tiers_onglet.c:1306 src/tiers_onglet.c:1326
msgid "Select all"
msgstr "éæ©ææ"
#. ajoute le bouton (dé)sélectionne tout
#: src/etats_config.c:2596 src/etats_config.c:2863 src/etats_config.c:3153
#: src/etats_config.c:3966 src/etats_config.c:4162 src/etats_config.c:7527
-#: src/tiers_onglet.c:1062 src/tiers_onglet.c:1265
+#: src/tiers_onglet.c:1105 src/tiers_onglet.c:1308
msgid "Unselect all"
msgstr "åæ¶éæ©ææ"
@@ -1895,7 +1895,7 @@
#. set the title
#: src/etats_config.c:4041 src/navigation.c:290 src/navigation.c:1228
-#: src/tiers_onglet.c:214
+#: src/tiers_onglet.c:215
#, fuzzy
msgid "Payees"
msgstr "æ¥"
@@ -2017,7 +2017,7 @@
#: src/etats_config.c:5310 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:2897
+#: src/gsb_transactions_list.c:150 src/import.c:2921
#: src/traitement_variables.c:81
msgid "Amount"
msgstr "æ»è®¡"
@@ -3867,7 +3867,7 @@
msgstr ""
#: src/gsb_assistant_archive.c:354 src/gsb_data_payee.c:511
-#: src/gsb_form.c:2572 src/gsb_form.c:2573 src/navigation.c:1289
+#: src/gsb_form.c:2583 src/gsb_form.c:2584 src/navigation.c:1289
msgid "Report"
msgstr "æ¥è¡¨"
@@ -6217,19 +6217,19 @@
msgstr "交æ #%d åºå½å #%dï¼ä½æ¬æ¡æ²¡æã\n"
#. Deposit = Dépôt
-#: src/gsb_data_payment.c:714 src/import.c:2331 src/plugins/ofx/ofx.c:451
+#: src/gsb_data_payment.c:714 src/import.c:2355 src/plugins/ofx/ofx.c:451
msgid "Deposit"
msgstr "å款"
#. pas trouvé de définition remplacé par carte de crédit
#. Point of sale = Point de vente remplacé par carte de crédit
-#: src/gsb_data_payment.c:723 src/import.c:2337 src/import.c:2343
+#: src/gsb_data_payment.c:723 src/import.c:2361 src/import.c:2367
msgid "Credit card"
msgstr "ä¿¡ç¨å¡"
#. Electronic payment remplacé par Direct debit = Prélèvement
#. Merchant initiated debit remplacé par Direct debit = Prélèvement
-#: src/gsb_data_payment.c:732 src/import.c:2355 src/import.c:2373
+#: src/gsb_data_payment.c:732 src/import.c:2379 src/import.c:2397
msgid "Direct debit"
msgstr "ç´æ¥åè®°"
@@ -6736,7 +6736,7 @@
msgid "Encryption plugin not found."
msgstr "è´¦æ· %s æªæ¾å°\n"
-#: src/gsb_file_load.c:410 src/gsb_file_load.c:4364
+#: src/gsb_file_load.c:410 src/gsb_file_load.c:4370
#, fuzzy
msgid "This is not a Grisbi file... Loading aborted."
msgstr "该æ件ä¸æ¯Grisbiæ¥è¡¨"
@@ -6751,14 +6751,14 @@
msgstr ""
#. we don't know here the release of that file, give the release needed
-#: src/gsb_file_load.c:7582
+#: src/gsb_file_load.c:7588
#, fuzzy, c-format
msgid ""
"Grisbi version %s is needed to open this file.\n"
"You are using version %s."
msgstr "æå¼æ¤æ件éè¦Grisbiçæ¬ %s "
-#: src/gsb_file_load.c:7621
+#: src/gsb_file_load.c:7627
msgid ""
"You have opened an archive.\n"
"There is no limit in Grisbi, you can do whatever you want and save it later "
@@ -6766,11 +6766,11 @@
"transactions or important informations."
msgstr ""
-#: src/gsb_file_load.c:7622
+#: src/gsb_file_load.c:7628
msgid "Grisbi archive opened"
msgstr ""
-#: src/gsb_file_load.c:7714
+#: src/gsb_file_load.c:7720
#, c-format
msgid ""
"Your old file grisbi was saved as: \n"
@@ -6901,53 +6901,53 @@
msgid "Cheque/Transfer number"
msgstr "æ¯ç¥¨/转å¸ç¼å·"
-#: src/gsb_form.c:2157
+#: src/gsb_form.c:2168
#, fuzzy
msgid "No payee selected for this report."
msgstr "æ¬æ¥è¡¨æ²¡æéæ©ç¬¬ä¸æ¹ã"
-#: src/gsb_form.c:2415
+#: src/gsb_form.c:2426
msgid "You must enter a date."
msgstr "æ¨å¿
é¡»è¾å
¥æ¥æ"
-#: src/gsb_form.c:2422
+#: src/gsb_form.c:2433
#, fuzzy, c-format
msgid "Invalid date %s"
msgstr "éæ³æ¥æ"
-#: src/gsb_form.c:2441
+#: src/gsb_form.c:2452
#, fuzzy, c-format
msgid "Invalid value date %s"
msgstr "éæ³æ¥æ"
-#: src/gsb_form.c:2467
+#: src/gsb_form.c:2478
msgid ""
"You cannot set split of transaction in category for a daughter of a split of "
"transaction."
msgstr ""
-#: src/gsb_form.c:2500
+#: src/gsb_form.c:2511
#, fuzzy
msgid ""
"Cannot associate a transfer to a deleted account in a scheduled transaction."
msgstr "转æ¢äº¤æ为计å交æ"
-#: src/gsb_form.c:2507
+#: src/gsb_form.c:2518
#, fuzzy
msgid ""
"There is no associated account for this transfer or associated account is "
"invalid."
msgstr "æ¬è½¬å¸å
³èçè´¦æ·ä¸åæ³"
-#: src/gsb_form.c:2515
+#: src/gsb_form.c:2526
msgid "Can't issue a transfer its own account."
msgstr "ä¸è½è½¬å¸å°æ¬è´¦æ·ã"
-#: src/gsb_form.c:2520
+#: src/gsb_form.c:2531
msgid "Can't issue a transfer on a closed account."
msgstr "ä¸è½å¨ç»ç®è´¦æ·ä¸äº§ç交æã"
-#: src/gsb_form.c:2546
+#: src/gsb_form.c:2557
msgid ""
"Selected method of payment has an automatic incremental number\n"
"but doesn't contain any number.\n"
@@ -6957,7 +6957,7 @@
"ä½æ¯æ²¡æä»»ä½ç¼å·ã\n"
"ä»ç¶ç»§ç»ï¼"
-#: src/gsb_form.c:2560
+#: src/gsb_form.c:2571
msgid ""
"Warning: this cheque number is already used.\n"
"Continue anyway?"
@@ -6965,31 +6965,31 @@
"è¦åï¼è¯¥æ¯ç¥¨çç¼å·å·²ç»ä½¿ç¨è¿äºã\n"
"ä»ç¶ç»§ç»ï¼"
-#: src/gsb_form.c:2580
+#: src/gsb_form.c:2591
#, fuzzy
msgid "A transaction with a multiple payee must be a new one."
msgstr "æå¤ä¸ªç¬¬ä¸æ¹ç交æå¿
é¡»çææ°ç交æã"
-#: src/gsb_form.c:2585
+#: src/gsb_form.c:2596
#, fuzzy
msgid "A transaction with a multiple payee cannot be a split child."
msgstr "æå¤ä¸ªç¬¬ä¸æ¹ç交æå¿
é¡»çææ°ç交æã"
-#: src/gsb_form.c:2596
+#: src/gsb_form.c:2607
msgid "The word \"Report\" is reserved. Please use another one."
msgstr ""
-#: src/gsb_form.c:2603
+#: src/gsb_form.c:2614
#, fuzzy
msgid "Invalid multiple payee."
msgstr "æ æçå¤ç¬¬ä¸æ¹ã"
-#: src/gsb_form.c:2860
+#: src/gsb_form.c:2871
#, fuzzy
msgid "Modifying a transaction"
msgstr "æ´æ¹äº¤æ"
-#: src/gsb_form.c:2861
+#: src/gsb_form.c:2872
msgid ""
"You are trying to change a split of transaction to another kind of "
"transaction.\n"
@@ -6999,7 +6999,7 @@
msgstr ""
#. propose to configure the form
-#: src/gsb_form.c:3161
+#: src/gsb_form.c:3172
msgid "Configure the form"
msgstr ""
@@ -7995,11 +7995,11 @@
msgid "File name"
msgstr "ææè
å称"
-#: src/import.c:526 src/import.c:608 src/import.c:3207 src/import.c:3230
+#: src/import.c:526 src/import.c:608 src/import.c:3244 src/import.c:3267
msgid "Unknown"
msgstr "为æ¢"
-#: src/import.c:568 src/import.c:3310 src/import_csv.c:1045
+#: src/import.c:568 src/import.c:3347 src/import_csv.c:1045
#, c-format
msgid "Unable to read file: %s\n"
msgstr ""
@@ -8162,7 +8162,7 @@
#. there is a difference between the imported account id and grisbi account id,
#. * ask to be sure
-#: src/import.c:1730
+#: src/import.c:1731
#, fuzzy, c-format
msgid ""
"The Grisbi's id account is %s, but the imported id account is %s.\n"
@@ -8175,46 +8175,62 @@
#. l'id du compte choisi et l'id du compte importé sont différents
#. on propose encore d'arrêter...
-#: src/import.c:1733 src/import.c:2515
+#: src/import.c:1734 src/import.c:2539
msgid "The id of the imported and chosen accounts are different"
msgstr "导å
¥åéæ©è´¦æ·çIDä¸å"
-#: src/import.c:1963
+#: src/import.c:1968
+#, fuzzy
+msgid "Confirmation of transactions to be merged"
+msgstr "导å
¥äº¤æ确认"
+
+#: src/import.c:1971
msgid "Confirmation of importation of transactions"
msgstr "导å
¥äº¤æ确认"
-#: src/import.c:1975
+#: src/import.c:1987
+#, fuzzy
+msgid "Please select the transactions to be merged"
+msgstr "使ç¨éä¸äº¤æå模æ¿"
+
+#: src/import.c:1990
+#, fuzzy
msgid ""
-"Some imported transactions seem to be already saved. Please select the "
+"Some imported transactions seem to be already saved.Please select the "
"transactions to import."
msgstr "ä¸äºå¯¼å
¥ç交æä¼¼ä¹å·²ç»è¢«ä¿åè¿äºã请éæ©å¯¼å
¥ç交æã"
-#: src/import.c:2051
+#: src/import.c:2070
+#, fuzzy, c-format
+msgid "Transactions to be merged : %s ; %s ; %s"
+msgstr "导å
¥ç交æï¼%02d/%02d/%04d ; %s ; %4.2f"
+
+#: src/import.c:2075
#, fuzzy, c-format
msgid "Transactions to import : %s ; %s ; %s"
msgstr "导å
¥ç交æï¼%02d/%02d/%04d ; %s ; %4.2f"
-#: src/import.c:2090
+#: src/import.c:2114
#, fuzzy, c-format
msgid "Transaction found : %s ; %s ; %s ; %s"
msgstr "æ¾å°äº¤æï¼%02d/%02d/%04d ; %s ; %4.2f ; %s"
-#: src/import.c:2103
+#: src/import.c:2127
#, fuzzy, c-format
msgid "Transaction found : %s ; %s ; %s"
msgstr "æ¾å°äº¤æï¼%02d/%02d/%04d ; %s ; %4.2f"
#. Check = Chèque
-#: src/import.c:2317 src/plugins/ofx/ofx.c:431
+#: src/import.c:2341 src/plugins/ofx/ofx.c:431
msgid "Check"
msgstr "æ¯ç¥¨"
#. Cash withdrawal = retrait en liquide
-#: src/import.c:2361
+#: src/import.c:2385
msgid "Cash withdrawal"
msgstr ""
-#: src/import.c:2451
+#: src/import.c:2475
#, fuzzy, c-format
msgid ""
"Warning : the cheque number %ld is already used.\n"
@@ -8223,106 +8239,111 @@
"è¦åï¼è¯¥æ¯ç¥¨çç¼å·å·²ç»ä½¿ç¨è¿äºã\n"
"ä»ç¶ç»§ç»ï¼"
-#: src/import.c:2516
+#: src/import.c:2540
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:2792
+#: src/import.c:2816
msgid "Orphaned transactions"
msgstr "å¤å¿äº¤æ"
-#: src/import.c:2805
+#: src/import.c:2829
msgid "Mark transactions you want to add to the list and click the add button"
msgstr "æ è®°æ¨æ³å¢å å°æ¸
åç交æï¼ç¹å»å¢å æé®"
-#: src/import.c:2874
+#: src/import.c:2898
msgid "Mark"
msgstr "æ è®°"
-#: src/import.c:3075
+#: src/import.c:3099
#, fuzzy, c-format
msgid "%s #%d"
msgstr "%s %d"
-#: src/import.c:3110
+#: src/import.c:3134
msgid "Threshold while matching transaction date during import (in days)"
msgstr ""
-#: src/import.c:3136
+#: src/import.c:3160
+#, fuzzy
+msgid "merge transactions imported with planned transactions"
+msgstr "转æ¢äº¤æ为计å交æ"
+
+#: src/import.c:3173
msgid "automatically associate the category of the payee if it is possible"
msgstr ""
-#: src/import.c:3149
+#: src/import.c:3186
#, fuzzy
msgid "Set the financial year"
msgstr "财年"
-#: src/import.c:3150
+#: src/import.c:3187
#, fuzzy
msgid "According to the date"
msgstr "æ ¹æ®äº¤ææ¥æ"
-#: src/import.c:3151
+#: src/import.c:3188
msgid "According to the value date (if fail, try with the date)"
msgstr ""
-#: src/import.c:3295
+#: src/import.c:3332
#, c-format
msgid ""
"%s is neither an OFX file, neither a QIF file. Nothing will be done for that "
"file."
msgstr ""
-#: src/import.c:3353
+#: src/import.c:3390
#, c-format
msgid ""
"%s was not imported successfully. An error occured while getting the "
"transactions."
msgstr ""
-#: src/import.c:3431
+#: src/import.c:3468
msgid "Import a file with a rule"
msgstr ""
#. text for paddingbox
-#: src/import.c:3442
+#: src/import.c:3479
#, fuzzy, c-format
msgid "Properties of the rule : %s\n"
msgstr ""
"æ件 \"%s\" åç°é误ï¼\n"
"%s"
-#: src/import.c:3461
+#: src/import.c:3498
#, fuzzy, c-format
msgid "Imported transactions will be added to the account %s.\n"
msgstr "ææ交æå°è¢«è½¬å为å®ä»¬è´¦æ·çè´§å¸ã"
-#: src/import.c:3464
+#: src/import.c:3501
#, fuzzy, c-format
msgid "Imported transactions will mark transactions in the account %s.\n"
msgstr "交æçç»ç®åç±»æ¯æ¬è´¦æ·ç转å¸ã\n"
#. textstring 2
-#: src/import.c:3468
+#: src/import.c:3505
#, fuzzy, c-format
msgid "Currency to import is %s.\n"
msgstr "è´§å¸å±æ§"
-#: src/import.c:3474
+#: src/import.c:3511
#, fuzzy
msgid "Amounts of the transactions will be inverted.\n"
msgstr "å½å
¥èªå¨é¢å®ç交æ"
#. label filename
-#: src/import.c:3484
+#: src/import.c:3521
#, fuzzy
msgid "Name of the file to import "
msgstr "éæ©å¯¼å
¥çæ件"
-#: src/import.c:3578
+#: src/import.c:3615
#, c-format
msgid "Unable to create tmp file: %s\n"
msgstr ""
@@ -8817,7 +8838,7 @@
msgstr "没æåç±»"
#. * Find a unique name for payee
-#: src/meta_payee.c:320 src/tiers_onglet.c:299
+#: src/meta_payee.c:320 src/tiers_onglet.c:300
#, fuzzy
msgid "New payee"
msgstr "æ°æ¯ä»æ¹å¼"
@@ -9485,39 +9506,39 @@
msgid "Error opening file '%s'"
msgstr "æå¼æ件 '%s'.åçé误"
-#: src/tiers_onglet.c:303
+#: src/tiers_onglet.c:304
#, fuzzy
msgid "Create a new payee"
msgstr "æ°å¢è´¦æ·"
-#: src/tiers_onglet.c:312
+#: src/tiers_onglet.c:313
#, fuzzy
msgid "Delete selected payee"
msgstr "å é¤ç¬¬ä¸æ¹"
-#: src/tiers_onglet.c:321
+#: src/tiers_onglet.c:322
msgid "Edit selected payee"
msgstr ""
-#: src/tiers_onglet.c:325
+#: src/tiers_onglet.c:326
msgid "Remove unused payees"
msgstr ""
-#: src/tiers_onglet.c:329 src/tiers_onglet.c:373
+#: src/tiers_onglet.c:330 src/tiers_onglet.c:374
msgid "Remove orphan payees"
msgstr ""
-#: src/tiers_onglet.c:343
+#: src/tiers_onglet.c:344
#, fuzzy
msgid "Manage payees"
msgstr "é¦é¡µ"
-#: src/tiers_onglet.c:347 src/tiers_onglet.c:729
+#: src/tiers_onglet.c:348 src/tiers_onglet.c:730
#, fuzzy
msgid "Manage the payees"
msgstr "ç±»å«è¯¦æ
"
-#: src/tiers_onglet.c:374
+#: src/tiers_onglet.c:375
msgid ""
"This will remove all the payees wich are not used in any transactions. "
"Payees linked to an archived transactions will not be removed, even if not "
@@ -9526,29 +9547,29 @@
"Are you sure you want to do that?"
msgstr ""
-#: src/tiers_onglet.c:386 src/tiers_onglet.c:819
+#: src/tiers_onglet.c:387 src/tiers_onglet.c:862
#, c-format
msgid "Removed %d payees."
msgstr ""
#. Edit transaction
-#: src/tiers_onglet.c:411
+#: src/tiers_onglet.c:412
msgid "Payee view"
msgstr ""
-#: src/tiers_onglet.c:633
+#: src/tiers_onglet.c:634
#, c-format
msgid ""
"You tried to rename current payee to '%s' but this payee already exists. "
"Please choose another name."
msgstr ""
-#: src/tiers_onglet.c:637
+#: src/tiers_onglet.c:638
#, fuzzy
msgid "Payee already exists"
msgstr "æ件已ç»åå¨"
-#: src/tiers_onglet.c:730
+#: src/tiers_onglet.c:731
msgid ""
"This wizard will help you to simplify the list of payees.\n"
"\n"
@@ -9557,12 +9578,12 @@
"It is better to make a backup of your Grisbi file if you have not yet done. "
msgstr ""
-#: src/tiers_onglet.c:873
+#: src/tiers_onglet.c:916
#, fuzzy
msgid "Choose a payee"
msgstr "éæ©å¯¼å
¥çæ件"
-#: src/tiers_onglet.c:875
+#: src/tiers_onglet.c:918
msgid ""
"Select one payee in the list that you modify to serve as the basis for your "
"research.\n"
@@ -9573,69 +9594,69 @@
"string_1%string_2"
msgstr ""
-#: src/tiers_onglet.c:896
+#: src/tiers_onglet.c:939
#, fuzzy
msgid "Enter the new payee"
msgstr "è¾å
¥æ°ç¬¬ä¸æ¹çå称"
-#: src/tiers_onglet.c:898
+#: src/tiers_onglet.c:941
#, fuzzy
msgid "Enter the name of the new payee"
msgstr "è¾å
¥æ°åé¢ç®è¡çå称"
-#: src/tiers_onglet.c:911
+#: src/tiers_onglet.c:954
#, fuzzy
msgid "Options"
msgstr "æ¯åº"
-#: src/tiers_onglet.c:913
+#: src/tiers_onglet.c:956
msgid "Extracting a number and save it in the field No Cheque/Virement"
msgstr ""
-#: src/tiers_onglet.c:919
+#: src/tiers_onglet.c:962
msgid "Save the payees in the notes"
msgstr ""
-#: src/tiers_onglet.c:952
+#: src/tiers_onglet.c:995
msgid "List of payees who will be modified"
msgstr ""
-#: src/tiers_onglet.c:994
+#: src/tiers_onglet.c:1037
#, fuzzy
msgid "Select"
msgstr "éæ©ææ"
-#: src/tiers_onglet.c:1002
+#: src/tiers_onglet.c:1045
#, fuzzy
msgid "Payee number"
msgstr "æ¯ç¥¨ç¼å·"
-#: src/tiers_onglet.c:1012
+#: src/tiers_onglet.c:1055
#, fuzzy
msgid "Payee name"
msgstr "ä¸è¬æ»è®¡"
-#: src/tiers_onglet.c:1028
+#: src/tiers_onglet.c:1071
msgid "Total number of payees :"
msgstr ""
#. ajoute le nombre de tiers sélectionnés
-#: src/tiers_onglet.c:1045
+#: src/tiers_onglet.c:1088
#, fuzzy
msgid "Number of selected payees :"
msgstr "å é¤ç¬¬ä¸æ¹"
-#: src/tiers_onglet.c:1147
+#: src/tiers_onglet.c:1190
#, c-format
msgid "Payee sought : %s\n"
msgstr ""
-#: src/tiers_onglet.c:1153
+#: src/tiers_onglet.c:1196
#, fuzzy, c-format
msgid "New payee : %s"
msgstr "æ°æ¯ä»æ¹å¼"
-#: src/tiers_onglet.c:1229
+#: src/tiers_onglet.c:1272
#, c-format
msgid ""
"You are about to replace %d payees whose names contain %s\n"
@@ -9644,11 +9665,11 @@
"<span weight=\"bold\">Are you sure?</span>"
msgstr ""
-#: src/tiers_onglet.c:1393
+#: src/tiers_onglet.c:1436
msgid "You must choose a payee for searching."
msgstr ""
-#: src/tiers_onglet.c:1397
+#: src/tiers_onglet.c:1440
msgid "Beware you don't use one of models for the research."
msgstr ""
- Previous message: [grisbi-cvs] grisbi/po fr.po,1.141,1.142
- Next message: [grisbi-cvs] grisbi/src gsb_file_load.c, 1.153, 1.154 gsb_file_save.c, 1.114, 1.115 gsb_form.c, 1.113, 1.114 import.c, 1.264, 1.265 structures.h, 1.225, 1.226
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cvs
mailing list