From bb17f149abe263b36eaab1125e12ea266a60306a Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Wed, 28 Oct 2009 21:18:16 -0700
Subject: [PATCH] Import revised translations.  DO NOT MERGE

---
 res/values-nb/strings.xml | 58 +++++++++++++++++++--------------------
 res/values-nl/strings.xml |  2 +-
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c9cec0ff7..c4414eafa 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -15,10 +15,10 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="read_attachment_label" msgid="1162255191991555285">"Les e-postvedlegg"</string>
+    <string name="read_attachment_label" msgid="1162255191991555285">"lese e-post-vedlegg"</string>
     <string name="read_attachment_desc" msgid="7594746717616308643">"Tillat applikasjonen å lese e-post-vedleggene dine."</string>
-    <string name="permission_access_provider_label" msgid="4274353114641168675">"Åpne data for e-postleverandør"</string>
-    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Gir programmet tilgang til e-postdatabasen, herunder mottatte og sendte meldinger samt brukernavn og passord."</string>
+    <string name="permission_access_provider_label" msgid="4274353114641168675">"få tilgang til epostleverandørdata"</string>
+    <string name="permission_access_provider_desc" msgid="1513898266889541617">"Gir applikasjonen tilgang til epostdatabasen, inkludert mottatte meldinger, sendte meldinger, brukernavn og passord."</string>
     <string name="app_name" msgid="5815426892327290362">"E-post"</string>
     <string name="accounts_title" msgid="6622149231904649210">"E-post"</string>
     <string name="compose_title" msgid="427986915662706899">"Skriv e-post"</string>
@@ -34,15 +34,15 @@
     <string name="done_action" msgid="7497990549515580249">"Ferdig"</string>
     <string name="discard_action" msgid="6532206074859505968">"Forkast"</string>
     <string name="save_draft_action" msgid="812855865552028622">"Lagre som utkast"</string>
-    <string name="read_unread_action" msgid="4721446664849165077">"Lest/ulest"</string>
-    <string name="read_action" msgid="4701484794504781686">"Marker som lest"</string>
+    <string name="read_unread_action" msgid="4721446664849165077">"Lest/ikke lest"</string>
+    <string name="read_action" msgid="4701484794504781686">"Merk som lest"</string>
     <string name="unread_action" msgid="6280399049357552826">"Merk som ulest"</string>
     <string name="favorite_action" msgid="2911296685862420689">"Favoritt"</string>
     <string name="set_star_action" msgid="4660317166196258160">"Legg til stjerne"</string>
     <string name="remove_star_action" msgid="6689770999647007163">"Fjern stjerne"</string>
     <string name="refresh_action" msgid="5951383001436708175">"Oppdater"</string>
     <string name="add_account_action" msgid="8835736309476033727">"Legg til konto"</string>
-    <string name="deselect_all_action" msgid="253663239459688238">"Fjern alle markeringer"</string>
+    <string name="deselect_all_action" msgid="253663239459688238">"Avmerk alle"</string>
     <string name="compose_action" msgid="4045702519637388045">"Skriv e-post"</string>
     <string name="search_action" msgid="6325101454876682308">"Søk"</string>
     <string name="open_action" msgid="936766723989190816">"Åpne"</string>
@@ -54,7 +54,7 @@
     <string name="mark_as_unread_action" msgid="3766298115778767554">"Merk som ulest"</string>
     <string name="add_cc_bcc_action" msgid="5569074812077509737">"Legg til kopi/blindkopi"</string>
     <string name="add_attachment_action" msgid="2696013743130573897">"Legg til vedlegg"</string>
-    <string name="dump_settings_action" msgid="4478192525236169829">"Dump settings"</string>
+    <string name="dump_settings_action" msgid="4478192525236169829">"Dump innstillinger"</string>
     <string name="choose_attachment_dialog_title" msgid="81937507117528954">"Velg vedlegg"</string>
     <string name="accounts_context_menu_title" msgid="1053701760934475027">"Kontoinnstillinger"</string>
     <string name="status_loading_more" msgid="1580386959044617884">"Henter meldinger…"</string>
@@ -63,7 +63,7 @@
     <string name="status_sending_messages_failed" msgid="7975009558738692407">"Forsøk å sende meldinger på nytt"</string>
     <string name="status_loading_more_failed" msgid="1629172047185323">"Prøv på nytt å hente flere meldinger"</string>
     <string name="notification_new_title" msgid="2200257910380529139">"Ny e-post"</string>
-    <string name="error_loading_message_body" msgid="2265140604109272914">"En uventet feil oppstod under innlasting av meldingstekst. Meldingen kan være for stor til å vises."</string>
+    <string name="error_loading_message_body" msgid="2265140604109272914">"Uventet feil under lastingen av meldingstekst. Det kan være meldingen er for stor."</string>
   <plurals name="notification_new_one_account_fmt">
     <item quantity="one" msgid="3422945912787702191">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> ulest (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
     <item quantity="few" msgid="6543078667692990869">"<xliff:g id="UNREAD_MESSAGE_COUNT">%d</xliff:g> uleste (<xliff:g id="ACCOUNT">%s</xliff:g>)"</item>
@@ -78,15 +78,15 @@
     <string name="mailbox_name_display_drafts" msgid="4868718300700514319">"Utkast"</string>
     <string name="mailbox_name_display_trash" msgid="9139069064580630647">"Papirkurv"</string>
     <string name="mailbox_name_display_sent" msgid="3426058998191869523">"Sendt"</string>
-    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Søppel"</string>
-    <string name="debug_version_fmt" msgid="6160213145745376955">"Version: <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="mailbox_name_display_junk" msgid="9046762505977999288">"Nettsøppel"</string>
+    <string name="debug_version_fmt" msgid="6160213145745376955">"Versjon: <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="debug_enable_debug_logging_label" msgid="2715742416050944774">"Slå på ekstra debug-logging?"</string>
     <string name="debug_enable_sensitive_logging_label" msgid="9010809457943556126">"Slå på debug-logging av sensitiv informasjon? (Kan vise passord i logger.)"</string>
-    <string name="debug_enable_exchange_logging_label" msgid="8054457784052573080">"Aktiver logging for Exchange-analyse (svært omfattende)"</string>
-    <string name="debug_enable_exchange_file_logging_label" msgid="2264994303719050729">"Vil du aktivere logging av Exchange-minnekort?"</string>
+    <string name="debug_enable_exchange_logging_label" msgid="8054457784052573080">"Aktivere logging av Exchange-feilsøking?"</string>
+    <string name="debug_enable_exchange_file_logging_label" msgid="2264994303719050729">"Aktivere logging av Exchange-minnekort?"</string>
     <string name="account_folder_list_separator_accounts" msgid="7568820182396669244">"Kontoer"</string>
-    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Kombinert innboks"</string>
-    <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Uleste"</string>
+    <string name="account_folder_list_summary_inbox" msgid="5790553737870057607">"Innboks"</string>
+    <string name="account_folder_list_summary_unread" msgid="1200755158196002928">"Ikke lest"</string>
     <string name="account_folder_list_summary_starred" msgid="3134312269246375723">"Stjernemerket"</string>
     <string name="account_folder_list_summary_drafts" msgid="5514845993247300437">"Utkast"</string>
     <string name="account_folder_list_summary_outbox" msgid="3059836696049399377">"Utboks"</string>
@@ -103,7 +103,7 @@
     <string name="message_compose_reply_header_fmt" msgid="8815624773273454573">\n\n"<xliff:g id="SENDER">%s</xliff:g>:"\n\n</string>
     <string name="message_compose_quoted_text_label" msgid="5722467956990009520">"Sitert tekst"</string>
     <string name="message_compose_error_no_recipients" msgid="4903715888250785486">"Du må legge til minst én mottager."</string>
-    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Noen·av·e-postadressene·er·ugyldige."</string>
+    <string name="message_compose_error_invalid_email" msgid="1817633338629885643">"Noen e-postadresser er ugyldige."</string>
     <string name="message_compose_attachments_skipped_toast" msgid="5611815773808423460">"Noen vedlegg kunne ikke sendes videre fordi de ikke er blitt lastet ned."</string>
     <string name="message_compose_attachment_size" msgid="4401081828287333647">"Filen er for stor til å bli lagt ved."</string>
     <string name="message_compose_display_name" msgid="6415258924917140704">"<xliff:g id="NAME">%1$s</xliff:g> og <xliff:g id="NUMBER">%2$d</xliff:g> andre"</string>
@@ -124,8 +124,8 @@
     <string name="add_contact_dlg_message_fmt" msgid="4470846346726847478">"Legg til «<xliff:g id="EMAIL">%s</xliff:g>» som kontakt"</string>
     <string name="message_view_display_attachment_toast" msgid="6096315816776330821">"Kan ikke vise vedlegget."</string>
     <string name="account_setup_basics_title" msgid="3969856368228940980">"Sett opp e-post"</string>
-    <string name="accounts_welcome" msgid="5901437782383439370">"Du kan konfigurere e-post for de fleste kontoer ved kun å følge noen få trinn."</string>
-    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Du kan konfigurere en Exchange-konto ved kun å følge noen få trinn."</string>
+    <string name="accounts_welcome" msgid="5901437782383439370">"Velkommen til oppsett av e-post!BREAK_0BREAK_1Du kan bruke en hvilken som helst e-postkonto. De mest populære e-postkontoene kan settes opp i to trinn!"</string>
+    <string name="accounts_welcome_exchange" msgid="4414121583987233733">"Du kan sette opp en Exchange-konto med bare noen få enkle steg."</string>
     <!-- no translation found for account_setup_basics_instructions (3126077748322815504) -->
     <skip />
     <string name="account_setup_basics_email_hint" msgid="7414269319207261120">"E-postadresse"</string>
@@ -133,8 +133,8 @@
     <string name="account_setup_basics_default_label" msgid="5924790142029806711">"Bruk denne kontoen som standard for utgående e-post."</string>
     <string name="account_setup_basics_manual_setup_action" msgid="8053852205391155912">"Manuelt oppsett"</string>
     <string name="account_setup_username_password_toast" msgid="4441448542557889481">"Skriv inn en gyldig e-postadresse og passord."</string>
-    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Duplisert konto"</string>
-    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Denne påloggingen er allerede i bruk for kontoen «<xliff:g id="DUPLICATE">%s</xliff:g>»."</string>
+    <string name="account_duplicate_dlg_title" msgid="3176749833792312641">"Duplikatkonto"</string>
+    <string name="account_duplicate_dlg_message_fmt" msgid="1920726613701479851">"Denne innloggingen er allerede i bruk for kontoen «<xliff:g id="DUPLICATE">%s</xliff:g>»"</string>
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Henter kontoinformasjon…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="5356212700221438863">"Sjekker tjenerinnstillinger for inngående e-post…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4033015234096725343">"Sjekker tjenerinnstillinger for utgående e-post…"</string>
@@ -147,7 +147,7 @@
     <string name="account_setup_account_type_instructions" msgid="114515540798408760">"Hva slags konto er dette?"</string>
     <string name="account_setup_account_type_pop_action" msgid="3958144865724586762">"POP3-konto"</string>
     <string name="account_setup_account_type_imap_action" msgid="3471220237309488124">"IMAP-konto"</string>
-    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Exchange-konto"</string>
+    <string name="account_setup_account_type_exchange_action" msgid="7424283706321767987">"Exchange/ActiveSync"</string>
     <string name="account_setup_incoming_title" msgid="6862032674547580337">"Tjenerinnstillinger for inngående e-post"</string>
     <string name="account_setup_incoming_username_label" msgid="5700581386104070302">"Brukernavn"</string>
     <string name="account_setup_incoming_password_label" msgid="6365327603172559859">"Passord"</string>
@@ -157,9 +157,9 @@
     <string name="account_setup_incoming_security_label" msgid="2110260791086007424">"Sikkerhetstype"</string>
     <string name="account_setup_incoming_security_none_label" msgid="8300169413118264895">"Ingen"</string>
     <string name="account_setup_incoming_security_ssl_trust_certificates_label" msgid="3581382268191377346">"SSL (godta alle sertifikater)"</string>
-    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL"</string>
+    <string name="account_setup_incoming_security_ssl_label" msgid="8886698397743061682">"SSL (alltid)"</string>
     <string name="account_setup_incoming_security_tls_trust_certificates_label" msgid="1089227022489257055">"TLS (godta alle sertifikater)"</string>
-    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS"</string>
+    <string name="account_setup_incoming_security_tls_label" msgid="8638006172590036487">"TLS (alltid)"</string>
     <string name="account_setup_incoming_delete_policy_label" msgid="9213590134693857912">"Slett e-post fra tjener"</string>
     <string name="account_setup_incoming_delete_policy_never_label" msgid="3222897501875871041">"Aldri"</string>
     <string name="account_setup_incoming_delete_policy_delete_label" msgid="222216840911785631">"Når jeg sletter den fra innboksen"</string>
@@ -169,16 +169,16 @@
     <string name="account_setup_outgoing_smtp_server_label" msgid="6035137446691195177">"SMTP-tjener"</string>
     <string name="account_setup_outgoing_port_label" msgid="7573207437835827876">"Port"</string>
     <string name="account_setup_outgoing_security_label" msgid="911398071120720589">"Sikkerhetstype"</string>
-    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Krev pålogging"</string>
+    <string name="account_setup_outgoing_require_login_label" msgid="6371514297854287948">"Krev pålogging."</string>
     <string name="account_setup_outgoing_username_label" msgid="3309680794731596981">"Brukernavn"</string>
     <string name="account_setup_outgoing_password_label" msgid="227844585493317550">"Passord"</string>
     <string name="account_setup_exchange_title" msgid="247933841122558059">"Innstillinger for Exchange Server"</string>
     <string name="account_setup_exchange_server_label" msgid="5390359659749339317">"Exchange Server"</string>
-    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domene/brukernavn"</string>
+    <string name="account_setup_exchange_username_label" msgid="6517176180828983060">"Domene\\brukernavn"</string>
     <string name="account_setup_exchange_domain_label" msgid="3584668050727667045">"Domene"</string>
     <string name="account_setup_exchange_domain_hint" msgid="350372033916025287">"Oppgi domene her"</string>
     <string name="account_setup_exchange_ssl_label" msgid="6704105469083211236">"Bruk sikker tilkobling (SSL)"</string>
-    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Godta alle SSL-sertifikater"</string>
+    <string name="account_setup_exchange_trust_certificates_label" msgid="6232880757633882678">"Godkjenn alle SSL-sertifikater"</string>
     <string name="account_setup_options_title" msgid="8995162193118880993">"Kontoinnstillinger"</string>
     <string name="account_setup_options_mail_check_frequency_label" msgid="4598023962234986194">"Hvor ofte e-post skal sjekkes"</string>
     <string name="account_setup_options_mail_check_frequency_never" msgid="287951859480505416">"Aldri"</string>
@@ -214,7 +214,7 @@
     <string name="account_settings_default_label" msgid="3575963379680943640">"Standardkonto"</string>
     <string name="account_settings_default_summary" msgid="1531901438624688482">"Bruk denne kontoen som standard for utgående e-post."</string>
     <string name="account_settings_notify_label" msgid="1630001017303007974">"Varsling om e-post"</string>
-    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Synkroniseringsfrekvens, varslinger m.m."</string>
+    <string name="account_settings_exchange_summary" msgid="8498451479029626317">"Synkroniseringsfrekvens, varslinger, osv."</string>
     <string name="account_settings_notify_summary" msgid="6609224590300639887">"Varsle i statusfeltet når det kommer e-post"</string>
     <string name="account_settings_mail_check_frequency_label" msgid="2067835530563849675">"Hvor ofte skal e-post sjekkes"</string>
     <string name="account_settings_incoming_label" msgid="7858928031806297542">"Inngående innstillinger"</string>
@@ -224,7 +224,7 @@
     <string name="account_settings_name_label" msgid="8186406122590008449">"Ditt navn"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Innstillinger for varsling"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synkroniser kontakter"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Synkroniser også kontakter fra denne kontoen"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Synkroniser kontakter fra denne kontoen"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Vibrer"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Vibrer når det kommer e-post"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Velg ringetone"</string>
@@ -235,6 +235,6 @@
     <string name="provider_note_yahoo_uk" msgid="2055976404478603298">"Før du setter opp denne e-postkontoen, må du gå til Yahoo!-nettstedet og slå på POP3-tilgang for den."</string>
     <string name="provider_note_live" msgid="3584841823811425060">"Bare noen «pluss-kontoer» tilbyr POP-tilgang som dette programmet trenger for å koble til. Hvis du ikke klarer å logge på med riktig e-postadresse og passord, kan det være du ikke har en betalt «pluss»-tilgang. Start nettleseren for å få tilgang til slike e-postkontoer."</string>
     <string name="provider_note_t_online" msgid="1973701903400232774">"Før du setter opp denne e-postkontoen, besøk T-Online-nettstedet og velg et passord for e-posttilgang via POP3."</string>
-    <string name="exchange_name" msgid="1190783774800310346">"Bedrift"</string>
-    <string name="system_account_create_failed" msgid="4917162302393971752">"Kontobehandleren kunne ikke opprette noen konto. Prøv på nytt."</string>
+    <string name="exchange_name" msgid="1190783774800310346">"Exchange"</string>
+    <string name="system_account_create_failed" msgid="4917162302393971752">"Kontobehandleren kunne ikke opprette noen konto, prøv på nytt."</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d3490c072..504d02ddf 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -231,7 +231,7 @@
     <string name="account_settings_name_label" msgid="8186406122590008449">"Uw naam"</string>
     <string name="account_settings_notifications" msgid="1042620094281375043">"Instellingen voor meldingen"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Contacten synchroniseren"</string>
-    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Contacten van dit account synchroniseren"</string>
+    <string name="account_settings_sync_contacts_summary" msgid="8901452720940015928">"Contacten van dit account eveneens synchroniseren"</string>
     <string name="account_settings_vibrate_enable" msgid="8045133290388856478">"Trillen"</string>
     <string name="account_settings_vibrate_summary" msgid="3690631050585589365">"Ook trillen bij ontvangst van e-mail"</string>
     <string name="account_settings_ringtone" msgid="7922187231467500404">"Beltoon selecteren"</string>