X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/61cdc03e938e2d87754439c2dce5dde7e8a2b47d..71fec3f0a23c27d6fce365e4c45b1981caf2bfaf:/WEB-INF/resources/no.lang.php

diff --git a/WEB-INF/resources/no.lang.php b/WEB-INF/resources/no.lang.php
index 51f634d4..5b4d5d4b 100644
--- a/WEB-INF/resources/no.lang.php
+++ b/WEB-INF/resources/no.lang.php
@@ -182,7 +182,7 @@ $i18n_key_words = array(
 // 'label.cost' => 'Cost',
 // 'label.day_total' => 'Day total',
 'label.week_total' => 'Uken totalt',
-// TODO: translate the following.    
+// TODO: translate the following.
 // 'label.month_total' => 'Month total',
 'label.today' => 'I dag',
 // TODO: translate the following.
@@ -210,7 +210,8 @@ $i18n_key_words = array(
 // 'label.total' => 'Total',
 // 'label.client_name' => 'Client name',
 // 'label.client_address' => 'Client address',
-// 'label.or' => 'or',
+'label.or' => 'eller',
+// TODO: translate the following.
 // 'label.error' => 'Error',
 // 'label.ldap_hint' => 'Type your <b>Windows login</b> and <b>password</b> in the fields below.',
 'label.required_fields' => '* obligatoriske felt',
@@ -357,7 +358,8 @@ $i18n_key_words = array(
 // Time form. See example at https://timetracker.anuko.com/time.php.
 // TODO: translate the following.
 // 'form.time.duration_format' => '(hh:mm or 0.0h)',
-// 'form.time.billable' => 'Billable',
+'form.time.billable' => 'Fakturerbar',
+// TODO: translate the following.
 // 'form.time.uncompleted' => 'Uncompleted',
 // 'form.time.remaining_quota' => 'Remaining quota',
 // 'form.time.over_quota' => 'Over quota',
@@ -374,9 +376,9 @@ $i18n_key_words = array(
 // TODO: translate the following.
 // 'form.reports.save_as_favorite' => 'Save as favorite',
 'form.reports.confirm_delete' => 'Er du sikker på at du vil slette denne favorittrapporten?',
+'form.reports.include_billable' => 'fakturerbar',
+'form.reports.include_not_billable' => 'ikke fakturerbar',
 // TODO: translate the following.
-// 'form.reports.include_billable' => 'billable',
-// 'form.reports.include_not_billable' => 'not billable',
 // 'form.reports.include_invoiced' => 'invoiced',
 // 'form.reports.include_not_invoiced' => 'not invoiced',
 // 'form.reports.select_period' => 'Select time period',
@@ -447,7 +449,6 @@ $i18n_key_words = array(
 // Note to translators: the strings below must be translated
 // "form.mytime.del_yes" => 'tidsoppføringen er slettet', 
 // "form.mytime.no_finished_rec" => 'Denne oppføringen ble lagret kun med starttid. Det er ikke en feil. Logg ut om nødvendig.',
-// "form.mytime.billable" => 'kan faktureres',
 // "form.mytime.warn_tozero_rec" => 'Denne oppføringen må slettes fordi tidsperioden er låst',
 // "form.mytime.uncompleted" => 'uferdig',
 
@@ -573,7 +574,6 @@ $i18n_key_words = array(
 // Note to translators: the strings below are missing and must be translated and added
 // "forward.toxmlfile" => 'eksporter data til en .xml fil',
 // "forward.geninvoice" => 'lag faktura',
-// "forward.change" => 'konfigur klienter',
 
 // Note to translators: the string below is missing and must be translated and added
 // "controls.select.client" => '--- velg klient ---',
@@ -590,11 +590,6 @@ $i18n_key_words = array(
 // "controls.per_at" => 'all tid',
 // "controls.per_ty" => 'dette årr',
 "controls.sel_period" => '--- velg tidsperiode ---',
-"controls.sel_groupby" => '--- ingen sortering ---',
-// Note to translators: the strings below are missing and must be translated and added
-// "controls.inc_billable" => 'fakturerbar',
-// "controls.inc_nbillable" => 'ikke fakturerbar',
-// "controls.default" => '--- default ---',
 
 // labels
 "label.sel_tp" => 'velg tidsperiode',
@@ -606,7 +601,6 @@ $i18n_key_words = array(
 // Note to translators: the strings below are missing and must be translated and added
 // "label.sel_all" => 'velg alle',
 // "label.sel_none" => 'velg ingen',
-// "label.or" => 'or',
 // "label.disable" => 'slå av',
 // "label.enable" => 'slå på',
 // "label.hrs" => 'timer',