From 742064ee8752831003944fea62d01dfdd86bc4bd Mon Sep 17 00:00:00 2001 From: fell Date: Wed, 15 Nov 2017 00:36:41 +0100 Subject: [PATCH 1/6] Fix a few encodings and Content-* tags in glossary --- po/glossary/ca.po | 2 +- po/glossary/el.po | 268 +++++++++++++++++------------------ po/glossary/es.po | 108 +++++++------- po/glossary/es_NI-policy.txt | 40 +++--- po/glossary/it.po | 24 ++-- po/glossary/lt.po | 2 +- po/glossary/nb.po | 58 ++++---- 7 files changed, 251 insertions(+), 251 deletions(-) diff --git a/po/glossary/ca.po b/po/glossary/ca.po index ec640db2923..4d22b477610 100644 --- a/po/glossary/ca.po +++ b/po/glossary/ca.po @@ -13,7 +13,7 @@ msgstr "" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Transfer-Encoding: 8bit\n" #. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" msgid "Term (Dear translator: This file will never be visible to the user!)" diff --git a/po/glossary/el.po b/po/glossary/el.po index c82a3e50fc0..0438419a962 100644 --- a/po/glossary/el.po +++ b/po/glossary/el.po @@ -11,7 +11,7 @@ msgstr "" "Language-Team: Greek \n" "Language: el\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-7\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" @@ -20,37 +20,37 @@ msgstr "" #. "A detailed record of money spent and received" msgid "account" -msgstr "" +msgstr "λογαριασμός" #. "-" #, fuzzy msgid "account code" -msgstr " %d" +msgstr "Λογαριασμός %d" #. "the tree view of all accounts" #, fuzzy msgid "account hierarchy" -msgstr "" +msgstr "ιεραρχία" #. "-" #, fuzzy msgid "account name" -msgstr " _:" +msgstr "Όνομα _λογαριασμού:" #. "The left side of the balance sheet in T account form shows the application of funds in form of assets. Because it contains only assets use assets directly. Complement: Passive. See also: Report Form" #, fuzzy msgid "account type: Active" -msgstr " :" +msgstr "Είδος Παρασκηνίου:" #. "A thing, esp. owned by a person or company, that has value and can be used or sold to pay debts. Dependent on the context you might use 'account type: Active' instead." #, fuzzy msgid "account type: Asset" -msgstr " :" +msgstr "Είδος Παρασκηνίου:" #. "in fact: 'Active & Passive', group aka 'Balance Sheet accounts'; complement of 'Profit & Loss'" #, fuzzy msgid "account type: Assets & Liabilities" -msgstr " :" +msgstr "Είδος Παρασκηνίου:" #. "(esp. US) (Brit = current account) a bank account from which money can be withdrawn without previous notice" msgid "account type: checking" @@ -87,12 +87,12 @@ msgstr "" #. "The right side of the balance sheet in T account form shows the source of funds and contains equity & liability. While not common in english, most languages would translate 'equity & liability' with 'passive'. Complement: Active. See also: Report Form Implementation: https://bugzilla.gnome.org/show_bug.cgi?id=421766" #, fuzzy msgid "account type: Passive" -msgstr " :" +msgstr "Είδος Παρασκηνίου:" #. "Group of accounts tracking your success, complement of 'Assets & Liabilities'" #, fuzzy msgid "account type: Profit & Loss" -msgstr " :" +msgstr "Είδος Παρασκηνίου:" #. "1. (US) any type of account that earns interest 2. (Brit) any type of bank account that earns a higher level of interest than a current account or deposit account" msgid "account type: saving" @@ -101,17 +101,17 @@ msgstr "" #. "-" #, fuzzy msgid "account type: Stock" -msgstr " :" +msgstr "Είδος Παρασκηνίου:" #. "This account type (new in gnucash-2.4.0) is used when exchanging or trading amounts from one currency into another" #, fuzzy msgid "account type: trading" -msgstr " :" +msgstr "Είδος Παρασκηνίου:" #. "-" #, fuzzy msgid "account: parent account" -msgstr " " +msgstr "Διαφανές παρασκήνιο" #. "-" msgid "account: subaccount" @@ -128,88 +128,88 @@ msgstr "" #. "Automated teller machine" #, fuzzy msgid "action: ATM" -msgstr ": " +msgstr "Τοποθεσία: " #. "Transaction was an auto deposit" #, fuzzy msgid "action: autoDep" -msgstr " " +msgstr "Βάση ενεργειών" #. "-" #, fuzzy msgid "action: buy" -msgstr ": " +msgstr "Τοποθεσία: " #. "-" #, fuzzy msgid "action: deposit" -msgstr " " +msgstr "Σημείο εισαγωγής" #. "When people can automatically deduct money straight from your account. The reverse of Direct Deposit." #, fuzzy msgid "action: direct debit" -msgstr " " +msgstr "Ανύπαρκτη συνάρτηση" #. "transaction is a distribution (???)" #, fuzzy msgid "action: dist" -msgstr " " +msgstr "Λίστα Εικονιδίων" #. "transaction is a dividend" #, fuzzy msgid "action: div" -msgstr ": " +msgstr "Τοποθεσία: " #. "-" #, fuzzy msgid "action: fee" -msgstr ": " +msgstr "Τοποθεσία: " #. "transaction comes from interest" #, fuzzy msgid "action: int" -msgstr ": " +msgstr "Τοποθεσία: " # # FIX check! #. "-" #, fuzzy msgid "action: loan" -msgstr " " +msgstr "Νήσος του Ασεντιόν" #. "see: payment 1." #, fuzzy msgid "action: payment" -msgstr "_ " +msgstr "Ο_νόματα Συναρτήσεων" #. "Point of sale" #, fuzzy msgid "action: POS" -msgstr ": " +msgstr "Τοποθεσία: " #. "-" #, fuzzy msgid "action: rebate" -msgstr "A " +msgstr "Aλλαγή τμήματος" #. "-" #, fuzzy msgid "action: sell" -msgstr ": " +msgstr "Τοποθεσία: " #. "-" #, fuzzy msgid "action: Teller" -msgstr " " +msgstr "Επιλογέας Συναρτήσεων" #. "see: transfer 2. (=credit transfer)" #, fuzzy msgid "action: transfer" -msgstr " " +msgstr "Βάση ενεργειών" #. "-" #, fuzzy msgid "action: wire" -msgstr " " +msgstr "Ώρα δημιουργίας" #. "-" msgid "action: withdraw" @@ -218,12 +218,12 @@ msgstr "" #. "A sum of money" #, fuzzy msgid "amount" -msgstr "" +msgstr "μήνας" #. "The result of adding several amounts together and then dividing this total by the number of amounts" #, fuzzy msgid "average" -msgstr "" +msgstr "Μέσος" #. "The amount of money that is in one's account" msgid "balance (noun)" @@ -232,17 +232,17 @@ msgstr "" #. "A written record of money received and paid out, showing the difference between the two total amounts" #, fuzzy msgid "balance sheet" -msgstr " " +msgstr "ενεργό φύλλο" #. "To arrange for income and spending to be equal" #, fuzzy msgid "balance, to" -msgstr "" +msgstr "Ισορροπία" #. "-" #, fuzzy msgid "bank" -msgstr "" +msgstr "Βαθμός" #. "A written statement of money owed for goods or services supplied. In Gnucash, a 'bill' is a statement that we received (from a vendor), whereas an 'invoice' is one that we sent out (to a customer)." msgid "bill" @@ -276,29 +276,29 @@ msgstr "" #. "as Menu Item: Headline for features that are related to small business accounting" #, fuzzy msgid "business (noun)" -msgstr "" +msgstr "Μεταφορά" #. "Profits made from the sale of investments or property" #, fuzzy msgid "capital gains" -msgstr " " +msgstr "Μερικώς παγωμένο χιόνι" #. "Distinguishing the uppercase and lowercase letters" #, fuzzy msgid "case sensitive" -msgstr "/ " +msgstr "Πεζά/κεφαλαία διαφέρουν" # #. "Money in coins or notes" #, fuzzy msgid "cash" -msgstr "" +msgstr "Απορρίματα" # #. "(esp. US) (= cheque) A special printed form on which one writes an order to a bank to pay a sum of money from one's account to another person" #, fuzzy msgid "check" -msgstr "" +msgstr "Έλεγχος" #. "To repair unbalanced transactions and orphan splits in an account tree. Any transactions that have debits != credits will get a balancing split added (pointing to a special new account called 'Imbalance'). Any splits that do not have accounts are put into another special account called 'Orphan'. Formerly known as 'to scrub'." msgid "check and repair, to" @@ -307,13 +307,13 @@ msgstr "" #. "To end an application's relationship with an open file so that the application will no longer be able to access the file without opening it again. " #, fuzzy msgid "close, to" -msgstr " " +msgstr "Κλείσιμο καταγραφών" # #. "An article that is bought and sold. The most general term of what an account keeps track of, e.g. a currency or a stock." #, fuzzy msgid "commodity" -msgstr "" +msgstr "Διάπραξη" #. "e.g. NASDAQ" msgid "commodity listing" @@ -322,7 +322,7 @@ msgstr "" #. "the smallest amount of a commodity that's traded (e.g. 1/100 for USD, 1 for most stocks)" #, fuzzy msgid "commodity option: fraction" -msgstr " " +msgstr "άδεια θέση στη βάση" #. "e.g. USD, DEM" msgid "commodity option: Symbol" @@ -331,7 +331,7 @@ msgstr "" #. "interest which is earned on both the initial deposit and on any interest that has already been earned but left on deposit." #, fuzzy msgid "compound interests" -msgstr "" +msgstr "Δίκτυο" #. "(a) A sum of money paid into an account. (b) A record of such a payment. (c) The state of having money in one's bank account." msgid "Credit (column in register)" @@ -339,46 +339,46 @@ msgstr "" #. "-" msgid "Credit Card" -msgstr " " +msgstr "Πιστωτική Κάρτα" #. "A transfer of money direct from one bank account to another, without using a cheque" #, fuzzy msgid "credit transfer" -msgstr " " +msgstr "Ο χρήστης διέκοψε την μεταφορά" #. "A document that you give to a client that says you owe money to the client, i.e. the opposite of an invoice" #, fuzzy msgid "credit note" -msgstr " " +msgstr "Ο χρήστης διέκοψε την μεταφορά" #. "The system of money used in a country" #, fuzzy msgid "currency" -msgstr "_" +msgstr "_Νόμισμα" # Translation of "custom" sucks! ("kata paraggelia"??? nah!) #. "Custom print format (i.e. according to the user's wishes) as opposed to a template choice." msgid "Custom" -msgstr "" +msgstr "Προσαρμοσμένο" #. "The backend where the data is stored." msgid "database" -msgstr " " +msgstr "βάση δεδομένων" # #. "A specific numbered day of the month" msgid "Date" -msgstr "/" +msgstr "Ημ/νία" #. "DD/MM/YY or MM/DD/YY or something else" #, fuzzy msgid "date format" -msgstr " /" +msgstr "Μορφή Ημ/νίας" #. "A range in time that is delimited by two distinct dates." #, fuzzy msgid "date range" -msgstr " " +msgstr "ημερομηνία αλλαγής" #. "(a) A written note in an account of a sum owed or paid out. (b) A sum withdrawn from an account." msgid "Debit (column in register)" @@ -387,7 +387,7 @@ msgstr "" #. "Each option has a default setting that it is shipped with, until the user changes the setting." #, fuzzy msgid "default" -msgstr "' " +msgstr "Εξ' ορισμού" #. "see credit" msgid "deposit (in the reconcile dialog)" @@ -396,32 +396,32 @@ msgstr "" #. "The process of something becoming less valuable" #, fuzzy msgid "depreciation" -msgstr " " +msgstr "Έντονη ατμοσφαιρική κατακρήμνιση" #. "1. One textfield per transaction. The text in it should describe what the transaction was about. A short descriptive phrase (up to 40 chars) 2. One textfield per account. It is intended to be a longer, 1-5 sentence description of what this account is all about." #, fuzzy msgid "Description (column in register)" -msgstr " " +msgstr "Η περιγραφή περιέχει" #. "Reductions to a basic price of goods or services. Your language might distinguish between discounts dealing with payments (billing terms) and others (invoice)." #, fuzzy msgid "discount" -msgstr "" +msgstr "λογαριασμός" #. "Important Buzzword :)" #, fuzzy msgid "double entry" -msgstr "" +msgstr "διπλό" #. "a person who works for somebody or a company in return for wages" #, fuzzy msgid "employee" -msgstr "" +msgstr "Πρότυπο" #. "1. The money value of a property after all charges on it have been paid. Equity isn't debt, it's a representation of long-term capital (So combining it with liability isn't really very meaningful, except in the balance sheet. 2. (a) The value of the shares issued by a company. (b) Ordinary stocks and shares that carry no fixed interest." #, fuzzy msgid "equity" -msgstr "" +msgstr "Ασφάλεια" #. "Report that ... FIXME: Add description." msgid "equity statement" @@ -430,26 +430,26 @@ msgstr "" #. "A trusted third party that holds a payment or deposit until a transaction is completed. In the US, many mortgage companies set up an escrow account when you get a mortgage. You pay into the account every month and they disburse amounts out of the escrow to pay for hazard insurance and property taxes. So they are holding funds 'in escrow' to complete the transactions (paying insurance and taxes)." #, fuzzy msgid "escrow (account)" -msgstr "" +msgstr "προσωρινά" #. "The relation in value between the money used in different countries" #, fuzzy msgid "exchange rate" -msgstr " -" +msgstr "Εναλλαγή Κεφαλαία-Μικρά" #. "in the account creation dialog??" #, fuzzy msgid "field" -msgstr "" +msgstr "Πεδίο" #. "Any piece of information (text, graphics, executable) put together and given a name. All the information you have on the hard drive is arranged as a collection of files." msgid "file" -msgstr "" +msgstr "αρχείο" #. "-" #, fuzzy msgid "file type" -msgstr " :" +msgstr "Τύπος αρχείου:" #. "-" msgid "financial calculator: interest rate" @@ -462,18 +462,18 @@ msgstr "" #. "An increase in wealth; profit; advantage (See also: capital gains)" #, fuzzy msgid "gain" -msgstr "" +msgstr "Βροχή" #. "Name of an automatically created account to get imbalanced transactions back in balance" #, fuzzy msgid "imbalance" -msgstr "" +msgstr "Ισορροπία" # #. "Process of extracting data from a non-Gnucash format into a Gnucash file. E.g. QIF Import." #, fuzzy msgid "import" -msgstr "" +msgstr "Εισαγωγή" #. "Report that ... FIXME: add description. This report used to be called the 'Profit & Loss', but it was renamed on 2004-07-13." msgid "income statement" @@ -482,12 +482,12 @@ msgstr "" #. "Money charged for borrowing money, or paid to somebody who invests money" #, fuzzy msgid "interest" -msgstr "" +msgstr "Δίκτυο" #. "A list of goods sold or services provided together with the prices charged; see also: a bill. In Gnucash, an 'invoice' is a statement that we sent out (to a customer), whereas a 'bill' is one that we received (from a vendor)." #, fuzzy msgid "invoice" -msgstr "" +msgstr "αρχάριος" #. "In business accounting: Jobs are a mechanism by which you can group multiple invoices or bills that belong to the same customer or vendor. The job describes a (larger) piece of work or a task undertaken on order, for which one or many invoices or bills will be issued." msgid "job" @@ -497,7 +497,7 @@ msgstr "" #. "A book in which a bank, business firm, etc. records its financial accounts" #, fuzzy msgid "ledger" -msgstr "" +msgstr "Επικεφαλίδα" #. "The heading for the right side of the balance sheet. See also: Equity." msgid "liabilities/equity" @@ -506,51 +506,51 @@ msgstr "" #. "A sum of money that is lent (by a bank)" #, fuzzy msgid "loan" -msgstr "" +msgstr "Κορεάτικα" # #. "The money lost in business activity" #, fuzzy msgid "loss" -msgstr "" +msgstr "Κλείσιμο" #. "name of an automatically created account" #, fuzzy msgid "Lost Accounts" -msgstr "" +msgstr "Λογαριασμοί" # #. "A particular collection of items that were bought in one transaction. A lot is typically formed when the item is bought, and is closed when the item is sold out. Needed e.g. for U.S. tax purposes." #, fuzzy msgid "Lot" -msgstr "o" +msgstr "Πρoς" # #. "Combine two books into one (see book)." #, fuzzy msgid "merge, to" -msgstr "" +msgstr "Ανανέωση" #. "The thing that the scatter plot uses to mark each data point" #, fuzzy msgid "marker" -msgstr "" +msgstr "Μεγαλύτερο" #. "1. Some text annotation, but this meaning isn't used inside gnucash. 2. In the Customer summary report: The ratio of profit vs. sales, i.e. the profit amount divided by the sales amount, shown in percent." #, fuzzy msgid "markup" -msgstr "" +msgstr "Μεγαλύτερο" # #. "The way how more than one window is displayed in GnuCash at the same time. MDI = Multiple Document Interface." #, fuzzy msgid "MDI modus" -msgstr " MDI" +msgstr "Ρυθμίσεις MDI" #. "One textfield per split that should help you remember what this split was about." #, fuzzy msgid "Memo" -msgstr "" +msgstr "Μνήμη" #. "(a) An agreement by which money is lent by a bank for buying a house or other property, the property being the security. (b) A sum of money lent in this way." msgid "Mortgage" @@ -563,28 +563,28 @@ msgstr "" #. "(of money) remaining when nothing more is to be taken away" #, fuzzy msgid "net" -msgstr "" +msgstr "επόμενο" #. "net total of all assets" #, fuzzy msgid "net assets" -msgstr " " +msgstr "Σύνολα τοποθεσιών" # #. "The total income minus the total expenses of a given time period." #, fuzzy msgid "net profit" -msgstr " " +msgstr "Ανάθεση προτεραιότητας" #. "Your net worth is your assets minus your liabilities. If your accounts are balanced, your net worth should equal your equity plus your net profit." #, fuzzy msgid "net worth" -msgstr " " +msgstr "Ένας Μήνας" #. "One textfield per transaction that can hold explanatory text about the transaction." #, fuzzy msgid "notes (register)" -msgstr " OAF" +msgstr "Δεν ήταν δυνατή η εγγραφή στο OAF" #. "Abbreviation for: number; Field in a transaction. If this transaction was done by check, then the check number should be noted in this field." msgid "Num (column in register)" @@ -593,17 +593,17 @@ msgstr "" #. "to make accessible" #, fuzzy msgid "open, to" -msgstr " " +msgstr "Άνοιγμα αρχείου καταγραφών" #. "If an account starts with a non-zero balance, then this amount is called the opening balance." #, fuzzy msgid "opening balance" -msgstr " " +msgstr "Σφάλμα ανοίγματος αρχείου" #. "A menu choice in the graphical user interface that allows the user to specify how the application will act each time it is used. " #, fuzzy msgid "options" -msgstr ":\n" +msgstr "επιλογές:\n" #. "Watch out: Although this word exists in gnucash program code, all that program code in gnucash is currently not activated. In the future, it will be used in business accounting as follows: A particular request to make or supply goods, but belonging to a (larger) job. Such a request can come from a customer or be sent to a vendor. An order will probably generate one invoice or bill." msgid "order" @@ -612,7 +612,7 @@ msgstr "" #. "Name of an automatically created account that holds splits that have no account." #, fuzzy msgid "orphan" -msgstr "" +msgstr "Κορεάτικα" #. "The customer to (or employee or vendor from) which this invoice is sent - or short your business partner." msgid "owner (of bill, invoice or expense voucher)" @@ -629,17 +629,17 @@ msgstr "" #. "A person to whom sth is paid" #, fuzzy msgid "payee" -msgstr "" +msgstr "σελίδα" #. "A person who pays or who has to pay for sth" #, fuzzy msgid "payer" -msgstr "" +msgstr "Στρώμα" #. "1. The action of paying sb/sth or of being paid. 2. A sum of money paid." #, fuzzy msgid "payment" -msgstr "" +msgstr "πατρικά" #. "An account where no transactions may be posted to; transactions can only be posted to subaccounts of this account, so this account serves as a placeholder in the hierarchy" msgid "placeholder" @@ -648,23 +648,23 @@ msgstr "" #. "A set of investments owned by a person" #, fuzzy msgid "portfolio" -msgstr " " +msgstr "Εξαγωγή καταγραφών" #. "Register invoice, voucher in account register" #, fuzzy msgid "post, to" -msgstr " " +msgstr "Κλείσιμο καταγραφών" # #. "A menu choice in many graphical user interface applications that allows the user to specify how the application will act each time it is used. " #, fuzzy msgid "preferences" -msgstr "" +msgstr "Προτιμήσεις" #. "Loan repayment calculator: your payments are split in interests payment and principal payment" #, fuzzy msgid "principal payment" -msgstr "_ " +msgstr "Ο_νόματα Συναρτήσεων" #. "An amount of money for which sth may be bought or sold" msgid "price (in a split)" @@ -673,22 +673,22 @@ msgstr "" #. "An ask is an offer to sell, and the price you want to sell at." #, fuzzy msgid "price type: ask" -msgstr " :" +msgstr "Τύπος αρχείου:" #. "A bid is an offer to buy, and the price you want to buy at." #, fuzzy msgid "price type: bid" -msgstr " :" +msgstr "Τύπος αρχείου:" #. "online quotes (rather: quotation!?) A statement of the current price of stocks or commodities" #, fuzzy msgid "price: quotes" -msgstr " " +msgstr "Απόκρυψη Σημειώματων" #. "Money gained in business, esp. the difference between the amount earned (sales) and the amount spent (expenses/cost): Profit is sales minus expenses/cost." #, fuzzy msgid "profit" -msgstr "" +msgstr "στιγμή" #. "OBSOLETE. This report was renamed to 'income statement' on 2004-07-13. Old definition: A list that shows the amount of money spent compared with the amount earned by a business in a particular period" msgid "Profit & Loss" @@ -702,7 +702,7 @@ msgstr "" #. "-" #, fuzzy msgid "rebalance, to (a transaction)" -msgstr " " +msgstr "Εκκίνηση νέας διενέργειας" #. "reconcile an account, a reconciled split. To find a way to make the bank's account statement agree with the user's recorded transactions in an account." msgid "reconcile, to" @@ -711,18 +711,18 @@ msgstr "" #. "-" #, fuzzy msgid "record keeping" -msgstr " " +msgstr "Σε ηχογράφηση" #. "A list of items; a book containing such a list" #, fuzzy msgid "register" -msgstr "" +msgstr "Εγγραφή" # #. "A transaction that is divided into two or more parts" #, fuzzy msgid "register entry: split transaction" -msgstr " " +msgstr "Εκκίνηση νέας διενέργειας" #. "-" msgid "register entry: stock split" @@ -744,13 +744,13 @@ msgstr "" #. "another form of register" #, fuzzy msgid "register: transaction journal" -msgstr " " +msgstr "Εκκίνηση νέας διενέργειας" # #. "reload the current document" #, fuzzy msgid "reload, to" -msgstr "" +msgstr "Ανανέωση" #. "aka 'two-sided form' is in Europe often used for the balance sheet. Complement: report form: Vertical Form" msgid "report form: T Account Form" @@ -763,12 +763,12 @@ msgstr "" #. "name of an equity account (?); to be distinguished from the opening balance." #, fuzzy msgid "Retained Earnings" -msgstr "" +msgstr "Απομένουν" #. "Create a new transaction that is the inverse of the old one. When you add the two together they completely cancel out. Accounts use this instead of voiding transactions, usually because the prior month has been closed and can no longer be changed, or the entire accounting system is 'write only'." #, fuzzy msgid "reverse transaction, to (Action in the register)" -msgstr " " +msgstr "Η περιγραφή περιέχει" #. "(In the customer summary report) The total amount of money received because something was sold." msgid "sales" @@ -778,12 +778,12 @@ msgstr "" #. "To write data (typically a file) to a storage medium, such as a disk or tape." #, fuzzy msgid "save, to (to a file)" -msgstr " " +msgstr "Αποθήκευση της αναφοράς σε αρχείο" #. "A transaction or reminder of a transaction that can be automatically executed at a specific time. It can be executed either once, or several times at regular intervals." #, fuzzy msgid "Scheduled Transaction" -msgstr "" +msgstr "Διενέργειες" #. "DEPRECATED. To repair unbalanced transactions and orphan splits in an account tree. Any transactions that have debits != credits will get a balancing split added (pointing to a special new account called 'Imbalance'). Any splits that do not have accounts are put into another special account called 'Orphan'. Deprecated - use the term 'to check and repair' now." msgid "scrub, to" @@ -792,7 +792,7 @@ msgstr "" #. "A document or certificate showing who owns shares" #, fuzzy msgid "security" -msgstr "" +msgstr "Ασφάλεια" #. "-" msgid "Share Balance (register)" @@ -801,96 +801,96 @@ msgstr "" #. "Any of the equal parts into which the money of a business company is divided, giving the holder a right to a portion of the profits" #, fuzzy msgid "shares" -msgstr "" +msgstr "Διαμοιραζόμενα" #. "(of a price) A place wfrom which sth comes or is obtained" #, fuzzy msgid "source" -msgstr "" +msgstr "Πόρος" #. "One of the two or several parts a transaction is divided into" #, fuzzy msgid "split" -msgstr "" +msgstr "Διαίρεση" #. "This sets the particular design or shape of a report." msgid "style sheet" -msgstr " " +msgstr "επίστρωμα ύφους" #. "The total of a set of figures that are part of a larger group of figures" #, fuzzy msgid "subtotal" -msgstr "%d " +msgstr "%d συνολικά" #. "On the government's tax forms, the tax code identifies the given line or place on the form where certain amounts must be specified according to the current country's legislation" #, fuzzy msgid "tax code" -msgstr " . ." +msgstr "πληροφορίες ηλεκ. διεύθ." #. "field of an account" #, fuzzy msgid "tax info" -msgstr " . ." +msgstr "πληροφορίες ηλεκ. διεύθ." #. "if you create a new e.g. style sheet, you can start from a template" #, fuzzy msgid "template" -msgstr "" +msgstr "Πρότυπο" #. "see: date range" #, fuzzy msgid "time period" -msgstr "" +msgstr "ώρα" # #. "as abbreviation for Total" #, fuzzy msgid "Tot" -msgstr "o" +msgstr "Πρoς" #. "The full number or amount: total of some balances, of any account's running balance etc." msgid "total" -msgstr "" +msgstr "σύνολο" #. "A piece of business done; the transfer of money from one account to one or more other accounts. (see also: Scheduled Transaction)" #, fuzzy msgid "transaction" -msgstr "" +msgstr "Διενέργειες" # #. "A transaction whose amount has actually been moved. The word comes from checks: a check is issued, but several steps have to be done until the amount is actually retrieved from the bank account, which is the point in time where that transaction (check) gets cleared." #, fuzzy msgid "transaction state: cleared" -msgstr " " +msgstr "Έναρξη διενέργειας" # #. "-" #, fuzzy msgid "transaction state: frozen" -msgstr " " +msgstr "Έναρξη διενέργειας" # #. "A transaction that was reconciled with the bank's statement." #, fuzzy msgid "transaction state: reconciled" -msgstr " " +msgstr "Έναρξη διενέργειας" # #. "A transaction that is void i.e. not valid (anymore)." #, fuzzy msgid "transaction state: voided" -msgstr " " +msgstr "Έναρξη διενέργειας" # #. "1. The action of transferring sth. 2. see: credit transfer" #, fuzzy msgid "transfer (noun)" -msgstr "" +msgstr "Μεταφορά" #. "The account where an amount is transferred to" #, fuzzy msgid "transfer account" -msgstr "" +msgstr "προσωρινά" #. "To move money from one account to another. Will create a transaction." msgid "transfer, to (register toolbar)" @@ -903,12 +903,12 @@ msgstr "" # #. "A class or things that have characteristics in common; type of an account, of a commodity etc." msgid "type" -msgstr "" +msgstr "είδος" #. "A fixed amount or number used as a standard of measurement; e.g. millimeters, inch; for absolute positioning in the custom check format." #, fuzzy msgid "units" -msgstr "&:" +msgstr "&Μονάδες:" #. "-" msgid "URL" @@ -925,7 +925,7 @@ msgstr "" #. "The terms 'Voucher' and 'Expense Voucher' are used interchangeably in gnucash. The 'Expense Voucher' is also a bit of a misnomer -- it's more like an 'Expense Report' in gnucash. The phrase is meant to be a list of expenses incurred by an employee for which the company will reminburse them." #, fuzzy msgid "voucher" -msgstr "" +msgstr "Πόρος" #. "see debit" msgid "withdraw (in the reconcile dialog)" @@ -933,7 +933,7 @@ msgstr "" #, fuzzy #~ msgid "invoice owner" -#~ msgstr "" +#~ msgstr "αρχάριος" #~ msgid "Term" -#~ msgstr "" +#~ msgstr "Ορισμός" diff --git a/po/glossary/es.po b/po/glossary/es.po index a006701ca19..34a0f20ac83 100644 --- a/po/glossary/es.po +++ b/po/glossary/es.po @@ -1,8 +1,8 @@ -# Glosario de trminos de GnuCash traducido al espaol +# Glosario de términos de GnuCash traducido al español # Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -# Ral Mir , 2001. +# Raúl Miró , 2001. # Eneko Lacunza , 2003. -# Ral Mir , 2003. +# Raúl Miró , 2003. # Eneko Lacunza , 2004. # msgid "" @@ -15,8 +15,8 @@ msgstr "" "Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-15\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" #. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" msgid "Term (Dear translator: This file will never be visible to the user!)" @@ -28,7 +28,7 @@ msgstr "cuenta" #. "-" msgid "account code" -msgstr "cdigo de cuenta" +msgstr "código de cuenta" #. "the tree view of all accounts" msgid "account hierarchy" @@ -82,7 +82,7 @@ msgstr "tipo de cuenta: mercado monetario" #. "-" msgid "account type: Mutual fund" -msgstr "tipo de cuenta: Fondo de Inversin" +msgstr "tipo de cuenta: Fondo de Inversión" #. "The right side of the balance sheet in T account form shows the source of funds and contains equity & liability. While not common in english, most languages would translate 'equity & liability' with 'passive'. Complement: Active. See also: Report Form Implementation: https://bugzilla.gnome.org/show_bug.cgi?id=421766" #, fuzzy @@ -121,71 +121,71 @@ msgstr "cuenta: cuenta de nivel superior" #. "The process of doing something that caused a transaction to happen" msgid "Action (register)" -msgstr "Accin (libro)" +msgstr "Acción (libro)" #. "Automated teller machine" msgid "action: ATM" -msgstr "accin: cajero automtico" +msgstr "acción: cajero automático" #. "Transaction was an auto deposit" msgid "action: autoDep" -msgstr "accin: autoDep" +msgstr "acción: autoDep" #. "-" msgid "action: buy" -msgstr "accin: compra" +msgstr "acción: compra" #. "-" msgid "action: deposit" -msgstr "accin: ingreso" +msgstr "acción: ingreso" #. "When people can automatically deduct money straight from your account. The reverse of Direct Deposit." msgid "action: direct debit" -msgstr "accin: abono directo" +msgstr "acción: abono directo" #. "transaction is a distribution (???)" msgid "action: dist" -msgstr "accin: dist" +msgstr "acción: dist" #. "transaction is a dividend" msgid "action: div" -msgstr "accin: div" +msgstr "acción: div" #. "-" msgid "action: fee" -msgstr "accin: fee" +msgstr "acción: fee" #. "transaction comes from interest" msgid "action: int" -msgstr "accin: int" +msgstr "acción: int" #. "-" msgid "action: loan" -msgstr "accin: prstamo" +msgstr "acción: préstamo" #. "see: payment 1." msgid "action: payment" -msgstr "accin: pago" +msgstr "acción: pago" #. "Point of sale" msgid "action: POS" -msgstr "accin: POS" +msgstr "acción: POS" #. "-" msgid "action: rebate" -msgstr "accin: descuento" +msgstr "acción: descuento" #. "-" msgid "action: sell" -msgstr "accin: venta" +msgstr "acción: venta" #. "-" msgid "action: Teller" -msgstr "accin: cajero (persona)" +msgstr "acción: cajero (persona)" #. "see: transfer 2. (=credit transfer)" msgid "action: transfer" -msgstr "accin: transferencia" +msgstr "acción: transferencia" #. "-" msgid "action: wire" @@ -193,7 +193,7 @@ msgstr "" #. "-" msgid "action: withdraw" -msgstr "accin: reintegro" +msgstr "acción: reintegro" #. "A sum of money" msgid "amount" @@ -258,11 +258,11 @@ msgstr "ganancias de capital" #. "Distinguishing the uppercase and lowercase letters" msgid "case sensitive" -msgstr "distinguir maysculas" +msgstr "distinguir mayúsculas" #. "Money in coins or notes" msgid "cash" -msgstr "metlico" +msgstr "metálico" #. "(esp. US) (= cheque) A special printed form on which one writes an order to a bank to pay a sum of money from one's account to another person" msgid "check" @@ -282,20 +282,20 @@ msgstr "valor" #. "e.g. NASDAQ" msgid "commodity listing" -msgstr "ndice de valores" +msgstr "índice de valores" #. "the smallest amount of a commodity that's traded (e.g. 1/100 for USD, 1 for most stocks)" msgid "commodity option: fraction" -msgstr "opcin de valor: fraccin" +msgstr "opción de valor: fracción" #. "e.g. USD, DEM" msgid "commodity option: Symbol" -msgstr "opcin de valor: Smbolo" +msgstr "opción de valor: Símbolo" #. "interest which is earned on both the initial deposit and on any interest that has already been earned but left on deposit." #, fuzzy msgid "compound interests" -msgstr "inters" +msgstr "interés" #. "(a) A sum of money paid into an account. (b) A record of such a payment. (c) The state of having money in one's bank account." msgid "Credit (column in register)" @@ -303,7 +303,7 @@ msgstr "Haber (columna en el libro), Abono" #. "-" msgid "Credit Card" -msgstr "Tarjeta de crdito" +msgstr "Tarjeta de crédito" #. "A transfer of money direct from one bank account to another, without using a cheque" msgid "credit transfer" @@ -328,7 +328,7 @@ msgstr "base de datos" #. "A specific numbered day of the month" msgid "Date" -msgstr "Da (Fecha)" +msgstr "Día (Fecha)" #. "DD/MM/YY or MM/DD/YY or something else" msgid "date format" @@ -352,11 +352,11 @@ msgstr "ingreso" #. "The process of something becoming less valuable" msgid "depreciation" -msgstr "depreciacin" +msgstr "depreciación" #. "1. One textfield per transaction. The text in it should describe what the transaction was about. A short descriptive phrase (up to 40 chars) 2. One textfield per account. It is intended to be a longer, 1-5 sentence description of what this account is all about." msgid "Description (column in register)" -msgstr "Descripcin" +msgstr "Descripción" #. "Reductions to a basic price of goods or services. Your language might distinguish between discounts dealing with payments (billing terms) and others (invoice)." #, fuzzy @@ -401,7 +401,7 @@ msgstr "tipo de archivo" #. "-" msgid "financial calculator: interest rate" -msgstr "calculadora financiera: tasa de inters" +msgstr "calculadora financiera: tasa de interés" #. "see: payment" msgid "financial calculator: payments" @@ -425,7 +425,7 @@ msgstr "" #. "Money charged for borrowing money, or paid to somebody who invests money" msgid "interest" -msgstr "inters" +msgstr "interés" #. "A list of goods sold or services provided together with the prices charged; see also: a bill. In Gnucash, an 'invoice' is a statement that we sent out (to a customer), whereas a 'bill' is one that we received (from a vendor)." msgid "invoice" @@ -445,11 +445,11 @@ msgstr "pasivo/patrimonio" #. "A sum of money that is lent (by a bank)" msgid "loan" -msgstr "prstamo" +msgstr "préstamo" #. "The money lost in business activity" msgid "loss" -msgstr "prdida" +msgstr "pérdida" #. "name of an automatically created account" msgid "Lost Accounts" @@ -512,7 +512,7 @@ msgstr "notas" #. "Abbreviation for: number; Field in a transaction. If this transaction was done by check, then the check number should be noted in this field." msgid "Num (column in register)" -msgstr "Nm." +msgstr "Núm." #. "to make accessible" msgid "open, to" @@ -532,7 +532,7 @@ msgstr "pedido" #. "Name of an automatically created account that holds splits that have no account." msgid "orphan" -msgstr "hurfano" +msgstr "huérfano" #. "The customer to (or employee or vendor from) which this invoice is sent - or short your business partner." msgid "owner (of bill, invoice or expense voucher)" @@ -578,11 +578,11 @@ msgstr "preferencias" #. "Loan repayment calculator: your payments are split in interests payment and principal payment" #, fuzzy msgid "principal payment" -msgstr "accin: pago" +msgstr "acción: pago" #. "An amount of money for which sth may be bought or sold" msgid "price (in a split)" -msgstr "cotizacin (valor), precio (asiento)" +msgstr "cotización (valor), precio (asiento)" #. "An ask is an offer to sell, and the price you want to sell at." msgid "price type: ask" @@ -602,7 +602,7 @@ msgstr "beneficio" #. "OBSOLETE. This report was renamed to 'income statement' on 2004-07-13. Old definition: A list that shows the amount of money spent compared with the amount earned by a business in a particular period" msgid "Profit & Loss" -msgstr "Cuenta de Prdidas y Ganancias" +msgstr "Cuenta de Pérdidas y Ganancias" #. "-" msgid "quick-fill" @@ -618,7 +618,7 @@ msgstr "conciliar" #. "-" msgid "record keeping" -msgstr "tenedura de libros?" +msgstr "teneduría de libros?" #. "A list of items; a book containing such a list" msgid "register" @@ -626,11 +626,11 @@ msgstr "libro de cuentas/anotaciones" #. "A transaction that is divided into two or more parts" msgid "register entry: split transaction" -msgstr "anotacin de libro de cuentas: asiento mltiple" +msgstr "anotación de libro de cuentas: asiento múltiple" #. "-" msgid "register entry: stock split" -msgstr "anotacin en libro de cuentas: divisin de valor" +msgstr "anotación en libro de cuentas: división de valor" #. "one form of register" msgid "register: auto-split ledger" @@ -638,7 +638,7 @@ msgstr "libro de cuentas: libro con asientos desglosados" #. "another form of register" msgid "register: basic ledger" -msgstr "libro de cuentas: libro bsico" +msgstr "libro de cuentas: libro básico" #. "another form of register" msgid "register: general ledger" @@ -667,7 +667,7 @@ msgstr "" #. "Create a new transaction that is the inverse of the old one. When you add the two together they completely cancel out. Accounts use this instead of voiding transactions, usually because the prior month has been closed and can no longer be changed, or the entire accounting system is 'write only'." #, fuzzy msgid "reverse transaction, to (Action in the register)" -msgstr "Descripcin" +msgstr "Descripción" #. "(In the customer summary report) The total amount of money received because something was sold." msgid "sales" @@ -716,11 +716,11 @@ msgstr "subtotal" #. "On the government's tax forms, the tax code identifies the given line or place on the form where certain amounts must be specified according to the current country's legislation" #, fuzzy msgid "tax code" -msgstr "informacin sobre impuestos" +msgstr "información sobre impuestos" #. "field of an account" msgid "tax info" -msgstr "informacin sobre impuestos" +msgstr "información sobre impuestos" #. "if you create a new e.g. style sheet, you can start from a template" msgid "template" @@ -728,7 +728,7 @@ msgstr "plantilla" #. "see: date range" msgid "time period" -msgstr "perodo de tiempo" +msgstr "período de tiempo" #. "as abbreviation for Total" msgid "Tot" @@ -756,7 +756,7 @@ msgstr "estado del asiento: conciliado" #. "A transaction that is void i.e. not valid (anymore)." msgid "transaction state: voided" -msgstr "estado de asiento: invlido" +msgstr "estado de asiento: inválido" #. "1. The action of transferring sth. 2. see: credit transfer" msgid "transfer (noun)" @@ -809,4 +809,4 @@ msgstr "cargo" #~ msgstr "factura" #~ msgid "Term" -#~ msgstr "Condiciones (Trminos) (de pago)" +#~ msgstr "Condiciones (Términos) (de pago)" diff --git a/po/glossary/es_NI-policy.txt b/po/glossary/es_NI-policy.txt index fe478dbaa01..68711608d8e 100644 --- a/po/glossary/es_NI-policy.txt +++ b/po/glossary/es_NI-policy.txt @@ -1,23 +1,23 @@ LEG22102001 - es_NI-policy.txt En este documento se describen las normas aplicadas al traducir los -textos de GnuCash al idioma espaol +textos de GnuCash al idioma español -Nota: El autor no es native speaker del espaol, ni especialista - contable. Cualquier recomendacin o correccin es muy +Nota: El autor no es native speaker del español, ni especialista + contable. Cualquier recomendación o corrección es muy bienvenida. Onda: ===== -La onda es, crear una notacin apta para pequeos negocios, de tal +La onda es, crear una notación apta para pequeños negocios, de tal manera, que se puede usar en la vida comercial y fiscal. Por lo tanto -se prefiere trminos oficiales/contables ante trminos del habla -comn. +se prefiere términos oficiales/contables ante términos del habla +común. -La explicacin de estos trminos a una persona privada que quiere usar -GnuCash es tarea de la documentacin. +La explicación de estos términos a una persona privada que quiere usar +GnuCash es tarea de la documentación. Mayuscula/Menuscula: @@ -37,10 +37,10 @@ Ejemplos: + "Abrir" -Puntuacin +Puntuación ========== -Normalmente se deja dos espacios despus de la puntuacin de frases. +Normalmente se deja dos espacios después de la puntuación de frases. Ya que supongo que usamos fuentes proporcionales no se utiliza esta regla y solamente se inserta un (1) espacio. @@ -49,12 +49,12 @@ Diccionario =========== Commodity valores (plural) -Stock accin +Stock acción Income ingreso Expense egreso Asset activo Liability pasivo -Price quote cotizacin +Price quote cotización Reconcile reconciliar Portfolio cartera Parent account cuenta superior @@ -67,15 +67,15 @@ Forward avanzar Top-Level primer plano -Account Tree jerarqua de cuentas +Account Tree jerarquía de cuentas GnuCash Network Red GnuCash --- estoy buscando el trmino correcto para +-- estoy buscando el término correcto para -Equity patrimonio? o equidad, lo ltimo esta actualmente en +Equity ¿patrimonio? o equidad, lo último esta actualmente en uso. -Security cdigo de seguridad +Security código de seguridad Share partida @@ -93,12 +93,12 @@ Nota: prefiereo "encontrar" bara "find" y "buscar" para "search", pero no ha sido esforzado. -Gnero +Género ====== -Donde aplicable se utiliza los dos gneros al referirse a personas, -usando la notacin: el/la contador/a. Por razones de consistencia -siempre el gnero femenino viene en segunda posicin. +Donde aplicable se utiliza los dos géneros al referirse a personas, +usando la notación: el/la contador/a. Por razones de consistencia +siempre el género femenino viene en segunda posición. diff --git a/po/glossary/it.po b/po/glossary/it.po index 9a524d5d764..4d060557256 100644 --- a/po/glossary/it.po +++ b/po/glossary/it.po @@ -6,7 +6,7 @@ # Cristian Marchi , 2008. # # - I messaggi ancora dubbi sono marcati come fuzzy. -# - Quando qui sono indicate pi traduzioni, la prima quella usata +# - Quando qui sono indicate più traduzioni, la prima è quella usata # nel .po vero del programma. # msgid "" @@ -18,7 +18,7 @@ msgstr "" "Language-Team: Italian \n" "Language: it\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" @@ -44,16 +44,16 @@ msgstr "nome conto" #. "The left side of the balance sheet in T account form shows the application of funds in form of assets. Because it contains only assets use assets directly. Complement: Passive. See also: Report Form" #, fuzzy msgid "account type: Active" -msgstr "tipo conto: attivo, attivit" +msgstr "tipo conto: attivo, attività" #. "A thing, esp. owned by a person or company, that has value and can be used or sold to pay debts. Dependent on the context you might use 'account type: Active' instead." msgid "account type: Asset" -msgstr "tipo conto: attivo, attivit" +msgstr "tipo conto: attivo, attività" #. "in fact: 'Active & Passive', group aka 'Balance Sheet accounts'; complement of 'Profit & Loss'" #, fuzzy msgid "account type: Assets & Liabilities" -msgstr "tipo conto: passivo, passivit, obbligazione, debito" +msgstr "tipo conto: passivo, passività, obbligazione, debito" #. "(esp. US) (Brit = current account) a bank account from which money can be withdrawn without previous notice" msgid "account type: checking" @@ -77,7 +77,7 @@ msgstr "tipo conto: entrate" #. "A debt, a financial obligation, but see also 'account type: Passive'" msgid "account type: Liability" -msgstr "tipo conto: passivo, passivit, obbligazione, debito" +msgstr "tipo conto: passivo, passività, obbligazione, debito" #. "-" msgid "account type: money-market" @@ -90,12 +90,12 @@ msgstr "tipo conto: fondi comuni" #. "The right side of the balance sheet in T account form shows the source of funds and contains equity & liability. While not common in english, most languages would translate 'equity & liability' with 'passive'. Complement: Active. See also: Report Form Implementation: https://bugzilla.gnome.org/show_bug.cgi?id=421766" #, fuzzy msgid "account type: Passive" -msgstr "tipo conto: attivo, attivit" +msgstr "tipo conto: attivo, attività" #. "Group of accounts tracking your success, complement of 'Assets & Liabilities'" #, fuzzy msgid "account type: Profit & Loss" -msgstr "tipo conto: attivo, attivit" +msgstr "tipo conto: attivo, attività" #. "1. (US) any type of account that earns interest 2. (Brit) any type of bank account that earns a higher level of interest than a current account or deposit account" msgid "account type: saving" @@ -447,7 +447,7 @@ msgstr "libro mastro, mastro" #. "The heading for the right side of the balance sheet. See also: Equity." msgid "liabilities/equity" -msgstr "passivit/nette" +msgstr "passività/nette" #. "A sum of money that is lent (by a bank)" msgid "loan" @@ -482,7 +482,7 @@ msgstr "marcatore" #. "The way how more than one window is displayed in GnuCash at the same time. MDI = Multiple Document Interface." msgid "MDI modus" -msgstr "modalit MDI" +msgstr "modalità MDI" #. "One textfield per split that should help you remember what this split was about." msgid "Memo" @@ -628,7 +628,7 @@ msgstr "tenere traccia" #. "A list of items; a book containing such a list" msgid "register" -msgstr "registro (termine generico e pi comprensibile)" +msgstr "registro (termine generico e più comprensibile)" #. "A transaction that is divided into two or more parts" msgid "register entry: split transaction" @@ -788,7 +788,7 @@ msgstr "tipo" #. "A fixed amount or number used as a standard of measurement; e.g. millimeters, inch; for absolute positioning in the custom check format." msgid "units" -msgstr "unit" +msgstr "unità" #. "-" msgid "URL" diff --git a/po/glossary/lt.po b/po/glossary/lt.po index 28b9c9fb978..1f8605ce76f 100644 --- a/po/glossary/lt.po +++ b/po/glossary/lt.po @@ -12,7 +12,7 @@ msgstr "" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" "%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Virtaal 0.7.0\n" diff --git a/po/glossary/nb.po b/po/glossary/nb.po index b1261c5236a..c3aca898f9d 100644 --- a/po/glossary/nb.po +++ b/po/glossary/nb.po @@ -15,7 +15,7 @@ msgstr "" "Language-Team: Norwegian/Bokmaal \n" "Language: Norwegian/Bokmaal\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. "English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)" @@ -117,7 +117,7 @@ msgstr "account: underkonto" #. "-" msgid "account: top level account" -msgstr "account: toppniv konto" +msgstr "account: toppnivå konto" #. "The process of doing something that caused a transaction to happen" msgid "Action (register)" @@ -133,7 +133,7 @@ msgstr "" #. "-" msgid "action: buy" -msgstr "action: kjpe" +msgstr "action: kjøpe" #. "-" msgid "action: deposit" @@ -141,7 +141,7 @@ msgstr "action: bankinskudd" #. "When people can automatically deduct money straight from your account. The reverse of Direct Deposit." msgid "action: direct debit" -msgstr "action: automatisk overfrsel" +msgstr "action: automatisk overførsel" #. "transaction is a distribution (???)" msgid "action: dist" @@ -185,7 +185,7 @@ msgstr "" #. "see: transfer 2. (=credit transfer)" msgid "action: transfer" -msgstr "action: overfr" +msgstr "action: overfør" #. "-" msgid "action: wire" @@ -197,7 +197,7 @@ msgstr "action: bankuttak" #. "A sum of money" msgid "amount" -msgstr "belp" +msgstr "beløp" #. "The result of adding several amounts together and then dividing this total by the number of amounts" msgid "average" @@ -246,11 +246,11 @@ msgstr "Budsjett" #. "-" msgid "business (adjective)" -msgstr "nring (adjektiv)" +msgstr "næring (adjektiv)" #. "as Menu Item: Headline for features that are related to small business accounting" msgid "business (noun)" -msgstr "Nring" +msgstr "Næring" #. "Profits made from the sale of investments or property" msgid "capital gains" @@ -258,7 +258,7 @@ msgstr "" #. "Distinguishing the uppercase and lowercase letters" msgid "case sensitive" -msgstr "skill mellom store/sm bokstaver" +msgstr "skill mellom store/små bokstaver" #. "Money in coins or notes" msgid "cash" @@ -307,12 +307,12 @@ msgstr "Kredittkort" #. "A transfer of money direct from one bank account to another, without using a cheque" msgid "credit transfer" -msgstr "bankoverfring" +msgstr "bankoverføring" #. "A document that you give to a client that says you owe money to the client, i.e. the opposite of an invoice" #, fuzzy msgid "credit note" -msgstr "bankoverfring" +msgstr "bankoverføring" #. "The system of money used in a country" msgid "currency" @@ -336,7 +336,7 @@ msgstr "dato format" #. "A range in time that is delimited by two distinct dates." msgid "date range" -msgstr "dato omrde" +msgstr "dato område" #. "(a) A written note in an account of a sum owed or paid out. (b) A sum withdrawn from an account." msgid "Debit (column in register)" @@ -365,7 +365,7 @@ msgstr "konto" #. "Important Buzzword :)" msgid "double entry" -msgstr "dobbel bokfring" +msgstr "dobbel bokføring" #. "a person who works for somebody or a company in return for wages" msgid "employee" @@ -445,7 +445,7 @@ msgstr "gjeld/egenkapital" #. "A sum of money that is lent (by a bank)" msgid "loan" -msgstr "ln" +msgstr "lån" #. "The money lost in business activity" msgid "loss" @@ -461,16 +461,16 @@ msgstr "" #. "Combine two books into one (see book)." msgid "merge, to" -msgstr "sl sammen, til" +msgstr "slå sammen, til" #. "The thing that the scatter plot uses to mark each data point" msgid "marker" -msgstr "markr" +msgstr "markør" #. "1. Some text annotation, but this meaning isn't used inside gnucash. 2. In the Customer summary report: The ratio of profit vs. sales, i.e. the profit amount divided by the sales amount, shown in percent." #, fuzzy msgid "markup" -msgstr "markr" +msgstr "markør" #. "The way how more than one window is displayed in GnuCash at the same time. MDI = Multiple Document Interface." msgid "MDI modus" @@ -514,11 +514,11 @@ msgstr "No, (kolonne i registeret)=" #. "to make accessible" msgid "open, to" -msgstr "pne, til" +msgstr "åpne, til" #. "If an account starts with a non-zero balance, then this amount is called the opening balance." msgid "opening balance" -msgstr "inngende balanse" +msgstr "inngående balanse" #. "A menu choice in the graphical user interface that allows the user to specify how the application will act each time it is used. " msgid "options" @@ -562,12 +562,12 @@ msgstr "plassholder" #. "A set of investments owned by a person" msgid "portfolio" -msgstr "porteflje" +msgstr "portefølje" #. "Register invoice, voucher in account register" #, fuzzy msgid "post, to" -msgstr "pne, til" +msgstr "åpne, til" #. "A menu choice in many graphical user interface applications that allows the user to specify how the application will act each time it is used. " msgid "preferences" @@ -580,7 +580,7 @@ msgstr "action: betaling" #. "An amount of money for which sth may be bought or sold" msgid "price (in a split)" -msgstr "belp (i en splitt)" +msgstr "beløp (i en splitt)" #. "An ask is an offer to sell, and the price you want to sell at." msgid "price type: ask" @@ -616,7 +616,7 @@ msgstr "avstemme, til" #. "-" msgid "record keeping" -msgstr "bokfring" +msgstr "bokføring" #. "A list of items; a book containing such a list" msgid "register" @@ -648,7 +648,7 @@ msgstr "register: transaksjons journal" #. "reload the current document" msgid "reload, to" -msgstr "laste p nytt, til" +msgstr "laste på nytt, til" #. "aka 'two-sided form' is in Europe often used for the balance sheet. Complement: report form: Vertical Form" msgid "report form: T Account Form" @@ -757,15 +757,15 @@ msgstr "transaction state: annulert" #. "1. The action of transferring sth. 2. see: credit transfer" msgid "transfer (noun)" -msgstr "overfr (noun)" +msgstr "overfør (noun)" #. "The account where an amount is transferred to" msgid "transfer account" -msgstr "overfringskonto" +msgstr "overføringskonto" #. "To move money from one account to another. Will create a transaction." msgid "transfer, to (register toolbar)" -msgstr "overfor, til (registrerings verktylinje)" +msgstr "overfor, til (registrerings verktøylinje)" #. "The trial balance is a worksheet on which you list all your general ledger accounts and their debit or credit balance. It is a tool that is used to alert you to errors in your books. The total debits must equal the total credits. If they don't equal, you know you have an error that must be tracked down." #, fuzzy @@ -786,11 +786,11 @@ msgstr "URL" #. "The worth of sth in terms of money or other commodities for which it can be exchanged" msgid "value (in a split)" -msgstr "belp" +msgstr "beløp" #. "In small business accounting: A person or company that sells items and is supplying goods" msgid "vendor" -msgstr "leverandr" +msgstr "leverandør" #. "The terms 'Voucher' and 'Expense Voucher' are used interchangeably in gnucash. The 'Expense Voucher' is also a bit of a misnomer -- it's more like an 'Expense Report' in gnucash. The phrase is meant to be a list of expenses incurred by an employee for which the company will reminburse them." #, fuzzy From ff76db28f5d6de298df29e390c59b2a7bddf6dfa Mon Sep 17 00:00:00 2001 From: fell Date: Wed, 15 Nov 2017 03:33:57 +0100 Subject: [PATCH 2/6] Add po/glossary/gnc-glossary.pot to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 005f994c055..86b62c9e15c 100644 --- a/.gitignore +++ b/.gitignore @@ -76,6 +76,7 @@ po/POTFILES po/POTFILES.in po/gnucash.pot po/stamp-it +po/glossary/gnc-glossary.pot py-compile src/app-utils/gnucash src/app-utils/sw_app_utils.py From 23f25d74d99c4f2b1b2371e1824fde93ef8127b4 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sun, 19 Nov 2017 09:35:08 -0800 Subject: [PATCH 3/6] Don't try to unref a NULL GDateTime*. --- src/libqof/qof/gnc-date.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libqof/qof/gnc-date.c b/src/libqof/qof/gnc-date.c index d0ded979219..3af9be90554 100644 --- a/src/libqof/qof/gnc-date.c +++ b/src/libqof/qof/gnc-date.c @@ -1503,8 +1503,8 @@ gnc_iso8601_to_timespec_gmt(const char *str) { time.tv_sec = g_date_time_to_unix (gdt); time.tv_nsec = g_date_time_get_microsecond (gdt) * 1000; + g_date_time_unref (gdt); } - g_date_time_unref (gdt); return time; } From af1bc45021aaa9c844a9e204ead402f155835e36 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sun, 19 Nov 2017 09:36:44 -0800 Subject: [PATCH 4/6] A better way to handle MySQL's 0000-00-00 invalid date indicator. --- src/backend/sql/gnc-backend-sql.c | 43 ++++++++++++------ src/libqof/qof/gnc-date.c | 29 ++++-------- src/libqof/qof/gnc-date.h | 5 +-- src/libqof/qof/test/test-gnc-date.c | 68 ++++++++++++++++------------- 4 files changed, 79 insertions(+), 66 deletions(-) diff --git a/src/backend/sql/gnc-backend-sql.c b/src/backend/sql/gnc-backend-sql.c index e9dfc7521a8..7d169d1248c 100644 --- a/src/backend/sql/gnc-backend-sql.c +++ b/src/backend/sql/gnc-backend-sql.c @@ -30,6 +30,7 @@ #include "config.h" #include +#include #include #include #include @@ -1904,27 +1905,43 @@ load_timespec( const GncSqlBackend* be, GncSqlRow* row, } else { + /* MySQL's TIMESTAMP type is not compliant with the SQL + * standard in that it is valid only from 1970-01-01 00:00:01 + * to 2038-01-15 23:59:59. Times outside that range are set to + * "0000-00-00 00:00:00"; depending on the libdbi version we + * may get either the string value or the time64 representing + * it. In either case leave the timespec at 0. + */ if ( G_VALUE_HOLDS_INT64( val ) ) { - timespecFromTime64 (&ts, (time64)(g_value_get_int64 (val))); - isOK = TRUE; + const time64 MINTIME = INT64_C(-62135596800); + const time64 MAXTIME = INT64_C(253402300799); + const time64 t = (time64)(g_value_get_int64 (val)); + if (t >= MINTIME && t <= MAXTIME) + { + timespecFromTime64 (&ts, t); + } + isOK = TRUE; } else if (G_VALUE_HOLDS_STRING (val)) { const gchar* s = g_value_get_string( val ); if ( s != NULL ) { - gchar* buf; - buf = g_strdup_printf( "%c%c%c%c-%c%c-%c%c %c%c:%c%c:%c%c", - s[0], s[1], s[2], s[3], - s[4], s[5], - s[6], s[7], - s[8], s[9], - s[10], s[11], - s[12], s[13] ); - ts = gnc_iso8601_to_timespec_gmt( buf ); - g_free( buf ); - isOK = TRUE; + if (! g_str_has_prefix (s, "0000-00-00")) + { + gchar* buf; + buf = g_strdup_printf( "%c%c%c%c-%c%c-%c%c %c%c:%c%c:%c%c", + s[0], s[1], s[2], s[3], + s[4], s[5], + s[6], s[7], + s[8], s[9], + s[10], s[11], + s[12], s[13] ); + ts = gnc_iso8601_to_timespec_gmt( buf ); + g_free( buf ); + } + isOK = TRUE; } } else diff --git a/src/libqof/qof/gnc-date.c b/src/libqof/qof/gnc-date.c index 3af9be90554..1c652dedf0a 100644 --- a/src/libqof/qof/gnc-date.c +++ b/src/libqof/qof/gnc-date.c @@ -73,17 +73,6 @@ # define GNC_T_FMT "%r" #endif -/* t < MINTIME is probably from a bad conversion from t 0 to - * 0000-00-00, so restore it to the Unix Epoch. t anywhere near - * MAXTIME is obviously an error, but we don't want to crash with a - * bad date-time so just clamp it to MAXTIME. - */ -static inline time64 -clamp_time(time64 t) -{ - return t < MINTIME ? 0 : t > MAXTIME ? MAXTIME : t; -} - const char *gnc_default_strftime_date_format = #ifdef G_OS_WIN32 /* The default date format for use with strftime in Win32. */ @@ -152,7 +141,7 @@ GDateTime* gnc_g_date_time_new_from_unix_local (time64 time) { GTimeZone *tz = gnc_g_time_zone_new_local (); - GDateTime *gdt = g_date_time_new_from_unix_utc (clamp_time (time)); + GDateTime *gdt = g_date_time_new_from_unix_utc (time); if (gdt) gdt = gnc_g_date_time_adjust_for_dst (gdt, tz); return gdt; @@ -260,7 +249,7 @@ struct tm* gnc_localtime_r (const time64 *secs, struct tm* time) { guint index = 0; - GDateTime *gdt = gnc_g_date_time_new_from_unix_local (clamp_time (*secs)); + GDateTime *gdt = gnc_g_date_time_new_from_unix_local (*secs); g_return_val_if_fail (gdt != NULL, NULL); gnc_g_date_time_fill_struct_tm (gdt, time); @@ -282,7 +271,7 @@ struct tm* gnc_gmtime (const time64 *secs) { struct tm *time; - GDateTime *gdt = g_date_time_new_from_unix_utc (clamp_time (*secs)); + GDateTime *gdt = g_date_time_new_from_unix_utc (*secs); g_return_val_if_fail (gdt != NULL, NULL); time = g_slice_alloc0 (sizeof (struct tm)); gnc_g_date_time_fill_struct_tm (gdt, time); @@ -400,10 +389,10 @@ gnc_timegm (struct tm* time) gchar* gnc_ctime (const time64 *secs) { - GDateTime *gdt = gnc_g_date_time_new_from_unix_local (clamp_time (*secs)); - gchar *string = g_date_time_format (gdt, "%a %b %e %H:%M:%S %Y"); - g_date_time_unref (gdt); - return string; + GDateTime *gdt = gnc_g_date_time_new_from_unix_local (*secs); + gchar *string = g_date_time_format (gdt, "%a %b %e %H:%M:%S %Y"); + g_date_time_unref (gdt); + return string; } time64 @@ -898,7 +887,7 @@ size_t qof_print_date_buff (char * buff, size_t len, time64 t) { struct tm theTime; - time64 bt = clamp_time (t); + time64 bt = t; size_t actual; if (!buff) return 0 ; if (!gnc_localtime_r(&bt, &theTime)) @@ -1646,7 +1635,7 @@ gnc_timezone (const struct tm *tm) void timespecFromTime64 ( Timespec *ts, time64 t ) { - ts->tv_sec = clamp_time (t); + ts->tv_sec = t; ts->tv_nsec = 0; } diff --git a/src/libqof/qof/gnc-date.h b/src/libqof/qof/gnc-date.h index ad5bcf03190..acdbe65efda 100644 --- a/src/libqof/qof/gnc-date.h +++ b/src/libqof/qof/gnc-date.h @@ -70,7 +70,7 @@ #include #include -#include + /** * Many systems, including Microsoft Windows and BSD-derived Unixes * like Darwin, are retaining the int-32 typedef for time_t. Since @@ -100,8 +100,7 @@ extern const char *gnc_default_strftime_date_format; /** The maximum length of a string created by the date printers */ #define MAX_DATE_LENGTH 34 -#define MAXTIME INT64_C(253402300799) -#define MINTIME INT64_C(-62135596800) + /** Constants *******************************************************/ /** \brief UTC date format string. diff --git a/src/libqof/qof/test/test-gnc-date.c b/src/libqof/qof/test/test-gnc-date.c index c54d2f0bcba..acd48f91278 100644 --- a/src/libqof/qof/test/test-gnc-date.c +++ b/src/libqof/qof/test/test-gnc-date.c @@ -58,17 +58,6 @@ typedef struct static _GncDateTime gncdt; extern void _gnc_date_time_init (_GncDateTime *); -/* t < MINTIME is probably from a bad conversion from t 0 to - * 0000-00-00, so restore it to the Unix Epoch. t anywhere near - * MAXTIME is obviously an error, but we don't want to crash with a - * bad date-time so just clamp it to MAXTIME. - */ -static inline time64 -clamp_time(time64 t) -{ - return t < MINTIME ? 0 : t > MAXTIME ? MAXTIME : t; -} - /* gnc_localtime just creates a tm on the heap and calls * gnc_localtime_r with it, so this suffices to test both. */ @@ -81,6 +70,18 @@ test_gnc_localtime (void) // difference between g_date_time and tm->tm_wday) }; guint ind; +#if defined(__clang__) && __clang_major__ < 6 +#define _func "struct tm *gnc_localtime_r(const time64 *, struct tm *)" +#else +#define _func "gnc_localtime_r" +#endif + gchar *msg = _func ": assertion " _Q "gdt != NULL' failed"; +#undef _func + gint loglevel = G_LOG_LEVEL_CRITICAL | G_LOG_FLAG_FATAL; + gchar *logdomain = "qof"; + TestErrorStruct check = {loglevel, logdomain, msg, 0}; + GLogFunc hdlr = g_log_set_default_handler ((GLogFunc)test_null_handler, &check); + g_test_log_set_fatal_handler ((GTestLogFatalFunc)test_checked_handler, &check); for (ind = 0; ind < G_N_ELEMENTS (secs); ind++) { @@ -111,6 +112,8 @@ test_gnc_localtime (void) g_date_time_unref (gdt); gnc_tm_free (time); } + g_assert_cmpint (check.hits, ==, 1); + g_log_set_default_handler (hdlr, NULL); } static void @@ -126,23 +129,35 @@ test_gnc_gmtime (void) { 48, 51, 23, 18, 11, 69, 4, 352, 0, 0, NULL }, { 41, 12, 0, 6, 0, 70, 2, 6, 0, 0, NULL }, { 32, 30, 2, 3, 11, 92, 4, 338, 0, 0, NULL }, - { 59, 59, 23, 31, 11, 8099, 5, 365, 0, 0, NULL }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL }, { 6, 47, 16, 7, 3, 107, 6, 97, 0, 0, NULL }, #else { 6, 41, 2, 24, 9, -1301, 4, 297, 0 }, { 48, 51, 23, 18, 11, 69, 4, 352, 0 }, { 41, 12, 0, 6, 0, 70, 2, 6, 0 }, { 32, 30, 2, 3, 11, 92, 4, 338, 0 }, - { 59, 50, 23, 31, 11, 8099, 5, 365, 0 }, + { 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 6, 47, 16, 7, 3, 107, 6, 97, 0 }, #endif }; guint ind; +#if defined(__clang__) && __clang_major__ < 6 +#define _func "struct tm *gnc_gmtime(const time64 *)" +#else +#define _func "gnc_gmtime" +#endif + gchar *msg = _func ": assertion " _Q "gdt != NULL' failed"; +#undef _func + gint loglevel = G_LOG_LEVEL_CRITICAL | G_LOG_FLAG_FATAL; + gchar *logdomain = "qof"; + TestErrorStruct check = {loglevel, logdomain, msg, 0}; + GLogFunc hdlr = g_log_set_default_handler ((GLogFunc)test_null_handler, &check); + g_test_log_set_fatal_handler ((GTestLogFatalFunc)test_checked_handler, &check); for (ind = 0; ind < G_N_ELEMENTS (secs); ind++) { struct tm* time = gnc_gmtime (&secs[ind]); - GDateTime *gdt = g_date_time_new_from_unix_utc (clamp_time (secs[ind])); + GDateTime *gdt = g_date_time_new_from_unix_utc (secs[ind]); if (gdt == NULL) { g_assert (time == NULL); @@ -163,6 +178,8 @@ test_gnc_gmtime (void) g_date_time_unref (gdt); gnc_tm_free (time); } + g_assert_cmpint (check.hits, ==, 1); + g_log_set_default_handler (hdlr, NULL); } static void @@ -2020,23 +2037,14 @@ gnc_timezone (const struct tm *tm)// C: 5 in 2 Local: 2:0:0 test_gnc_timezone (void) { }*/ -/* timespecFromTime64 +/* timespecFromtime64 void -timespecFromTime64( Timespec *ts, time64 t )// C: 22 in 11 Local: 0:0:0 +timespecFromtime64( Timespec *ts, time64 t )// C: 22 in 11 Local: 0:0:0 */ -static void -test_timespecFromTime64 (void) -{ - Timespec ts = {-9999, 0}; - timespecFromTime64 (&ts, MINTIME - 1); - g_assert_cmpint (0, ==, ts.tv_sec); - timespecFromTime64 (&ts, MINTIME + 1); - g_assert_cmpint (MINTIME + 1, ==, ts.tv_sec); - timespecFromTime64 (&ts, MAXTIME + 1); - g_assert_cmpint (MAXTIME, ==, ts.tv_sec); - timespecFromTime64 (&ts, MAXTIME - 1); - g_assert_cmpint (MAXTIME - 1, ==, ts.tv_sec); -} +/* static void +test_timespecFromtime64 (void) +{ +}*/ /* timespec_now Timespec timespec_now()// C: 2 in 2 Local: 0:0:0 @@ -2466,7 +2474,7 @@ test_suite_gnc_date (void) GNC_TEST_ADD_FUNC (suitename, "gnc dmy2timespec end", test_gnc_dmy2timespec_end); GNC_TEST_ADD_FUNC (suitename, "gnc dmy2timespec Neutral", test_gnc_dmy2timespec_neutral); // GNC_TEST_ADD_FUNC (suitename, "gnc timezone", test_gnc_timezone); - GNC_TEST_ADD_FUNC (suitename, "timespecFromTime64", test_timespecFromTime64); +// GNC_TEST_ADD_FUNC (suitename, "timespecFromTime t", test_timespecFromtime64); // GNC_TEST_ADD_FUNC (suitename, "timespec now", test_timespec_now); // GNC_TEST_ADD_FUNC (suitename, "timespecToTime t", test_timespecTotime64); GNC_TEST_ADD_FUNC (suitename, "timespec to gdate", test_timespec_to_gdate); From 1674eb0bd49d38ce9ddde059a59527d6f2400f8a Mon Sep 17 00:00:00 2001 From: John Ralls Date: Tue, 21 Nov 2017 13:30:17 -0800 Subject: [PATCH 5/6] Fix python build and test errors on Mac. --- src/app-utils/CMakeLists.txt | 2 +- src/optional/python-bindings/CMakeLists.txt | 2 +- src/optional/python-bindings/sqlite3test.c | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/app-utils/CMakeLists.txt b/src/app-utils/CMakeLists.txt index bda78471b7e..e093b827ab6 100644 --- a/src/app-utils/CMakeLists.txt +++ b/src/app-utils/CMakeLists.txt @@ -108,7 +108,7 @@ INSTALL(TARGETS gncmod-app-utils IF (WITH_PYTHON) ADD_LIBRARY (gncmod-app-utils-python ${app_utils_ALL_SOURCES} ${SWIG_APP_UTILS_PYTHON_C}) - TARGET_LINK_LIBRARIES(gncmod-app-utils-python ${app_utils_ALL_LIBRARIES} ${PYTHON_LIBRARIES}) + TARGET_LINK_LIBRARIES(gncmod-app-utils-python gncmod-app-utils ${app_utils_ALL_LIBRARIES} ${PYTHON_LIBRARIES}) TARGET_INCLUDE_DIRECTORIES (gncmod-app-utils-python PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/src/optional/python-bindings/CMakeLists.txt b/src/optional/python-bindings/CMakeLists.txt index 92ea1d81981..e87c194c905 100644 --- a/src/optional/python-bindings/CMakeLists.txt +++ b/src/optional/python-bindings/CMakeLists.txt @@ -95,7 +95,7 @@ IF(WITH_PYTHON) DEPENDS ${SWIG_GNUCASH_CORE_C}) ADD_CUSTOM_TARGET(gnucash-core-c-build ALL - COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/gnucash/_gnucash_core_c${CMAKE_SHARED_LIBRARY_SUFFIX} ${PYTHON_SYSCONFIG_BUILD}/gnucash + COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/lib/gnucash/_gnucash_core_c${CMAKE_SHARED_MODULE_SUFFIX} ${PYTHON_SYSCONFIG_BUILD}/gnucash DEPENDS gnucash_core_c) ENDIF() diff --git a/src/optional/python-bindings/sqlite3test.c b/src/optional/python-bindings/sqlite3test.c index e22d74bf2fc..20d96ae99f1 100644 --- a/src/optional/python-bindings/sqlite3test.c +++ b/src/optional/python-bindings/sqlite3test.c @@ -20,9 +20,10 @@ #include "config.h" #include "qofsession.h" - +#define TESTFILE "/tmp/blah.gnucash" int main() { + const char* testurl = "sqlite3://" TESTFILE; qof_log_init(); qof_init(); gnc_module_system_init(); @@ -30,9 +31,10 @@ int main() gnc_engine_init(0, no_args); QofSession * s = qof_session_new(); - qof_session_begin(s, "sqlite3:///tmp/blah.gnucash", 0, 1, 0); + qof_session_begin(s, testurl, 0, 1, 0); qof_session_load(s, NULL); qof_session_save(s, NULL); qof_session_end(s); + unlink(TESTFILE); return 0; } From 0d8112bfefdcd13134d6a70042d48806b59475f9 Mon Sep 17 00:00:00 2001 From: Rob Gowin Date: Thu, 23 Nov 2017 10:50:16 -0500 Subject: [PATCH 6/6] =?UTF-8?q?Bug=20790620=20-=20Failed=20to=20create=20f?= =?UTF-8?q?ile=20=E2=80=9C/usr/share/glib-2.0/schemas/gschemas.compiled.XY?= =?UTF-8?q?789Y=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changed install rule for gschema.compiled to use a target. --- cmake/CMakeLists.txt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index a8651da48e1..089a8ba1b6c 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -1,7 +1,5 @@ # Post install actions go here. -INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${GLIB_COMPILE_SCHEMAS} ${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas)") - IF (APPLE) INSTALL(CODE "EXECUTE_PROCESS( COMMAND /usr/bin/install_name_tool -add_rpath ${CMAKE_INSTALL_PREFIX}/lib @@ -16,19 +14,25 @@ IF (${CMAKE_VERSION} VERSION_GREATER 3.1) ENDIF() SET(schema-targets business-gnome-gschema csv-exp-gschema csv-imp-gschema - generic-import-gschema gnome-gschema gnome-utils-gschema ofx-gschema qif-imp-gschema) + generic-import-gschema gnome-gschema gnome-utils-gschema qif-imp-gschema) IF (WITH_AQBANKING) LIST(APPEND schema-targets aqb-gschema) ENDIF (WITH_AQBANKING) -SET(SCHEMA_DIRECTORY ${DATADIR_BUILD}/glib-2.0/schemas) +IF (WITH_OFX) + LIST(APPEND schema-targets ofx-gschema) +ENDIF (WITH_OFX) + +SET(SCHEMA_BUILD_DIR ${DATADIR_BUILD}/glib-2.0/schemas) ADD_CUSTOM_COMMAND( - OUTPUT ${SCHEMA_DIRECTORY}/gschemas.compiled - COMMAND ${CMAKE_COMMAND_TMP} ${GLIB_COMPILE_SCHEMAS} ${SCHEMA_DIRECTORY} + OUTPUT ${SCHEMA_BUILD_DIR}/gschemas.compiled + COMMAND ${CMAKE_COMMAND_TMP} ${GLIB_COMPILE_SCHEMAS} ${SCHEMA_BUILD_DIR} DEPENDS ${schema-targets} ) -ADD_CUSTOM_TARGET(compiled-schemas ALL DEPENDS ${SCHEMA_DIRECTORY}/gschemas.compiled) +ADD_CUSTOM_TARGET(compiled-schemas ALL DEPENDS ${SCHEMA_BUILD_DIR}/gschemas.compiled) + +INSTALL(FILES ${SCHEMA_BUILD_DIR}/gschemas.compiled DESTINATION ${DATADIR}/glib-2.0/schemas) SET_DIST_LIST(cmake_DIST CMakeLists.txt README_CMAKE.txt cmake_uninstall.cmake.in)