Merge from BRANCH_1_0.

1 files changed, 4 insertions, 4 deletions

diff --git a/i18n/no/checkbook.ts b/i18n/no/checkbook.ts
index 2851c82..9d60723 100644
--- a/i18n/no/checkbook.ts
+++ b/i18n/no/checkbook.ts
@@ -1,505 +1,505 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>Checkbook</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transactions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password protect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to enable/disable password protection of this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Savings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Money market</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mutual fund</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bank:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter name of the bank for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter account number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PIN number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter PIN number for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting balance:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the initial balance for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this checkbook here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %10.00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This area shows the current balance in this checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all transactions entered for this checkbook.
 
 To sort entries by a specific field, click on the column name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Num</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to add a new transaction.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a transaction and then click here to edit it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to delete it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the desired chart below and then click on the Draw button.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select the desired chart type.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawals by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposits by category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Draw</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to draw the selected chart.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Current balance: %1%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Confirm password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please confirm your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password to confirm removal of password protection:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete transaction</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Configuration</name>
     <message>
         <source>Configure Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter currency symbol:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter your local currency symbol here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show whether checkbook is password
 protected</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display that the checkbook is protected with a password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show checkbook balances</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to select whether or not the main window will display the current balance for each checkbook.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>Checkbook</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to create a new checkbook.
 
 You also can select New from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here to edit it.
 
 You also can select Edit from the Checkbook menu, or click and hold on a checkbook name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a checkbook and then click here delete it.
 
 You also can select Delete from the Checkbook menu.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click here to configure this app.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is a listing of all checkbooks currently available.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checkbook Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please enter your password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete checkbook</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Transaction</name>
     <message>
         <source>Transaction for </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Withdrawal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select whether the transaction is a withdrawal or deposit here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deposit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Date:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select date of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter check number here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter description of transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction category here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select transaction type here.
 
 The options available vary based on whether the transaction is a deposit or withdrawal.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter the amount of transaction here.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fee:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any fee amount assoiciated with this transaction.
 
 The value entered should always be positive.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notes:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter any additional information for this transaction here.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automobile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Bills</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clothing</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Computer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>DVDs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Eletronics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Entertainment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Food</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Gasoline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Movies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Rent</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Travel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Debit Charge</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Written Check</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Transfer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Credit Card</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Work</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Family Member</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Misc. Credit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Automatic Payment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cash</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Electronics</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>